From 1f8b21ff150e181e874dfeff3bab229cf62c670b Mon Sep 17 00:00:00 2001 From: Christian Dietrich Date: Fri, 13 Dec 2019 10:16:24 +0100 Subject: [PATCH] [eclipse/xtext#1282] Update to EMF 2.20: regenerated languages Signed-off-by: Christian Dietrich --- .../IndentationAwareUiTestLanguage.genmodel | 2 +- .../PartialContentAssistTestLanguage.genmodel | 2 +- .../PartialSerializationTestLanguage.genmodel | 2 +- .../generated/RenameTestLanguage.genmodel | 2 +- .../model/generated/TestLanguage.genmodel | 2 +- .../ChildList.java | 4 - .../OtherTreeNode.java | 8 - .../indentationAwareUiTestLanguage/Tree.java | 8 - .../TreeNode.java | 8 - .../impl/ChildListImpl.java | 1 + ...ntationAwareUiTestLanguageFactoryImpl.java | 5 + ...ntationAwareUiTestLanguagePackageImpl.java | 18 +- .../impl/OtherTreeNodeImpl.java | 6 +- .../impl/TreeImpl.java | 2 + .../impl/TreeNodeImpl.java | 5 +- .../Property.java | 8 - .../TypeDeclaration.java | 12 -- ...lContentAssistTestLanguageFactoryImpl.java | 3 + ...lContentAssistTestLanguagePackageImpl.java | 14 +- .../impl/PropertyImpl.java | 6 +- .../impl/TypeDeclarationImpl.java | 7 +- .../ChildWithSubChild.java | 4 - .../ChildWithSubChilds.java | 4 - .../EClassRef.java | 4 - .../Import.java | 4 - .../MandatoryChild.java | 4 - .../MandatoryChildList.java | 4 - .../MandatoryValue.java | 4 - .../ManyMandatoryValues.java | 4 - .../ManyValues.java | 4 - .../Model.java | 4 - .../Node.java | 20 -- .../OptionalChild.java | 4 - .../OptionalChildList.java | 4 - .../OptionalValue.java | 4 - .../SubChild.java | 4 - .../TwoChildLists.java | 8 - .../TwoChilds.java | 8 - .../WithTransientContainer.java | 4 - .../impl/ChildWithSubChildImpl.java | 1 + .../impl/ChildWithSubChildsImpl.java | 1 + .../impl/EClassRefImpl.java | 2 + .../impl/ImportImpl.java | 4 +- .../impl/MandatoryChildImpl.java | 2 + .../impl/MandatoryChildListImpl.java | 1 + .../impl/MandatoryValueImpl.java | 4 +- .../impl/ManyMandatoryValuesImpl.java | 3 +- .../impl/ManyValuesImpl.java | 3 +- .../impl/ModelImpl.java | 1 + .../impl/NodeImpl.java | 9 +- .../impl/OptionalChildImpl.java | 2 + .../impl/OptionalChildListImpl.java | 1 + .../impl/OptionalValueImpl.java | 4 +- ...lSerializationTestLanguageFactoryImpl.java | 20 ++ ...lSerializationTestLanguagePackageImpl.java | 50 ++++- .../impl/SubChildImpl.java | 4 +- .../impl/TwoChildListsImpl.java | 3 + .../impl/TwoChildsImpl.java | 4 + .../impl/WithTransientContainerImpl.java | 2 + .../renameTestLanguage/Model.java | 4 - .../renameTestLanguage/TypeDeclaration.java | 8 - .../renameTestLanguage/impl/ModelImpl.java | 1 + .../impl/RenameTestLanguageFactoryImpl.java | 3 + .../impl/RenameTestLanguagePackageImpl.java | 12 +- .../impl/TypeDeclarationImpl.java | 6 +- .../testLanguage/AbstractElement.java | 4 - .../testlanguage/testLanguage/Member.java | 4 - .../testlanguage/testLanguage/Model.java | 4 - .../testlanguage/testLanguage/Operation.java | 12 -- .../testLanguage/OperationCall.java | 8 - .../testLanguage/PackageDeclaration.java | 4 - .../testlanguage/testLanguage/Parameter.java | 8 - .../testLanguage/PrimitiveType.java | 4 - .../testlanguage/testLanguage/Property.java | 4 - .../tests/testlanguage/testLanguage/Type.java | 4 - .../testLanguage/TypeDeclaration.java | 8 - .../testLanguage/TypeReference.java | 4 - .../impl/AbstractElementImpl.java | 4 +- .../testLanguage/impl/MemberImpl.java | 4 +- .../testLanguage/impl/ModelImpl.java | 1 + .../testLanguage/impl/OperationCallImpl.java | 5 +- .../testLanguage/impl/OperationImpl.java | 5 + .../impl/PackageDeclarationImpl.java | 1 + .../testLanguage/impl/ParameterImpl.java | 6 +- .../testLanguage/impl/PrimitiveTypeImpl.java | 4 +- .../testLanguage/impl/PropertyImpl.java | 2 + .../impl/TestLanguageFactoryImpl.java | 13 ++ .../impl/TestLanguagePackageImpl.java | 36 +++- .../impl/TypeDeclarationImpl.java | 3 + .../testLanguage/impl/TypeImpl.java | 3 +- .../testLanguage/impl/TypeReferenceImpl.java | 2 + .../withtransient/WithTransient.java | 8 - .../withtransient/impl/WithTransientImpl.java | 6 +- .../impl/WithtransientFactoryImpl.java | 2 + .../impl/WithtransientPackageImpl.java | 10 +- .../tests/testlanguage/WithTransient.genmodel | 2 +- .../generated/BeeLangTestLanguage.genmodel | 2 +- .../generated/FileAwareTestLanguage.genmodel | 2 +- .../generated/NestedRefsTestLanguage.genmodel | 2 +- .../generated/NoJdtTestLanguage.genmodel | 2 +- .../XtextGrammarTestLanguage.genmodel | 2 +- .../AliasedRequiredCapability.java | 32 ---- .../beeLangTestLanguage/AndExpression.java | 8 - .../AssignmentExpression.java | 12 -- .../beeLangTestLanguage/AtExpression.java | 8 - .../BinaryOpExpression.java | 12 -- .../beeLangTestLanguage/CachedExpression.java | 4 - .../beeLangTestLanguage/CallFeature.java | 12 -- .../beeLangTestLanguage/CallFunction.java | 8 - .../CallNamedFunction.java | 8 - .../ChainedExpression.java | 4 - .../beeLangTestLanguage/ClosureTypeRef.java | 12 -- .../beeLangTestLanguage/CreateExpression.java | 16 -- .../beeLangTestLanguage/DefValue.java | 20 -- .../FeatureExpression.java | 8 - .../beeLangTestLanguage/Function.java | 36 ---- .../beeLangTestLanguage/GuardExpression.java | 4 - .../beeLangTestLanguage/Model.java | 8 - .../beeLangTestLanguage/OrExpression.java | 8 - .../beeLangTestLanguage/Parameter.java | 4 - .../ParameterDeclaration.java | 8 - .../beeLangTestLanguage/ParameterList.java | 4 - .../ProvidedCapability.java | 16 -- .../RequiredCapability.java | 28 --- .../beeLangTestLanguage/SimpleTypeRef.java | 8 - .../UnaryOpExpression.java | 8 - .../UnaryPostOpExpression.java | 8 - .../UnaryPreOpExpression.java | 8 - .../beeLangTestLanguage/Unit.java | 40 ---- .../beeLangTestLanguage/ValueLiteral.java | 4 - .../VariableExpression.java | 4 - .../WithContextExpression.java | 12 -- .../beeLangTestLanguage/WithExpression.java | 8 - .../impl/AliasedRequiredCapabilityImpl.java | 18 +- .../impl/AndExpressionImpl.java | 4 + .../impl/AssignmentExpressionImpl.java | 8 +- .../impl/AtExpressionImpl.java | 4 + .../impl/BeeLangTestLanguageFactoryImpl.java | 37 ++++ .../impl/BeeLangTestLanguagePackageImpl.java | 138 +++++++++++++- .../impl/BinaryOpExpressionImpl.java | 8 +- .../impl/CachedExpressionImpl.java | 2 + .../impl/CallFeatureImpl.java | 8 +- .../impl/CallFunctionImpl.java | 4 + .../impl/CallNamedFunctionImpl.java | 6 +- .../impl/ChainedExpressionImpl.java | 1 + .../impl/ClosureTypeRefImpl.java | 7 +- .../impl/CreateExpressionImpl.java | 10 +- .../impl/DefValueImpl.java | 12 +- .../impl/FeatureExpressionImpl.java | 6 +- .../impl/FunctionImpl.java | 19 +- .../impl/GuardExpressionImpl.java | 2 + .../beeLangTestLanguage/impl/ModelImpl.java | 2 + .../impl/OrExpressionImpl.java | 4 + .../impl/ParameterDeclarationImpl.java | 6 +- .../impl/ParameterImpl.java | 2 + .../impl/ParameterListImpl.java | 1 + .../impl/ProvidedCapabilityImpl.java | 10 +- .../impl/RequiredCapabilityImpl.java | 16 +- .../impl/SimpleTypeRefImpl.java | 5 +- .../impl/UnaryOpExpressionImpl.java | 6 +- .../impl/UnaryPostOpExpressionImpl.java | 6 +- .../impl/UnaryPreOpExpressionImpl.java | 6 +- .../beeLangTestLanguage/impl/UnitImpl.java | 17 +- .../impl/ValueLiteralImpl.java | 4 +- .../impl/VariableExpressionImpl.java | 4 +- .../impl/WithContextExpressionImpl.java | 8 +- .../impl/WithExpressionImpl.java | 5 +- .../fileAware/fileAware/Element.java | 12 -- .../fileAware/fileAware/Import.java | 4 - .../fileAware/PackageDeclaration.java | 12 -- .../fileAware/fileAware/impl/ElementImpl.java | 6 +- .../fileAware/impl/FileAwareFactoryImpl.java | 4 + .../fileAware/impl/FileAwarePackageImpl.java | 17 +- .../fileAware/fileAware/impl/ImportImpl.java | 2 + .../impl/PackageDeclarationImpl.java | 6 +- .../nestedRefs/nestedRefs/Doc.java | 4 - .../nestedRefs/SelfReferingDecl.java | 8 - .../nestedRefs/nestedRefs/impl/DocImpl.java | 1 + .../impl/NestedRefsFactoryImpl.java | 3 + .../impl/NestedRefsPackageImpl.java | 12 +- .../nestedRefs/impl/SelfReferingDeclImpl.java | 6 +- .../testlanguages/noJdt/noJdt/Greeting.java | 8 - .../testlanguages/noJdt/noJdt/Model.java | 4 - .../noJdt/noJdt/impl/GreetingImpl.java | 6 +- .../noJdt/noJdt/impl/ModelImpl.java | 1 + .../noJdt/noJdt/impl/NoJdtFactoryImpl.java | 3 + .../noJdt/noJdt/impl/NoJdtPackageImpl.java | 12 +- .../xtextGrammarTest/AbstractElement.java | 4 - .../AbstractMetamodelDeclaration.java | 8 - .../AbstractNegatedToken.java | 4 - .../xtextGrammarTest/AbstractRule.java | 12 -- .../xtextgrammar/xtextGrammarTest/Action.java | 12 -- .../xtextGrammarTest/Alternatives.java | 4 - .../xtextGrammarTest/Assignment.java | 12 -- .../xtextGrammarTest/CharacterRange.java | 8 - .../xtextGrammarTest/CrossReference.java | 8 - .../EnumLiteralDeclaration.java | 8 - .../xtextGrammarTest/GeneratedMetamodel.java | 4 - .../xtextGrammarTest/Grammar.java | 24 --- .../xtextgrammar/xtextGrammarTest/Group.java | 4 - .../xtextGrammarTest/Keyword.java | 4 - .../xtextGrammarTest/ParserRule.java | 8 - .../xtextGrammarTest/RuleCall.java | 4 - .../xtextGrammarTest/TypeRef.java | 8 - .../impl/AbstractElementImpl.java | 4 +- .../AbstractMetamodelDeclarationImpl.java | 6 +- .../impl/AbstractNegatedTokenImpl.java | 2 + .../impl/AbstractRuleImpl.java | 8 +- .../xtextGrammarTest/impl/ActionImpl.java | 8 +- .../impl/AlternativesImpl.java | 1 + .../xtextGrammarTest/impl/AssignmentImpl.java | 8 +- .../impl/CharacterRangeImpl.java | 4 + .../impl/CrossReferenceImpl.java | 4 + .../impl/EnumLiteralDeclarationImpl.java | 4 + .../impl/GeneratedMetamodelImpl.java | 4 +- .../xtextGrammarTest/impl/GrammarImpl.java | 10 +- .../xtextGrammarTest/impl/GroupImpl.java | 1 + .../xtextGrammarTest/impl/KeywordImpl.java | 4 +- .../xtextGrammarTest/impl/ParserRuleImpl.java | 5 +- .../xtextGrammarTest/impl/RuleCallImpl.java | 2 + .../xtextGrammarTest/impl/TypeRefImpl.java | 4 + .../impl/XtextGrammarTestFactoryImpl.java | 24 +++ .../impl/XtextGrammarTestPackageImpl.java | 64 ++++++- .../xtext/generator/ecore/first/First.java | 4 - .../ecore/first/impl/FirstFactoryImpl.java | 2 + .../generator/ecore/first/impl/FirstImpl.java | 4 +- .../ecore/first/impl/FirstPackageImpl.java | 12 +- .../ecore/first/util/FirstSwitch.java | 43 ++--- .../xtext/generator/ecore/second/Second.java | 8 - .../ecore/second/impl/SecondFactoryImpl.java | 2 + .../ecore/second/impl/SecondImpl.java | 6 +- .../ecore/second/impl/SecondPackageImpl.java | 13 +- .../ecore/second/util/SecondSwitch.java | 43 ++--- .../xtext/XtextGrammarTestLanguage.genmodel | 2 +- .../xtext/dummy/DummyTestLanguage.genmodel | 2 +- .../xtext/dummy/dummyLang/Element.java | 12 -- .../eclipse/xtext/dummy/dummyLang/Model.java | 4 - .../dummyLang/impl/DummyLangFactoryImpl.java | 3 + .../dummyLang/impl/DummyLangPackageImpl.java | 13 +- .../dummy/dummyLang/impl/ElementImpl.java | 7 +- .../xtext/dummy/dummyLang/impl/ModelImpl.java | 1 + .../EnumAndReferenceTestLanguage.genmodel | 2 +- .../enumrules/EnumRulesTestLanguage.genmodel | 2 +- .../MultiRuleEnumTestLanguage.genmodel | 2 +- .../EntityWithEnumAndReference.java | 12 -- .../KindOfKeyword.java | 11 +- .../impl/EntityWithEnumAndReferenceImpl.java | 8 +- ...umAndReferenceTestLanguageFactoryImpl.java | 2 + ...umAndReferenceTestLanguagePackageImpl.java | 12 +- .../enumRulesTestLanguage/GeneratedEnum.java | 11 +- .../enumRulesTestLanguage/Model.java | 8 - .../EnumRulesTestLanguageFactoryImpl.java | 2 + .../EnumRulesTestLanguagePackageImpl.java | 11 +- .../enumRulesTestLanguage/impl/ModelImpl.java | 6 +- .../xtext/enumrules/multiRuleenums/Model.java | 12 -- .../enumrules/multiRuleenums/MyEnum.java | 23 +-- .../multiRuleenums/impl/ModelImpl.java | 8 +- .../impl/MultiRuleenumsFactoryImpl.java | 2 + .../impl/MultiRuleenumsPackageImpl.java | 12 +- .../internal/FormatterTestLanguage.genmodel | 2 +- .../formattertestlanguage/IDList.java | 4 - .../formattertestlanguage/KWList.java | 20 -- .../FormattertestlanguageFactoryImpl.java | 4 + .../FormattertestlanguagePackageImpl.java | 16 +- .../impl/IDListImpl.java | 3 +- .../impl/KWListImpl.java | 12 +- .../RegionAccessTestLanguage.genmodel | 2 +- .../regionaccesstestlanguage/Add.java | 8 - .../AssignedAction.java | 8 - .../regionaccesstestlanguage/Delegate.java | 4 - .../regionaccesstestlanguage/Delegation.java | 4 - .../regionaccesstestlanguage/Enum.java | 11 +- .../regionaccesstestlanguage/Mixed.java | 24 --- .../regionaccesstestlanguage/Named.java | 4 - .../PrefixedUnassigned.java | 4 - .../regionaccesstestlanguage/Root.java | 4 - .../regionaccesstestlanguage/Simple.java | 4 - .../regionaccesstestlanguage/ValueList.java | 4 - .../impl/AddImpl.java | 4 + .../impl/AssignedActionImpl.java | 4 + .../impl/DelegateImpl.java | 4 +- .../impl/DelegationImpl.java | 2 + .../impl/MixedImpl.java | 14 +- .../impl/NamedImpl.java | 4 +- .../impl/PrefixedUnassignedImpl.java | 2 + .../RegionaccesstestlanguageFactoryImpl.java | 16 ++ .../RegionaccesstestlanguagePackageImpl.java | 40 +++- .../impl/RootImpl.java | 2 + .../impl/SimpleImpl.java | 4 +- .../impl/ValueListImpl.java | 3 +- .../generator/ecore/SubTestLanguage.genmodel | 2 +- .../ecore/SuperTestLanguage.genmodel | 2 +- .../impl/NestedPackage1FactoryImpl.java | 2 + .../impl/NestedPackage1PackageImpl.java | 14 +- .../util/NestedPackage1Switch.java | 43 ++--- .../genmodelaccess/noLiterals/NoLitClass.java | 8 - .../genmodelaccess/noLiterals/NoLitEnum.java | 7 +- .../noLiterals/impl/NoLitClassImpl.java | 6 +- .../impl/NoLiteralsFactoryImpl.java | 2 + .../impl/NoLiteralsPackageImpl.java | 18 +- .../noLiterals/util/NoLiteralsSwitch.java | 43 ++--- .../ecore/genmodelaccess/root/RootClass.java | 8 - .../ecore/genmodelaccess/root/RootEnum.java | 7 +- .../root/impl/RootClassImpl.java | 6 +- .../root/impl/RootFactoryImpl.java | 2 + .../root/impl/RootPackageImpl.java | 18 +- .../genmodelaccess/root/util/RootSwitch.java | 43 ++--- .../generator/ecore/subPackage/SubMain.java | 8 - .../ecore/subPackage/impl/SubMainImpl.java | 3 + .../impl/SubPackageFactoryImpl.java | 3 + .../impl/SubPackagePackageImpl.java | 13 +- .../ecore/superPackage/AnotherSuperMain.java | 4 - .../ecore/superPackage/SuperMain.java | 4 - .../impl/AnotherSuperMainImpl.java | 4 +- .../superPackage/impl/SuperMainImpl.java | 4 +- .../impl/SuperPackageFactoryImpl.java | 3 + .../impl/SuperPackagePackageImpl.java | 11 +- .../BaseInheritanceTestLanguage.genmodel | 2 +- .../ConcreteTestLanguage.genmodel | 2 +- .../InheritanceTest2Language.genmodel | 2 +- .../InheritanceTestLanguage.genmodel | 2 +- .../baseInheritanceTest/Model.java | 4 - .../impl/BaseInheritanceTestFactoryImpl.java | 2 + .../impl/BaseInheritanceTestPackageImpl.java | 9 +- .../baseInheritanceTest/impl/ModelImpl.java | 4 +- .../xtext/grammarinheritance/foo/AType2.java | 4 - .../foo/CallExtendedParserRule.java | 4 - .../foo/CallOverridenParserRule.java | 4 - .../foo/ConcreteParserRule.java | 8 - .../grammarinheritance/foo/Subrule1.java | 4 - .../grammarinheritance/foo/Subrule2.java | 4 - .../grammarinheritance/foo/Subrule3.java | 4 - .../foo/impl/AType2Impl.java | 6 +- .../foo/impl/CallExtendedParserRuleImpl.java | 2 + .../foo/impl/CallOverridenParserRuleImpl.java | 2 + .../foo/impl/ConcreteParserRuleImpl.java | 5 +- .../foo/impl/FooFactoryImpl.java | 9 + .../foo/impl/FooPackageImpl.java | 24 ++- .../foo/impl/Subrule1Impl.java | 4 +- .../foo/impl/Subrule2Impl.java | 4 +- .../foo/impl/Subrule3Impl.java | 4 +- .../inheritanceTest/Element.java | 4 - .../inheritanceTest/Model.java | 4 - .../inheritanceTest/impl/ElementImpl.java | 4 +- .../impl/InheritanceTestFactoryImpl.java | 3 + .../impl/InheritanceTestPackageImpl.java | 12 +- .../inheritanceTest/impl/ModelImpl.java | 1 + .../inheritanceTest2/Model.java | 4 - .../impl/InheritanceTest2FactoryImpl.java | 2 + .../impl/InheritanceTest2PackageImpl.java | 13 +- .../inheritanceTest2/impl/ModelImpl.java | 3 +- .../xtext/index/IndexTestLanguage.genmodel | 2 +- .../xtext/index/indexTestLanguage/Entity.java | 4 - .../xtext/index/indexTestLanguage/File.java | 4 - .../xtext/index/indexTestLanguage/Import.java | 4 - .../index/indexTestLanguage/Namespace.java | 8 - .../index/indexTestLanguage/Property.java | 8 - .../xtext/index/indexTestLanguage/Type.java | 4 - .../indexTestLanguage/impl/EntityImpl.java | 1 + .../indexTestLanguage/impl/FileImpl.java | 1 + .../indexTestLanguage/impl/ImportImpl.java | 4 +- .../impl/IndexTestLanguageFactoryImpl.java | 9 + .../impl/IndexTestLanguagePackageImpl.java | 23 ++- .../indexTestLanguage/impl/NamespaceImpl.java | 5 +- .../indexTestLanguage/impl/PropertyImpl.java | 6 +- .../indexTestLanguage/impl/TypeImpl.java | 4 +- .../BacktrackingLexerTestLanguage.genmodel | 2 +- .../IgnoreCaseLexerTestLanguage.genmodel | 2 +- .../lexer/backtrackingTestLanguage/Ab.java | 8 - .../backtrackingTestLanguage/EnumName.java | 11 +- .../lexer/backtrackingTestLanguage/Model.java | 24 --- .../lexer/backtrackingTestLanguage/Xb.java | 8 - .../backtrackingTestLanguage/impl/AbImpl.java | 6 +- .../BacktrackingTestLanguageFactoryImpl.java | 4 + .../BacktrackingTestLanguagePackageImpl.java | 21 +- .../impl/ModelImpl.java | 8 +- .../backtrackingTestLanguage/impl/XbImpl.java | 6 +- .../lexer/ignoreCaseTestLanguage/Model.java | 4 - .../IgnoreCaseTestLanguageFactoryImpl.java | 2 + .../IgnoreCaseTestLanguagePackageImpl.java | 9 +- .../impl/ModelImpl.java | 4 +- ...ractIgnoreCaseLinkingTestLanguage.genmodel | 2 +- .../linking/Bug287988TestLanguage.genmodel | 2 +- .../linking/Bug289059TestLanguage.genmodel | 2 +- .../linking/Bug313089TestLanguage.genmodel | 2 +- .../eclipse/xtext/linking/Bug362902.genmodel | 2 +- .../IgnoreCaseImportsTestLanguage.genmodel | 2 +- .../IgnoreCaseNamespacesTestLanguage.genmodel | 2 +- .../linking/ImportUriTestLanguage.genmodel | 2 +- .../xtext/linking/LangATestLanguage.genmodel | 2 +- .../linking/bug287988Test/BaseAttribute.java | 12 -- .../xtext/linking/bug287988Test/Model.java | 4 - .../bug287988Test/impl/BaseAttributeImpl.java | 8 +- .../impl/Bug287988TestFactoryImpl.java | 5 + .../impl/Bug287988TestPackageImpl.java | 15 +- .../linking/bug287988Test/impl/ModelImpl.java | 1 + .../xtext/linking/bug289059Test/Model.java | 12 -- .../impl/Bug289059TestFactoryImpl.java | 3 + .../impl/Bug289059TestPackageImpl.java | 12 +- .../linking/bug289059Test/impl/ModelImpl.java | 8 +- .../eclipse/xtext/linking/bug313089/Bar.java | 4 - .../eclipse/xtext/linking/bug313089/Baz.java | 8 - .../eclipse/xtext/linking/bug313089/Foo.java | 16 -- .../xtext/linking/bug313089/impl/BarImpl.java | 4 +- .../xtext/linking/bug313089/impl/BazImpl.java | 6 +- .../bug313089/impl/Bug313089FactoryImpl.java | 4 + .../bug313089/impl/Bug313089PackageImpl.java | 17 +- .../xtext/linking/bug313089/impl/FooImpl.java | 10 +- .../xtext/linking/bug362902/Greeting.java | 4 - .../xtext/linking/bug362902/Model.java | 8 - .../bug362902/impl/Bug362902FactoryImpl.java | 3 + .../bug362902/impl/Bug362902PackageImpl.java | 12 +- .../linking/bug362902/impl/GreetingImpl.java | 4 +- .../linking/bug362902/impl/ModelImpl.java | 3 + .../linking/ignoreCaseImportsTest/Import.java | 4 - .../linking/ignoreCaseImportsTest/Model.java | 4 - .../IgnoreCaseImportsTestFactoryImpl.java | 3 + .../IgnoreCaseImportsTestPackageImpl.java | 12 +- .../impl/ImportImpl.java | 4 +- .../ignoreCaseImportsTest/impl/ModelImpl.java | 1 + .../ignoreCaseLinkingTest/Element.java | 12 -- .../linking/ignoreCaseLinkingTest/Model.java | 4 - .../impl/ElementImpl.java | 7 +- .../IgnoreCaseLinkingTestFactoryImpl.java | 3 + .../IgnoreCaseLinkingTestPackageImpl.java | 13 +- .../ignoreCaseLinkingTest/impl/ModelImpl.java | 1 + .../ignoreCaseNamespacesTest/Import.java | 4 - .../ignoreCaseNamespacesTest/Model.java | 4 - .../IgnoreCaseNamespacesTestFactoryImpl.java | 3 + .../IgnoreCaseNamespacesTestPackageImpl.java | 12 +- .../impl/ImportImpl.java | 4 +- .../impl/ModelImpl.java | 1 + .../xtext/linking/importedURI/Import.java | 4 - .../xtext/linking/importedURI/Main.java | 8 - .../xtext/linking/importedURI/Type.java | 8 - .../linking/importedURI/impl/ImportImpl.java | 4 +- .../impl/ImportedURIFactoryImpl.java | 4 + .../impl/ImportedURIPackageImpl.java | 15 +- .../linking/importedURI/impl/MainImpl.java | 2 + .../linking/importedURI/impl/TypeImpl.java | 6 +- .../linking/langATestLanguage/Import.java | 4 - .../xtext/linking/langATestLanguage/Main.java | 8 - .../xtext/linking/langATestLanguage/Type.java | 12 -- .../langATestLanguage/impl/ImportImpl.java | 4 +- .../impl/LangATestLanguageFactoryImpl.java | 4 + .../impl/LangATestLanguagePackageImpl.java | 16 +- .../langATestLanguage/impl/MainImpl.java | 2 + .../langATestLanguage/impl/TypeImpl.java | 7 +- .../lazy/Bug311337TestLanguage.genmodel | 2 +- .../xtext/linking/lazy/bug311337/Child.java | 8 - .../linking/lazy/bug311337/Definition.java | 12 -- .../xtext/linking/lazy/bug311337/Model.java | 4 - .../linking/lazy/bug311337/NestedRef.java | 4 - .../linking/lazy/bug311337/Reference.java | 4 - .../bug311337/impl/Bug311337FactoryImpl.java | 6 + .../bug311337/impl/Bug311337PackageImpl.java | 20 +- .../lazy/bug311337/impl/ChildImpl.java | 6 +- .../lazy/bug311337/impl/DefinitionImpl.java | 6 +- .../lazy/bug311337/impl/ModelImpl.java | 1 + .../lazy/bug311337/impl/NestedRefImpl.java | 2 + .../lazy/bug311337/impl/ReferenceImpl.java | 2 + .../tests/EcoreReferenceTestLanguage.genmodel | 2 +- .../tests/MetamodelRefTestLanguage.genmodel | 2 +- .../tests/MultiGenMMTestLanguage.genmodel | 2 +- .../tests/anotherSimpleTest/Foo.java | 8 - .../impl/AnotherSimpleTestFactoryImpl.java | 2 + .../impl/AnotherSimpleTestPackageImpl.java | 11 +- .../tests/anotherSimpleTest/impl/FooImpl.java | 5 +- .../tests/ecoreReference/Model.java | 4 - .../impl/EcoreReferenceFactoryImpl.java | 5 + .../impl/EcoreReferencePackageImpl.java | 13 +- .../tests/ecoreReference/impl/ModelImpl.java | 1 + .../tests/otherTest/FooBar.java | 4 - .../tests/otherTest/impl/FooBarImpl.java | 4 +- .../otherTest/impl/OtherTestFactoryImpl.java | 2 + .../otherTest/impl/OtherTestPackageImpl.java | 12 +- .../tests/simpleTest/Foo.java | 8 - .../tests/simpleTest/impl/FooImpl.java | 5 +- .../impl/SimpleTestFactoryImpl.java | 2 + .../impl/SimpleTestPackageImpl.java | 13 +- .../antlr/Bug289515TestLanguage.genmodel | 2 +- .../antlr/Bug289524ExTestLanguage.genmodel | 2 +- .../antlr/Bug289524TestLanguage.genmodel | 2 +- .../antlr/Bug296889ExTestLanguage.genmodel | 2 +- .../antlr/Bug296889TestLanguage.genmodel | 2 +- .../antlr/Bug299237TestLanguage.genmodel | 2 +- .../antlr/Bug301935TestLanguage.genmodel | 2 +- .../antlr/Bug378967TestLanguage.genmodel | 2 +- .../antlr/Bug406914TestLanguage.genmodel | 2 +- .../antlr/Bug443221TestLanguage.genmodel | 2 +- .../parser/antlr/bug289515Test/Model.java | 4 - .../impl/Bug289515TestFactoryImpl.java | 2 + .../impl/Bug289515TestPackageImpl.java | 9 +- .../antlr/bug289515Test/impl/ModelImpl.java | 4 +- .../antlr/bug289524ExTest/Contained.java | 4 - .../parser/antlr/bug289524ExTest/Model.java | 4 - .../antlr/bug289524ExTest/ModelElement.java | 8 - .../impl/Bug289524ExTestFactoryImpl.java | 4 + .../impl/Bug289524ExTestPackageImpl.java | 14 +- .../bug289524ExTest/impl/ContainedImpl.java | 4 +- .../impl/ModelElementImpl.java | 2 + .../antlr/bug289524ExTest/impl/ModelImpl.java | 1 + .../parser/antlr/bug289524Test/Contained.java | 4 - .../parser/antlr/bug289524Test/Model.java | 4 - .../antlr/bug289524Test/ModelElement.java | 8 - .../impl/Bug289524TestFactoryImpl.java | 4 + .../impl/Bug289524TestPackageImpl.java | 14 +- .../bug289524Test/impl/ContainedImpl.java | 4 +- .../bug289524Test/impl/ModelElementImpl.java | 2 + .../antlr/bug289524Test/impl/ModelImpl.java | 1 + .../parser/antlr/bug296889ExTest/Model.java | 8 - .../parser/antlr/bug296889ExTest/Postop.java | 8 - .../parser/antlr/bug296889ExTest/Preop.java | 8 - .../antlr/bug296889ExTest/Variable.java | 4 - .../impl/Bug296889ExTestFactoryImpl.java | 6 + .../impl/Bug296889ExTestPackageImpl.java | 19 +- .../antlr/bug296889ExTest/impl/ModelImpl.java | 4 +- .../bug296889ExTest/impl/PostopImpl.java | 6 +- .../antlr/bug296889ExTest/impl/PreopImpl.java | 6 +- .../bug296889ExTest/impl/VariableImpl.java | 4 +- .../parser/antlr/bug296889Test/Model.java | 8 - .../parser/antlr/bug296889Test/Postop.java | 8 - .../parser/antlr/bug296889Test/Preop.java | 8 - .../parser/antlr/bug296889Test/Variable.java | 4 - .../impl/Bug296889TestFactoryImpl.java | 6 + .../impl/Bug296889TestPackageImpl.java | 19 +- .../antlr/bug296889Test/impl/ModelImpl.java | 4 +- .../antlr/bug296889Test/impl/PostopImpl.java | 6 +- .../antlr/bug296889Test/impl/PreopImpl.java | 6 +- .../bug296889Test/impl/VariableImpl.java | 4 +- .../parser/antlr/bug299237Test/Model.java | 4 - .../impl/Bug299237TestFactoryImpl.java | 2 + .../impl/Bug299237TestPackageImpl.java | 9 +- .../antlr/bug299237Test/impl/ModelImpl.java | 4 +- .../parser/antlr/bug301935Test/Model.java | 12 -- .../impl/Bug301935TestFactoryImpl.java | 2 + .../impl/Bug301935TestPackageImpl.java | 11 +- .../antlr/bug301935Test/impl/ModelImpl.java | 8 +- .../parser/antlr/bug378967Test/AfterObj.java | 4 - .../parser/antlr/bug378967Test/FirstEnum.java | 7 +- .../parser/antlr/bug378967Test/Root.java | 4 - .../parser/antlr/bug378967Test/Rule1.java | 12 -- .../parser/antlr/bug378967Test/Rule2.java | 4 - .../parser/antlr/bug378967Test/Rule3.java | 4 - .../parser/antlr/bug378967Test/Rule4.java | 12 -- .../parser/antlr/bug378967Test/SObj.java | 4 - .../antlr/bug378967Test/SecondEnum.java | 7 +- .../bug378967Test/impl/AfterObjImpl.java | 4 +- .../impl/Bug378967TestFactoryImpl.java | 8 + .../impl/Bug378967TestPackageImpl.java | 27 ++- .../antlr/bug378967Test/impl/RootImpl.java | 2 + .../antlr/bug378967Test/impl/Rule1Impl.java | 8 +- .../antlr/bug378967Test/impl/Rule2Impl.java | 4 +- .../antlr/bug378967Test/impl/Rule3Impl.java | 4 +- .../antlr/bug378967Test/impl/Rule4Impl.java | 8 +- .../antlr/bug378967Test/impl/SObjImpl.java | 4 +- .../parser/antlr/bug406914Test/Model.java | 4 - .../impl/Bug406914TestFactoryImpl.java | 2 + .../impl/Bug406914TestPackageImpl.java | 9 +- .../antlr/bug406914Test/impl/ModelImpl.java | 4 +- .../parser/antlr/bug443221Test/Model.java | 4 - .../impl/Bug443221TestFactoryImpl.java | 2 + .../impl/Bug443221TestPackageImpl.java | 9 +- .../antlr/bug443221Test/impl/ModelImpl.java | 4 +- .../AssignmentsTestLanguage.genmodel | 2 +- .../Bug287184TestLanguage.genmodel | 2 +- .../Bug288432TestLanguage.genmodel | 2 +- .../assignmentsTestLanguage/Model.java | 12 -- .../assignmentsTestLanguage/MultiValue.java | 4 - .../assignmentsTestLanguage/SingleValue.java | 4 - .../AssignmentsTestLanguageFactoryImpl.java | 4 + .../AssignmentsTestLanguagePackageImpl.java | 15 +- .../impl/ModelImpl.java | 6 + .../impl/MultiValueImpl.java | 3 +- .../impl/SingleValueImpl.java | 4 +- .../bug287184Test/AbstractDetail.java | 4 - .../assignments/bug287184Test/Detail.java | 4 - .../assignments/bug287184Test/Model.java | 8 - .../impl/AbstractDetailImpl.java | 2 + .../impl/Bug287184TestFactoryImpl.java | 5 + .../impl/Bug287184TestPackageImpl.java | 15 +- .../bug287184Test/impl/DetailImpl.java | 4 +- .../bug287184Test/impl/ModelImpl.java | 5 +- .../assignments/bug288432Test/Body.java | 12 -- .../parser/assignments/bug288432Test/Foo.java | 4 - .../assignments/bug288432Test/MyElement.java | 4 - .../assignments/bug288432Test/MyInt.java | 4 - .../assignments/bug288432Test/Parameter.java | 8 - .../bug288432Test/ParameterRef.java | 4 - .../bug288432Test/impl/BodyImpl.java | 4 + .../impl/Bug288432TestFactoryImpl.java | 9 + .../impl/Bug288432TestPackageImpl.java | 24 ++- .../bug288432Test/impl/FooImpl.java | 4 +- .../bug288432Test/impl/MyElementImpl.java | 2 + .../bug288432Test/impl/MyIntImpl.java | 4 +- .../bug288432Test/impl/ParameterImpl.java | 6 +- .../bug288432Test/impl/ParameterRefImpl.java | 2 + .../DatatypeRulesTestLanguage.genmodel | 2 +- .../CompositeModel.java | 4 - .../datatypeRulesTestLanguage/Model.java | 20 -- .../impl/CompositeModelImpl.java | 1 + .../DatatypeRulesTestLanguageFactoryImpl.java | 3 + .../DatatypeRulesTestLanguagePackageImpl.java | 15 +- .../impl/ModelImpl.java | 12 +- .../encoding/EncodingTestLanguage.genmodel | 2 +- .../parser/encoding/encodingTest/Model.java | 4 - .../parser/encoding/encodingTest/Word.java | 4 - .../impl/EncodingTestFactoryImpl.java | 3 + .../impl/EncodingTestPackageImpl.java | 11 +- .../encoding/encodingTest/impl/ModelImpl.java | 1 + .../encoding/encodingTest/impl/WordImpl.java | 4 +- .../parser/epatch/EpatchTestLanguage.genmodel | 2 +- .../epatch/epatchTestLanguage/Assignment.java | 4 - .../epatchTestLanguage/AssignmentValue.java | 36 ---- .../epatchTestLanguage/EPackageImport.java | 4 - .../epatch/epatchTestLanguage/EPatch.java | 16 -- .../ExpressionExecutable.java | 4 - .../epatchTestLanguage/ExtensionImport.java | 4 - .../epatchTestLanguage/JavaExecutable.java | 4 - .../epatch/epatchTestLanguage/JavaImport.java | 4 - .../epatchTestLanguage/ListAssignment.java | 8 - .../epatch/epatchTestLanguage/Migration.java | 12 -- .../epatchTestLanguage/ModelImport.java | 4 - .../epatchTestLanguage/NamedObject.java | 12 -- .../epatchTestLanguage/NamedResource.java | 20 -- .../epatch/epatchTestLanguage/ObjectCopy.java | 8 - .../epatch/epatchTestLanguage/ObjectNew.java | 8 - .../epatch/epatchTestLanguage/ObjectRef.java | 20 -- .../epatchTestLanguage/ResourceImport.java | 4 - .../epatchTestLanguage/SingleAssignment.java | 8 - .../impl/AssignmentImpl.java | 4 +- .../impl/AssignmentValueImpl.java | 20 +- .../impl/EPackageImportImpl.java | 4 +- .../epatchTestLanguage/impl/EPatchImpl.java | 7 +- .../impl/EpatchTestLanguageFactoryImpl.java | 22 +++ .../impl/EpatchTestLanguagePackageImpl.java | 73 ++++++- .../impl/ExpressionExecutableImpl.java | 4 +- .../impl/ExtensionImportImpl.java | 3 +- .../impl/JavaExecutableImpl.java | 4 +- .../impl/JavaImportImpl.java | 3 +- .../impl/ListAssignmentImpl.java | 2 + .../impl/MigrationImpl.java | 6 + .../impl/ModelImportImpl.java | 4 +- .../impl/NamedObjectImpl.java | 7 +- .../impl/NamedResourceImpl.java | 12 +- .../impl/ObjectCopyImpl.java | 6 +- .../impl/ObjectNewImpl.java | 6 +- .../impl/ObjectRefImpl.java | 12 +- .../impl/ResourceImportImpl.java | 4 +- .../impl/SingleAssignmentImpl.java | 4 + .../fragments/FragmentTestLanguage.genmodel | 2 +- .../fragmentTestLanguage/PRFNamed.java | 8 - .../PRFNamedWithAction.java | 8 - .../ParserRuleFragments.java | 8 - .../impl/FragmentTestLanguageFactoryImpl.java | 4 + .../impl/FragmentTestLanguagePackageImpl.java | 16 +- .../impl/PRFNamedImpl.java | 6 +- .../impl/PRFNamedWithActionImpl.java | 4 + .../impl/ParserRuleFragmentsImpl.java | 4 + .../IndentationAwareTestLanguage.genmodel | 2 +- .../ChildList.java | 4 - .../OtherTreeNode.java | 8 - .../indentationAwareTestLanguage/Tree.java | 8 - .../TreeNode.java | 8 - .../impl/ChildListImpl.java | 1 + ...dentationAwareTestLanguageFactoryImpl.java | 5 + ...dentationAwareTestLanguagePackageImpl.java | 18 +- .../impl/OtherTreeNodeImpl.java | 6 +- .../impl/TreeImpl.java | 2 + .../impl/TreeNodeImpl.java | 5 +- .../keywords/KeywordsTestLanguage.genmodel | 2 +- .../keywords/keywordsTestLanguage/Model.java | 32 ---- .../impl/KeywordsTestLanguageFactoryImpl.java | 2 + .../impl/KeywordsTestLanguagePackageImpl.java | 16 +- .../keywordsTestLanguage/impl/ModelImpl.java | 18 +- .../ParametersTestLanguage.genmodel | 2 +- .../ParserRuleParameters.java | 4 - .../parametersTestLanguage/Scenario.java | 8 - .../ParametersTestLanguageFactoryImpl.java | 3 + .../ParametersTestLanguagePackageImpl.java | 12 +- .../impl/ParserRuleParametersImpl.java | 2 + .../impl/ScenarioImpl.java | 6 +- .../Bug292245TestLanguage.genmodel | 2 +- .../Bug297105TestLanguage.genmodel | 2 +- .../Bug317840TestLanguage.genmodel | 2 +- .../EcoreTerminalsTestLanguage.genmodel | 2 +- .../HiddenTerminalsTestLanguage.genmodel | 2 +- .../TerminalRulesTestLanguage.genmodel | 2 +- .../UnicodeTestLanguage.genmodel | 2 +- .../XtextTerminalsTestLanguage.genmodel | 2 +- .../bug292245TestLanguage/Model.java | 12 -- .../Bug292245TestLanguageFactoryImpl.java | 2 + .../Bug292245TestLanguagePackageImpl.java | 11 +- .../bug292245TestLanguage/impl/ModelImpl.java | 5 +- .../bug297105TestLanguage/Expression.java | 8 - .../bug297105TestLanguage/Literal.java | 4 - .../bug297105TestLanguage/Model.java | 4 - .../Bug297105TestLanguageFactoryImpl.java | 6 + .../Bug297105TestLanguagePackageImpl.java | 16 +- .../impl/ExpressionImpl.java | 4 + .../impl/LiteralImpl.java | 4 +- .../bug297105TestLanguage/impl/ModelImpl.java | 1 + .../bug317840TestLanguage/Element.java | 16 -- .../bug317840TestLanguage/Model.java | 4 - .../bug317840TestLanguage/Named.java | 4 - .../Bug317840TestLanguageFactoryImpl.java | 4 + .../Bug317840TestLanguagePackageImpl.java | 16 +- .../impl/ElementImpl.java | 6 + .../bug317840TestLanguage/impl/ModelImpl.java | 1 + .../bug317840TestLanguage/impl/NamedImpl.java | 4 +- .../ecoreTerminalsTestLanguage/Model.java | 12 -- ...EcoreTerminalsTestLanguageFactoryImpl.java | 2 + ...EcoreTerminalsTestLanguagePackageImpl.java | 11 +- .../impl/ModelImpl.java | 5 +- .../HidingHiddens.java | 8 - .../InheritingHiddens.java | 8 - .../InheritingHiddensCall.java | 4 - .../hiddenTerminalsTestLanguage/Model.java | 4 - .../OverridingHiddens.java | 4 - .../OverridingHiddensCall.java | 8 - .../WithoutHiddens.java | 4 - ...iddenTerminalsTestLanguageFactoryImpl.java | 10 + ...iddenTerminalsTestLanguagePackageImpl.java | 26 ++- .../impl/HidingHiddensImpl.java | 6 +- .../impl/InheritingHiddensCallImpl.java | 4 +- .../impl/InheritingHiddensImpl.java | 4 + .../impl/ModelImpl.java | 4 +- .../impl/OverridingHiddensCallImpl.java | 5 +- .../impl/OverridingHiddensImpl.java | 2 + .../impl/WithoutHiddensImpl.java | 3 +- .../terminalRulesTestLanguage/Model.java | 32 ---- .../impl/ModelImpl.java | 18 +- .../TerminalRulesTestLanguageFactoryImpl.java | 2 + .../TerminalRulesTestLanguagePackageImpl.java | 16 +- .../terminalrules/unicode/AbstractString.java | 4 - .../parser/terminalrules/unicode/Model.java | 4 - .../unicode/impl/AbstractStringImpl.java | 4 +- .../terminalrules/unicode/impl/ModelImpl.java | 1 + .../unicode/impl/UnicodeFactoryImpl.java | 5 + .../unicode/impl/UnicodePackageImpl.java | 13 +- .../AbstractElement.java | 4 - .../AbstractMetamodelDeclaration.java | 8 - .../AbstractNegatedToken.java | 4 - .../AbstractRule.java | 12 -- .../xtextTerminalsTestLanguage/Action.java | 12 -- .../Alternatives.java | 4 - .../Assignment.java | 12 -- .../CharacterRange.java | 8 - .../CrossReference.java | 8 - .../EnumLiteralDeclaration.java | 8 - .../GeneratedMetamodel.java | 4 - .../xtextTerminalsTestLanguage/Grammar.java | 24 --- .../xtextTerminalsTestLanguage/Group.java | 4 - .../xtextTerminalsTestLanguage/Keyword.java | 4 - .../ParserRule.java | 8 - .../xtextTerminalsTestLanguage/RuleCall.java | 4 - .../xtextTerminalsTestLanguage/TypeRef.java | 8 - .../impl/AbstractElementImpl.java | 4 +- .../AbstractMetamodelDeclarationImpl.java | 6 +- .../impl/AbstractNegatedTokenImpl.java | 2 + .../impl/AbstractRuleImpl.java | 8 +- .../impl/ActionImpl.java | 8 +- .../impl/AlternativesImpl.java | 1 + .../impl/AssignmentImpl.java | 8 +- .../impl/CharacterRangeImpl.java | 4 + .../impl/CrossReferenceImpl.java | 4 + .../impl/EnumLiteralDeclarationImpl.java | 4 + .../impl/GeneratedMetamodelImpl.java | 4 +- .../impl/GrammarImpl.java | 10 +- .../impl/GroupImpl.java | 1 + .../impl/KeywordImpl.java | 4 +- .../impl/ParserRuleImpl.java | 5 +- .../impl/RuleCallImpl.java | 2 + .../impl/TypeRefImpl.java | 4 + ...XtextTerminalsTestLanguageFactoryImpl.java | 24 +++ ...XtextTerminalsTestLanguagePackageImpl.java | 64 ++++++- ...BacktrackingBug325745TestLanguage.genmodel | 2 +- .../UnorderedGroupsTestLanguage.genmodel | 2 +- .../DataType.java | 8 - .../Element.java | 12 -- .../Expression.java | 12 -- .../Model.java | 4 - .../SimpleTerm.java | 16 -- ...ckingBug325745TestLanguageFactoryImpl.java | 6 + ...ckingBug325745TestLanguagePackageImpl.java | 25 ++- .../impl/DataTypeImpl.java | 6 +- .../impl/ElementImpl.java | 8 +- .../impl/ExpressionImpl.java | 7 +- .../impl/ModelImpl.java | 1 + .../impl/SimpleTermImpl.java | 10 +- .../unorderedGroupsTestLanguage/Model.java | 44 ----- .../NestedModel.java | 8 - .../UnorderedSerialization.java | 24 --- .../impl/ModelImpl.java | 19 +- .../impl/NestedModelImpl.java | 6 +- ...norderedGroupsTestLanguageFactoryImpl.java | 4 + ...norderedGroupsTestLanguagePackageImpl.java | 29 ++- .../impl/UnorderedSerializationImpl.java | 12 +- .../formatter/FormatterTestLanguage.genmodel | 2 +- .../formatter/FormatterTestLanguage2.genmodel | 2 +- .../formattertestlanguage/Assign.java | 12 -- .../formattertestlanguage/Datatypes.java | 12 -- .../formatter/formattertestlanguage/Decl.java | 8 - .../formattertestlanguage/Enum1.java | 15 +- .../formattertestlanguage/Enumeration.java | 4 - .../formattertestlanguage/FqnObj.java | 4 - .../formattertestlanguage/FqnRef.java | 4 - .../formatter/formattertestlanguage/Meth.java | 8 - .../formattertestlanguage/Param.java | 8 - .../formattertestlanguage/Space.java | 4 - .../SuppressedHidden.java | 4 - .../SuppressedHiddenSub.java | 4 - .../TestIndentation.java | 8 - .../formattertestlanguage/TestLinewrap.java | 4 - .../TestLinewrapMinMax.java | 4 - .../WrappingDataTypeTest.java | 4 - .../impl/AssignImpl.java | 7 +- .../impl/DatatypesImpl.java | 8 +- .../formattertestlanguage/impl/DeclImpl.java | 4 +- .../impl/EnumerationImpl.java | 3 +- .../FormattertestlanguageFactoryImpl.java | 20 ++ .../FormattertestlanguagePackageImpl.java | 50 ++++- .../impl/FqnObjImpl.java | 4 +- .../impl/FqnRefImpl.java | 2 + .../formattertestlanguage/impl/MethImpl.java | 5 +- .../formattertestlanguage/impl/ParamImpl.java | 4 +- .../formattertestlanguage/impl/SpaceImpl.java | 4 +- .../impl/SuppressedHiddenImpl.java | 1 + .../impl/SuppressedHiddenSubImpl.java | 4 +- .../impl/TestIndentationImpl.java | 5 +- .../impl/TestLinewrapImpl.java | 1 + .../impl/TestLinewrapMinMaxImpl.java | 1 + .../impl/WrappingDataTypeTestImpl.java | 4 +- .../formattertestlanguage2/Root.java | 4 - .../Formattertestlanguage2FactoryImpl.java | 2 + .../Formattertestlanguage2PackageImpl.java | 9 +- .../formattertestlanguage2/impl/RootImpl.java | 4 +- .../xtext/parsetree/impl/Bug305397.genmodel | 2 +- .../CommentAssociationTestLanguage.genmodel | 2 +- .../parsetree/impl/bug305397/Element.java | 12 -- .../xtext/parsetree/impl/bug305397/Model.java | 4 - .../bug305397/impl/Bug305397FactoryImpl.java | 3 + .../bug305397/impl/Bug305397PackageImpl.java | 13 +- .../impl/bug305397/impl/ElementImpl.java | 7 +- .../impl/bug305397/impl/ModelImpl.java | 1 + .../impl/commentAssociation/Element.java | 8 - .../impl/commentAssociation/Model.java | 4 - .../impl/CommentAssociationFactoryImpl.java | 3 + .../impl/CommentAssociationPackageImpl.java | 12 +- .../commentAssociation/impl/ElementImpl.java | 6 +- .../commentAssociation/impl/ModelImpl.java | 1 + .../reconstr/Bug299395TestLanguage.genmodel | 2 +- .../reconstr/Bug302128TestLanguage.genmodel | 2 +- .../ComplexReconstrTestLanguage.genmodel | 2 +- ...erializationBug269362TestLanguage.genmodel | 2 +- .../SerializationErrorTestLanguage.genmodel | 2 +- .../parsetree/reconstr/bug299395/Model.java | 16 -- .../reconstr/bug299395/SubModel.java | 4 - .../bug299395/impl/Bug299395FactoryImpl.java | 3 + .../bug299395/impl/Bug299395PackageImpl.java | 14 +- .../reconstr/bug299395/impl/ModelImpl.java | 7 +- .../reconstr/bug299395/impl/SubModelImpl.java | 3 +- .../parsetree/reconstr/bug302128/Element.java | 8 - .../parsetree/reconstr/bug302128/Model.java | 4 - .../bug302128/impl/Bug302128FactoryImpl.java | 3 + .../bug302128/impl/Bug302128PackageImpl.java | 12 +- .../reconstr/bug302128/impl/ElementImpl.java | 6 +- .../reconstr/bug302128/impl/ModelImpl.java | 1 + .../reconstr/complexrewritetest/Add.java | 4 - .../reconstr/complexrewritetest/Atom.java | 4 - .../reconstr/complexrewritetest/C1.java | 4 - .../reconstr/complexrewritetest/C2.java | 4 - .../reconstr/complexrewritetest/C3.java | 4 - .../complexrewritetest/Expression.java | 4 - .../reconstr/complexrewritetest/Minus.java | 4 - .../reconstr/complexrewritetest/TrickyB.java | 8 - .../reconstr/complexrewritetest/TrickyC.java | 4 - .../reconstr/complexrewritetest/TrickyD.java | 12 -- .../reconstr/complexrewritetest/TrickyE.java | 12 -- .../reconstr/complexrewritetest/TrickyF.java | 8 - .../reconstr/complexrewritetest/TrickyG.java | 4 - .../reconstr/complexrewritetest/TrickyG1.java | 4 - .../reconstr/complexrewritetest/TrickyG2.java | 4 - .../complexrewritetest/impl/AddImpl.java | 1 + .../complexrewritetest/impl/AtomImpl.java | 4 +- .../complexrewritetest/impl/C1Impl.java | 2 + .../complexrewritetest/impl/C2Impl.java | 2 + .../complexrewritetest/impl/C3Impl.java | 2 + .../impl/ComplexrewritetestFactoryImpl.java | 17 ++ .../impl/ComplexrewritetestPackageImpl.java | 44 ++++- .../impl/ExpressionImpl.java | 4 +- .../complexrewritetest/impl/MinusImpl.java | 1 + .../complexrewritetest/impl/TrickyBImpl.java | 5 +- .../complexrewritetest/impl/TrickyCImpl.java | 4 +- .../complexrewritetest/impl/TrickyDImpl.java | 6 +- .../complexrewritetest/impl/TrickyEImpl.java | 5 +- .../complexrewritetest/impl/TrickyFImpl.java | 4 +- .../complexrewritetest/impl/TrickyG1Impl.java | 1 + .../complexrewritetest/impl/TrickyG2Impl.java | 4 +- .../complexrewritetest/impl/TrickyGImpl.java | 2 + .../Model.java | 8 - .../impl/ModelImpl.java | 6 +- ...ationBug269362TestLanguageFactoryImpl.java | 2 + ...ationBug269362TestLanguagePackageImpl.java | 10 +- .../reconstr/serializationerror/Indent.java | 12 -- .../reconstr/serializationerror/Model.java | 4 - .../serializationerror/TwoOptions.java | 8 - .../serializationerror/TwoRequired.java | 8 - .../serializationerror/impl/IndentImpl.java | 5 + .../serializationerror/impl/ModelImpl.java | 2 + .../impl/SerializationerrorFactoryImpl.java | 6 + .../impl/SerializationerrorPackageImpl.java | 20 +- .../impl/TwoOptionsImpl.java | 6 +- .../impl/TwoRequiredImpl.java | 6 +- ...ionErrorTestLanguageSemanticSequencer.java | 2 +- .../TransientValuesTest.genmodel | 2 +- .../transientvaluestest/TestList.java | 4 - .../transientvaluestest/TestOptional.java | 8 - .../transientvaluestest/TestRequired.java | 8 - .../impl/TestListImpl.java | 3 +- .../impl/TestOptionalImpl.java | 6 +- .../impl/TestRequiredImpl.java | 6 +- .../impl/TransientvaluestestFactoryImpl.java | 5 + .../impl/TransientvaluestestPackageImpl.java | 16 +- .../UnassignedTextTestLanguage.genmodel | 2 +- .../CaseInsensitiveKeywordRule.java | 4 - .../unassignedtext/CommonTerminalsRule.java | 4 - .../unassignedtext/DatatypeRule.java | 4 - .../unassignedtext/MultiRule.java | 4 - .../unassignedtext/PluralRule.java | 4 - .../impl/CaseInsensitiveKeywordRuleImpl.java | 4 +- .../impl/CommonTerminalsRuleImpl.java | 4 +- .../unassignedtext/impl/DatatypeRuleImpl.java | 4 +- .../unassignedtext/impl/MultiRuleImpl.java | 4 +- .../unassignedtext/impl/PluralRuleImpl.java | 4 +- .../impl/UnassignedtextFactoryImpl.java | 8 + .../impl/UnassignedtextPackageImpl.java | 19 +- .../eclipse/xtext/resource/Bug385636.genmodel | 2 +- .../EObjectAtOffsetTestLanguage.genmodel | 2 +- ...erBuilderIntegerationTestLanguage.genmodel | 2 +- .../LiveContainerTestLanguage.genmodel | 2 +- .../LocationProviderTestLanguage.genmodel | 2 +- .../resource/bug385636/DefineVariable.java | 4 - .../resource/bug385636/DefineVariables.java | 4 - .../resource/bug385636/Expression_Equal.java | 8 - .../bug385636/Expression_Larger_Equal.java | 8 - .../bug385636/Expression_Not_Equal.java | 8 - .../bug385636/Expression_Not_Greater.java | 8 - .../bug385636/Expression_Not_Less.java | 8 - .../bug385636/Expression_Smaller.java | 8 - .../bug385636/Expression_Smaller_Equal.java | 8 - .../bug385636/Expression_VariableName.java | 4 - .../resource/bug385636/NVariableAccess.java | 4 - .../xtext/resource/bug385636/Program.java | 8 - .../bug385636/impl/Bug385636FactoryImpl.java | 14 ++ .../bug385636/impl/Bug385636PackageImpl.java | 40 +++- .../bug385636/impl/DefineVariableImpl.java | 4 +- .../bug385636/impl/DefineVariablesImpl.java | 1 + .../bug385636/impl/Expression_EqualImpl.java | 4 + .../impl/Expression_Larger_EqualImpl.java | 4 + .../impl/Expression_Not_EqualImpl.java | 4 + .../impl/Expression_Not_GreaterImpl.java | 4 + .../impl/Expression_Not_LessImpl.java | 4 + .../impl/Expression_SmallerImpl.java | 4 + .../impl/Expression_Smaller_EqualImpl.java | 4 + .../impl/Expression_VariableNameImpl.java | 2 + .../bug385636/impl/NVariableAccessImpl.java | 2 + .../resource/bug385636/impl/ProgramImpl.java | 3 + .../AbstractBar.java | 4 - .../eObjectAtOffsetTestLanguage/Bar.java | 4 - .../eObjectAtOffsetTestLanguage/Foo.java | 4 - .../eObjectAtOffsetTestLanguage/FooBar.java | 4 - .../eObjectAtOffsetTestLanguage/Model.java | 8 - .../impl/AbstractBarImpl.java | 1 + .../impl/BarImpl.java | 4 +- ...ObjectAtOffsetTestLanguageFactoryImpl.java | 6 + ...ObjectAtOffsetTestLanguagePackageImpl.java | 18 +- .../impl/FooBarImpl.java | 2 + .../impl/FooImpl.java | 4 +- .../impl/ModelImpl.java | 2 + .../Model.java | 4 - ...erIntegerationTestLanguageFactoryImpl.java | 2 + ...erIntegerationTestLanguagePackageImpl.java | 9 +- .../impl/ModelImpl.java | 4 +- .../liveContainerTestLanguage/Model.java | 4 - .../LiveContainerTestLanguageFactoryImpl.java | 2 + .../LiveContainerTestLanguagePackageImpl.java | 9 +- .../impl/ModelImpl.java | 4 +- .../resource/locationprovidertest/Bus.java | 4 - .../locationprovidertest/Component.java | 12 -- .../resource/locationprovidertest/Data.java | 4 - .../locationprovidertest/Element.java | 12 -- .../resource/locationprovidertest/Mode.java | 4 - .../resource/locationprovidertest/Model.java | 8 - .../resource/locationprovidertest/Port.java | 4 - .../locationprovidertest/Processor.java | 4 - .../locationprovidertest/Transition.java | 12 -- .../locationprovidertest/impl/BusImpl.java | 1 + .../impl/ComponentImpl.java | 6 +- .../locationprovidertest/impl/DataImpl.java | 4 +- .../impl/ElementImpl.java | 7 +- .../impl/LocationprovidertestFactoryImpl.java | 10 + .../impl/LocationprovidertestPackageImpl.java | 32 +++- .../locationprovidertest/impl/ModeImpl.java | 4 +- .../locationprovidertest/impl/ModelImpl.java | 2 + .../locationprovidertest/impl/PortImpl.java | 4 +- .../impl/ProcessorImpl.java | 1 + .../impl/TransitionImpl.java | 8 +- .../AssignmentFinderTestLanguage.genmodel | 2 +- .../ContextFinderTestLanguage.genmodel | 2 +- .../HiddenTokenSequencerTestLanguage.genmodel | 2 +- .../serializer/SequencerTestLanguage.genmodel | 2 +- .../SyntacticSequencerTestLanguage.genmodel | 2 +- .../assignmentFinderTest/ContainmentRef.java | 4 - .../assignmentFinderTest/ContainmentRefN.java | 8 - .../assignmentFinderTest/CrossRef.java | 8 - .../assignmentFinderTest/EnumBool.java | 4 - .../assignmentFinderTest/EnumVal.java | 4 - .../assignmentFinderTest/KeywordBool.java | 4 - .../assignmentFinderTest/KeywordVal.java | 4 - .../assignmentFinderTest/MixedBool.java | 4 - .../assignmentFinderTest/MixedValue.java | 4 - .../assignmentFinderTest/Model.java | 40 ---- .../assignmentFinderTest/TerminalBool.java | 4 - .../assignmentFinderTest/TerminalVal.java | 4 - .../assignmentFinderTest/TestEnum.java | 15 +- .../impl/AssignmentFinderTestFactoryImpl.java | 13 ++ .../impl/AssignmentFinderTestPackageImpl.java | 43 ++++- .../impl/ContainmentRefImpl.java | 2 + .../impl/ContainmentRefNImpl.java | 6 +- .../impl/CrossRefImpl.java | 6 +- .../impl/EnumBoolImpl.java | 4 +- .../impl/EnumValImpl.java | 4 +- .../impl/KeywordBoolImpl.java | 4 +- .../impl/KeywordValImpl.java | 4 +- .../impl/MixedBoolImpl.java | 4 +- .../impl/MixedValueImpl.java | 4 +- .../assignmentFinderTest/impl/ModelImpl.java | 20 ++ .../impl/TerminalBoolImpl.java | 4 +- .../impl/TerminalValImpl.java | 4 +- .../AttributeExclusionTest.java | 8 - .../serializer/contextFinderTest/Model.java | 40 ---- .../contextFinderTest/NestedTypeChild.java | 4 - .../NestedTypeRecursiveTest.java | 4 - .../contextFinderTest/NestedTypeTest.java | 4 - .../contextFinderTest/NodeExclusion.java | 4 - .../contextFinderTest/NodeExclusionList.java | 4 - .../contextFinderTest/ParentRefTest1.java | 4 - .../contextFinderTest/ParentRefTest2.java | 4 - .../contextFinderTest/ParentRefTestChild.java | 4 - .../QuantityExclusionTest.java | 8 - .../contextFinderTest/ValueExclusionTest.java | 4 - .../ValueExclusionTestEn.java | 15 +- .../impl/AttributeExclusionTestImpl.java | 6 +- .../impl/ContextFinderTestFactoryImpl.java | 17 ++ .../impl/ContextFinderTestPackageImpl.java | 47 ++++- .../contextFinderTest/impl/ModelImpl.java | 22 ++- .../impl/NestedTypeChildImpl.java | 4 +- .../impl/NestedTypeRecursiveTestImpl.java | 2 + .../impl/NestedTypeTestImpl.java | 2 + .../impl/NodeExclusionImpl.java | 2 + .../impl/NodeExclusionListImpl.java | 1 + .../impl/ParentRefTest1Impl.java | 2 + .../impl/ParentRefTest2Impl.java | 2 + .../impl/ParentRefTestChildImpl.java | 2 + .../impl/QuantityExclusionTestImpl.java | 6 +- .../impl/ValueExclusionTestImpl.java | 4 +- .../hiddentokensequencertest/DomainModel.java | 4 - .../hiddentokensequencertest/Entity.java | 8 - .../hiddentokensequencertest/Model.java | 4 - .../impl/DomainModelImpl.java | 1 + .../impl/EntityImpl.java | 6 +- .../HiddentokensequencertestFactoryImpl.java | 4 + .../HiddentokensequencertestPackageImpl.java | 14 +- .../impl/ModelImpl.java | 2 + .../serializer/sequencertest/AltList1.java | 16 -- .../serializer/sequencertest/AltList2.java | 12 -- .../AlternativeMultiplicities.java | 24 --- .../serializer/sequencertest/Complex1.java | 24 --- .../serializer/sequencertest/DefEnum.java | 15 +- .../serializer/sequencertest/Delegation.java | 8 - .../serializer/sequencertest/DelegationA.java | 8 - .../sequencertest/DependentAlternative1.java | 8 - .../sequencertest/DependentAlternative2.java | 8 - .../sequencertest/FragmentCallerType.java | 12 -- .../sequencertest/GroupMultiplicities.java | 28 --- .../xtext/serializer/sequencertest/List1.java | 4 - .../xtext/serializer/sequencertest/List2.java | 4 - .../xtext/serializer/sequencertest/Model.java | 128 ------------- .../sequencertest/MultiKeywords.java | 4 - .../sequencertest/MultiKeywordsOrID.java | 4 - .../sequencertest/MultiTerminals.java | 4 - .../sequencertest/NullCrossRef.java | 8 - .../serializer/sequencertest/NullValue.java | 8 - .../serializer/sequencertest/Optional.java | 12 -- .../sequencertest/OptionalDouble.java | 12 -- .../sequencertest/ParameterCaller.java | 4 - .../sequencertest/ParameterDelegation.java | 4 - .../sequencertest/Parameterized.java | 12 -- .../sequencertest/SimpleAlternative.java | 8 - .../serializer/sequencertest/SimpleGroup.java | 8 - .../sequencertest/SimpleMultiplicities.java | 16 -- .../SingleContainmentReference.java | 4 - .../SingleContainmentReferenceChild1.java | 4 - .../SingleContainmentReferenceChild2.java | 4 - .../SingleContainmentReferenceChild3.java | 4 - .../sequencertest/SingleCrossReference.java | 8 - .../serializer/sequencertest/SingleEnum.java | 4 - .../sequencertest/SingleKeywords.java | 4 - .../sequencertest/SingleKeywordsOrID.java | 4 - .../sequencertest/SingleTerminals.java | 4 - .../sequencertest/UnorderedAlternative.java | 16 -- .../UnorderedAlternativeVal.java | 4 - .../UnorderedAlternativeVal2.java | 4 - .../sequencertest/UnorderedGroup.java | 16 -- .../sequencertest/UnorderedGroupBoolean.java | 12 -- .../sequencertest/UnorderedGroupOptional.java | 12 -- .../sequencertest/UnorderedGroupVal.java | 4 - .../sequencertest/UnorderedGroupVal2.java | 4 - .../sequencertest/impl/AltList1Impl.java | 10 +- .../sequencertest/impl/AltList2Impl.java | 7 +- .../impl/AlternativeMultiplicitiesImpl.java | 10 +- .../sequencertest/impl/Complex1Impl.java | 10 +- .../sequencertest/impl/DelegationAImpl.java | 4 + .../sequencertest/impl/DelegationImpl.java | 6 +- .../impl/DependentAlternative1Impl.java | 6 +- .../impl/DependentAlternative2Impl.java | 5 +- .../impl/FragmentCallerTypeImpl.java | 8 +- .../impl/GroupMultiplicitiesImpl.java | 12 +- .../sequencertest/impl/List1Impl.java | 3 +- .../sequencertest/impl/List2Impl.java | 3 +- .../sequencertest/impl/ModelImpl.java | 64 +++++++ .../sequencertest/impl/MultiKeywordsImpl.java | 3 +- .../impl/MultiKeywordsOrIDImpl.java | 3 +- .../impl/MultiTerminalsImpl.java | 3 +- .../sequencertest/impl/NullCrossRefImpl.java | 6 +- .../sequencertest/impl/NullValueImpl.java | 6 +- .../impl/OptionalDoubleImpl.java | 8 +- .../sequencertest/impl/OptionalImpl.java | 8 +- .../impl/ParameterCallerImpl.java | 2 + .../impl/ParameterDelegationImpl.java | 2 + .../sequencertest/impl/ParameterizedImpl.java | 8 +- .../impl/SequencertestFactoryImpl.java | 47 +++++ .../impl/SequencertestPackageImpl.java | 179 +++++++++++++++++- .../impl/SimpleAlternativeImpl.java | 6 +- .../sequencertest/impl/SimpleGroupImpl.java | 6 +- .../impl/SimpleMultiplicitiesImpl.java | 8 +- .../SingleContainmentReferenceChild1Impl.java | 4 +- .../SingleContainmentReferenceChild2Impl.java | 4 +- .../SingleContainmentReferenceChild3Impl.java | 4 +- .../impl/SingleContainmentReferenceImpl.java | 2 + .../impl/SingleCrossReferenceImpl.java | 6 +- .../sequencertest/impl/SingleEnumImpl.java | 4 +- .../impl/SingleKeywordsImpl.java | 4 +- .../impl/SingleKeywordsOrIDImpl.java | 4 +- .../impl/SingleTerminalsImpl.java | 4 +- .../impl/UnorderedAlternativeImpl.java | 6 +- .../impl/UnorderedAlternativeVal2Impl.java | 4 +- .../impl/UnorderedAlternativeValImpl.java | 4 +- .../impl/UnorderedGroupBooleanImpl.java | 8 +- .../impl/UnorderedGroupImpl.java | 10 +- .../impl/UnorderedGroupOptionalImpl.java | 8 +- .../impl/UnorderedGroupVal2Impl.java | 4 +- .../impl/UnorderedGroupValImpl.java | 4 +- .../syntacticsequencertest/Add0.java | 8 - .../syntacticsequencertest/Add1.java | 8 - .../syntacticsequencertest/Add2.java | 8 - .../AlternativeTransition.java | 4 - .../BooleanAlternative.java | 4 - .../BooleanAlternativeLiteral.java | 4 - .../syntacticsequencertest/BooleanValues.java | 12 -- .../syntacticsequencertest/Bug398890.java | 4 - .../FragmentCallerType.java | 12 -- .../LongAlternative.java | 36 ---- .../MandatoryKeywords.java | 12 -- .../MandatoryManyTransition.java | 4 - .../syntacticsequencertest/Model.java | 64 ------- .../syntacticsequencertest/Mult2.java | 8 - .../OptionalManyTransition.java | 4 - .../OptionalSingleTransition.java | 4 - .../SingleCrossReference.java | 20 -- .../UnassignedDatatype.java | 4 - .../syntacticsequencertest/Val0.java | 4 - .../syntacticsequencertest/Val1.java | 4 - .../syntacticsequencertest/Val2.java | 4 - .../syntacticsequencertest/impl/Add0Impl.java | 4 + .../syntacticsequencertest/impl/Add1Impl.java | 4 + .../syntacticsequencertest/impl/Add2Impl.java | 4 + .../impl/AlternativeTransitionImpl.java | 4 +- .../impl/BooleanAlternativeImpl.java | 2 + .../impl/BooleanAlternativeLiteralImpl.java | 4 +- .../impl/BooleanValuesImpl.java | 8 +- .../impl/Bug398890Impl.java | 4 +- .../impl/FragmentCallerTypeImpl.java | 8 +- .../impl/LongAlternativeImpl.java | 12 +- .../impl/MandatoryKeywordsImpl.java | 8 +- .../impl/MandatoryManyTransitionImpl.java | 4 +- .../impl/ModelImpl.java | 32 ++++ .../impl/Mult2Impl.java | 4 + .../impl/OptionalManyTransitionImpl.java | 4 +- .../impl/OptionalSingleTransitionImpl.java | 4 +- .../impl/SingleCrossReferenceImpl.java | 12 +- .../SyntacticsequencertestFactoryImpl.java | 26 +++ .../SyntacticsequencertestPackageImpl.java | 90 ++++++++- .../impl/UnassignedDatatypeImpl.java | 4 +- .../syntacticsequencertest/impl/Val0Impl.java | 4 +- .../syntacticsequencertest/impl/Val1Impl.java | 4 +- .../syntacticsequencertest/impl/Val2Impl.java | 4 +- .../testlanguages/ActionTestLanguage.genmodel | 2 +- .../ActionTestLanguage2.genmodel | 2 +- .../FowlerDslTestLanguage.genmodel | 2 +- .../LookaheadTestLanguage.genmodel | 2 +- .../OptionalEmptyTestLanguage.genmodel | 2 +- .../PartialParserTestLanguage.genmodel | 2 +- .../ReferenceGrammarTestLanguage.genmodel | 2 +- .../SimpleExpressionsTestLanguage.genmodel | 2 +- .../xtext/testlanguages/TestLanguage.genmodel | 2 +- .../testlanguages/TreeTestLanguage.genmodel | 2 +- .../xtext/testlanguages/actionLang/Child.java | 4 - .../testlanguages/actionLang/Parent.java | 8 - .../impl/ActionLangFactoryImpl.java | 4 + .../impl/ActionLangPackageImpl.java | 13 +- .../actionLang/impl/ChildImpl.java | 4 +- .../actionLang/impl/ParentImpl.java | 4 + .../testlanguages/actionLang2/ORing.java | 4 - .../testlanguages/actionLang2/Value.java | 4 - .../impl/ActionLang2FactoryImpl.java | 3 + .../impl/ActionLang2PackageImpl.java | 11 +- .../actionLang2/impl/ORingImpl.java | 1 + .../actionLang2/impl/ValueImpl.java | 4 +- .../testlanguages/fowlerdsl/Command.java | 8 - .../xtext/testlanguages/fowlerdsl/Event.java | 12 -- .../xtext/testlanguages/fowlerdsl/State.java | 12 -- .../testlanguages/fowlerdsl/Statemachine.java | 12 -- .../testlanguages/fowlerdsl/Transition.java | 8 - .../fowlerdsl/impl/CommandImpl.java | 6 +- .../fowlerdsl/impl/EventImpl.java | 8 +- .../fowlerdsl/impl/FowlerdslFactoryImpl.java | 6 + .../fowlerdsl/impl/FowlerdslPackageImpl.java | 25 ++- .../fowlerdsl/impl/StateImpl.java | 6 +- .../fowlerdsl/impl/StatemachineImpl.java | 3 + .../fowlerdsl/impl/TransitionImpl.java | 4 + .../IndentationAwareTestLanguage.genmodel | 2 +- .../testlanguages/indent/indentLang/Node.java | 8 - .../indent/indentLang/NodeList.java | 4 - .../impl/IndentLangFactoryImpl.java | 3 + .../impl/IndentLangPackageImpl.java | 12 +- .../indent/indentLang/impl/NodeImpl.java | 6 +- .../indent/indentLang/impl/NodeListImpl.java | 1 + .../testlanguages/lookaheadLang/Alts.java | 4 - .../testlanguages/lookaheadLang/Entry.java | 4 - .../lookaheadLang/LookAhead1.java | 8 - .../lookaheadLang/LookAhead2.java | 4 - .../lookaheadLang/LookAhead3.java | 4 - .../lookaheadLang/LookAhead4.java | 4 - .../lookaheadLang/impl/AltsImpl.java | 4 +- .../lookaheadLang/impl/EntryImpl.java | 1 + .../lookaheadLang/impl/LookAhead1Impl.java | 6 +- .../lookaheadLang/impl/LookAhead2Impl.java | 4 +- .../lookaheadLang/impl/LookAhead3Impl.java | 2 + .../lookaheadLang/impl/LookAhead4Impl.java | 4 +- .../impl/LookaheadLangFactoryImpl.java | 8 + .../impl/LookaheadLangPackageImpl.java | 21 +- .../testlanguages/optionalEmpty/Greeting.java | 4 - .../testlanguages/optionalEmpty/Model.java | 4 - .../optionalEmpty/impl/GreetingImpl.java | 4 +- .../optionalEmpty/impl/ModelImpl.java | 2 + .../impl/OptionalEmptyFactoryImpl.java | 3 + .../impl/OptionalEmptyPackageImpl.java | 11 +- .../AbstractChild.java | 4 - .../AbstractChildren.java | 4 - .../partialParserTestLanguage/Child.java | 4 - .../partialParserTestLanguage/Children.java | 4 - .../FirstConcrete.java | 4 - .../partialParserTestLanguage/Named.java | 4 - .../partialParserTestLanguage/Nested.java | 4 - .../SecondConcrete.java | 4 - .../SomeContainer.java | 12 -- .../impl/AbstractChildImpl.java | 2 + .../impl/AbstractChildrenImpl.java | 1 + .../impl/ChildImpl.java | 2 + .../impl/ChildrenImpl.java | 1 + .../impl/FirstConcreteImpl.java | 2 + .../impl/NamedImpl.java | 4 +- .../impl/NestedImpl.java | 1 + .../PartialParserTestLanguageFactoryImpl.java | 11 ++ .../PartialParserTestLanguagePackageImpl.java | 28 ++- .../impl/SecondConcreteImpl.java | 1 + .../impl/SomeContainerImpl.java | 6 +- .../referenceGrammar/Familie.java | 16 -- .../testlanguages/referenceGrammar/Farbe.java | 4 - .../referenceGrammar/Person.java | 8 - .../referenceGrammar/Spielplatz.java | 24 --- .../referenceGrammar/Spielzeug.java | 8 - .../referenceGrammar/impl/FamilieImpl.java | 9 +- .../referenceGrammar/impl/FarbeImpl.java | 4 +- .../referenceGrammar/impl/PersonImpl.java | 6 +- .../impl/ReferenceGrammarFactoryImpl.java | 8 + .../impl/ReferenceGrammarPackageImpl.java | 29 ++- .../referenceGrammar/impl/SpielplatzImpl.java | 10 +- .../referenceGrammar/impl/SpielzeugImpl.java | 6 +- .../testlanguages/simpleExpressions/Atom.java | 4 - .../testlanguages/simpleExpressions/Op.java | 8 - .../simpleExpressions/Sequence.java | 4 - .../simpleExpressions/impl/AtomImpl.java | 4 +- .../simpleExpressions/impl/OpImpl.java | 5 +- .../simpleExpressions/impl/SequenceImpl.java | 1 + .../impl/SimpleExpressionsFactoryImpl.java | 5 + .../impl/SimpleExpressionsPackageImpl.java | 15 +- .../testlanguages/testLang/ChoiceElement.java | 8 - .../xtext/testlanguages/testLang/Model.java | 4 - .../testLang/ReducibleComposite.java | 4 - .../testLang/TerminalElement.java | 4 - .../testLang/impl/ChoiceElementImpl.java | 6 +- .../testLang/impl/ModelImpl.java | 1 + .../testLang/impl/ReducibleCompositeImpl.java | 1 + .../testLang/impl/TerminalElementImpl.java | 4 +- .../testLang/impl/TestLangFactoryImpl.java | 7 + .../testLang/impl/TestLangPackageImpl.java | 18 +- .../testlanguages/treeTestLanguage/Model.java | 4 - .../testlanguages/treeTestLanguage/Node.java | 12 -- .../treeTestLanguage/impl/ModelImpl.java | 1 + .../treeTestLanguage/impl/NodeImpl.java | 7 +- .../impl/TreeTestLanguageFactoryImpl.java | 3 + .../impl/TreeTestLanguagePackageImpl.java | 13 +- ...creteSyntaxValidationTestLanguage.genmodel | 2 +- .../validation/csvalidationtest/AltList1.java | 16 -- .../validation/csvalidationtest/AltList2.java | 12 -- .../AlternativeMultiplicities.java | 24 --- .../csvalidationtest/AssignedAction.java | 12 -- .../csvalidationtest/Combination1.java | 16 -- .../csvalidationtest/Combination2.java | 16 -- .../csvalidationtest/Combination3.java | 12 -- .../csvalidationtest/Combination4.java | 12 -- .../csvalidationtest/GroupMultiplicities.java | 28 --- .../csvalidationtest/Heuristic1.java | 12 -- .../validation/csvalidationtest/List1.java | 4 - .../validation/csvalidationtest/List2.java | 4 - .../validation/csvalidationtest/List3.java | 8 - .../validation/csvalidationtest/List4.java | 8 - .../validation/csvalidationtest/List5.java | 12 -- .../validation/csvalidationtest/Model.java | 112 ----------- .../csvalidationtest/SimpleAlternative.java | 8 - .../csvalidationtest/SimpleGroup.java | 8 - .../SimpleMultiplicities.java | 16 -- .../StaticSimplification.java | 12 -- .../csvalidationtest/TransientObject.java | 8 - .../csvalidationtest/TransientObjectSub.java | 8 - .../TransientSerializeables1.java | 16 -- .../TransientSerializeables1Enum.java | 11 +- .../csvalidationtest/TwoVersion.java | 32 ---- .../csvalidationtest/UnassignedAction1.java | 8 - .../UnassignedAction2Sub.java | 8 - .../csvalidationtest/UnassignedAction3.java | 8 - .../UnassignedRuleCall1Sub.java | 8 - .../UnassignedRuleCall2Sub.java | 4 - .../csvalidationtest/impl/AltList1Impl.java | 10 +- .../csvalidationtest/impl/AltList2Impl.java | 7 +- .../impl/AlternativeMultiplicitiesImpl.java | 10 +- .../impl/AssignedActionImpl.java | 8 +- .../impl/Combination1Impl.java | 10 +- .../impl/Combination2Impl.java | 8 +- .../impl/Combination3Impl.java | 8 +- .../impl/Combination4Impl.java | 5 +- .../impl/CsvalidationtestFactoryImpl.java | 37 ++++ .../impl/CsvalidationtestPackageImpl.java | 157 ++++++++++++++- .../impl/GroupMultiplicitiesImpl.java | 12 +- .../csvalidationtest/impl/Heuristic1Impl.java | 5 +- .../csvalidationtest/impl/List1Impl.java | 3 +- .../csvalidationtest/impl/List2Impl.java | 3 +- .../csvalidationtest/impl/List3Impl.java | 5 +- .../csvalidationtest/impl/List4Impl.java | 5 +- .../csvalidationtest/impl/List5Impl.java | 7 +- .../csvalidationtest/impl/ModelImpl.java | 56 ++++++ .../impl/SimpleAlternativeImpl.java | 6 +- .../impl/SimpleGroupImpl.java | 6 +- .../impl/SimpleMultiplicitiesImpl.java | 8 +- .../impl/StaticSimplificationImpl.java | 8 +- .../impl/TransientObjectImpl.java | 6 +- .../impl/TransientObjectSubImpl.java | 6 +- .../impl/TransientSerializeables1Impl.java | 10 +- .../csvalidationtest/impl/TwoVersionImpl.java | 17 +- .../impl/UnassignedAction1Impl.java | 6 +- .../impl/UnassignedAction2SubImpl.java | 6 +- .../impl/UnassignedAction3Impl.java | 6 +- .../impl/UnassignedRuleCall1SubImpl.java | 6 +- .../impl/UnassignedRuleCall2SubImpl.java | 4 +- .../xtext/valueconverter/Bug250313.genmodel | 2 +- .../QualifiedNameTestLanguage.genmodel | 2 +- .../xtext/valueconverter/bug250313/Child.java | 4 - .../xtext/valueconverter/bug250313/Model.java | 12 -- .../bug250313/impl/Bug250313FactoryImpl.java | 5 + .../bug250313/impl/Bug250313PackageImpl.java | 15 +- .../bug250313/impl/ChildImpl.java | 4 +- .../bug250313/impl/ModelImpl.java | 7 +- .../valueconverter/qualifiedName/Element.java | 4 - .../qualifiedName/impl/ElementImpl.java | 4 +- .../impl/QualifiedNameFactoryImpl.java | 2 + .../impl/QualifiedNamePackageImpl.java | 9 +- .../MultiValueFeatureTestLanguage.genmodel | 2 +- .../UnassignedRuleCallTestLanguage.genmodel | 2 +- .../multiValueFeatureTestLanguage/Start.java | 4 - ...tiValueFeatureTestLanguageFactoryImpl.java | 2 + ...tiValueFeatureTestLanguagePackageImpl.java | 9 +- .../impl/StartImpl.java | 3 +- .../unassignedRuleCallTestLanguage/Model.java | 4 - .../ModelFeatures.java | 4 - .../impl/ModelFeaturesImpl.java | 4 +- .../impl/ModelImpl.java | 2 + ...signedRuleCallTestLanguageFactoryImpl.java | 3 + ...signedRuleCallTestLanguagePackageImpl.java | 11 +- .../xtext/xtextTest/AbstractElement.java | 12 -- .../AbstractMetamodelDeclaration.java | 8 - .../xtext/xtextTest/AbstractNegatedToken.java | 4 - .../eclipse/xtext/xtextTest/AbstractRule.java | 12 -- .../org/eclipse/xtext/xtextTest/Action.java | 12 -- .../eclipse/xtext/xtextTest/Alternatives.java | 4 - .../eclipse/xtext/xtextTest/Assignment.java | 12 -- .../xtext/xtextTest/CharacterRange.java | 8 - .../xtext/xtextTest/ConditionalBranch.java | 12 -- .../xtext/xtextTest/CrossReference.java | 8 - .../xtextTest/EnumLiteralDeclaration.java | 8 - .../xtext/xtextTest/GeneratedMetamodel.java | 4 - .../org/eclipse/xtext/xtextTest/Grammar.java | 24 --- .../org/eclipse/xtext/xtextTest/Group.java | 4 - .../org/eclipse/xtext/xtextTest/Keyword.java | 4 - .../xtext/xtextTest/NamedArgument.java | 12 -- .../eclipse/xtext/xtextTest/Parameter.java | 4 - .../eclipse/xtext/xtextTest/ParserRule.java | 20 -- .../org/eclipse/xtext/xtextTest/RuleCall.java | 8 - .../eclipse/xtext/xtextTest/TerminalRule.java | 4 - .../org/eclipse/xtext/xtextTest/TypeRef.java | 8 - .../xtext/xtextTest/UnorderedGroup.java | 4 - .../xtextTest/impl/AbstractElementImpl.java | 8 +- .../AbstractMetamodelDeclarationImpl.java | 6 +- .../impl/AbstractNegatedTokenImpl.java | 2 + .../xtextTest/impl/AbstractRuleImpl.java | 8 +- .../xtext/xtextTest/impl/ActionImpl.java | 8 +- .../xtextTest/impl/AlternativesImpl.java | 1 + .../xtext/xtextTest/impl/AssignmentImpl.java | 8 +- .../xtextTest/impl/CharacterRangeImpl.java | 4 + .../xtextTest/impl/ConditionalBranchImpl.java | 8 +- .../xtextTest/impl/CrossReferenceImpl.java | 4 + .../impl/EnumLiteralDeclarationImpl.java | 4 + .../impl/GeneratedMetamodelImpl.java | 4 +- .../xtext/xtextTest/impl/GrammarImpl.java | 10 +- .../xtext/xtextTest/impl/GroupImpl.java | 1 + .../xtext/xtextTest/impl/KeywordImpl.java | 4 +- .../xtextTest/impl/NamedArgumentImpl.java | 8 +- .../xtext/xtextTest/impl/ParameterImpl.java | 4 +- .../xtext/xtextTest/impl/ParserRuleImpl.java | 10 +- .../xtext/xtextTest/impl/RuleCallImpl.java | 3 + .../xtextTest/impl/TerminalRuleImpl.java | 4 +- .../xtext/xtextTest/impl/TypeRefImpl.java | 4 + .../xtextTest/impl/UnorderedGroupImpl.java | 1 + .../xtextTest/impl/XtextTestFactoryImpl.java | 29 +++ .../xtextTest/impl/XtextTestPackageImpl.java | 84 +++++++- .../splitting/SimpleExpressions.genmodel | 2 +- 1458 files changed, 5680 insertions(+), 5744 deletions(-) diff --git a/org.eclipse.xtext.ide.tests/model/generated/IndentationAwareUiTestLanguage.genmodel b/org.eclipse.xtext.ide.tests/model/generated/IndentationAwareUiTestLanguage.genmodel index 9d540fa67..06502040e 100644 --- a/org.eclipse.xtext.ide.tests/model/generated/IndentationAwareUiTestLanguage.genmodel +++ b/org.eclipse.xtext.ide.tests/model/generated/IndentationAwareUiTestLanguage.genmodel @@ -4,7 +4,7 @@ modelDirectory="/org.eclipse.xtext.ide.tests/testlang-src-gen" modelPluginID="org.eclipse.xtext.ide.tests" forceOverwrite="true" modelName="IndentationAwareUiTestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" complianceLevel="8.0" - copyrightFields="false" runtimeVersion="2.12" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> + copyrightFields="false" runtimeVersion="2.20" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> diff --git a/org.eclipse.xtext.ide.tests/model/generated/PartialContentAssistTestLanguage.genmodel b/org.eclipse.xtext.ide.tests/model/generated/PartialContentAssistTestLanguage.genmodel index 157a42c43..56f70705c 100644 --- a/org.eclipse.xtext.ide.tests/model/generated/PartialContentAssistTestLanguage.genmodel +++ b/org.eclipse.xtext.ide.tests/model/generated/PartialContentAssistTestLanguage.genmodel @@ -4,7 +4,7 @@ modelDirectory="/org.eclipse.xtext.ide.tests/testlang-src-gen" modelPluginID="org.eclipse.xtext.ide.tests" forceOverwrite="true" modelName="PartialContentAssistTestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" complianceLevel="8.0" - copyrightFields="false" runtimeVersion="2.12" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> + copyrightFields="false" runtimeVersion="2.20" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> diff --git a/org.eclipse.xtext.ide.tests/model/generated/PartialSerializationTestLanguage.genmodel b/org.eclipse.xtext.ide.tests/model/generated/PartialSerializationTestLanguage.genmodel index d94f96b2a..2e2f9d75c 100644 --- a/org.eclipse.xtext.ide.tests/model/generated/PartialSerializationTestLanguage.genmodel +++ b/org.eclipse.xtext.ide.tests/model/generated/PartialSerializationTestLanguage.genmodel @@ -4,7 +4,7 @@ modelDirectory="/org.eclipse.xtext.ide.tests/testlang-src-gen" modelPluginID="org.eclipse.xtext.ide.tests" forceOverwrite="true" modelName="PartialSerializationTestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" complianceLevel="8.0" - copyrightFields="false" runtimeVersion="2.12" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../testlang-src/org/eclipse/xtext/ide/tests/testlanguage/WithTransient.genmodel#//withtransient"> + copyrightFields="false" runtimeVersion="2.20" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../testlang-src/org/eclipse/xtext/ide/tests/testlanguage/WithTransient.genmodel#//withtransient"> diff --git a/org.eclipse.xtext.ide.tests/model/generated/RenameTestLanguage.genmodel b/org.eclipse.xtext.ide.tests/model/generated/RenameTestLanguage.genmodel index 4b64786a4..8b1467ea8 100644 --- a/org.eclipse.xtext.ide.tests/model/generated/RenameTestLanguage.genmodel +++ b/org.eclipse.xtext.ide.tests/model/generated/RenameTestLanguage.genmodel @@ -3,7 +3,7 @@ xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2016, 2017 TypeFox GmbH (http://www.typefox.io) and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html" modelDirectory="/org.eclipse.xtext.ide.tests/testlang-src-gen" modelPluginID="org.eclipse.xtext.ide.tests" forceOverwrite="true" modelName="RenameTestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.12" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> + complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> diff --git a/org.eclipse.xtext.ide.tests/model/generated/TestLanguage.genmodel b/org.eclipse.xtext.ide.tests/model/generated/TestLanguage.genmodel index 9f7badc9a..a713930a5 100644 --- a/org.eclipse.xtext.ide.tests/model/generated/TestLanguage.genmodel +++ b/org.eclipse.xtext.ide.tests/model/generated/TestLanguage.genmodel @@ -3,7 +3,7 @@ xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2016, 2017 TypeFox GmbH (http://www.typefox.io) and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html" modelDirectory="/org.eclipse.xtext.ide.tests/testlang-src-gen" modelPluginID="org.eclipse.xtext.ide.tests" forceOverwrite="true" modelName="TestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.12" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> + complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/indentationAwareUiTestLanguage/ChildList.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/indentationAwareUiTestLanguage/ChildList.java index 925b518b6..ac056c286 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/indentationAwareUiTestLanguage/ChildList.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/indentationAwareUiTestLanguage/ChildList.java @@ -33,10 +33,6 @@ public interface ChildList extends EObject * Returns the value of the 'Children' containment reference list. * The list contents are of type {@link org.eclipse.xtext.ide.tests.testlanguage.indentationAwareUiTestLanguage.OtherTreeNode}. * - *

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

* * @return the value of the 'Children' containment reference list. * @see org.eclipse.xtext.ide.tests.testlanguage.indentationAwareUiTestLanguage.IndentationAwareUiTestLanguagePackage#getChildList_Children() diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/indentationAwareUiTestLanguage/OtherTreeNode.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/indentationAwareUiTestLanguage/OtherTreeNode.java index 92eb4462e..ffa3f99bf 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/indentationAwareUiTestLanguage/OtherTreeNode.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/indentationAwareUiTestLanguage/OtherTreeNode.java @@ -31,10 +31,6 @@ public interface OtherTreeNode 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) @@ -57,10 +53,6 @@ public interface OtherTreeNode extends EObject /** * Returns the value of the 'Child List' containment reference. * - *

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

* * @return the value of the 'Child List' containment reference. * @see #setChildList(ChildList) diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/indentationAwareUiTestLanguage/Tree.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/indentationAwareUiTestLanguage/Tree.java index 56f32b76c..6bab7e121 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/indentationAwareUiTestLanguage/Tree.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/indentationAwareUiTestLanguage/Tree.java @@ -34,10 +34,6 @@ public interface Tree extends EObject * Returns the value of the 'Nodes' containment reference list. * The list contents are of type {@link org.eclipse.xtext.ide.tests.testlanguage.indentationAwareUiTestLanguage.TreeNode}. * - *

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

* * @return the value of the 'Nodes' containment reference list. * @see org.eclipse.xtext.ide.tests.testlanguage.indentationAwareUiTestLanguage.IndentationAwareUiTestLanguagePackage#getTree_Nodes() @@ -50,10 +46,6 @@ public interface Tree extends EObject * Returns the value of the 'More Nodes' containment reference list. * The list contents are of type {@link org.eclipse.xtext.ide.tests.testlanguage.indentationAwareUiTestLanguage.OtherTreeNode}. * - *

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

* * @return the value of the 'More Nodes' containment reference list. * @see org.eclipse.xtext.ide.tests.testlanguage.indentationAwareUiTestLanguage.IndentationAwareUiTestLanguagePackage#getTree_MoreNodes() diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/indentationAwareUiTestLanguage/TreeNode.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/indentationAwareUiTestLanguage/TreeNode.java index b46bf1bc7..1b451e182 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/indentationAwareUiTestLanguage/TreeNode.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/indentationAwareUiTestLanguage/TreeNode.java @@ -33,10 +33,6 @@ public interface TreeNode 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) @@ -60,10 +56,6 @@ public interface TreeNode extends EObject * Returns the value of the 'Children' containment reference list. * The list contents are of type {@link org.eclipse.xtext.ide.tests.testlanguage.indentationAwareUiTestLanguage.TreeNode}. * - *

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

* * @return the value of the 'Children' containment reference list. * @see org.eclipse.xtext.ide.tests.testlanguage.indentationAwareUiTestLanguage.IndentationAwareUiTestLanguagePackage#getTreeNode_Children() diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/indentationAwareUiTestLanguage/impl/ChildListImpl.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/indentationAwareUiTestLanguage/impl/ChildListImpl.java index 12523c05c..8c0e15046 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/indentationAwareUiTestLanguage/impl/ChildListImpl.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/indentationAwareUiTestLanguage/impl/ChildListImpl.java @@ -76,6 +76,7 @@ public class ChildListImpl extends MinimalEObjectImpl.Container implements Child * * @generated */ + @Override public EList getChildren() { if (children == null) diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/indentationAwareUiTestLanguage/impl/IndentationAwareUiTestLanguageFactoryImpl.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/indentationAwareUiTestLanguage/impl/IndentationAwareUiTestLanguageFactoryImpl.java index 8d67eda30..5d4d2bdd3 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/indentationAwareUiTestLanguage/impl/IndentationAwareUiTestLanguageFactoryImpl.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/indentationAwareUiTestLanguage/impl/IndentationAwareUiTestLanguageFactoryImpl.java @@ -83,6 +83,7 @@ public class IndentationAwareUiTestLanguageFactoryImpl extends EFactoryImpl impl * * @generated */ + @Override public Tree createTree() { TreeImpl tree = new TreeImpl(); @@ -94,6 +95,7 @@ public class IndentationAwareUiTestLanguageFactoryImpl extends EFactoryImpl impl * * @generated */ + @Override public TreeNode createTreeNode() { TreeNodeImpl treeNode = new TreeNodeImpl(); @@ -105,6 +107,7 @@ public class IndentationAwareUiTestLanguageFactoryImpl extends EFactoryImpl impl * * @generated */ + @Override public OtherTreeNode createOtherTreeNode() { OtherTreeNodeImpl otherTreeNode = new OtherTreeNodeImpl(); @@ -116,6 +119,7 @@ public class IndentationAwareUiTestLanguageFactoryImpl extends EFactoryImpl impl * * @generated */ + @Override public ChildList createChildList() { ChildListImpl childList = new ChildListImpl(); @@ -127,6 +131,7 @@ public class IndentationAwareUiTestLanguageFactoryImpl extends EFactoryImpl impl * * @generated */ + @Override public IndentationAwareUiTestLanguagePackage getIndentationAwareUiTestLanguagePackage() { return (IndentationAwareUiTestLanguagePackage)getEPackage(); diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/indentationAwareUiTestLanguage/impl/IndentationAwareUiTestLanguagePackageImpl.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/indentationAwareUiTestLanguage/impl/IndentationAwareUiTestLanguagePackageImpl.java index c94a75378..b87a2a404 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/indentationAwareUiTestLanguage/impl/IndentationAwareUiTestLanguagePackageImpl.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/indentationAwareUiTestLanguage/impl/IndentationAwareUiTestLanguagePackageImpl.java @@ -87,7 +87,7 @@ public class IndentationAwareUiTestLanguagePackageImpl extends EPackageImpl impl /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link IndentationAwareUiTestLanguagePackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -102,7 +102,8 @@ public class IndentationAwareUiTestLanguagePackageImpl extends EPackageImpl impl if (isInited) return (IndentationAwareUiTestLanguagePackage)EPackage.Registry.INSTANCE.getEPackage(IndentationAwareUiTestLanguagePackage.eNS_URI); // Obtain or create and register package - IndentationAwareUiTestLanguagePackageImpl theIndentationAwareUiTestLanguagePackage = (IndentationAwareUiTestLanguagePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof IndentationAwareUiTestLanguagePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new IndentationAwareUiTestLanguagePackageImpl()); + Object registeredIndentationAwareUiTestLanguagePackage = EPackage.Registry.INSTANCE.get(eNS_URI); + IndentationAwareUiTestLanguagePackageImpl theIndentationAwareUiTestLanguagePackage = registeredIndentationAwareUiTestLanguagePackage instanceof IndentationAwareUiTestLanguagePackageImpl ? (IndentationAwareUiTestLanguagePackageImpl)registeredIndentationAwareUiTestLanguagePackage : new IndentationAwareUiTestLanguagePackageImpl(); isInited = true; @@ -118,7 +119,6 @@ public class IndentationAwareUiTestLanguagePackageImpl extends EPackageImpl impl // Mark meta-data to indicate it can't be changed theIndentationAwareUiTestLanguagePackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(IndentationAwareUiTestLanguagePackage.eNS_URI, theIndentationAwareUiTestLanguagePackage); return theIndentationAwareUiTestLanguagePackage; @@ -129,6 +129,7 @@ public class IndentationAwareUiTestLanguagePackageImpl extends EPackageImpl impl * * @generated */ + @Override public EClass getTree() { return treeEClass; @@ -139,6 +140,7 @@ public class IndentationAwareUiTestLanguagePackageImpl extends EPackageImpl impl * * @generated */ + @Override public EReference getTree_Nodes() { return (EReference)treeEClass.getEStructuralFeatures().get(0); @@ -149,6 +151,7 @@ public class IndentationAwareUiTestLanguagePackageImpl extends EPackageImpl impl * * @generated */ + @Override public EReference getTree_MoreNodes() { return (EReference)treeEClass.getEStructuralFeatures().get(1); @@ -159,6 +162,7 @@ public class IndentationAwareUiTestLanguagePackageImpl extends EPackageImpl impl * * @generated */ + @Override public EClass getTreeNode() { return treeNodeEClass; @@ -169,6 +173,7 @@ public class IndentationAwareUiTestLanguagePackageImpl extends EPackageImpl impl * * @generated */ + @Override public EAttribute getTreeNode_Name() { return (EAttribute)treeNodeEClass.getEStructuralFeatures().get(0); @@ -179,6 +184,7 @@ public class IndentationAwareUiTestLanguagePackageImpl extends EPackageImpl impl * * @generated */ + @Override public EReference getTreeNode_Children() { return (EReference)treeNodeEClass.getEStructuralFeatures().get(1); @@ -189,6 +195,7 @@ public class IndentationAwareUiTestLanguagePackageImpl extends EPackageImpl impl * * @generated */ + @Override public EClass getOtherTreeNode() { return otherTreeNodeEClass; @@ -199,6 +206,7 @@ public class IndentationAwareUiTestLanguagePackageImpl extends EPackageImpl impl * * @generated */ + @Override public EAttribute getOtherTreeNode_Name() { return (EAttribute)otherTreeNodeEClass.getEStructuralFeatures().get(0); @@ -209,6 +217,7 @@ public class IndentationAwareUiTestLanguagePackageImpl extends EPackageImpl impl * * @generated */ + @Override public EReference getOtherTreeNode_ChildList() { return (EReference)otherTreeNodeEClass.getEStructuralFeatures().get(1); @@ -219,6 +228,7 @@ public class IndentationAwareUiTestLanguagePackageImpl extends EPackageImpl impl * * @generated */ + @Override public EClass getChildList() { return childListEClass; @@ -229,6 +239,7 @@ public class IndentationAwareUiTestLanguagePackageImpl extends EPackageImpl impl * * @generated */ + @Override public EReference getChildList_Children() { return (EReference)childListEClass.getEStructuralFeatures().get(0); @@ -239,6 +250,7 @@ public class IndentationAwareUiTestLanguagePackageImpl extends EPackageImpl impl * * @generated */ + @Override public IndentationAwareUiTestLanguageFactory getIndentationAwareUiTestLanguageFactory() { return (IndentationAwareUiTestLanguageFactory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/indentationAwareUiTestLanguage/impl/OtherTreeNodeImpl.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/indentationAwareUiTestLanguage/impl/OtherTreeNodeImpl.java index c09566782..4390c5d00 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/indentationAwareUiTestLanguage/impl/OtherTreeNodeImpl.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/indentationAwareUiTestLanguage/impl/OtherTreeNodeImpl.java @@ -92,6 +92,7 @@ public class OtherTreeNodeImpl extends MinimalEObjectImpl.Container implements O * * @generated */ + @Override public String getName() { return name; @@ -102,6 +103,7 @@ public class OtherTreeNodeImpl extends MinimalEObjectImpl.Container implements O * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -115,6 +117,7 @@ public class OtherTreeNodeImpl extends MinimalEObjectImpl.Container implements O * * @generated */ + @Override public ChildList getChildList() { return childList; @@ -142,6 +145,7 @@ public class OtherTreeNodeImpl extends MinimalEObjectImpl.Container implements O * * @generated */ + @Override public void setChildList(ChildList newChildList) { if (newChildList != childList) @@ -260,7 +264,7 @@ public class OtherTreeNodeImpl extends MinimalEObjectImpl.Container implements O { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/indentationAwareUiTestLanguage/impl/TreeImpl.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/indentationAwareUiTestLanguage/impl/TreeImpl.java index 3a7d7f988..2cdb12562 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/indentationAwareUiTestLanguage/impl/TreeImpl.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/indentationAwareUiTestLanguage/impl/TreeImpl.java @@ -88,6 +88,7 @@ public class TreeImpl extends MinimalEObjectImpl.Container implements Tree * * @generated */ + @Override public EList getNodes() { if (nodes == null) @@ -102,6 +103,7 @@ public class TreeImpl extends MinimalEObjectImpl.Container implements Tree * * @generated */ + @Override public EList getMoreNodes() { if (moreNodes == null) diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/indentationAwareUiTestLanguage/impl/TreeNodeImpl.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/indentationAwareUiTestLanguage/impl/TreeNodeImpl.java index 8946c16cb..2cdb13760 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/indentationAwareUiTestLanguage/impl/TreeNodeImpl.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/indentationAwareUiTestLanguage/impl/TreeNodeImpl.java @@ -98,6 +98,7 @@ public class TreeNodeImpl extends MinimalEObjectImpl.Container implements TreeNo * * @generated */ + @Override public String getName() { return name; @@ -108,6 +109,7 @@ public class TreeNodeImpl extends MinimalEObjectImpl.Container implements TreeNo * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -121,6 +123,7 @@ public class TreeNodeImpl extends MinimalEObjectImpl.Container implements TreeNo * * @generated */ + @Override public EList getChildren() { if (children == null) @@ -234,7 +237,7 @@ public class TreeNodeImpl extends MinimalEObjectImpl.Container implements TreeNo { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialContentAssistTestLanguage/Property.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialContentAssistTestLanguage/Property.java index bc7a119b8..dcb6834cf 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialContentAssistTestLanguage/Property.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialContentAssistTestLanguage/Property.java @@ -31,10 +31,6 @@ public interface Property extends EObject /** * Returns the value of the 'Type' attribute. * - *

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

* * @return the value of the 'Type' attribute. * @see #setType(String) @@ -57,10 +53,6 @@ public interface Property 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) diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialContentAssistTestLanguage/TypeDeclaration.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialContentAssistTestLanguage/TypeDeclaration.java index fc3f363b0..592e0e9f1 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialContentAssistTestLanguage/TypeDeclaration.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialContentAssistTestLanguage/TypeDeclaration.java @@ -34,10 +34,6 @@ public interface TypeDeclaration 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) @@ -60,10 +56,6 @@ public interface TypeDeclaration extends EObject /** * Returns the value of the 'Super Type' reference. * - *

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

* * @return the value of the 'Super Type' reference. * @see #setSuperType(TypeDeclaration) @@ -87,10 +79,6 @@ public interface TypeDeclaration extends EObject * Returns the value of the 'Properties' containment reference list. * The list contents are of type {@link org.eclipse.xtext.ide.tests.testlanguage.partialContentAssistTestLanguage.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.ide.tests.testlanguage.partialContentAssistTestLanguage.PartialContentAssistTestLanguagePackage#getTypeDeclaration_Properties() diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialContentAssistTestLanguage/impl/PartialContentAssistTestLanguageFactoryImpl.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialContentAssistTestLanguage/impl/PartialContentAssistTestLanguageFactoryImpl.java index baef29252..fd2a3d304 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialContentAssistTestLanguage/impl/PartialContentAssistTestLanguageFactoryImpl.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialContentAssistTestLanguage/impl/PartialContentAssistTestLanguageFactoryImpl.java @@ -81,6 +81,7 @@ public class PartialContentAssistTestLanguageFactoryImpl extends EFactoryImpl im * * @generated */ + @Override public TypeDeclaration createTypeDeclaration() { TypeDeclarationImpl typeDeclaration = new TypeDeclarationImpl(); @@ -92,6 +93,7 @@ public class PartialContentAssistTestLanguageFactoryImpl extends EFactoryImpl im * * @generated */ + @Override public Property createProperty() { PropertyImpl property = new PropertyImpl(); @@ -103,6 +105,7 @@ public class PartialContentAssistTestLanguageFactoryImpl extends EFactoryImpl im * * @generated */ + @Override public PartialContentAssistTestLanguagePackage getPartialContentAssistTestLanguagePackage() { return (PartialContentAssistTestLanguagePackage)getEPackage(); diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialContentAssistTestLanguage/impl/PartialContentAssistTestLanguagePackageImpl.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialContentAssistTestLanguage/impl/PartialContentAssistTestLanguagePackageImpl.java index 06715934b..a03b70f9f 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialContentAssistTestLanguage/impl/PartialContentAssistTestLanguagePackageImpl.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialContentAssistTestLanguage/impl/PartialContentAssistTestLanguagePackageImpl.java @@ -71,7 +71,7 @@ public class PartialContentAssistTestLanguagePackageImpl extends EPackageImpl im /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link PartialContentAssistTestLanguagePackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -86,7 +86,8 @@ public class PartialContentAssistTestLanguagePackageImpl extends EPackageImpl im if (isInited) return (PartialContentAssistTestLanguagePackage)EPackage.Registry.INSTANCE.getEPackage(PartialContentAssistTestLanguagePackage.eNS_URI); // Obtain or create and register package - PartialContentAssistTestLanguagePackageImpl thePartialContentAssistTestLanguagePackage = (PartialContentAssistTestLanguagePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof PartialContentAssistTestLanguagePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new PartialContentAssistTestLanguagePackageImpl()); + Object registeredPartialContentAssistTestLanguagePackage = EPackage.Registry.INSTANCE.get(eNS_URI); + PartialContentAssistTestLanguagePackageImpl thePartialContentAssistTestLanguagePackage = registeredPartialContentAssistTestLanguagePackage instanceof PartialContentAssistTestLanguagePackageImpl ? (PartialContentAssistTestLanguagePackageImpl)registeredPartialContentAssistTestLanguagePackage : new PartialContentAssistTestLanguagePackageImpl(); isInited = true; @@ -102,7 +103,6 @@ public class PartialContentAssistTestLanguagePackageImpl extends EPackageImpl im // Mark meta-data to indicate it can't be changed thePartialContentAssistTestLanguagePackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(PartialContentAssistTestLanguagePackage.eNS_URI, thePartialContentAssistTestLanguagePackage); return thePartialContentAssistTestLanguagePackage; @@ -113,6 +113,7 @@ public class PartialContentAssistTestLanguagePackageImpl extends EPackageImpl im * * @generated */ + @Override public EClass getTypeDeclaration() { return typeDeclarationEClass; @@ -123,6 +124,7 @@ public class PartialContentAssistTestLanguagePackageImpl extends EPackageImpl im * * @generated */ + @Override public EAttribute getTypeDeclaration_Name() { return (EAttribute)typeDeclarationEClass.getEStructuralFeatures().get(0); @@ -133,6 +135,7 @@ public class PartialContentAssistTestLanguagePackageImpl extends EPackageImpl im * * @generated */ + @Override public EReference getTypeDeclaration_SuperType() { return (EReference)typeDeclarationEClass.getEStructuralFeatures().get(1); @@ -143,6 +146,7 @@ public class PartialContentAssistTestLanguagePackageImpl extends EPackageImpl im * * @generated */ + @Override public EReference getTypeDeclaration_Properties() { return (EReference)typeDeclarationEClass.getEStructuralFeatures().get(2); @@ -153,6 +157,7 @@ public class PartialContentAssistTestLanguagePackageImpl extends EPackageImpl im * * @generated */ + @Override public EClass getProperty() { return propertyEClass; @@ -163,6 +168,7 @@ public class PartialContentAssistTestLanguagePackageImpl extends EPackageImpl im * * @generated */ + @Override public EAttribute getProperty_Type() { return (EAttribute)propertyEClass.getEStructuralFeatures().get(0); @@ -173,6 +179,7 @@ public class PartialContentAssistTestLanguagePackageImpl extends EPackageImpl im * * @generated */ + @Override public EAttribute getProperty_Name() { return (EAttribute)propertyEClass.getEStructuralFeatures().get(1); @@ -183,6 +190,7 @@ public class PartialContentAssistTestLanguagePackageImpl extends EPackageImpl im * * @generated */ + @Override public PartialContentAssistTestLanguageFactory getPartialContentAssistTestLanguageFactory() { return (PartialContentAssistTestLanguageFactory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialContentAssistTestLanguage/impl/PropertyImpl.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialContentAssistTestLanguage/impl/PropertyImpl.java index a0703296e..55bdd4921 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialContentAssistTestLanguage/impl/PropertyImpl.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialContentAssistTestLanguage/impl/PropertyImpl.java @@ -99,6 +99,7 @@ public class PropertyImpl extends MinimalEObjectImpl.Container implements Proper * * @generated */ + @Override public String getType() { return type; @@ -109,6 +110,7 @@ public class PropertyImpl extends MinimalEObjectImpl.Container implements Proper * * @generated */ + @Override public void setType(String newType) { String oldType = type; @@ -122,6 +124,7 @@ public class PropertyImpl extends MinimalEObjectImpl.Container implements Proper * * @generated */ + @Override public String getName() { return name; @@ -132,6 +135,7 @@ public class PropertyImpl extends MinimalEObjectImpl.Container implements Proper * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -226,7 +230,7 @@ public class PropertyImpl extends MinimalEObjectImpl.Container implements Proper { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (type: "); result.append(type); result.append(", name: "); diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialContentAssistTestLanguage/impl/TypeDeclarationImpl.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialContentAssistTestLanguage/impl/TypeDeclarationImpl.java index b5ffd4add..47444dcfb 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialContentAssistTestLanguage/impl/TypeDeclarationImpl.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialContentAssistTestLanguage/impl/TypeDeclarationImpl.java @@ -110,6 +110,7 @@ public class TypeDeclarationImpl extends MinimalEObjectImpl.Container implements * * @generated */ + @Override public String getName() { return name; @@ -120,6 +121,7 @@ public class TypeDeclarationImpl extends MinimalEObjectImpl.Container implements * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -133,6 +135,7 @@ public class TypeDeclarationImpl extends MinimalEObjectImpl.Container implements * * @generated */ + @Override public TypeDeclaration getSuperType() { if (superType != null && superType.eIsProxy()) @@ -163,6 +166,7 @@ public class TypeDeclarationImpl extends MinimalEObjectImpl.Container implements * * @generated */ + @Override public void setSuperType(TypeDeclaration newSuperType) { TypeDeclaration oldSuperType = superType; @@ -176,6 +180,7 @@ public class TypeDeclarationImpl extends MinimalEObjectImpl.Container implements * * @generated */ + @Override public EList getProperties() { if (properties == null) @@ -300,7 +305,7 @@ public class TypeDeclarationImpl extends MinimalEObjectImpl.Container implements { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/ChildWithSubChild.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/ChildWithSubChild.java index 7feb17c51..6402e1b80 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/ChildWithSubChild.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/ChildWithSubChild.java @@ -33,10 +33,6 @@ public interface ChildWithSubChild extends EObject * Returns the value of the 'Sub Childs' containment reference list. * The list contents are of type {@link org.eclipse.xtext.ide.tests.testlanguage.partialSerializationTestLanguage.SubChild}. * - *

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

* * @return the value of the 'Sub Childs' containment reference list. * @see org.eclipse.xtext.ide.tests.testlanguage.partialSerializationTestLanguage.PartialSerializationTestLanguagePackage#getChildWithSubChild_SubChilds() diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/ChildWithSubChilds.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/ChildWithSubChilds.java index b3bbfe8b2..8473fce43 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/ChildWithSubChilds.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/ChildWithSubChilds.java @@ -31,10 +31,6 @@ public interface ChildWithSubChilds extends Model * Returns the value of the 'Children' containment reference list. * The list contents are of type {@link org.eclipse.xtext.ide.tests.testlanguage.partialSerializationTestLanguage.ChildWithSubChild}. * - *

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

* * @return the value of the 'Children' containment reference list. * @see org.eclipse.xtext.ide.tests.testlanguage.partialSerializationTestLanguage.PartialSerializationTestLanguagePackage#getChildWithSubChilds_Children() diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/EClassRef.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/EClassRef.java index 9e871a3d5..791e826ef 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/EClassRef.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/EClassRef.java @@ -30,10 +30,6 @@ public interface EClassRef extends Model /** * Returns the value of the 'Ref' reference. * - *

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

* * @return the value of the 'Ref' reference. * @see #setRef(EClass) diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/Import.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/Import.java index 26d18baad..c74bff2f3 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/Import.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/Import.java @@ -30,10 +30,6 @@ public interface Import extends EObject /** * Returns the value of the 'Imported Namespace' attribute. * - *

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

* * @return the value of the 'Imported Namespace' attribute. * @see #setImportedNamespace(String) diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/MandatoryChild.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/MandatoryChild.java index 4bc6e6ff7..3dd45840e 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/MandatoryChild.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/MandatoryChild.java @@ -29,10 +29,6 @@ public interface MandatoryChild extends Model /** * Returns the value of the 'Child' containment reference. * - *

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

* * @return the value of the 'Child' containment reference. * @see #setChild(MandatoryValue) diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/MandatoryChildList.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/MandatoryChildList.java index d9c9f9faa..f3e79446a 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/MandatoryChildList.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/MandatoryChildList.java @@ -31,10 +31,6 @@ public interface MandatoryChildList extends Model * Returns the value of the 'Children' containment reference list. * The list contents are of type {@link org.eclipse.xtext.ide.tests.testlanguage.partialSerializationTestLanguage.MandatoryValue}. * - *

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

* * @return the value of the 'Children' containment reference list. * @see org.eclipse.xtext.ide.tests.testlanguage.partialSerializationTestLanguage.PartialSerializationTestLanguagePackage#getMandatoryChildList_Children() diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/MandatoryValue.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/MandatoryValue.java index 6c2a1312d..fa757ffe3 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/MandatoryValue.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/MandatoryValue.java @@ -29,10 +29,6 @@ public interface MandatoryValue extends Model /** * 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) diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/ManyMandatoryValues.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/ManyMandatoryValues.java index 6b3f82060..6a3cfbea9 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/ManyMandatoryValues.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/ManyMandatoryValues.java @@ -31,10 +31,6 @@ public interface ManyMandatoryValues extends Model * Returns the value of the 'Name' attribute list. * The list contents are of type {@link java.lang.String}. * - *

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

* * @return the value of the 'Name' attribute list. * @see org.eclipse.xtext.ide.tests.testlanguage.partialSerializationTestLanguage.PartialSerializationTestLanguagePackage#getManyMandatoryValues_Name() diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/ManyValues.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/ManyValues.java index 41244396d..f290773d9 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/ManyValues.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/ManyValues.java @@ -31,10 +31,6 @@ public interface ManyValues extends ManyOptionalValues * Returns the value of the 'Name' attribute list. * The list contents are of type {@link java.lang.String}. * - *

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

* * @return the value of the 'Name' attribute list. * @see org.eclipse.xtext.ide.tests.testlanguage.partialSerializationTestLanguage.PartialSerializationTestLanguagePackage#getManyValues_Name() diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/Model.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/Model.java index 398cc8ad4..07bd48ef3 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/Model.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/Model.java @@ -34,10 +34,6 @@ public interface Model extends EObject * Returns the value of the 'Clazz' containment reference list. * The list contents are of type {@link org.eclipse.emf.ecore.EClass}. * - *

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

* * @return the value of the 'Clazz' containment reference list. * @see org.eclipse.xtext.ide.tests.testlanguage.partialSerializationTestLanguage.PartialSerializationTestLanguagePackage#getModel_Clazz() diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/Node.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/Node.java index fbf595e8c..49112910a 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/Node.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/Node.java @@ -35,10 +35,6 @@ public interface Node extends Model * Returns the value of the 'Imports' containment reference list. * The list contents are of type {@link org.eclipse.xtext.ide.tests.testlanguage.partialSerializationTestLanguage.Import}. * - *

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

* * @return the value of the 'Imports' containment reference list. * @see org.eclipse.xtext.ide.tests.testlanguage.partialSerializationTestLanguage.PartialSerializationTestLanguagePackage#getNode_Imports() @@ -50,10 +46,6 @@ public interface Node extends Model /** * 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) @@ -77,10 +69,6 @@ public interface Node extends Model * Returns the value of the 'Refs' reference list. * The list contents are of type {@link org.eclipse.xtext.ide.tests.testlanguage.partialSerializationTestLanguage.Node}. * - *

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

* * @return the value of the 'Refs' reference list. * @see org.eclipse.xtext.ide.tests.testlanguage.partialSerializationTestLanguage.PartialSerializationTestLanguagePackage#getNode_Refs() @@ -93,10 +81,6 @@ public interface Node extends Model * Returns the value of the 'Children' containment reference list. * The list contents are of type {@link org.eclipse.xtext.ide.tests.testlanguage.partialSerializationTestLanguage.Node}. * - *

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

* * @return the value of the 'Children' containment reference list. * @see org.eclipse.xtext.ide.tests.testlanguage.partialSerializationTestLanguage.PartialSerializationTestLanguagePackage#getNode_Children() @@ -108,10 +92,6 @@ public interface Node extends Model /** * Returns the value of the 'Ref' reference. * - *

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

* * @return the value of the 'Ref' reference. * @see #setRef(Node) diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/OptionalChild.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/OptionalChild.java index a4f616404..5987beac3 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/OptionalChild.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/OptionalChild.java @@ -29,10 +29,6 @@ public interface OptionalChild extends Model /** * Returns the value of the 'Child' containment reference. * - *

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

* * @return the value of the 'Child' containment reference. * @see #setChild(MandatoryValue) diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/OptionalChildList.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/OptionalChildList.java index b18a0350b..69297432b 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/OptionalChildList.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/OptionalChildList.java @@ -31,10 +31,6 @@ public interface OptionalChildList extends Model * Returns the value of the 'Children' containment reference list. * The list contents are of type {@link org.eclipse.xtext.ide.tests.testlanguage.partialSerializationTestLanguage.MandatoryValue}. * - *

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

* * @return the value of the 'Children' containment reference list. * @see org.eclipse.xtext.ide.tests.testlanguage.partialSerializationTestLanguage.PartialSerializationTestLanguagePackage#getOptionalChildList_Children() diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/OptionalValue.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/OptionalValue.java index 95a7287b3..dff3751ae 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/OptionalValue.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/OptionalValue.java @@ -29,10 +29,6 @@ public interface OptionalValue extends Model /** * 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) diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/SubChild.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/SubChild.java index 18f0b5880..e7ae0459b 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/SubChild.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/SubChild.java @@ -30,10 +30,6 @@ public interface SubChild 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) diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/TwoChildLists.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/TwoChildLists.java index 876b632f9..ecd055d45 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/TwoChildLists.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/TwoChildLists.java @@ -32,10 +32,6 @@ public interface TwoChildLists extends Model * Returns the value of the 'Direct Children' containment reference list. * The list contents are of type {@link org.eclipse.xtext.ide.tests.testlanguage.partialSerializationTestLanguage.MandatoryValue}. * - *

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

* * @return the value of the 'Direct Children' containment reference list. * @see org.eclipse.xtext.ide.tests.testlanguage.partialSerializationTestLanguage.PartialSerializationTestLanguagePackage#getTwoChildLists_DirectChildren() @@ -47,10 +43,6 @@ public interface TwoChildLists extends Model /** * Returns the value of the 'Childs List' containment reference. * - *

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

* * @return the value of the 'Childs List' containment reference. * @see #setChildsList(MandatoryChildList) diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/TwoChilds.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/TwoChilds.java index 25beb0b27..b215baacc 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/TwoChilds.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/TwoChilds.java @@ -30,10 +30,6 @@ public interface TwoChilds extends Model /** * Returns the value of the 'Direct Child' containment reference. * - *

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

* * @return the value of the 'Direct Child' containment reference. * @see #setDirectChild(MandatoryValue) @@ -56,10 +52,6 @@ public interface TwoChilds extends Model /** * Returns the value of the 'Opt Child' containment reference. * - *

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

* * @return the value of the 'Opt Child' containment reference. * @see #setOptChild(OptionalChild) diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/WithTransientContainer.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/WithTransientContainer.java index d4d2f3d4a..d47a50f87 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/WithTransientContainer.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/WithTransientContainer.java @@ -30,10 +30,6 @@ public interface WithTransientContainer extends Model /** * Returns the value of the 'Child' containment reference. * - *

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

* * @return the value of the 'Child' containment reference. * @see #setChild(WithTransient) diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/impl/ChildWithSubChildImpl.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/impl/ChildWithSubChildImpl.java index b1c6713a3..da4bed4eb 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/impl/ChildWithSubChildImpl.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/impl/ChildWithSubChildImpl.java @@ -76,6 +76,7 @@ public class ChildWithSubChildImpl extends MinimalEObjectImpl.Container implemen * * @generated */ + @Override public EList getSubChilds() { if (subChilds == null) diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/impl/ChildWithSubChildsImpl.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/impl/ChildWithSubChildsImpl.java index c8d0a1695..618eef1e3 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/impl/ChildWithSubChildsImpl.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/impl/ChildWithSubChildsImpl.java @@ -74,6 +74,7 @@ public class ChildWithSubChildsImpl extends ModelImpl implements ChildWithSubChi * * @generated */ + @Override public EList getChildren() { if (children == null) diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/impl/EClassRefImpl.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/impl/EClassRefImpl.java index 3cbc368b7..038a9feed 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/impl/EClassRefImpl.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/impl/EClassRefImpl.java @@ -68,6 +68,7 @@ public class EClassRefImpl extends ModelImpl implements EClassRef * * @generated */ + @Override public EClass getRef() { if (ref != null && ref.eIsProxy()) @@ -98,6 +99,7 @@ public class EClassRefImpl extends ModelImpl implements EClassRef * * @generated */ + @Override public void setRef(EClass newRef) { EClass oldRef = ref; diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/impl/ImportImpl.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/impl/ImportImpl.java index 00ec239ad..87520e03f 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/impl/ImportImpl.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/impl/ImportImpl.java @@ -78,6 +78,7 @@ public class ImportImpl extends MinimalEObjectImpl.Container implements Import * * @generated */ + @Override public String getImportedNamespace() { return importedNamespace; @@ -88,6 +89,7 @@ public class ImportImpl extends MinimalEObjectImpl.Container implements Import * * @generated */ + @Override public void setImportedNamespace(String newImportedNamespace) { String oldImportedNamespace = importedNamespace; @@ -172,7 +174,7 @@ public class ImportImpl extends MinimalEObjectImpl.Container implements Import { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (importedNamespace: "); result.append(importedNamespace); result.append(')'); diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/impl/MandatoryChildImpl.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/impl/MandatoryChildImpl.java index 8cda893e5..0b56b23de 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/impl/MandatoryChildImpl.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/impl/MandatoryChildImpl.java @@ -70,6 +70,7 @@ public class MandatoryChildImpl extends ModelImpl implements MandatoryChild * * @generated */ + @Override public MandatoryValue getChild() { return child; @@ -97,6 +98,7 @@ public class MandatoryChildImpl extends ModelImpl implements MandatoryChild * * @generated */ + @Override public void setChild(MandatoryValue newChild) { if (newChild != child) diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/impl/MandatoryChildListImpl.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/impl/MandatoryChildListImpl.java index 8b8aad88f..f8d8fb20b 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/impl/MandatoryChildListImpl.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/impl/MandatoryChildListImpl.java @@ -74,6 +74,7 @@ public class MandatoryChildListImpl extends ModelImpl implements MandatoryChildL * * @generated */ + @Override public EList getChildren() { if (children == null) diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/impl/MandatoryValueImpl.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/impl/MandatoryValueImpl.java index 46523e401..618c9fdae 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/impl/MandatoryValueImpl.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/impl/MandatoryValueImpl.java @@ -77,6 +77,7 @@ public class MandatoryValueImpl extends ModelImpl implements MandatoryValue * * @generated */ + @Override public String getName() { return name; @@ -87,6 +88,7 @@ public class MandatoryValueImpl extends ModelImpl implements MandatoryValue * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -171,7 +173,7 @@ public class MandatoryValueImpl extends ModelImpl implements MandatoryValue { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/impl/ManyMandatoryValuesImpl.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/impl/ManyMandatoryValuesImpl.java index 878b91909..3d5373c78 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/impl/ManyMandatoryValuesImpl.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/impl/ManyMandatoryValuesImpl.java @@ -69,6 +69,7 @@ public class ManyMandatoryValuesImpl extends ModelImpl implements ManyMandatoryV * * @generated */ + @Override public EList getName() { if (name == null) @@ -156,7 +157,7 @@ public class ManyMandatoryValuesImpl extends ModelImpl implements ManyMandatoryV { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/impl/ManyValuesImpl.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/impl/ManyValuesImpl.java index 578e45811..c7fe4005b 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/impl/ManyValuesImpl.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/impl/ManyValuesImpl.java @@ -69,6 +69,7 @@ public class ManyValuesImpl extends ManyOptionalValuesImpl implements ManyValues * * @generated */ + @Override public EList getName() { if (name == null) @@ -156,7 +157,7 @@ public class ManyValuesImpl extends ManyOptionalValuesImpl implements ManyValues { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/impl/ModelImpl.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/impl/ModelImpl.java index a09160e47..10d8879aa 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/impl/ModelImpl.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/impl/ModelImpl.java @@ -75,6 +75,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public EList getClazz() { if (clazz == null) diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/impl/NodeImpl.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/impl/NodeImpl.java index c67fe4928..461ef7431 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/impl/NodeImpl.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/impl/NodeImpl.java @@ -132,6 +132,7 @@ public class NodeImpl extends ModelImpl implements Node * * @generated */ + @Override public EList getImports() { if (imports == null) @@ -146,6 +147,7 @@ public class NodeImpl extends ModelImpl implements Node * * @generated */ + @Override public String getName() { return name; @@ -156,6 +158,7 @@ public class NodeImpl extends ModelImpl implements Node * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -169,6 +172,7 @@ public class NodeImpl extends ModelImpl implements Node * * @generated */ + @Override public EList getRefs() { if (refs == null) @@ -183,6 +187,7 @@ public class NodeImpl extends ModelImpl implements Node * * @generated */ + @Override public EList getChildren() { if (children == null) @@ -197,6 +202,7 @@ public class NodeImpl extends ModelImpl implements Node * * @generated */ + @Override public Node getRef() { if (ref != null && ref.eIsProxy()) @@ -227,6 +233,7 @@ public class NodeImpl extends ModelImpl implements Node * * @generated */ + @Override public void setRef(Node newRef) { Node oldRef = ref; @@ -374,7 +381,7 @@ public class NodeImpl extends ModelImpl implements Node { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/impl/OptionalChildImpl.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/impl/OptionalChildImpl.java index d02bb72e5..9df186c6d 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/impl/OptionalChildImpl.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/impl/OptionalChildImpl.java @@ -70,6 +70,7 @@ public class OptionalChildImpl extends ModelImpl implements OptionalChild * * @generated */ + @Override public MandatoryValue getChild() { return child; @@ -97,6 +98,7 @@ public class OptionalChildImpl extends ModelImpl implements OptionalChild * * @generated */ + @Override public void setChild(MandatoryValue newChild) { if (newChild != child) diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/impl/OptionalChildListImpl.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/impl/OptionalChildListImpl.java index eb39e5c4c..461f21904 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/impl/OptionalChildListImpl.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/impl/OptionalChildListImpl.java @@ -74,6 +74,7 @@ public class OptionalChildListImpl extends ModelImpl implements OptionalChildLis * * @generated */ + @Override public EList getChildren() { if (children == null) diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/impl/OptionalValueImpl.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/impl/OptionalValueImpl.java index 9f6ab9f4b..852988193 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/impl/OptionalValueImpl.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/impl/OptionalValueImpl.java @@ -77,6 +77,7 @@ public class OptionalValueImpl extends ModelImpl implements OptionalValue * * @generated */ + @Override public String getName() { return name; @@ -87,6 +88,7 @@ public class OptionalValueImpl extends ModelImpl implements OptionalValue * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -171,7 +173,7 @@ public class OptionalValueImpl extends ModelImpl implements OptionalValue { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/impl/PartialSerializationTestLanguageFactoryImpl.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/impl/PartialSerializationTestLanguageFactoryImpl.java index 77c6c94d4..7eb32e2f2 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/impl/PartialSerializationTestLanguageFactoryImpl.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/impl/PartialSerializationTestLanguageFactoryImpl.java @@ -98,6 +98,7 @@ public class PartialSerializationTestLanguageFactoryImpl extends EFactoryImpl im * * @generated */ + @Override public Model createModel() { ModelImpl model = new ModelImpl(); @@ -109,6 +110,7 @@ public class PartialSerializationTestLanguageFactoryImpl extends EFactoryImpl im * * @generated */ + @Override public MandatoryValue createMandatoryValue() { MandatoryValueImpl mandatoryValue = new MandatoryValueImpl(); @@ -120,6 +122,7 @@ public class PartialSerializationTestLanguageFactoryImpl extends EFactoryImpl im * * @generated */ + @Override public OptionalValue createOptionalValue() { OptionalValueImpl optionalValue = new OptionalValueImpl(); @@ -131,6 +134,7 @@ public class PartialSerializationTestLanguageFactoryImpl extends EFactoryImpl im * * @generated */ + @Override public ManyOptionalValues createManyOptionalValues() { ManyOptionalValuesImpl manyOptionalValues = new ManyOptionalValuesImpl(); @@ -142,6 +146,7 @@ public class PartialSerializationTestLanguageFactoryImpl extends EFactoryImpl im * * @generated */ + @Override public ManyMandatoryValues createManyMandatoryValues() { ManyMandatoryValuesImpl manyMandatoryValues = new ManyMandatoryValuesImpl(); @@ -153,6 +158,7 @@ public class PartialSerializationTestLanguageFactoryImpl extends EFactoryImpl im * * @generated */ + @Override public MandatoryChild createMandatoryChild() { MandatoryChildImpl mandatoryChild = new MandatoryChildImpl(); @@ -164,6 +170,7 @@ public class PartialSerializationTestLanguageFactoryImpl extends EFactoryImpl im * * @generated */ + @Override public OptionalChild createOptionalChild() { OptionalChildImpl optionalChild = new OptionalChildImpl(); @@ -175,6 +182,7 @@ public class PartialSerializationTestLanguageFactoryImpl extends EFactoryImpl im * * @generated */ + @Override public TwoChildLists createTwoChildLists() { TwoChildListsImpl twoChildLists = new TwoChildListsImpl(); @@ -186,6 +194,7 @@ public class PartialSerializationTestLanguageFactoryImpl extends EFactoryImpl im * * @generated */ + @Override public TwoChilds createTwoChilds() { TwoChildsImpl twoChilds = new TwoChildsImpl(); @@ -197,6 +206,7 @@ public class PartialSerializationTestLanguageFactoryImpl extends EFactoryImpl im * * @generated */ + @Override public ChildWithSubChilds createChildWithSubChilds() { ChildWithSubChildsImpl childWithSubChilds = new ChildWithSubChildsImpl(); @@ -208,6 +218,7 @@ public class PartialSerializationTestLanguageFactoryImpl extends EFactoryImpl im * * @generated */ + @Override public ChildWithSubChild createChildWithSubChild() { ChildWithSubChildImpl childWithSubChild = new ChildWithSubChildImpl(); @@ -219,6 +230,7 @@ public class PartialSerializationTestLanguageFactoryImpl extends EFactoryImpl im * * @generated */ + @Override public SubChild createSubChild() { SubChildImpl subChild = new SubChildImpl(); @@ -230,6 +242,7 @@ public class PartialSerializationTestLanguageFactoryImpl extends EFactoryImpl im * * @generated */ + @Override public MandatoryChildList createMandatoryChildList() { MandatoryChildListImpl mandatoryChildList = new MandatoryChildListImpl(); @@ -241,6 +254,7 @@ public class PartialSerializationTestLanguageFactoryImpl extends EFactoryImpl im * * @generated */ + @Override public OptionalChildList createOptionalChildList() { OptionalChildListImpl optionalChildList = new OptionalChildListImpl(); @@ -252,6 +266,7 @@ public class PartialSerializationTestLanguageFactoryImpl extends EFactoryImpl im * * @generated */ + @Override public Import createImport() { ImportImpl import_ = new ImportImpl(); @@ -263,6 +278,7 @@ public class PartialSerializationTestLanguageFactoryImpl extends EFactoryImpl im * * @generated */ + @Override public Node createNode() { NodeImpl node = new NodeImpl(); @@ -274,6 +290,7 @@ public class PartialSerializationTestLanguageFactoryImpl extends EFactoryImpl im * * @generated */ + @Override public EClassRef createEClassRef() { EClassRefImpl eClassRef = new EClassRefImpl(); @@ -285,6 +302,7 @@ public class PartialSerializationTestLanguageFactoryImpl extends EFactoryImpl im * * @generated */ + @Override public WithTransientContainer createWithTransientContainer() { WithTransientContainerImpl withTransientContainer = new WithTransientContainerImpl(); @@ -296,6 +314,7 @@ public class PartialSerializationTestLanguageFactoryImpl extends EFactoryImpl im * * @generated */ + @Override public ManyValues createManyValues() { ManyValuesImpl manyValues = new ManyValuesImpl(); @@ -307,6 +326,7 @@ public class PartialSerializationTestLanguageFactoryImpl extends EFactoryImpl im * * @generated */ + @Override public PartialSerializationTestLanguagePackage getPartialSerializationTestLanguagePackage() { return (PartialSerializationTestLanguagePackage)getEPackage(); diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/impl/PartialSerializationTestLanguagePackageImpl.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/impl/PartialSerializationTestLanguagePackageImpl.java index f3c8e589d..3760e0036 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/impl/PartialSerializationTestLanguagePackageImpl.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/impl/PartialSerializationTestLanguagePackageImpl.java @@ -209,7 +209,7 @@ public class PartialSerializationTestLanguagePackageImpl extends EPackageImpl im /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link PartialSerializationTestLanguagePackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -224,7 +224,8 @@ public class PartialSerializationTestLanguagePackageImpl extends EPackageImpl im if (isInited) return (PartialSerializationTestLanguagePackage)EPackage.Registry.INSTANCE.getEPackage(PartialSerializationTestLanguagePackage.eNS_URI); // Obtain or create and register package - PartialSerializationTestLanguagePackageImpl thePartialSerializationTestLanguagePackage = (PartialSerializationTestLanguagePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof PartialSerializationTestLanguagePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new PartialSerializationTestLanguagePackageImpl()); + Object registeredPartialSerializationTestLanguagePackage = EPackage.Registry.INSTANCE.get(eNS_URI); + PartialSerializationTestLanguagePackageImpl thePartialSerializationTestLanguagePackage = registeredPartialSerializationTestLanguagePackage instanceof PartialSerializationTestLanguagePackageImpl ? (PartialSerializationTestLanguagePackageImpl)registeredPartialSerializationTestLanguagePackage : new PartialSerializationTestLanguagePackageImpl(); isInited = true; @@ -241,7 +242,6 @@ public class PartialSerializationTestLanguagePackageImpl extends EPackageImpl im // Mark meta-data to indicate it can't be changed thePartialSerializationTestLanguagePackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(PartialSerializationTestLanguagePackage.eNS_URI, thePartialSerializationTestLanguagePackage); return thePartialSerializationTestLanguagePackage; @@ -252,6 +252,7 @@ public class PartialSerializationTestLanguagePackageImpl extends EPackageImpl im * * @generated */ + @Override public EClass getModel() { return modelEClass; @@ -262,6 +263,7 @@ public class PartialSerializationTestLanguagePackageImpl extends EPackageImpl im * * @generated */ + @Override public EReference getModel_Clazz() { return (EReference)modelEClass.getEStructuralFeatures().get(0); @@ -272,6 +274,7 @@ public class PartialSerializationTestLanguagePackageImpl extends EPackageImpl im * * @generated */ + @Override public EClass getMandatoryValue() { return mandatoryValueEClass; @@ -282,6 +285,7 @@ public class PartialSerializationTestLanguagePackageImpl extends EPackageImpl im * * @generated */ + @Override public EAttribute getMandatoryValue_Name() { return (EAttribute)mandatoryValueEClass.getEStructuralFeatures().get(0); @@ -292,6 +296,7 @@ public class PartialSerializationTestLanguagePackageImpl extends EPackageImpl im * * @generated */ + @Override public EClass getOptionalValue() { return optionalValueEClass; @@ -302,6 +307,7 @@ public class PartialSerializationTestLanguagePackageImpl extends EPackageImpl im * * @generated */ + @Override public EAttribute getOptionalValue_Name() { return (EAttribute)optionalValueEClass.getEStructuralFeatures().get(0); @@ -312,6 +318,7 @@ public class PartialSerializationTestLanguagePackageImpl extends EPackageImpl im * * @generated */ + @Override public EClass getManyOptionalValues() { return manyOptionalValuesEClass; @@ -322,6 +329,7 @@ public class PartialSerializationTestLanguagePackageImpl extends EPackageImpl im * * @generated */ + @Override public EClass getManyMandatoryValues() { return manyMandatoryValuesEClass; @@ -332,6 +340,7 @@ public class PartialSerializationTestLanguagePackageImpl extends EPackageImpl im * * @generated */ + @Override public EAttribute getManyMandatoryValues_Name() { return (EAttribute)manyMandatoryValuesEClass.getEStructuralFeatures().get(0); @@ -342,6 +351,7 @@ public class PartialSerializationTestLanguagePackageImpl extends EPackageImpl im * * @generated */ + @Override public EClass getMandatoryChild() { return mandatoryChildEClass; @@ -352,6 +362,7 @@ public class PartialSerializationTestLanguagePackageImpl extends EPackageImpl im * * @generated */ + @Override public EReference getMandatoryChild_Child() { return (EReference)mandatoryChildEClass.getEStructuralFeatures().get(0); @@ -362,6 +373,7 @@ public class PartialSerializationTestLanguagePackageImpl extends EPackageImpl im * * @generated */ + @Override public EClass getOptionalChild() { return optionalChildEClass; @@ -372,6 +384,7 @@ public class PartialSerializationTestLanguagePackageImpl extends EPackageImpl im * * @generated */ + @Override public EReference getOptionalChild_Child() { return (EReference)optionalChildEClass.getEStructuralFeatures().get(0); @@ -382,6 +395,7 @@ public class PartialSerializationTestLanguagePackageImpl extends EPackageImpl im * * @generated */ + @Override public EClass getTwoChildLists() { return twoChildListsEClass; @@ -392,6 +406,7 @@ public class PartialSerializationTestLanguagePackageImpl extends EPackageImpl im * * @generated */ + @Override public EReference getTwoChildLists_DirectChildren() { return (EReference)twoChildListsEClass.getEStructuralFeatures().get(0); @@ -402,6 +417,7 @@ public class PartialSerializationTestLanguagePackageImpl extends EPackageImpl im * * @generated */ + @Override public EReference getTwoChildLists_ChildsList() { return (EReference)twoChildListsEClass.getEStructuralFeatures().get(1); @@ -412,6 +428,7 @@ public class PartialSerializationTestLanguagePackageImpl extends EPackageImpl im * * @generated */ + @Override public EClass getTwoChilds() { return twoChildsEClass; @@ -422,6 +439,7 @@ public class PartialSerializationTestLanguagePackageImpl extends EPackageImpl im * * @generated */ + @Override public EReference getTwoChilds_DirectChild() { return (EReference)twoChildsEClass.getEStructuralFeatures().get(0); @@ -432,6 +450,7 @@ public class PartialSerializationTestLanguagePackageImpl extends EPackageImpl im * * @generated */ + @Override public EReference getTwoChilds_OptChild() { return (EReference)twoChildsEClass.getEStructuralFeatures().get(1); @@ -442,6 +461,7 @@ public class PartialSerializationTestLanguagePackageImpl extends EPackageImpl im * * @generated */ + @Override public EClass getChildWithSubChilds() { return childWithSubChildsEClass; @@ -452,6 +472,7 @@ public class PartialSerializationTestLanguagePackageImpl extends EPackageImpl im * * @generated */ + @Override public EReference getChildWithSubChilds_Children() { return (EReference)childWithSubChildsEClass.getEStructuralFeatures().get(0); @@ -462,6 +483,7 @@ public class PartialSerializationTestLanguagePackageImpl extends EPackageImpl im * * @generated */ + @Override public EClass getChildWithSubChild() { return childWithSubChildEClass; @@ -472,6 +494,7 @@ public class PartialSerializationTestLanguagePackageImpl extends EPackageImpl im * * @generated */ + @Override public EReference getChildWithSubChild_SubChilds() { return (EReference)childWithSubChildEClass.getEStructuralFeatures().get(0); @@ -482,6 +505,7 @@ public class PartialSerializationTestLanguagePackageImpl extends EPackageImpl im * * @generated */ + @Override public EClass getSubChild() { return subChildEClass; @@ -492,6 +516,7 @@ public class PartialSerializationTestLanguagePackageImpl extends EPackageImpl im * * @generated */ + @Override public EAttribute getSubChild_Name() { return (EAttribute)subChildEClass.getEStructuralFeatures().get(0); @@ -502,6 +527,7 @@ public class PartialSerializationTestLanguagePackageImpl extends EPackageImpl im * * @generated */ + @Override public EClass getMandatoryChildList() { return mandatoryChildListEClass; @@ -512,6 +538,7 @@ public class PartialSerializationTestLanguagePackageImpl extends EPackageImpl im * * @generated */ + @Override public EReference getMandatoryChildList_Children() { return (EReference)mandatoryChildListEClass.getEStructuralFeatures().get(0); @@ -522,6 +549,7 @@ public class PartialSerializationTestLanguagePackageImpl extends EPackageImpl im * * @generated */ + @Override public EClass getOptionalChildList() { return optionalChildListEClass; @@ -532,6 +560,7 @@ public class PartialSerializationTestLanguagePackageImpl extends EPackageImpl im * * @generated */ + @Override public EReference getOptionalChildList_Children() { return (EReference)optionalChildListEClass.getEStructuralFeatures().get(0); @@ -542,6 +571,7 @@ public class PartialSerializationTestLanguagePackageImpl extends EPackageImpl im * * @generated */ + @Override public EClass getImport() { return importEClass; @@ -552,6 +582,7 @@ public class PartialSerializationTestLanguagePackageImpl extends EPackageImpl im * * @generated */ + @Override public EAttribute getImport_ImportedNamespace() { return (EAttribute)importEClass.getEStructuralFeatures().get(0); @@ -562,6 +593,7 @@ public class PartialSerializationTestLanguagePackageImpl extends EPackageImpl im * * @generated */ + @Override public EClass getNode() { return nodeEClass; @@ -572,6 +604,7 @@ public class PartialSerializationTestLanguagePackageImpl extends EPackageImpl im * * @generated */ + @Override public EReference getNode_Imports() { return (EReference)nodeEClass.getEStructuralFeatures().get(0); @@ -582,6 +615,7 @@ public class PartialSerializationTestLanguagePackageImpl extends EPackageImpl im * * @generated */ + @Override public EAttribute getNode_Name() { return (EAttribute)nodeEClass.getEStructuralFeatures().get(1); @@ -592,6 +626,7 @@ public class PartialSerializationTestLanguagePackageImpl extends EPackageImpl im * * @generated */ + @Override public EReference getNode_Refs() { return (EReference)nodeEClass.getEStructuralFeatures().get(2); @@ -602,6 +637,7 @@ public class PartialSerializationTestLanguagePackageImpl extends EPackageImpl im * * @generated */ + @Override public EReference getNode_Children() { return (EReference)nodeEClass.getEStructuralFeatures().get(3); @@ -612,6 +648,7 @@ public class PartialSerializationTestLanguagePackageImpl extends EPackageImpl im * * @generated */ + @Override public EReference getNode_Ref() { return (EReference)nodeEClass.getEStructuralFeatures().get(4); @@ -622,6 +659,7 @@ public class PartialSerializationTestLanguagePackageImpl extends EPackageImpl im * * @generated */ + @Override public EClass getEClassRef() { return eClassRefEClass; @@ -632,6 +670,7 @@ public class PartialSerializationTestLanguagePackageImpl extends EPackageImpl im * * @generated */ + @Override public EReference getEClassRef_Ref() { return (EReference)eClassRefEClass.getEStructuralFeatures().get(0); @@ -642,6 +681,7 @@ public class PartialSerializationTestLanguagePackageImpl extends EPackageImpl im * * @generated */ + @Override public EClass getWithTransientContainer() { return withTransientContainerEClass; @@ -652,6 +692,7 @@ public class PartialSerializationTestLanguagePackageImpl extends EPackageImpl im * * @generated */ + @Override public EReference getWithTransientContainer_Child() { return (EReference)withTransientContainerEClass.getEStructuralFeatures().get(0); @@ -662,6 +703,7 @@ public class PartialSerializationTestLanguagePackageImpl extends EPackageImpl im * * @generated */ + @Override public EClass getManyValues() { return manyValuesEClass; @@ -672,6 +714,7 @@ public class PartialSerializationTestLanguagePackageImpl extends EPackageImpl im * * @generated */ + @Override public EAttribute getManyValues_Name() { return (EAttribute)manyValuesEClass.getEStructuralFeatures().get(0); @@ -682,6 +725,7 @@ public class PartialSerializationTestLanguagePackageImpl extends EPackageImpl im * * @generated */ + @Override public PartialSerializationTestLanguageFactory getPartialSerializationTestLanguageFactory() { return (PartialSerializationTestLanguageFactory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/impl/SubChildImpl.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/impl/SubChildImpl.java index 2e2a68570..0685d6c7c 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/impl/SubChildImpl.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/impl/SubChildImpl.java @@ -78,6 +78,7 @@ public class SubChildImpl extends MinimalEObjectImpl.Container implements SubChi * * @generated */ + @Override public String getName() { return name; @@ -88,6 +89,7 @@ public class SubChildImpl extends MinimalEObjectImpl.Container implements SubChi * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -172,7 +174,7 @@ public class SubChildImpl extends MinimalEObjectImpl.Container implements SubChi { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/impl/TwoChildListsImpl.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/impl/TwoChildListsImpl.java index 9a1af9cd6..7a84b2069 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/impl/TwoChildListsImpl.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/impl/TwoChildListsImpl.java @@ -89,6 +89,7 @@ public class TwoChildListsImpl extends ModelImpl implements TwoChildLists * * @generated */ + @Override public EList getDirectChildren() { if (directChildren == null) @@ -103,6 +104,7 @@ public class TwoChildListsImpl extends ModelImpl implements TwoChildLists * * @generated */ + @Override public MandatoryChildList getChildsList() { return childsList; @@ -130,6 +132,7 @@ public class TwoChildListsImpl extends ModelImpl implements TwoChildLists * * @generated */ + @Override public void setChildsList(MandatoryChildList newChildsList) { if (newChildsList != childsList) diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/impl/TwoChildsImpl.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/impl/TwoChildsImpl.java index c4c660bf6..dec73b28a 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/impl/TwoChildsImpl.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/impl/TwoChildsImpl.java @@ -82,6 +82,7 @@ public class TwoChildsImpl extends ModelImpl implements TwoChilds * * @generated */ + @Override public MandatoryValue getDirectChild() { return directChild; @@ -109,6 +110,7 @@ public class TwoChildsImpl extends ModelImpl implements TwoChilds * * @generated */ + @Override public void setDirectChild(MandatoryValue newDirectChild) { if (newDirectChild != directChild) @@ -130,6 +132,7 @@ public class TwoChildsImpl extends ModelImpl implements TwoChilds * * @generated */ + @Override public OptionalChild getOptChild() { return optChild; @@ -157,6 +160,7 @@ public class TwoChildsImpl extends ModelImpl implements TwoChilds * * @generated */ + @Override public void setOptChild(OptionalChild newOptChild) { if (newOptChild != optChild) diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/impl/WithTransientContainerImpl.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/impl/WithTransientContainerImpl.java index f6d9ca394..359e1fa6f 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/impl/WithTransientContainerImpl.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/partialSerializationTestLanguage/impl/WithTransientContainerImpl.java @@ -71,6 +71,7 @@ public class WithTransientContainerImpl extends ModelImpl implements WithTransie * * @generated */ + @Override public WithTransient getChild() { return child; @@ -98,6 +99,7 @@ public class WithTransientContainerImpl extends ModelImpl implements WithTransie * * @generated */ + @Override public void setChild(WithTransient newChild) { if (newChild != child) diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/renameTestLanguage/Model.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/renameTestLanguage/Model.java index 399b3ca52..8064b4ac3 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/renameTestLanguage/Model.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/renameTestLanguage/Model.java @@ -33,10 +33,6 @@ public interface Model extends EObject * Returns the value of the 'Types' containment reference list. * The list contents are of type {@link org.eclipse.xtext.ide.tests.testlanguage.renameTestLanguage.TypeDeclaration}. * - *

- * 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.ide.tests.testlanguage.renameTestLanguage.RenameTestLanguagePackage#getModel_Types() diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/renameTestLanguage/TypeDeclaration.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/renameTestLanguage/TypeDeclaration.java index c48d0ee77..deb1176ac 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/renameTestLanguage/TypeDeclaration.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/renameTestLanguage/TypeDeclaration.java @@ -31,10 +31,6 @@ public interface TypeDeclaration 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) @@ -57,10 +53,6 @@ public interface TypeDeclaration extends EObject /** * Returns the value of the 'Super Type' reference. * - *

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

* * @return the value of the 'Super Type' reference. * @see #setSuperType(TypeDeclaration) diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/renameTestLanguage/impl/ModelImpl.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/renameTestLanguage/impl/ModelImpl.java index ce1605da9..ff97fb3f0 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/renameTestLanguage/impl/ModelImpl.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/renameTestLanguage/impl/ModelImpl.java @@ -76,6 +76,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public EList getTypes() { if (types == null) diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/renameTestLanguage/impl/RenameTestLanguageFactoryImpl.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/renameTestLanguage/impl/RenameTestLanguageFactoryImpl.java index 72b5ac258..70ff9b43a 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/renameTestLanguage/impl/RenameTestLanguageFactoryImpl.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/renameTestLanguage/impl/RenameTestLanguageFactoryImpl.java @@ -81,6 +81,7 @@ public class RenameTestLanguageFactoryImpl extends EFactoryImpl implements Renam * * @generated */ + @Override public Model createModel() { ModelImpl model = new ModelImpl(); @@ -92,6 +93,7 @@ public class RenameTestLanguageFactoryImpl extends EFactoryImpl implements Renam * * @generated */ + @Override public TypeDeclaration createTypeDeclaration() { TypeDeclarationImpl typeDeclaration = new TypeDeclarationImpl(); @@ -103,6 +105,7 @@ public class RenameTestLanguageFactoryImpl extends EFactoryImpl implements Renam * * @generated */ + @Override public RenameTestLanguagePackage getRenameTestLanguagePackage() { return (RenameTestLanguagePackage)getEPackage(); diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/renameTestLanguage/impl/RenameTestLanguagePackageImpl.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/renameTestLanguage/impl/RenameTestLanguagePackageImpl.java index cbb713532..7e2dd8b6c 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/renameTestLanguage/impl/RenameTestLanguagePackageImpl.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/renameTestLanguage/impl/RenameTestLanguagePackageImpl.java @@ -71,7 +71,7 @@ public class RenameTestLanguagePackageImpl extends EPackageImpl implements Renam /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link RenameTestLanguagePackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -86,7 +86,8 @@ public class RenameTestLanguagePackageImpl extends EPackageImpl implements Renam if (isInited) return (RenameTestLanguagePackage)EPackage.Registry.INSTANCE.getEPackage(RenameTestLanguagePackage.eNS_URI); // Obtain or create and register package - RenameTestLanguagePackageImpl theRenameTestLanguagePackage = (RenameTestLanguagePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof RenameTestLanguagePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new RenameTestLanguagePackageImpl()); + Object registeredRenameTestLanguagePackage = EPackage.Registry.INSTANCE.get(eNS_URI); + RenameTestLanguagePackageImpl theRenameTestLanguagePackage = registeredRenameTestLanguagePackage instanceof RenameTestLanguagePackageImpl ? (RenameTestLanguagePackageImpl)registeredRenameTestLanguagePackage : new RenameTestLanguagePackageImpl(); isInited = true; @@ -102,7 +103,6 @@ public class RenameTestLanguagePackageImpl extends EPackageImpl implements Renam // Mark meta-data to indicate it can't be changed theRenameTestLanguagePackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(RenameTestLanguagePackage.eNS_URI, theRenameTestLanguagePackage); return theRenameTestLanguagePackage; @@ -113,6 +113,7 @@ public class RenameTestLanguagePackageImpl extends EPackageImpl implements Renam * * @generated */ + @Override public EClass getModel() { return modelEClass; @@ -123,6 +124,7 @@ public class RenameTestLanguagePackageImpl extends EPackageImpl implements Renam * * @generated */ + @Override public EReference getModel_Types() { return (EReference)modelEClass.getEStructuralFeatures().get(0); @@ -133,6 +135,7 @@ public class RenameTestLanguagePackageImpl extends EPackageImpl implements Renam * * @generated */ + @Override public EClass getTypeDeclaration() { return typeDeclarationEClass; @@ -143,6 +146,7 @@ public class RenameTestLanguagePackageImpl extends EPackageImpl implements Renam * * @generated */ + @Override public EAttribute getTypeDeclaration_Name() { return (EAttribute)typeDeclarationEClass.getEStructuralFeatures().get(0); @@ -153,6 +157,7 @@ public class RenameTestLanguagePackageImpl extends EPackageImpl implements Renam * * @generated */ + @Override public EReference getTypeDeclaration_SuperType() { return (EReference)typeDeclarationEClass.getEStructuralFeatures().get(1); @@ -163,6 +168,7 @@ public class RenameTestLanguagePackageImpl extends EPackageImpl implements Renam * * @generated */ + @Override public RenameTestLanguageFactory getRenameTestLanguageFactory() { return (RenameTestLanguageFactory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/renameTestLanguage/impl/TypeDeclarationImpl.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/renameTestLanguage/impl/TypeDeclarationImpl.java index 5074a9908..a4f98498e 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/renameTestLanguage/impl/TypeDeclarationImpl.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/renameTestLanguage/impl/TypeDeclarationImpl.java @@ -90,6 +90,7 @@ public class TypeDeclarationImpl extends MinimalEObjectImpl.Container implements * * @generated */ + @Override public String getName() { return name; @@ -100,6 +101,7 @@ public class TypeDeclarationImpl extends MinimalEObjectImpl.Container implements * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -113,6 +115,7 @@ public class TypeDeclarationImpl extends MinimalEObjectImpl.Container implements * * @generated */ + @Override public TypeDeclaration getSuperType() { if (superType != null && superType.eIsProxy()) @@ -143,6 +146,7 @@ public class TypeDeclarationImpl extends MinimalEObjectImpl.Container implements * * @generated */ + @Override public void setSuperType(TypeDeclaration newSuperType) { TypeDeclaration oldSuperType = superType; @@ -238,7 +242,7 @@ public class TypeDeclarationImpl extends MinimalEObjectImpl.Container implements { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/AbstractElement.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/AbstractElement.java index 8c1321d39..f20584ca5 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/AbstractElement.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/AbstractElement.java @@ -30,10 +30,6 @@ public interface AbstractElement 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) diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/Member.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/Member.java index 922c85e87..d74e01aa9 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/Member.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/Member.java @@ -30,10 +30,6 @@ public interface Member 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) diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/Model.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/Model.java index f4bbc8eed..2e08fb589 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/Model.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/Model.java @@ -33,10 +33,6 @@ public interface Model extends EObject * Returns the value of the 'Elements' containment reference list. * The list contents are of type {@link org.eclipse.xtext.ide.tests.testlanguage.testLanguage.AbstractElement}. * - *

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

* * @return the value of the 'Elements' containment reference list. * @see org.eclipse.xtext.ide.tests.testlanguage.testLanguage.TestLanguagePackage#getModel_Elements() diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/Operation.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/Operation.java index 9e11e4830..685265947 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/Operation.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/Operation.java @@ -33,10 +33,6 @@ public interface Operation extends Member * Returns the value of the 'Params' containment reference list. * The list contents are of type {@link org.eclipse.xtext.ide.tests.testlanguage.testLanguage.Parameter}. * - *

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

* * @return the value of the 'Params' containment reference list. * @see org.eclipse.xtext.ide.tests.testlanguage.testLanguage.TestLanguagePackage#getOperation_Params() @@ -48,10 +44,6 @@ public interface Operation extends Member /** * Returns the value of the 'Return Type' containment reference. * - *

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

* * @return the value of the 'Return Type' containment reference. * @see #setReturnType(Type) @@ -74,10 +66,6 @@ public interface Operation extends Member /** * Returns the value of the 'Operation Call' containment reference. * - *

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

* * @return the value of the 'Operation Call' containment reference. * @see #setOperationCall(OperationCall) diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/OperationCall.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/OperationCall.java index 7fe77e379..2d6632882 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/OperationCall.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/OperationCall.java @@ -33,10 +33,6 @@ public interface OperationCall extends EObject /** * Returns the value of the 'Operation' reference. * - *

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

* * @return the value of the 'Operation' reference. * @see #setOperation(Operation) @@ -60,10 +56,6 @@ public interface OperationCall extends EObject * Returns the value of the 'Params' attribute list. * The list contents are of type {@link java.lang.Integer}. * - *

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

* * @return the value of the 'Params' attribute list. * @see org.eclipse.xtext.ide.tests.testlanguage.testLanguage.TestLanguagePackage#getOperationCall_Params() diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/PackageDeclaration.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/PackageDeclaration.java index 33546721f..6a7248ef7 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/PackageDeclaration.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/PackageDeclaration.java @@ -31,10 +31,6 @@ public interface PackageDeclaration extends AbstractElement * Returns the value of the 'Elements' containment reference list. * The list contents are of type {@link org.eclipse.xtext.ide.tests.testlanguage.testLanguage.AbstractElement}. * - *

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

* * @return the value of the 'Elements' containment reference list. * @see org.eclipse.xtext.ide.tests.testlanguage.testLanguage.TestLanguagePackage#getPackageDeclaration_Elements() diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/Parameter.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/Parameter.java index 1d0d91068..20f909b12 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/Parameter.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/Parameter.java @@ -31,10 +31,6 @@ public interface Parameter 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) @@ -57,10 +53,6 @@ public interface Parameter extends EObject /** * Returns the value of the 'Type' containment reference. * - *

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

* * @return the value of the 'Type' containment reference. * @see #setType(Type) diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/PrimitiveType.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/PrimitiveType.java index ef61b4d55..394999df5 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/PrimitiveType.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/PrimitiveType.java @@ -29,10 +29,6 @@ public interface PrimitiveType extends Type /** * 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) diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/Property.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/Property.java index 4c390703d..556fcae9e 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/Property.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/Property.java @@ -29,10 +29,6 @@ public interface Property extends Member /** * Returns the value of the 'Type' containment reference. * - *

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

* * @return the value of the 'Type' containment reference. * @see #setType(Type) diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/Type.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/Type.java index 8f28da8a8..111fec0a3 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/Type.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/Type.java @@ -33,10 +33,6 @@ public interface Type extends EObject * Returns the value of the 'Array Diemensions' attribute list. * The list contents are of type {@link java.lang.String}. * - *

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

* * @return the value of the 'Array Diemensions' attribute list. * @see org.eclipse.xtext.ide.tests.testlanguage.testLanguage.TestLanguagePackage#getType_ArrayDiemensions() diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/TypeDeclaration.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/TypeDeclaration.java index ed8e3babc..c42e7176a 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/TypeDeclaration.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/TypeDeclaration.java @@ -31,10 +31,6 @@ public interface TypeDeclaration extends AbstractElement /** * Returns the value of the 'Super Type' reference. * - *

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

* * @return the value of the 'Super Type' reference. * @see #setSuperType(TypeDeclaration) @@ -58,10 +54,6 @@ public interface TypeDeclaration extends AbstractElement * Returns the value of the 'Members' containment reference list. * The list contents are of type {@link org.eclipse.xtext.ide.tests.testlanguage.testLanguage.Member}. * - *

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

* * @return the value of the 'Members' containment reference list. * @see org.eclipse.xtext.ide.tests.testlanguage.testLanguage.TestLanguagePackage#getTypeDeclaration_Members() diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/TypeReference.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/TypeReference.java index 8e31bd588..c07e2c830 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/TypeReference.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/TypeReference.java @@ -29,10 +29,6 @@ public interface TypeReference extends Type /** * Returns the value of the 'Type Ref' reference. * - *

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

* * @return the value of the 'Type Ref' reference. * @see #setTypeRef(TypeDeclaration) diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/impl/AbstractElementImpl.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/impl/AbstractElementImpl.java index 46c37f43b..b16e5f1cc 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/impl/AbstractElementImpl.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/impl/AbstractElementImpl.java @@ -78,6 +78,7 @@ public class AbstractElementImpl extends MinimalEObjectImpl.Container implements * * @generated */ + @Override public String getName() { return name; @@ -88,6 +89,7 @@ public class AbstractElementImpl extends MinimalEObjectImpl.Container implements * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -172,7 +174,7 @@ public class AbstractElementImpl extends MinimalEObjectImpl.Container implements { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/impl/MemberImpl.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/impl/MemberImpl.java index 307aa38b1..f716009e7 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/impl/MemberImpl.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/impl/MemberImpl.java @@ -78,6 +78,7 @@ public class MemberImpl extends MinimalEObjectImpl.Container implements Member * * @generated */ + @Override public String getName() { return name; @@ -88,6 +89,7 @@ public class MemberImpl extends MinimalEObjectImpl.Container implements Member * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -172,7 +174,7 @@ public class MemberImpl extends MinimalEObjectImpl.Container implements Member { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/impl/ModelImpl.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/impl/ModelImpl.java index fea3ee407..d5aa95f92 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/impl/ModelImpl.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/impl/ModelImpl.java @@ -76,6 +76,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public EList getElements() { if (elements == null) diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/impl/OperationCallImpl.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/impl/OperationCallImpl.java index 479fb1d19..6de5288ee 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/impl/OperationCallImpl.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/impl/OperationCallImpl.java @@ -87,6 +87,7 @@ public class OperationCallImpl extends MinimalEObjectImpl.Container implements O * * @generated */ + @Override public Operation getOperation() { if (operation != null && operation.eIsProxy()) @@ -117,6 +118,7 @@ public class OperationCallImpl extends MinimalEObjectImpl.Container implements O * * @generated */ + @Override public void setOperation(Operation newOperation) { Operation oldOperation = operation; @@ -130,6 +132,7 @@ public class OperationCallImpl extends MinimalEObjectImpl.Container implements O * * @generated */ + @Override public EList getParams() { if (params == null) @@ -228,7 +231,7 @@ public class OperationCallImpl extends MinimalEObjectImpl.Container implements O { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (params: "); result.append(params); result.append(')'); diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/impl/OperationImpl.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/impl/OperationImpl.java index 689d2c218..da4e25605 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/impl/OperationImpl.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/impl/OperationImpl.java @@ -101,6 +101,7 @@ public class OperationImpl extends MemberImpl implements Operation * * @generated */ + @Override public EList getParams() { if (params == null) @@ -115,6 +116,7 @@ public class OperationImpl extends MemberImpl implements Operation * * @generated */ + @Override public Type getReturnType() { return returnType; @@ -142,6 +144,7 @@ public class OperationImpl extends MemberImpl implements Operation * * @generated */ + @Override public void setReturnType(Type newReturnType) { if (newReturnType != returnType) @@ -163,6 +166,7 @@ public class OperationImpl extends MemberImpl implements Operation * * @generated */ + @Override public OperationCall getOperationCall() { return operationCall; @@ -190,6 +194,7 @@ public class OperationImpl extends MemberImpl implements Operation * * @generated */ + @Override public void setOperationCall(OperationCall newOperationCall) { if (newOperationCall != operationCall) diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/impl/PackageDeclarationImpl.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/impl/PackageDeclarationImpl.java index e149ccf08..fb1533442 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/impl/PackageDeclarationImpl.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/impl/PackageDeclarationImpl.java @@ -74,6 +74,7 @@ public class PackageDeclarationImpl extends AbstractElementImpl implements Packa * * @generated */ + @Override public EList getElements() { if (elements == null) diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/impl/ParameterImpl.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/impl/ParameterImpl.java index b50997fd0..e84e0d886 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/impl/ParameterImpl.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/impl/ParameterImpl.java @@ -92,6 +92,7 @@ public class ParameterImpl extends MinimalEObjectImpl.Container implements Param * * @generated */ + @Override public String getName() { return name; @@ -102,6 +103,7 @@ public class ParameterImpl extends MinimalEObjectImpl.Container implements Param * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -115,6 +117,7 @@ public class ParameterImpl extends MinimalEObjectImpl.Container implements Param * * @generated */ + @Override public Type getType() { return type; @@ -142,6 +145,7 @@ public class ParameterImpl extends MinimalEObjectImpl.Container implements Param * * @generated */ + @Override public void setType(Type newType) { if (newType != type) @@ -260,7 +264,7 @@ public class ParameterImpl extends MinimalEObjectImpl.Container implements Param { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/impl/PrimitiveTypeImpl.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/impl/PrimitiveTypeImpl.java index 123415d95..03a20af01 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/impl/PrimitiveTypeImpl.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/impl/PrimitiveTypeImpl.java @@ -77,6 +77,7 @@ public class PrimitiveTypeImpl extends TypeImpl implements PrimitiveType * * @generated */ + @Override public String getName() { return name; @@ -87,6 +88,7 @@ public class PrimitiveTypeImpl extends TypeImpl implements PrimitiveType * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -171,7 +173,7 @@ public class PrimitiveTypeImpl extends TypeImpl implements PrimitiveType { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/impl/PropertyImpl.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/impl/PropertyImpl.java index 78f3c7291..e0c5215f7 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/impl/PropertyImpl.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/impl/PropertyImpl.java @@ -70,6 +70,7 @@ public class PropertyImpl extends MemberImpl implements Property * * @generated */ + @Override public Type getType() { return type; @@ -97,6 +98,7 @@ public class PropertyImpl extends MemberImpl implements Property * * @generated */ + @Override public void setType(Type newType) { if (newType != type) diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/impl/TestLanguageFactoryImpl.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/impl/TestLanguageFactoryImpl.java index 3bbea1cc9..5ed1c5227 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/impl/TestLanguageFactoryImpl.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/impl/TestLanguageFactoryImpl.java @@ -91,6 +91,7 @@ public class TestLanguageFactoryImpl extends EFactoryImpl implements TestLanguag * * @generated */ + @Override public Model createModel() { ModelImpl model = new ModelImpl(); @@ -102,6 +103,7 @@ public class TestLanguageFactoryImpl extends EFactoryImpl implements TestLanguag * * @generated */ + @Override public PackageDeclaration createPackageDeclaration() { PackageDeclarationImpl packageDeclaration = new PackageDeclarationImpl(); @@ -113,6 +115,7 @@ public class TestLanguageFactoryImpl extends EFactoryImpl implements TestLanguag * * @generated */ + @Override public AbstractElement createAbstractElement() { AbstractElementImpl abstractElement = new AbstractElementImpl(); @@ -124,6 +127,7 @@ public class TestLanguageFactoryImpl extends EFactoryImpl implements TestLanguag * * @generated */ + @Override public TypeDeclaration createTypeDeclaration() { TypeDeclarationImpl typeDeclaration = new TypeDeclarationImpl(); @@ -135,6 +139,7 @@ public class TestLanguageFactoryImpl extends EFactoryImpl implements TestLanguag * * @generated */ + @Override public Member createMember() { MemberImpl member = new MemberImpl(); @@ -146,6 +151,7 @@ public class TestLanguageFactoryImpl extends EFactoryImpl implements TestLanguag * * @generated */ + @Override public Property createProperty() { PropertyImpl property = new PropertyImpl(); @@ -157,6 +163,7 @@ public class TestLanguageFactoryImpl extends EFactoryImpl implements TestLanguag * * @generated */ + @Override public Type createType() { TypeImpl type = new TypeImpl(); @@ -168,6 +175,7 @@ public class TestLanguageFactoryImpl extends EFactoryImpl implements TestLanguag * * @generated */ + @Override public Operation createOperation() { OperationImpl operation = new OperationImpl(); @@ -179,6 +187,7 @@ public class TestLanguageFactoryImpl extends EFactoryImpl implements TestLanguag * * @generated */ + @Override public OperationCall createOperationCall() { OperationCallImpl operationCall = new OperationCallImpl(); @@ -190,6 +199,7 @@ public class TestLanguageFactoryImpl extends EFactoryImpl implements TestLanguag * * @generated */ + @Override public Parameter createParameter() { ParameterImpl parameter = new ParameterImpl(); @@ -201,6 +211,7 @@ public class TestLanguageFactoryImpl extends EFactoryImpl implements TestLanguag * * @generated */ + @Override public TypeReference createTypeReference() { TypeReferenceImpl typeReference = new TypeReferenceImpl(); @@ -212,6 +223,7 @@ public class TestLanguageFactoryImpl extends EFactoryImpl implements TestLanguag * * @generated */ + @Override public PrimitiveType createPrimitiveType() { PrimitiveTypeImpl primitiveType = new PrimitiveTypeImpl(); @@ -223,6 +235,7 @@ public class TestLanguageFactoryImpl extends EFactoryImpl implements TestLanguag * * @generated */ + @Override public TestLanguagePackage getTestLanguagePackage() { return (TestLanguagePackage)getEPackage(); diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/impl/TestLanguagePackageImpl.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/impl/TestLanguagePackageImpl.java index de764e6e0..923583fc9 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/impl/TestLanguagePackageImpl.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/impl/TestLanguagePackageImpl.java @@ -151,7 +151,7 @@ public class TestLanguagePackageImpl extends EPackageImpl implements TestLanguag /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link TestLanguagePackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -166,7 +166,8 @@ public class TestLanguagePackageImpl extends EPackageImpl implements TestLanguag if (isInited) return (TestLanguagePackage)EPackage.Registry.INSTANCE.getEPackage(TestLanguagePackage.eNS_URI); // Obtain or create and register package - TestLanguagePackageImpl theTestLanguagePackage = (TestLanguagePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof TestLanguagePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new TestLanguagePackageImpl()); + Object registeredTestLanguagePackage = EPackage.Registry.INSTANCE.get(eNS_URI); + TestLanguagePackageImpl theTestLanguagePackage = registeredTestLanguagePackage instanceof TestLanguagePackageImpl ? (TestLanguagePackageImpl)registeredTestLanguagePackage : new TestLanguagePackageImpl(); isInited = true; @@ -182,7 +183,6 @@ public class TestLanguagePackageImpl extends EPackageImpl implements TestLanguag // Mark meta-data to indicate it can't be changed theTestLanguagePackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(TestLanguagePackage.eNS_URI, theTestLanguagePackage); return theTestLanguagePackage; @@ -193,6 +193,7 @@ public class TestLanguagePackageImpl extends EPackageImpl implements TestLanguag * * @generated */ + @Override public EClass getModel() { return modelEClass; @@ -203,6 +204,7 @@ public class TestLanguagePackageImpl extends EPackageImpl implements TestLanguag * * @generated */ + @Override public EReference getModel_Elements() { return (EReference)modelEClass.getEStructuralFeatures().get(0); @@ -213,6 +215,7 @@ public class TestLanguagePackageImpl extends EPackageImpl implements TestLanguag * * @generated */ + @Override public EClass getPackageDeclaration() { return packageDeclarationEClass; @@ -223,6 +226,7 @@ public class TestLanguagePackageImpl extends EPackageImpl implements TestLanguag * * @generated */ + @Override public EReference getPackageDeclaration_Elements() { return (EReference)packageDeclarationEClass.getEStructuralFeatures().get(0); @@ -233,6 +237,7 @@ public class TestLanguagePackageImpl extends EPackageImpl implements TestLanguag * * @generated */ + @Override public EClass getAbstractElement() { return abstractElementEClass; @@ -243,6 +248,7 @@ public class TestLanguagePackageImpl extends EPackageImpl implements TestLanguag * * @generated */ + @Override public EAttribute getAbstractElement_Name() { return (EAttribute)abstractElementEClass.getEStructuralFeatures().get(0); @@ -253,6 +259,7 @@ public class TestLanguagePackageImpl extends EPackageImpl implements TestLanguag * * @generated */ + @Override public EClass getTypeDeclaration() { return typeDeclarationEClass; @@ -263,6 +270,7 @@ public class TestLanguagePackageImpl extends EPackageImpl implements TestLanguag * * @generated */ + @Override public EReference getTypeDeclaration_SuperType() { return (EReference)typeDeclarationEClass.getEStructuralFeatures().get(0); @@ -273,6 +281,7 @@ public class TestLanguagePackageImpl extends EPackageImpl implements TestLanguag * * @generated */ + @Override public EReference getTypeDeclaration_Members() { return (EReference)typeDeclarationEClass.getEStructuralFeatures().get(1); @@ -283,6 +292,7 @@ public class TestLanguagePackageImpl extends EPackageImpl implements TestLanguag * * @generated */ + @Override public EClass getMember() { return memberEClass; @@ -293,6 +303,7 @@ public class TestLanguagePackageImpl extends EPackageImpl implements TestLanguag * * @generated */ + @Override public EAttribute getMember_Name() { return (EAttribute)memberEClass.getEStructuralFeatures().get(0); @@ -303,6 +314,7 @@ public class TestLanguagePackageImpl extends EPackageImpl implements TestLanguag * * @generated */ + @Override public EClass getProperty() { return propertyEClass; @@ -313,6 +325,7 @@ public class TestLanguagePackageImpl extends EPackageImpl implements TestLanguag * * @generated */ + @Override public EReference getProperty_Type() { return (EReference)propertyEClass.getEStructuralFeatures().get(0); @@ -323,6 +336,7 @@ public class TestLanguagePackageImpl extends EPackageImpl implements TestLanguag * * @generated */ + @Override public EClass getType() { return typeEClass; @@ -333,6 +347,7 @@ public class TestLanguagePackageImpl extends EPackageImpl implements TestLanguag * * @generated */ + @Override public EAttribute getType_ArrayDiemensions() { return (EAttribute)typeEClass.getEStructuralFeatures().get(0); @@ -343,6 +358,7 @@ public class TestLanguagePackageImpl extends EPackageImpl implements TestLanguag * * @generated */ + @Override public EClass getOperation() { return operationEClass; @@ -353,6 +369,7 @@ public class TestLanguagePackageImpl extends EPackageImpl implements TestLanguag * * @generated */ + @Override public EReference getOperation_Params() { return (EReference)operationEClass.getEStructuralFeatures().get(0); @@ -363,6 +380,7 @@ public class TestLanguagePackageImpl extends EPackageImpl implements TestLanguag * * @generated */ + @Override public EReference getOperation_ReturnType() { return (EReference)operationEClass.getEStructuralFeatures().get(1); @@ -373,6 +391,7 @@ public class TestLanguagePackageImpl extends EPackageImpl implements TestLanguag * * @generated */ + @Override public EReference getOperation_OperationCall() { return (EReference)operationEClass.getEStructuralFeatures().get(2); @@ -383,6 +402,7 @@ public class TestLanguagePackageImpl extends EPackageImpl implements TestLanguag * * @generated */ + @Override public EClass getOperationCall() { return operationCallEClass; @@ -393,6 +413,7 @@ public class TestLanguagePackageImpl extends EPackageImpl implements TestLanguag * * @generated */ + @Override public EReference getOperationCall_Operation() { return (EReference)operationCallEClass.getEStructuralFeatures().get(0); @@ -403,6 +424,7 @@ public class TestLanguagePackageImpl extends EPackageImpl implements TestLanguag * * @generated */ + @Override public EAttribute getOperationCall_Params() { return (EAttribute)operationCallEClass.getEStructuralFeatures().get(1); @@ -413,6 +435,7 @@ public class TestLanguagePackageImpl extends EPackageImpl implements TestLanguag * * @generated */ + @Override public EClass getParameter() { return parameterEClass; @@ -423,6 +446,7 @@ public class TestLanguagePackageImpl extends EPackageImpl implements TestLanguag * * @generated */ + @Override public EAttribute getParameter_Name() { return (EAttribute)parameterEClass.getEStructuralFeatures().get(0); @@ -433,6 +457,7 @@ public class TestLanguagePackageImpl extends EPackageImpl implements TestLanguag * * @generated */ + @Override public EReference getParameter_Type() { return (EReference)parameterEClass.getEStructuralFeatures().get(1); @@ -443,6 +468,7 @@ public class TestLanguagePackageImpl extends EPackageImpl implements TestLanguag * * @generated */ + @Override public EClass getTypeReference() { return typeReferenceEClass; @@ -453,6 +479,7 @@ public class TestLanguagePackageImpl extends EPackageImpl implements TestLanguag * * @generated */ + @Override public EReference getTypeReference_TypeRef() { return (EReference)typeReferenceEClass.getEStructuralFeatures().get(0); @@ -463,6 +490,7 @@ public class TestLanguagePackageImpl extends EPackageImpl implements TestLanguag * * @generated */ + @Override public EClass getPrimitiveType() { return primitiveTypeEClass; @@ -473,6 +501,7 @@ public class TestLanguagePackageImpl extends EPackageImpl implements TestLanguag * * @generated */ + @Override public EAttribute getPrimitiveType_Name() { return (EAttribute)primitiveTypeEClass.getEStructuralFeatures().get(0); @@ -483,6 +512,7 @@ public class TestLanguagePackageImpl extends EPackageImpl implements TestLanguag * * @generated */ + @Override public TestLanguageFactory getTestLanguageFactory() { return (TestLanguageFactory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/impl/TypeDeclarationImpl.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/impl/TypeDeclarationImpl.java index 9f3ee6e93..99cf740d1 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/impl/TypeDeclarationImpl.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/impl/TypeDeclarationImpl.java @@ -88,6 +88,7 @@ public class TypeDeclarationImpl extends AbstractElementImpl implements TypeDecl * * @generated */ + @Override public TypeDeclaration getSuperType() { if (superType != null && superType.eIsProxy()) @@ -118,6 +119,7 @@ public class TypeDeclarationImpl extends AbstractElementImpl implements TypeDecl * * @generated */ + @Override public void setSuperType(TypeDeclaration newSuperType) { TypeDeclaration oldSuperType = superType; @@ -131,6 +133,7 @@ public class TypeDeclarationImpl extends AbstractElementImpl implements TypeDecl * * @generated */ + @Override public EList getMembers() { if (members == null) diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/impl/TypeImpl.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/impl/TypeImpl.java index c6a6763b5..08ad3d7ba 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/impl/TypeImpl.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/impl/TypeImpl.java @@ -71,6 +71,7 @@ public class TypeImpl extends MinimalEObjectImpl.Container implements Type * * @generated */ + @Override public EList getArrayDiemensions() { if (arrayDiemensions == null) @@ -158,7 +159,7 @@ public class TypeImpl extends MinimalEObjectImpl.Container implements Type { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (arrayDiemensions: "); result.append(arrayDiemensions); result.append(')'); diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/impl/TypeReferenceImpl.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/impl/TypeReferenceImpl.java index 96784a0bc..be856fd40 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/impl/TypeReferenceImpl.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/testLanguage/impl/TypeReferenceImpl.java @@ -69,6 +69,7 @@ public class TypeReferenceImpl extends TypeImpl implements TypeReference * * @generated */ + @Override public TypeDeclaration getTypeRef() { if (typeRef != null && typeRef.eIsProxy()) @@ -99,6 +100,7 @@ public class TypeReferenceImpl extends TypeImpl implements TypeReference * * @generated */ + @Override public void setTypeRef(TypeDeclaration newTypeRef) { TypeDeclaration oldTypeRef = typeRef; diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/withtransient/WithTransient.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/withtransient/WithTransient.java index 045bb6664..5ee18e6b1 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/withtransient/WithTransient.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/withtransient/WithTransient.java @@ -31,10 +31,6 @@ public interface WithTransient 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) @@ -57,10 +53,6 @@ public interface WithTransient extends EObject /** * Returns the value of the 'Package Name' attribute. * - *

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

* * @return the value of the 'Package Name' attribute. * @see #setPackageName(String) diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/withtransient/impl/WithTransientImpl.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/withtransient/impl/WithTransientImpl.java index 77036ea0f..5dfa9670c 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/withtransient/impl/WithTransientImpl.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/withtransient/impl/WithTransientImpl.java @@ -99,6 +99,7 @@ public class WithTransientImpl extends MinimalEObjectImpl.Container implements W * * @generated */ + @Override public String getName() { return name; @@ -109,6 +110,7 @@ public class WithTransientImpl extends MinimalEObjectImpl.Container implements W * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -122,6 +124,7 @@ public class WithTransientImpl extends MinimalEObjectImpl.Container implements W * * @generated */ + @Override public String getPackageName() { return packageName; @@ -132,6 +135,7 @@ public class WithTransientImpl extends MinimalEObjectImpl.Container implements W * * @generated */ + @Override public void setPackageName(String newPackageName) { String oldPackageName = packageName; @@ -226,7 +230,7 @@ public class WithTransientImpl extends MinimalEObjectImpl.Container implements W { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(", packageName: "); diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/withtransient/impl/WithtransientFactoryImpl.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/withtransient/impl/WithtransientFactoryImpl.java index 9922f690e..1a16c3cf1 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/withtransient/impl/WithtransientFactoryImpl.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/withtransient/impl/WithtransientFactoryImpl.java @@ -80,6 +80,7 @@ public class WithtransientFactoryImpl extends EFactoryImpl implements Withtransi * * @generated */ + @Override public WithTransient createWithTransient() { WithTransientImpl withTransient = new WithTransientImpl(); @@ -91,6 +92,7 @@ public class WithtransientFactoryImpl extends EFactoryImpl implements Withtransi * * @generated */ + @Override public WithtransientPackage getWithtransientPackage() { return (WithtransientPackage)getEPackage(); diff --git a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/withtransient/impl/WithtransientPackageImpl.java b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/withtransient/impl/WithtransientPackageImpl.java index 25a3d7b0b..4ec76c8dc 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/withtransient/impl/WithtransientPackageImpl.java +++ b/org.eclipse.xtext.ide.tests/testlang-src-gen/org/eclipse/xtext/ide/tests/testlanguage/withtransient/impl/WithtransientPackageImpl.java @@ -61,7 +61,7 @@ public class WithtransientPackageImpl extends EPackageImpl implements Withtransi /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link WithtransientPackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -76,7 +76,8 @@ public class WithtransientPackageImpl extends EPackageImpl implements Withtransi if (isInited) return (WithtransientPackage)EPackage.Registry.INSTANCE.getEPackage(WithtransientPackage.eNS_URI); // Obtain or create and register package - WithtransientPackageImpl theWithtransientPackage = (WithtransientPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof WithtransientPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new WithtransientPackageImpl()); + Object registeredWithtransientPackage = EPackage.Registry.INSTANCE.get(eNS_URI); + WithtransientPackageImpl theWithtransientPackage = registeredWithtransientPackage instanceof WithtransientPackageImpl ? (WithtransientPackageImpl)registeredWithtransientPackage : new WithtransientPackageImpl(); isInited = true; @@ -89,7 +90,6 @@ public class WithtransientPackageImpl extends EPackageImpl implements Withtransi // Mark meta-data to indicate it can't be changed theWithtransientPackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(WithtransientPackage.eNS_URI, theWithtransientPackage); return theWithtransientPackage; @@ -100,6 +100,7 @@ public class WithtransientPackageImpl extends EPackageImpl implements Withtransi * * @generated */ + @Override public EClass getWithTransient() { return withTransientEClass; @@ -110,6 +111,7 @@ public class WithtransientPackageImpl extends EPackageImpl implements Withtransi * * @generated */ + @Override public EAttribute getWithTransient_Name() { return (EAttribute)withTransientEClass.getEStructuralFeatures().get(0); @@ -120,6 +122,7 @@ public class WithtransientPackageImpl extends EPackageImpl implements Withtransi * * @generated */ + @Override public EAttribute getWithTransient_PackageName() { return (EAttribute)withTransientEClass.getEStructuralFeatures().get(1); @@ -130,6 +133,7 @@ public class WithtransientPackageImpl extends EPackageImpl implements Withtransi * * @generated */ + @Override public WithtransientFactory getWithtransientFactory() { return (WithtransientFactory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.ide.tests/testlang-src/org/eclipse/xtext/ide/tests/testlanguage/WithTransient.genmodel b/org.eclipse.xtext.ide.tests/testlang-src/org/eclipse/xtext/ide/tests/testlanguage/WithTransient.genmodel index 0af724c9e..964688668 100644 --- a/org.eclipse.xtext.ide.tests/testlang-src/org/eclipse/xtext/ide/tests/testlanguage/WithTransient.genmodel +++ b/org.eclipse.xtext.ide.tests/testlang-src/org/eclipse/xtext/ide/tests/testlanguage/WithTransient.genmodel @@ -4,7 +4,7 @@ modelDirectory="/org.eclipse.xtext.ide.tests/testlang-src-gen" modelPluginID="org.eclipse.xtext.ide.tests" forceOverwrite="true" modelName="WithTransient" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" complianceLevel="8.0" - copyrightFields="false" runtimeVersion="2.12" > + copyrightFields="false" runtimeVersion="2.20" > WithTransient.ecore diff --git a/org.eclipse.xtext.testlanguages/model/generated/BeeLangTestLanguage.genmodel b/org.eclipse.xtext.testlanguages/model/generated/BeeLangTestLanguage.genmodel index 2500d7134..8532ae3c0 100644 --- a/org.eclipse.xtext.testlanguages/model/generated/BeeLangTestLanguage.genmodel +++ b/org.eclipse.xtext.testlanguages/model/generated/BeeLangTestLanguage.genmodel @@ -3,7 +3,7 @@ xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.testlanguages/src-gen" modelPluginID="org.eclipse.xtext.testlanguages" forceOverwrite="true" modelName="BeeLangTestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9"> + complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20"> diff --git a/org.eclipse.xtext.testlanguages/model/generated/FileAwareTestLanguage.genmodel b/org.eclipse.xtext.testlanguages/model/generated/FileAwareTestLanguage.genmodel index 158b761ec..895056918 100644 --- a/org.eclipse.xtext.testlanguages/model/generated/FileAwareTestLanguage.genmodel +++ b/org.eclipse.xtext.testlanguages/model/generated/FileAwareTestLanguage.genmodel @@ -3,7 +3,7 @@ xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.testlanguages/src-gen" modelPluginID="org.eclipse.xtext.testlanguages" forceOverwrite="true" modelName="FileAwareTestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.12"> + complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20"> diff --git a/org.eclipse.xtext.testlanguages/model/generated/NestedRefsTestLanguage.genmodel b/org.eclipse.xtext.testlanguages/model/generated/NestedRefsTestLanguage.genmodel index 9965b3cb8..fac1106b8 100644 --- a/org.eclipse.xtext.testlanguages/model/generated/NestedRefsTestLanguage.genmodel +++ b/org.eclipse.xtext.testlanguages/model/generated/NestedRefsTestLanguage.genmodel @@ -3,7 +3,7 @@ xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.testlanguages/src-gen" modelPluginID="org.eclipse.xtext.testlanguages" forceOverwrite="true" modelName="NestedRefsTestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9"> + complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20"> diff --git a/org.eclipse.xtext.testlanguages/model/generated/NoJdtTestLanguage.genmodel b/org.eclipse.xtext.testlanguages/model/generated/NoJdtTestLanguage.genmodel index e40e63784..93d3bdbb7 100644 --- a/org.eclipse.xtext.testlanguages/model/generated/NoJdtTestLanguage.genmodel +++ b/org.eclipse.xtext.testlanguages/model/generated/NoJdtTestLanguage.genmodel @@ -3,7 +3,7 @@ xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.testlanguages/src-gen" modelPluginID="org.eclipse.xtext.testlanguages" forceOverwrite="true" modelName="NoJdtTestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9"> + complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20"> diff --git a/org.eclipse.xtext.testlanguages/model/generated/XtextGrammarTestLanguage.genmodel b/org.eclipse.xtext.testlanguages/model/generated/XtextGrammarTestLanguage.genmodel index 4046e71f4..2c76012b1 100644 --- a/org.eclipse.xtext.testlanguages/model/generated/XtextGrammarTestLanguage.genmodel +++ b/org.eclipse.xtext.testlanguages/model/generated/XtextGrammarTestLanguage.genmodel @@ -3,7 +3,7 @@ xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.testlanguages/src-gen" modelPluginID="org.eclipse.xtext.testlanguages" forceOverwrite="true" modelName="XtextGrammarTestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.12"> + complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20"> diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/AliasedRequiredCapability.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/AliasedRequiredCapability.java index 31c2164f1..cda69568d 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/AliasedRequiredCapability.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/AliasedRequiredCapability.java @@ -33,10 +33,6 @@ public interface AliasedRequiredCapability extends EObject /** * Returns the value of the 'Name Space' attribute. * - *

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

* * @return the value of the 'Name Space' attribute. * @see #setNameSpace(String) @@ -59,10 +55,6 @@ public interface AliasedRequiredCapability 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) @@ -85,10 +77,6 @@ public interface AliasedRequiredCapability extends EObject /** * Returns the value of the 'Alias' attribute. * - *

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

* * @return the value of the 'Alias' attribute. * @see #setAlias(String) @@ -111,10 +99,6 @@ public interface AliasedRequiredCapability extends EObject /** * Returns the value of the 'Cond Expr' containment reference. * - *

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

* * @return the value of the 'Cond Expr' containment reference. * @see #setCondExpr(Expression) @@ -137,10 +121,6 @@ public interface AliasedRequiredCapability extends EObject /** * Returns the value of the 'Greedy' attribute. * - *

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

* * @return the value of the 'Greedy' attribute. * @see #setGreedy(boolean) @@ -163,10 +143,6 @@ public interface AliasedRequiredCapability extends EObject /** * Returns the value of the 'Min' attribute. * - *

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

* * @return the value of the 'Min' attribute. * @see #setMin(int) @@ -189,10 +165,6 @@ public interface AliasedRequiredCapability extends EObject /** * Returns the value of the 'Max' attribute. * - *

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

* * @return the value of the 'Max' attribute. * @see #setMax(int) @@ -215,10 +187,6 @@ public interface AliasedRequiredCapability extends EObject /** * Returns the value of the 'Version Range' attribute. * - *

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

* * @return the value of the 'Version Range' attribute. * @see #setVersionRange(String) diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/AndExpression.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/AndExpression.java index c5585a067..ca5f5db2b 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/AndExpression.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/AndExpression.java @@ -26,10 +26,6 @@ public interface AndExpression extends Expression /** * Returns the value of the 'Left Expr' containment reference. * - *

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

* * @return the value of the 'Left Expr' containment reference. * @see #setLeftExpr(Expression) @@ -52,10 +48,6 @@ public interface AndExpression extends Expression /** * Returns the value of the 'Right Expr' containment reference. * - *

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

* * @return the value of the 'Right Expr' containment reference. * @see #setRightExpr(Expression) diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/AssignmentExpression.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/AssignmentExpression.java index a15a34251..a1d9e9571 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/AssignmentExpression.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/AssignmentExpression.java @@ -27,10 +27,6 @@ public interface AssignmentExpression extends Expression /** * Returns the value of the 'Left Expr' containment reference. * - *

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

* * @return the value of the 'Left Expr' containment reference. * @see #setLeftExpr(Expression) @@ -53,10 +49,6 @@ public interface AssignmentExpression extends Expression /** * Returns the value of the 'Function Name' attribute. * - *

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

* * @return the value of the 'Function Name' attribute. * @see #setFunctionName(String) @@ -79,10 +71,6 @@ public interface AssignmentExpression extends Expression /** * Returns the value of the 'Right Expr' containment reference. * - *

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

* * @return the value of the 'Right Expr' containment reference. * @see #setRightExpr(Expression) diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/AtExpression.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/AtExpression.java index 464f1f828..57e46fd9e 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/AtExpression.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/AtExpression.java @@ -26,10 +26,6 @@ public interface AtExpression extends Expression /** * Returns the value of the 'Obj Expr' containment reference. * - *

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

* * @return the value of the 'Obj Expr' containment reference. * @see #setObjExpr(Expression) @@ -52,10 +48,6 @@ public interface AtExpression extends Expression /** * Returns the value of the 'Index Expr' containment reference. * - *

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

* * @return the value of the 'Index Expr' containment reference. * @see #setIndexExpr(Expression) diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/BinaryOpExpression.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/BinaryOpExpression.java index cb403b8cc..ea94e4f1f 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/BinaryOpExpression.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/BinaryOpExpression.java @@ -27,10 +27,6 @@ public interface BinaryOpExpression extends Expression /** * Returns the value of the 'Left Expr' containment reference. * - *

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

* * @return the value of the 'Left Expr' containment reference. * @see #setLeftExpr(Expression) @@ -53,10 +49,6 @@ public interface BinaryOpExpression extends Expression /** * Returns the value of the 'Function Name' attribute. * - *

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

* * @return the value of the 'Function Name' attribute. * @see #setFunctionName(String) @@ -79,10 +71,6 @@ public interface BinaryOpExpression extends Expression /** * Returns the value of the 'Right Expr' containment reference. * - *

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

* * @return the value of the 'Right Expr' containment reference. * @see #setRightExpr(Expression) diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/CachedExpression.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/CachedExpression.java index 4608b72ae..387c97a6b 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/CachedExpression.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/CachedExpression.java @@ -25,10 +25,6 @@ public interface CachedExpression extends Expression /** * Returns the value of the 'Expr' containment reference. * - *

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

* * @return the value of the 'Expr' containment reference. * @see #setExpr(Expression) diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/CallFeature.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/CallFeature.java index f0951961f..6ab1681c6 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/CallFeature.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/CallFeature.java @@ -27,10 +27,6 @@ public interface CallFeature extends Expression /** * Returns the value of the 'Func Expr' containment reference. * - *

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

* * @return the value of the 'Func Expr' containment reference. * @see #setFuncExpr(Expression) @@ -53,10 +49,6 @@ public interface CallFeature extends Expression /** * 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) @@ -79,10 +71,6 @@ public interface CallFeature extends Expression /** * Returns the value of the 'Parameter List' containment reference. * - *

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

* * @return the value of the 'Parameter List' containment reference. * @see #setParameterList(ParameterList) diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/CallFunction.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/CallFunction.java index 924fb6738..7433998e9 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/CallFunction.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/CallFunction.java @@ -26,10 +26,6 @@ public interface CallFunction extends Expression /** * Returns the value of the 'Func Expr' containment reference. * - *

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

* * @return the value of the 'Func Expr' containment reference. * @see #setFuncExpr(Expression) @@ -52,10 +48,6 @@ public interface CallFunction extends Expression /** * Returns the value of the 'Parameter List' containment reference. * - *

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

* * @return the value of the 'Parameter List' containment reference. * @see #setParameterList(ParameterList) diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/CallNamedFunction.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/CallNamedFunction.java index e9c349a8e..6b18fcf04 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/CallNamedFunction.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/CallNamedFunction.java @@ -26,10 +26,6 @@ public interface CallNamedFunction extends CallExpression /** * 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) @@ -52,10 +48,6 @@ public interface CallNamedFunction extends CallExpression /** * Returns the value of the 'Parameter List' containment reference. * - *

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

* * @return the value of the 'Parameter List' containment reference. * @see #setParameterList(ParameterList) diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/ChainedExpression.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/ChainedExpression.java index f1c1f360b..a4592ce01 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/ChainedExpression.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/ChainedExpression.java @@ -27,10 +27,6 @@ public interface ChainedExpression extends Expression * Returns the value of the 'Expressions' containment reference list. * The list contents are of type {@link org.eclipse.xtext.testlanguages.backtracking.beeLangTestLanguage.Expression}. * - *

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

* * @return the value of the 'Expressions' containment reference list. * @see org.eclipse.xtext.testlanguages.backtracking.beeLangTestLanguage.BeeLangTestLanguagePackage#getChainedExpression_Expressions() diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/ClosureTypeRef.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/ClosureTypeRef.java index a47e969c0..fdbe28af7 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/ClosureTypeRef.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/ClosureTypeRef.java @@ -29,10 +29,6 @@ public interface ClosureTypeRef extends TypeRef * Returns the value of the 'Parameter Types' attribute list. * The list contents are of type {@link java.lang.String}. * - *

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

* * @return the value of the 'Parameter Types' attribute list. * @see org.eclipse.xtext.testlanguages.backtracking.beeLangTestLanguage.BeeLangTestLanguagePackage#getClosureTypeRef_ParameterTypes() @@ -44,10 +40,6 @@ public interface ClosureTypeRef extends TypeRef /** * Returns the value of the 'Var Args' attribute. * - *

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

* * @return the value of the 'Var Args' attribute. * @see #setVarArgs(boolean) @@ -70,10 +62,6 @@ public interface ClosureTypeRef extends TypeRef /** * Returns the value of the 'Return Type' attribute. * - *

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

* * @return the value of the 'Return Type' attribute. * @see #setReturnType(String) diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/CreateExpression.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/CreateExpression.java index 7e558a4e7..8ad6a81e6 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/CreateExpression.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/CreateExpression.java @@ -28,10 +28,6 @@ public interface CreateExpression extends Expression /** * Returns the value of the 'Type Expr' attribute. * - *

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

* * @return the value of the 'Type Expr' attribute. * @see #setTypeExpr(String) @@ -54,10 +50,6 @@ public interface CreateExpression extends Expression /** * Returns the value of the 'Parameter List' containment reference. * - *

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

* * @return the value of the 'Parameter List' containment reference. * @see #setParameterList(ParameterList) @@ -80,10 +72,6 @@ public interface CreateExpression extends Expression /** * Returns the value of the 'Alias' attribute. * - *

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

* * @return the value of the 'Alias' attribute. * @see #setAlias(String) @@ -106,10 +94,6 @@ public interface CreateExpression extends Expression /** * Returns the value of the 'Context Block' containment reference. * - *

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

* * @return the value of the 'Context Block' containment reference. * @see #setContextBlock(Expression) diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/DefValue.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/DefValue.java index 87fff66a1..e771bd539 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/DefValue.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/DefValue.java @@ -29,10 +29,6 @@ public interface DefValue extends Expression /** * Returns the value of the 'Final' attribute. * - *

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

* * @return the value of the 'Final' attribute. * @see #setFinal(boolean) @@ -55,10 +51,6 @@ public interface DefValue extends Expression /** * Returns the value of the 'Type' containment reference. * - *

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

* * @return the value of the 'Type' containment reference. * @see #setType(TypeRef) @@ -81,10 +73,6 @@ public interface DefValue extends Expression /** * 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) @@ -107,10 +95,6 @@ public interface DefValue extends Expression /** * Returns the value of the 'Value Expr' containment reference. * - *

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

* * @return the value of the 'Value Expr' containment reference. * @see #setValueExpr(Expression) @@ -133,10 +117,6 @@ public interface DefValue extends Expression /** * Returns the value of the 'Immutable' attribute. * - *

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

* * @return the value of the 'Immutable' attribute. * @see #setImmutable(boolean) diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/FeatureExpression.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/FeatureExpression.java index 301ed62eb..ccc20f2e4 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/FeatureExpression.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/FeatureExpression.java @@ -26,10 +26,6 @@ public interface FeatureExpression extends Expression /** * Returns the value of the 'Obj Expr' containment reference. * - *

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

* * @return the value of the 'Obj Expr' containment reference. * @see #setObjExpr(Expression) @@ -52,10 +48,6 @@ public interface FeatureExpression extends Expression /** * Returns the value of the 'Feature Name' attribute. * - *

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

* * @return the value of the 'Feature Name' attribute. * @see #setFeatureName(String) diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/Function.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/Function.java index 41bdf5fdc..97eba0dde 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/Function.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/Function.java @@ -34,10 +34,6 @@ public interface Function extends Expression /** * Returns the value of the 'Documentation' attribute. * - *

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

* * @return the value of the 'Documentation' attribute. * @see #setDocumentation(String) @@ -60,10 +56,6 @@ public interface Function extends Expression /** * Returns the value of the 'Visibility' attribute. * - *

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

* * @return the value of the 'Visibility' attribute. * @see #setVisibility(String) @@ -86,10 +78,6 @@ public interface Function extends Expression /** * Returns the value of the 'Final' attribute. * - *

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

* * @return the value of the 'Final' attribute. * @see #setFinal(boolean) @@ -112,10 +100,6 @@ public interface Function extends Expression /** * Returns the value of the 'Return Type' containment reference. * - *

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

* * @return the value of the 'Return Type' containment reference. * @see #setReturnType(TypeRef) @@ -138,10 +122,6 @@ public interface Function extends Expression /** * 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) @@ -165,10 +145,6 @@ public interface Function extends Expression * Returns the value of the 'Parameters' containment reference list. * The list contents are of type {@link org.eclipse.xtext.testlanguages.backtracking.beeLangTestLanguage.ParameterDeclaration}. * - *

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

* * @return the value of the 'Parameters' containment reference list. * @see org.eclipse.xtext.testlanguages.backtracking.beeLangTestLanguage.BeeLangTestLanguagePackage#getFunction_Parameters() @@ -180,10 +156,6 @@ public interface Function extends Expression /** * Returns the value of the 'Var Args' attribute. * - *

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

* * @return the value of the 'Var Args' attribute. * @see #setVarArgs(boolean) @@ -206,10 +178,6 @@ public interface Function extends Expression /** * Returns the value of the 'Guard' containment reference. * - *

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

* * @return the value of the 'Guard' containment reference. * @see #setGuard(GuardExpression) @@ -232,10 +200,6 @@ public interface Function extends Expression /** * Returns the value of the 'Func Expr' containment reference. * - *

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

* * @return the value of the 'Func Expr' containment reference. * @see #setFuncExpr(Expression) diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/GuardExpression.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/GuardExpression.java index 6173b5755..c96472391 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/GuardExpression.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/GuardExpression.java @@ -26,10 +26,6 @@ public interface GuardExpression extends EObject /** * Returns the value of the 'Guard Expr' containment reference. * - *

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

* * @return the value of the 'Guard Expr' containment reference. * @see #setGuardExpr(Expression) diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/Model.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/Model.java index 73eebe31e..7bd3fe95f 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/Model.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/Model.java @@ -30,10 +30,6 @@ public interface Model extends EObject * Returns the value of the 'Units' containment reference list. * The list contents are of type {@link org.eclipse.xtext.testlanguages.backtracking.beeLangTestLanguage.Unit}. * - *

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

* * @return the value of the 'Units' containment reference list. * @see org.eclipse.xtext.testlanguages.backtracking.beeLangTestLanguage.BeeLangTestLanguagePackage#getModel_Units() @@ -46,10 +42,6 @@ public interface Model extends EObject * Returns the value of the 'Functions' containment reference list. * The list contents are of type {@link org.eclipse.xtext.testlanguages.backtracking.beeLangTestLanguage.Function}. * - *

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

* * @return the value of the 'Functions' containment reference list. * @see org.eclipse.xtext.testlanguages.backtracking.beeLangTestLanguage.BeeLangTestLanguagePackage#getModel_Functions() diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/OrExpression.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/OrExpression.java index 83777488a..f9b6d5094 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/OrExpression.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/OrExpression.java @@ -26,10 +26,6 @@ public interface OrExpression extends Expression /** * Returns the value of the 'Left Expr' containment reference. * - *

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

* * @return the value of the 'Left Expr' containment reference. * @see #setLeftExpr(Expression) @@ -52,10 +48,6 @@ public interface OrExpression extends Expression /** * Returns the value of the 'Right Expr' containment reference. * - *

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

* * @return the value of the 'Right Expr' containment reference. * @see #setRightExpr(Expression) diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/Parameter.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/Parameter.java index 9394315b6..dbcd54081 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/Parameter.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/Parameter.java @@ -26,10 +26,6 @@ public interface Parameter extends EObject /** * Returns the value of the 'Expr' containment reference. * - *

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

* * @return the value of the 'Expr' containment reference. * @see #setExpr(Expression) diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/ParameterDeclaration.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/ParameterDeclaration.java index 3452a555c..80a769583 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/ParameterDeclaration.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/ParameterDeclaration.java @@ -27,10 +27,6 @@ public interface ParameterDeclaration extends EObject /** * Returns the value of the 'Type' containment reference. * - *

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

* * @return the value of the 'Type' containment reference. * @see #setType(TypeRef) @@ -53,10 +49,6 @@ public interface ParameterDeclaration 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) diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/ParameterList.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/ParameterList.java index c826a5006..7f17838ee 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/ParameterList.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/ParameterList.java @@ -29,10 +29,6 @@ public interface ParameterList extends EObject * Returns the value of the 'Parameters' containment reference list. * The list contents are of type {@link org.eclipse.xtext.testlanguages.backtracking.beeLangTestLanguage.Parameter}. * - *

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

* * @return the value of the 'Parameters' containment reference list. * @see org.eclipse.xtext.testlanguages.backtracking.beeLangTestLanguage.BeeLangTestLanguagePackage#getParameterList_Parameters() diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/ProvidedCapability.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/ProvidedCapability.java index 61841af72..31f1d39bf 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/ProvidedCapability.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/ProvidedCapability.java @@ -29,10 +29,6 @@ public interface ProvidedCapability extends EObject /** * Returns the value of the 'Name Space' attribute. * - *

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

* * @return the value of the 'Name Space' attribute. * @see #setNameSpace(String) @@ -55,10 +51,6 @@ public interface ProvidedCapability extends EObject /** * Returns the value of the 'Cond Expr' containment reference. * - *

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

* * @return the value of the 'Cond Expr' containment reference. * @see #setCondExpr(Expression) @@ -81,10 +73,6 @@ public interface ProvidedCapability 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) @@ -107,10 +95,6 @@ public interface ProvidedCapability extends EObject /** * Returns the value of the 'Version' attribute. * - *

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

* * @return the value of the 'Version' attribute. * @see #setVersion(String) diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/RequiredCapability.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/RequiredCapability.java index 3ceb31afd..8bcdb1130 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/RequiredCapability.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/RequiredCapability.java @@ -32,10 +32,6 @@ public interface RequiredCapability extends EObject /** * Returns the value of the 'Name Space' attribute. * - *

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

* * @return the value of the 'Name Space' attribute. * @see #setNameSpace(String) @@ -58,10 +54,6 @@ public interface RequiredCapability 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) @@ -84,10 +76,6 @@ public interface RequiredCapability extends EObject /** * Returns the value of the 'Cond Expr' containment reference. * - *

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

* * @return the value of the 'Cond Expr' containment reference. * @see #setCondExpr(Expression) @@ -110,10 +98,6 @@ public interface RequiredCapability extends EObject /** * Returns the value of the 'Greedy' attribute. * - *

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

* * @return the value of the 'Greedy' attribute. * @see #setGreedy(boolean) @@ -136,10 +120,6 @@ public interface RequiredCapability extends EObject /** * Returns the value of the 'Min' attribute. * - *

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

* * @return the value of the 'Min' attribute. * @see #setMin(int) @@ -162,10 +142,6 @@ public interface RequiredCapability extends EObject /** * Returns the value of the 'Max' attribute. * - *

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

* * @return the value of the 'Max' attribute. * @see #setMax(int) @@ -188,10 +164,6 @@ public interface RequiredCapability extends EObject /** * Returns the value of the 'Version Range' attribute. * - *

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

* * @return the value of the 'Version Range' attribute. * @see #setVersionRange(String) diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/SimpleTypeRef.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/SimpleTypeRef.java index 3413c7a42..7cd4fdf16 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/SimpleTypeRef.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/SimpleTypeRef.java @@ -27,10 +27,6 @@ public interface SimpleTypeRef extends TypeRef /** * Returns the value of the 'Raw Type' attribute. * - *

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

* * @return the value of the 'Raw Type' attribute. * @see #setRawType(String) @@ -54,10 +50,6 @@ public interface SimpleTypeRef extends TypeRef * Returns the value of the 'Actual Arguments List' attribute list. * The list contents are of type {@link java.lang.String}. * - *

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

* * @return the value of the 'Actual Arguments List' attribute list. * @see org.eclipse.xtext.testlanguages.backtracking.beeLangTestLanguage.BeeLangTestLanguagePackage#getSimpleTypeRef_ActualArgumentsList() diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/UnaryOpExpression.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/UnaryOpExpression.java index c56999b36..ac44f38d0 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/UnaryOpExpression.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/UnaryOpExpression.java @@ -26,10 +26,6 @@ public interface UnaryOpExpression extends Expression /** * Returns the value of the 'Function Name' attribute. * - *

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

* * @return the value of the 'Function Name' attribute. * @see #setFunctionName(String) @@ -52,10 +48,6 @@ public interface UnaryOpExpression extends Expression /** * Returns the value of the 'Expr' containment reference. * - *

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

* * @return the value of the 'Expr' containment reference. * @see #setExpr(Expression) diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/UnaryPostOpExpression.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/UnaryPostOpExpression.java index bb8338857..e160009d3 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/UnaryPostOpExpression.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/UnaryPostOpExpression.java @@ -26,10 +26,6 @@ public interface UnaryPostOpExpression extends Expression /** * Returns the value of the 'Expr' containment reference. * - *

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

* * @return the value of the 'Expr' containment reference. * @see #setExpr(Expression) @@ -52,10 +48,6 @@ public interface UnaryPostOpExpression extends Expression /** * Returns the value of the 'Function Name' attribute. * - *

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

* * @return the value of the 'Function Name' attribute. * @see #setFunctionName(String) diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/UnaryPreOpExpression.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/UnaryPreOpExpression.java index 45b57cfb3..3a9fb9dd8 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/UnaryPreOpExpression.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/UnaryPreOpExpression.java @@ -26,10 +26,6 @@ public interface UnaryPreOpExpression extends Expression /** * Returns the value of the 'Function Name' attribute. * - *

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

* * @return the value of the 'Function Name' attribute. * @see #setFunctionName(String) @@ -52,10 +48,6 @@ public interface UnaryPreOpExpression extends Expression /** * Returns the value of the 'Expr' containment reference. * - *

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

* * @return the value of the 'Expr' containment reference. * @see #setExpr(Expression) diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/Unit.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/Unit.java index 0ea6d6030..5a4d26771 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/Unit.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/Unit.java @@ -37,10 +37,6 @@ public interface Unit extends EObject /** * Returns the value of the 'Documentation' attribute. * - *

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

* * @return the value of the 'Documentation' attribute. * @see #setDocumentation(String) @@ -63,10 +59,6 @@ public interface Unit 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) @@ -89,10 +81,6 @@ public interface Unit extends EObject /** * Returns the value of the 'Version' attribute. * - *

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

* * @return the value of the 'Version' attribute. * @see #setVersion(String) @@ -116,10 +104,6 @@ public interface Unit extends EObject * Returns the value of the 'Implements' containment reference list. * The list contents are of type {@link org.eclipse.xtext.testlanguages.backtracking.beeLangTestLanguage.SimpleTypeRef}. * - *

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

* * @return the value of the 'Implements' containment reference list. * @see org.eclipse.xtext.testlanguages.backtracking.beeLangTestLanguage.BeeLangTestLanguagePackage#getUnit_Implements() @@ -131,10 +115,6 @@ public interface Unit extends EObject /** * Returns the value of the 'Source Location' attribute. * - *

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

* * @return the value of the 'Source Location' attribute. * @see #setSourceLocation(String) @@ -157,10 +137,6 @@ public interface Unit extends EObject /** * Returns the value of the 'Output Location' attribute. * - *

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

* * @return the value of the 'Output Location' attribute. * @see #setOutputLocation(String) @@ -184,10 +160,6 @@ public interface Unit extends EObject * Returns the value of the 'Provided Capabilities' containment reference list. * The list contents are of type {@link org.eclipse.xtext.testlanguages.backtracking.beeLangTestLanguage.ProvidedCapability}. * - *

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

* * @return the value of the 'Provided Capabilities' containment reference list. * @see org.eclipse.xtext.testlanguages.backtracking.beeLangTestLanguage.BeeLangTestLanguagePackage#getUnit_ProvidedCapabilities() @@ -200,10 +172,6 @@ public interface Unit extends EObject * Returns the value of the 'Required Capabilities' containment reference list. * The list contents are of type {@link org.eclipse.xtext.testlanguages.backtracking.beeLangTestLanguage.AliasedRequiredCapability}. * - *

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

* * @return the value of the 'Required Capabilities' containment reference list. * @see org.eclipse.xtext.testlanguages.backtracking.beeLangTestLanguage.BeeLangTestLanguagePackage#getUnit_RequiredCapabilities() @@ -216,10 +184,6 @@ public interface Unit extends EObject * Returns the value of the 'Meta Required Capabilities' containment reference list. * The list contents are of type {@link org.eclipse.xtext.testlanguages.backtracking.beeLangTestLanguage.RequiredCapability}. * - *

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

* * @return the value of the 'Meta Required Capabilities' containment reference list. * @see org.eclipse.xtext.testlanguages.backtracking.beeLangTestLanguage.BeeLangTestLanguagePackage#getUnit_MetaRequiredCapabilities() @@ -232,10 +196,6 @@ public interface Unit extends EObject * Returns the value of the 'Functions' containment reference list. * The list contents are of type {@link org.eclipse.xtext.testlanguages.backtracking.beeLangTestLanguage.Function}. * - *

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

* * @return the value of the 'Functions' containment reference list. * @see org.eclipse.xtext.testlanguages.backtracking.beeLangTestLanguage.BeeLangTestLanguagePackage#getUnit_Functions() diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/ValueLiteral.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/ValueLiteral.java index 72752b749..28c936885 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/ValueLiteral.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/ValueLiteral.java @@ -25,10 +25,6 @@ public interface ValueLiteral extends Expression /** * Returns the value of the 'Value' attribute. * - *

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

* * @return the value of the 'Value' attribute. * @see #setValue(String) diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/VariableExpression.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/VariableExpression.java index 938294380..5a83d20f5 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/VariableExpression.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/VariableExpression.java @@ -25,10 +25,6 @@ public interface VariableExpression extends Expression /** * 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) diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/WithContextExpression.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/WithContextExpression.java index 9e28c926d..80089948c 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/WithContextExpression.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/WithContextExpression.java @@ -27,10 +27,6 @@ public interface WithContextExpression extends Expression /** * Returns the value of the 'Expr' containment reference. * - *

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

* * @return the value of the 'Expr' containment reference. * @see #setExpr(Expression) @@ -53,10 +49,6 @@ public interface WithContextExpression extends Expression /** * Returns the value of the 'Alias' attribute. * - *

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

* * @return the value of the 'Alias' attribute. * @see #setAlias(String) @@ -79,10 +71,6 @@ public interface WithContextExpression extends Expression /** * Returns the value of the 'Context Block' containment reference. * - *

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

* * @return the value of the 'Context Block' containment reference. * @see #setContextBlock(Expression) diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/WithExpression.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/WithExpression.java index 3f3ca1de0..6b4ca2135 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/WithExpression.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/WithExpression.java @@ -28,10 +28,6 @@ public interface WithExpression extends Expression * Returns the value of the 'Referenced Advice' attribute list. * The list contents are of type {@link java.lang.String}. * - *

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

* * @return the value of the 'Referenced Advice' attribute list. * @see org.eclipse.xtext.testlanguages.backtracking.beeLangTestLanguage.BeeLangTestLanguagePackage#getWithExpression_ReferencedAdvice() @@ -43,10 +39,6 @@ public interface WithExpression extends Expression /** * Returns the value of the 'Func Expr' containment reference. * - *

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

* * @return the value of the 'Func Expr' containment reference. * @see #setFuncExpr(Expression) diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/AliasedRequiredCapabilityImpl.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/AliasedRequiredCapabilityImpl.java index 6954bfdc9..c5641ce7d 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/AliasedRequiredCapabilityImpl.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/AliasedRequiredCapabilityImpl.java @@ -214,6 +214,7 @@ public class AliasedRequiredCapabilityImpl extends MinimalEObjectImpl.Container * * @generated */ + @Override public String getNameSpace() { return nameSpace; @@ -224,6 +225,7 @@ public class AliasedRequiredCapabilityImpl extends MinimalEObjectImpl.Container * * @generated */ + @Override public void setNameSpace(String newNameSpace) { String oldNameSpace = nameSpace; @@ -237,6 +239,7 @@ public class AliasedRequiredCapabilityImpl extends MinimalEObjectImpl.Container * * @generated */ + @Override public String getName() { return name; @@ -247,6 +250,7 @@ public class AliasedRequiredCapabilityImpl extends MinimalEObjectImpl.Container * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -260,6 +264,7 @@ public class AliasedRequiredCapabilityImpl extends MinimalEObjectImpl.Container * * @generated */ + @Override public String getAlias() { return alias; @@ -270,6 +275,7 @@ public class AliasedRequiredCapabilityImpl extends MinimalEObjectImpl.Container * * @generated */ + @Override public void setAlias(String newAlias) { String oldAlias = alias; @@ -283,6 +289,7 @@ public class AliasedRequiredCapabilityImpl extends MinimalEObjectImpl.Container * * @generated */ + @Override public Expression getCondExpr() { return condExpr; @@ -310,6 +317,7 @@ public class AliasedRequiredCapabilityImpl extends MinimalEObjectImpl.Container * * @generated */ + @Override public void setCondExpr(Expression newCondExpr) { if (newCondExpr != condExpr) @@ -331,6 +339,7 @@ public class AliasedRequiredCapabilityImpl extends MinimalEObjectImpl.Container * * @generated */ + @Override public boolean isGreedy() { return greedy; @@ -341,6 +350,7 @@ public class AliasedRequiredCapabilityImpl extends MinimalEObjectImpl.Container * * @generated */ + @Override public void setGreedy(boolean newGreedy) { boolean oldGreedy = greedy; @@ -354,6 +364,7 @@ public class AliasedRequiredCapabilityImpl extends MinimalEObjectImpl.Container * * @generated */ + @Override public int getMin() { return min; @@ -364,6 +375,7 @@ public class AliasedRequiredCapabilityImpl extends MinimalEObjectImpl.Container * * @generated */ + @Override public void setMin(int newMin) { int oldMin = min; @@ -377,6 +389,7 @@ public class AliasedRequiredCapabilityImpl extends MinimalEObjectImpl.Container * * @generated */ + @Override public int getMax() { return max; @@ -387,6 +400,7 @@ public class AliasedRequiredCapabilityImpl extends MinimalEObjectImpl.Container * * @generated */ + @Override public void setMax(int newMax) { int oldMax = max; @@ -400,6 +414,7 @@ public class AliasedRequiredCapabilityImpl extends MinimalEObjectImpl.Container * * @generated */ + @Override public String getVersionRange() { return versionRange; @@ -410,6 +425,7 @@ public class AliasedRequiredCapabilityImpl extends MinimalEObjectImpl.Container * * @generated */ + @Override public void setVersionRange(String newVersionRange) { String oldVersionRange = versionRange; @@ -580,7 +596,7 @@ public class AliasedRequiredCapabilityImpl extends MinimalEObjectImpl.Container { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (nameSpace: "); result.append(nameSpace); result.append(", name: "); diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/AndExpressionImpl.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/AndExpressionImpl.java index 77de0aa4c..901d63897 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/AndExpressionImpl.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/AndExpressionImpl.java @@ -77,6 +77,7 @@ public class AndExpressionImpl extends ExpressionImpl implements AndExpression * * @generated */ + @Override public Expression getLeftExpr() { return leftExpr; @@ -104,6 +105,7 @@ public class AndExpressionImpl extends ExpressionImpl implements AndExpression * * @generated */ + @Override public void setLeftExpr(Expression newLeftExpr) { if (newLeftExpr != leftExpr) @@ -125,6 +127,7 @@ public class AndExpressionImpl extends ExpressionImpl implements AndExpression * * @generated */ + @Override public Expression getRightExpr() { return rightExpr; @@ -152,6 +155,7 @@ public class AndExpressionImpl extends ExpressionImpl implements AndExpression * * @generated */ + @Override public void setRightExpr(Expression newRightExpr) { if (newRightExpr != rightExpr) diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/AssignmentExpressionImpl.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/AssignmentExpressionImpl.java index 499209048..6b60f8a27 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/AssignmentExpressionImpl.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/AssignmentExpressionImpl.java @@ -98,6 +98,7 @@ public class AssignmentExpressionImpl extends ExpressionImpl implements Assignme * * @generated */ + @Override public Expression getLeftExpr() { return leftExpr; @@ -125,6 +126,7 @@ public class AssignmentExpressionImpl extends ExpressionImpl implements Assignme * * @generated */ + @Override public void setLeftExpr(Expression newLeftExpr) { if (newLeftExpr != leftExpr) @@ -146,6 +148,7 @@ public class AssignmentExpressionImpl extends ExpressionImpl implements Assignme * * @generated */ + @Override public String getFunctionName() { return functionName; @@ -156,6 +159,7 @@ public class AssignmentExpressionImpl extends ExpressionImpl implements Assignme * * @generated */ + @Override public void setFunctionName(String newFunctionName) { String oldFunctionName = functionName; @@ -169,6 +173,7 @@ public class AssignmentExpressionImpl extends ExpressionImpl implements Assignme * * @generated */ + @Override public Expression getRightExpr() { return rightExpr; @@ -196,6 +201,7 @@ public class AssignmentExpressionImpl extends ExpressionImpl implements Assignme * * @generated */ + @Override public void setRightExpr(Expression newRightExpr) { if (newRightExpr != rightExpr) @@ -326,7 +332,7 @@ public class AssignmentExpressionImpl extends ExpressionImpl implements Assignme { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (functionName: "); result.append(functionName); result.append(')'); diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/AtExpressionImpl.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/AtExpressionImpl.java index 1e6685943..88043b8c2 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/AtExpressionImpl.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/AtExpressionImpl.java @@ -77,6 +77,7 @@ public class AtExpressionImpl extends ExpressionImpl implements AtExpression * * @generated */ + @Override public Expression getObjExpr() { return objExpr; @@ -104,6 +105,7 @@ public class AtExpressionImpl extends ExpressionImpl implements AtExpression * * @generated */ + @Override public void setObjExpr(Expression newObjExpr) { if (newObjExpr != objExpr) @@ -125,6 +127,7 @@ public class AtExpressionImpl extends ExpressionImpl implements AtExpression * * @generated */ + @Override public Expression getIndexExpr() { return indexExpr; @@ -152,6 +155,7 @@ public class AtExpressionImpl extends ExpressionImpl implements AtExpression * * @generated */ + @Override public void setIndexExpr(Expression newIndexExpr) { if (newIndexExpr != indexExpr) diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/BeeLangTestLanguageFactoryImpl.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/BeeLangTestLanguageFactoryImpl.java index 95cbbbe2d..9d0c79875 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/BeeLangTestLanguageFactoryImpl.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/BeeLangTestLanguageFactoryImpl.java @@ -111,6 +111,7 @@ public class BeeLangTestLanguageFactoryImpl extends EFactoryImpl implements BeeL * * @generated */ + @Override public Model createModel() { ModelImpl model = new ModelImpl(); @@ -122,6 +123,7 @@ public class BeeLangTestLanguageFactoryImpl extends EFactoryImpl implements BeeL * * @generated */ + @Override public Unit createUnit() { UnitImpl unit = new UnitImpl(); @@ -133,6 +135,7 @@ public class BeeLangTestLanguageFactoryImpl extends EFactoryImpl implements BeeL * * @generated */ + @Override public ProvidedCapability createProvidedCapability() { ProvidedCapabilityImpl providedCapability = new ProvidedCapabilityImpl(); @@ -144,6 +147,7 @@ public class BeeLangTestLanguageFactoryImpl extends EFactoryImpl implements BeeL * * @generated */ + @Override public AliasedRequiredCapability createAliasedRequiredCapability() { AliasedRequiredCapabilityImpl aliasedRequiredCapability = new AliasedRequiredCapabilityImpl(); @@ -155,6 +159,7 @@ public class BeeLangTestLanguageFactoryImpl extends EFactoryImpl implements BeeL * * @generated */ + @Override public RequiredCapability createRequiredCapability() { RequiredCapabilityImpl requiredCapability = new RequiredCapabilityImpl(); @@ -166,6 +171,7 @@ public class BeeLangTestLanguageFactoryImpl extends EFactoryImpl implements BeeL * * @generated */ + @Override public ParameterList createParameterList() { ParameterListImpl parameterList = new ParameterListImpl(); @@ -177,6 +183,7 @@ public class BeeLangTestLanguageFactoryImpl extends EFactoryImpl implements BeeL * * @generated */ + @Override public Parameter createParameter() { ParameterImpl parameter = new ParameterImpl(); @@ -188,6 +195,7 @@ public class BeeLangTestLanguageFactoryImpl extends EFactoryImpl implements BeeL * * @generated */ + @Override public ClosureParameter createClosureParameter() { ClosureParameterImpl closureParameter = new ClosureParameterImpl(); @@ -199,6 +207,7 @@ public class BeeLangTestLanguageFactoryImpl extends EFactoryImpl implements BeeL * * @generated */ + @Override public ParameterDeclaration createParameterDeclaration() { ParameterDeclarationImpl parameterDeclaration = new ParameterDeclarationImpl(); @@ -210,6 +219,7 @@ public class BeeLangTestLanguageFactoryImpl extends EFactoryImpl implements BeeL * * @generated */ + @Override public Function createFunction() { FunctionImpl function = new FunctionImpl(); @@ -221,6 +231,7 @@ public class BeeLangTestLanguageFactoryImpl extends EFactoryImpl implements BeeL * * @generated */ + @Override public GuardExpression createGuardExpression() { GuardExpressionImpl guardExpression = new GuardExpressionImpl(); @@ -232,6 +243,7 @@ public class BeeLangTestLanguageFactoryImpl extends EFactoryImpl implements BeeL * * @generated */ + @Override public Expression createExpression() { ExpressionImpl expression = new ExpressionImpl(); @@ -243,6 +255,7 @@ public class BeeLangTestLanguageFactoryImpl extends EFactoryImpl implements BeeL * * @generated */ + @Override public TypeRef createTypeRef() { TypeRefImpl typeRef = new TypeRefImpl(); @@ -254,6 +267,7 @@ public class BeeLangTestLanguageFactoryImpl extends EFactoryImpl implements BeeL * * @generated */ + @Override public SimpleTypeRef createSimpleTypeRef() { SimpleTypeRefImpl simpleTypeRef = new SimpleTypeRefImpl(); @@ -265,6 +279,7 @@ public class BeeLangTestLanguageFactoryImpl extends EFactoryImpl implements BeeL * * @generated */ + @Override public ClosureTypeRef createClosureTypeRef() { ClosureTypeRefImpl closureTypeRef = new ClosureTypeRefImpl(); @@ -276,6 +291,7 @@ public class BeeLangTestLanguageFactoryImpl extends EFactoryImpl implements BeeL * * @generated */ + @Override public WithExpression createWithExpression() { WithExpressionImpl withExpression = new WithExpressionImpl(); @@ -287,6 +303,7 @@ public class BeeLangTestLanguageFactoryImpl extends EFactoryImpl implements BeeL * * @generated */ + @Override public WithContextExpression createWithContextExpression() { WithContextExpressionImpl withContextExpression = new WithContextExpressionImpl(); @@ -298,6 +315,7 @@ public class BeeLangTestLanguageFactoryImpl extends EFactoryImpl implements BeeL * * @generated */ + @Override public CallExpression createCallExpression() { CallExpressionImpl callExpression = new CallExpressionImpl(); @@ -309,6 +327,7 @@ public class BeeLangTestLanguageFactoryImpl extends EFactoryImpl implements BeeL * * @generated */ + @Override public ValueLiteral createValueLiteral() { ValueLiteralImpl valueLiteral = new ValueLiteralImpl(); @@ -320,6 +339,7 @@ public class BeeLangTestLanguageFactoryImpl extends EFactoryImpl implements BeeL * * @generated */ + @Override public AssignmentExpression createAssignmentExpression() { AssignmentExpressionImpl assignmentExpression = new AssignmentExpressionImpl(); @@ -331,6 +351,7 @@ public class BeeLangTestLanguageFactoryImpl extends EFactoryImpl implements BeeL * * @generated */ + @Override public DefValue createDefValue() { DefValueImpl defValue = new DefValueImpl(); @@ -342,6 +363,7 @@ public class BeeLangTestLanguageFactoryImpl extends EFactoryImpl implements BeeL * * @generated */ + @Override public CachedExpression createCachedExpression() { CachedExpressionImpl cachedExpression = new CachedExpressionImpl(); @@ -353,6 +375,7 @@ public class BeeLangTestLanguageFactoryImpl extends EFactoryImpl implements BeeL * * @generated */ + @Override public OrExpression createOrExpression() { OrExpressionImpl orExpression = new OrExpressionImpl(); @@ -364,6 +387,7 @@ public class BeeLangTestLanguageFactoryImpl extends EFactoryImpl implements BeeL * * @generated */ + @Override public AndExpression createAndExpression() { AndExpressionImpl andExpression = new AndExpressionImpl(); @@ -375,6 +399,7 @@ public class BeeLangTestLanguageFactoryImpl extends EFactoryImpl implements BeeL * * @generated */ + @Override public BinaryOpExpression createBinaryOpExpression() { BinaryOpExpressionImpl binaryOpExpression = new BinaryOpExpressionImpl(); @@ -386,6 +411,7 @@ public class BeeLangTestLanguageFactoryImpl extends EFactoryImpl implements BeeL * * @generated */ + @Override public UnaryOpExpression createUnaryOpExpression() { UnaryOpExpressionImpl unaryOpExpression = new UnaryOpExpressionImpl(); @@ -397,6 +423,7 @@ public class BeeLangTestLanguageFactoryImpl extends EFactoryImpl implements BeeL * * @generated */ + @Override public UnaryPreOpExpression createUnaryPreOpExpression() { UnaryPreOpExpressionImpl unaryPreOpExpression = new UnaryPreOpExpressionImpl(); @@ -408,6 +435,7 @@ public class BeeLangTestLanguageFactoryImpl extends EFactoryImpl implements BeeL * * @generated */ + @Override public UnaryPostOpExpression createUnaryPostOpExpression() { UnaryPostOpExpressionImpl unaryPostOpExpression = new UnaryPostOpExpressionImpl(); @@ -419,6 +447,7 @@ public class BeeLangTestLanguageFactoryImpl extends EFactoryImpl implements BeeL * * @generated */ + @Override public CallFeature createCallFeature() { CallFeatureImpl callFeature = new CallFeatureImpl(); @@ -430,6 +459,7 @@ public class BeeLangTestLanguageFactoryImpl extends EFactoryImpl implements BeeL * * @generated */ + @Override public AtExpression createAtExpression() { AtExpressionImpl atExpression = new AtExpressionImpl(); @@ -441,6 +471,7 @@ public class BeeLangTestLanguageFactoryImpl extends EFactoryImpl implements BeeL * * @generated */ + @Override public FeatureExpression createFeatureExpression() { FeatureExpressionImpl featureExpression = new FeatureExpressionImpl(); @@ -452,6 +483,7 @@ public class BeeLangTestLanguageFactoryImpl extends EFactoryImpl implements BeeL * * @generated */ + @Override public CallFunction createCallFunction() { CallFunctionImpl callFunction = new CallFunctionImpl(); @@ -463,6 +495,7 @@ public class BeeLangTestLanguageFactoryImpl extends EFactoryImpl implements BeeL * * @generated */ + @Override public ChainedExpression createChainedExpression() { ChainedExpressionImpl chainedExpression = new ChainedExpressionImpl(); @@ -474,6 +507,7 @@ public class BeeLangTestLanguageFactoryImpl extends EFactoryImpl implements BeeL * * @generated */ + @Override public VariableExpression createVariableExpression() { VariableExpressionImpl variableExpression = new VariableExpressionImpl(); @@ -485,6 +519,7 @@ public class BeeLangTestLanguageFactoryImpl extends EFactoryImpl implements BeeL * * @generated */ + @Override public CallNamedFunction createCallNamedFunction() { CallNamedFunctionImpl callNamedFunction = new CallNamedFunctionImpl(); @@ -496,6 +531,7 @@ public class BeeLangTestLanguageFactoryImpl extends EFactoryImpl implements BeeL * * @generated */ + @Override public CreateExpression createCreateExpression() { CreateExpressionImpl createExpression = new CreateExpressionImpl(); @@ -507,6 +543,7 @@ public class BeeLangTestLanguageFactoryImpl extends EFactoryImpl implements BeeL * * @generated */ + @Override public BeeLangTestLanguagePackage getBeeLangTestLanguagePackage() { return (BeeLangTestLanguagePackage)getEPackage(); diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/BeeLangTestLanguagePackageImpl.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/BeeLangTestLanguagePackageImpl.java index ce7e9dc5c..04b7b5fef 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/BeeLangTestLanguagePackageImpl.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/BeeLangTestLanguagePackageImpl.java @@ -338,7 +338,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link BeeLangTestLanguagePackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -353,7 +353,8 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL if (isInited) return (BeeLangTestLanguagePackage)EPackage.Registry.INSTANCE.getEPackage(BeeLangTestLanguagePackage.eNS_URI); // Obtain or create and register package - BeeLangTestLanguagePackageImpl theBeeLangTestLanguagePackage = (BeeLangTestLanguagePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof BeeLangTestLanguagePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new BeeLangTestLanguagePackageImpl()); + Object registeredBeeLangTestLanguagePackage = EPackage.Registry.INSTANCE.get(eNS_URI); + BeeLangTestLanguagePackageImpl theBeeLangTestLanguagePackage = registeredBeeLangTestLanguagePackage instanceof BeeLangTestLanguagePackageImpl ? (BeeLangTestLanguagePackageImpl)registeredBeeLangTestLanguagePackage : new BeeLangTestLanguagePackageImpl(); isInited = true; @@ -366,7 +367,6 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL // Mark meta-data to indicate it can't be changed theBeeLangTestLanguagePackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(BeeLangTestLanguagePackage.eNS_URI, theBeeLangTestLanguagePackage); return theBeeLangTestLanguagePackage; @@ -377,6 +377,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EClass getModel() { return modelEClass; @@ -387,6 +388,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EReference getModel_Units() { return (EReference)modelEClass.getEStructuralFeatures().get(0); @@ -397,6 +399,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EReference getModel_Functions() { return (EReference)modelEClass.getEStructuralFeatures().get(1); @@ -407,6 +410,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EClass getUnit() { return unitEClass; @@ -417,6 +421,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EAttribute getUnit_Documentation() { return (EAttribute)unitEClass.getEStructuralFeatures().get(0); @@ -427,6 +432,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EAttribute getUnit_Name() { return (EAttribute)unitEClass.getEStructuralFeatures().get(1); @@ -437,6 +443,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EAttribute getUnit_Version() { return (EAttribute)unitEClass.getEStructuralFeatures().get(2); @@ -447,6 +454,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EReference getUnit_Implements() { return (EReference)unitEClass.getEStructuralFeatures().get(3); @@ -457,6 +465,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EAttribute getUnit_SourceLocation() { return (EAttribute)unitEClass.getEStructuralFeatures().get(4); @@ -467,6 +476,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EAttribute getUnit_OutputLocation() { return (EAttribute)unitEClass.getEStructuralFeatures().get(5); @@ -477,6 +487,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EReference getUnit_ProvidedCapabilities() { return (EReference)unitEClass.getEStructuralFeatures().get(6); @@ -487,6 +498,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EReference getUnit_RequiredCapabilities() { return (EReference)unitEClass.getEStructuralFeatures().get(7); @@ -497,6 +509,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EReference getUnit_MetaRequiredCapabilities() { return (EReference)unitEClass.getEStructuralFeatures().get(8); @@ -507,6 +520,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EReference getUnit_Functions() { return (EReference)unitEClass.getEStructuralFeatures().get(9); @@ -517,6 +531,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EClass getProvidedCapability() { return providedCapabilityEClass; @@ -527,6 +542,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EAttribute getProvidedCapability_NameSpace() { return (EAttribute)providedCapabilityEClass.getEStructuralFeatures().get(0); @@ -537,6 +553,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EReference getProvidedCapability_CondExpr() { return (EReference)providedCapabilityEClass.getEStructuralFeatures().get(1); @@ -547,6 +564,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EAttribute getProvidedCapability_Name() { return (EAttribute)providedCapabilityEClass.getEStructuralFeatures().get(2); @@ -557,6 +575,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EAttribute getProvidedCapability_Version() { return (EAttribute)providedCapabilityEClass.getEStructuralFeatures().get(3); @@ -567,6 +586,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EClass getAliasedRequiredCapability() { return aliasedRequiredCapabilityEClass; @@ -577,6 +597,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EAttribute getAliasedRequiredCapability_NameSpace() { return (EAttribute)aliasedRequiredCapabilityEClass.getEStructuralFeatures().get(0); @@ -587,6 +608,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EAttribute getAliasedRequiredCapability_Name() { return (EAttribute)aliasedRequiredCapabilityEClass.getEStructuralFeatures().get(1); @@ -597,6 +619,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EAttribute getAliasedRequiredCapability_Alias() { return (EAttribute)aliasedRequiredCapabilityEClass.getEStructuralFeatures().get(2); @@ -607,6 +630,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EReference getAliasedRequiredCapability_CondExpr() { return (EReference)aliasedRequiredCapabilityEClass.getEStructuralFeatures().get(3); @@ -617,6 +641,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EAttribute getAliasedRequiredCapability_Greedy() { return (EAttribute)aliasedRequiredCapabilityEClass.getEStructuralFeatures().get(4); @@ -627,6 +652,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EAttribute getAliasedRequiredCapability_Min() { return (EAttribute)aliasedRequiredCapabilityEClass.getEStructuralFeatures().get(5); @@ -637,6 +663,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EAttribute getAliasedRequiredCapability_Max() { return (EAttribute)aliasedRequiredCapabilityEClass.getEStructuralFeatures().get(6); @@ -647,6 +674,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EAttribute getAliasedRequiredCapability_VersionRange() { return (EAttribute)aliasedRequiredCapabilityEClass.getEStructuralFeatures().get(7); @@ -657,6 +685,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EClass getRequiredCapability() { return requiredCapabilityEClass; @@ -667,6 +696,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EAttribute getRequiredCapability_NameSpace() { return (EAttribute)requiredCapabilityEClass.getEStructuralFeatures().get(0); @@ -677,6 +707,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EAttribute getRequiredCapability_Name() { return (EAttribute)requiredCapabilityEClass.getEStructuralFeatures().get(1); @@ -687,6 +718,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EReference getRequiredCapability_CondExpr() { return (EReference)requiredCapabilityEClass.getEStructuralFeatures().get(2); @@ -697,6 +729,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EAttribute getRequiredCapability_Greedy() { return (EAttribute)requiredCapabilityEClass.getEStructuralFeatures().get(3); @@ -707,6 +740,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EAttribute getRequiredCapability_Min() { return (EAttribute)requiredCapabilityEClass.getEStructuralFeatures().get(4); @@ -717,6 +751,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EAttribute getRequiredCapability_Max() { return (EAttribute)requiredCapabilityEClass.getEStructuralFeatures().get(5); @@ -727,6 +762,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EAttribute getRequiredCapability_VersionRange() { return (EAttribute)requiredCapabilityEClass.getEStructuralFeatures().get(6); @@ -737,6 +773,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EClass getParameterList() { return parameterListEClass; @@ -747,6 +784,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EReference getParameterList_Parameters() { return (EReference)parameterListEClass.getEStructuralFeatures().get(0); @@ -757,6 +795,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EClass getParameter() { return parameterEClass; @@ -767,6 +806,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EReference getParameter_Expr() { return (EReference)parameterEClass.getEStructuralFeatures().get(0); @@ -777,6 +817,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EClass getClosureParameter() { return closureParameterEClass; @@ -787,6 +828,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EClass getParameterDeclaration() { return parameterDeclarationEClass; @@ -797,6 +839,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EReference getParameterDeclaration_Type() { return (EReference)parameterDeclarationEClass.getEStructuralFeatures().get(0); @@ -807,6 +850,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EAttribute getParameterDeclaration_Name() { return (EAttribute)parameterDeclarationEClass.getEStructuralFeatures().get(1); @@ -817,6 +861,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EClass getFunction() { return functionEClass; @@ -827,6 +872,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EAttribute getFunction_Documentation() { return (EAttribute)functionEClass.getEStructuralFeatures().get(0); @@ -837,6 +883,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EAttribute getFunction_Visibility() { return (EAttribute)functionEClass.getEStructuralFeatures().get(1); @@ -847,6 +894,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EAttribute getFunction_Final() { return (EAttribute)functionEClass.getEStructuralFeatures().get(2); @@ -857,6 +905,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EReference getFunction_ReturnType() { return (EReference)functionEClass.getEStructuralFeatures().get(3); @@ -867,6 +916,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EAttribute getFunction_Name() { return (EAttribute)functionEClass.getEStructuralFeatures().get(4); @@ -877,6 +927,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EReference getFunction_Parameters() { return (EReference)functionEClass.getEStructuralFeatures().get(5); @@ -887,6 +938,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EAttribute getFunction_VarArgs() { return (EAttribute)functionEClass.getEStructuralFeatures().get(6); @@ -897,6 +949,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EReference getFunction_Guard() { return (EReference)functionEClass.getEStructuralFeatures().get(7); @@ -907,6 +960,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EReference getFunction_FuncExpr() { return (EReference)functionEClass.getEStructuralFeatures().get(8); @@ -917,6 +971,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EClass getGuardExpression() { return guardExpressionEClass; @@ -927,6 +982,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EReference getGuardExpression_GuardExpr() { return (EReference)guardExpressionEClass.getEStructuralFeatures().get(0); @@ -937,6 +993,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EClass getExpression() { return expressionEClass; @@ -947,6 +1004,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EClass getTypeRef() { return typeRefEClass; @@ -957,6 +1015,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EClass getSimpleTypeRef() { return simpleTypeRefEClass; @@ -967,6 +1026,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EAttribute getSimpleTypeRef_RawType() { return (EAttribute)simpleTypeRefEClass.getEStructuralFeatures().get(0); @@ -977,6 +1037,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EAttribute getSimpleTypeRef_ActualArgumentsList() { return (EAttribute)simpleTypeRefEClass.getEStructuralFeatures().get(1); @@ -987,6 +1048,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EClass getClosureTypeRef() { return closureTypeRefEClass; @@ -997,6 +1059,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EAttribute getClosureTypeRef_ParameterTypes() { return (EAttribute)closureTypeRefEClass.getEStructuralFeatures().get(0); @@ -1007,6 +1070,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EAttribute getClosureTypeRef_VarArgs() { return (EAttribute)closureTypeRefEClass.getEStructuralFeatures().get(1); @@ -1017,6 +1081,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EAttribute getClosureTypeRef_ReturnType() { return (EAttribute)closureTypeRefEClass.getEStructuralFeatures().get(2); @@ -1027,6 +1092,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EClass getWithExpression() { return withExpressionEClass; @@ -1037,6 +1103,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EAttribute getWithExpression_ReferencedAdvice() { return (EAttribute)withExpressionEClass.getEStructuralFeatures().get(0); @@ -1047,6 +1114,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EReference getWithExpression_FuncExpr() { return (EReference)withExpressionEClass.getEStructuralFeatures().get(1); @@ -1057,6 +1125,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EClass getWithContextExpression() { return withContextExpressionEClass; @@ -1067,6 +1136,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EReference getWithContextExpression_Expr() { return (EReference)withContextExpressionEClass.getEStructuralFeatures().get(0); @@ -1077,6 +1147,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EAttribute getWithContextExpression_Alias() { return (EAttribute)withContextExpressionEClass.getEStructuralFeatures().get(1); @@ -1087,6 +1158,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EReference getWithContextExpression_ContextBlock() { return (EReference)withContextExpressionEClass.getEStructuralFeatures().get(2); @@ -1097,6 +1169,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EClass getCallExpression() { return callExpressionEClass; @@ -1107,6 +1180,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EClass getValueLiteral() { return valueLiteralEClass; @@ -1117,6 +1191,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EAttribute getValueLiteral_Value() { return (EAttribute)valueLiteralEClass.getEStructuralFeatures().get(0); @@ -1127,6 +1202,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EClass getAssignmentExpression() { return assignmentExpressionEClass; @@ -1137,6 +1213,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EReference getAssignmentExpression_LeftExpr() { return (EReference)assignmentExpressionEClass.getEStructuralFeatures().get(0); @@ -1147,6 +1224,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EAttribute getAssignmentExpression_FunctionName() { return (EAttribute)assignmentExpressionEClass.getEStructuralFeatures().get(1); @@ -1157,6 +1235,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EReference getAssignmentExpression_RightExpr() { return (EReference)assignmentExpressionEClass.getEStructuralFeatures().get(2); @@ -1167,6 +1246,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EClass getDefValue() { return defValueEClass; @@ -1177,6 +1257,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EAttribute getDefValue_Final() { return (EAttribute)defValueEClass.getEStructuralFeatures().get(0); @@ -1187,6 +1268,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EReference getDefValue_Type() { return (EReference)defValueEClass.getEStructuralFeatures().get(1); @@ -1197,6 +1279,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EAttribute getDefValue_Name() { return (EAttribute)defValueEClass.getEStructuralFeatures().get(2); @@ -1207,6 +1290,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EReference getDefValue_ValueExpr() { return (EReference)defValueEClass.getEStructuralFeatures().get(3); @@ -1217,6 +1301,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EAttribute getDefValue_Immutable() { return (EAttribute)defValueEClass.getEStructuralFeatures().get(4); @@ -1227,6 +1312,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EClass getCachedExpression() { return cachedExpressionEClass; @@ -1237,6 +1323,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EReference getCachedExpression_Expr() { return (EReference)cachedExpressionEClass.getEStructuralFeatures().get(0); @@ -1247,6 +1334,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EClass getOrExpression() { return orExpressionEClass; @@ -1257,6 +1345,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EReference getOrExpression_LeftExpr() { return (EReference)orExpressionEClass.getEStructuralFeatures().get(0); @@ -1267,6 +1356,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EReference getOrExpression_RightExpr() { return (EReference)orExpressionEClass.getEStructuralFeatures().get(1); @@ -1277,6 +1367,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EClass getAndExpression() { return andExpressionEClass; @@ -1287,6 +1378,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EReference getAndExpression_LeftExpr() { return (EReference)andExpressionEClass.getEStructuralFeatures().get(0); @@ -1297,6 +1389,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EReference getAndExpression_RightExpr() { return (EReference)andExpressionEClass.getEStructuralFeatures().get(1); @@ -1307,6 +1400,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EClass getBinaryOpExpression() { return binaryOpExpressionEClass; @@ -1317,6 +1411,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EReference getBinaryOpExpression_LeftExpr() { return (EReference)binaryOpExpressionEClass.getEStructuralFeatures().get(0); @@ -1327,6 +1422,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EAttribute getBinaryOpExpression_FunctionName() { return (EAttribute)binaryOpExpressionEClass.getEStructuralFeatures().get(1); @@ -1337,6 +1433,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EReference getBinaryOpExpression_RightExpr() { return (EReference)binaryOpExpressionEClass.getEStructuralFeatures().get(2); @@ -1347,6 +1444,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EClass getUnaryOpExpression() { return unaryOpExpressionEClass; @@ -1357,6 +1455,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EAttribute getUnaryOpExpression_FunctionName() { return (EAttribute)unaryOpExpressionEClass.getEStructuralFeatures().get(0); @@ -1367,6 +1466,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EReference getUnaryOpExpression_Expr() { return (EReference)unaryOpExpressionEClass.getEStructuralFeatures().get(1); @@ -1377,6 +1477,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EClass getUnaryPreOpExpression() { return unaryPreOpExpressionEClass; @@ -1387,6 +1488,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EAttribute getUnaryPreOpExpression_FunctionName() { return (EAttribute)unaryPreOpExpressionEClass.getEStructuralFeatures().get(0); @@ -1397,6 +1499,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EReference getUnaryPreOpExpression_Expr() { return (EReference)unaryPreOpExpressionEClass.getEStructuralFeatures().get(1); @@ -1407,6 +1510,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EClass getUnaryPostOpExpression() { return unaryPostOpExpressionEClass; @@ -1417,6 +1521,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EReference getUnaryPostOpExpression_Expr() { return (EReference)unaryPostOpExpressionEClass.getEStructuralFeatures().get(0); @@ -1427,6 +1532,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EAttribute getUnaryPostOpExpression_FunctionName() { return (EAttribute)unaryPostOpExpressionEClass.getEStructuralFeatures().get(1); @@ -1437,6 +1543,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EClass getCallFeature() { return callFeatureEClass; @@ -1447,6 +1554,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EReference getCallFeature_FuncExpr() { return (EReference)callFeatureEClass.getEStructuralFeatures().get(0); @@ -1457,6 +1565,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EAttribute getCallFeature_Name() { return (EAttribute)callFeatureEClass.getEStructuralFeatures().get(1); @@ -1467,6 +1576,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EReference getCallFeature_ParameterList() { return (EReference)callFeatureEClass.getEStructuralFeatures().get(2); @@ -1477,6 +1587,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EClass getAtExpression() { return atExpressionEClass; @@ -1487,6 +1598,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EReference getAtExpression_ObjExpr() { return (EReference)atExpressionEClass.getEStructuralFeatures().get(0); @@ -1497,6 +1609,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EReference getAtExpression_IndexExpr() { return (EReference)atExpressionEClass.getEStructuralFeatures().get(1); @@ -1507,6 +1620,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EClass getFeatureExpression() { return featureExpressionEClass; @@ -1517,6 +1631,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EReference getFeatureExpression_ObjExpr() { return (EReference)featureExpressionEClass.getEStructuralFeatures().get(0); @@ -1527,6 +1642,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EAttribute getFeatureExpression_FeatureName() { return (EAttribute)featureExpressionEClass.getEStructuralFeatures().get(1); @@ -1537,6 +1653,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EClass getCallFunction() { return callFunctionEClass; @@ -1547,6 +1664,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EReference getCallFunction_FuncExpr() { return (EReference)callFunctionEClass.getEStructuralFeatures().get(0); @@ -1557,6 +1675,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EReference getCallFunction_ParameterList() { return (EReference)callFunctionEClass.getEStructuralFeatures().get(1); @@ -1567,6 +1686,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EClass getChainedExpression() { return chainedExpressionEClass; @@ -1577,6 +1697,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EReference getChainedExpression_Expressions() { return (EReference)chainedExpressionEClass.getEStructuralFeatures().get(0); @@ -1587,6 +1708,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EClass getVariableExpression() { return variableExpressionEClass; @@ -1597,6 +1719,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EAttribute getVariableExpression_Name() { return (EAttribute)variableExpressionEClass.getEStructuralFeatures().get(0); @@ -1607,6 +1730,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EClass getCallNamedFunction() { return callNamedFunctionEClass; @@ -1617,6 +1741,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EAttribute getCallNamedFunction_Name() { return (EAttribute)callNamedFunctionEClass.getEStructuralFeatures().get(0); @@ -1627,6 +1752,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EReference getCallNamedFunction_ParameterList() { return (EReference)callNamedFunctionEClass.getEStructuralFeatures().get(1); @@ -1637,6 +1763,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EClass getCreateExpression() { return createExpressionEClass; @@ -1647,6 +1774,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EAttribute getCreateExpression_TypeExpr() { return (EAttribute)createExpressionEClass.getEStructuralFeatures().get(0); @@ -1657,6 +1785,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EReference getCreateExpression_ParameterList() { return (EReference)createExpressionEClass.getEStructuralFeatures().get(1); @@ -1667,6 +1796,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EAttribute getCreateExpression_Alias() { return (EAttribute)createExpressionEClass.getEStructuralFeatures().get(2); @@ -1677,6 +1807,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public EReference getCreateExpression_ContextBlock() { return (EReference)createExpressionEClass.getEStructuralFeatures().get(3); @@ -1687,6 +1818,7 @@ public class BeeLangTestLanguagePackageImpl extends EPackageImpl implements BeeL * * @generated */ + @Override public BeeLangTestLanguageFactory getBeeLangTestLanguageFactory() { return (BeeLangTestLanguageFactory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/BinaryOpExpressionImpl.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/BinaryOpExpressionImpl.java index e77a5b970..87cb5e016 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/BinaryOpExpressionImpl.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/BinaryOpExpressionImpl.java @@ -98,6 +98,7 @@ public class BinaryOpExpressionImpl extends ExpressionImpl implements BinaryOpEx * * @generated */ + @Override public Expression getLeftExpr() { return leftExpr; @@ -125,6 +126,7 @@ public class BinaryOpExpressionImpl extends ExpressionImpl implements BinaryOpEx * * @generated */ + @Override public void setLeftExpr(Expression newLeftExpr) { if (newLeftExpr != leftExpr) @@ -146,6 +148,7 @@ public class BinaryOpExpressionImpl extends ExpressionImpl implements BinaryOpEx * * @generated */ + @Override public String getFunctionName() { return functionName; @@ -156,6 +159,7 @@ public class BinaryOpExpressionImpl extends ExpressionImpl implements BinaryOpEx * * @generated */ + @Override public void setFunctionName(String newFunctionName) { String oldFunctionName = functionName; @@ -169,6 +173,7 @@ public class BinaryOpExpressionImpl extends ExpressionImpl implements BinaryOpEx * * @generated */ + @Override public Expression getRightExpr() { return rightExpr; @@ -196,6 +201,7 @@ public class BinaryOpExpressionImpl extends ExpressionImpl implements BinaryOpEx * * @generated */ + @Override public void setRightExpr(Expression newRightExpr) { if (newRightExpr != rightExpr) @@ -326,7 +332,7 @@ public class BinaryOpExpressionImpl extends ExpressionImpl implements BinaryOpEx { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (functionName: "); result.append(functionName); result.append(')'); diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/CachedExpressionImpl.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/CachedExpressionImpl.java index 8a8cf1868..3c3a8cb7b 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/CachedExpressionImpl.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/CachedExpressionImpl.java @@ -66,6 +66,7 @@ public class CachedExpressionImpl extends ExpressionImpl implements CachedExpres * * @generated */ + @Override public Expression getExpr() { return expr; @@ -93,6 +94,7 @@ public class CachedExpressionImpl extends ExpressionImpl implements CachedExpres * * @generated */ + @Override public void setExpr(Expression newExpr) { if (newExpr != expr) diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/CallFeatureImpl.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/CallFeatureImpl.java index fe98a5584..8063a3901 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/CallFeatureImpl.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/CallFeatureImpl.java @@ -99,6 +99,7 @@ public class CallFeatureImpl extends ExpressionImpl implements CallFeature * * @generated */ + @Override public Expression getFuncExpr() { return funcExpr; @@ -126,6 +127,7 @@ public class CallFeatureImpl extends ExpressionImpl implements CallFeature * * @generated */ + @Override public void setFuncExpr(Expression newFuncExpr) { if (newFuncExpr != funcExpr) @@ -147,6 +149,7 @@ public class CallFeatureImpl extends ExpressionImpl implements CallFeature * * @generated */ + @Override public String getName() { return name; @@ -157,6 +160,7 @@ public class CallFeatureImpl extends ExpressionImpl implements CallFeature * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -170,6 +174,7 @@ public class CallFeatureImpl extends ExpressionImpl implements CallFeature * * @generated */ + @Override public ParameterList getParameterList() { return parameterList; @@ -197,6 +202,7 @@ public class CallFeatureImpl extends ExpressionImpl implements CallFeature * * @generated */ + @Override public void setParameterList(ParameterList newParameterList) { if (newParameterList != parameterList) @@ -327,7 +333,7 @@ public class CallFeatureImpl extends ExpressionImpl implements CallFeature { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/CallFunctionImpl.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/CallFunctionImpl.java index 0de50bde9..7276f8088 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/CallFunctionImpl.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/CallFunctionImpl.java @@ -78,6 +78,7 @@ public class CallFunctionImpl extends ExpressionImpl implements CallFunction * * @generated */ + @Override public Expression getFuncExpr() { return funcExpr; @@ -105,6 +106,7 @@ public class CallFunctionImpl extends ExpressionImpl implements CallFunction * * @generated */ + @Override public void setFuncExpr(Expression newFuncExpr) { if (newFuncExpr != funcExpr) @@ -126,6 +128,7 @@ public class CallFunctionImpl extends ExpressionImpl implements CallFunction * * @generated */ + @Override public ParameterList getParameterList() { return parameterList; @@ -153,6 +156,7 @@ public class CallFunctionImpl extends ExpressionImpl implements CallFunction * * @generated */ + @Override public void setParameterList(ParameterList newParameterList) { if (newParameterList != parameterList) diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/CallNamedFunctionImpl.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/CallNamedFunctionImpl.java index 9937b587d..c05b64083 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/CallNamedFunctionImpl.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/CallNamedFunctionImpl.java @@ -87,6 +87,7 @@ public class CallNamedFunctionImpl extends CallExpressionImpl implements CallNam * * @generated */ + @Override public String getName() { return name; @@ -97,6 +98,7 @@ public class CallNamedFunctionImpl extends CallExpressionImpl implements CallNam * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -110,6 +112,7 @@ public class CallNamedFunctionImpl extends CallExpressionImpl implements CallNam * * @generated */ + @Override public ParameterList getParameterList() { return parameterList; @@ -137,6 +140,7 @@ public class CallNamedFunctionImpl extends CallExpressionImpl implements CallNam * * @generated */ + @Override public void setParameterList(ParameterList newParameterList) { if (newParameterList != parameterList) @@ -255,7 +259,7 @@ public class CallNamedFunctionImpl extends CallExpressionImpl implements CallNam { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/ChainedExpressionImpl.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/ChainedExpressionImpl.java index 1fe121ec7..68344f5c6 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/ChainedExpressionImpl.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/ChainedExpressionImpl.java @@ -70,6 +70,7 @@ public class ChainedExpressionImpl extends ExpressionImpl implements ChainedExpr * * @generated */ + @Override public EList getExpressions() { if (expressions == null) diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/ClosureTypeRefImpl.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/ClosureTypeRefImpl.java index e82685545..c30b0bd5a 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/ClosureTypeRefImpl.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/ClosureTypeRefImpl.java @@ -111,6 +111,7 @@ public class ClosureTypeRefImpl extends TypeRefImpl implements ClosureTypeRef * * @generated */ + @Override public EList getParameterTypes() { if (parameterTypes == null) @@ -125,6 +126,7 @@ public class ClosureTypeRefImpl extends TypeRefImpl implements ClosureTypeRef * * @generated */ + @Override public boolean isVarArgs() { return varArgs; @@ -135,6 +137,7 @@ public class ClosureTypeRefImpl extends TypeRefImpl implements ClosureTypeRef * * @generated */ + @Override public void setVarArgs(boolean newVarArgs) { boolean oldVarArgs = varArgs; @@ -148,6 +151,7 @@ public class ClosureTypeRefImpl extends TypeRefImpl implements ClosureTypeRef * * @generated */ + @Override public String getReturnType() { return returnType; @@ -158,6 +162,7 @@ public class ClosureTypeRefImpl extends TypeRefImpl implements ClosureTypeRef * * @generated */ + @Override public void setReturnType(String newReturnType) { String oldReturnType = returnType; @@ -264,7 +269,7 @@ public class ClosureTypeRefImpl extends TypeRefImpl implements ClosureTypeRef { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (parameterTypes: "); result.append(parameterTypes); result.append(", varArgs: "); diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/CreateExpressionImpl.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/CreateExpressionImpl.java index 8a40441aa..c51cdff90 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/CreateExpressionImpl.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/CreateExpressionImpl.java @@ -120,6 +120,7 @@ public class CreateExpressionImpl extends ExpressionImpl implements CreateExpres * * @generated */ + @Override public String getTypeExpr() { return typeExpr; @@ -130,6 +131,7 @@ public class CreateExpressionImpl extends ExpressionImpl implements CreateExpres * * @generated */ + @Override public void setTypeExpr(String newTypeExpr) { String oldTypeExpr = typeExpr; @@ -143,6 +145,7 @@ public class CreateExpressionImpl extends ExpressionImpl implements CreateExpres * * @generated */ + @Override public ParameterList getParameterList() { return parameterList; @@ -170,6 +173,7 @@ public class CreateExpressionImpl extends ExpressionImpl implements CreateExpres * * @generated */ + @Override public void setParameterList(ParameterList newParameterList) { if (newParameterList != parameterList) @@ -191,6 +195,7 @@ public class CreateExpressionImpl extends ExpressionImpl implements CreateExpres * * @generated */ + @Override public String getAlias() { return alias; @@ -201,6 +206,7 @@ public class CreateExpressionImpl extends ExpressionImpl implements CreateExpres * * @generated */ + @Override public void setAlias(String newAlias) { String oldAlias = alias; @@ -214,6 +220,7 @@ public class CreateExpressionImpl extends ExpressionImpl implements CreateExpres * * @generated */ + @Override public Expression getContextBlock() { return contextBlock; @@ -241,6 +248,7 @@ public class CreateExpressionImpl extends ExpressionImpl implements CreateExpres * * @generated */ + @Override public void setContextBlock(Expression newContextBlock) { if (newContextBlock != contextBlock) @@ -381,7 +389,7 @@ public class CreateExpressionImpl extends ExpressionImpl implements CreateExpres { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (typeExpr: "); result.append(typeExpr); result.append(", alias: "); diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/DefValueImpl.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/DefValueImpl.java index 8a17cf61d..49b5ddbe5 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/DefValueImpl.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/DefValueImpl.java @@ -141,6 +141,7 @@ public class DefValueImpl extends ExpressionImpl implements DefValue * * @generated */ + @Override public boolean isFinal() { return final_; @@ -151,6 +152,7 @@ public class DefValueImpl extends ExpressionImpl implements DefValue * * @generated */ + @Override public void setFinal(boolean newFinal) { boolean oldFinal = final_; @@ -164,6 +166,7 @@ public class DefValueImpl extends ExpressionImpl implements DefValue * * @generated */ + @Override public TypeRef getType() { return type; @@ -191,6 +194,7 @@ public class DefValueImpl extends ExpressionImpl implements DefValue * * @generated */ + @Override public void setType(TypeRef newType) { if (newType != type) @@ -212,6 +216,7 @@ public class DefValueImpl extends ExpressionImpl implements DefValue * * @generated */ + @Override public String getName() { return name; @@ -222,6 +227,7 @@ public class DefValueImpl extends ExpressionImpl implements DefValue * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -235,6 +241,7 @@ public class DefValueImpl extends ExpressionImpl implements DefValue * * @generated */ + @Override public Expression getValueExpr() { return valueExpr; @@ -262,6 +269,7 @@ public class DefValueImpl extends ExpressionImpl implements DefValue * * @generated */ + @Override public void setValueExpr(Expression newValueExpr) { if (newValueExpr != valueExpr) @@ -283,6 +291,7 @@ public class DefValueImpl extends ExpressionImpl implements DefValue * * @generated */ + @Override public boolean isImmutable() { return immutable; @@ -293,6 +302,7 @@ public class DefValueImpl extends ExpressionImpl implements DefValue * * @generated */ + @Override public void setImmutable(boolean newImmutable) { boolean oldImmutable = immutable; @@ -435,7 +445,7 @@ public class DefValueImpl extends ExpressionImpl implements DefValue { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (final: "); result.append(final_); result.append(", name: "); diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/FeatureExpressionImpl.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/FeatureExpressionImpl.java index 7b1f4a342..0fc4910ae 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/FeatureExpressionImpl.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/FeatureExpressionImpl.java @@ -87,6 +87,7 @@ public class FeatureExpressionImpl extends ExpressionImpl implements FeatureExpr * * @generated */ + @Override public Expression getObjExpr() { return objExpr; @@ -114,6 +115,7 @@ public class FeatureExpressionImpl extends ExpressionImpl implements FeatureExpr * * @generated */ + @Override public void setObjExpr(Expression newObjExpr) { if (newObjExpr != objExpr) @@ -135,6 +137,7 @@ public class FeatureExpressionImpl extends ExpressionImpl implements FeatureExpr * * @generated */ + @Override public String getFeatureName() { return featureName; @@ -145,6 +148,7 @@ public class FeatureExpressionImpl extends ExpressionImpl implements FeatureExpr * * @generated */ + @Override public void setFeatureName(String newFeatureName) { String oldFeatureName = featureName; @@ -255,7 +259,7 @@ public class FeatureExpressionImpl extends ExpressionImpl implements FeatureExpr { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (featureName: "); result.append(featureName); result.append(')'); diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/FunctionImpl.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/FunctionImpl.java index fc6f880c9..ebc77fd05 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/FunctionImpl.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/FunctionImpl.java @@ -214,6 +214,7 @@ public class FunctionImpl extends ExpressionImpl implements Function * * @generated */ + @Override public String getDocumentation() { return documentation; @@ -224,6 +225,7 @@ public class FunctionImpl extends ExpressionImpl implements Function * * @generated */ + @Override public void setDocumentation(String newDocumentation) { String oldDocumentation = documentation; @@ -237,6 +239,7 @@ public class FunctionImpl extends ExpressionImpl implements Function * * @generated */ + @Override public String getVisibility() { return visibility; @@ -247,6 +250,7 @@ public class FunctionImpl extends ExpressionImpl implements Function * * @generated */ + @Override public void setVisibility(String newVisibility) { String oldVisibility = visibility; @@ -260,6 +264,7 @@ public class FunctionImpl extends ExpressionImpl implements Function * * @generated */ + @Override public boolean isFinal() { return final_; @@ -270,6 +275,7 @@ public class FunctionImpl extends ExpressionImpl implements Function * * @generated */ + @Override public void setFinal(boolean newFinal) { boolean oldFinal = final_; @@ -283,6 +289,7 @@ public class FunctionImpl extends ExpressionImpl implements Function * * @generated */ + @Override public TypeRef getReturnType() { return returnType; @@ -310,6 +317,7 @@ public class FunctionImpl extends ExpressionImpl implements Function * * @generated */ + @Override public void setReturnType(TypeRef newReturnType) { if (newReturnType != returnType) @@ -331,6 +339,7 @@ public class FunctionImpl extends ExpressionImpl implements Function * * @generated */ + @Override public String getName() { return name; @@ -341,6 +350,7 @@ public class FunctionImpl extends ExpressionImpl implements Function * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -354,6 +364,7 @@ public class FunctionImpl extends ExpressionImpl implements Function * * @generated */ + @Override public EList getParameters() { if (parameters == null) @@ -368,6 +379,7 @@ public class FunctionImpl extends ExpressionImpl implements Function * * @generated */ + @Override public boolean isVarArgs() { return varArgs; @@ -378,6 +390,7 @@ public class FunctionImpl extends ExpressionImpl implements Function * * @generated */ + @Override public void setVarArgs(boolean newVarArgs) { boolean oldVarArgs = varArgs; @@ -391,6 +404,7 @@ public class FunctionImpl extends ExpressionImpl implements Function * * @generated */ + @Override public GuardExpression getGuard() { return guard; @@ -418,6 +432,7 @@ public class FunctionImpl extends ExpressionImpl implements Function * * @generated */ + @Override public void setGuard(GuardExpression newGuard) { if (newGuard != guard) @@ -439,6 +454,7 @@ public class FunctionImpl extends ExpressionImpl implements Function * * @generated */ + @Override public Expression getFuncExpr() { return funcExpr; @@ -466,6 +482,7 @@ public class FunctionImpl extends ExpressionImpl implements Function * * @generated */ + @Override public void setFuncExpr(Expression newFuncExpr) { if (newFuncExpr != funcExpr) @@ -662,7 +679,7 @@ public class FunctionImpl extends ExpressionImpl implements Function { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (documentation: "); result.append(documentation); result.append(", visibility: "); diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/GuardExpressionImpl.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/GuardExpressionImpl.java index 87d4db8a7..340660ab7 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/GuardExpressionImpl.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/GuardExpressionImpl.java @@ -67,6 +67,7 @@ public class GuardExpressionImpl extends MinimalEObjectImpl.Container implements * * @generated */ + @Override public Expression getGuardExpr() { return guardExpr; @@ -94,6 +95,7 @@ public class GuardExpressionImpl extends MinimalEObjectImpl.Container implements * * @generated */ + @Override public void setGuardExpr(Expression newGuardExpr) { if (newGuardExpr != guardExpr) diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/ModelImpl.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/ModelImpl.java index 26a5b9471..43cfd42c1 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/ModelImpl.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/ModelImpl.java @@ -84,6 +84,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public EList getUnits() { if (units == null) @@ -98,6 +99,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public EList getFunctions() { if (functions == null) diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/OrExpressionImpl.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/OrExpressionImpl.java index b1e45b338..30b1fa333 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/OrExpressionImpl.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/OrExpressionImpl.java @@ -77,6 +77,7 @@ public class OrExpressionImpl extends ExpressionImpl implements OrExpression * * @generated */ + @Override public Expression getLeftExpr() { return leftExpr; @@ -104,6 +105,7 @@ public class OrExpressionImpl extends ExpressionImpl implements OrExpression * * @generated */ + @Override public void setLeftExpr(Expression newLeftExpr) { if (newLeftExpr != leftExpr) @@ -125,6 +127,7 @@ public class OrExpressionImpl extends ExpressionImpl implements OrExpression * * @generated */ + @Override public Expression getRightExpr() { return rightExpr; @@ -152,6 +155,7 @@ public class OrExpressionImpl extends ExpressionImpl implements OrExpression * * @generated */ + @Override public void setRightExpr(Expression newRightExpr) { if (newRightExpr != rightExpr) diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/ParameterDeclarationImpl.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/ParameterDeclarationImpl.java index 4c5344968..358327c4a 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/ParameterDeclarationImpl.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/ParameterDeclarationImpl.java @@ -88,6 +88,7 @@ public class ParameterDeclarationImpl extends MinimalEObjectImpl.Container imple * * @generated */ + @Override public TypeRef getType() { return type; @@ -115,6 +116,7 @@ public class ParameterDeclarationImpl extends MinimalEObjectImpl.Container imple * * @generated */ + @Override public void setType(TypeRef newType) { if (newType != type) @@ -136,6 +138,7 @@ public class ParameterDeclarationImpl extends MinimalEObjectImpl.Container imple * * @generated */ + @Override public String getName() { return name; @@ -146,6 +149,7 @@ public class ParameterDeclarationImpl extends MinimalEObjectImpl.Container imple * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -256,7 +260,7 @@ public class ParameterDeclarationImpl extends MinimalEObjectImpl.Container imple { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/ParameterImpl.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/ParameterImpl.java index 8079e4f1e..c6512adb6 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/ParameterImpl.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/ParameterImpl.java @@ -67,6 +67,7 @@ public class ParameterImpl extends MinimalEObjectImpl.Container implements Param * * @generated */ + @Override public Expression getExpr() { return expr; @@ -94,6 +95,7 @@ public class ParameterImpl extends MinimalEObjectImpl.Container implements Param * * @generated */ + @Override public void setExpr(Expression newExpr) { if (newExpr != expr) diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/ParameterListImpl.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/ParameterListImpl.java index bbbfb9242..5d7c30c01 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/ParameterListImpl.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/ParameterListImpl.java @@ -72,6 +72,7 @@ public class ParameterListImpl extends MinimalEObjectImpl.Container implements P * * @generated */ + @Override public EList getParameters() { if (parameters == null) diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/ProvidedCapabilityImpl.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/ProvidedCapabilityImpl.java index bacbc35d2..cddc86a00 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/ProvidedCapabilityImpl.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/ProvidedCapabilityImpl.java @@ -130,6 +130,7 @@ public class ProvidedCapabilityImpl extends MinimalEObjectImpl.Container impleme * * @generated */ + @Override public String getNameSpace() { return nameSpace; @@ -140,6 +141,7 @@ public class ProvidedCapabilityImpl extends MinimalEObjectImpl.Container impleme * * @generated */ + @Override public void setNameSpace(String newNameSpace) { String oldNameSpace = nameSpace; @@ -153,6 +155,7 @@ public class ProvidedCapabilityImpl extends MinimalEObjectImpl.Container impleme * * @generated */ + @Override public Expression getCondExpr() { return condExpr; @@ -180,6 +183,7 @@ public class ProvidedCapabilityImpl extends MinimalEObjectImpl.Container impleme * * @generated */ + @Override public void setCondExpr(Expression newCondExpr) { if (newCondExpr != condExpr) @@ -201,6 +205,7 @@ public class ProvidedCapabilityImpl extends MinimalEObjectImpl.Container impleme * * @generated */ + @Override public String getName() { return name; @@ -211,6 +216,7 @@ public class ProvidedCapabilityImpl extends MinimalEObjectImpl.Container impleme * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -224,6 +230,7 @@ public class ProvidedCapabilityImpl extends MinimalEObjectImpl.Container impleme * * @generated */ + @Override public String getVersion() { return version; @@ -234,6 +241,7 @@ public class ProvidedCapabilityImpl extends MinimalEObjectImpl.Container impleme * * @generated */ + @Override public void setVersion(String newVersion) { String oldVersion = version; @@ -364,7 +372,7 @@ public class ProvidedCapabilityImpl extends MinimalEObjectImpl.Container impleme { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (nameSpace: "); result.append(nameSpace); result.append(", name: "); diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/RequiredCapabilityImpl.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/RequiredCapabilityImpl.java index 071cdcfb9..06d5ea22e 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/RequiredCapabilityImpl.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/RequiredCapabilityImpl.java @@ -193,6 +193,7 @@ public class RequiredCapabilityImpl extends MinimalEObjectImpl.Container impleme * * @generated */ + @Override public String getNameSpace() { return nameSpace; @@ -203,6 +204,7 @@ public class RequiredCapabilityImpl extends MinimalEObjectImpl.Container impleme * * @generated */ + @Override public void setNameSpace(String newNameSpace) { String oldNameSpace = nameSpace; @@ -216,6 +218,7 @@ public class RequiredCapabilityImpl extends MinimalEObjectImpl.Container impleme * * @generated */ + @Override public String getName() { return name; @@ -226,6 +229,7 @@ public class RequiredCapabilityImpl extends MinimalEObjectImpl.Container impleme * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -239,6 +243,7 @@ public class RequiredCapabilityImpl extends MinimalEObjectImpl.Container impleme * * @generated */ + @Override public Expression getCondExpr() { return condExpr; @@ -266,6 +271,7 @@ public class RequiredCapabilityImpl extends MinimalEObjectImpl.Container impleme * * @generated */ + @Override public void setCondExpr(Expression newCondExpr) { if (newCondExpr != condExpr) @@ -287,6 +293,7 @@ public class RequiredCapabilityImpl extends MinimalEObjectImpl.Container impleme * * @generated */ + @Override public boolean isGreedy() { return greedy; @@ -297,6 +304,7 @@ public class RequiredCapabilityImpl extends MinimalEObjectImpl.Container impleme * * @generated */ + @Override public void setGreedy(boolean newGreedy) { boolean oldGreedy = greedy; @@ -310,6 +318,7 @@ public class RequiredCapabilityImpl extends MinimalEObjectImpl.Container impleme * * @generated */ + @Override public int getMin() { return min; @@ -320,6 +329,7 @@ public class RequiredCapabilityImpl extends MinimalEObjectImpl.Container impleme * * @generated */ + @Override public void setMin(int newMin) { int oldMin = min; @@ -333,6 +343,7 @@ public class RequiredCapabilityImpl extends MinimalEObjectImpl.Container impleme * * @generated */ + @Override public int getMax() { return max; @@ -343,6 +354,7 @@ public class RequiredCapabilityImpl extends MinimalEObjectImpl.Container impleme * * @generated */ + @Override public void setMax(int newMax) { int oldMax = max; @@ -356,6 +368,7 @@ public class RequiredCapabilityImpl extends MinimalEObjectImpl.Container impleme * * @generated */ + @Override public String getVersionRange() { return versionRange; @@ -366,6 +379,7 @@ public class RequiredCapabilityImpl extends MinimalEObjectImpl.Container impleme * * @generated */ + @Override public void setVersionRange(String newVersionRange) { String oldVersionRange = versionRange; @@ -526,7 +540,7 @@ public class RequiredCapabilityImpl extends MinimalEObjectImpl.Container impleme { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (nameSpace: "); result.append(nameSpace); result.append(", name: "); diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/SimpleTypeRefImpl.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/SimpleTypeRefImpl.java index 402856a7b..2981dd051 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/SimpleTypeRefImpl.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/SimpleTypeRefImpl.java @@ -90,6 +90,7 @@ public class SimpleTypeRefImpl extends TypeRefImpl implements SimpleTypeRef * * @generated */ + @Override public String getRawType() { return rawType; @@ -100,6 +101,7 @@ public class SimpleTypeRefImpl extends TypeRefImpl implements SimpleTypeRef * * @generated */ + @Override public void setRawType(String newRawType) { String oldRawType = rawType; @@ -113,6 +115,7 @@ public class SimpleTypeRefImpl extends TypeRefImpl implements SimpleTypeRef * * @generated */ + @Override public EList getActualArgumentsList() { if (actualArgumentsList == null) @@ -210,7 +213,7 @@ public class SimpleTypeRefImpl extends TypeRefImpl implements SimpleTypeRef { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (rawType: "); result.append(rawType); result.append(", actualArgumentsList: "); diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/UnaryOpExpressionImpl.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/UnaryOpExpressionImpl.java index cb508c523..48dc00d2a 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/UnaryOpExpressionImpl.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/UnaryOpExpressionImpl.java @@ -87,6 +87,7 @@ public class UnaryOpExpressionImpl extends ExpressionImpl implements UnaryOpExpr * * @generated */ + @Override public String getFunctionName() { return functionName; @@ -97,6 +98,7 @@ public class UnaryOpExpressionImpl extends ExpressionImpl implements UnaryOpExpr * * @generated */ + @Override public void setFunctionName(String newFunctionName) { String oldFunctionName = functionName; @@ -110,6 +112,7 @@ public class UnaryOpExpressionImpl extends ExpressionImpl implements UnaryOpExpr * * @generated */ + @Override public Expression getExpr() { return expr; @@ -137,6 +140,7 @@ public class UnaryOpExpressionImpl extends ExpressionImpl implements UnaryOpExpr * * @generated */ + @Override public void setExpr(Expression newExpr) { if (newExpr != expr) @@ -255,7 +259,7 @@ public class UnaryOpExpressionImpl extends ExpressionImpl implements UnaryOpExpr { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (functionName: "); result.append(functionName); result.append(')'); diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/UnaryPostOpExpressionImpl.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/UnaryPostOpExpressionImpl.java index cad7d2878..7b6c2b74b 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/UnaryPostOpExpressionImpl.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/UnaryPostOpExpressionImpl.java @@ -87,6 +87,7 @@ public class UnaryPostOpExpressionImpl extends ExpressionImpl implements UnaryPo * * @generated */ + @Override public Expression getExpr() { return expr; @@ -114,6 +115,7 @@ public class UnaryPostOpExpressionImpl extends ExpressionImpl implements UnaryPo * * @generated */ + @Override public void setExpr(Expression newExpr) { if (newExpr != expr) @@ -135,6 +137,7 @@ public class UnaryPostOpExpressionImpl extends ExpressionImpl implements UnaryPo * * @generated */ + @Override public String getFunctionName() { return functionName; @@ -145,6 +148,7 @@ public class UnaryPostOpExpressionImpl extends ExpressionImpl implements UnaryPo * * @generated */ + @Override public void setFunctionName(String newFunctionName) { String oldFunctionName = functionName; @@ -255,7 +259,7 @@ public class UnaryPostOpExpressionImpl extends ExpressionImpl implements UnaryPo { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (functionName: "); result.append(functionName); result.append(')'); diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/UnaryPreOpExpressionImpl.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/UnaryPreOpExpressionImpl.java index b63cb550b..80ebf4712 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/UnaryPreOpExpressionImpl.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/UnaryPreOpExpressionImpl.java @@ -87,6 +87,7 @@ public class UnaryPreOpExpressionImpl extends ExpressionImpl implements UnaryPre * * @generated */ + @Override public String getFunctionName() { return functionName; @@ -97,6 +98,7 @@ public class UnaryPreOpExpressionImpl extends ExpressionImpl implements UnaryPre * * @generated */ + @Override public void setFunctionName(String newFunctionName) { String oldFunctionName = functionName; @@ -110,6 +112,7 @@ public class UnaryPreOpExpressionImpl extends ExpressionImpl implements UnaryPre * * @generated */ + @Override public Expression getExpr() { return expr; @@ -137,6 +140,7 @@ public class UnaryPreOpExpressionImpl extends ExpressionImpl implements UnaryPre * * @generated */ + @Override public void setExpr(Expression newExpr) { if (newExpr != expr) @@ -255,7 +259,7 @@ public class UnaryPreOpExpressionImpl extends ExpressionImpl implements UnaryPre { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (functionName: "); result.append(functionName); result.append(')'); diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/UnitImpl.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/UnitImpl.java index 497826705..fb08fe94b 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/UnitImpl.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/UnitImpl.java @@ -227,6 +227,7 @@ public class UnitImpl extends MinimalEObjectImpl.Container implements Unit * * @generated */ + @Override public String getDocumentation() { return documentation; @@ -237,6 +238,7 @@ public class UnitImpl extends MinimalEObjectImpl.Container implements Unit * * @generated */ + @Override public void setDocumentation(String newDocumentation) { String oldDocumentation = documentation; @@ -250,6 +252,7 @@ public class UnitImpl extends MinimalEObjectImpl.Container implements Unit * * @generated */ + @Override public String getName() { return name; @@ -260,6 +263,7 @@ public class UnitImpl extends MinimalEObjectImpl.Container implements Unit * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -273,6 +277,7 @@ public class UnitImpl extends MinimalEObjectImpl.Container implements Unit * * @generated */ + @Override public String getVersion() { return version; @@ -283,6 +288,7 @@ public class UnitImpl extends MinimalEObjectImpl.Container implements Unit * * @generated */ + @Override public void setVersion(String newVersion) { String oldVersion = version; @@ -296,6 +302,7 @@ public class UnitImpl extends MinimalEObjectImpl.Container implements Unit * * @generated */ + @Override public EList getImplements() { if (implements_ == null) @@ -310,6 +317,7 @@ public class UnitImpl extends MinimalEObjectImpl.Container implements Unit * * @generated */ + @Override public String getSourceLocation() { return sourceLocation; @@ -320,6 +328,7 @@ public class UnitImpl extends MinimalEObjectImpl.Container implements Unit * * @generated */ + @Override public void setSourceLocation(String newSourceLocation) { String oldSourceLocation = sourceLocation; @@ -333,6 +342,7 @@ public class UnitImpl extends MinimalEObjectImpl.Container implements Unit * * @generated */ + @Override public String getOutputLocation() { return outputLocation; @@ -343,6 +353,7 @@ public class UnitImpl extends MinimalEObjectImpl.Container implements Unit * * @generated */ + @Override public void setOutputLocation(String newOutputLocation) { String oldOutputLocation = outputLocation; @@ -356,6 +367,7 @@ public class UnitImpl extends MinimalEObjectImpl.Container implements Unit * * @generated */ + @Override public EList getProvidedCapabilities() { if (providedCapabilities == null) @@ -370,6 +382,7 @@ public class UnitImpl extends MinimalEObjectImpl.Container implements Unit * * @generated */ + @Override public EList getRequiredCapabilities() { if (requiredCapabilities == null) @@ -384,6 +397,7 @@ public class UnitImpl extends MinimalEObjectImpl.Container implements Unit * * @generated */ + @Override public EList getMetaRequiredCapabilities() { if (metaRequiredCapabilities == null) @@ -398,6 +412,7 @@ public class UnitImpl extends MinimalEObjectImpl.Container implements Unit * * @generated */ + @Override public EList getFunctions() { if (functions == null) @@ -603,7 +618,7 @@ public class UnitImpl extends MinimalEObjectImpl.Container implements Unit { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (documentation: "); result.append(documentation); result.append(", name: "); diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/ValueLiteralImpl.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/ValueLiteralImpl.java index 5bd386020..54075dda5 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/ValueLiteralImpl.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/ValueLiteralImpl.java @@ -73,6 +73,7 @@ public class ValueLiteralImpl extends ExpressionImpl implements ValueLiteral * * @generated */ + @Override public String getValue() { return value; @@ -83,6 +84,7 @@ public class ValueLiteralImpl extends ExpressionImpl implements ValueLiteral * * @generated */ + @Override public void setValue(String newValue) { String oldValue = value; @@ -167,7 +169,7 @@ public class ValueLiteralImpl extends ExpressionImpl implements ValueLiteral { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (value: "); result.append(value); result.append(')'); diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/VariableExpressionImpl.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/VariableExpressionImpl.java index 925b17f16..28a01809b 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/VariableExpressionImpl.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/VariableExpressionImpl.java @@ -73,6 +73,7 @@ public class VariableExpressionImpl extends ExpressionImpl implements VariableEx * * @generated */ + @Override public String getName() { return name; @@ -83,6 +84,7 @@ public class VariableExpressionImpl extends ExpressionImpl implements VariableEx * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -167,7 +169,7 @@ public class VariableExpressionImpl extends ExpressionImpl implements VariableEx { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/WithContextExpressionImpl.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/WithContextExpressionImpl.java index 3ab1b1dda..802f9038c 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/WithContextExpressionImpl.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/WithContextExpressionImpl.java @@ -98,6 +98,7 @@ public class WithContextExpressionImpl extends ExpressionImpl implements WithCon * * @generated */ + @Override public Expression getExpr() { return expr; @@ -125,6 +126,7 @@ public class WithContextExpressionImpl extends ExpressionImpl implements WithCon * * @generated */ + @Override public void setExpr(Expression newExpr) { if (newExpr != expr) @@ -146,6 +148,7 @@ public class WithContextExpressionImpl extends ExpressionImpl implements WithCon * * @generated */ + @Override public String getAlias() { return alias; @@ -156,6 +159,7 @@ public class WithContextExpressionImpl extends ExpressionImpl implements WithCon * * @generated */ + @Override public void setAlias(String newAlias) { String oldAlias = alias; @@ -169,6 +173,7 @@ public class WithContextExpressionImpl extends ExpressionImpl implements WithCon * * @generated */ + @Override public Expression getContextBlock() { return contextBlock; @@ -196,6 +201,7 @@ public class WithContextExpressionImpl extends ExpressionImpl implements WithCon * * @generated */ + @Override public void setContextBlock(Expression newContextBlock) { if (newContextBlock != contextBlock) @@ -326,7 +332,7 @@ public class WithContextExpressionImpl extends ExpressionImpl implements WithCon { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (alias: "); result.append(alias); result.append(')'); diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/WithExpressionImpl.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/WithExpressionImpl.java index db5230628..b31158741 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/WithExpressionImpl.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/backtracking/beeLangTestLanguage/impl/WithExpressionImpl.java @@ -83,6 +83,7 @@ public class WithExpressionImpl extends ExpressionImpl implements WithExpression * * @generated */ + @Override public EList getReferencedAdvice() { if (referencedAdvice == null) @@ -97,6 +98,7 @@ public class WithExpressionImpl extends ExpressionImpl implements WithExpression * * @generated */ + @Override public Expression getFuncExpr() { return funcExpr; @@ -124,6 +126,7 @@ public class WithExpressionImpl extends ExpressionImpl implements WithExpression * * @generated */ + @Override public void setFuncExpr(Expression newFuncExpr) { if (newFuncExpr != funcExpr) @@ -244,7 +247,7 @@ public class WithExpressionImpl extends ExpressionImpl implements WithExpression { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (referencedAdvice: "); result.append(referencedAdvice); result.append(')'); diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/fileAware/fileAware/Element.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/fileAware/fileAware/Element.java index 31e503178..23d4dd22b 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/fileAware/fileAware/Element.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/fileAware/fileAware/Element.java @@ -30,10 +30,6 @@ public interface Element 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) @@ -57,10 +53,6 @@ public interface Element extends EObject * Returns the value of the 'Contents' containment reference list. * The list contents are of type {@link org.eclipse.xtext.testlanguages.fileAware.fileAware.Element}. * - *

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

* * @return the value of the 'Contents' containment reference list. * @see org.eclipse.xtext.testlanguages.fileAware.fileAware.FileAwarePackage#getElement_Contents() @@ -73,10 +65,6 @@ public interface Element extends EObject * Returns the value of the 'Ref' reference list. * The list contents are of type {@link org.eclipse.xtext.testlanguages.fileAware.fileAware.Element}. * - *

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

* * @return the value of the 'Ref' reference list. * @see org.eclipse.xtext.testlanguages.fileAware.fileAware.FileAwarePackage#getElement_Ref() diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/fileAware/fileAware/Import.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/fileAware/fileAware/Import.java index 64887a110..a42823ffc 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/fileAware/fileAware/Import.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/fileAware/fileAware/Import.java @@ -26,10 +26,6 @@ public interface Import extends EObject /** * Returns the value of the 'Element' reference. * - *

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

* * @return the value of the 'Element' reference. * @see #setElement(Element) diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/fileAware/fileAware/PackageDeclaration.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/fileAware/fileAware/PackageDeclaration.java index 369766bdd..2ce0c95dd 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/fileAware/fileAware/PackageDeclaration.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/fileAware/fileAware/PackageDeclaration.java @@ -30,10 +30,6 @@ public interface PackageDeclaration 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) @@ -57,10 +53,6 @@ public interface PackageDeclaration extends EObject * Returns the value of the 'Imports' containment reference list. * The list contents are of type {@link org.eclipse.xtext.testlanguages.fileAware.fileAware.Import}. * - *

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

* * @return the value of the 'Imports' containment reference list. * @see org.eclipse.xtext.testlanguages.fileAware.fileAware.FileAwarePackage#getPackageDeclaration_Imports() @@ -73,10 +65,6 @@ public interface PackageDeclaration extends EObject * Returns the value of the 'Contents' containment reference list. * The list contents are of type {@link org.eclipse.xtext.testlanguages.fileAware.fileAware.Element}. * - *

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

* * @return the value of the 'Contents' containment reference list. * @see org.eclipse.xtext.testlanguages.fileAware.fileAware.FileAwarePackage#getPackageDeclaration_Contents() diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/fileAware/fileAware/impl/ElementImpl.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/fileAware/fileAware/impl/ElementImpl.java index 2b039161d..e77181a10 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/fileAware/fileAware/impl/ElementImpl.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/fileAware/fileAware/impl/ElementImpl.java @@ -106,6 +106,7 @@ public class ElementImpl extends MinimalEObjectImpl.Container implements Element * * @generated */ + @Override public String getName() { return name; @@ -116,6 +117,7 @@ public class ElementImpl extends MinimalEObjectImpl.Container implements Element * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -129,6 +131,7 @@ public class ElementImpl extends MinimalEObjectImpl.Container implements Element * * @generated */ + @Override public EList getContents() { if (contents == null) @@ -143,6 +146,7 @@ public class ElementImpl extends MinimalEObjectImpl.Container implements Element * * @generated */ + @Override public EList getRef() { if (ref == null) @@ -267,7 +271,7 @@ public class ElementImpl extends MinimalEObjectImpl.Container implements Element { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/fileAware/fileAware/impl/FileAwareFactoryImpl.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/fileAware/fileAware/impl/FileAwareFactoryImpl.java index 2b7bb104f..06e89a323 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/fileAware/fileAware/impl/FileAwareFactoryImpl.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/fileAware/fileAware/impl/FileAwareFactoryImpl.java @@ -78,6 +78,7 @@ public class FileAwareFactoryImpl extends EFactoryImpl implements FileAwareFacto * * @generated */ + @Override public PackageDeclaration createPackageDeclaration() { PackageDeclarationImpl packageDeclaration = new PackageDeclarationImpl(); @@ -89,6 +90,7 @@ public class FileAwareFactoryImpl extends EFactoryImpl implements FileAwareFacto * * @generated */ + @Override public Import createImport() { ImportImpl import_ = new ImportImpl(); @@ -100,6 +102,7 @@ public class FileAwareFactoryImpl extends EFactoryImpl implements FileAwareFacto * * @generated */ + @Override public Element createElement() { ElementImpl element = new ElementImpl(); @@ -111,6 +114,7 @@ public class FileAwareFactoryImpl extends EFactoryImpl implements FileAwareFacto * * @generated */ + @Override public FileAwarePackage getFileAwarePackage() { return (FileAwarePackage)getEPackage(); diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/fileAware/fileAware/impl/FileAwarePackageImpl.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/fileAware/fileAware/impl/FileAwarePackageImpl.java index 527362cc6..c87313c4c 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/fileAware/fileAware/impl/FileAwarePackageImpl.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/fileAware/fileAware/impl/FileAwarePackageImpl.java @@ -74,7 +74,7 @@ public class FileAwarePackageImpl extends EPackageImpl implements FileAwarePacka /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link FileAwarePackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -89,7 +89,8 @@ public class FileAwarePackageImpl extends EPackageImpl implements FileAwarePacka if (isInited) return (FileAwarePackage)EPackage.Registry.INSTANCE.getEPackage(FileAwarePackage.eNS_URI); // Obtain or create and register package - FileAwarePackageImpl theFileAwarePackage = (FileAwarePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof FileAwarePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new FileAwarePackageImpl()); + Object registeredFileAwarePackage = EPackage.Registry.INSTANCE.get(eNS_URI); + FileAwarePackageImpl theFileAwarePackage = registeredFileAwarePackage instanceof FileAwarePackageImpl ? (FileAwarePackageImpl)registeredFileAwarePackage : new FileAwarePackageImpl(); isInited = true; @@ -102,7 +103,6 @@ public class FileAwarePackageImpl extends EPackageImpl implements FileAwarePacka // Mark meta-data to indicate it can't be changed theFileAwarePackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(FileAwarePackage.eNS_URI, theFileAwarePackage); return theFileAwarePackage; @@ -113,6 +113,7 @@ public class FileAwarePackageImpl extends EPackageImpl implements FileAwarePacka * * @generated */ + @Override public EClass getPackageDeclaration() { return packageDeclarationEClass; @@ -123,6 +124,7 @@ public class FileAwarePackageImpl extends EPackageImpl implements FileAwarePacka * * @generated */ + @Override public EAttribute getPackageDeclaration_Name() { return (EAttribute)packageDeclarationEClass.getEStructuralFeatures().get(0); @@ -133,6 +135,7 @@ public class FileAwarePackageImpl extends EPackageImpl implements FileAwarePacka * * @generated */ + @Override public EReference getPackageDeclaration_Imports() { return (EReference)packageDeclarationEClass.getEStructuralFeatures().get(1); @@ -143,6 +146,7 @@ public class FileAwarePackageImpl extends EPackageImpl implements FileAwarePacka * * @generated */ + @Override public EReference getPackageDeclaration_Contents() { return (EReference)packageDeclarationEClass.getEStructuralFeatures().get(2); @@ -153,6 +157,7 @@ public class FileAwarePackageImpl extends EPackageImpl implements FileAwarePacka * * @generated */ + @Override public EClass getImport() { return importEClass; @@ -163,6 +168,7 @@ public class FileAwarePackageImpl extends EPackageImpl implements FileAwarePacka * * @generated */ + @Override public EReference getImport_Element() { return (EReference)importEClass.getEStructuralFeatures().get(0); @@ -173,6 +179,7 @@ public class FileAwarePackageImpl extends EPackageImpl implements FileAwarePacka * * @generated */ + @Override public EClass getElement() { return elementEClass; @@ -183,6 +190,7 @@ public class FileAwarePackageImpl extends EPackageImpl implements FileAwarePacka * * @generated */ + @Override public EAttribute getElement_Name() { return (EAttribute)elementEClass.getEStructuralFeatures().get(0); @@ -193,6 +201,7 @@ public class FileAwarePackageImpl extends EPackageImpl implements FileAwarePacka * * @generated */ + @Override public EReference getElement_Contents() { return (EReference)elementEClass.getEStructuralFeatures().get(1); @@ -203,6 +212,7 @@ public class FileAwarePackageImpl extends EPackageImpl implements FileAwarePacka * * @generated */ + @Override public EReference getElement_Ref() { return (EReference)elementEClass.getEStructuralFeatures().get(2); @@ -213,6 +223,7 @@ public class FileAwarePackageImpl extends EPackageImpl implements FileAwarePacka * * @generated */ + @Override public FileAwareFactory getFileAwareFactory() { return (FileAwareFactory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/fileAware/fileAware/impl/ImportImpl.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/fileAware/fileAware/impl/ImportImpl.java index 26b5f2b64..caf0f9505 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/fileAware/fileAware/impl/ImportImpl.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/fileAware/fileAware/impl/ImportImpl.java @@ -66,6 +66,7 @@ public class ImportImpl extends MinimalEObjectImpl.Container implements Import * * @generated */ + @Override public Element getElement() { if (element != null && element.eIsProxy()) @@ -96,6 +97,7 @@ public class ImportImpl extends MinimalEObjectImpl.Container implements Import * * @generated */ + @Override public void setElement(Element newElement) { Element oldElement = element; diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/fileAware/fileAware/impl/PackageDeclarationImpl.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/fileAware/fileAware/impl/PackageDeclarationImpl.java index 03040c6be..a047a4749 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/fileAware/fileAware/impl/PackageDeclarationImpl.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/fileAware/fileAware/impl/PackageDeclarationImpl.java @@ -107,6 +107,7 @@ public class PackageDeclarationImpl extends MinimalEObjectImpl.Container impleme * * @generated */ + @Override public String getName() { return name; @@ -117,6 +118,7 @@ public class PackageDeclarationImpl extends MinimalEObjectImpl.Container impleme * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -130,6 +132,7 @@ public class PackageDeclarationImpl extends MinimalEObjectImpl.Container impleme * * @generated */ + @Override public EList getImports() { if (imports == null) @@ -144,6 +147,7 @@ public class PackageDeclarationImpl extends MinimalEObjectImpl.Container impleme * * @generated */ + @Override public EList getContents() { if (contents == null) @@ -270,7 +274,7 @@ public class PackageDeclarationImpl extends MinimalEObjectImpl.Container impleme { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/nestedRefs/nestedRefs/Doc.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/nestedRefs/nestedRefs/Doc.java index 7072d8c46..c1221416c 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/nestedRefs/nestedRefs/Doc.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/nestedRefs/nestedRefs/Doc.java @@ -29,10 +29,6 @@ public interface Doc extends EObject * Returns the value of the 'Declarations' containment reference list. * The list contents are of type {@link org.eclipse.xtext.testlanguages.nestedRefs.nestedRefs.SelfReferingDecl}. * - *

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

* * @return the value of the 'Declarations' containment reference list. * @see org.eclipse.xtext.testlanguages.nestedRefs.nestedRefs.NestedRefsPackage#getDoc_Declarations() diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/nestedRefs/nestedRefs/SelfReferingDecl.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/nestedRefs/nestedRefs/SelfReferingDecl.java index f4046b5cb..4c98fd0be 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/nestedRefs/nestedRefs/SelfReferingDecl.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/nestedRefs/nestedRefs/SelfReferingDecl.java @@ -27,10 +27,6 @@ public interface SelfReferingDecl 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) @@ -53,10 +49,6 @@ public interface SelfReferingDecl extends EObject /** * Returns the value of the 'Self Ref' reference. * - *

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

* * @return the value of the 'Self Ref' reference. * @see #setSelfRef(SelfReferingDecl) diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/nestedRefs/nestedRefs/impl/DocImpl.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/nestedRefs/nestedRefs/impl/DocImpl.java index c32e144c2..7572d951a 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/nestedRefs/nestedRefs/impl/DocImpl.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/nestedRefs/nestedRefs/impl/DocImpl.java @@ -72,6 +72,7 @@ public class DocImpl extends MinimalEObjectImpl.Container implements Doc * * @generated */ + @Override public EList getDeclarations() { if (declarations == null) diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/nestedRefs/nestedRefs/impl/NestedRefsFactoryImpl.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/nestedRefs/nestedRefs/impl/NestedRefsFactoryImpl.java index 046ccf586..b79e0ce81 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/nestedRefs/nestedRefs/impl/NestedRefsFactoryImpl.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/nestedRefs/nestedRefs/impl/NestedRefsFactoryImpl.java @@ -77,6 +77,7 @@ public class NestedRefsFactoryImpl extends EFactoryImpl implements NestedRefsFac * * @generated */ + @Override public Doc createDoc() { DocImpl doc = new DocImpl(); @@ -88,6 +89,7 @@ public class NestedRefsFactoryImpl extends EFactoryImpl implements NestedRefsFac * * @generated */ + @Override public SelfReferingDecl createSelfReferingDecl() { SelfReferingDeclImpl selfReferingDecl = new SelfReferingDeclImpl(); @@ -99,6 +101,7 @@ public class NestedRefsFactoryImpl extends EFactoryImpl implements NestedRefsFac * * @generated */ + @Override public NestedRefsPackage getNestedRefsPackage() { return (NestedRefsPackage)getEPackage(); diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/nestedRefs/nestedRefs/impl/NestedRefsPackageImpl.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/nestedRefs/nestedRefs/impl/NestedRefsPackageImpl.java index 3e7d91ac4..63d3014ab 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/nestedRefs/nestedRefs/impl/NestedRefsPackageImpl.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/nestedRefs/nestedRefs/impl/NestedRefsPackageImpl.java @@ -66,7 +66,7 @@ public class NestedRefsPackageImpl extends EPackageImpl implements NestedRefsPac /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link NestedRefsPackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -81,7 +81,8 @@ public class NestedRefsPackageImpl extends EPackageImpl implements NestedRefsPac if (isInited) return (NestedRefsPackage)EPackage.Registry.INSTANCE.getEPackage(NestedRefsPackage.eNS_URI); // Obtain or create and register package - NestedRefsPackageImpl theNestedRefsPackage = (NestedRefsPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof NestedRefsPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new NestedRefsPackageImpl()); + Object registeredNestedRefsPackage = EPackage.Registry.INSTANCE.get(eNS_URI); + NestedRefsPackageImpl theNestedRefsPackage = registeredNestedRefsPackage instanceof NestedRefsPackageImpl ? (NestedRefsPackageImpl)registeredNestedRefsPackage : new NestedRefsPackageImpl(); isInited = true; @@ -94,7 +95,6 @@ public class NestedRefsPackageImpl extends EPackageImpl implements NestedRefsPac // Mark meta-data to indicate it can't be changed theNestedRefsPackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(NestedRefsPackage.eNS_URI, theNestedRefsPackage); return theNestedRefsPackage; @@ -105,6 +105,7 @@ public class NestedRefsPackageImpl extends EPackageImpl implements NestedRefsPac * * @generated */ + @Override public EClass getDoc() { return docEClass; @@ -115,6 +116,7 @@ public class NestedRefsPackageImpl extends EPackageImpl implements NestedRefsPac * * @generated */ + @Override public EReference getDoc_Declarations() { return (EReference)docEClass.getEStructuralFeatures().get(0); @@ -125,6 +127,7 @@ public class NestedRefsPackageImpl extends EPackageImpl implements NestedRefsPac * * @generated */ + @Override public EClass getSelfReferingDecl() { return selfReferingDeclEClass; @@ -135,6 +138,7 @@ public class NestedRefsPackageImpl extends EPackageImpl implements NestedRefsPac * * @generated */ + @Override public EAttribute getSelfReferingDecl_Name() { return (EAttribute)selfReferingDeclEClass.getEStructuralFeatures().get(0); @@ -145,6 +149,7 @@ public class NestedRefsPackageImpl extends EPackageImpl implements NestedRefsPac * * @generated */ + @Override public EReference getSelfReferingDecl_SelfRef() { return (EReference)selfReferingDeclEClass.getEStructuralFeatures().get(1); @@ -155,6 +160,7 @@ public class NestedRefsPackageImpl extends EPackageImpl implements NestedRefsPac * * @generated */ + @Override public NestedRefsFactory getNestedRefsFactory() { return (NestedRefsFactory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/nestedRefs/nestedRefs/impl/SelfReferingDeclImpl.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/nestedRefs/nestedRefs/impl/SelfReferingDeclImpl.java index 9c676406b..c5fe193c5 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/nestedRefs/nestedRefs/impl/SelfReferingDeclImpl.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/nestedRefs/nestedRefs/impl/SelfReferingDeclImpl.java @@ -86,6 +86,7 @@ public class SelfReferingDeclImpl extends MinimalEObjectImpl.Container implement * * @generated */ + @Override public String getName() { return name; @@ -96,6 +97,7 @@ public class SelfReferingDeclImpl extends MinimalEObjectImpl.Container implement * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -109,6 +111,7 @@ public class SelfReferingDeclImpl extends MinimalEObjectImpl.Container implement * * @generated */ + @Override public SelfReferingDecl getSelfRef() { if (selfRef != null && selfRef.eIsProxy()) @@ -139,6 +142,7 @@ public class SelfReferingDeclImpl extends MinimalEObjectImpl.Container implement * * @generated */ + @Override public void setSelfRef(SelfReferingDecl newSelfRef) { SelfReferingDecl oldSelfRef = selfRef; @@ -234,7 +238,7 @@ public class SelfReferingDeclImpl extends MinimalEObjectImpl.Container implement { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/noJdt/noJdt/Greeting.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/noJdt/noJdt/Greeting.java index c4b722e83..07efccf2e 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/noJdt/noJdt/Greeting.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/noJdt/noJdt/Greeting.java @@ -27,10 +27,6 @@ public interface Greeting 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) @@ -53,10 +49,6 @@ public interface Greeting extends EObject /** * Returns the value of the 'Other' reference. * - *

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

* * @return the value of the 'Other' reference. * @see #setOther(Greeting) diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/noJdt/noJdt/Model.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/noJdt/noJdt/Model.java index 5827c4a44..be065debe 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/noJdt/noJdt/Model.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/noJdt/noJdt/Model.java @@ -29,10 +29,6 @@ public interface Model extends EObject * Returns the value of the 'Greetings' containment reference list. * The list contents are of type {@link org.eclipse.xtext.testlanguages.noJdt.noJdt.Greeting}. * - *

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

* * @return the value of the 'Greetings' containment reference list. * @see org.eclipse.xtext.testlanguages.noJdt.noJdt.NoJdtPackage#getModel_Greetings() diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/noJdt/noJdt/impl/GreetingImpl.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/noJdt/noJdt/impl/GreetingImpl.java index 2edfae5d6..7ee974064 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/noJdt/noJdt/impl/GreetingImpl.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/noJdt/noJdt/impl/GreetingImpl.java @@ -86,6 +86,7 @@ public class GreetingImpl extends MinimalEObjectImpl.Container implements Greeti * * @generated */ + @Override public String getName() { return name; @@ -96,6 +97,7 @@ public class GreetingImpl extends MinimalEObjectImpl.Container implements Greeti * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -109,6 +111,7 @@ public class GreetingImpl extends MinimalEObjectImpl.Container implements Greeti * * @generated */ + @Override public Greeting getOther() { if (other != null && other.eIsProxy()) @@ -139,6 +142,7 @@ public class GreetingImpl extends MinimalEObjectImpl.Container implements Greeti * * @generated */ + @Override public void setOther(Greeting newOther) { Greeting oldOther = other; @@ -234,7 +238,7 @@ public class GreetingImpl extends MinimalEObjectImpl.Container implements Greeti { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/noJdt/noJdt/impl/ModelImpl.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/noJdt/noJdt/impl/ModelImpl.java index 7c1fd756a..06bfc8841 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/noJdt/noJdt/impl/ModelImpl.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/noJdt/noJdt/impl/ModelImpl.java @@ -72,6 +72,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public EList getGreetings() { if (greetings == null) diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/noJdt/noJdt/impl/NoJdtFactoryImpl.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/noJdt/noJdt/impl/NoJdtFactoryImpl.java index 25e095de8..7df4d0b8c 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/noJdt/noJdt/impl/NoJdtFactoryImpl.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/noJdt/noJdt/impl/NoJdtFactoryImpl.java @@ -77,6 +77,7 @@ public class NoJdtFactoryImpl extends EFactoryImpl implements NoJdtFactory * * @generated */ + @Override public Model createModel() { ModelImpl model = new ModelImpl(); @@ -88,6 +89,7 @@ public class NoJdtFactoryImpl extends EFactoryImpl implements NoJdtFactory * * @generated */ + @Override public Greeting createGreeting() { GreetingImpl greeting = new GreetingImpl(); @@ -99,6 +101,7 @@ public class NoJdtFactoryImpl extends EFactoryImpl implements NoJdtFactory * * @generated */ + @Override public NoJdtPackage getNoJdtPackage() { return (NoJdtPackage)getEPackage(); diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/noJdt/noJdt/impl/NoJdtPackageImpl.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/noJdt/noJdt/impl/NoJdtPackageImpl.java index 7f40ae8ca..49e0669d0 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/noJdt/noJdt/impl/NoJdtPackageImpl.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/noJdt/noJdt/impl/NoJdtPackageImpl.java @@ -66,7 +66,7 @@ public class NoJdtPackageImpl extends EPackageImpl implements NoJdtPackage /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link NoJdtPackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -81,7 +81,8 @@ public class NoJdtPackageImpl extends EPackageImpl implements NoJdtPackage if (isInited) return (NoJdtPackage)EPackage.Registry.INSTANCE.getEPackage(NoJdtPackage.eNS_URI); // Obtain or create and register package - NoJdtPackageImpl theNoJdtPackage = (NoJdtPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof NoJdtPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new NoJdtPackageImpl()); + Object registeredNoJdtPackage = EPackage.Registry.INSTANCE.get(eNS_URI); + NoJdtPackageImpl theNoJdtPackage = registeredNoJdtPackage instanceof NoJdtPackageImpl ? (NoJdtPackageImpl)registeredNoJdtPackage : new NoJdtPackageImpl(); isInited = true; @@ -94,7 +95,6 @@ public class NoJdtPackageImpl extends EPackageImpl implements NoJdtPackage // Mark meta-data to indicate it can't be changed theNoJdtPackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(NoJdtPackage.eNS_URI, theNoJdtPackage); return theNoJdtPackage; @@ -105,6 +105,7 @@ public class NoJdtPackageImpl extends EPackageImpl implements NoJdtPackage * * @generated */ + @Override public EClass getModel() { return modelEClass; @@ -115,6 +116,7 @@ public class NoJdtPackageImpl extends EPackageImpl implements NoJdtPackage * * @generated */ + @Override public EReference getModel_Greetings() { return (EReference)modelEClass.getEStructuralFeatures().get(0); @@ -125,6 +127,7 @@ public class NoJdtPackageImpl extends EPackageImpl implements NoJdtPackage * * @generated */ + @Override public EClass getGreeting() { return greetingEClass; @@ -135,6 +138,7 @@ public class NoJdtPackageImpl extends EPackageImpl implements NoJdtPackage * * @generated */ + @Override public EAttribute getGreeting_Name() { return (EAttribute)greetingEClass.getEStructuralFeatures().get(0); @@ -145,6 +149,7 @@ public class NoJdtPackageImpl extends EPackageImpl implements NoJdtPackage * * @generated */ + @Override public EReference getGreeting_Other() { return (EReference)greetingEClass.getEStructuralFeatures().get(1); @@ -155,6 +160,7 @@ public class NoJdtPackageImpl extends EPackageImpl implements NoJdtPackage * * @generated */ + @Override public NoJdtFactory getNoJdtFactory() { return (NoJdtFactory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/AbstractElement.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/AbstractElement.java index 51146f5a2..0af9699e5 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/AbstractElement.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/AbstractElement.java @@ -26,10 +26,6 @@ public interface AbstractElement extends EObject /** * Returns the value of the 'Cardinality' attribute. * - *

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

* * @return the value of the 'Cardinality' attribute. * @see #setCardinality(String) diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/AbstractMetamodelDeclaration.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/AbstractMetamodelDeclaration.java index 36035ee16..869e6fe9e 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/AbstractMetamodelDeclaration.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/AbstractMetamodelDeclaration.java @@ -28,10 +28,6 @@ public interface AbstractMetamodelDeclaration extends EObject /** * Returns the value of the 'EPackage' reference. * - *

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

* * @return the value of the 'EPackage' reference. * @see #setEPackage(EPackage) @@ -54,10 +50,6 @@ public interface AbstractMetamodelDeclaration extends EObject /** * Returns the value of the 'Alias' attribute. * - *

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

* * @return the value of the 'Alias' attribute. * @see #setAlias(String) diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/AbstractNegatedToken.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/AbstractNegatedToken.java index 397d0aa49..e3d70c587 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/AbstractNegatedToken.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/AbstractNegatedToken.java @@ -25,10 +25,6 @@ public interface AbstractNegatedToken extends AbstractElement /** * Returns the value of the 'Terminal' containment reference. * - *

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

* * @return the value of the 'Terminal' containment reference. * @see #setTerminal(AbstractElement) diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/AbstractRule.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/AbstractRule.java index d0a0e9ec2..fc129c894 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/AbstractRule.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/AbstractRule.java @@ -28,10 +28,6 @@ public interface AbstractRule 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) @@ -54,10 +50,6 @@ public interface AbstractRule extends EObject /** * Returns the value of the 'Type' containment reference. * - *

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

* * @return the value of the 'Type' containment reference. * @see #setType(TypeRef) @@ -80,10 +72,6 @@ public interface AbstractRule extends EObject /** * Returns the value of the 'Alternatives' containment reference. * - *

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

* * @return the value of the 'Alternatives' containment reference. * @see #setAlternatives(AbstractElement) diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/Action.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/Action.java index 2a293b85f..1d52ef289 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/Action.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/Action.java @@ -27,10 +27,6 @@ public interface Action extends AbstractElement /** * Returns the value of the 'Type' containment reference. * - *

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

* * @return the value of the 'Type' containment reference. * @see #setType(TypeRef) @@ -53,10 +49,6 @@ public interface Action extends AbstractElement /** * Returns the value of the 'Feature' attribute. * - *

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

* * @return the value of the 'Feature' attribute. * @see #setFeature(String) @@ -79,10 +71,6 @@ public interface Action extends AbstractElement /** * Returns the value of the 'Operator' attribute. * - *

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

* * @return the value of the 'Operator' attribute. * @see #setOperator(String) diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/Alternatives.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/Alternatives.java index 8fd5431aa..167909e9e 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/Alternatives.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/Alternatives.java @@ -27,10 +27,6 @@ public interface Alternatives extends AbstractElement * Returns the value of the 'Groups' containment reference list. * The list contents are of type {@link org.eclipse.xtext.testlanguages.xtextgrammar.xtextGrammarTest.AbstractElement}. * - *

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

* * @return the value of the 'Groups' containment reference list. * @see org.eclipse.xtext.testlanguages.xtextgrammar.xtextGrammarTest.XtextGrammarTestPackage#getAlternatives_Groups() diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/Assignment.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/Assignment.java index acb200647..b1248d4e2 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/Assignment.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/Assignment.java @@ -27,10 +27,6 @@ public interface Assignment extends AbstractElement /** * Returns the value of the 'Feature' attribute. * - *

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

* * @return the value of the 'Feature' attribute. * @see #setFeature(String) @@ -53,10 +49,6 @@ public interface Assignment extends AbstractElement /** * Returns the value of the 'Operator' attribute. * - *

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

* * @return the value of the 'Operator' attribute. * @see #setOperator(String) @@ -79,10 +71,6 @@ public interface Assignment extends AbstractElement /** * Returns the value of the 'Terminal' containment reference. * - *

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

* * @return the value of the 'Terminal' containment reference. * @see #setTerminal(AbstractElement) diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/CharacterRange.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/CharacterRange.java index 1d81856fe..56a4519a2 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/CharacterRange.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/CharacterRange.java @@ -26,10 +26,6 @@ public interface CharacterRange extends AbstractElement /** * Returns the value of the 'Left' containment reference. * - *

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

* * @return the value of the 'Left' containment reference. * @see #setLeft(Keyword) @@ -52,10 +48,6 @@ public interface CharacterRange extends AbstractElement /** * Returns the value of the 'Right' containment reference. * - *

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

* * @return the value of the 'Right' containment reference. * @see #setRight(Keyword) diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/CrossReference.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/CrossReference.java index f18a5df94..a7bce22f9 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/CrossReference.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/CrossReference.java @@ -26,10 +26,6 @@ public interface CrossReference extends AbstractElement /** * Returns the value of the 'Type' containment reference. * - *

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

* * @return the value of the 'Type' containment reference. * @see #setType(TypeRef) @@ -52,10 +48,6 @@ public interface CrossReference extends AbstractElement /** * Returns the value of the 'Terminal' containment reference. * - *

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

* * @return the value of the 'Terminal' containment reference. * @see #setTerminal(AbstractElement) diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/EnumLiteralDeclaration.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/EnumLiteralDeclaration.java index 68b84f14e..631bc94f4 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/EnumLiteralDeclaration.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/EnumLiteralDeclaration.java @@ -27,10 +27,6 @@ public interface EnumLiteralDeclaration extends AbstractElement /** * Returns the value of the 'Enum Literal' reference. * - *

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

* * @return the value of the 'Enum Literal' reference. * @see #setEnumLiteral(EEnumLiteral) @@ -53,10 +49,6 @@ public interface EnumLiteralDeclaration extends AbstractElement /** * Returns the value of the 'Literal' containment reference. * - *

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

* * @return the value of the 'Literal' containment reference. * @see #setLiteral(Keyword) diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/GeneratedMetamodel.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/GeneratedMetamodel.java index 109b16702..977992ae5 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/GeneratedMetamodel.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/GeneratedMetamodel.java @@ -25,10 +25,6 @@ public interface GeneratedMetamodel extends AbstractMetamodelDeclaration /** * 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) diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/Grammar.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/Grammar.java index 8b6604f40..033581d34 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/Grammar.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/Grammar.java @@ -33,10 +33,6 @@ public interface Grammar 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) @@ -60,10 +56,6 @@ public interface Grammar extends EObject * Returns the value of the 'Used Grammars' reference list. * The list contents are of type {@link org.eclipse.xtext.testlanguages.xtextgrammar.xtextGrammarTest.Grammar}. * - *

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

* * @return the value of the 'Used Grammars' reference list. * @see org.eclipse.xtext.testlanguages.xtextgrammar.xtextGrammarTest.XtextGrammarTestPackage#getGrammar_UsedGrammars() @@ -75,10 +67,6 @@ public interface Grammar extends EObject /** * Returns the value of the 'Defines Hidden Tokens' attribute. * - *

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

* * @return the value of the 'Defines Hidden Tokens' attribute. * @see #setDefinesHiddenTokens(boolean) @@ -102,10 +90,6 @@ public interface Grammar extends EObject * Returns the value of the 'Hidden Tokens' reference list. * The list contents are of type {@link org.eclipse.xtext.testlanguages.xtextgrammar.xtextGrammarTest.AbstractRule}. * - *

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

* * @return the value of the 'Hidden Tokens' reference list. * @see org.eclipse.xtext.testlanguages.xtextgrammar.xtextGrammarTest.XtextGrammarTestPackage#getGrammar_HiddenTokens() @@ -118,10 +102,6 @@ public interface Grammar extends EObject * Returns the value of the 'Metamodel Declarations' containment reference list. * The list contents are of type {@link org.eclipse.xtext.testlanguages.xtextgrammar.xtextGrammarTest.AbstractMetamodelDeclaration}. * - *

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

* * @return the value of the 'Metamodel Declarations' containment reference list. * @see org.eclipse.xtext.testlanguages.xtextgrammar.xtextGrammarTest.XtextGrammarTestPackage#getGrammar_MetamodelDeclarations() @@ -134,10 +114,6 @@ public interface Grammar extends EObject * Returns the value of the 'Rules' containment reference list. * The list contents are of type {@link org.eclipse.xtext.testlanguages.xtextgrammar.xtextGrammarTest.AbstractRule}. * - *

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

* * @return the value of the 'Rules' containment reference list. * @see org.eclipse.xtext.testlanguages.xtextgrammar.xtextGrammarTest.XtextGrammarTestPackage#getGrammar_Rules() diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/Group.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/Group.java index a244aa311..fcd2c55a8 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/Group.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/Group.java @@ -27,10 +27,6 @@ public interface Group extends AbstractElement * Returns the value of the 'Tokens' containment reference list. * The list contents are of type {@link org.eclipse.xtext.testlanguages.xtextgrammar.xtextGrammarTest.AbstractElement}. * - *

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

* * @return the value of the 'Tokens' containment reference list. * @see org.eclipse.xtext.testlanguages.xtextgrammar.xtextGrammarTest.XtextGrammarTestPackage#getGroup_Tokens() diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/Keyword.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/Keyword.java index 12022cc09..a58d99cd5 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/Keyword.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/Keyword.java @@ -25,10 +25,6 @@ public interface Keyword extends AbstractElement /** * Returns the value of the 'Value' attribute. * - *

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

* * @return the value of the 'Value' attribute. * @see #setValue(String) diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/ParserRule.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/ParserRule.java index 11171da98..90e15b4a8 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/ParserRule.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/ParserRule.java @@ -27,10 +27,6 @@ public interface ParserRule extends AbstractRule /** * Returns the value of the 'Defines Hidden Tokens' attribute. * - *

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

* * @return the value of the 'Defines Hidden Tokens' attribute. * @see #setDefinesHiddenTokens(boolean) @@ -54,10 +50,6 @@ public interface ParserRule extends AbstractRule * Returns the value of the 'Hidden Tokens' reference list. * The list contents are of type {@link org.eclipse.xtext.testlanguages.xtextgrammar.xtextGrammarTest.AbstractRule}. * - *

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

* * @return the value of the 'Hidden Tokens' reference list. * @see org.eclipse.xtext.testlanguages.xtextgrammar.xtextGrammarTest.XtextGrammarTestPackage#getParserRule_HiddenTokens() diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/RuleCall.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/RuleCall.java index 814a87f60..9b8884176 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/RuleCall.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/RuleCall.java @@ -25,10 +25,6 @@ public interface RuleCall extends AbstractElement /** * Returns the value of the 'Rule' reference. * - *

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

* * @return the value of the 'Rule' reference. * @see #setRule(AbstractRule) diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/TypeRef.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/TypeRef.java index 676d76bfb..1fc5990ae 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/TypeRef.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/TypeRef.java @@ -28,10 +28,6 @@ public interface TypeRef extends EObject /** * Returns the value of the 'Metamodel' reference. * - *

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

* * @return the value of the 'Metamodel' reference. * @see #setMetamodel(AbstractMetamodelDeclaration) @@ -54,10 +50,6 @@ public interface TypeRef extends EObject /** * Returns the value of the 'Classifier' reference. * - *

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

* * @return the value of the 'Classifier' reference. * @see #setClassifier(EClassifier) diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/impl/AbstractElementImpl.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/impl/AbstractElementImpl.java index 7e257ec1f..f186e8533 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/impl/AbstractElementImpl.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/impl/AbstractElementImpl.java @@ -74,6 +74,7 @@ public class AbstractElementImpl extends MinimalEObjectImpl.Container implements * * @generated */ + @Override public String getCardinality() { return cardinality; @@ -84,6 +85,7 @@ public class AbstractElementImpl extends MinimalEObjectImpl.Container implements * * @generated */ + @Override public void setCardinality(String newCardinality) { String oldCardinality = cardinality; @@ -168,7 +170,7 @@ public class AbstractElementImpl extends MinimalEObjectImpl.Container implements { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (cardinality: "); result.append(cardinality); result.append(')'); diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/impl/AbstractMetamodelDeclarationImpl.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/impl/AbstractMetamodelDeclarationImpl.java index 8f2a11269..809743d69 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/impl/AbstractMetamodelDeclarationImpl.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/impl/AbstractMetamodelDeclarationImpl.java @@ -87,6 +87,7 @@ public class AbstractMetamodelDeclarationImpl extends MinimalEObjectImpl.Contain * * @generated */ + @Override public EPackage getEPackage() { if (ePackage != null && ePackage.eIsProxy()) @@ -117,6 +118,7 @@ public class AbstractMetamodelDeclarationImpl extends MinimalEObjectImpl.Contain * * @generated */ + @Override public void setEPackage(EPackage newEPackage) { EPackage oldEPackage = ePackage; @@ -130,6 +132,7 @@ public class AbstractMetamodelDeclarationImpl extends MinimalEObjectImpl.Contain * * @generated */ + @Override public String getAlias() { return alias; @@ -140,6 +143,7 @@ public class AbstractMetamodelDeclarationImpl extends MinimalEObjectImpl.Contain * * @generated */ + @Override public void setAlias(String newAlias) { String oldAlias = alias; @@ -235,7 +239,7 @@ public class AbstractMetamodelDeclarationImpl extends MinimalEObjectImpl.Contain { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (alias: "); result.append(alias); result.append(')'); diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/impl/AbstractNegatedTokenImpl.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/impl/AbstractNegatedTokenImpl.java index b9399932a..d336c50e7 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/impl/AbstractNegatedTokenImpl.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/impl/AbstractNegatedTokenImpl.java @@ -66,6 +66,7 @@ public class AbstractNegatedTokenImpl extends AbstractElementImpl implements Abs * * @generated */ + @Override public AbstractElement getTerminal() { return terminal; @@ -93,6 +94,7 @@ public class AbstractNegatedTokenImpl extends AbstractElementImpl implements Abs * * @generated */ + @Override public void setTerminal(AbstractElement newTerminal) { if (newTerminal != terminal) diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/impl/AbstractRuleImpl.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/impl/AbstractRuleImpl.java index 763bad8b9..b34d898a9 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/impl/AbstractRuleImpl.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/impl/AbstractRuleImpl.java @@ -100,6 +100,7 @@ public class AbstractRuleImpl extends MinimalEObjectImpl.Container implements Ab * * @generated */ + @Override public String getName() { return name; @@ -110,6 +111,7 @@ public class AbstractRuleImpl extends MinimalEObjectImpl.Container implements Ab * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -123,6 +125,7 @@ public class AbstractRuleImpl extends MinimalEObjectImpl.Container implements Ab * * @generated */ + @Override public TypeRef getType() { return type; @@ -150,6 +153,7 @@ public class AbstractRuleImpl extends MinimalEObjectImpl.Container implements Ab * * @generated */ + @Override public void setType(TypeRef newType) { if (newType != type) @@ -171,6 +175,7 @@ public class AbstractRuleImpl extends MinimalEObjectImpl.Container implements Ab * * @generated */ + @Override public AbstractElement getAlternatives() { return alternatives; @@ -198,6 +203,7 @@ public class AbstractRuleImpl extends MinimalEObjectImpl.Container implements Ab * * @generated */ + @Override public void setAlternatives(AbstractElement newAlternatives) { if (newAlternatives != alternatives) @@ -328,7 +334,7 @@ public class AbstractRuleImpl extends MinimalEObjectImpl.Container implements Ab { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/impl/ActionImpl.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/impl/ActionImpl.java index 3936162bd..6eb81d706 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/impl/ActionImpl.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/impl/ActionImpl.java @@ -108,6 +108,7 @@ public class ActionImpl extends AbstractElementImpl implements Action * * @generated */ + @Override public TypeRef getType() { return type; @@ -135,6 +136,7 @@ public class ActionImpl extends AbstractElementImpl implements Action * * @generated */ + @Override public void setType(TypeRef newType) { if (newType != type) @@ -156,6 +158,7 @@ public class ActionImpl extends AbstractElementImpl implements Action * * @generated */ + @Override public String getFeature() { return feature; @@ -166,6 +169,7 @@ public class ActionImpl extends AbstractElementImpl implements Action * * @generated */ + @Override public void setFeature(String newFeature) { String oldFeature = feature; @@ -179,6 +183,7 @@ public class ActionImpl extends AbstractElementImpl implements Action * * @generated */ + @Override public String getOperator() { return operator; @@ -189,6 +194,7 @@ public class ActionImpl extends AbstractElementImpl implements Action * * @generated */ + @Override public void setOperator(String newOperator) { String oldOperator = operator; @@ -309,7 +315,7 @@ public class ActionImpl extends AbstractElementImpl implements Action { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (feature: "); result.append(feature); result.append(", operator: "); diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/impl/AlternativesImpl.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/impl/AlternativesImpl.java index 051b36dd7..42bd61c8f 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/impl/AlternativesImpl.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/impl/AlternativesImpl.java @@ -70,6 +70,7 @@ public class AlternativesImpl extends AbstractElementImpl implements Alternative * * @generated */ + @Override public EList getGroups() { if (groups == null) diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/impl/AssignmentImpl.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/impl/AssignmentImpl.java index 2d50be5dc..9523892d3 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/impl/AssignmentImpl.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/impl/AssignmentImpl.java @@ -108,6 +108,7 @@ public class AssignmentImpl extends AbstractElementImpl implements Assignment * * @generated */ + @Override public String getFeature() { return feature; @@ -118,6 +119,7 @@ public class AssignmentImpl extends AbstractElementImpl implements Assignment * * @generated */ + @Override public void setFeature(String newFeature) { String oldFeature = feature; @@ -131,6 +133,7 @@ public class AssignmentImpl extends AbstractElementImpl implements Assignment * * @generated */ + @Override public String getOperator() { return operator; @@ -141,6 +144,7 @@ public class AssignmentImpl extends AbstractElementImpl implements Assignment * * @generated */ + @Override public void setOperator(String newOperator) { String oldOperator = operator; @@ -154,6 +158,7 @@ public class AssignmentImpl extends AbstractElementImpl implements Assignment * * @generated */ + @Override public AbstractElement getTerminal() { return terminal; @@ -181,6 +186,7 @@ public class AssignmentImpl extends AbstractElementImpl implements Assignment * * @generated */ + @Override public void setTerminal(AbstractElement newTerminal) { if (newTerminal != terminal) @@ -309,7 +315,7 @@ public class AssignmentImpl extends AbstractElementImpl implements Assignment { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (feature: "); result.append(feature); result.append(", operator: "); diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/impl/CharacterRangeImpl.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/impl/CharacterRangeImpl.java index ead9c3003..98f4fe722 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/impl/CharacterRangeImpl.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/impl/CharacterRangeImpl.java @@ -77,6 +77,7 @@ public class CharacterRangeImpl extends AbstractElementImpl implements Character * * @generated */ + @Override public Keyword getLeft() { return left; @@ -104,6 +105,7 @@ public class CharacterRangeImpl extends AbstractElementImpl implements Character * * @generated */ + @Override public void setLeft(Keyword newLeft) { if (newLeft != left) @@ -125,6 +127,7 @@ public class CharacterRangeImpl extends AbstractElementImpl implements Character * * @generated */ + @Override public Keyword getRight() { return right; @@ -152,6 +155,7 @@ public class CharacterRangeImpl extends AbstractElementImpl implements Character * * @generated */ + @Override public void setRight(Keyword newRight) { if (newRight != right) diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/impl/CrossReferenceImpl.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/impl/CrossReferenceImpl.java index 37070c657..899892688 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/impl/CrossReferenceImpl.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/impl/CrossReferenceImpl.java @@ -78,6 +78,7 @@ public class CrossReferenceImpl extends AbstractElementImpl implements CrossRefe * * @generated */ + @Override public TypeRef getType() { return type; @@ -105,6 +106,7 @@ public class CrossReferenceImpl extends AbstractElementImpl implements CrossRefe * * @generated */ + @Override public void setType(TypeRef newType) { if (newType != type) @@ -126,6 +128,7 @@ public class CrossReferenceImpl extends AbstractElementImpl implements CrossRefe * * @generated */ + @Override public AbstractElement getTerminal() { return terminal; @@ -153,6 +156,7 @@ public class CrossReferenceImpl extends AbstractElementImpl implements CrossRefe * * @generated */ + @Override public void setTerminal(AbstractElement newTerminal) { if (newTerminal != terminal) diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/impl/EnumLiteralDeclarationImpl.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/impl/EnumLiteralDeclarationImpl.java index 6e49f9684..0bdd4497f 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/impl/EnumLiteralDeclarationImpl.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/impl/EnumLiteralDeclarationImpl.java @@ -78,6 +78,7 @@ public class EnumLiteralDeclarationImpl extends AbstractElementImpl implements E * * @generated */ + @Override public EEnumLiteral getEnumLiteral() { if (enumLiteral != null && enumLiteral.eIsProxy()) @@ -108,6 +109,7 @@ public class EnumLiteralDeclarationImpl extends AbstractElementImpl implements E * * @generated */ + @Override public void setEnumLiteral(EEnumLiteral newEnumLiteral) { EEnumLiteral oldEnumLiteral = enumLiteral; @@ -121,6 +123,7 @@ public class EnumLiteralDeclarationImpl extends AbstractElementImpl implements E * * @generated */ + @Override public Keyword getLiteral() { return literal; @@ -148,6 +151,7 @@ public class EnumLiteralDeclarationImpl extends AbstractElementImpl implements E * * @generated */ + @Override public void setLiteral(Keyword newLiteral) { if (newLiteral != literal) diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/impl/GeneratedMetamodelImpl.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/impl/GeneratedMetamodelImpl.java index 0bacd7908..0dd4efecc 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/impl/GeneratedMetamodelImpl.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/impl/GeneratedMetamodelImpl.java @@ -73,6 +73,7 @@ public class GeneratedMetamodelImpl extends AbstractMetamodelDeclarationImpl imp * * @generated */ + @Override public String getName() { return name; @@ -83,6 +84,7 @@ public class GeneratedMetamodelImpl extends AbstractMetamodelDeclarationImpl imp * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -167,7 +169,7 @@ public class GeneratedMetamodelImpl extends AbstractMetamodelDeclarationImpl imp { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/impl/GrammarImpl.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/impl/GrammarImpl.java index 4424ae91e..79e55ae97 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/impl/GrammarImpl.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/impl/GrammarImpl.java @@ -151,6 +151,7 @@ public class GrammarImpl extends MinimalEObjectImpl.Container implements Grammar * * @generated */ + @Override public String getName() { return name; @@ -161,6 +162,7 @@ public class GrammarImpl extends MinimalEObjectImpl.Container implements Grammar * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -174,6 +176,7 @@ public class GrammarImpl extends MinimalEObjectImpl.Container implements Grammar * * @generated */ + @Override public EList getUsedGrammars() { if (usedGrammars == null) @@ -188,6 +191,7 @@ public class GrammarImpl extends MinimalEObjectImpl.Container implements Grammar * * @generated */ + @Override public boolean isDefinesHiddenTokens() { return definesHiddenTokens; @@ -198,6 +202,7 @@ public class GrammarImpl extends MinimalEObjectImpl.Container implements Grammar * * @generated */ + @Override public void setDefinesHiddenTokens(boolean newDefinesHiddenTokens) { boolean oldDefinesHiddenTokens = definesHiddenTokens; @@ -211,6 +216,7 @@ public class GrammarImpl extends MinimalEObjectImpl.Container implements Grammar * * @generated */ + @Override public EList getHiddenTokens() { if (hiddenTokens == null) @@ -225,6 +231,7 @@ public class GrammarImpl extends MinimalEObjectImpl.Container implements Grammar * * @generated */ + @Override public EList getMetamodelDeclarations() { if (metamodelDeclarations == null) @@ -239,6 +246,7 @@ public class GrammarImpl extends MinimalEObjectImpl.Container implements Grammar * * @generated */ + @Override public EList getRules() { if (rules == null) @@ -397,7 +405,7 @@ public class GrammarImpl extends MinimalEObjectImpl.Container implements Grammar { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(", definesHiddenTokens: "); diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/impl/GroupImpl.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/impl/GroupImpl.java index 115b2a801..792744c22 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/impl/GroupImpl.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/impl/GroupImpl.java @@ -70,6 +70,7 @@ public class GroupImpl extends AbstractElementImpl implements Group * * @generated */ + @Override public EList getTokens() { if (tokens == null) diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/impl/KeywordImpl.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/impl/KeywordImpl.java index 1806037fc..1e9954d4c 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/impl/KeywordImpl.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/impl/KeywordImpl.java @@ -73,6 +73,7 @@ public class KeywordImpl extends AbstractElementImpl implements Keyword * * @generated */ + @Override public String getValue() { return value; @@ -83,6 +84,7 @@ public class KeywordImpl extends AbstractElementImpl implements Keyword * * @generated */ + @Override public void setValue(String newValue) { String oldValue = value; @@ -167,7 +169,7 @@ public class KeywordImpl extends AbstractElementImpl implements Keyword { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (value: "); result.append(value); result.append(')'); diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/impl/ParserRuleImpl.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/impl/ParserRuleImpl.java index dd981ebef..137e8d275 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/impl/ParserRuleImpl.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/impl/ParserRuleImpl.java @@ -91,6 +91,7 @@ public class ParserRuleImpl extends AbstractRuleImpl implements ParserRule * * @generated */ + @Override public boolean isDefinesHiddenTokens() { return definesHiddenTokens; @@ -101,6 +102,7 @@ public class ParserRuleImpl extends AbstractRuleImpl implements ParserRule * * @generated */ + @Override public void setDefinesHiddenTokens(boolean newDefinesHiddenTokens) { boolean oldDefinesHiddenTokens = definesHiddenTokens; @@ -114,6 +116,7 @@ public class ParserRuleImpl extends AbstractRuleImpl implements ParserRule * * @generated */ + @Override public EList getHiddenTokens() { if (hiddenTokens == null) @@ -211,7 +214,7 @@ public class ParserRuleImpl extends AbstractRuleImpl implements ParserRule { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (definesHiddenTokens: "); result.append(definesHiddenTokens); result.append(')'); diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/impl/RuleCallImpl.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/impl/RuleCallImpl.java index 0db940444..2b6a2ec70 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/impl/RuleCallImpl.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/impl/RuleCallImpl.java @@ -65,6 +65,7 @@ public class RuleCallImpl extends AbstractElementImpl implements RuleCall * * @generated */ + @Override public AbstractRule getRule() { if (rule != null && rule.eIsProxy()) @@ -95,6 +96,7 @@ public class RuleCallImpl extends AbstractElementImpl implements RuleCall * * @generated */ + @Override public void setRule(AbstractRule newRule) { AbstractRule oldRule = rule; diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/impl/TypeRefImpl.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/impl/TypeRefImpl.java index 63bbced3a..0e3a391d1 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/impl/TypeRefImpl.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/impl/TypeRefImpl.java @@ -78,6 +78,7 @@ public class TypeRefImpl extends MinimalEObjectImpl.Container implements TypeRef * * @generated */ + @Override public AbstractMetamodelDeclaration getMetamodel() { if (metamodel != null && metamodel.eIsProxy()) @@ -108,6 +109,7 @@ public class TypeRefImpl extends MinimalEObjectImpl.Container implements TypeRef * * @generated */ + @Override public void setMetamodel(AbstractMetamodelDeclaration newMetamodel) { AbstractMetamodelDeclaration oldMetamodel = metamodel; @@ -121,6 +123,7 @@ public class TypeRefImpl extends MinimalEObjectImpl.Container implements TypeRef * * @generated */ + @Override public EClassifier getClassifier() { if (classifier != null && classifier.eIsProxy()) @@ -151,6 +154,7 @@ public class TypeRefImpl extends MinimalEObjectImpl.Container implements TypeRef * * @generated */ + @Override public void setClassifier(EClassifier newClassifier) { EClassifier oldClassifier = classifier; diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/impl/XtextGrammarTestFactoryImpl.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/impl/XtextGrammarTestFactoryImpl.java index 70f69c97e..15ef0f8a9 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/impl/XtextGrammarTestFactoryImpl.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/impl/XtextGrammarTestFactoryImpl.java @@ -98,6 +98,7 @@ public class XtextGrammarTestFactoryImpl extends EFactoryImpl implements XtextGr * * @generated */ + @Override public Grammar createGrammar() { GrammarImpl grammar = new GrammarImpl(); @@ -109,6 +110,7 @@ public class XtextGrammarTestFactoryImpl extends EFactoryImpl implements XtextGr * * @generated */ + @Override public AbstractRule createAbstractRule() { AbstractRuleImpl abstractRule = new AbstractRuleImpl(); @@ -120,6 +122,7 @@ public class XtextGrammarTestFactoryImpl extends EFactoryImpl implements XtextGr * * @generated */ + @Override public AbstractMetamodelDeclaration createAbstractMetamodelDeclaration() { AbstractMetamodelDeclarationImpl abstractMetamodelDeclaration = new AbstractMetamodelDeclarationImpl(); @@ -131,6 +134,7 @@ public class XtextGrammarTestFactoryImpl extends EFactoryImpl implements XtextGr * * @generated */ + @Override public GeneratedMetamodel createGeneratedMetamodel() { GeneratedMetamodelImpl generatedMetamodel = new GeneratedMetamodelImpl(); @@ -142,6 +146,7 @@ public class XtextGrammarTestFactoryImpl extends EFactoryImpl implements XtextGr * * @generated */ + @Override public ReferencedMetamodel createReferencedMetamodel() { ReferencedMetamodelImpl referencedMetamodel = new ReferencedMetamodelImpl(); @@ -153,6 +158,7 @@ public class XtextGrammarTestFactoryImpl extends EFactoryImpl implements XtextGr * * @generated */ + @Override public ParserRule createParserRule() { ParserRuleImpl parserRule = new ParserRuleImpl(); @@ -164,6 +170,7 @@ public class XtextGrammarTestFactoryImpl extends EFactoryImpl implements XtextGr * * @generated */ + @Override public TypeRef createTypeRef() { TypeRefImpl typeRef = new TypeRefImpl(); @@ -175,6 +182,7 @@ public class XtextGrammarTestFactoryImpl extends EFactoryImpl implements XtextGr * * @generated */ + @Override public AbstractElement createAbstractElement() { AbstractElementImpl abstractElement = new AbstractElementImpl(); @@ -186,6 +194,7 @@ public class XtextGrammarTestFactoryImpl extends EFactoryImpl implements XtextGr * * @generated */ + @Override public Action createAction() { ActionImpl action = new ActionImpl(); @@ -197,6 +206,7 @@ public class XtextGrammarTestFactoryImpl extends EFactoryImpl implements XtextGr * * @generated */ + @Override public Keyword createKeyword() { KeywordImpl keyword = new KeywordImpl(); @@ -208,6 +218,7 @@ public class XtextGrammarTestFactoryImpl extends EFactoryImpl implements XtextGr * * @generated */ + @Override public RuleCall createRuleCall() { RuleCallImpl ruleCall = new RuleCallImpl(); @@ -219,6 +230,7 @@ public class XtextGrammarTestFactoryImpl extends EFactoryImpl implements XtextGr * * @generated */ + @Override public Assignment createAssignment() { AssignmentImpl assignment = new AssignmentImpl(); @@ -230,6 +242,7 @@ public class XtextGrammarTestFactoryImpl extends EFactoryImpl implements XtextGr * * @generated */ + @Override public CrossReference createCrossReference() { CrossReferenceImpl crossReference = new CrossReferenceImpl(); @@ -241,6 +254,7 @@ public class XtextGrammarTestFactoryImpl extends EFactoryImpl implements XtextGr * * @generated */ + @Override public TerminalRule createTerminalRule() { TerminalRuleImpl terminalRule = new TerminalRuleImpl(); @@ -252,6 +266,7 @@ public class XtextGrammarTestFactoryImpl extends EFactoryImpl implements XtextGr * * @generated */ + @Override public AbstractNegatedToken createAbstractNegatedToken() { AbstractNegatedTokenImpl abstractNegatedToken = new AbstractNegatedTokenImpl(); @@ -263,6 +278,7 @@ public class XtextGrammarTestFactoryImpl extends EFactoryImpl implements XtextGr * * @generated */ + @Override public NegatedToken createNegatedToken() { NegatedTokenImpl negatedToken = new NegatedTokenImpl(); @@ -274,6 +290,7 @@ public class XtextGrammarTestFactoryImpl extends EFactoryImpl implements XtextGr * * @generated */ + @Override public UntilToken createUntilToken() { UntilTokenImpl untilToken = new UntilTokenImpl(); @@ -285,6 +302,7 @@ public class XtextGrammarTestFactoryImpl extends EFactoryImpl implements XtextGr * * @generated */ + @Override public Wildcard createWildcard() { WildcardImpl wildcard = new WildcardImpl(); @@ -296,6 +314,7 @@ public class XtextGrammarTestFactoryImpl extends EFactoryImpl implements XtextGr * * @generated */ + @Override public EnumRule createEnumRule() { EnumRuleImpl enumRule = new EnumRuleImpl(); @@ -307,6 +326,7 @@ public class XtextGrammarTestFactoryImpl extends EFactoryImpl implements XtextGr * * @generated */ + @Override public EnumLiteralDeclaration createEnumLiteralDeclaration() { EnumLiteralDeclarationImpl enumLiteralDeclaration = new EnumLiteralDeclarationImpl(); @@ -318,6 +338,7 @@ public class XtextGrammarTestFactoryImpl extends EFactoryImpl implements XtextGr * * @generated */ + @Override public Alternatives createAlternatives() { AlternativesImpl alternatives = new AlternativesImpl(); @@ -329,6 +350,7 @@ public class XtextGrammarTestFactoryImpl extends EFactoryImpl implements XtextGr * * @generated */ + @Override public Group createGroup() { GroupImpl group = new GroupImpl(); @@ -340,6 +362,7 @@ public class XtextGrammarTestFactoryImpl extends EFactoryImpl implements XtextGr * * @generated */ + @Override public CharacterRange createCharacterRange() { CharacterRangeImpl characterRange = new CharacterRangeImpl(); @@ -351,6 +374,7 @@ public class XtextGrammarTestFactoryImpl extends EFactoryImpl implements XtextGr * * @generated */ + @Override public XtextGrammarTestPackage getXtextGrammarTestPackage() { return (XtextGrammarTestPackage)getEPackage(); diff --git a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/impl/XtextGrammarTestPackageImpl.java b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/impl/XtextGrammarTestPackageImpl.java index cbead1f50..18d2c52dd 100644 --- a/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/impl/XtextGrammarTestPackageImpl.java +++ b/org.eclipse.xtext.testlanguages/src-gen/org/eclipse/xtext/testlanguages/xtextgrammar/xtextGrammarTest/impl/XtextGrammarTestPackageImpl.java @@ -234,7 +234,7 @@ public class XtextGrammarTestPackageImpl extends EPackageImpl implements XtextGr /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link XtextGrammarTestPackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -249,7 +249,8 @@ public class XtextGrammarTestPackageImpl extends EPackageImpl implements XtextGr if (isInited) return (XtextGrammarTestPackage)EPackage.Registry.INSTANCE.getEPackage(XtextGrammarTestPackage.eNS_URI); // Obtain or create and register package - XtextGrammarTestPackageImpl theXtextGrammarTestPackage = (XtextGrammarTestPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof XtextGrammarTestPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new XtextGrammarTestPackageImpl()); + Object registeredXtextGrammarTestPackage = EPackage.Registry.INSTANCE.get(eNS_URI); + XtextGrammarTestPackageImpl theXtextGrammarTestPackage = registeredXtextGrammarTestPackage instanceof XtextGrammarTestPackageImpl ? (XtextGrammarTestPackageImpl)registeredXtextGrammarTestPackage : new XtextGrammarTestPackageImpl(); isInited = true; @@ -262,7 +263,6 @@ public class XtextGrammarTestPackageImpl extends EPackageImpl implements XtextGr // Mark meta-data to indicate it can't be changed theXtextGrammarTestPackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(XtextGrammarTestPackage.eNS_URI, theXtextGrammarTestPackage); return theXtextGrammarTestPackage; @@ -273,6 +273,7 @@ public class XtextGrammarTestPackageImpl extends EPackageImpl implements XtextGr * * @generated */ + @Override public EClass getGrammar() { return grammarEClass; @@ -283,6 +284,7 @@ public class XtextGrammarTestPackageImpl extends EPackageImpl implements XtextGr * * @generated */ + @Override public EAttribute getGrammar_Name() { return (EAttribute)grammarEClass.getEStructuralFeatures().get(0); @@ -293,6 +295,7 @@ public class XtextGrammarTestPackageImpl extends EPackageImpl implements XtextGr * * @generated */ + @Override public EReference getGrammar_UsedGrammars() { return (EReference)grammarEClass.getEStructuralFeatures().get(1); @@ -303,6 +306,7 @@ public class XtextGrammarTestPackageImpl extends EPackageImpl implements XtextGr * * @generated */ + @Override public EAttribute getGrammar_DefinesHiddenTokens() { return (EAttribute)grammarEClass.getEStructuralFeatures().get(2); @@ -313,6 +317,7 @@ public class XtextGrammarTestPackageImpl extends EPackageImpl implements XtextGr * * @generated */ + @Override public EReference getGrammar_HiddenTokens() { return (EReference)grammarEClass.getEStructuralFeatures().get(3); @@ -323,6 +328,7 @@ public class XtextGrammarTestPackageImpl extends EPackageImpl implements XtextGr * * @generated */ + @Override public EReference getGrammar_MetamodelDeclarations() { return (EReference)grammarEClass.getEStructuralFeatures().get(4); @@ -333,6 +339,7 @@ public class XtextGrammarTestPackageImpl extends EPackageImpl implements XtextGr * * @generated */ + @Override public EReference getGrammar_Rules() { return (EReference)grammarEClass.getEStructuralFeatures().get(5); @@ -343,6 +350,7 @@ public class XtextGrammarTestPackageImpl extends EPackageImpl implements XtextGr * * @generated */ + @Override public EClass getAbstractRule() { return abstractRuleEClass; @@ -353,6 +361,7 @@ public class XtextGrammarTestPackageImpl extends EPackageImpl implements XtextGr * * @generated */ + @Override public EAttribute getAbstractRule_Name() { return (EAttribute)abstractRuleEClass.getEStructuralFeatures().get(0); @@ -363,6 +372,7 @@ public class XtextGrammarTestPackageImpl extends EPackageImpl implements XtextGr * * @generated */ + @Override public EReference getAbstractRule_Type() { return (EReference)abstractRuleEClass.getEStructuralFeatures().get(1); @@ -373,6 +383,7 @@ public class XtextGrammarTestPackageImpl extends EPackageImpl implements XtextGr * * @generated */ + @Override public EReference getAbstractRule_Alternatives() { return (EReference)abstractRuleEClass.getEStructuralFeatures().get(2); @@ -383,6 +394,7 @@ public class XtextGrammarTestPackageImpl extends EPackageImpl implements XtextGr * * @generated */ + @Override public EClass getAbstractMetamodelDeclaration() { return abstractMetamodelDeclarationEClass; @@ -393,6 +405,7 @@ public class XtextGrammarTestPackageImpl extends EPackageImpl implements XtextGr * * @generated */ + @Override public EReference getAbstractMetamodelDeclaration_EPackage() { return (EReference)abstractMetamodelDeclarationEClass.getEStructuralFeatures().get(0); @@ -403,6 +416,7 @@ public class XtextGrammarTestPackageImpl extends EPackageImpl implements XtextGr * * @generated */ + @Override public EAttribute getAbstractMetamodelDeclaration_Alias() { return (EAttribute)abstractMetamodelDeclarationEClass.getEStructuralFeatures().get(1); @@ -413,6 +427,7 @@ public class XtextGrammarTestPackageImpl extends EPackageImpl implements XtextGr * * @generated */ + @Override public EClass getGeneratedMetamodel() { return generatedMetamodelEClass; @@ -423,6 +438,7 @@ public class XtextGrammarTestPackageImpl extends EPackageImpl implements XtextGr * * @generated */ + @Override public EAttribute getGeneratedMetamodel_Name() { return (EAttribute)generatedMetamodelEClass.getEStructuralFeatures().get(0); @@ -433,6 +449,7 @@ public class XtextGrammarTestPackageImpl extends EPackageImpl implements XtextGr * * @generated */ + @Override public EClass getReferencedMetamodel() { return referencedMetamodelEClass; @@ -443,6 +460,7 @@ public class XtextGrammarTestPackageImpl extends EPackageImpl implements XtextGr * * @generated */ + @Override public EClass getParserRule() { return parserRuleEClass; @@ -453,6 +471,7 @@ public class XtextGrammarTestPackageImpl extends EPackageImpl implements XtextGr * * @generated */ + @Override public EAttribute getParserRule_DefinesHiddenTokens() { return (EAttribute)parserRuleEClass.getEStructuralFeatures().get(0); @@ -463,6 +482,7 @@ public class XtextGrammarTestPackageImpl extends EPackageImpl implements XtextGr * * @generated */ + @Override public EReference getParserRule_HiddenTokens() { return (EReference)parserRuleEClass.getEStructuralFeatures().get(1); @@ -473,6 +493,7 @@ public class XtextGrammarTestPackageImpl extends EPackageImpl implements XtextGr * * @generated */ + @Override public EClass getTypeRef() { return typeRefEClass; @@ -483,6 +504,7 @@ public class XtextGrammarTestPackageImpl extends EPackageImpl implements XtextGr * * @generated */ + @Override public EReference getTypeRef_Metamodel() { return (EReference)typeRefEClass.getEStructuralFeatures().get(0); @@ -493,6 +515,7 @@ public class XtextGrammarTestPackageImpl extends EPackageImpl implements XtextGr * * @generated */ + @Override public EReference getTypeRef_Classifier() { return (EReference)typeRefEClass.getEStructuralFeatures().get(1); @@ -503,6 +526,7 @@ public class XtextGrammarTestPackageImpl extends EPackageImpl implements XtextGr * * @generated */ + @Override public EClass getAbstractElement() { return abstractElementEClass; @@ -513,6 +537,7 @@ public class XtextGrammarTestPackageImpl extends EPackageImpl implements XtextGr * * @generated */ + @Override public EAttribute getAbstractElement_Cardinality() { return (EAttribute)abstractElementEClass.getEStructuralFeatures().get(0); @@ -523,6 +548,7 @@ public class XtextGrammarTestPackageImpl extends EPackageImpl implements XtextGr * * @generated */ + @Override public EClass getAction() { return actionEClass; @@ -533,6 +559,7 @@ public class XtextGrammarTestPackageImpl extends EPackageImpl implements XtextGr * * @generated */ + @Override public EReference getAction_Type() { return (EReference)actionEClass.getEStructuralFeatures().get(0); @@ -543,6 +570,7 @@ public class XtextGrammarTestPackageImpl extends EPackageImpl implements XtextGr * * @generated */ + @Override public EAttribute getAction_Feature() { return (EAttribute)actionEClass.getEStructuralFeatures().get(1); @@ -553,6 +581,7 @@ public class XtextGrammarTestPackageImpl extends EPackageImpl implements XtextGr * * @generated */ + @Override public EAttribute getAction_Operator() { return (EAttribute)actionEClass.getEStructuralFeatures().get(2); @@ -563,6 +592,7 @@ public class XtextGrammarTestPackageImpl extends EPackageImpl implements XtextGr * * @generated */ + @Override public EClass getKeyword() { return keywordEClass; @@ -573,6 +603,7 @@ public class XtextGrammarTestPackageImpl extends EPackageImpl implements XtextGr * * @generated */ + @Override public EAttribute getKeyword_Value() { return (EAttribute)keywordEClass.getEStructuralFeatures().get(0); @@ -583,6 +614,7 @@ public class XtextGrammarTestPackageImpl extends EPackageImpl implements XtextGr * * @generated */ + @Override public EClass getRuleCall() { return ruleCallEClass; @@ -593,6 +625,7 @@ public class XtextGrammarTestPackageImpl extends EPackageImpl implements XtextGr * * @generated */ + @Override public EReference getRuleCall_Rule() { return (EReference)ruleCallEClass.getEStructuralFeatures().get(0); @@ -603,6 +636,7 @@ public class XtextGrammarTestPackageImpl extends EPackageImpl implements XtextGr * * @generated */ + @Override public EClass getAssignment() { return assignmentEClass; @@ -613,6 +647,7 @@ public class XtextGrammarTestPackageImpl extends EPackageImpl implements XtextGr * * @generated */ + @Override public EAttribute getAssignment_Feature() { return (EAttribute)assignmentEClass.getEStructuralFeatures().get(0); @@ -623,6 +658,7 @@ public class XtextGrammarTestPackageImpl extends EPackageImpl implements XtextGr * * @generated */ + @Override public EAttribute getAssignment_Operator() { return (EAttribute)assignmentEClass.getEStructuralFeatures().get(1); @@ -633,6 +669,7 @@ public class XtextGrammarTestPackageImpl extends EPackageImpl implements XtextGr * * @generated */ + @Override public EReference getAssignment_Terminal() { return (EReference)assignmentEClass.getEStructuralFeatures().get(2); @@ -643,6 +680,7 @@ public class XtextGrammarTestPackageImpl extends EPackageImpl implements XtextGr * * @generated */ + @Override public EClass getCrossReference() { return crossReferenceEClass; @@ -653,6 +691,7 @@ public class XtextGrammarTestPackageImpl extends EPackageImpl implements XtextGr * * @generated */ + @Override public EReference getCrossReference_Type() { return (EReference)crossReferenceEClass.getEStructuralFeatures().get(0); @@ -663,6 +702,7 @@ public class XtextGrammarTestPackageImpl extends EPackageImpl implements XtextGr * * @generated */ + @Override public EReference getCrossReference_Terminal() { return (EReference)crossReferenceEClass.getEStructuralFeatures().get(1); @@ -673,6 +713,7 @@ public class XtextGrammarTestPackageImpl extends EPackageImpl implements XtextGr * * @generated */ + @Override public EClass getTerminalRule() { return terminalRuleEClass; @@ -683,6 +724,7 @@ public class XtextGrammarTestPackageImpl extends EPackageImpl implements XtextGr * * @generated */ + @Override public EClass getAbstractNegatedToken() { return abstractNegatedTokenEClass; @@ -693,6 +735,7 @@ public class XtextGrammarTestPackageImpl extends EPackageImpl implements XtextGr * * @generated */ + @Override public EReference getAbstractNegatedToken_Terminal() { return (EReference)abstractNegatedTokenEClass.getEStructuralFeatures().get(0); @@ -703,6 +746,7 @@ public class XtextGrammarTestPackageImpl extends EPackageImpl implements XtextGr * * @generated */ + @Override public EClass getNegatedToken() { return negatedTokenEClass; @@ -713,6 +757,7 @@ public class XtextGrammarTestPackageImpl extends EPackageImpl implements XtextGr * * @generated */ + @Override public EClass getUntilToken() { return untilTokenEClass; @@ -723,6 +768,7 @@ public class XtextGrammarTestPackageImpl extends EPackageImpl implements XtextGr * * @generated */ + @Override public EClass getWildcard() { return wildcardEClass; @@ -733,6 +779,7 @@ public class XtextGrammarTestPackageImpl extends EPackageImpl implements XtextGr * * @generated */ + @Override public EClass getEnumRule() { return enumRuleEClass; @@ -743,6 +790,7 @@ public class XtextGrammarTestPackageImpl extends EPackageImpl implements XtextGr * * @generated */ + @Override public EClass getEnumLiteralDeclaration() { return enumLiteralDeclarationEClass; @@ -753,6 +801,7 @@ public class XtextGrammarTestPackageImpl extends EPackageImpl implements XtextGr * * @generated */ + @Override public EReference getEnumLiteralDeclaration_EnumLiteral() { return (EReference)enumLiteralDeclarationEClass.getEStructuralFeatures().get(0); @@ -763,6 +812,7 @@ public class XtextGrammarTestPackageImpl extends EPackageImpl implements XtextGr * * @generated */ + @Override public EReference getEnumLiteralDeclaration_Literal() { return (EReference)enumLiteralDeclarationEClass.getEStructuralFeatures().get(1); @@ -773,6 +823,7 @@ public class XtextGrammarTestPackageImpl extends EPackageImpl implements XtextGr * * @generated */ + @Override public EClass getAlternatives() { return alternativesEClass; @@ -783,6 +834,7 @@ public class XtextGrammarTestPackageImpl extends EPackageImpl implements XtextGr * * @generated */ + @Override public EReference getAlternatives_Groups() { return (EReference)alternativesEClass.getEStructuralFeatures().get(0); @@ -793,6 +845,7 @@ public class XtextGrammarTestPackageImpl extends EPackageImpl implements XtextGr * * @generated */ + @Override public EClass getGroup() { return groupEClass; @@ -803,6 +856,7 @@ public class XtextGrammarTestPackageImpl extends EPackageImpl implements XtextGr * * @generated */ + @Override public EReference getGroup_Tokens() { return (EReference)groupEClass.getEStructuralFeatures().get(0); @@ -813,6 +867,7 @@ public class XtextGrammarTestPackageImpl extends EPackageImpl implements XtextGr * * @generated */ + @Override public EClass getCharacterRange() { return characterRangeEClass; @@ -823,6 +878,7 @@ public class XtextGrammarTestPackageImpl extends EPackageImpl implements XtextGr * * @generated */ + @Override public EReference getCharacterRange_Left() { return (EReference)characterRangeEClass.getEStructuralFeatures().get(0); @@ -833,6 +889,7 @@ public class XtextGrammarTestPackageImpl extends EPackageImpl implements XtextGr * * @generated */ + @Override public EReference getCharacterRange_Right() { return (EReference)characterRangeEClass.getEStructuralFeatures().get(1); @@ -843,6 +900,7 @@ public class XtextGrammarTestPackageImpl extends EPackageImpl implements XtextGr * * @generated */ + @Override public XtextGrammarTestFactory getXtextGrammarTestFactory() { return (XtextGrammarTestFactory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/generator/ecore/first/First.java b/org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/generator/ecore/first/First.java index 8439f19ad..bb597ffb5 100644 --- a/org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/generator/ecore/first/First.java +++ b/org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/generator/ecore/first/First.java @@ -25,10 +25,6 @@ public interface First 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) diff --git a/org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/generator/ecore/first/impl/FirstFactoryImpl.java b/org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/generator/ecore/first/impl/FirstFactoryImpl.java index 58bbd73b0..be88d5f27 100644 --- a/org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/generator/ecore/first/impl/FirstFactoryImpl.java +++ b/org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/generator/ecore/first/impl/FirstFactoryImpl.java @@ -75,6 +75,7 @@ public class FirstFactoryImpl extends EFactoryImpl implements FirstFactory * * @generated */ + @Override public First createFirst() { FirstImpl first = new FirstImpl(); @@ -86,6 +87,7 @@ public class FirstFactoryImpl extends EFactoryImpl implements FirstFactory * * @generated */ + @Override public FirstPackage getFirstPackage() { return (FirstPackage)getEPackage(); diff --git a/org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/generator/ecore/first/impl/FirstImpl.java b/org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/generator/ecore/first/impl/FirstImpl.java index 8f05fab02..ee03c6b7f 100644 --- a/org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/generator/ecore/first/impl/FirstImpl.java +++ b/org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/generator/ecore/first/impl/FirstImpl.java @@ -73,6 +73,7 @@ public class FirstImpl extends MinimalEObjectImpl.Container implements First * * @generated */ + @Override public String getName() { return name; @@ -83,6 +84,7 @@ public class FirstImpl extends MinimalEObjectImpl.Container implements First * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -167,7 +169,7 @@ public class FirstImpl extends MinimalEObjectImpl.Container implements First { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/generator/ecore/first/impl/FirstPackageImpl.java b/org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/generator/ecore/first/impl/FirstPackageImpl.java index 13c6ac3c6..51cc50456 100644 --- a/org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/generator/ecore/first/impl/FirstPackageImpl.java +++ b/org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/generator/ecore/first/impl/FirstPackageImpl.java @@ -61,7 +61,7 @@ public class FirstPackageImpl extends EPackageImpl implements FirstPackage /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link FirstPackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -76,7 +76,8 @@ public class FirstPackageImpl extends EPackageImpl implements FirstPackage if (isInited) return (FirstPackage)EPackage.Registry.INSTANCE.getEPackage(FirstPackage.eNS_URI); // Obtain or create and register package - FirstPackageImpl theFirstPackage = (FirstPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof FirstPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new FirstPackageImpl()); + Object registeredFirstPackage = EPackage.Registry.INSTANCE.get(eNS_URI); + FirstPackageImpl theFirstPackage = registeredFirstPackage instanceof FirstPackageImpl ? (FirstPackageImpl)registeredFirstPackage : new FirstPackageImpl(); isInited = true; @@ -84,7 +85,8 @@ public class FirstPackageImpl extends EPackageImpl implements FirstPackage EcorePackage.eINSTANCE.eClass(); // Obtain or create and register interdependencies - SecondPackageImpl theSecondPackage = (SecondPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(SecondPackage.eNS_URI) instanceof SecondPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(SecondPackage.eNS_URI) : SecondPackage.eINSTANCE); + Object registeredPackage = EPackage.Registry.INSTANCE.getEPackage(SecondPackage.eNS_URI); + SecondPackageImpl theSecondPackage = (SecondPackageImpl)(registeredPackage instanceof SecondPackageImpl ? registeredPackage : SecondPackage.eINSTANCE); // Create package meta-data objects theFirstPackage.createPackageContents(); @@ -97,7 +99,6 @@ public class FirstPackageImpl extends EPackageImpl implements FirstPackage // Mark meta-data to indicate it can't be changed theFirstPackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(FirstPackage.eNS_URI, theFirstPackage); return theFirstPackage; @@ -108,6 +109,7 @@ public class FirstPackageImpl extends EPackageImpl implements FirstPackage * * @generated */ + @Override public EClass getFirst() { return firstEClass; @@ -118,6 +120,7 @@ public class FirstPackageImpl extends EPackageImpl implements FirstPackage * * @generated */ + @Override public EAttribute getFirst_Name() { return (EAttribute)firstEClass.getEStructuralFeatures().get(0); @@ -128,6 +131,7 @@ public class FirstPackageImpl extends EPackageImpl implements FirstPackage * * @generated */ + @Override public FirstFactory getFirstFactory() { return (FirstFactory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/generator/ecore/first/util/FirstSwitch.java b/org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/generator/ecore/first/util/FirstSwitch.java index ec7c17edb..1efdbe342 100644 --- a/org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/generator/ecore/first/util/FirstSwitch.java +++ b/org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/generator/ecore/first/util/FirstSwitch.java @@ -2,10 +2,10 @@ */ package org.eclipse.xtext.generator.ecore.first.util; -import java.util.List; - -import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.EPackage; + +import org.eclipse.emf.ecore.util.Switch; import org.eclipse.xtext.generator.ecore.first.*; @@ -22,7 +22,7 @@ import org.eclipse.xtext.generator.ecore.first.*; * @see org.eclipse.xtext.generator.ecore.first.FirstPackage * @generated */ -public class FirstSwitch +public class FirstSwitch extends Switch { /** * The cached model package @@ -47,38 +47,17 @@ public class FirstSwitch } /** - * Calls caseXXX for each class of the model until one returns a non null result; it yields that result. + * Checks whether this is a switch for the given package. * * - * @return the first non-null result returned by a caseXXX call. + * @param ePackage the package in question. + * @return whether this is a switch for the given package. * @generated */ - public T doSwitch(EObject theEObject) + @Override + protected boolean isSwitchFor(EPackage ePackage) { - return doSwitch(theEObject.eClass(), theEObject); - } - - /** - * 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 - */ - protected T doSwitch(EClass theEClass, EObject theEObject) - { - if (theEClass.eContainer() == modelPackage) - { - return doSwitch(theEClass.getClassifierID(), theEObject); - } - else - { - List eSuperTypes = theEClass.getESuperTypes(); - return - eSuperTypes.isEmpty() ? - defaultCase(theEObject) : - doSwitch(eSuperTypes.get(0), theEObject); - } + return ePackage == modelPackage; } /** @@ -88,6 +67,7 @@ public class FirstSwitch * @return the first non-null result returned by a caseXXX call. * @generated */ + @Override protected T doSwitch(int classifierID, EObject theEObject) { switch (classifierID) @@ -130,6 +110,7 @@ public class FirstSwitch * @see #doSwitch(org.eclipse.emf.ecore.EObject) * @generated */ + @Override public T defaultCase(EObject object) { return null; diff --git a/org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/generator/ecore/second/Second.java b/org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/generator/ecore/second/Second.java index f63f974b8..115ec491f 100644 --- a/org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/generator/ecore/second/Second.java +++ b/org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/generator/ecore/second/Second.java @@ -28,10 +28,6 @@ public interface Second 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) @@ -54,10 +50,6 @@ public interface Second extends EObject /** * Returns the value of the 'First' reference. * - *

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

* * @return the value of the 'First' reference. * @see #setFirst(First) diff --git a/org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/generator/ecore/second/impl/SecondFactoryImpl.java b/org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/generator/ecore/second/impl/SecondFactoryImpl.java index 6696c186a..b97205cc2 100644 --- a/org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/generator/ecore/second/impl/SecondFactoryImpl.java +++ b/org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/generator/ecore/second/impl/SecondFactoryImpl.java @@ -75,6 +75,7 @@ public class SecondFactoryImpl extends EFactoryImpl implements SecondFactory * * @generated */ + @Override public Second createSecond() { SecondImpl second = new SecondImpl(); @@ -86,6 +87,7 @@ public class SecondFactoryImpl extends EFactoryImpl implements SecondFactory * * @generated */ + @Override public SecondPackage getSecondPackage() { return (SecondPackage)getEPackage(); diff --git a/org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/generator/ecore/second/impl/SecondImpl.java b/org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/generator/ecore/second/impl/SecondImpl.java index bbe5df8e0..f35d59531 100644 --- a/org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/generator/ecore/second/impl/SecondImpl.java +++ b/org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/generator/ecore/second/impl/SecondImpl.java @@ -87,6 +87,7 @@ public class SecondImpl extends MinimalEObjectImpl.Container implements Second * * @generated */ + @Override public String getName() { return name; @@ -97,6 +98,7 @@ public class SecondImpl extends MinimalEObjectImpl.Container implements Second * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -110,6 +112,7 @@ public class SecondImpl extends MinimalEObjectImpl.Container implements Second * * @generated */ + @Override public First getFirst() { if (first != null && first.eIsProxy()) @@ -140,6 +143,7 @@ public class SecondImpl extends MinimalEObjectImpl.Container implements Second * * @generated */ + @Override public void setFirst(First newFirst) { First oldFirst = first; @@ -235,7 +239,7 @@ public class SecondImpl extends MinimalEObjectImpl.Container implements Second { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/generator/ecore/second/impl/SecondPackageImpl.java b/org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/generator/ecore/second/impl/SecondPackageImpl.java index c007fa431..725011293 100644 --- a/org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/generator/ecore/second/impl/SecondPackageImpl.java +++ b/org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/generator/ecore/second/impl/SecondPackageImpl.java @@ -62,7 +62,7 @@ public class SecondPackageImpl extends EPackageImpl implements SecondPackage /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link SecondPackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -77,7 +77,8 @@ public class SecondPackageImpl extends EPackageImpl implements SecondPackage if (isInited) return (SecondPackage)EPackage.Registry.INSTANCE.getEPackage(SecondPackage.eNS_URI); // Obtain or create and register package - SecondPackageImpl theSecondPackage = (SecondPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof SecondPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new SecondPackageImpl()); + Object registeredSecondPackage = EPackage.Registry.INSTANCE.get(eNS_URI); + SecondPackageImpl theSecondPackage = registeredSecondPackage instanceof SecondPackageImpl ? (SecondPackageImpl)registeredSecondPackage : new SecondPackageImpl(); isInited = true; @@ -85,7 +86,8 @@ public class SecondPackageImpl extends EPackageImpl implements SecondPackage EcorePackage.eINSTANCE.eClass(); // Obtain or create and register interdependencies - FirstPackageImpl theFirstPackage = (FirstPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(FirstPackage.eNS_URI) instanceof FirstPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(FirstPackage.eNS_URI) : FirstPackage.eINSTANCE); + Object registeredPackage = EPackage.Registry.INSTANCE.getEPackage(FirstPackage.eNS_URI); + FirstPackageImpl theFirstPackage = (FirstPackageImpl)(registeredPackage instanceof FirstPackageImpl ? registeredPackage : FirstPackage.eINSTANCE); // Create package meta-data objects theSecondPackage.createPackageContents(); @@ -98,7 +100,6 @@ public class SecondPackageImpl extends EPackageImpl implements SecondPackage // Mark meta-data to indicate it can't be changed theSecondPackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(SecondPackage.eNS_URI, theSecondPackage); return theSecondPackage; @@ -109,6 +110,7 @@ public class SecondPackageImpl extends EPackageImpl implements SecondPackage * * @generated */ + @Override public EClass getSecond() { return secondEClass; @@ -119,6 +121,7 @@ public class SecondPackageImpl extends EPackageImpl implements SecondPackage * * @generated */ + @Override public EAttribute getSecond_Name() { return (EAttribute)secondEClass.getEStructuralFeatures().get(0); @@ -129,6 +132,7 @@ public class SecondPackageImpl extends EPackageImpl implements SecondPackage * * @generated */ + @Override public EReference getSecond_First() { return (EReference)secondEClass.getEStructuralFeatures().get(1); @@ -139,6 +143,7 @@ public class SecondPackageImpl extends EPackageImpl implements SecondPackage * * @generated */ + @Override public SecondFactory getSecondFactory() { return (SecondFactory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/generator/ecore/second/util/SecondSwitch.java b/org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/generator/ecore/second/util/SecondSwitch.java index 2c6a9c5a9..ffb294aa7 100644 --- a/org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/generator/ecore/second/util/SecondSwitch.java +++ b/org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/generator/ecore/second/util/SecondSwitch.java @@ -2,10 +2,10 @@ */ package org.eclipse.xtext.generator.ecore.second.util; -import java.util.List; - -import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.EPackage; + +import org.eclipse.emf.ecore.util.Switch; import org.eclipse.xtext.generator.ecore.second.*; @@ -22,7 +22,7 @@ import org.eclipse.xtext.generator.ecore.second.*; * @see org.eclipse.xtext.generator.ecore.second.SecondPackage * @generated */ -public class SecondSwitch +public class SecondSwitch extends Switch { /** * The cached model package @@ -47,38 +47,17 @@ public class SecondSwitch } /** - * Calls caseXXX for each class of the model until one returns a non null result; it yields that result. + * Checks whether this is a switch for the given package. * * - * @return the first non-null result returned by a caseXXX call. + * @param ePackage the package in question. + * @return whether this is a switch for the given package. * @generated */ - public T doSwitch(EObject theEObject) + @Override + protected boolean isSwitchFor(EPackage ePackage) { - return doSwitch(theEObject.eClass(), theEObject); - } - - /** - * 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 - */ - protected T doSwitch(EClass theEClass, EObject theEObject) - { - if (theEClass.eContainer() == modelPackage) - { - return doSwitch(theEClass.getClassifierID(), theEObject); - } - else - { - List eSuperTypes = theEClass.getESuperTypes(); - return - eSuperTypes.isEmpty() ? - defaultCase(theEObject) : - doSwitch(eSuperTypes.get(0), theEObject); - } + return ePackage == modelPackage; } /** @@ -88,6 +67,7 @@ public class SecondSwitch * @return the first non-null result returned by a caseXXX call. * @generated */ + @Override protected T doSwitch(int classifierID, EObject theEObject) { switch (classifierID) @@ -130,6 +110,7 @@ public class SecondSwitch * @see #doSwitch(org.eclipse.emf.ecore.EObject) * @generated */ + @Override public T defaultCase(EObject object) { return null; diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguage.genmodel index 5550a4664..8aa89dfc1 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguage.genmodel +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguage.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="XtextGrammarTestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> + complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/dummy/DummyTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/dummy/DummyTestLanguage.genmodel index f367f178d..6b16df42a 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/dummy/DummyTestLanguage.genmodel +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/dummy/DummyTestLanguage.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="DummyTestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> + complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/dummy/dummyLang/Element.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/dummy/dummyLang/Element.java index cc7c37a22..86465faca 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/dummy/dummyLang/Element.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/dummy/dummyLang/Element.java @@ -30,10 +30,6 @@ public interface Element extends EObject /** * Returns the value of the 'Optional' attribute. * - *

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

* * @return the value of the 'Optional' attribute. * @see #setOptional(boolean) @@ -56,10 +52,6 @@ public interface Element 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) @@ -83,10 +75,6 @@ public interface Element extends EObject * Returns the value of the 'Descriptions' attribute list. * The list contents are of type {@link java.lang.String}. * - *

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

* * @return the value of the 'Descriptions' attribute list. * @see org.eclipse.xtext.dummy.dummyLang.DummyLangPackage#getElement_Descriptions() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/dummy/dummyLang/Model.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/dummy/dummyLang/Model.java index 974eed91e..4a944ede2 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/dummy/dummyLang/Model.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/dummy/dummyLang/Model.java @@ -29,10 +29,6 @@ public interface Model extends EObject * Returns the value of the 'Elements' containment reference list. * The list contents are of type {@link org.eclipse.xtext.dummy.dummyLang.Element}. * - *

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

* * @return the value of the 'Elements' containment reference list. * @see org.eclipse.xtext.dummy.dummyLang.DummyLangPackage#getModel_Elements() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/dummy/dummyLang/impl/DummyLangFactoryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/dummy/dummyLang/impl/DummyLangFactoryImpl.java index 1e1334a63..42107631a 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/dummy/dummyLang/impl/DummyLangFactoryImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/dummy/dummyLang/impl/DummyLangFactoryImpl.java @@ -77,6 +77,7 @@ public class DummyLangFactoryImpl extends EFactoryImpl implements DummyLangFacto * * @generated */ + @Override public Model createModel() { ModelImpl model = new ModelImpl(); @@ -88,6 +89,7 @@ public class DummyLangFactoryImpl extends EFactoryImpl implements DummyLangFacto * * @generated */ + @Override public Element createElement() { ElementImpl element = new ElementImpl(); @@ -99,6 +101,7 @@ public class DummyLangFactoryImpl extends EFactoryImpl implements DummyLangFacto * * @generated */ + @Override public DummyLangPackage getDummyLangPackage() { return (DummyLangPackage)getEPackage(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/dummy/dummyLang/impl/DummyLangPackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/dummy/dummyLang/impl/DummyLangPackageImpl.java index 5859c47c5..5a82a6a35 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/dummy/dummyLang/impl/DummyLangPackageImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/dummy/dummyLang/impl/DummyLangPackageImpl.java @@ -67,7 +67,7 @@ public class DummyLangPackageImpl extends EPackageImpl implements DummyLangPacka /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link DummyLangPackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -82,7 +82,8 @@ public class DummyLangPackageImpl extends EPackageImpl implements DummyLangPacka if (isInited) return (DummyLangPackage)EPackage.Registry.INSTANCE.getEPackage(DummyLangPackage.eNS_URI); // Obtain or create and register package - DummyLangPackageImpl theDummyLangPackage = (DummyLangPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof DummyLangPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new DummyLangPackageImpl()); + Object registeredDummyLangPackage = EPackage.Registry.INSTANCE.get(eNS_URI); + DummyLangPackageImpl theDummyLangPackage = registeredDummyLangPackage instanceof DummyLangPackageImpl ? (DummyLangPackageImpl)registeredDummyLangPackage : new DummyLangPackageImpl(); isInited = true; @@ -98,7 +99,6 @@ public class DummyLangPackageImpl extends EPackageImpl implements DummyLangPacka // Mark meta-data to indicate it can't be changed theDummyLangPackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(DummyLangPackage.eNS_URI, theDummyLangPackage); return theDummyLangPackage; @@ -109,6 +109,7 @@ public class DummyLangPackageImpl extends EPackageImpl implements DummyLangPacka * * @generated */ + @Override public EClass getModel() { return modelEClass; @@ -119,6 +120,7 @@ public class DummyLangPackageImpl extends EPackageImpl implements DummyLangPacka * * @generated */ + @Override public EReference getModel_Elements() { return (EReference)modelEClass.getEStructuralFeatures().get(0); @@ -129,6 +131,7 @@ public class DummyLangPackageImpl extends EPackageImpl implements DummyLangPacka * * @generated */ + @Override public EClass getElement() { return elementEClass; @@ -139,6 +142,7 @@ public class DummyLangPackageImpl extends EPackageImpl implements DummyLangPacka * * @generated */ + @Override public EAttribute getElement_Optional() { return (EAttribute)elementEClass.getEStructuralFeatures().get(0); @@ -149,6 +153,7 @@ public class DummyLangPackageImpl extends EPackageImpl implements DummyLangPacka * * @generated */ + @Override public EAttribute getElement_Name() { return (EAttribute)elementEClass.getEStructuralFeatures().get(1); @@ -159,6 +164,7 @@ public class DummyLangPackageImpl extends EPackageImpl implements DummyLangPacka * * @generated */ + @Override public EAttribute getElement_Descriptions() { return (EAttribute)elementEClass.getEStructuralFeatures().get(2); @@ -169,6 +175,7 @@ public class DummyLangPackageImpl extends EPackageImpl implements DummyLangPacka * * @generated */ + @Override public DummyLangFactory getDummyLangFactory() { return (DummyLangFactory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/dummy/dummyLang/impl/ElementImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/dummy/dummyLang/impl/ElementImpl.java index d426ef4ba..824b4a745 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/dummy/dummyLang/impl/ElementImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/dummy/dummyLang/impl/ElementImpl.java @@ -112,6 +112,7 @@ public class ElementImpl extends MinimalEObjectImpl.Container implements Element * * @generated */ + @Override public boolean isOptional() { return optional; @@ -122,6 +123,7 @@ public class ElementImpl extends MinimalEObjectImpl.Container implements Element * * @generated */ + @Override public void setOptional(boolean newOptional) { boolean oldOptional = optional; @@ -135,6 +137,7 @@ public class ElementImpl extends MinimalEObjectImpl.Container implements Element * * @generated */ + @Override public String getName() { return name; @@ -145,6 +148,7 @@ public class ElementImpl extends MinimalEObjectImpl.Container implements Element * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -158,6 +162,7 @@ public class ElementImpl extends MinimalEObjectImpl.Container implements Element * * @generated */ + @Override public EList getDescriptions() { if (descriptions == null) @@ -265,7 +270,7 @@ public class ElementImpl extends MinimalEObjectImpl.Container implements Element { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (optional: "); result.append(optional); result.append(", name: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/dummy/dummyLang/impl/ModelImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/dummy/dummyLang/impl/ModelImpl.java index 032afc977..962fa3243 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/dummy/dummyLang/impl/ModelImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/dummy/dummyLang/impl/ModelImpl.java @@ -72,6 +72,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public EList getElements() { if (elements == null) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/EnumAndReferenceTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/EnumAndReferenceTestLanguage.genmodel index 0325d967f..48a0316ec 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/EnumAndReferenceTestLanguage.genmodel +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/EnumAndReferenceTestLanguage.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="EnumAndReferenceTestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> + complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/EnumRulesTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/EnumRulesTestLanguage.genmodel index 22881682f..d13deb23b 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/EnumRulesTestLanguage.genmodel +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/EnumRulesTestLanguage.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="EnumRulesTestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="../../../../../src/org/eclipse/xtext/enumrules/enums.genmodel#//enums"> + complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20" usedGenPackages="../../../../../src/org/eclipse/xtext/enumrules/enums.genmodel#//enums"> diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/MultiRuleEnumTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/MultiRuleEnumTestLanguage.genmodel index 203482b86..eef5255fc 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/MultiRuleEnumTestLanguage.genmodel +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/MultiRuleEnumTestLanguage.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="MultiRuleEnumTestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9"> + complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20"> diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/enumAndReferenceTestLanguage/EntityWithEnumAndReference.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/enumAndReferenceTestLanguage/EntityWithEnumAndReference.java index 8ead83599..8ed836bab 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/enumAndReferenceTestLanguage/EntityWithEnumAndReference.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/enumAndReferenceTestLanguage/EntityWithEnumAndReference.java @@ -29,10 +29,6 @@ public interface EntityWithEnumAndReference extends EObject * Returns the value of the 'Type' attribute. * The literals are from the enumeration {@link org.eclipse.xtext.enumrules.enumAndReferenceTestLanguage.KindOfKeyword}. * - *

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

* * @return the value of the 'Type' attribute. * @see org.eclipse.xtext.enumrules.enumAndReferenceTestLanguage.KindOfKeyword @@ -57,10 +53,6 @@ public interface EntityWithEnumAndReference 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) @@ -83,10 +75,6 @@ public interface EntityWithEnumAndReference extends EObject /** * Returns the value of the 'Ref' reference. * - *

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

* * @return the value of the 'Ref' reference. * @see #setRef(EntityWithEnumAndReference) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/enumAndReferenceTestLanguage/KindOfKeyword.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/enumAndReferenceTestLanguage/KindOfKeyword.java index ad58275fc..50b6395e6 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/enumAndReferenceTestLanguage/KindOfKeyword.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/enumAndReferenceTestLanguage/KindOfKeyword.java @@ -43,10 +43,6 @@ public enum KindOfKeyword implements Enumerator /** * The 'Kind Of Keyword' literal value. * - *

- * If the meaning of 'Kind Of Keyword' literal object isn't clear, - * there really should be more of a description here... - *

* * @see #KIND_OF_KEYWORD * @model name="kindOfKeyword" @@ -58,10 +54,6 @@ public enum KindOfKeyword implements Enumerator /** * The 'Another Enum Literal' literal value. * - *

- * If the meaning of 'Another Enum Literal' literal object isn't clear, - * there really should be more of a description here... - *

* * @see #ANOTHER_ENUM_LITERAL * @model name="anotherEnumLiteral" @@ -190,6 +182,7 @@ public enum KindOfKeyword implements Enumerator * * @generated */ + @Override public int getValue() { return value; @@ -200,6 +193,7 @@ public enum KindOfKeyword implements Enumerator * * @generated */ + @Override public String getName() { return name; @@ -210,6 +204,7 @@ public enum KindOfKeyword implements Enumerator * * @generated */ + @Override public String getLiteral() { return literal; diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/enumAndReferenceTestLanguage/impl/EntityWithEnumAndReferenceImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/enumAndReferenceTestLanguage/impl/EntityWithEnumAndReferenceImpl.java index 3304ec7c3..a835a70ee 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/enumAndReferenceTestLanguage/impl/EntityWithEnumAndReferenceImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/enumAndReferenceTestLanguage/impl/EntityWithEnumAndReferenceImpl.java @@ -108,6 +108,7 @@ public class EntityWithEnumAndReferenceImpl extends MinimalEObjectImpl.Container * * @generated */ + @Override public KindOfKeyword getType() { return type; @@ -118,6 +119,7 @@ public class EntityWithEnumAndReferenceImpl extends MinimalEObjectImpl.Container * * @generated */ + @Override public void setType(KindOfKeyword newType) { KindOfKeyword oldType = type; @@ -131,6 +133,7 @@ public class EntityWithEnumAndReferenceImpl extends MinimalEObjectImpl.Container * * @generated */ + @Override public String getName() { return name; @@ -141,6 +144,7 @@ public class EntityWithEnumAndReferenceImpl extends MinimalEObjectImpl.Container * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -154,6 +158,7 @@ public class EntityWithEnumAndReferenceImpl extends MinimalEObjectImpl.Container * * @generated */ + @Override public EntityWithEnumAndReference getRef() { if (ref != null && ref.eIsProxy()) @@ -184,6 +189,7 @@ public class EntityWithEnumAndReferenceImpl extends MinimalEObjectImpl.Container * * @generated */ + @Override public void setRef(EntityWithEnumAndReference newRef) { EntityWithEnumAndReference oldRef = ref; @@ -289,7 +295,7 @@ public class EntityWithEnumAndReferenceImpl extends MinimalEObjectImpl.Container { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (type: "); result.append(type); result.append(", name: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/enumAndReferenceTestLanguage/impl/EnumAndReferenceTestLanguageFactoryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/enumAndReferenceTestLanguage/impl/EnumAndReferenceTestLanguageFactoryImpl.java index 42002ff5d..ee68c33a5 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/enumAndReferenceTestLanguage/impl/EnumAndReferenceTestLanguageFactoryImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/enumAndReferenceTestLanguage/impl/EnumAndReferenceTestLanguageFactoryImpl.java @@ -111,6 +111,7 @@ public class EnumAndReferenceTestLanguageFactoryImpl extends EFactoryImpl implem * * @generated */ + @Override public EntityWithEnumAndReference createEntityWithEnumAndReference() { EntityWithEnumAndReferenceImpl entityWithEnumAndReference = new EntityWithEnumAndReferenceImpl(); @@ -144,6 +145,7 @@ public class EnumAndReferenceTestLanguageFactoryImpl extends EFactoryImpl implem * * @generated */ + @Override public EnumAndReferenceTestLanguagePackage getEnumAndReferenceTestLanguagePackage() { return (EnumAndReferenceTestLanguagePackage)getEPackage(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/enumAndReferenceTestLanguage/impl/EnumAndReferenceTestLanguagePackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/enumAndReferenceTestLanguage/impl/EnumAndReferenceTestLanguagePackageImpl.java index 73c7696a2..90f3b90f0 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/enumAndReferenceTestLanguage/impl/EnumAndReferenceTestLanguagePackageImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/enumAndReferenceTestLanguage/impl/EnumAndReferenceTestLanguagePackageImpl.java @@ -68,7 +68,7 @@ public class EnumAndReferenceTestLanguagePackageImpl extends EPackageImpl implem /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link EnumAndReferenceTestLanguagePackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -83,7 +83,8 @@ public class EnumAndReferenceTestLanguagePackageImpl extends EPackageImpl implem if (isInited) return (EnumAndReferenceTestLanguagePackage)EPackage.Registry.INSTANCE.getEPackage(EnumAndReferenceTestLanguagePackage.eNS_URI); // Obtain or create and register package - EnumAndReferenceTestLanguagePackageImpl theEnumAndReferenceTestLanguagePackage = (EnumAndReferenceTestLanguagePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof EnumAndReferenceTestLanguagePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new EnumAndReferenceTestLanguagePackageImpl()); + Object registeredEnumAndReferenceTestLanguagePackage = EPackage.Registry.INSTANCE.get(eNS_URI); + EnumAndReferenceTestLanguagePackageImpl theEnumAndReferenceTestLanguagePackage = registeredEnumAndReferenceTestLanguagePackage instanceof EnumAndReferenceTestLanguagePackageImpl ? (EnumAndReferenceTestLanguagePackageImpl)registeredEnumAndReferenceTestLanguagePackage : new EnumAndReferenceTestLanguagePackageImpl(); isInited = true; @@ -99,7 +100,6 @@ public class EnumAndReferenceTestLanguagePackageImpl extends EPackageImpl implem // Mark meta-data to indicate it can't be changed theEnumAndReferenceTestLanguagePackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(EnumAndReferenceTestLanguagePackage.eNS_URI, theEnumAndReferenceTestLanguagePackage); return theEnumAndReferenceTestLanguagePackage; @@ -110,6 +110,7 @@ public class EnumAndReferenceTestLanguagePackageImpl extends EPackageImpl implem * * @generated */ + @Override public EClass getEntityWithEnumAndReference() { return entityWithEnumAndReferenceEClass; @@ -120,6 +121,7 @@ public class EnumAndReferenceTestLanguagePackageImpl extends EPackageImpl implem * * @generated */ + @Override public EAttribute getEntityWithEnumAndReference_Type() { return (EAttribute)entityWithEnumAndReferenceEClass.getEStructuralFeatures().get(0); @@ -130,6 +132,7 @@ public class EnumAndReferenceTestLanguagePackageImpl extends EPackageImpl implem * * @generated */ + @Override public EAttribute getEntityWithEnumAndReference_Name() { return (EAttribute)entityWithEnumAndReferenceEClass.getEStructuralFeatures().get(1); @@ -140,6 +143,7 @@ public class EnumAndReferenceTestLanguagePackageImpl extends EPackageImpl implem * * @generated */ + @Override public EReference getEntityWithEnumAndReference_Ref() { return (EReference)entityWithEnumAndReferenceEClass.getEStructuralFeatures().get(2); @@ -150,6 +154,7 @@ public class EnumAndReferenceTestLanguagePackageImpl extends EPackageImpl implem * * @generated */ + @Override public EEnum getKindOfKeyword() { return kindOfKeywordEEnum; @@ -160,6 +165,7 @@ public class EnumAndReferenceTestLanguagePackageImpl extends EPackageImpl implem * * @generated */ + @Override public EnumAndReferenceTestLanguageFactory getEnumAndReferenceTestLanguageFactory() { return (EnumAndReferenceTestLanguageFactory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/enumRulesTestLanguage/GeneratedEnum.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/enumRulesTestLanguage/GeneratedEnum.java index a7cd9ed2d..a74f61d59 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/enumRulesTestLanguage/GeneratedEnum.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/enumRulesTestLanguage/GeneratedEnum.java @@ -43,10 +43,6 @@ public enum GeneratedEnum implements Enumerator /** * The 'Same Name' literal value. * - *

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

* * @see #SAME_NAME * @model name="SameName" @@ -58,10 +54,6 @@ public enum GeneratedEnum implements Enumerator /** * The 'Different Name' literal value. * - *

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

* * @see #DIFFERENT_NAME * @model name="DifferentName" literal="DifferentLiteral" @@ -190,6 +182,7 @@ public enum GeneratedEnum implements Enumerator * * @generated */ + @Override public int getValue() { return value; @@ -200,6 +193,7 @@ public enum GeneratedEnum implements Enumerator * * @generated */ + @Override public String getName() { return name; @@ -210,6 +204,7 @@ public enum GeneratedEnum implements Enumerator * * @generated */ + @Override public String getLiteral() { return literal; diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/enumRulesTestLanguage/Model.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/enumRulesTestLanguage/Model.java index 35d4766ff..0f5acab57 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/enumRulesTestLanguage/Model.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/enumRulesTestLanguage/Model.java @@ -30,10 +30,6 @@ public interface Model extends EObject * Returns the value of the 'Existing' attribute. * The literals are from the enumeration {@link org.eclipse.xtext.enumrules.enums.ExistingEnum}. * - *

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

* * @return the value of the 'Existing' attribute. * @see org.eclipse.xtext.enumrules.enums.ExistingEnum @@ -59,10 +55,6 @@ public interface Model extends EObject * Returns the value of the 'Generated' attribute. * The literals are from the enumeration {@link org.eclipse.xtext.enumrules.enumRulesTestLanguage.GeneratedEnum}. * - *

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

* * @return the value of the 'Generated' attribute. * @see org.eclipse.xtext.enumrules.enumRulesTestLanguage.GeneratedEnum diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/enumRulesTestLanguage/impl/EnumRulesTestLanguageFactoryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/enumRulesTestLanguage/impl/EnumRulesTestLanguageFactoryImpl.java index 5382660ee..c82746125 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/enumRulesTestLanguage/impl/EnumRulesTestLanguageFactoryImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/enumRulesTestLanguage/impl/EnumRulesTestLanguageFactoryImpl.java @@ -111,6 +111,7 @@ public class EnumRulesTestLanguageFactoryImpl extends EFactoryImpl implements En * * @generated */ + @Override public Model createModel() { ModelImpl model = new ModelImpl(); @@ -144,6 +145,7 @@ public class EnumRulesTestLanguageFactoryImpl extends EFactoryImpl implements En * * @generated */ + @Override public EnumRulesTestLanguagePackage getEnumRulesTestLanguagePackage() { return (EnumRulesTestLanguagePackage)getEPackage(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/enumRulesTestLanguage/impl/EnumRulesTestLanguagePackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/enumRulesTestLanguage/impl/EnumRulesTestLanguagePackageImpl.java index e01ce4293..82b410ca9 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/enumRulesTestLanguage/impl/EnumRulesTestLanguagePackageImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/enumRulesTestLanguage/impl/EnumRulesTestLanguagePackageImpl.java @@ -68,7 +68,7 @@ public class EnumRulesTestLanguagePackageImpl extends EPackageImpl implements En /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link EnumRulesTestLanguagePackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -83,7 +83,8 @@ public class EnumRulesTestLanguagePackageImpl extends EPackageImpl implements En if (isInited) return (EnumRulesTestLanguagePackage)EPackage.Registry.INSTANCE.getEPackage(EnumRulesTestLanguagePackage.eNS_URI); // Obtain or create and register package - EnumRulesTestLanguagePackageImpl theEnumRulesTestLanguagePackage = (EnumRulesTestLanguagePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof EnumRulesTestLanguagePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new EnumRulesTestLanguagePackageImpl()); + Object registeredEnumRulesTestLanguagePackage = EPackage.Registry.INSTANCE.get(eNS_URI); + EnumRulesTestLanguagePackageImpl theEnumRulesTestLanguagePackage = registeredEnumRulesTestLanguagePackage instanceof EnumRulesTestLanguagePackageImpl ? (EnumRulesTestLanguagePackageImpl)registeredEnumRulesTestLanguagePackage : new EnumRulesTestLanguagePackageImpl(); isInited = true; @@ -99,7 +100,6 @@ public class EnumRulesTestLanguagePackageImpl extends EPackageImpl implements En // Mark meta-data to indicate it can't be changed theEnumRulesTestLanguagePackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(EnumRulesTestLanguagePackage.eNS_URI, theEnumRulesTestLanguagePackage); return theEnumRulesTestLanguagePackage; @@ -110,6 +110,7 @@ public class EnumRulesTestLanguagePackageImpl extends EPackageImpl implements En * * @generated */ + @Override public EClass getModel() { return modelEClass; @@ -120,6 +121,7 @@ public class EnumRulesTestLanguagePackageImpl extends EPackageImpl implements En * * @generated */ + @Override public EAttribute getModel_Existing() { return (EAttribute)modelEClass.getEStructuralFeatures().get(0); @@ -130,6 +132,7 @@ public class EnumRulesTestLanguagePackageImpl extends EPackageImpl implements En * * @generated */ + @Override public EAttribute getModel_Generated() { return (EAttribute)modelEClass.getEStructuralFeatures().get(1); @@ -140,6 +143,7 @@ public class EnumRulesTestLanguagePackageImpl extends EPackageImpl implements En * * @generated */ + @Override public EEnum getGeneratedEnum() { return generatedEnumEEnum; @@ -150,6 +154,7 @@ public class EnumRulesTestLanguagePackageImpl extends EPackageImpl implements En * * @generated */ + @Override public EnumRulesTestLanguageFactory getEnumRulesTestLanguageFactory() { return (EnumRulesTestLanguageFactory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/enumRulesTestLanguage/impl/ModelImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/enumRulesTestLanguage/impl/ModelImpl.java index 9200dbba6..1f2936089 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/enumRulesTestLanguage/impl/ModelImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/enumRulesTestLanguage/impl/ModelImpl.java @@ -98,6 +98,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public ExistingEnum getExisting() { return existing; @@ -108,6 +109,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setExisting(ExistingEnum newExisting) { ExistingEnum oldExisting = existing; @@ -121,6 +123,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public GeneratedEnum getGenerated() { return generated; @@ -131,6 +134,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setGenerated(GeneratedEnum newGenerated) { GeneratedEnum oldGenerated = generated; @@ -225,7 +229,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (existing: "); result.append(existing); result.append(", generated: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/multiRuleenums/Model.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/multiRuleenums/Model.java index ecaf6a91f..86bbb0f77 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/multiRuleenums/Model.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/multiRuleenums/Model.java @@ -29,10 +29,6 @@ public interface Model extends EObject * Returns the value of the 'A' attribute. * The literals are from the enumeration {@link org.eclipse.xtext.enumrules.multiRuleenums.MyEnum}. * - *

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

* * @return the value of the 'A' attribute. * @see org.eclipse.xtext.enumrules.multiRuleenums.MyEnum @@ -58,10 +54,6 @@ public interface Model extends EObject * Returns the value of the 'B' attribute. * The literals are from the enumeration {@link org.eclipse.xtext.enumrules.multiRuleenums.MyEnum}. * - *

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

* * @return the value of the 'B' attribute. * @see org.eclipse.xtext.enumrules.multiRuleenums.MyEnum @@ -87,10 +79,6 @@ public interface Model extends EObject * Returns the value of the 'C' attribute. * The literals are from the enumeration {@link org.eclipse.xtext.enumrules.multiRuleenums.MyEnum}. * - *

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

* * @return the value of the 'C' attribute. * @see org.eclipse.xtext.enumrules.multiRuleenums.MyEnum diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/multiRuleenums/MyEnum.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/multiRuleenums/MyEnum.java index 11a1f5694..3745e171a 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/multiRuleenums/MyEnum.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/multiRuleenums/MyEnum.java @@ -73,10 +73,6 @@ public enum MyEnum implements Enumerator /** * The 'A' literal value. * - *

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

* * @see #A * @model @@ -88,10 +84,6 @@ public enum MyEnum implements Enumerator /** * The 'B' literal value. * - *

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

* * @see #B * @model @@ -103,10 +95,6 @@ public enum MyEnum implements Enumerator /** * The 'C' literal value. * - *

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

* * @see #C * @model @@ -118,10 +106,6 @@ public enum MyEnum implements Enumerator /** * The 'D' literal value. * - *

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

* * @see #D * @model @@ -133,10 +117,6 @@ public enum MyEnum implements Enumerator /** * The 'E' literal value. * - *

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

* * @see #E * @model @@ -271,6 +251,7 @@ public enum MyEnum implements Enumerator * * @generated */ + @Override public int getValue() { return value; @@ -281,6 +262,7 @@ public enum MyEnum implements Enumerator * * @generated */ + @Override public String getName() { return name; @@ -291,6 +273,7 @@ public enum MyEnum implements Enumerator * * @generated */ + @Override public String getLiteral() { return literal; diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/multiRuleenums/impl/ModelImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/multiRuleenums/impl/ModelImpl.java index 5bff4dae4..0007b5fda 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/multiRuleenums/impl/ModelImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/multiRuleenums/impl/ModelImpl.java @@ -117,6 +117,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public MyEnum getA() { return a; @@ -127,6 +128,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setA(MyEnum newA) { MyEnum oldA = a; @@ -140,6 +142,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public MyEnum getB() { return b; @@ -150,6 +153,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setB(MyEnum newB) { MyEnum oldB = b; @@ -163,6 +167,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public MyEnum getC() { return c; @@ -173,6 +178,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setC(MyEnum newC) { MyEnum oldC = c; @@ -277,7 +283,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (a: "); result.append(a); result.append(", b: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/multiRuleenums/impl/MultiRuleenumsFactoryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/multiRuleenums/impl/MultiRuleenumsFactoryImpl.java index 453487033..11837584c 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/multiRuleenums/impl/MultiRuleenumsFactoryImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/multiRuleenums/impl/MultiRuleenumsFactoryImpl.java @@ -111,6 +111,7 @@ public class MultiRuleenumsFactoryImpl extends EFactoryImpl implements MultiRule * * @generated */ + @Override public Model createModel() { ModelImpl model = new ModelImpl(); @@ -144,6 +145,7 @@ public class MultiRuleenumsFactoryImpl extends EFactoryImpl implements MultiRule * * @generated */ + @Override public MultiRuleenumsPackage getMultiRuleenumsPackage() { return (MultiRuleenumsPackage)getEPackage(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/multiRuleenums/impl/MultiRuleenumsPackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/multiRuleenums/impl/MultiRuleenumsPackageImpl.java index 458aab224..e6091df7f 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/multiRuleenums/impl/MultiRuleenumsPackageImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/enumrules/multiRuleenums/impl/MultiRuleenumsPackageImpl.java @@ -66,7 +66,7 @@ public class MultiRuleenumsPackageImpl extends EPackageImpl implements MultiRule /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link MultiRuleenumsPackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -81,7 +81,8 @@ public class MultiRuleenumsPackageImpl extends EPackageImpl implements MultiRule if (isInited) return (MultiRuleenumsPackage)EPackage.Registry.INSTANCE.getEPackage(MultiRuleenumsPackage.eNS_URI); // Obtain or create and register package - MultiRuleenumsPackageImpl theMultiRuleenumsPackage = (MultiRuleenumsPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof MultiRuleenumsPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new MultiRuleenumsPackageImpl()); + Object registeredMultiRuleenumsPackage = EPackage.Registry.INSTANCE.get(eNS_URI); + MultiRuleenumsPackageImpl theMultiRuleenumsPackage = registeredMultiRuleenumsPackage instanceof MultiRuleenumsPackageImpl ? (MultiRuleenumsPackageImpl)registeredMultiRuleenumsPackage : new MultiRuleenumsPackageImpl(); isInited = true; @@ -94,7 +95,6 @@ public class MultiRuleenumsPackageImpl extends EPackageImpl implements MultiRule // Mark meta-data to indicate it can't be changed theMultiRuleenumsPackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(MultiRuleenumsPackage.eNS_URI, theMultiRuleenumsPackage); return theMultiRuleenumsPackage; @@ -105,6 +105,7 @@ public class MultiRuleenumsPackageImpl extends EPackageImpl implements MultiRule * * @generated */ + @Override public EClass getModel() { return modelEClass; @@ -115,6 +116,7 @@ public class MultiRuleenumsPackageImpl extends EPackageImpl implements MultiRule * * @generated */ + @Override public EAttribute getModel_A() { return (EAttribute)modelEClass.getEStructuralFeatures().get(0); @@ -125,6 +127,7 @@ public class MultiRuleenumsPackageImpl extends EPackageImpl implements MultiRule * * @generated */ + @Override public EAttribute getModel_B() { return (EAttribute)modelEClass.getEStructuralFeatures().get(1); @@ -135,6 +138,7 @@ public class MultiRuleenumsPackageImpl extends EPackageImpl implements MultiRule * * @generated */ + @Override public EAttribute getModel_C() { return (EAttribute)modelEClass.getEStructuralFeatures().get(2); @@ -145,6 +149,7 @@ public class MultiRuleenumsPackageImpl extends EPackageImpl implements MultiRule * * @generated */ + @Override public EEnum getMyEnum() { return myEnumEEnum; @@ -155,6 +160,7 @@ public class MultiRuleenumsPackageImpl extends EPackageImpl implements MultiRule * * @generated */ + @Override public MultiRuleenumsFactory getMultiRuleenumsFactory() { return (MultiRuleenumsFactory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/internal/FormatterTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/internal/FormatterTestLanguage.genmodel index 32898e984..8dde69719 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/internal/FormatterTestLanguage.genmodel +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/internal/FormatterTestLanguage.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="FormatterTestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> + complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/internal/formattertestlanguage/IDList.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/internal/formattertestlanguage/IDList.java index d64b83ed8..f21491710 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/internal/formattertestlanguage/IDList.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/internal/formattertestlanguage/IDList.java @@ -27,10 +27,6 @@ public interface IDList extends Root * Returns the value of the 'Ids' attribute list. * The list contents are of type {@link java.lang.String}. * - *

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

* * @return the value of the 'Ids' attribute list. * @see org.eclipse.xtext.formatting2.internal.formattertestlanguage.FormattertestlanguagePackage#getIDList_Ids() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/internal/formattertestlanguage/KWList.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/internal/formattertestlanguage/KWList.java index c9a0408b5..e669f7516 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/internal/formattertestlanguage/KWList.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/internal/formattertestlanguage/KWList.java @@ -29,10 +29,6 @@ public interface KWList extends Root /** * Returns the value of the 'Kw1' attribute. * - *

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

* * @return the value of the 'Kw1' attribute. * @see #setKw1(boolean) @@ -55,10 +51,6 @@ public interface KWList extends Root /** * Returns the value of the 'Kw2' attribute. * - *

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

* * @return the value of the 'Kw2' attribute. * @see #setKw2(boolean) @@ -81,10 +73,6 @@ public interface KWList extends Root /** * Returns the value of the 'Kw3' attribute. * - *

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

* * @return the value of the 'Kw3' attribute. * @see #setKw3(boolean) @@ -107,10 +95,6 @@ public interface KWList extends Root /** * Returns the value of the 'Kw4' attribute. * - *

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

* * @return the value of the 'Kw4' attribute. * @see #setKw4(boolean) @@ -133,10 +117,6 @@ public interface KWList extends Root /** * Returns the value of the 'Kw5' attribute. * - *

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

* * @return the value of the 'Kw5' attribute. * @see #setKw5(boolean) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/internal/formattertestlanguage/impl/FormattertestlanguageFactoryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/internal/formattertestlanguage/impl/FormattertestlanguageFactoryImpl.java index 2667b0c5f..c3cc8153a 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/internal/formattertestlanguage/impl/FormattertestlanguageFactoryImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/internal/formattertestlanguage/impl/FormattertestlanguageFactoryImpl.java @@ -78,6 +78,7 @@ public class FormattertestlanguageFactoryImpl extends EFactoryImpl implements Fo * * @generated */ + @Override public Root createRoot() { RootImpl root = new RootImpl(); @@ -89,6 +90,7 @@ public class FormattertestlanguageFactoryImpl extends EFactoryImpl implements Fo * * @generated */ + @Override public IDList createIDList() { IDListImpl idList = new IDListImpl(); @@ -100,6 +102,7 @@ public class FormattertestlanguageFactoryImpl extends EFactoryImpl implements Fo * * @generated */ + @Override public KWList createKWList() { KWListImpl kwList = new KWListImpl(); @@ -111,6 +114,7 @@ public class FormattertestlanguageFactoryImpl extends EFactoryImpl implements Fo * * @generated */ + @Override public FormattertestlanguagePackage getFormattertestlanguagePackage() { return (FormattertestlanguagePackage)getEPackage(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/internal/formattertestlanguage/impl/FormattertestlanguagePackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/internal/formattertestlanguage/impl/FormattertestlanguagePackageImpl.java index bb1df05f5..1bfbef110 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/internal/formattertestlanguage/impl/FormattertestlanguagePackageImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/internal/formattertestlanguage/impl/FormattertestlanguagePackageImpl.java @@ -74,7 +74,7 @@ public class FormattertestlanguagePackageImpl extends EPackageImpl implements Fo /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link FormattertestlanguagePackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -89,7 +89,8 @@ public class FormattertestlanguagePackageImpl extends EPackageImpl implements Fo if (isInited) return (FormattertestlanguagePackage)EPackage.Registry.INSTANCE.getEPackage(FormattertestlanguagePackage.eNS_URI); // Obtain or create and register package - FormattertestlanguagePackageImpl theFormattertestlanguagePackage = (FormattertestlanguagePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof FormattertestlanguagePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new FormattertestlanguagePackageImpl()); + Object registeredFormattertestlanguagePackage = EPackage.Registry.INSTANCE.get(eNS_URI); + FormattertestlanguagePackageImpl theFormattertestlanguagePackage = registeredFormattertestlanguagePackage instanceof FormattertestlanguagePackageImpl ? (FormattertestlanguagePackageImpl)registeredFormattertestlanguagePackage : new FormattertestlanguagePackageImpl(); isInited = true; @@ -105,7 +106,6 @@ public class FormattertestlanguagePackageImpl extends EPackageImpl implements Fo // Mark meta-data to indicate it can't be changed theFormattertestlanguagePackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(FormattertestlanguagePackage.eNS_URI, theFormattertestlanguagePackage); return theFormattertestlanguagePackage; @@ -116,6 +116,7 @@ public class FormattertestlanguagePackageImpl extends EPackageImpl implements Fo * * @generated */ + @Override public EClass getRoot() { return rootEClass; @@ -126,6 +127,7 @@ public class FormattertestlanguagePackageImpl extends EPackageImpl implements Fo * * @generated */ + @Override public EClass getIDList() { return idListEClass; @@ -136,6 +138,7 @@ public class FormattertestlanguagePackageImpl extends EPackageImpl implements Fo * * @generated */ + @Override public EAttribute getIDList_Ids() { return (EAttribute)idListEClass.getEStructuralFeatures().get(0); @@ -146,6 +149,7 @@ public class FormattertestlanguagePackageImpl extends EPackageImpl implements Fo * * @generated */ + @Override public EClass getKWList() { return kwListEClass; @@ -156,6 +160,7 @@ public class FormattertestlanguagePackageImpl extends EPackageImpl implements Fo * * @generated */ + @Override public EAttribute getKWList_Kw1() { return (EAttribute)kwListEClass.getEStructuralFeatures().get(0); @@ -166,6 +171,7 @@ public class FormattertestlanguagePackageImpl extends EPackageImpl implements Fo * * @generated */ + @Override public EAttribute getKWList_Kw2() { return (EAttribute)kwListEClass.getEStructuralFeatures().get(1); @@ -176,6 +182,7 @@ public class FormattertestlanguagePackageImpl extends EPackageImpl implements Fo * * @generated */ + @Override public EAttribute getKWList_Kw3() { return (EAttribute)kwListEClass.getEStructuralFeatures().get(2); @@ -186,6 +193,7 @@ public class FormattertestlanguagePackageImpl extends EPackageImpl implements Fo * * @generated */ + @Override public EAttribute getKWList_Kw4() { return (EAttribute)kwListEClass.getEStructuralFeatures().get(3); @@ -196,6 +204,7 @@ public class FormattertestlanguagePackageImpl extends EPackageImpl implements Fo * * @generated */ + @Override public EAttribute getKWList_Kw5() { return (EAttribute)kwListEClass.getEStructuralFeatures().get(4); @@ -206,6 +215,7 @@ public class FormattertestlanguagePackageImpl extends EPackageImpl implements Fo * * @generated */ + @Override public FormattertestlanguageFactory getFormattertestlanguageFactory() { return (FormattertestlanguageFactory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/internal/formattertestlanguage/impl/IDListImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/internal/formattertestlanguage/impl/IDListImpl.java index ebaabec0a..6544f2a9f 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/internal/formattertestlanguage/impl/IDListImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/internal/formattertestlanguage/impl/IDListImpl.java @@ -65,6 +65,7 @@ public class IDListImpl extends RootImpl implements IDList * * @generated */ + @Override public EList getIds() { if (ids == null) @@ -152,7 +153,7 @@ public class IDListImpl extends RootImpl implements IDList { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (ids: "); result.append(ids); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/internal/formattertestlanguage/impl/KWListImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/internal/formattertestlanguage/impl/KWListImpl.java index bdb432304..51419ce81 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/internal/formattertestlanguage/impl/KWListImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/internal/formattertestlanguage/impl/KWListImpl.java @@ -157,6 +157,7 @@ public class KWListImpl extends RootImpl implements KWList * * @generated */ + @Override public boolean isKw1() { return kw1; @@ -167,6 +168,7 @@ public class KWListImpl extends RootImpl implements KWList * * @generated */ + @Override public void setKw1(boolean newKw1) { boolean oldKw1 = kw1; @@ -180,6 +182,7 @@ public class KWListImpl extends RootImpl implements KWList * * @generated */ + @Override public boolean isKw2() { return kw2; @@ -190,6 +193,7 @@ public class KWListImpl extends RootImpl implements KWList * * @generated */ + @Override public void setKw2(boolean newKw2) { boolean oldKw2 = kw2; @@ -203,6 +207,7 @@ public class KWListImpl extends RootImpl implements KWList * * @generated */ + @Override public boolean isKw3() { return kw3; @@ -213,6 +218,7 @@ public class KWListImpl extends RootImpl implements KWList * * @generated */ + @Override public void setKw3(boolean newKw3) { boolean oldKw3 = kw3; @@ -226,6 +232,7 @@ public class KWListImpl extends RootImpl implements KWList * * @generated */ + @Override public boolean isKw4() { return kw4; @@ -236,6 +243,7 @@ public class KWListImpl extends RootImpl implements KWList * * @generated */ + @Override public void setKw4(boolean newKw4) { boolean oldKw4 = kw4; @@ -249,6 +257,7 @@ public class KWListImpl extends RootImpl implements KWList * * @generated */ + @Override public boolean isKw5() { return kw5; @@ -259,6 +268,7 @@ public class KWListImpl extends RootImpl implements KWList * * @generated */ + @Override public void setKw5(boolean newKw5) { boolean oldKw5 = kw5; @@ -383,7 +393,7 @@ public class KWListImpl extends RootImpl implements KWList { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (kw1: "); result.append(kw1); result.append(", kw2: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/RegionAccessTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/RegionAccessTestLanguage.genmodel index a63627f90..8c4e63e1e 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/RegionAccessTestLanguage.genmodel +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/RegionAccessTestLanguage.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="RegionAccessTestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> + complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/regionaccesstestlanguage/Add.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/regionaccesstestlanguage/Add.java index 3c0bdad7b..f5f0e9a80 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/regionaccesstestlanguage/Add.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/regionaccesstestlanguage/Add.java @@ -26,10 +26,6 @@ public interface Add extends Expression /** * Returns the value of the 'Left' containment reference. * - *

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

* * @return the value of the 'Left' containment reference. * @see #setLeft(Expression) @@ -52,10 +48,6 @@ public interface Add extends Expression /** * Returns the value of the 'Right' containment reference. * - *

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

* * @return the value of the 'Right' containment reference. * @see #setRight(Expression) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/regionaccesstestlanguage/AssignedAction.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/regionaccesstestlanguage/AssignedAction.java index 4ee6c7d06..99d9460a5 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/regionaccesstestlanguage/AssignedAction.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/regionaccesstestlanguage/AssignedAction.java @@ -26,10 +26,6 @@ public interface AssignedAction extends Mixed /** * Returns the value of the 'Child' containment reference. * - *

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

* * @return the value of the 'Child' containment reference. * @see #setChild(Mixed) @@ -52,10 +48,6 @@ public interface AssignedAction extends Mixed /** * Returns the value of the 'Body' containment reference. * - *

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

* * @return the value of the 'Body' containment reference. * @see #setBody(Mixed) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/regionaccesstestlanguage/Delegate.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/regionaccesstestlanguage/Delegate.java index af66e01b8..f8ff3cc2e 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/regionaccesstestlanguage/Delegate.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/regionaccesstestlanguage/Delegate.java @@ -25,10 +25,6 @@ public interface Delegate extends Unassigned, PrefixedDelegate /** * 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) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/regionaccesstestlanguage/Delegation.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/regionaccesstestlanguage/Delegation.java index 8d8fb47dc..c1e3e3bbb 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/regionaccesstestlanguage/Delegation.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/regionaccesstestlanguage/Delegation.java @@ -25,10 +25,6 @@ public interface Delegation extends Root /** * Returns the value of the 'Delegate' containment reference. * - *

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

* * @return the value of the 'Delegate' containment reference. * @see #setDelegate(Delegate) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/regionaccesstestlanguage/Enum.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/regionaccesstestlanguage/Enum.java index 6a3aed016..4d1c2ba3a 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/regionaccesstestlanguage/Enum.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/regionaccesstestlanguage/Enum.java @@ -43,10 +43,6 @@ public enum Enum implements Enumerator /** * The 'Lit1' literal value. * - *

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

* * @see #LIT1 * @model name="lit1" @@ -58,10 +54,6 @@ public enum Enum implements Enumerator /** * The 'Lit2' literal value. * - *

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

* * @see #LIT2 * @model name="lit2" @@ -190,6 +182,7 @@ public enum Enum implements Enumerator * * @generated */ + @Override public int getValue() { return value; @@ -200,6 +193,7 @@ public enum Enum implements Enumerator * * @generated */ + @Override public String getName() { return name; @@ -210,6 +204,7 @@ public enum Enum implements Enumerator * * @generated */ + @Override public String getLiteral() { return literal; diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/regionaccesstestlanguage/Mixed.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/regionaccesstestlanguage/Mixed.java index 3a4b110cd..c8b154553 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/regionaccesstestlanguage/Mixed.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/regionaccesstestlanguage/Mixed.java @@ -30,10 +30,6 @@ public interface Mixed extends Root /** * 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) @@ -56,10 +52,6 @@ public interface Mixed extends Root /** * Returns the value of the 'Eobj' containment reference. * - *

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

* * @return the value of the 'Eobj' containment reference. * @see #setEobj(Mixed) @@ -82,10 +74,6 @@ public interface Mixed extends Root /** * Returns the value of the 'Datatype' attribute. * - *

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

* * @return the value of the 'Datatype' attribute. * @see #setDatatype(String) @@ -108,10 +96,6 @@ public interface Mixed extends Root /** * Returns the value of the 'Ref' reference. * - *

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

* * @return the value of the 'Ref' reference. * @see #setRef(Mixed) @@ -135,10 +119,6 @@ public interface Mixed extends Root * Returns the value of the 'Lit' attribute. * The literals are from the enumeration {@link org.eclipse.xtext.formatting2.regionaccess.internal.regionaccesstestlanguage.Enum}. * - *

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

* * @return the value of the 'Lit' attribute. * @see org.eclipse.xtext.formatting2.regionaccess.internal.regionaccesstestlanguage.Enum @@ -163,10 +143,6 @@ public interface Mixed extends Root /** * Returns the value of the 'Frag Name' attribute. * - *

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

* * @return the value of the 'Frag Name' attribute. * @see #setFragName(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/regionaccesstestlanguage/Named.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/regionaccesstestlanguage/Named.java index 29db2a58f..82d9cb07d 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/regionaccesstestlanguage/Named.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/regionaccesstestlanguage/Named.java @@ -25,10 +25,6 @@ public interface Named extends Expression /** * 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) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/regionaccesstestlanguage/PrefixedUnassigned.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/regionaccesstestlanguage/PrefixedUnassigned.java index 4afc0b5aa..1c0ce7698 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/regionaccesstestlanguage/PrefixedUnassigned.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/regionaccesstestlanguage/PrefixedUnassigned.java @@ -25,10 +25,6 @@ public interface PrefixedUnassigned extends Root /** * Returns the value of the 'Delegate' containment reference. * - *

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

* * @return the value of the 'Delegate' containment reference. * @see #setDelegate(PrefixedDelegate) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/regionaccesstestlanguage/Root.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/regionaccesstestlanguage/Root.java index 110146d9b..4c2bc2e99 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/regionaccesstestlanguage/Root.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/regionaccesstestlanguage/Root.java @@ -26,10 +26,6 @@ public interface Root extends EObject /** * Returns the value of the 'Mixed' containment reference. * - *

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

* * @return the value of the 'Mixed' containment reference. * @see #setMixed(Mixed) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/regionaccesstestlanguage/Simple.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/regionaccesstestlanguage/Simple.java index c56bbc480..eb567642a 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/regionaccesstestlanguage/Simple.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/regionaccesstestlanguage/Simple.java @@ -25,10 +25,6 @@ public interface Simple extends Root /** * 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) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/regionaccesstestlanguage/ValueList.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/regionaccesstestlanguage/ValueList.java index af0d629c4..0fb746f3a 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/regionaccesstestlanguage/ValueList.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/regionaccesstestlanguage/ValueList.java @@ -27,10 +27,6 @@ public interface ValueList extends Root * Returns the value of the 'Name' attribute list. * The list contents are of type {@link java.lang.String}. * - *

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

* * @return the value of the 'Name' attribute list. * @see org.eclipse.xtext.formatting2.regionaccess.internal.regionaccesstestlanguage.RegionaccesstestlanguagePackage#getValueList_Name() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/regionaccesstestlanguage/impl/AddImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/regionaccesstestlanguage/impl/AddImpl.java index c3bf25111..98de1aa41 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/regionaccesstestlanguage/impl/AddImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/regionaccesstestlanguage/impl/AddImpl.java @@ -77,6 +77,7 @@ public class AddImpl extends ExpressionImpl implements Add * * @generated */ + @Override public Expression getLeft() { return left; @@ -104,6 +105,7 @@ public class AddImpl extends ExpressionImpl implements Add * * @generated */ + @Override public void setLeft(Expression newLeft) { if (newLeft != left) @@ -125,6 +127,7 @@ public class AddImpl extends ExpressionImpl implements Add * * @generated */ + @Override public Expression getRight() { return right; @@ -152,6 +155,7 @@ public class AddImpl extends ExpressionImpl implements Add * * @generated */ + @Override public void setRight(Expression newRight) { if (newRight != right) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/regionaccesstestlanguage/impl/AssignedActionImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/regionaccesstestlanguage/impl/AssignedActionImpl.java index a63af93e5..94feb2297 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/regionaccesstestlanguage/impl/AssignedActionImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/regionaccesstestlanguage/impl/AssignedActionImpl.java @@ -77,6 +77,7 @@ public class AssignedActionImpl extends MixedImpl implements AssignedAction * * @generated */ + @Override public Mixed getChild() { return child; @@ -104,6 +105,7 @@ public class AssignedActionImpl extends MixedImpl implements AssignedAction * * @generated */ + @Override public void setChild(Mixed newChild) { if (newChild != child) @@ -125,6 +127,7 @@ public class AssignedActionImpl extends MixedImpl implements AssignedAction * * @generated */ + @Override public Mixed getBody() { return body; @@ -152,6 +155,7 @@ public class AssignedActionImpl extends MixedImpl implements AssignedAction * * @generated */ + @Override public void setBody(Mixed newBody) { if (newBody != body) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/regionaccesstestlanguage/impl/DelegateImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/regionaccesstestlanguage/impl/DelegateImpl.java index 4fa26a200..98ce5ff45 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/regionaccesstestlanguage/impl/DelegateImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/regionaccesstestlanguage/impl/DelegateImpl.java @@ -73,6 +73,7 @@ public class DelegateImpl extends UnassignedImpl implements Delegate * * @generated */ + @Override public String getName() { return name; @@ -83,6 +84,7 @@ public class DelegateImpl extends UnassignedImpl implements Delegate * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -167,7 +169,7 @@ public class DelegateImpl extends UnassignedImpl implements Delegate { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/regionaccesstestlanguage/impl/DelegationImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/regionaccesstestlanguage/impl/DelegationImpl.java index 57de07b92..2c6f098e2 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/regionaccesstestlanguage/impl/DelegationImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/regionaccesstestlanguage/impl/DelegationImpl.java @@ -66,6 +66,7 @@ public class DelegationImpl extends RootImpl implements Delegation * * @generated */ + @Override public Delegate getDelegate() { return delegate; @@ -93,6 +94,7 @@ public class DelegationImpl extends RootImpl implements Delegation * * @generated */ + @Override public void setDelegate(Delegate newDelegate) { if (newDelegate != delegate) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/regionaccesstestlanguage/impl/MixedImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/regionaccesstestlanguage/impl/MixedImpl.java index b4c15e612..26e318433 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/regionaccesstestlanguage/impl/MixedImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/regionaccesstestlanguage/impl/MixedImpl.java @@ -160,6 +160,7 @@ public class MixedImpl extends RootImpl implements Mixed * * @generated */ + @Override public String getName() { return name; @@ -170,6 +171,7 @@ public class MixedImpl extends RootImpl implements Mixed * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -183,6 +185,7 @@ public class MixedImpl extends RootImpl implements Mixed * * @generated */ + @Override public Mixed getEobj() { return eobj; @@ -210,6 +213,7 @@ public class MixedImpl extends RootImpl implements Mixed * * @generated */ + @Override public void setEobj(Mixed newEobj) { if (newEobj != eobj) @@ -231,6 +235,7 @@ public class MixedImpl extends RootImpl implements Mixed * * @generated */ + @Override public String getDatatype() { return datatype; @@ -241,6 +246,7 @@ public class MixedImpl extends RootImpl implements Mixed * * @generated */ + @Override public void setDatatype(String newDatatype) { String oldDatatype = datatype; @@ -254,6 +260,7 @@ public class MixedImpl extends RootImpl implements Mixed * * @generated */ + @Override public Mixed getRef() { if (ref != null && ref.eIsProxy()) @@ -284,6 +291,7 @@ public class MixedImpl extends RootImpl implements Mixed * * @generated */ + @Override public void setRef(Mixed newRef) { Mixed oldRef = ref; @@ -297,6 +305,7 @@ public class MixedImpl extends RootImpl implements Mixed * * @generated */ + @Override public org.eclipse.xtext.formatting2.regionaccess.internal.regionaccesstestlanguage.Enum getLit() { return lit; @@ -307,6 +316,7 @@ public class MixedImpl extends RootImpl implements Mixed * * @generated */ + @Override public void setLit(org.eclipse.xtext.formatting2.regionaccess.internal.regionaccesstestlanguage.Enum newLit) { org.eclipse.xtext.formatting2.regionaccess.internal.regionaccesstestlanguage.Enum oldLit = lit; @@ -320,6 +330,7 @@ public class MixedImpl extends RootImpl implements Mixed * * @generated */ + @Override public String getFragName() { return fragName; @@ -330,6 +341,7 @@ public class MixedImpl extends RootImpl implements Mixed * * @generated */ + @Override public void setFragName(String newFragName) { String oldFragName = fragName; @@ -481,7 +493,7 @@ public class MixedImpl extends RootImpl implements Mixed { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(", datatype: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/regionaccesstestlanguage/impl/NamedImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/regionaccesstestlanguage/impl/NamedImpl.java index d4965775d..db6d0d608 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/regionaccesstestlanguage/impl/NamedImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/regionaccesstestlanguage/impl/NamedImpl.java @@ -73,6 +73,7 @@ public class NamedImpl extends ExpressionImpl implements Named * * @generated */ + @Override public String getName() { return name; @@ -83,6 +84,7 @@ public class NamedImpl extends ExpressionImpl implements Named * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -167,7 +169,7 @@ public class NamedImpl extends ExpressionImpl implements Named { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/regionaccesstestlanguage/impl/PrefixedUnassignedImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/regionaccesstestlanguage/impl/PrefixedUnassignedImpl.java index 5c0f57ed6..0beedad67 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/regionaccesstestlanguage/impl/PrefixedUnassignedImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/regionaccesstestlanguage/impl/PrefixedUnassignedImpl.java @@ -66,6 +66,7 @@ public class PrefixedUnassignedImpl extends RootImpl implements PrefixedUnassign * * @generated */ + @Override public PrefixedDelegate getDelegate() { return delegate; @@ -93,6 +94,7 @@ public class PrefixedUnassignedImpl extends RootImpl implements PrefixedUnassign * * @generated */ + @Override public void setDelegate(PrefixedDelegate newDelegate) { if (newDelegate != delegate) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/regionaccesstestlanguage/impl/RegionaccesstestlanguageFactoryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/regionaccesstestlanguage/impl/RegionaccesstestlanguageFactoryImpl.java index fffd42023..21b214dcf 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/regionaccesstestlanguage/impl/RegionaccesstestlanguageFactoryImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/regionaccesstestlanguage/impl/RegionaccesstestlanguageFactoryImpl.java @@ -141,6 +141,7 @@ public class RegionaccesstestlanguageFactoryImpl extends EFactoryImpl implements * * @generated */ + @Override public Root createRoot() { RootImpl root = new RootImpl(); @@ -152,6 +153,7 @@ public class RegionaccesstestlanguageFactoryImpl extends EFactoryImpl implements * * @generated */ + @Override public Simple createSimple() { SimpleImpl simple = new SimpleImpl(); @@ -163,6 +165,7 @@ public class RegionaccesstestlanguageFactoryImpl extends EFactoryImpl implements * * @generated */ + @Override public Delegation createDelegation() { DelegationImpl delegation = new DelegationImpl(); @@ -174,6 +177,7 @@ public class RegionaccesstestlanguageFactoryImpl extends EFactoryImpl implements * * @generated */ + @Override public Unassigned createUnassigned() { UnassignedImpl unassigned = new UnassignedImpl(); @@ -185,6 +189,7 @@ public class RegionaccesstestlanguageFactoryImpl extends EFactoryImpl implements * * @generated */ + @Override public PrefixedUnassigned createPrefixedUnassigned() { PrefixedUnassignedImpl prefixedUnassigned = new PrefixedUnassignedImpl(); @@ -196,6 +201,7 @@ public class RegionaccesstestlanguageFactoryImpl extends EFactoryImpl implements * * @generated */ + @Override public PrefixedDelegate createPrefixedDelegate() { PrefixedDelegateImpl prefixedDelegate = new PrefixedDelegateImpl(); @@ -207,6 +213,7 @@ public class RegionaccesstestlanguageFactoryImpl extends EFactoryImpl implements * * @generated */ + @Override public Delegate createDelegate() { DelegateImpl delegate = new DelegateImpl(); @@ -218,6 +225,7 @@ public class RegionaccesstestlanguageFactoryImpl extends EFactoryImpl implements * * @generated */ + @Override public Expression createExpression() { ExpressionImpl expression = new ExpressionImpl(); @@ -229,6 +237,7 @@ public class RegionaccesstestlanguageFactoryImpl extends EFactoryImpl implements * * @generated */ + @Override public Mixed createMixed() { MixedImpl mixed = new MixedImpl(); @@ -240,6 +249,7 @@ public class RegionaccesstestlanguageFactoryImpl extends EFactoryImpl implements * * @generated */ + @Override public ValueList createValueList() { ValueListImpl valueList = new ValueListImpl(); @@ -251,6 +261,7 @@ public class RegionaccesstestlanguageFactoryImpl extends EFactoryImpl implements * * @generated */ + @Override public RootAction createRootAction() { RootActionImpl rootAction = new RootActionImpl(); @@ -262,6 +273,7 @@ public class RegionaccesstestlanguageFactoryImpl extends EFactoryImpl implements * * @generated */ + @Override public Add createAdd() { AddImpl add = new AddImpl(); @@ -273,6 +285,7 @@ public class RegionaccesstestlanguageFactoryImpl extends EFactoryImpl implements * * @generated */ + @Override public Named createNamed() { NamedImpl named = new NamedImpl(); @@ -284,6 +297,7 @@ public class RegionaccesstestlanguageFactoryImpl extends EFactoryImpl implements * * @generated */ + @Override public Action createAction() { ActionImpl action = new ActionImpl(); @@ -295,6 +309,7 @@ public class RegionaccesstestlanguageFactoryImpl extends EFactoryImpl implements * * @generated */ + @Override public AssignedAction createAssignedAction() { AssignedActionImpl assignedAction = new AssignedActionImpl(); @@ -328,6 +343,7 @@ public class RegionaccesstestlanguageFactoryImpl extends EFactoryImpl implements * * @generated */ + @Override public RegionaccesstestlanguagePackage getRegionaccesstestlanguagePackage() { return (RegionaccesstestlanguagePackage)getEPackage(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/regionaccesstestlanguage/impl/RegionaccesstestlanguagePackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/regionaccesstestlanguage/impl/RegionaccesstestlanguagePackageImpl.java index 307c60ef7..fd9d0c11d 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/regionaccesstestlanguage/impl/RegionaccesstestlanguagePackageImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/regionaccesstestlanguage/impl/RegionaccesstestlanguagePackageImpl.java @@ -179,7 +179,7 @@ public class RegionaccesstestlanguagePackageImpl extends EPackageImpl implements /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link RegionaccesstestlanguagePackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -194,7 +194,8 @@ public class RegionaccesstestlanguagePackageImpl extends EPackageImpl implements if (isInited) return (RegionaccesstestlanguagePackage)EPackage.Registry.INSTANCE.getEPackage(RegionaccesstestlanguagePackage.eNS_URI); // Obtain or create and register package - RegionaccesstestlanguagePackageImpl theRegionaccesstestlanguagePackage = (RegionaccesstestlanguagePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof RegionaccesstestlanguagePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new RegionaccesstestlanguagePackageImpl()); + Object registeredRegionaccesstestlanguagePackage = EPackage.Registry.INSTANCE.get(eNS_URI); + RegionaccesstestlanguagePackageImpl theRegionaccesstestlanguagePackage = registeredRegionaccesstestlanguagePackage instanceof RegionaccesstestlanguagePackageImpl ? (RegionaccesstestlanguagePackageImpl)registeredRegionaccesstestlanguagePackage : new RegionaccesstestlanguagePackageImpl(); isInited = true; @@ -210,7 +211,6 @@ public class RegionaccesstestlanguagePackageImpl extends EPackageImpl implements // Mark meta-data to indicate it can't be changed theRegionaccesstestlanguagePackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(RegionaccesstestlanguagePackage.eNS_URI, theRegionaccesstestlanguagePackage); return theRegionaccesstestlanguagePackage; @@ -221,6 +221,7 @@ public class RegionaccesstestlanguagePackageImpl extends EPackageImpl implements * * @generated */ + @Override public EClass getRoot() { return rootEClass; @@ -231,6 +232,7 @@ public class RegionaccesstestlanguagePackageImpl extends EPackageImpl implements * * @generated */ + @Override public EReference getRoot_Mixed() { return (EReference)rootEClass.getEStructuralFeatures().get(0); @@ -241,6 +243,7 @@ public class RegionaccesstestlanguagePackageImpl extends EPackageImpl implements * * @generated */ + @Override public EClass getSimple() { return simpleEClass; @@ -251,6 +254,7 @@ public class RegionaccesstestlanguagePackageImpl extends EPackageImpl implements * * @generated */ + @Override public EAttribute getSimple_Name() { return (EAttribute)simpleEClass.getEStructuralFeatures().get(0); @@ -261,6 +265,7 @@ public class RegionaccesstestlanguagePackageImpl extends EPackageImpl implements * * @generated */ + @Override public EClass getDelegation() { return delegationEClass; @@ -271,6 +276,7 @@ public class RegionaccesstestlanguagePackageImpl extends EPackageImpl implements * * @generated */ + @Override public EReference getDelegation_Delegate() { return (EReference)delegationEClass.getEStructuralFeatures().get(0); @@ -281,6 +287,7 @@ public class RegionaccesstestlanguagePackageImpl extends EPackageImpl implements * * @generated */ + @Override public EClass getUnassigned() { return unassignedEClass; @@ -291,6 +298,7 @@ public class RegionaccesstestlanguagePackageImpl extends EPackageImpl implements * * @generated */ + @Override public EClass getPrefixedUnassigned() { return prefixedUnassignedEClass; @@ -301,6 +309,7 @@ public class RegionaccesstestlanguagePackageImpl extends EPackageImpl implements * * @generated */ + @Override public EReference getPrefixedUnassigned_Delegate() { return (EReference)prefixedUnassignedEClass.getEStructuralFeatures().get(0); @@ -311,6 +320,7 @@ public class RegionaccesstestlanguagePackageImpl extends EPackageImpl implements * * @generated */ + @Override public EClass getPrefixedDelegate() { return prefixedDelegateEClass; @@ -321,6 +331,7 @@ public class RegionaccesstestlanguagePackageImpl extends EPackageImpl implements * * @generated */ + @Override public EClass getDelegate() { return delegateEClass; @@ -331,6 +342,7 @@ public class RegionaccesstestlanguagePackageImpl extends EPackageImpl implements * * @generated */ + @Override public EAttribute getDelegate_Name() { return (EAttribute)delegateEClass.getEStructuralFeatures().get(0); @@ -341,6 +353,7 @@ public class RegionaccesstestlanguagePackageImpl extends EPackageImpl implements * * @generated */ + @Override public EClass getExpression() { return expressionEClass; @@ -351,6 +364,7 @@ public class RegionaccesstestlanguagePackageImpl extends EPackageImpl implements * * @generated */ + @Override public EClass getMixed() { return mixedEClass; @@ -361,6 +375,7 @@ public class RegionaccesstestlanguagePackageImpl extends EPackageImpl implements * * @generated */ + @Override public EAttribute getMixed_Name() { return (EAttribute)mixedEClass.getEStructuralFeatures().get(0); @@ -371,6 +386,7 @@ public class RegionaccesstestlanguagePackageImpl extends EPackageImpl implements * * @generated */ + @Override public EReference getMixed_Eobj() { return (EReference)mixedEClass.getEStructuralFeatures().get(1); @@ -381,6 +397,7 @@ public class RegionaccesstestlanguagePackageImpl extends EPackageImpl implements * * @generated */ + @Override public EAttribute getMixed_Datatype() { return (EAttribute)mixedEClass.getEStructuralFeatures().get(2); @@ -391,6 +408,7 @@ public class RegionaccesstestlanguagePackageImpl extends EPackageImpl implements * * @generated */ + @Override public EReference getMixed_Ref() { return (EReference)mixedEClass.getEStructuralFeatures().get(3); @@ -401,6 +419,7 @@ public class RegionaccesstestlanguagePackageImpl extends EPackageImpl implements * * @generated */ + @Override public EAttribute getMixed_Lit() { return (EAttribute)mixedEClass.getEStructuralFeatures().get(4); @@ -411,6 +430,7 @@ public class RegionaccesstestlanguagePackageImpl extends EPackageImpl implements * * @generated */ + @Override public EAttribute getMixed_FragName() { return (EAttribute)mixedEClass.getEStructuralFeatures().get(5); @@ -421,6 +441,7 @@ public class RegionaccesstestlanguagePackageImpl extends EPackageImpl implements * * @generated */ + @Override public EClass getValueList() { return valueListEClass; @@ -431,6 +452,7 @@ public class RegionaccesstestlanguagePackageImpl extends EPackageImpl implements * * @generated */ + @Override public EAttribute getValueList_Name() { return (EAttribute)valueListEClass.getEStructuralFeatures().get(0); @@ -441,6 +463,7 @@ public class RegionaccesstestlanguagePackageImpl extends EPackageImpl implements * * @generated */ + @Override public EClass getRootAction() { return rootActionEClass; @@ -451,6 +474,7 @@ public class RegionaccesstestlanguagePackageImpl extends EPackageImpl implements * * @generated */ + @Override public EClass getAdd() { return addEClass; @@ -461,6 +485,7 @@ public class RegionaccesstestlanguagePackageImpl extends EPackageImpl implements * * @generated */ + @Override public EReference getAdd_Left() { return (EReference)addEClass.getEStructuralFeatures().get(0); @@ -471,6 +496,7 @@ public class RegionaccesstestlanguagePackageImpl extends EPackageImpl implements * * @generated */ + @Override public EReference getAdd_Right() { return (EReference)addEClass.getEStructuralFeatures().get(1); @@ -481,6 +507,7 @@ public class RegionaccesstestlanguagePackageImpl extends EPackageImpl implements * * @generated */ + @Override public EClass getNamed() { return namedEClass; @@ -491,6 +518,7 @@ public class RegionaccesstestlanguagePackageImpl extends EPackageImpl implements * * @generated */ + @Override public EAttribute getNamed_Name() { return (EAttribute)namedEClass.getEStructuralFeatures().get(0); @@ -501,6 +529,7 @@ public class RegionaccesstestlanguagePackageImpl extends EPackageImpl implements * * @generated */ + @Override public EClass getAction() { return actionEClass; @@ -511,6 +540,7 @@ public class RegionaccesstestlanguagePackageImpl extends EPackageImpl implements * * @generated */ + @Override public EClass getAssignedAction() { return assignedActionEClass; @@ -521,6 +551,7 @@ public class RegionaccesstestlanguagePackageImpl extends EPackageImpl implements * * @generated */ + @Override public EReference getAssignedAction_Child() { return (EReference)assignedActionEClass.getEStructuralFeatures().get(0); @@ -531,6 +562,7 @@ public class RegionaccesstestlanguagePackageImpl extends EPackageImpl implements * * @generated */ + @Override public EReference getAssignedAction_Body() { return (EReference)assignedActionEClass.getEStructuralFeatures().get(1); @@ -541,6 +573,7 @@ public class RegionaccesstestlanguagePackageImpl extends EPackageImpl implements * * @generated */ + @Override public EEnum getEnum() { return enumEEnum; @@ -551,6 +584,7 @@ public class RegionaccesstestlanguagePackageImpl extends EPackageImpl implements * * @generated */ + @Override public RegionaccesstestlanguageFactory getRegionaccesstestlanguageFactory() { return (RegionaccesstestlanguageFactory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/regionaccesstestlanguage/impl/RootImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/regionaccesstestlanguage/impl/RootImpl.java index d3c6b630b..4f277f0ac 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/regionaccesstestlanguage/impl/RootImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/regionaccesstestlanguage/impl/RootImpl.java @@ -67,6 +67,7 @@ public class RootImpl extends MinimalEObjectImpl.Container implements Root * * @generated */ + @Override public Mixed getMixed() { return mixed; @@ -94,6 +95,7 @@ public class RootImpl extends MinimalEObjectImpl.Container implements Root * * @generated */ + @Override public void setMixed(Mixed newMixed) { if (newMixed != mixed) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/regionaccesstestlanguage/impl/SimpleImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/regionaccesstestlanguage/impl/SimpleImpl.java index 70906474e..edb035f78 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/regionaccesstestlanguage/impl/SimpleImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/regionaccesstestlanguage/impl/SimpleImpl.java @@ -73,6 +73,7 @@ public class SimpleImpl extends RootImpl implements Simple * * @generated */ + @Override public String getName() { return name; @@ -83,6 +84,7 @@ public class SimpleImpl extends RootImpl implements Simple * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -167,7 +169,7 @@ public class SimpleImpl extends RootImpl implements Simple { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/regionaccesstestlanguage/impl/ValueListImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/regionaccesstestlanguage/impl/ValueListImpl.java index 6e776ee3f..6edba0fcf 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/regionaccesstestlanguage/impl/ValueListImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/regionaccesstestlanguage/impl/ValueListImpl.java @@ -65,6 +65,7 @@ public class ValueListImpl extends RootImpl implements ValueList * * @generated */ + @Override public EList getName() { if (name == null) @@ -152,7 +153,7 @@ public class ValueListImpl extends RootImpl implements ValueList { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/SubTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/SubTestLanguage.genmodel index 986295bb5..d606ba86d 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/SubTestLanguage.genmodel +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/SubTestLanguage.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="SubTestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="SuperTestLanguage.genmodel#//superPackage"> + complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20" usedGenPackages="SuperTestLanguage.genmodel#//superPackage"> diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/SuperTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/SuperTestLanguage.genmodel index a2ef5baf3..d74c35f98 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/SuperTestLanguage.genmodel +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/SuperTestLanguage.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="SuperTestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> + complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/genmodelaccess/nestedPackage1/impl/NestedPackage1FactoryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/genmodelaccess/nestedPackage1/impl/NestedPackage1FactoryImpl.java index 8a322e505..2f0b2eae5 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/genmodelaccess/nestedPackage1/impl/NestedPackage1FactoryImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/genmodelaccess/nestedPackage1/impl/NestedPackage1FactoryImpl.java @@ -75,6 +75,7 @@ public class NestedPackage1FactoryImpl extends EFactoryImpl implements NestedPac * * @generated */ + @Override public NestedClass1 createNestedClass1() { NestedClass1Impl nestedClass1 = new NestedClass1Impl(); @@ -86,6 +87,7 @@ public class NestedPackage1FactoryImpl extends EFactoryImpl implements NestedPac * * @generated */ + @Override public NestedPackage1Package getNestedPackage1Package() { return (NestedPackage1Package)getEPackage(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/genmodelaccess/nestedPackage1/impl/NestedPackage1PackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/genmodelaccess/nestedPackage1/impl/NestedPackage1PackageImpl.java index ff34afb71..ac6f90070 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/genmodelaccess/nestedPackage1/impl/NestedPackage1PackageImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/genmodelaccess/nestedPackage1/impl/NestedPackage1PackageImpl.java @@ -63,7 +63,7 @@ public class NestedPackage1PackageImpl extends EPackageImpl implements NestedPac /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link NestedPackage1Package#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -78,13 +78,16 @@ public class NestedPackage1PackageImpl extends EPackageImpl implements NestedPac if (isInited) return (NestedPackage1Package)EPackage.Registry.INSTANCE.getEPackage(NestedPackage1Package.eNS_URI); // Obtain or create and register package - NestedPackage1PackageImpl theNestedPackage1Package = (NestedPackage1PackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof NestedPackage1PackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new NestedPackage1PackageImpl()); + Object registeredNestedPackage1Package = EPackage.Registry.INSTANCE.get(eNS_URI); + NestedPackage1PackageImpl theNestedPackage1Package = registeredNestedPackage1Package instanceof NestedPackage1PackageImpl ? (NestedPackage1PackageImpl)registeredNestedPackage1Package : new NestedPackage1PackageImpl(); isInited = true; // Obtain or create and register interdependencies - RootPackageImpl theRootPackage = (RootPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(RootPackage.eNS_URI) instanceof RootPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(RootPackage.eNS_URI) : RootPackage.eINSTANCE); - NoLiteralsPackageImpl theNoLiteralsPackage = (NoLiteralsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NoLiteralsPackage.eNS_URI) instanceof NoLiteralsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NoLiteralsPackage.eNS_URI) : NoLiteralsPackage.eINSTANCE); + Object registeredPackage = EPackage.Registry.INSTANCE.getEPackage(RootPackage.eNS_URI); + RootPackageImpl theRootPackage = (RootPackageImpl)(registeredPackage instanceof RootPackageImpl ? registeredPackage : RootPackage.eINSTANCE); + registeredPackage = EPackage.Registry.INSTANCE.getEPackage(NoLiteralsPackage.eNS_URI); + NoLiteralsPackageImpl theNoLiteralsPackage = (NoLiteralsPackageImpl)(registeredPackage instanceof NoLiteralsPackageImpl ? registeredPackage : NoLiteralsPackage.eINSTANCE); // Create package meta-data objects theNestedPackage1Package.createPackageContents(); @@ -99,7 +102,6 @@ public class NestedPackage1PackageImpl extends EPackageImpl implements NestedPac // Mark meta-data to indicate it can't be changed theNestedPackage1Package.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(NestedPackage1Package.eNS_URI, theNestedPackage1Package); return theNestedPackage1Package; @@ -110,6 +112,7 @@ public class NestedPackage1PackageImpl extends EPackageImpl implements NestedPac * * @generated */ + @Override public EClass getNestedClass1() { return nestedClass1EClass; @@ -120,6 +123,7 @@ public class NestedPackage1PackageImpl extends EPackageImpl implements NestedPac * * @generated */ + @Override public NestedPackage1Factory getNestedPackage1Factory() { return (NestedPackage1Factory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/genmodelaccess/nestedPackage1/util/NestedPackage1Switch.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/genmodelaccess/nestedPackage1/util/NestedPackage1Switch.java index 344f4e344..d3403708e 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/genmodelaccess/nestedPackage1/util/NestedPackage1Switch.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/genmodelaccess/nestedPackage1/util/NestedPackage1Switch.java @@ -2,10 +2,10 @@ */ package org.eclipse.xtext.generator.ecore.genmodelaccess.nestedPackage1.util; -import java.util.List; - -import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.EPackage; + +import org.eclipse.emf.ecore.util.Switch; import org.eclipse.xtext.generator.ecore.genmodelaccess.nestedPackage1.*; @@ -22,7 +22,7 @@ import org.eclipse.xtext.generator.ecore.genmodelaccess.nestedPackage1.*; * @see org.eclipse.xtext.generator.ecore.genmodelaccess.nestedPackage1.NestedPackage1Package * @generated */ -public class NestedPackage1Switch +public class NestedPackage1Switch extends Switch { /** * The cached model package @@ -47,38 +47,17 @@ public class NestedPackage1Switch } /** - * Calls caseXXX for each class of the model until one returns a non null result; it yields that result. + * Checks whether this is a switch for the given package. * * - * @return the first non-null result returned by a caseXXX call. + * @param ePackage the package in question. + * @return whether this is a switch for the given package. * @generated */ - public T doSwitch(EObject theEObject) + @Override + protected boolean isSwitchFor(EPackage ePackage) { - return doSwitch(theEObject.eClass(), theEObject); - } - - /** - * 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 - */ - protected T doSwitch(EClass theEClass, EObject theEObject) - { - if (theEClass.eContainer() == modelPackage) - { - return doSwitch(theEClass.getClassifierID(), theEObject); - } - else - { - List eSuperTypes = theEClass.getESuperTypes(); - return - eSuperTypes.isEmpty() ? - defaultCase(theEObject) : - doSwitch(eSuperTypes.get(0), theEObject); - } + return ePackage == modelPackage; } /** @@ -88,6 +67,7 @@ public class NestedPackage1Switch * @return the first non-null result returned by a caseXXX call. * @generated */ + @Override protected T doSwitch(int classifierID, EObject theEObject) { switch (classifierID) @@ -130,6 +110,7 @@ public class NestedPackage1Switch * @see #doSwitch(org.eclipse.emf.ecore.EObject) * @generated */ + @Override public T defaultCase(EObject object) { return null; diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/genmodelaccess/noLiterals/NoLitClass.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/genmodelaccess/noLiterals/NoLitClass.java index d49a3ecb2..334a2a521 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/genmodelaccess/noLiterals/NoLitClass.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/genmodelaccess/noLiterals/NoLitClass.java @@ -28,10 +28,6 @@ public interface NoLitClass extends EObject /** * Returns the value of the 'Attribute2' attribute. * - *

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

* * @return the value of the 'Attribute2' attribute. * @see #setAttribute2(String) @@ -54,10 +50,6 @@ public interface NoLitClass extends EObject /** * Returns the value of the 'Reference2' reference. * - *

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

* * @return the value of the 'Reference2' reference. * @see #setReference2(NestedClass1) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/genmodelaccess/noLiterals/NoLitEnum.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/genmodelaccess/noLiterals/NoLitEnum.java index 2ab68971c..ad1fd4f94 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/genmodelaccess/noLiterals/NoLitEnum.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/genmodelaccess/noLiterals/NoLitEnum.java @@ -32,10 +32,6 @@ public enum NoLitEnum implements Enumerator /** * The 'Literal' literal value. * - *

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

* * @see #LITERAL * @model name="literal" @@ -162,6 +158,7 @@ public enum NoLitEnum implements Enumerator * * @generated */ + @Override public int getValue() { return value; @@ -172,6 +169,7 @@ public enum NoLitEnum implements Enumerator * * @generated */ + @Override public String getName() { return name; @@ -182,6 +180,7 @@ public enum NoLitEnum implements Enumerator * * @generated */ + @Override public String getLiteral() { return literal; diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/genmodelaccess/noLiterals/impl/NoLitClassImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/genmodelaccess/noLiterals/impl/NoLitClassImpl.java index 72ab59628..baded3990 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/genmodelaccess/noLiterals/impl/NoLitClassImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/genmodelaccess/noLiterals/impl/NoLitClassImpl.java @@ -87,6 +87,7 @@ public class NoLitClassImpl extends EObjectImpl implements NoLitClass * * @generated */ + @Override public String getAttribute2() { return attribute2; @@ -97,6 +98,7 @@ public class NoLitClassImpl extends EObjectImpl implements NoLitClass * * @generated */ + @Override public void setAttribute2(String newAttribute2) { String oldAttribute2 = attribute2; @@ -110,6 +112,7 @@ public class NoLitClassImpl extends EObjectImpl implements NoLitClass * * @generated */ + @Override public NestedClass1 getReference2() { if (reference2 != null && reference2.eIsProxy()) @@ -140,6 +143,7 @@ public class NoLitClassImpl extends EObjectImpl implements NoLitClass * * @generated */ + @Override public void setReference2(NestedClass1 newReference2) { NestedClass1 oldReference2 = reference2; @@ -235,7 +239,7 @@ public class NoLitClassImpl extends EObjectImpl implements NoLitClass { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (attribute2: "); result.append(attribute2); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/genmodelaccess/noLiterals/impl/NoLiteralsFactoryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/genmodelaccess/noLiterals/impl/NoLiteralsFactoryImpl.java index 0e80fe313..89f33dae9 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/genmodelaccess/noLiterals/impl/NoLiteralsFactoryImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/genmodelaccess/noLiterals/impl/NoLiteralsFactoryImpl.java @@ -114,6 +114,7 @@ public class NoLiteralsFactoryImpl extends EFactoryImpl implements NoLiteralsFac * * @generated */ + @Override public NoLitClass createNoLitClass() { NoLitClassImpl noLitClass = new NoLitClassImpl(); @@ -167,6 +168,7 @@ public class NoLiteralsFactoryImpl extends EFactoryImpl implements NoLiteralsFac * * @generated */ + @Override public NoLiteralsPackage getNoLiteralsPackage() { return (NoLiteralsPackage)getEPackage(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/genmodelaccess/noLiterals/impl/NoLiteralsPackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/genmodelaccess/noLiterals/impl/NoLiteralsPackageImpl.java index 981b75030..ba91be6be 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/genmodelaccess/noLiterals/impl/NoLiteralsPackageImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/genmodelaccess/noLiterals/impl/NoLiteralsPackageImpl.java @@ -82,7 +82,7 @@ public class NoLiteralsPackageImpl extends EPackageImpl implements NoLiteralsPac /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link NoLiteralsPackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -97,13 +97,16 @@ public class NoLiteralsPackageImpl extends EPackageImpl implements NoLiteralsPac if (isInited) return (NoLiteralsPackage)EPackage.Registry.INSTANCE.getEPackage(NoLiteralsPackage.eNS_URI); // Obtain or create and register package - NoLiteralsPackageImpl theNoLiteralsPackage = (NoLiteralsPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof NoLiteralsPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new NoLiteralsPackageImpl()); + Object registeredNoLiteralsPackage = EPackage.Registry.INSTANCE.get(eNS_URI); + NoLiteralsPackageImpl theNoLiteralsPackage = registeredNoLiteralsPackage instanceof NoLiteralsPackageImpl ? (NoLiteralsPackageImpl)registeredNoLiteralsPackage : new NoLiteralsPackageImpl(); isInited = true; // Obtain or create and register interdependencies - RootPackageImpl theRootPackage = (RootPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(RootPackage.eNS_URI) instanceof RootPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(RootPackage.eNS_URI) : RootPackage.eINSTANCE); - NestedPackage1PackageImpl theNestedPackage1Package = (NestedPackage1PackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NestedPackage1Package.eNS_URI) instanceof NestedPackage1PackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NestedPackage1Package.eNS_URI) : NestedPackage1Package.eINSTANCE); + Object registeredPackage = EPackage.Registry.INSTANCE.getEPackage(RootPackage.eNS_URI); + RootPackageImpl theRootPackage = (RootPackageImpl)(registeredPackage instanceof RootPackageImpl ? registeredPackage : RootPackage.eINSTANCE); + registeredPackage = EPackage.Registry.INSTANCE.getEPackage(NestedPackage1Package.eNS_URI); + NestedPackage1PackageImpl theNestedPackage1Package = (NestedPackage1PackageImpl)(registeredPackage instanceof NestedPackage1PackageImpl ? registeredPackage : NestedPackage1Package.eINSTANCE); // Create package meta-data objects theNoLiteralsPackage.createPackageContents(); @@ -118,7 +121,6 @@ public class NoLiteralsPackageImpl extends EPackageImpl implements NoLiteralsPac // Mark meta-data to indicate it can't be changed theNoLiteralsPackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(NoLiteralsPackage.eNS_URI, theNoLiteralsPackage); return theNoLiteralsPackage; @@ -129,6 +131,7 @@ public class NoLiteralsPackageImpl extends EPackageImpl implements NoLiteralsPac * * @generated */ + @Override public EClass getNoLitClass() { return noLitClassEClass; @@ -139,6 +142,7 @@ public class NoLiteralsPackageImpl extends EPackageImpl implements NoLiteralsPac * * @generated */ + @Override public EAttribute getNoLitClass_Attribute2() { return (EAttribute)noLitClassEClass.getEStructuralFeatures().get(0); @@ -149,6 +153,7 @@ public class NoLiteralsPackageImpl extends EPackageImpl implements NoLiteralsPac * * @generated */ + @Override public EReference getNoLitClass_Reference2() { return (EReference)noLitClassEClass.getEStructuralFeatures().get(1); @@ -159,6 +164,7 @@ public class NoLiteralsPackageImpl extends EPackageImpl implements NoLiteralsPac * * @generated */ + @Override public EEnum getNoLitEnum() { return noLitEnumEEnum; @@ -169,6 +175,7 @@ public class NoLiteralsPackageImpl extends EPackageImpl implements NoLiteralsPac * * @generated */ + @Override public EDataType getNoLitDataType() { return noLitDataTypeEDataType; @@ -179,6 +186,7 @@ public class NoLiteralsPackageImpl extends EPackageImpl implements NoLiteralsPac * * @generated */ + @Override public NoLiteralsFactory getNoLiteralsFactory() { return (NoLiteralsFactory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/genmodelaccess/noLiterals/util/NoLiteralsSwitch.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/genmodelaccess/noLiterals/util/NoLiteralsSwitch.java index 129fe43fa..2a9cc3d9f 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/genmodelaccess/noLiterals/util/NoLiteralsSwitch.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/genmodelaccess/noLiterals/util/NoLiteralsSwitch.java @@ -2,10 +2,10 @@ */ package org.eclipse.xtext.generator.ecore.genmodelaccess.noLiterals.util; -import java.util.List; - -import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.EPackage; + +import org.eclipse.emf.ecore.util.Switch; import org.eclipse.xtext.generator.ecore.genmodelaccess.noLiterals.*; @@ -22,7 +22,7 @@ import org.eclipse.xtext.generator.ecore.genmodelaccess.noLiterals.*; * @see org.eclipse.xtext.generator.ecore.genmodelaccess.noLiterals.NoLiteralsPackage * @generated */ -public class NoLiteralsSwitch +public class NoLiteralsSwitch extends Switch { /** * The cached model package @@ -47,38 +47,17 @@ public class NoLiteralsSwitch } /** - * Calls caseXXX for each class of the model until one returns a non null result; it yields that result. + * Checks whether this is a switch for the given package. * * - * @return the first non-null result returned by a caseXXX call. + * @param ePackage the package in question. + * @return whether this is a switch for the given package. * @generated */ - public T doSwitch(EObject theEObject) + @Override + protected boolean isSwitchFor(EPackage ePackage) { - return doSwitch(theEObject.eClass(), theEObject); - } - - /** - * 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 - */ - protected T doSwitch(EClass theEClass, EObject theEObject) - { - if (theEClass.eContainer() == modelPackage) - { - return doSwitch(theEClass.getClassifierID(), theEObject); - } - else - { - List eSuperTypes = theEClass.getESuperTypes(); - return - eSuperTypes.isEmpty() ? - defaultCase(theEObject) : - doSwitch(eSuperTypes.get(0), theEObject); - } + return ePackage == modelPackage; } /** @@ -88,6 +67,7 @@ public class NoLiteralsSwitch * @return the first non-null result returned by a caseXXX call. * @generated */ + @Override protected T doSwitch(int classifierID, EObject theEObject) { switch (classifierID) @@ -130,6 +110,7 @@ public class NoLiteralsSwitch * @see #doSwitch(org.eclipse.emf.ecore.EObject) * @generated */ + @Override public T defaultCase(EObject object) { return null; diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/genmodelaccess/root/RootClass.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/genmodelaccess/root/RootClass.java index 1dfd2a7ae..2902b0f3b 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/genmodelaccess/root/RootClass.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/genmodelaccess/root/RootClass.java @@ -28,10 +28,6 @@ public interface RootClass extends EObject /** * Returns the value of the 'Attribute1' attribute. * - *

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

* * @return the value of the 'Attribute1' attribute. * @see #setAttribute1(String) @@ -54,10 +50,6 @@ public interface RootClass extends EObject /** * Returns the value of the 'Reference1' reference. * - *

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

* * @return the value of the 'Reference1' reference. * @see #setReference1(NestedClass1) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/genmodelaccess/root/RootEnum.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/genmodelaccess/root/RootEnum.java index 26257c4af..6065692aa 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/genmodelaccess/root/RootEnum.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/genmodelaccess/root/RootEnum.java @@ -32,10 +32,6 @@ public enum RootEnum implements Enumerator /** * The 'Literal' literal value. * - *

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

* * @see #LITERAL * @model name="literal" @@ -162,6 +158,7 @@ public enum RootEnum implements Enumerator * * @generated */ + @Override public int getValue() { return value; @@ -172,6 +169,7 @@ public enum RootEnum implements Enumerator * * @generated */ + @Override public String getName() { return name; @@ -182,6 +180,7 @@ public enum RootEnum implements Enumerator * * @generated */ + @Override public String getLiteral() { return literal; diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/genmodelaccess/root/impl/RootClassImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/genmodelaccess/root/impl/RootClassImpl.java index 72a7f6a6f..db1aa0a71 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/genmodelaccess/root/impl/RootClassImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/genmodelaccess/root/impl/RootClassImpl.java @@ -87,6 +87,7 @@ public class RootClassImpl extends EObjectImpl implements RootClass * * @generated */ + @Override public String getAttribute1() { return attribute1; @@ -97,6 +98,7 @@ public class RootClassImpl extends EObjectImpl implements RootClass * * @generated */ + @Override public void setAttribute1(String newAttribute1) { String oldAttribute1 = attribute1; @@ -110,6 +112,7 @@ public class RootClassImpl extends EObjectImpl implements RootClass * * @generated */ + @Override public NestedClass1 getReference1() { if (reference1 != null && reference1.eIsProxy()) @@ -140,6 +143,7 @@ public class RootClassImpl extends EObjectImpl implements RootClass * * @generated */ + @Override public void setReference1(NestedClass1 newReference1) { NestedClass1 oldReference1 = reference1; @@ -235,7 +239,7 @@ public class RootClassImpl extends EObjectImpl implements RootClass { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (attribute1: "); result.append(attribute1); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/genmodelaccess/root/impl/RootFactoryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/genmodelaccess/root/impl/RootFactoryImpl.java index dd9cced03..d9005d5fa 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/genmodelaccess/root/impl/RootFactoryImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/genmodelaccess/root/impl/RootFactoryImpl.java @@ -114,6 +114,7 @@ public class RootFactoryImpl extends EFactoryImpl implements RootFactory * * @generated */ + @Override public RootClass createRootClass() { RootClassImpl rootClass = new RootClassImpl(); @@ -167,6 +168,7 @@ public class RootFactoryImpl extends EFactoryImpl implements RootFactory * * @generated */ + @Override public RootPackage getRootPackage() { return (RootPackage)getEPackage(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/genmodelaccess/root/impl/RootPackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/genmodelaccess/root/impl/RootPackageImpl.java index ea935bb07..963424f35 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/genmodelaccess/root/impl/RootPackageImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/genmodelaccess/root/impl/RootPackageImpl.java @@ -82,7 +82,7 @@ public class RootPackageImpl extends EPackageImpl implements RootPackage /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link RootPackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -97,13 +97,16 @@ public class RootPackageImpl extends EPackageImpl implements RootPackage if (isInited) return (RootPackage)EPackage.Registry.INSTANCE.getEPackage(RootPackage.eNS_URI); // Obtain or create and register package - RootPackageImpl theRootPackage = (RootPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof RootPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new RootPackageImpl()); + Object registeredRootPackage = EPackage.Registry.INSTANCE.get(eNS_URI); + RootPackageImpl theRootPackage = registeredRootPackage instanceof RootPackageImpl ? (RootPackageImpl)registeredRootPackage : new RootPackageImpl(); isInited = true; // Obtain or create and register interdependencies - NestedPackage1PackageImpl theNestedPackage1Package = (NestedPackage1PackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NestedPackage1Package.eNS_URI) instanceof NestedPackage1PackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NestedPackage1Package.eNS_URI) : NestedPackage1Package.eINSTANCE); - NoLiteralsPackageImpl theNoLiteralsPackage = (NoLiteralsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(NoLiteralsPackage.eNS_URI) instanceof NoLiteralsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(NoLiteralsPackage.eNS_URI) : NoLiteralsPackage.eINSTANCE); + Object registeredPackage = EPackage.Registry.INSTANCE.getEPackage(NestedPackage1Package.eNS_URI); + NestedPackage1PackageImpl theNestedPackage1Package = (NestedPackage1PackageImpl)(registeredPackage instanceof NestedPackage1PackageImpl ? registeredPackage : NestedPackage1Package.eINSTANCE); + registeredPackage = EPackage.Registry.INSTANCE.getEPackage(NoLiteralsPackage.eNS_URI); + NoLiteralsPackageImpl theNoLiteralsPackage = (NoLiteralsPackageImpl)(registeredPackage instanceof NoLiteralsPackageImpl ? registeredPackage : NoLiteralsPackage.eINSTANCE); // Create package meta-data objects theRootPackage.createPackageContents(); @@ -118,7 +121,6 @@ public class RootPackageImpl extends EPackageImpl implements RootPackage // Mark meta-data to indicate it can't be changed theRootPackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(RootPackage.eNS_URI, theRootPackage); return theRootPackage; @@ -129,6 +131,7 @@ public class RootPackageImpl extends EPackageImpl implements RootPackage * * @generated */ + @Override public EClass getRootClass() { return rootClassEClass; @@ -139,6 +142,7 @@ public class RootPackageImpl extends EPackageImpl implements RootPackage * * @generated */ + @Override public EAttribute getRootClass_Attribute1() { return (EAttribute)rootClassEClass.getEStructuralFeatures().get(0); @@ -149,6 +153,7 @@ public class RootPackageImpl extends EPackageImpl implements RootPackage * * @generated */ + @Override public EReference getRootClass_Reference1() { return (EReference)rootClassEClass.getEStructuralFeatures().get(1); @@ -159,6 +164,7 @@ public class RootPackageImpl extends EPackageImpl implements RootPackage * * @generated */ + @Override public EEnum getRootEnum() { return rootEnumEEnum; @@ -169,6 +175,7 @@ public class RootPackageImpl extends EPackageImpl implements RootPackage * * @generated */ + @Override public EDataType getRootDataType() { return rootDataTypeEDataType; @@ -179,6 +186,7 @@ public class RootPackageImpl extends EPackageImpl implements RootPackage * * @generated */ + @Override public RootFactory getRootFactory() { return (RootFactory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/genmodelaccess/root/util/RootSwitch.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/genmodelaccess/root/util/RootSwitch.java index 8bc53bc72..5da86a029 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/genmodelaccess/root/util/RootSwitch.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/genmodelaccess/root/util/RootSwitch.java @@ -2,10 +2,10 @@ */ package org.eclipse.xtext.generator.ecore.genmodelaccess.root.util; -import java.util.List; - -import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.EPackage; + +import org.eclipse.emf.ecore.util.Switch; import org.eclipse.xtext.generator.ecore.genmodelaccess.root.*; @@ -22,7 +22,7 @@ import org.eclipse.xtext.generator.ecore.genmodelaccess.root.*; * @see org.eclipse.xtext.generator.ecore.genmodelaccess.root.RootPackage * @generated */ -public class RootSwitch +public class RootSwitch extends Switch { /** * The cached model package @@ -47,38 +47,17 @@ public class RootSwitch } /** - * Calls caseXXX for each class of the model until one returns a non null result; it yields that result. + * Checks whether this is a switch for the given package. * * - * @return the first non-null result returned by a caseXXX call. + * @param ePackage the package in question. + * @return whether this is a switch for the given package. * @generated */ - public T doSwitch(EObject theEObject) + @Override + protected boolean isSwitchFor(EPackage ePackage) { - return doSwitch(theEObject.eClass(), theEObject); - } - - /** - * 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 - */ - protected T doSwitch(EClass theEClass, EObject theEObject) - { - if (theEClass.eContainer() == modelPackage) - { - return doSwitch(theEClass.getClassifierID(), theEObject); - } - else - { - List eSuperTypes = theEClass.getESuperTypes(); - return - eSuperTypes.isEmpty() ? - defaultCase(theEObject) : - doSwitch(eSuperTypes.get(0), theEObject); - } + return ePackage == modelPackage; } /** @@ -88,6 +67,7 @@ public class RootSwitch * @return the first non-null result returned by a caseXXX call. * @generated */ + @Override protected T doSwitch(int classifierID, EObject theEObject) { switch (classifierID) @@ -130,6 +110,7 @@ public class RootSwitch * @see #doSwitch(org.eclipse.emf.ecore.EObject) * @generated */ + @Override public T defaultCase(EObject object) { return null; diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/subPackage/SubMain.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/subPackage/SubMain.java index 32102f559..3995c57da 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/subPackage/SubMain.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/subPackage/SubMain.java @@ -32,10 +32,6 @@ public interface SubMain extends EObject * Returns the value of the 'Super Mains' containment reference list. * The list contents are of type {@link org.eclipse.xtext.generator.ecore.superPackage.SuperMain}. * - *

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

* * @return the value of the 'Super Mains' containment reference list. * @see org.eclipse.xtext.generator.ecore.subPackage.SubPackagePackage#getSubMain_SuperMains() @@ -47,10 +43,6 @@ public interface SubMain extends EObject /** * Returns the value of the 'Another' containment reference. * - *

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

* * @return the value of the 'Another' containment reference. * @see #setAnother(AnotherSuperMain) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/subPackage/impl/SubMainImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/subPackage/impl/SubMainImpl.java index 65b864cd6..4efce9ce3 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/subPackage/impl/SubMainImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/subPackage/impl/SubMainImpl.java @@ -87,6 +87,7 @@ public class SubMainImpl extends MinimalEObjectImpl.Container implements SubMain * * @generated */ + @Override public EList getSuperMains() { if (superMains == null) @@ -101,6 +102,7 @@ public class SubMainImpl extends MinimalEObjectImpl.Container implements SubMain * * @generated */ + @Override public AnotherSuperMain getAnother() { return another; @@ -128,6 +130,7 @@ public class SubMainImpl extends MinimalEObjectImpl.Container implements SubMain * * @generated */ + @Override public void setAnother(AnotherSuperMain newAnother) { if (newAnother != another) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/subPackage/impl/SubPackageFactoryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/subPackage/impl/SubPackageFactoryImpl.java index 135b30a4b..03b4d2f2e 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/subPackage/impl/SubPackageFactoryImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/subPackage/impl/SubPackageFactoryImpl.java @@ -77,6 +77,7 @@ public class SubPackageFactoryImpl extends EFactoryImpl implements SubPackageFac * * @generated */ + @Override public SubMain createSubMain() { SubMainImpl subMain = new SubMainImpl(); @@ -88,6 +89,7 @@ public class SubPackageFactoryImpl extends EFactoryImpl implements SubPackageFac * * @generated */ + @Override public AnotherSuperMain createAnotherSuperMain() { AnotherSuperMainImpl anotherSuperMain = new AnotherSuperMainImpl(); @@ -99,6 +101,7 @@ public class SubPackageFactoryImpl extends EFactoryImpl implements SubPackageFac * * @generated */ + @Override public SubPackagePackage getSubPackagePackage() { return (SubPackagePackage)getEPackage(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/subPackage/impl/SubPackagePackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/subPackage/impl/SubPackagePackageImpl.java index 22e6e1b54..eca95af17 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/subPackage/impl/SubPackagePackageImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/subPackage/impl/SubPackagePackageImpl.java @@ -6,6 +6,7 @@ package org.eclipse.xtext.generator.ecore.subPackage.impl; 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; @@ -67,7 +68,7 @@ public class SubPackagePackageImpl extends EPackageImpl implements SubPackagePac /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link SubPackagePackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -82,12 +83,14 @@ public class SubPackagePackageImpl extends EPackageImpl implements SubPackagePac if (isInited) return (SubPackagePackage)EPackage.Registry.INSTANCE.getEPackage(SubPackagePackage.eNS_URI); // Obtain or create and register package - SubPackagePackageImpl theSubPackagePackage = (SubPackagePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof SubPackagePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new SubPackagePackageImpl()); + Object registeredSubPackagePackage = EPackage.Registry.INSTANCE.get(eNS_URI); + SubPackagePackageImpl theSubPackagePackage = registeredSubPackagePackage instanceof SubPackagePackageImpl ? (SubPackagePackageImpl)registeredSubPackagePackage : new SubPackagePackageImpl(); isInited = true; // Initialize simple dependencies SuperPackagePackage.eINSTANCE.eClass(); + EcorePackage.eINSTANCE.eClass(); // Create package meta-data objects theSubPackagePackage.createPackageContents(); @@ -98,7 +101,6 @@ public class SubPackagePackageImpl extends EPackageImpl implements SubPackagePac // Mark meta-data to indicate it can't be changed theSubPackagePackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(SubPackagePackage.eNS_URI, theSubPackagePackage); return theSubPackagePackage; @@ -109,6 +111,7 @@ public class SubPackagePackageImpl extends EPackageImpl implements SubPackagePac * * @generated */ + @Override public EClass getSubMain() { return subMainEClass; @@ -119,6 +122,7 @@ public class SubPackagePackageImpl extends EPackageImpl implements SubPackagePac * * @generated */ + @Override public EReference getSubMain_SuperMains() { return (EReference)subMainEClass.getEStructuralFeatures().get(0); @@ -129,6 +133,7 @@ public class SubPackagePackageImpl extends EPackageImpl implements SubPackagePac * * @generated */ + @Override public EReference getSubMain_Another() { return (EReference)subMainEClass.getEStructuralFeatures().get(1); @@ -139,6 +144,7 @@ public class SubPackagePackageImpl extends EPackageImpl implements SubPackagePac * * @generated */ + @Override public EClass getAnotherSuperMain() { return anotherSuperMainEClass; @@ -149,6 +155,7 @@ public class SubPackagePackageImpl extends EPackageImpl implements SubPackagePac * * @generated */ + @Override public SubPackageFactory getSubPackageFactory() { return (SubPackageFactory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/superPackage/AnotherSuperMain.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/superPackage/AnotherSuperMain.java index 603e70e07..07a6358a1 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/superPackage/AnotherSuperMain.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/superPackage/AnotherSuperMain.java @@ -26,10 +26,6 @@ public interface AnotherSuperMain 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) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/superPackage/SuperMain.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/superPackage/SuperMain.java index d99aa6a5c..ec7a92027 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/superPackage/SuperMain.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/superPackage/SuperMain.java @@ -26,10 +26,6 @@ public interface SuperMain 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) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/superPackage/impl/AnotherSuperMainImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/superPackage/impl/AnotherSuperMainImpl.java index 1c90716a5..bd93ecc70 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/superPackage/impl/AnotherSuperMainImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/superPackage/impl/AnotherSuperMainImpl.java @@ -74,6 +74,7 @@ public class AnotherSuperMainImpl extends MinimalEObjectImpl.Container implement * * @generated */ + @Override public String getName() { return name; @@ -84,6 +85,7 @@ public class AnotherSuperMainImpl extends MinimalEObjectImpl.Container implement * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -168,7 +170,7 @@ public class AnotherSuperMainImpl extends MinimalEObjectImpl.Container implement { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/superPackage/impl/SuperMainImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/superPackage/impl/SuperMainImpl.java index 9c7722cc9..31833d3ff 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/superPackage/impl/SuperMainImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/superPackage/impl/SuperMainImpl.java @@ -74,6 +74,7 @@ public class SuperMainImpl extends MinimalEObjectImpl.Container implements Super * * @generated */ + @Override public String getName() { return name; @@ -84,6 +85,7 @@ public class SuperMainImpl extends MinimalEObjectImpl.Container implements Super * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -168,7 +170,7 @@ public class SuperMainImpl extends MinimalEObjectImpl.Container implements Super { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/superPackage/impl/SuperPackageFactoryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/superPackage/impl/SuperPackageFactoryImpl.java index 002143ee1..4606b9a3f 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/superPackage/impl/SuperPackageFactoryImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/superPackage/impl/SuperPackageFactoryImpl.java @@ -77,6 +77,7 @@ public class SuperPackageFactoryImpl extends EFactoryImpl implements SuperPackag * * @generated */ + @Override public SuperMain createSuperMain() { SuperMainImpl superMain = new SuperMainImpl(); @@ -88,6 +89,7 @@ public class SuperPackageFactoryImpl extends EFactoryImpl implements SuperPackag * * @generated */ + @Override public AnotherSuperMain createAnotherSuperMain() { AnotherSuperMainImpl anotherSuperMain = new AnotherSuperMainImpl(); @@ -99,6 +101,7 @@ public class SuperPackageFactoryImpl extends EFactoryImpl implements SuperPackag * * @generated */ + @Override public SuperPackagePackage getSuperPackagePackage() { return (SuperPackagePackage)getEPackage(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/superPackage/impl/SuperPackagePackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/superPackage/impl/SuperPackagePackageImpl.java index 7b3c23783..064d43b36 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/superPackage/impl/SuperPackagePackageImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/superPackage/impl/SuperPackagePackageImpl.java @@ -66,7 +66,7 @@ public class SuperPackagePackageImpl extends EPackageImpl implements SuperPackag /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link SuperPackagePackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -81,7 +81,8 @@ public class SuperPackagePackageImpl extends EPackageImpl implements SuperPackag if (isInited) return (SuperPackagePackage)EPackage.Registry.INSTANCE.getEPackage(SuperPackagePackage.eNS_URI); // Obtain or create and register package - SuperPackagePackageImpl theSuperPackagePackage = (SuperPackagePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof SuperPackagePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new SuperPackagePackageImpl()); + Object registeredSuperPackagePackage = EPackage.Registry.INSTANCE.get(eNS_URI); + SuperPackagePackageImpl theSuperPackagePackage = registeredSuperPackagePackage instanceof SuperPackagePackageImpl ? (SuperPackagePackageImpl)registeredSuperPackagePackage : new SuperPackagePackageImpl(); isInited = true; @@ -97,7 +98,6 @@ public class SuperPackagePackageImpl extends EPackageImpl implements SuperPackag // Mark meta-data to indicate it can't be changed theSuperPackagePackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(SuperPackagePackage.eNS_URI, theSuperPackagePackage); return theSuperPackagePackage; @@ -108,6 +108,7 @@ public class SuperPackagePackageImpl extends EPackageImpl implements SuperPackag * * @generated */ + @Override public EClass getSuperMain() { return superMainEClass; @@ -118,6 +119,7 @@ public class SuperPackagePackageImpl extends EPackageImpl implements SuperPackag * * @generated */ + @Override public EAttribute getSuperMain_Name() { return (EAttribute)superMainEClass.getEStructuralFeatures().get(0); @@ -128,6 +130,7 @@ public class SuperPackagePackageImpl extends EPackageImpl implements SuperPackag * * @generated */ + @Override public EClass getAnotherSuperMain() { return anotherSuperMainEClass; @@ -138,6 +141,7 @@ public class SuperPackagePackageImpl extends EPackageImpl implements SuperPackag * * @generated */ + @Override public EAttribute getAnotherSuperMain_Name() { return (EAttribute)anotherSuperMainEClass.getEStructuralFeatures().get(0); @@ -148,6 +152,7 @@ public class SuperPackagePackageImpl extends EPackageImpl implements SuperPackag * * @generated */ + @Override public SuperPackageFactory getSuperPackageFactory() { return (SuperPackageFactory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/BaseInheritanceTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/BaseInheritanceTestLanguage.genmodel index a5b220e47..56864f058 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/BaseInheritanceTestLanguage.genmodel +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/BaseInheritanceTestLanguage.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="BaseInheritanceTestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> + complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/ConcreteTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/ConcreteTestLanguage.genmodel index 4e1923bc1..76c735ade 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/ConcreteTestLanguage.genmodel +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/ConcreteTestLanguage.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="ConcreteTestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../../../../src/org/eclipse/xtext/grammarinheritance/ametamodel.genmodel#//ametamodel"> + complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../../../../src/org/eclipse/xtext/grammarinheritance/ametamodel.genmodel#//ametamodel"> diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/InheritanceTest2Language.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/InheritanceTest2Language.genmodel index 92204690e..c164df431 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/InheritanceTest2Language.genmodel +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/InheritanceTest2Language.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="InheritanceTest2Language" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore BaseInheritanceTestLanguage.genmodel#//baseInheritanceTest InheritanceTestLanguage.genmodel#//inheritanceTest"> + complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore BaseInheritanceTestLanguage.genmodel#//baseInheritanceTest InheritanceTestLanguage.genmodel#//inheritanceTest"> diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/InheritanceTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/InheritanceTestLanguage.genmodel index ceda0ff8d..b6ca95367 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/InheritanceTestLanguage.genmodel +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/InheritanceTestLanguage.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="InheritanceTestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore BaseInheritanceTestLanguage.genmodel#//baseInheritanceTest"> + complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore BaseInheritanceTestLanguage.genmodel#//baseInheritanceTest"> diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/baseInheritanceTest/Model.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/baseInheritanceTest/Model.java index 6cc4e0357..09e045174 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/baseInheritanceTest/Model.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/baseInheritanceTest/Model.java @@ -26,10 +26,6 @@ public interface Model 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) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/baseInheritanceTest/impl/BaseInheritanceTestFactoryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/baseInheritanceTest/impl/BaseInheritanceTestFactoryImpl.java index 11a577c86..772e96ad4 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/baseInheritanceTest/impl/BaseInheritanceTestFactoryImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/baseInheritanceTest/impl/BaseInheritanceTestFactoryImpl.java @@ -76,6 +76,7 @@ public class BaseInheritanceTestFactoryImpl extends EFactoryImpl implements Base * * @generated */ + @Override public Model createModel() { ModelImpl model = new ModelImpl(); @@ -87,6 +88,7 @@ public class BaseInheritanceTestFactoryImpl extends EFactoryImpl implements Base * * @generated */ + @Override public BaseInheritanceTestPackage getBaseInheritanceTestPackage() { return (BaseInheritanceTestPackage)getEPackage(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/baseInheritanceTest/impl/BaseInheritanceTestPackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/baseInheritanceTest/impl/BaseInheritanceTestPackageImpl.java index a66adb878..ab1a70dbe 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/baseInheritanceTest/impl/BaseInheritanceTestPackageImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/baseInheritanceTest/impl/BaseInheritanceTestPackageImpl.java @@ -58,7 +58,7 @@ public class BaseInheritanceTestPackageImpl extends EPackageImpl implements Base /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link BaseInheritanceTestPackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -73,7 +73,8 @@ public class BaseInheritanceTestPackageImpl extends EPackageImpl implements Base if (isInited) return (BaseInheritanceTestPackage)EPackage.Registry.INSTANCE.getEPackage(BaseInheritanceTestPackage.eNS_URI); // Obtain or create and register package - BaseInheritanceTestPackageImpl theBaseInheritanceTestPackage = (BaseInheritanceTestPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof BaseInheritanceTestPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new BaseInheritanceTestPackageImpl()); + Object registeredBaseInheritanceTestPackage = EPackage.Registry.INSTANCE.get(eNS_URI); + BaseInheritanceTestPackageImpl theBaseInheritanceTestPackage = registeredBaseInheritanceTestPackage instanceof BaseInheritanceTestPackageImpl ? (BaseInheritanceTestPackageImpl)registeredBaseInheritanceTestPackage : new BaseInheritanceTestPackageImpl(); isInited = true; @@ -89,7 +90,6 @@ public class BaseInheritanceTestPackageImpl extends EPackageImpl implements Base // Mark meta-data to indicate it can't be changed theBaseInheritanceTestPackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(BaseInheritanceTestPackage.eNS_URI, theBaseInheritanceTestPackage); return theBaseInheritanceTestPackage; @@ -100,6 +100,7 @@ public class BaseInheritanceTestPackageImpl extends EPackageImpl implements Base * * @generated */ + @Override public EClass getModel() { return modelEClass; @@ -110,6 +111,7 @@ public class BaseInheritanceTestPackageImpl extends EPackageImpl implements Base * * @generated */ + @Override public EAttribute getModel_Name() { return (EAttribute)modelEClass.getEStructuralFeatures().get(0); @@ -120,6 +122,7 @@ public class BaseInheritanceTestPackageImpl extends EPackageImpl implements Base * * @generated */ + @Override public BaseInheritanceTestFactory getBaseInheritanceTestFactory() { return (BaseInheritanceTestFactory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/baseInheritanceTest/impl/ModelImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/baseInheritanceTest/impl/ModelImpl.java index 664be8073..4615503cc 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/baseInheritanceTest/impl/ModelImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/baseInheritanceTest/impl/ModelImpl.java @@ -74,6 +74,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public String getName() { return name; @@ -84,6 +85,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -168,7 +170,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/foo/AType2.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/foo/AType2.java index dd8608aff..fada0508f 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/foo/AType2.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/foo/AType2.java @@ -26,10 +26,6 @@ public interface AType2 extends RootRule, AType /** * Returns the value of the 'Age' attribute. * - *

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

* * @return the value of the 'Age' attribute. * @see #setAge(int) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/foo/CallExtendedParserRule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/foo/CallExtendedParserRule.java index 183b18831..ba15fb478 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/foo/CallExtendedParserRule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/foo/CallExtendedParserRule.java @@ -26,10 +26,6 @@ public interface CallExtendedParserRule extends RootRule /** * Returns the value of the 'Call' containment reference. * - *

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

* * @return the value of the 'Call' containment reference. * @see #setCall(AModel) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/foo/CallOverridenParserRule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/foo/CallOverridenParserRule.java index 3b4e5dcd4..f944313ab 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/foo/CallOverridenParserRule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/foo/CallOverridenParserRule.java @@ -26,10 +26,6 @@ public interface CallOverridenParserRule extends RootRule /** * Returns the value of the 'Call' containment reference. * - *

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

* * @return the value of the 'Call' containment reference. * @see #setCall(AModel) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/foo/ConcreteParserRule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/foo/ConcreteParserRule.java index 405ba2a89..8899850f2 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/foo/ConcreteParserRule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/foo/ConcreteParserRule.java @@ -29,10 +29,6 @@ public interface ConcreteParserRule extends RootRule /** * Returns the value of the 'Magic Number' attribute. * - *

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

* * @return the value of the 'Magic Number' attribute. * @see #setMagicNumber(double) @@ -56,10 +52,6 @@ public interface ConcreteParserRule extends RootRule * Returns the value of the 'Elements' containment reference list. * The list contents are of type {@link org.eclipse.xtext.grammarinheritance.ametamodel.AType}. * - *

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

* * @return the value of the 'Elements' containment reference list. * @see org.eclipse.xtext.grammarinheritance.foo.FooPackage#getConcreteParserRule_Elements() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/foo/Subrule1.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/foo/Subrule1.java index b00b84371..8c71467f1 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/foo/Subrule1.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/foo/Subrule1.java @@ -26,10 +26,6 @@ public interface Subrule1 extends AType /** * Returns the value of the 'Sub1' attribute. * - *

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

* * @return the value of the 'Sub1' attribute. * @see #setSub1(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/foo/Subrule2.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/foo/Subrule2.java index 30b97e780..88c8e2257 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/foo/Subrule2.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/foo/Subrule2.java @@ -26,10 +26,6 @@ public interface Subrule2 extends AType /** * Returns the value of the 'Sub2' attribute. * - *

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

* * @return the value of the 'Sub2' attribute. * @see #setSub2(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/foo/Subrule3.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/foo/Subrule3.java index 392a4a019..7975e328e 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/foo/Subrule3.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/foo/Subrule3.java @@ -26,10 +26,6 @@ public interface Subrule3 extends AType /** * Returns the value of the 'Sub1' attribute. * - *

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

* * @return the value of the 'Sub1' attribute. * @see #setSub1(int) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/foo/impl/AType2Impl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/foo/impl/AType2Impl.java index 2d96be7b6..9c5474228 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/foo/impl/AType2Impl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/foo/impl/AType2Impl.java @@ -97,6 +97,7 @@ public class AType2Impl extends RootRuleImpl implements AType2 * * @generated */ + @Override public String getName() { return name; @@ -107,6 +108,7 @@ public class AType2Impl extends RootRuleImpl implements AType2 * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -120,6 +122,7 @@ public class AType2Impl extends RootRuleImpl implements AType2 * * @generated */ + @Override public int getAge() { return age; @@ -130,6 +133,7 @@ public class AType2Impl extends RootRuleImpl implements AType2 * * @generated */ + @Override public void setAge(int newAge) { int oldAge = age; @@ -262,7 +266,7 @@ public class AType2Impl extends RootRuleImpl implements AType2 { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(", age: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/foo/impl/CallExtendedParserRuleImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/foo/impl/CallExtendedParserRuleImpl.java index 1b5ccbf31..a6119169d 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/foo/impl/CallExtendedParserRuleImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/foo/impl/CallExtendedParserRuleImpl.java @@ -67,6 +67,7 @@ public class CallExtendedParserRuleImpl extends RootRuleImpl implements CallExte * * @generated */ + @Override public AModel getCall() { return call; @@ -94,6 +95,7 @@ public class CallExtendedParserRuleImpl extends RootRuleImpl implements CallExte * * @generated */ + @Override public void setCall(AModel newCall) { if (newCall != call) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/foo/impl/CallOverridenParserRuleImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/foo/impl/CallOverridenParserRuleImpl.java index 7d8083ce8..b8041b6e8 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/foo/impl/CallOverridenParserRuleImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/foo/impl/CallOverridenParserRuleImpl.java @@ -67,6 +67,7 @@ public class CallOverridenParserRuleImpl extends RootRuleImpl implements CallOve * * @generated */ + @Override public AModel getCall() { return call; @@ -94,6 +95,7 @@ public class CallOverridenParserRuleImpl extends RootRuleImpl implements CallOve * * @generated */ + @Override public void setCall(AModel newCall) { if (newCall != call) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/foo/impl/ConcreteParserRuleImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/foo/impl/ConcreteParserRuleImpl.java index 7e93f804f..06251809a 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/foo/impl/ConcreteParserRuleImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/foo/impl/ConcreteParserRuleImpl.java @@ -95,6 +95,7 @@ public class ConcreteParserRuleImpl extends RootRuleImpl implements ConcretePars * * @generated */ + @Override public double getMagicNumber() { return magicNumber; @@ -105,6 +106,7 @@ public class ConcreteParserRuleImpl extends RootRuleImpl implements ConcretePars * * @generated */ + @Override public void setMagicNumber(double newMagicNumber) { double oldMagicNumber = magicNumber; @@ -118,6 +120,7 @@ public class ConcreteParserRuleImpl extends RootRuleImpl implements ConcretePars * * @generated */ + @Override public EList getElements() { if (elements == null) @@ -231,7 +234,7 @@ public class ConcreteParserRuleImpl extends RootRuleImpl implements ConcretePars { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (magicNumber: "); result.append(magicNumber); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/foo/impl/FooFactoryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/foo/impl/FooFactoryImpl.java index d72137798..8460bccae 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/foo/impl/FooFactoryImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/foo/impl/FooFactoryImpl.java @@ -83,6 +83,7 @@ public class FooFactoryImpl extends EFactoryImpl implements FooFactory * * @generated */ + @Override public RootRule createRootRule() { RootRuleImpl rootRule = new RootRuleImpl(); @@ -94,6 +95,7 @@ public class FooFactoryImpl extends EFactoryImpl implements FooFactory * * @generated */ + @Override public ConcreteParserRule createConcreteParserRule() { ConcreteParserRuleImpl concreteParserRule = new ConcreteParserRuleImpl(); @@ -105,6 +107,7 @@ public class FooFactoryImpl extends EFactoryImpl implements FooFactory * * @generated */ + @Override public CallOverridenParserRule createCallOverridenParserRule() { CallOverridenParserRuleImpl callOverridenParserRule = new CallOverridenParserRuleImpl(); @@ -116,6 +119,7 @@ public class FooFactoryImpl extends EFactoryImpl implements FooFactory * * @generated */ + @Override public AType2 createAType2() { AType2Impl aType2 = new AType2Impl(); @@ -127,6 +131,7 @@ public class FooFactoryImpl extends EFactoryImpl implements FooFactory * * @generated */ + @Override public Subrule1 createSubrule1() { Subrule1Impl subrule1 = new Subrule1Impl(); @@ -138,6 +143,7 @@ public class FooFactoryImpl extends EFactoryImpl implements FooFactory * * @generated */ + @Override public Subrule2 createSubrule2() { Subrule2Impl subrule2 = new Subrule2Impl(); @@ -149,6 +155,7 @@ public class FooFactoryImpl extends EFactoryImpl implements FooFactory * * @generated */ + @Override public Subrule3 createSubrule3() { Subrule3Impl subrule3 = new Subrule3Impl(); @@ -160,6 +167,7 @@ public class FooFactoryImpl extends EFactoryImpl implements FooFactory * * @generated */ + @Override public CallExtendedParserRule createCallExtendedParserRule() { CallExtendedParserRuleImpl callExtendedParserRule = new CallExtendedParserRuleImpl(); @@ -171,6 +179,7 @@ public class FooFactoryImpl extends EFactoryImpl implements FooFactory * * @generated */ + @Override public FooPackage getFooPackage() { return (FooPackage)getEPackage(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/foo/impl/FooPackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/foo/impl/FooPackageImpl.java index 412e50794..6bc115738 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/foo/impl/FooPackageImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/foo/impl/FooPackageImpl.java @@ -117,7 +117,7 @@ public class FooPackageImpl extends EPackageImpl implements FooPackage /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link FooPackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -132,11 +132,13 @@ public class FooPackageImpl extends EPackageImpl implements FooPackage if (isInited) return (FooPackage)EPackage.Registry.INSTANCE.getEPackage(FooPackage.eNS_URI); // Obtain or create and register package - FooPackageImpl theFooPackage = (FooPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof FooPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new FooPackageImpl()); + Object registeredFooPackage = EPackage.Registry.INSTANCE.get(eNS_URI); + FooPackageImpl theFooPackage = registeredFooPackage instanceof FooPackageImpl ? (FooPackageImpl)registeredFooPackage : new FooPackageImpl(); isInited = true; // Initialize simple dependencies + EcorePackage.eINSTANCE.eClass(); AmetamodelPackage.eINSTANCE.eClass(); // Create package meta-data objects @@ -148,7 +150,6 @@ public class FooPackageImpl extends EPackageImpl implements FooPackage // Mark meta-data to indicate it can't be changed theFooPackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(FooPackage.eNS_URI, theFooPackage); return theFooPackage; @@ -159,6 +160,7 @@ public class FooPackageImpl extends EPackageImpl implements FooPackage * * @generated */ + @Override public EClass getRootRule() { return rootRuleEClass; @@ -169,6 +171,7 @@ public class FooPackageImpl extends EPackageImpl implements FooPackage * * @generated */ + @Override public EClass getConcreteParserRule() { return concreteParserRuleEClass; @@ -179,6 +182,7 @@ public class FooPackageImpl extends EPackageImpl implements FooPackage * * @generated */ + @Override public EAttribute getConcreteParserRule_MagicNumber() { return (EAttribute)concreteParserRuleEClass.getEStructuralFeatures().get(0); @@ -189,6 +193,7 @@ public class FooPackageImpl extends EPackageImpl implements FooPackage * * @generated */ + @Override public EReference getConcreteParserRule_Elements() { return (EReference)concreteParserRuleEClass.getEStructuralFeatures().get(1); @@ -199,6 +204,7 @@ public class FooPackageImpl extends EPackageImpl implements FooPackage * * @generated */ + @Override public EClass getCallOverridenParserRule() { return callOverridenParserRuleEClass; @@ -209,6 +215,7 @@ public class FooPackageImpl extends EPackageImpl implements FooPackage * * @generated */ + @Override public EReference getCallOverridenParserRule_Call() { return (EReference)callOverridenParserRuleEClass.getEStructuralFeatures().get(0); @@ -219,6 +226,7 @@ public class FooPackageImpl extends EPackageImpl implements FooPackage * * @generated */ + @Override public EClass getAType2() { return aType2EClass; @@ -229,6 +237,7 @@ public class FooPackageImpl extends EPackageImpl implements FooPackage * * @generated */ + @Override public EAttribute getAType2_Age() { return (EAttribute)aType2EClass.getEStructuralFeatures().get(0); @@ -239,6 +248,7 @@ public class FooPackageImpl extends EPackageImpl implements FooPackage * * @generated */ + @Override public EClass getSubrule1() { return subrule1EClass; @@ -249,6 +259,7 @@ public class FooPackageImpl extends EPackageImpl implements FooPackage * * @generated */ + @Override public EAttribute getSubrule1_Sub1() { return (EAttribute)subrule1EClass.getEStructuralFeatures().get(0); @@ -259,6 +270,7 @@ public class FooPackageImpl extends EPackageImpl implements FooPackage * * @generated */ + @Override public EClass getSubrule2() { return subrule2EClass; @@ -269,6 +281,7 @@ public class FooPackageImpl extends EPackageImpl implements FooPackage * * @generated */ + @Override public EAttribute getSubrule2_Sub2() { return (EAttribute)subrule2EClass.getEStructuralFeatures().get(0); @@ -279,6 +292,7 @@ public class FooPackageImpl extends EPackageImpl implements FooPackage * * @generated */ + @Override public EClass getSubrule3() { return subrule3EClass; @@ -289,6 +303,7 @@ public class FooPackageImpl extends EPackageImpl implements FooPackage * * @generated */ + @Override public EAttribute getSubrule3_Sub1() { return (EAttribute)subrule3EClass.getEStructuralFeatures().get(0); @@ -299,6 +314,7 @@ public class FooPackageImpl extends EPackageImpl implements FooPackage * * @generated */ + @Override public EClass getCallExtendedParserRule() { return callExtendedParserRuleEClass; @@ -309,6 +325,7 @@ public class FooPackageImpl extends EPackageImpl implements FooPackage * * @generated */ + @Override public EReference getCallExtendedParserRule_Call() { return (EReference)callExtendedParserRuleEClass.getEStructuralFeatures().get(0); @@ -319,6 +336,7 @@ public class FooPackageImpl extends EPackageImpl implements FooPackage * * @generated */ + @Override public FooFactory getFooFactory() { return (FooFactory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/foo/impl/Subrule1Impl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/foo/impl/Subrule1Impl.java index 67c061fd5..c9081a7bb 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/foo/impl/Subrule1Impl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/foo/impl/Subrule1Impl.java @@ -75,6 +75,7 @@ public class Subrule1Impl extends ATypeImpl implements Subrule1 * * @generated */ + @Override public String getSub1() { return sub1; @@ -85,6 +86,7 @@ public class Subrule1Impl extends ATypeImpl implements Subrule1 * * @generated */ + @Override public void setSub1(String newSub1) { String oldSub1 = sub1; @@ -169,7 +171,7 @@ public class Subrule1Impl extends ATypeImpl implements Subrule1 { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (sub1: "); result.append(sub1); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/foo/impl/Subrule2Impl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/foo/impl/Subrule2Impl.java index 64e17854f..2e3e249af 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/foo/impl/Subrule2Impl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/foo/impl/Subrule2Impl.java @@ -75,6 +75,7 @@ public class Subrule2Impl extends ATypeImpl implements Subrule2 * * @generated */ + @Override public String getSub2() { return sub2; @@ -85,6 +86,7 @@ public class Subrule2Impl extends ATypeImpl implements Subrule2 * * @generated */ + @Override public void setSub2(String newSub2) { String oldSub2 = sub2; @@ -169,7 +171,7 @@ public class Subrule2Impl extends ATypeImpl implements Subrule2 { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (sub2: "); result.append(sub2); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/foo/impl/Subrule3Impl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/foo/impl/Subrule3Impl.java index 5b53c1597..710cb22c6 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/foo/impl/Subrule3Impl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/foo/impl/Subrule3Impl.java @@ -75,6 +75,7 @@ public class Subrule3Impl extends ATypeImpl implements Subrule3 * * @generated */ + @Override public int getSub1() { return sub1; @@ -85,6 +86,7 @@ public class Subrule3Impl extends ATypeImpl implements Subrule3 * * @generated */ + @Override public void setSub1(int newSub1) { int oldSub1 = sub1; @@ -169,7 +171,7 @@ public class Subrule3Impl extends ATypeImpl implements Subrule3 { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (sub1: "); result.append(sub1); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/inheritanceTest/Element.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/inheritanceTest/Element.java index 922e0701a..bcf83a710 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/inheritanceTest/Element.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/inheritanceTest/Element.java @@ -26,10 +26,6 @@ public interface Element 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) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/inheritanceTest/Model.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/inheritanceTest/Model.java index 54c87042c..9df5e80d0 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/inheritanceTest/Model.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/inheritanceTest/Model.java @@ -27,10 +27,6 @@ public interface Model extends org.eclipse.xtext.grammarinheritance.baseInherita * Returns the value of the 'Elements' containment reference list. * The list contents are of type {@link org.eclipse.xtext.grammarinheritance.inheritanceTest.Element}. * - *

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

* * @return the value of the 'Elements' containment reference list. * @see org.eclipse.xtext.grammarinheritance.inheritanceTest.InheritanceTestPackage#getModel_Elements() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/inheritanceTest/impl/ElementImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/inheritanceTest/impl/ElementImpl.java index 1625cf0f9..f09711b26 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/inheritanceTest/impl/ElementImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/inheritanceTest/impl/ElementImpl.java @@ -74,6 +74,7 @@ public class ElementImpl extends MinimalEObjectImpl.Container implements Element * * @generated */ + @Override public String getName() { return name; @@ -84,6 +85,7 @@ public class ElementImpl extends MinimalEObjectImpl.Container implements Element * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -168,7 +170,7 @@ public class ElementImpl extends MinimalEObjectImpl.Container implements Element { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/inheritanceTest/impl/InheritanceTestFactoryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/inheritanceTest/impl/InheritanceTestFactoryImpl.java index 538f37f11..2f921632d 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/inheritanceTest/impl/InheritanceTestFactoryImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/inheritanceTest/impl/InheritanceTestFactoryImpl.java @@ -77,6 +77,7 @@ public class InheritanceTestFactoryImpl extends EFactoryImpl implements Inherita * * @generated */ + @Override public Model createModel() { ModelImpl model = new ModelImpl(); @@ -88,6 +89,7 @@ public class InheritanceTestFactoryImpl extends EFactoryImpl implements Inherita * * @generated */ + @Override public Element createElement() { ElementImpl element = new ElementImpl(); @@ -99,6 +101,7 @@ public class InheritanceTestFactoryImpl extends EFactoryImpl implements Inherita * * @generated */ + @Override public InheritanceTestPackage getInheritanceTestPackage() { return (InheritanceTestPackage)getEPackage(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/inheritanceTest/impl/InheritanceTestPackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/inheritanceTest/impl/InheritanceTestPackageImpl.java index 8c56b0b27..71e46108c 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/inheritanceTest/impl/InheritanceTestPackageImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/inheritanceTest/impl/InheritanceTestPackageImpl.java @@ -69,7 +69,7 @@ public class InheritanceTestPackageImpl extends EPackageImpl implements Inherita /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link InheritanceTestPackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -84,11 +84,13 @@ public class InheritanceTestPackageImpl extends EPackageImpl implements Inherita if (isInited) return (InheritanceTestPackage)EPackage.Registry.INSTANCE.getEPackage(InheritanceTestPackage.eNS_URI); // Obtain or create and register package - InheritanceTestPackageImpl theInheritanceTestPackage = (InheritanceTestPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof InheritanceTestPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new InheritanceTestPackageImpl()); + Object registeredInheritanceTestPackage = EPackage.Registry.INSTANCE.get(eNS_URI); + InheritanceTestPackageImpl theInheritanceTestPackage = registeredInheritanceTestPackage instanceof InheritanceTestPackageImpl ? (InheritanceTestPackageImpl)registeredInheritanceTestPackage : new InheritanceTestPackageImpl(); isInited = true; // Initialize simple dependencies + EcorePackage.eINSTANCE.eClass(); BaseInheritanceTestPackage.eINSTANCE.eClass(); // Create package meta-data objects @@ -100,7 +102,6 @@ public class InheritanceTestPackageImpl extends EPackageImpl implements Inherita // Mark meta-data to indicate it can't be changed theInheritanceTestPackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(InheritanceTestPackage.eNS_URI, theInheritanceTestPackage); return theInheritanceTestPackage; @@ -111,6 +112,7 @@ public class InheritanceTestPackageImpl extends EPackageImpl implements Inherita * * @generated */ + @Override public EClass getModel() { return modelEClass; @@ -121,6 +123,7 @@ public class InheritanceTestPackageImpl extends EPackageImpl implements Inherita * * @generated */ + @Override public EReference getModel_Elements() { return (EReference)modelEClass.getEStructuralFeatures().get(0); @@ -131,6 +134,7 @@ public class InheritanceTestPackageImpl extends EPackageImpl implements Inherita * * @generated */ + @Override public EClass getElement() { return elementEClass; @@ -141,6 +145,7 @@ public class InheritanceTestPackageImpl extends EPackageImpl implements Inherita * * @generated */ + @Override public EAttribute getElement_Name() { return (EAttribute)elementEClass.getEStructuralFeatures().get(0); @@ -151,6 +156,7 @@ public class InheritanceTestPackageImpl extends EPackageImpl implements Inherita * * @generated */ + @Override public InheritanceTestFactory getInheritanceTestFactory() { return (InheritanceTestFactory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/inheritanceTest/impl/ModelImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/inheritanceTest/impl/ModelImpl.java index 8249cbd23..817ee085f 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/inheritanceTest/impl/ModelImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/inheritanceTest/impl/ModelImpl.java @@ -70,6 +70,7 @@ public class ModelImpl extends org.eclipse.xtext.grammarinheritance.baseInherita * * @generated */ + @Override public EList getElements() { if (elements == null) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/inheritanceTest2/Model.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/inheritanceTest2/Model.java index 2a8bbd533..25c54d36a 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/inheritanceTest2/Model.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/inheritanceTest2/Model.java @@ -27,10 +27,6 @@ public interface Model extends org.eclipse.xtext.grammarinheritance.inheritanceT * Returns the value of the 'Ids' attribute list. * The list contents are of type {@link java.lang.String}. * - *

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

* * @return the value of the 'Ids' attribute list. * @see org.eclipse.xtext.grammarinheritance.inheritanceTest2.InheritanceTest2Package#getModel_Ids() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/inheritanceTest2/impl/InheritanceTest2FactoryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/inheritanceTest2/impl/InheritanceTest2FactoryImpl.java index e079886a8..fb3b13f1d 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/inheritanceTest2/impl/InheritanceTest2FactoryImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/inheritanceTest2/impl/InheritanceTest2FactoryImpl.java @@ -76,6 +76,7 @@ public class InheritanceTest2FactoryImpl extends EFactoryImpl implements Inherit * * @generated */ + @Override public Model createModel() { ModelImpl model = new ModelImpl(); @@ -87,6 +88,7 @@ public class InheritanceTest2FactoryImpl extends EFactoryImpl implements Inherit * * @generated */ + @Override public InheritanceTest2Package getInheritanceTest2Package() { return (InheritanceTest2Package)getEPackage(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/inheritanceTest2/impl/InheritanceTest2PackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/inheritanceTest2/impl/InheritanceTest2PackageImpl.java index f104d835e..1a8f3e839 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/inheritanceTest2/impl/InheritanceTest2PackageImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/inheritanceTest2/impl/InheritanceTest2PackageImpl.java @@ -10,6 +10,8 @@ import org.eclipse.emf.ecore.EcorePackage; import org.eclipse.emf.ecore.impl.EPackageImpl; +import org.eclipse.xtext.grammarinheritance.baseInheritanceTest.BaseInheritanceTestPackage; + import org.eclipse.xtext.grammarinheritance.inheritanceTest.InheritanceTestPackage; import org.eclipse.xtext.grammarinheritance.inheritanceTest2.InheritanceTest2Factory; @@ -60,7 +62,7 @@ public class InheritanceTest2PackageImpl extends EPackageImpl implements Inherit /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link InheritanceTest2Package#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -75,11 +77,14 @@ public class InheritanceTest2PackageImpl extends EPackageImpl implements Inherit if (isInited) return (InheritanceTest2Package)EPackage.Registry.INSTANCE.getEPackage(InheritanceTest2Package.eNS_URI); // Obtain or create and register package - InheritanceTest2PackageImpl theInheritanceTest2Package = (InheritanceTest2PackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof InheritanceTest2PackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new InheritanceTest2PackageImpl()); + Object registeredInheritanceTest2Package = EPackage.Registry.INSTANCE.get(eNS_URI); + InheritanceTest2PackageImpl theInheritanceTest2Package = registeredInheritanceTest2Package instanceof InheritanceTest2PackageImpl ? (InheritanceTest2PackageImpl)registeredInheritanceTest2Package : new InheritanceTest2PackageImpl(); isInited = true; // Initialize simple dependencies + EcorePackage.eINSTANCE.eClass(); + BaseInheritanceTestPackage.eINSTANCE.eClass(); InheritanceTestPackage.eINSTANCE.eClass(); // Create package meta-data objects @@ -91,7 +96,6 @@ public class InheritanceTest2PackageImpl extends EPackageImpl implements Inherit // Mark meta-data to indicate it can't be changed theInheritanceTest2Package.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(InheritanceTest2Package.eNS_URI, theInheritanceTest2Package); return theInheritanceTest2Package; @@ -102,6 +106,7 @@ public class InheritanceTest2PackageImpl extends EPackageImpl implements Inherit * * @generated */ + @Override public EClass getModel() { return modelEClass; @@ -112,6 +117,7 @@ public class InheritanceTest2PackageImpl extends EPackageImpl implements Inherit * * @generated */ + @Override public EAttribute getModel_Ids() { return (EAttribute)modelEClass.getEStructuralFeatures().get(0); @@ -122,6 +128,7 @@ public class InheritanceTest2PackageImpl extends EPackageImpl implements Inherit * * @generated */ + @Override public InheritanceTest2Factory getInheritanceTest2Factory() { return (InheritanceTest2Factory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/inheritanceTest2/impl/ModelImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/inheritanceTest2/impl/ModelImpl.java index 6899770d0..65cab7cb3 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/inheritanceTest2/impl/ModelImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/inheritanceTest2/impl/ModelImpl.java @@ -65,6 +65,7 @@ public class ModelImpl extends org.eclipse.xtext.grammarinheritance.inheritanceT * * @generated */ + @Override public EList getIds() { if (ids == null) @@ -152,7 +153,7 @@ public class ModelImpl extends org.eclipse.xtext.grammarinheritance.inheritanceT { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (ids: "); result.append(ids); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/index/IndexTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/index/IndexTestLanguage.genmodel index cd6209868..3ee69305e 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/index/IndexTestLanguage.genmodel +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/index/IndexTestLanguage.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="IndexTestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> + complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/index/indexTestLanguage/Entity.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/index/indexTestLanguage/Entity.java index 73d045a7b..d62119ee0 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/index/indexTestLanguage/Entity.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/index/indexTestLanguage/Entity.java @@ -27,10 +27,6 @@ public interface Entity extends Type * Returns the value of the 'Properties' containment reference list. * The list contents are of type {@link org.eclipse.xtext.index.indexTestLanguage.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.index.indexTestLanguage.IndexTestLanguagePackage#getEntity_Properties() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/index/indexTestLanguage/File.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/index/indexTestLanguage/File.java index f1e3477b7..ef2e47255 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/index/indexTestLanguage/File.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/index/indexTestLanguage/File.java @@ -29,10 +29,6 @@ public interface File extends EObject * Returns the value of the 'Elements' containment reference list. * The list contents are of type {@link org.eclipse.xtext.index.indexTestLanguage.Element}. * - *

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

* * @return the value of the 'Elements' containment reference list. * @see org.eclipse.xtext.index.indexTestLanguage.IndexTestLanguagePackage#getFile_Elements() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/index/indexTestLanguage/Import.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/index/indexTestLanguage/Import.java index fc1aa6e65..33ef0fd07 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/index/indexTestLanguage/Import.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/index/indexTestLanguage/Import.java @@ -25,10 +25,6 @@ public interface Import extends Element /** * Returns the value of the 'Imported Namespace' attribute. * - *

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

* * @return the value of the 'Imported Namespace' attribute. * @see #setImportedNamespace(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/index/indexTestLanguage/Namespace.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/index/indexTestLanguage/Namespace.java index af5dd7c4b..825c9a39f 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/index/indexTestLanguage/Namespace.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/index/indexTestLanguage/Namespace.java @@ -27,10 +27,6 @@ public interface Namespace extends Element /** * 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) @@ -54,10 +50,6 @@ public interface Namespace extends Element * Returns the value of the 'Elements' containment reference list. * The list contents are of type {@link org.eclipse.xtext.index.indexTestLanguage.Element}. * - *

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

* * @return the value of the 'Elements' containment reference list. * @see org.eclipse.xtext.index.indexTestLanguage.IndexTestLanguagePackage#getNamespace_Elements() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/index/indexTestLanguage/Property.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/index/indexTestLanguage/Property.java index 3b497d9cc..95bc486e6 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/index/indexTestLanguage/Property.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/index/indexTestLanguage/Property.java @@ -27,10 +27,6 @@ public interface Property extends EObject /** * Returns the value of the 'Type' reference. * - *

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

* * @return the value of the 'Type' reference. * @see #setType(Type) @@ -53,10 +49,6 @@ public interface Property 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) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/index/indexTestLanguage/Type.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/index/indexTestLanguage/Type.java index 3dd9f2559..9b56e8ee5 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/index/indexTestLanguage/Type.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/index/indexTestLanguage/Type.java @@ -25,10 +25,6 @@ public interface Type extends Element /** * 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) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/index/indexTestLanguage/impl/EntityImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/index/indexTestLanguage/impl/EntityImpl.java index cfc603a0f..f70f41d11 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/index/indexTestLanguage/impl/EntityImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/index/indexTestLanguage/impl/EntityImpl.java @@ -70,6 +70,7 @@ public class EntityImpl extends TypeImpl implements Entity * * @generated */ + @Override public EList getProperties() { if (properties == null) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/index/indexTestLanguage/impl/FileImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/index/indexTestLanguage/impl/FileImpl.java index 0f42170bf..61d0f3068 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/index/indexTestLanguage/impl/FileImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/index/indexTestLanguage/impl/FileImpl.java @@ -72,6 +72,7 @@ public class FileImpl extends MinimalEObjectImpl.Container implements File * * @generated */ + @Override public EList getElements() { if (elements == null) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/index/indexTestLanguage/impl/ImportImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/index/indexTestLanguage/impl/ImportImpl.java index eb18ea458..ef254c613 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/index/indexTestLanguage/impl/ImportImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/index/indexTestLanguage/impl/ImportImpl.java @@ -73,6 +73,7 @@ public class ImportImpl extends ElementImpl implements Import * * @generated */ + @Override public String getImportedNamespace() { return importedNamespace; @@ -83,6 +84,7 @@ public class ImportImpl extends ElementImpl implements Import * * @generated */ + @Override public void setImportedNamespace(String newImportedNamespace) { String oldImportedNamespace = importedNamespace; @@ -167,7 +169,7 @@ public class ImportImpl extends ElementImpl implements Import { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (importedNamespace: "); result.append(importedNamespace); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/index/indexTestLanguage/impl/IndexTestLanguageFactoryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/index/indexTestLanguage/impl/IndexTestLanguageFactoryImpl.java index af5a3c3fd..98fc40534 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/index/indexTestLanguage/impl/IndexTestLanguageFactoryImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/index/indexTestLanguage/impl/IndexTestLanguageFactoryImpl.java @@ -83,6 +83,7 @@ public class IndexTestLanguageFactoryImpl extends EFactoryImpl implements IndexT * * @generated */ + @Override public File createFile() { FileImpl file = new FileImpl(); @@ -94,6 +95,7 @@ public class IndexTestLanguageFactoryImpl extends EFactoryImpl implements IndexT * * @generated */ + @Override public Import createImport() { ImportImpl import_ = new ImportImpl(); @@ -105,6 +107,7 @@ public class IndexTestLanguageFactoryImpl extends EFactoryImpl implements IndexT * * @generated */ + @Override public Namespace createNamespace() { NamespaceImpl namespace = new NamespaceImpl(); @@ -116,6 +119,7 @@ public class IndexTestLanguageFactoryImpl extends EFactoryImpl implements IndexT * * @generated */ + @Override public Element createElement() { ElementImpl element = new ElementImpl(); @@ -127,6 +131,7 @@ public class IndexTestLanguageFactoryImpl extends EFactoryImpl implements IndexT * * @generated */ + @Override public Type createType() { TypeImpl type = new TypeImpl(); @@ -138,6 +143,7 @@ public class IndexTestLanguageFactoryImpl extends EFactoryImpl implements IndexT * * @generated */ + @Override public Entity createEntity() { EntityImpl entity = new EntityImpl(); @@ -149,6 +155,7 @@ public class IndexTestLanguageFactoryImpl extends EFactoryImpl implements IndexT * * @generated */ + @Override public Datatype createDatatype() { DatatypeImpl datatype = new DatatypeImpl(); @@ -160,6 +167,7 @@ public class IndexTestLanguageFactoryImpl extends EFactoryImpl implements IndexT * * @generated */ + @Override public Property createProperty() { PropertyImpl property = new PropertyImpl(); @@ -171,6 +179,7 @@ public class IndexTestLanguageFactoryImpl extends EFactoryImpl implements IndexT * * @generated */ + @Override public IndexTestLanguagePackage getIndexTestLanguagePackage() { return (IndexTestLanguagePackage)getEPackage(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/index/indexTestLanguage/impl/IndexTestLanguagePackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/index/indexTestLanguage/impl/IndexTestLanguagePackageImpl.java index 3c21757f3..dccd0a8ce 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/index/indexTestLanguage/impl/IndexTestLanguagePackageImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/index/indexTestLanguage/impl/IndexTestLanguagePackageImpl.java @@ -115,7 +115,7 @@ public class IndexTestLanguagePackageImpl extends EPackageImpl implements IndexT /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link IndexTestLanguagePackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -130,7 +130,8 @@ public class IndexTestLanguagePackageImpl extends EPackageImpl implements IndexT if (isInited) return (IndexTestLanguagePackage)EPackage.Registry.INSTANCE.getEPackage(IndexTestLanguagePackage.eNS_URI); // Obtain or create and register package - IndexTestLanguagePackageImpl theIndexTestLanguagePackage = (IndexTestLanguagePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof IndexTestLanguagePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new IndexTestLanguagePackageImpl()); + Object registeredIndexTestLanguagePackage = EPackage.Registry.INSTANCE.get(eNS_URI); + IndexTestLanguagePackageImpl theIndexTestLanguagePackage = registeredIndexTestLanguagePackage instanceof IndexTestLanguagePackageImpl ? (IndexTestLanguagePackageImpl)registeredIndexTestLanguagePackage : new IndexTestLanguagePackageImpl(); isInited = true; @@ -146,7 +147,6 @@ public class IndexTestLanguagePackageImpl extends EPackageImpl implements IndexT // Mark meta-data to indicate it can't be changed theIndexTestLanguagePackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(IndexTestLanguagePackage.eNS_URI, theIndexTestLanguagePackage); return theIndexTestLanguagePackage; @@ -157,6 +157,7 @@ public class IndexTestLanguagePackageImpl extends EPackageImpl implements IndexT * * @generated */ + @Override public EClass getFile() { return fileEClass; @@ -167,6 +168,7 @@ public class IndexTestLanguagePackageImpl extends EPackageImpl implements IndexT * * @generated */ + @Override public EReference getFile_Elements() { return (EReference)fileEClass.getEStructuralFeatures().get(0); @@ -177,6 +179,7 @@ public class IndexTestLanguagePackageImpl extends EPackageImpl implements IndexT * * @generated */ + @Override public EClass getImport() { return importEClass; @@ -187,6 +190,7 @@ public class IndexTestLanguagePackageImpl extends EPackageImpl implements IndexT * * @generated */ + @Override public EAttribute getImport_ImportedNamespace() { return (EAttribute)importEClass.getEStructuralFeatures().get(0); @@ -197,6 +201,7 @@ public class IndexTestLanguagePackageImpl extends EPackageImpl implements IndexT * * @generated */ + @Override public EClass getNamespace() { return namespaceEClass; @@ -207,6 +212,7 @@ public class IndexTestLanguagePackageImpl extends EPackageImpl implements IndexT * * @generated */ + @Override public EAttribute getNamespace_Name() { return (EAttribute)namespaceEClass.getEStructuralFeatures().get(0); @@ -217,6 +223,7 @@ public class IndexTestLanguagePackageImpl extends EPackageImpl implements IndexT * * @generated */ + @Override public EReference getNamespace_Elements() { return (EReference)namespaceEClass.getEStructuralFeatures().get(1); @@ -227,6 +234,7 @@ public class IndexTestLanguagePackageImpl extends EPackageImpl implements IndexT * * @generated */ + @Override public EClass getElement() { return elementEClass; @@ -237,6 +245,7 @@ public class IndexTestLanguagePackageImpl extends EPackageImpl implements IndexT * * @generated */ + @Override public EClass getType() { return typeEClass; @@ -247,6 +256,7 @@ public class IndexTestLanguagePackageImpl extends EPackageImpl implements IndexT * * @generated */ + @Override public EAttribute getType_Name() { return (EAttribute)typeEClass.getEStructuralFeatures().get(0); @@ -257,6 +267,7 @@ public class IndexTestLanguagePackageImpl extends EPackageImpl implements IndexT * * @generated */ + @Override public EClass getEntity() { return entityEClass; @@ -267,6 +278,7 @@ public class IndexTestLanguagePackageImpl extends EPackageImpl implements IndexT * * @generated */ + @Override public EReference getEntity_Properties() { return (EReference)entityEClass.getEStructuralFeatures().get(0); @@ -277,6 +289,7 @@ public class IndexTestLanguagePackageImpl extends EPackageImpl implements IndexT * * @generated */ + @Override public EClass getDatatype() { return datatypeEClass; @@ -287,6 +300,7 @@ public class IndexTestLanguagePackageImpl extends EPackageImpl implements IndexT * * @generated */ + @Override public EClass getProperty() { return propertyEClass; @@ -297,6 +311,7 @@ public class IndexTestLanguagePackageImpl extends EPackageImpl implements IndexT * * @generated */ + @Override public EReference getProperty_Type() { return (EReference)propertyEClass.getEStructuralFeatures().get(0); @@ -307,6 +322,7 @@ public class IndexTestLanguagePackageImpl extends EPackageImpl implements IndexT * * @generated */ + @Override public EAttribute getProperty_Name() { return (EAttribute)propertyEClass.getEStructuralFeatures().get(1); @@ -317,6 +333,7 @@ public class IndexTestLanguagePackageImpl extends EPackageImpl implements IndexT * * @generated */ + @Override public IndexTestLanguageFactory getIndexTestLanguageFactory() { return (IndexTestLanguageFactory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/index/indexTestLanguage/impl/NamespaceImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/index/indexTestLanguage/impl/NamespaceImpl.java index 670292ecd..7993331c2 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/index/indexTestLanguage/impl/NamespaceImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/index/indexTestLanguage/impl/NamespaceImpl.java @@ -94,6 +94,7 @@ public class NamespaceImpl extends ElementImpl implements Namespace * * @generated */ + @Override public String getName() { return name; @@ -104,6 +105,7 @@ public class NamespaceImpl extends ElementImpl implements Namespace * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -117,6 +119,7 @@ public class NamespaceImpl extends ElementImpl implements Namespace * * @generated */ + @Override public EList getElements() { if (elements == null) @@ -230,7 +233,7 @@ public class NamespaceImpl extends ElementImpl implements Namespace { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/index/indexTestLanguage/impl/PropertyImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/index/indexTestLanguage/impl/PropertyImpl.java index c504b0c80..4e09cad38 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/index/indexTestLanguage/impl/PropertyImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/index/indexTestLanguage/impl/PropertyImpl.java @@ -87,6 +87,7 @@ public class PropertyImpl extends MinimalEObjectImpl.Container implements Proper * * @generated */ + @Override public Type getType() { if (type != null && type.eIsProxy()) @@ -117,6 +118,7 @@ public class PropertyImpl extends MinimalEObjectImpl.Container implements Proper * * @generated */ + @Override public void setType(Type newType) { Type oldType = type; @@ -130,6 +132,7 @@ public class PropertyImpl extends MinimalEObjectImpl.Container implements Proper * * @generated */ + @Override public String getName() { return name; @@ -140,6 +143,7 @@ public class PropertyImpl extends MinimalEObjectImpl.Container implements Proper * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -235,7 +239,7 @@ public class PropertyImpl extends MinimalEObjectImpl.Container implements Proper { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/index/indexTestLanguage/impl/TypeImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/index/indexTestLanguage/impl/TypeImpl.java index 4baae29df..86a26014f 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/index/indexTestLanguage/impl/TypeImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/index/indexTestLanguage/impl/TypeImpl.java @@ -73,6 +73,7 @@ public class TypeImpl extends ElementImpl implements Type * * @generated */ + @Override public String getName() { return name; @@ -83,6 +84,7 @@ public class TypeImpl extends ElementImpl implements Type * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -167,7 +169,7 @@ public class TypeImpl extends ElementImpl implements Type { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/lexer/BacktrackingLexerTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/lexer/BacktrackingLexerTestLanguage.genmodel index 6dafd56e3..0a57ee4dc 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/lexer/BacktrackingLexerTestLanguage.genmodel +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/lexer/BacktrackingLexerTestLanguage.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="BacktrackingLexerTestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> + complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/lexer/IgnoreCaseLexerTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/lexer/IgnoreCaseLexerTestLanguage.genmodel index 6d2e562f8..b3aaf2222 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/lexer/IgnoreCaseLexerTestLanguage.genmodel +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/lexer/IgnoreCaseLexerTestLanguage.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="IgnoreCaseLexerTestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> + complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/lexer/backtrackingTestLanguage/Ab.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/lexer/backtrackingTestLanguage/Ab.java index d23551c64..34758a802 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/lexer/backtrackingTestLanguage/Ab.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/lexer/backtrackingTestLanguage/Ab.java @@ -27,10 +27,6 @@ public interface Ab extends EObject /** * Returns the value of the 'X' attribute. * - *

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

* * @return the value of the 'X' attribute. * @see #setX(String) @@ -53,10 +49,6 @@ public interface Ab extends EObject /** * Returns the value of the 'Y' attribute. * - *

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

* * @return the value of the 'Y' attribute. * @see #setY(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/lexer/backtrackingTestLanguage/EnumName.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/lexer/backtrackingTestLanguage/EnumName.java index 99ac1a784..0b40c9714 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/lexer/backtrackingTestLanguage/EnumName.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/lexer/backtrackingTestLanguage/EnumName.java @@ -43,10 +43,6 @@ public enum EnumName implements Enumerator /** * The 'Abc' literal value. * - *

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

* * @see #ABC * @model name="abc" literal="Abc" @@ -58,10 +54,6 @@ public enum EnumName implements Enumerator /** * The 'Efg' literal value. * - *

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

* * @see #EFG * @model name="efg" literal="Efg" @@ -190,6 +182,7 @@ public enum EnumName implements Enumerator * * @generated */ + @Override public int getValue() { return value; @@ -200,6 +193,7 @@ public enum EnumName implements Enumerator * * @generated */ + @Override public String getName() { return name; @@ -210,6 +204,7 @@ public enum EnumName implements Enumerator * * @generated */ + @Override public String getLiteral() { return literal; diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/lexer/backtrackingTestLanguage/Model.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/lexer/backtrackingTestLanguage/Model.java index ab88459e3..f266aa8a0 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/lexer/backtrackingTestLanguage/Model.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/lexer/backtrackingTestLanguage/Model.java @@ -35,10 +35,6 @@ public interface Model extends EObject * The list contents are of type {@link org.eclipse.xtext.lexer.backtrackingTestLanguage.EnumName}. * The literals are from the enumeration {@link org.eclipse.xtext.lexer.backtrackingTestLanguage.EnumName}. * - *

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

* * @return the value of the 'Enums' attribute list. * @see org.eclipse.xtext.lexer.backtrackingTestLanguage.EnumName @@ -52,10 +48,6 @@ public interface Model extends EObject * Returns the value of the 'Ycs' attribute list. * The list contents are of type {@link java.lang.String}. * - *

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

* * @return the value of the 'Ycs' attribute list. * @see org.eclipse.xtext.lexer.backtrackingTestLanguage.BacktrackingTestLanguagePackage#getModel_Ycs() @@ -68,10 +60,6 @@ public interface Model extends EObject * Returns the value of the 'Abs' containment reference list. * The list contents are of type {@link org.eclipse.xtext.lexer.backtrackingTestLanguage.Ab}. * - *

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

* * @return the value of the 'Abs' containment reference list. * @see org.eclipse.xtext.lexer.backtrackingTestLanguage.BacktrackingTestLanguagePackage#getModel_Abs() @@ -84,10 +72,6 @@ public interface Model extends EObject * Returns the value of the 'Xbs' containment reference list. * The list contents are of type {@link org.eclipse.xtext.lexer.backtrackingTestLanguage.Xb}. * - *

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

* * @return the value of the 'Xbs' containment reference list. * @see org.eclipse.xtext.lexer.backtrackingTestLanguage.BacktrackingTestLanguagePackage#getModel_Xbs() @@ -100,10 +84,6 @@ public interface Model extends EObject * Returns the value of the 'Ys' attribute list. * The list contents are of type {@link java.lang.String}. * - *

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

* * @return the value of the 'Ys' attribute list. * @see org.eclipse.xtext.lexer.backtrackingTestLanguage.BacktrackingTestLanguagePackage#getModel_Ys() @@ -116,10 +96,6 @@ public interface Model extends EObject * Returns the value of the 'As' attribute list. * The list contents are of type {@link java.lang.String}. * - *

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

* * @return the value of the 'As' attribute list. * @see org.eclipse.xtext.lexer.backtrackingTestLanguage.BacktrackingTestLanguagePackage#getModel_As() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/lexer/backtrackingTestLanguage/Xb.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/lexer/backtrackingTestLanguage/Xb.java index 8e1d04c34..86dc6c9f3 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/lexer/backtrackingTestLanguage/Xb.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/lexer/backtrackingTestLanguage/Xb.java @@ -27,10 +27,6 @@ public interface Xb extends EObject /** * Returns the value of the 'X' attribute. * - *

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

* * @return the value of the 'X' attribute. * @see #setX(String) @@ -53,10 +49,6 @@ public interface Xb extends EObject /** * Returns the value of the 'Y' attribute. * - *

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

* * @return the value of the 'Y' attribute. * @see #setY(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/lexer/backtrackingTestLanguage/impl/AbImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/lexer/backtrackingTestLanguage/impl/AbImpl.java index 05719ebdf..9f47fd68e 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/lexer/backtrackingTestLanguage/impl/AbImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/lexer/backtrackingTestLanguage/impl/AbImpl.java @@ -95,6 +95,7 @@ public class AbImpl extends MinimalEObjectImpl.Container implements Ab * * @generated */ + @Override public String getX() { return x; @@ -105,6 +106,7 @@ public class AbImpl extends MinimalEObjectImpl.Container implements Ab * * @generated */ + @Override public void setX(String newX) { String oldX = x; @@ -118,6 +120,7 @@ public class AbImpl extends MinimalEObjectImpl.Container implements Ab * * @generated */ + @Override public String getY() { return y; @@ -128,6 +131,7 @@ public class AbImpl extends MinimalEObjectImpl.Container implements Ab * * @generated */ + @Override public void setY(String newY) { String oldY = y; @@ -222,7 +226,7 @@ public class AbImpl extends MinimalEObjectImpl.Container implements Ab { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (x: "); result.append(x); result.append(", y: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/lexer/backtrackingTestLanguage/impl/BacktrackingTestLanguageFactoryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/lexer/backtrackingTestLanguage/impl/BacktrackingTestLanguageFactoryImpl.java index 11914e19a..62312c422 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/lexer/backtrackingTestLanguage/impl/BacktrackingTestLanguageFactoryImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/lexer/backtrackingTestLanguage/impl/BacktrackingTestLanguageFactoryImpl.java @@ -113,6 +113,7 @@ public class BacktrackingTestLanguageFactoryImpl extends EFactoryImpl implements * * @generated */ + @Override public Model createModel() { ModelImpl model = new ModelImpl(); @@ -124,6 +125,7 @@ public class BacktrackingTestLanguageFactoryImpl extends EFactoryImpl implements * * @generated */ + @Override public Ab createAb() { AbImpl ab = new AbImpl(); @@ -135,6 +137,7 @@ public class BacktrackingTestLanguageFactoryImpl extends EFactoryImpl implements * * @generated */ + @Override public Xb createXb() { XbImpl xb = new XbImpl(); @@ -168,6 +171,7 @@ public class BacktrackingTestLanguageFactoryImpl extends EFactoryImpl implements * * @generated */ + @Override public BacktrackingTestLanguagePackage getBacktrackingTestLanguagePackage() { return (BacktrackingTestLanguagePackage)getEPackage(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/lexer/backtrackingTestLanguage/impl/BacktrackingTestLanguagePackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/lexer/backtrackingTestLanguage/impl/BacktrackingTestLanguagePackageImpl.java index 8a744d8fc..837ccd78c 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/lexer/backtrackingTestLanguage/impl/BacktrackingTestLanguagePackageImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/lexer/backtrackingTestLanguage/impl/BacktrackingTestLanguagePackageImpl.java @@ -84,7 +84,7 @@ public class BacktrackingTestLanguagePackageImpl extends EPackageImpl implements /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link BacktrackingTestLanguagePackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -99,7 +99,8 @@ public class BacktrackingTestLanguagePackageImpl extends EPackageImpl implements if (isInited) return (BacktrackingTestLanguagePackage)EPackage.Registry.INSTANCE.getEPackage(BacktrackingTestLanguagePackage.eNS_URI); // Obtain or create and register package - BacktrackingTestLanguagePackageImpl theBacktrackingTestLanguagePackage = (BacktrackingTestLanguagePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof BacktrackingTestLanguagePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new BacktrackingTestLanguagePackageImpl()); + Object registeredBacktrackingTestLanguagePackage = EPackage.Registry.INSTANCE.get(eNS_URI); + BacktrackingTestLanguagePackageImpl theBacktrackingTestLanguagePackage = registeredBacktrackingTestLanguagePackage instanceof BacktrackingTestLanguagePackageImpl ? (BacktrackingTestLanguagePackageImpl)registeredBacktrackingTestLanguagePackage : new BacktrackingTestLanguagePackageImpl(); isInited = true; @@ -115,7 +116,6 @@ public class BacktrackingTestLanguagePackageImpl extends EPackageImpl implements // Mark meta-data to indicate it can't be changed theBacktrackingTestLanguagePackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(BacktrackingTestLanguagePackage.eNS_URI, theBacktrackingTestLanguagePackage); return theBacktrackingTestLanguagePackage; @@ -126,6 +126,7 @@ public class BacktrackingTestLanguagePackageImpl extends EPackageImpl implements * * @generated */ + @Override public EClass getModel() { return modelEClass; @@ -136,6 +137,7 @@ public class BacktrackingTestLanguagePackageImpl extends EPackageImpl implements * * @generated */ + @Override public EAttribute getModel_Enums() { return (EAttribute)modelEClass.getEStructuralFeatures().get(0); @@ -146,6 +148,7 @@ public class BacktrackingTestLanguagePackageImpl extends EPackageImpl implements * * @generated */ + @Override public EAttribute getModel_Ycs() { return (EAttribute)modelEClass.getEStructuralFeatures().get(1); @@ -156,6 +159,7 @@ public class BacktrackingTestLanguagePackageImpl extends EPackageImpl implements * * @generated */ + @Override public EReference getModel_Abs() { return (EReference)modelEClass.getEStructuralFeatures().get(2); @@ -166,6 +170,7 @@ public class BacktrackingTestLanguagePackageImpl extends EPackageImpl implements * * @generated */ + @Override public EReference getModel_Xbs() { return (EReference)modelEClass.getEStructuralFeatures().get(3); @@ -176,6 +181,7 @@ public class BacktrackingTestLanguagePackageImpl extends EPackageImpl implements * * @generated */ + @Override public EAttribute getModel_Ys() { return (EAttribute)modelEClass.getEStructuralFeatures().get(4); @@ -186,6 +192,7 @@ public class BacktrackingTestLanguagePackageImpl extends EPackageImpl implements * * @generated */ + @Override public EAttribute getModel_As() { return (EAttribute)modelEClass.getEStructuralFeatures().get(5); @@ -196,6 +203,7 @@ public class BacktrackingTestLanguagePackageImpl extends EPackageImpl implements * * @generated */ + @Override public EClass getAb() { return abEClass; @@ -206,6 +214,7 @@ public class BacktrackingTestLanguagePackageImpl extends EPackageImpl implements * * @generated */ + @Override public EAttribute getAb_X() { return (EAttribute)abEClass.getEStructuralFeatures().get(0); @@ -216,6 +225,7 @@ public class BacktrackingTestLanguagePackageImpl extends EPackageImpl implements * * @generated */ + @Override public EAttribute getAb_Y() { return (EAttribute)abEClass.getEStructuralFeatures().get(1); @@ -226,6 +236,7 @@ public class BacktrackingTestLanguagePackageImpl extends EPackageImpl implements * * @generated */ + @Override public EClass getXb() { return xbEClass; @@ -236,6 +247,7 @@ public class BacktrackingTestLanguagePackageImpl extends EPackageImpl implements * * @generated */ + @Override public EAttribute getXb_X() { return (EAttribute)xbEClass.getEStructuralFeatures().get(0); @@ -246,6 +258,7 @@ public class BacktrackingTestLanguagePackageImpl extends EPackageImpl implements * * @generated */ + @Override public EAttribute getXb_Y() { return (EAttribute)xbEClass.getEStructuralFeatures().get(1); @@ -256,6 +269,7 @@ public class BacktrackingTestLanguagePackageImpl extends EPackageImpl implements * * @generated */ + @Override public EEnum getEnumName() { return enumNameEEnum; @@ -266,6 +280,7 @@ public class BacktrackingTestLanguagePackageImpl extends EPackageImpl implements * * @generated */ + @Override public BacktrackingTestLanguageFactory getBacktrackingTestLanguageFactory() { return (BacktrackingTestLanguageFactory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/lexer/backtrackingTestLanguage/impl/ModelImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/lexer/backtrackingTestLanguage/impl/ModelImpl.java index fe240a6f5..b1c435d53 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/lexer/backtrackingTestLanguage/impl/ModelImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/lexer/backtrackingTestLanguage/impl/ModelImpl.java @@ -130,6 +130,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public EList getEnums() { if (enums == null) @@ -144,6 +145,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public EList getYcs() { if (ycs == null) @@ -158,6 +160,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public EList getAbs() { if (abs == null) @@ -172,6 +175,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public EList getXbs() { if (xbs == null) @@ -186,6 +190,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public EList getYs() { if (ys == null) @@ -200,6 +205,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public EList getAs() { if (as == null) @@ -360,7 +366,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (enums: "); result.append(enums); result.append(", ycs: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/lexer/backtrackingTestLanguage/impl/XbImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/lexer/backtrackingTestLanguage/impl/XbImpl.java index 3270bb134..ac3fa03c5 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/lexer/backtrackingTestLanguage/impl/XbImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/lexer/backtrackingTestLanguage/impl/XbImpl.java @@ -95,6 +95,7 @@ public class XbImpl extends MinimalEObjectImpl.Container implements Xb * * @generated */ + @Override public String getX() { return x; @@ -105,6 +106,7 @@ public class XbImpl extends MinimalEObjectImpl.Container implements Xb * * @generated */ + @Override public void setX(String newX) { String oldX = x; @@ -118,6 +120,7 @@ public class XbImpl extends MinimalEObjectImpl.Container implements Xb * * @generated */ + @Override public String getY() { return y; @@ -128,6 +131,7 @@ public class XbImpl extends MinimalEObjectImpl.Container implements Xb * * @generated */ + @Override public void setY(String newY) { String oldY = y; @@ -222,7 +226,7 @@ public class XbImpl extends MinimalEObjectImpl.Container implements Xb { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (x: "); result.append(x); result.append(", y: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/lexer/ignoreCaseTestLanguage/Model.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/lexer/ignoreCaseTestLanguage/Model.java index 13a5f4fca..d2cb3d212 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/lexer/ignoreCaseTestLanguage/Model.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/lexer/ignoreCaseTestLanguage/Model.java @@ -26,10 +26,6 @@ public interface Model extends EObject /** * Returns the value of the 'Value' attribute. * - *

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

* * @return the value of the 'Value' attribute. * @see #setValue(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/lexer/ignoreCaseTestLanguage/impl/IgnoreCaseTestLanguageFactoryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/lexer/ignoreCaseTestLanguage/impl/IgnoreCaseTestLanguageFactoryImpl.java index 91ff8d4b6..c7b9cc3a9 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/lexer/ignoreCaseTestLanguage/impl/IgnoreCaseTestLanguageFactoryImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/lexer/ignoreCaseTestLanguage/impl/IgnoreCaseTestLanguageFactoryImpl.java @@ -76,6 +76,7 @@ public class IgnoreCaseTestLanguageFactoryImpl extends EFactoryImpl implements I * * @generated */ + @Override public Model createModel() { ModelImpl model = new ModelImpl(); @@ -87,6 +88,7 @@ public class IgnoreCaseTestLanguageFactoryImpl extends EFactoryImpl implements I * * @generated */ + @Override public IgnoreCaseTestLanguagePackage getIgnoreCaseTestLanguagePackage() { return (IgnoreCaseTestLanguagePackage)getEPackage(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/lexer/ignoreCaseTestLanguage/impl/IgnoreCaseTestLanguagePackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/lexer/ignoreCaseTestLanguage/impl/IgnoreCaseTestLanguagePackageImpl.java index f2692ca30..0e058404b 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/lexer/ignoreCaseTestLanguage/impl/IgnoreCaseTestLanguagePackageImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/lexer/ignoreCaseTestLanguage/impl/IgnoreCaseTestLanguagePackageImpl.java @@ -58,7 +58,7 @@ public class IgnoreCaseTestLanguagePackageImpl extends EPackageImpl implements I /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link IgnoreCaseTestLanguagePackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -73,7 +73,8 @@ public class IgnoreCaseTestLanguagePackageImpl extends EPackageImpl implements I if (isInited) return (IgnoreCaseTestLanguagePackage)EPackage.Registry.INSTANCE.getEPackage(IgnoreCaseTestLanguagePackage.eNS_URI); // Obtain or create and register package - IgnoreCaseTestLanguagePackageImpl theIgnoreCaseTestLanguagePackage = (IgnoreCaseTestLanguagePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof IgnoreCaseTestLanguagePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new IgnoreCaseTestLanguagePackageImpl()); + Object registeredIgnoreCaseTestLanguagePackage = EPackage.Registry.INSTANCE.get(eNS_URI); + IgnoreCaseTestLanguagePackageImpl theIgnoreCaseTestLanguagePackage = registeredIgnoreCaseTestLanguagePackage instanceof IgnoreCaseTestLanguagePackageImpl ? (IgnoreCaseTestLanguagePackageImpl)registeredIgnoreCaseTestLanguagePackage : new IgnoreCaseTestLanguagePackageImpl(); isInited = true; @@ -89,7 +90,6 @@ public class IgnoreCaseTestLanguagePackageImpl extends EPackageImpl implements I // Mark meta-data to indicate it can't be changed theIgnoreCaseTestLanguagePackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(IgnoreCaseTestLanguagePackage.eNS_URI, theIgnoreCaseTestLanguagePackage); return theIgnoreCaseTestLanguagePackage; @@ -100,6 +100,7 @@ public class IgnoreCaseTestLanguagePackageImpl extends EPackageImpl implements I * * @generated */ + @Override public EClass getModel() { return modelEClass; @@ -110,6 +111,7 @@ public class IgnoreCaseTestLanguagePackageImpl extends EPackageImpl implements I * * @generated */ + @Override public EAttribute getModel_Value() { return (EAttribute)modelEClass.getEStructuralFeatures().get(0); @@ -120,6 +122,7 @@ public class IgnoreCaseTestLanguagePackageImpl extends EPackageImpl implements I * * @generated */ + @Override public IgnoreCaseTestLanguageFactory getIgnoreCaseTestLanguageFactory() { return (IgnoreCaseTestLanguageFactory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/lexer/ignoreCaseTestLanguage/impl/ModelImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/lexer/ignoreCaseTestLanguage/impl/ModelImpl.java index 9c2f90cee..d5ebeaad8 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/lexer/ignoreCaseTestLanguage/impl/ModelImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/lexer/ignoreCaseTestLanguage/impl/ModelImpl.java @@ -74,6 +74,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public String getValue() { return value; @@ -84,6 +85,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setValue(String newValue) { String oldValue = value; @@ -168,7 +170,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (value: "); result.append(value); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/AbstractIgnoreCaseLinkingTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/AbstractIgnoreCaseLinkingTestLanguage.genmodel index 32c4500ab..bb48bd0f8 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/AbstractIgnoreCaseLinkingTestLanguage.genmodel +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/AbstractIgnoreCaseLinkingTestLanguage.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="AbstractIgnoreCaseLinkingTestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> + complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/Bug287988TestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/Bug287988TestLanguage.genmodel index f2e5c9523..a7da7c319 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/Bug287988TestLanguage.genmodel +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/Bug287988TestLanguage.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="Bug287988TestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> + complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/Bug289059TestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/Bug289059TestLanguage.genmodel index 80204d275..de61f121e 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/Bug289059TestLanguage.genmodel +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/Bug289059TestLanguage.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="Bug289059TestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> + complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/Bug313089TestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/Bug313089TestLanguage.genmodel index 10f9f30f9..286b778d9 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/Bug313089TestLanguage.genmodel +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/Bug313089TestLanguage.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="Bug313089TestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> + complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/Bug362902.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/Bug362902.genmodel index 7f8c3d482..b9bbe3e26 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/Bug362902.genmodel +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/Bug362902.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="Bug362902" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> + complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/IgnoreCaseImportsTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/IgnoreCaseImportsTestLanguage.genmodel index e8bca565c..635e5f398 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/IgnoreCaseImportsTestLanguage.genmodel +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/IgnoreCaseImportsTestLanguage.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="IgnoreCaseImportsTestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore AbstractIgnoreCaseLinkingTestLanguage.genmodel#//ignoreCaseLinkingTest"> + complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore AbstractIgnoreCaseLinkingTestLanguage.genmodel#//ignoreCaseLinkingTest"> diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/IgnoreCaseNamespacesTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/IgnoreCaseNamespacesTestLanguage.genmodel index 1831616f1..14643c4f3 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/IgnoreCaseNamespacesTestLanguage.genmodel +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/IgnoreCaseNamespacesTestLanguage.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="IgnoreCaseNamespacesTestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore AbstractIgnoreCaseLinkingTestLanguage.genmodel#//ignoreCaseLinkingTest"> + complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore AbstractIgnoreCaseLinkingTestLanguage.genmodel#//ignoreCaseLinkingTest"> diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/ImportUriTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/ImportUriTestLanguage.genmodel index b19b02de1..fb134b0db 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/ImportUriTestLanguage.genmodel +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/ImportUriTestLanguage.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="ImportUriTestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> + complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/LangATestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/LangATestLanguage.genmodel index 87f06f42e..b1e7457bd 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/LangATestLanguage.genmodel +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/LangATestLanguage.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="LangATestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> + complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/bug287988Test/BaseAttribute.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/bug287988Test/BaseAttribute.java index d85415ea0..40784b4d3 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/bug287988Test/BaseAttribute.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/bug287988Test/BaseAttribute.java @@ -28,10 +28,6 @@ public interface BaseAttribute extends EObject /** * Returns the value of the 'Type Ref' reference. * - *

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

* * @return the value of the 'Type Ref' reference. * @see #setTypeRef(BaseAttribute) @@ -54,10 +50,6 @@ public interface BaseAttribute extends EObject /** * Returns the value of the 'Type' attribute. * - *

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

* * @return the value of the 'Type' attribute. * @see #setType(String) @@ -80,10 +72,6 @@ public interface BaseAttribute 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) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/bug287988Test/Model.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/bug287988Test/Model.java index 41f1c0a38..3d05e7861 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/bug287988Test/Model.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/bug287988Test/Model.java @@ -29,10 +29,6 @@ public interface Model extends EObject * Returns the value of the 'Attributes' containment reference list. * The list contents are of type {@link org.eclipse.xtext.linking.bug287988Test.BaseAttribute}. * - *

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

* * @return the value of the 'Attributes' containment reference list. * @see org.eclipse.xtext.linking.bug287988Test.Bug287988TestPackage#getModel_Attributes() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/bug287988Test/impl/BaseAttributeImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/bug287988Test/impl/BaseAttributeImpl.java index de1be683d..4025e2306 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/bug287988Test/impl/BaseAttributeImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/bug287988Test/impl/BaseAttributeImpl.java @@ -107,6 +107,7 @@ public class BaseAttributeImpl extends MinimalEObjectImpl.Container implements B * * @generated */ + @Override public BaseAttribute getTypeRef() { if (typeRef != null && typeRef.eIsProxy()) @@ -137,6 +138,7 @@ public class BaseAttributeImpl extends MinimalEObjectImpl.Container implements B * * @generated */ + @Override public void setTypeRef(BaseAttribute newTypeRef) { BaseAttribute oldTypeRef = typeRef; @@ -150,6 +152,7 @@ public class BaseAttributeImpl extends MinimalEObjectImpl.Container implements B * * @generated */ + @Override public String getType() { return type; @@ -160,6 +163,7 @@ public class BaseAttributeImpl extends MinimalEObjectImpl.Container implements B * * @generated */ + @Override public void setType(String newType) { String oldType = type; @@ -173,6 +177,7 @@ public class BaseAttributeImpl extends MinimalEObjectImpl.Container implements B * * @generated */ + @Override public String getName() { return name; @@ -183,6 +188,7 @@ public class BaseAttributeImpl extends MinimalEObjectImpl.Container implements B * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -288,7 +294,7 @@ public class BaseAttributeImpl extends MinimalEObjectImpl.Container implements B { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (type: "); result.append(type); result.append(", name: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/bug287988Test/impl/Bug287988TestFactoryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/bug287988Test/impl/Bug287988TestFactoryImpl.java index 096f6b590..d2bccd936 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/bug287988Test/impl/Bug287988TestFactoryImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/bug287988Test/impl/Bug287988TestFactoryImpl.java @@ -79,6 +79,7 @@ public class Bug287988TestFactoryImpl extends EFactoryImpl implements Bug287988T * * @generated */ + @Override public Model createModel() { ModelImpl model = new ModelImpl(); @@ -90,6 +91,7 @@ public class Bug287988TestFactoryImpl extends EFactoryImpl implements Bug287988T * * @generated */ + @Override public BaseAttribute createBaseAttribute() { BaseAttributeImpl baseAttribute = new BaseAttributeImpl(); @@ -101,6 +103,7 @@ public class Bug287988TestFactoryImpl extends EFactoryImpl implements Bug287988T * * @generated */ + @Override public Attribute createAttribute() { AttributeImpl attribute = new AttributeImpl(); @@ -112,6 +115,7 @@ public class Bug287988TestFactoryImpl extends EFactoryImpl implements Bug287988T * * @generated */ + @Override public Master createMaster() { MasterImpl master = new MasterImpl(); @@ -123,6 +127,7 @@ public class Bug287988TestFactoryImpl extends EFactoryImpl implements Bug287988T * * @generated */ + @Override public Bug287988TestPackage getBug287988TestPackage() { return (Bug287988TestPackage)getEPackage(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/bug287988Test/impl/Bug287988TestPackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/bug287988Test/impl/Bug287988TestPackageImpl.java index 2cf36d199..0b1eacb62 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/bug287988Test/impl/Bug287988TestPackageImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/bug287988Test/impl/Bug287988TestPackageImpl.java @@ -83,7 +83,7 @@ public class Bug287988TestPackageImpl extends EPackageImpl implements Bug287988T /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link Bug287988TestPackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -98,7 +98,8 @@ public class Bug287988TestPackageImpl extends EPackageImpl implements Bug287988T if (isInited) return (Bug287988TestPackage)EPackage.Registry.INSTANCE.getEPackage(Bug287988TestPackage.eNS_URI); // Obtain or create and register package - Bug287988TestPackageImpl theBug287988TestPackage = (Bug287988TestPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof Bug287988TestPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new Bug287988TestPackageImpl()); + Object registeredBug287988TestPackage = EPackage.Registry.INSTANCE.get(eNS_URI); + Bug287988TestPackageImpl theBug287988TestPackage = registeredBug287988TestPackage instanceof Bug287988TestPackageImpl ? (Bug287988TestPackageImpl)registeredBug287988TestPackage : new Bug287988TestPackageImpl(); isInited = true; @@ -114,7 +115,6 @@ public class Bug287988TestPackageImpl extends EPackageImpl implements Bug287988T // Mark meta-data to indicate it can't be changed theBug287988TestPackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(Bug287988TestPackage.eNS_URI, theBug287988TestPackage); return theBug287988TestPackage; @@ -125,6 +125,7 @@ public class Bug287988TestPackageImpl extends EPackageImpl implements Bug287988T * * @generated */ + @Override public EClass getModel() { return modelEClass; @@ -135,6 +136,7 @@ public class Bug287988TestPackageImpl extends EPackageImpl implements Bug287988T * * @generated */ + @Override public EReference getModel_Attributes() { return (EReference)modelEClass.getEStructuralFeatures().get(0); @@ -145,6 +147,7 @@ public class Bug287988TestPackageImpl extends EPackageImpl implements Bug287988T * * @generated */ + @Override public EClass getBaseAttribute() { return baseAttributeEClass; @@ -155,6 +158,7 @@ public class Bug287988TestPackageImpl extends EPackageImpl implements Bug287988T * * @generated */ + @Override public EReference getBaseAttribute_TypeRef() { return (EReference)baseAttributeEClass.getEStructuralFeatures().get(0); @@ -165,6 +169,7 @@ public class Bug287988TestPackageImpl extends EPackageImpl implements Bug287988T * * @generated */ + @Override public EAttribute getBaseAttribute_Type() { return (EAttribute)baseAttributeEClass.getEStructuralFeatures().get(1); @@ -175,6 +180,7 @@ public class Bug287988TestPackageImpl extends EPackageImpl implements Bug287988T * * @generated */ + @Override public EAttribute getBaseAttribute_Name() { return (EAttribute)baseAttributeEClass.getEStructuralFeatures().get(2); @@ -185,6 +191,7 @@ public class Bug287988TestPackageImpl extends EPackageImpl implements Bug287988T * * @generated */ + @Override public EClass getAttribute() { return attributeEClass; @@ -195,6 +202,7 @@ public class Bug287988TestPackageImpl extends EPackageImpl implements Bug287988T * * @generated */ + @Override public EClass getMaster() { return masterEClass; @@ -205,6 +213,7 @@ public class Bug287988TestPackageImpl extends EPackageImpl implements Bug287988T * * @generated */ + @Override public Bug287988TestFactory getBug287988TestFactory() { return (Bug287988TestFactory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/bug287988Test/impl/ModelImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/bug287988Test/impl/ModelImpl.java index cb376ee24..841e0f52c 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/bug287988Test/impl/ModelImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/bug287988Test/impl/ModelImpl.java @@ -72,6 +72,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public EList getAttributes() { if (attributes == null) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/bug289059Test/Model.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/bug289059Test/Model.java index 7a8e92e18..7db48887f 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/bug289059Test/Model.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/bug289059Test/Model.java @@ -28,10 +28,6 @@ public interface Model 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) @@ -54,10 +50,6 @@ public interface Model extends EObject /** * Returns the value of the 'Enabled' containment reference. * - *

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

* * @return the value of the 'Enabled' containment reference. * @see #setEnabled(UnassignedAction) @@ -80,10 +72,6 @@ public interface Model extends EObject /** * Returns the value of the 'Reference' reference. * - *

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

* * @return the value of the 'Reference' reference. * @see #setReference(Model) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/bug289059Test/impl/Bug289059TestFactoryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/bug289059Test/impl/Bug289059TestFactoryImpl.java index f0edecf74..15aa2ae1f 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/bug289059Test/impl/Bug289059TestFactoryImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/bug289059Test/impl/Bug289059TestFactoryImpl.java @@ -77,6 +77,7 @@ public class Bug289059TestFactoryImpl extends EFactoryImpl implements Bug289059T * * @generated */ + @Override public Model createModel() { ModelImpl model = new ModelImpl(); @@ -88,6 +89,7 @@ public class Bug289059TestFactoryImpl extends EFactoryImpl implements Bug289059T * * @generated */ + @Override public UnassignedAction createUnassignedAction() { UnassignedActionImpl unassignedAction = new UnassignedActionImpl(); @@ -99,6 +101,7 @@ public class Bug289059TestFactoryImpl extends EFactoryImpl implements Bug289059T * * @generated */ + @Override public Bug289059TestPackage getBug289059TestPackage() { return (Bug289059TestPackage)getEPackage(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/bug289059Test/impl/Bug289059TestPackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/bug289059Test/impl/Bug289059TestPackageImpl.java index da981e84e..0f9442c7c 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/bug289059Test/impl/Bug289059TestPackageImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/bug289059Test/impl/Bug289059TestPackageImpl.java @@ -67,7 +67,7 @@ public class Bug289059TestPackageImpl extends EPackageImpl implements Bug289059T /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link Bug289059TestPackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -82,7 +82,8 @@ public class Bug289059TestPackageImpl extends EPackageImpl implements Bug289059T if (isInited) return (Bug289059TestPackage)EPackage.Registry.INSTANCE.getEPackage(Bug289059TestPackage.eNS_URI); // Obtain or create and register package - Bug289059TestPackageImpl theBug289059TestPackage = (Bug289059TestPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof Bug289059TestPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new Bug289059TestPackageImpl()); + Object registeredBug289059TestPackage = EPackage.Registry.INSTANCE.get(eNS_URI); + Bug289059TestPackageImpl theBug289059TestPackage = registeredBug289059TestPackage instanceof Bug289059TestPackageImpl ? (Bug289059TestPackageImpl)registeredBug289059TestPackage : new Bug289059TestPackageImpl(); isInited = true; @@ -98,7 +99,6 @@ public class Bug289059TestPackageImpl extends EPackageImpl implements Bug289059T // Mark meta-data to indicate it can't be changed theBug289059TestPackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(Bug289059TestPackage.eNS_URI, theBug289059TestPackage); return theBug289059TestPackage; @@ -109,6 +109,7 @@ public class Bug289059TestPackageImpl extends EPackageImpl implements Bug289059T * * @generated */ + @Override public EClass getModel() { return modelEClass; @@ -119,6 +120,7 @@ public class Bug289059TestPackageImpl extends EPackageImpl implements Bug289059T * * @generated */ + @Override public EAttribute getModel_Name() { return (EAttribute)modelEClass.getEStructuralFeatures().get(0); @@ -129,6 +131,7 @@ public class Bug289059TestPackageImpl extends EPackageImpl implements Bug289059T * * @generated */ + @Override public EReference getModel_Enabled() { return (EReference)modelEClass.getEStructuralFeatures().get(1); @@ -139,6 +142,7 @@ public class Bug289059TestPackageImpl extends EPackageImpl implements Bug289059T * * @generated */ + @Override public EReference getModel_Reference() { return (EReference)modelEClass.getEStructuralFeatures().get(2); @@ -149,6 +153,7 @@ public class Bug289059TestPackageImpl extends EPackageImpl implements Bug289059T * * @generated */ + @Override public EClass getUnassignedAction() { return unassignedActionEClass; @@ -159,6 +164,7 @@ public class Bug289059TestPackageImpl extends EPackageImpl implements Bug289059T * * @generated */ + @Override public Bug289059TestFactory getBug289059TestFactory() { return (Bug289059TestFactory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/bug289059Test/impl/ModelImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/bug289059Test/impl/ModelImpl.java index 406051825..0bd11f028 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/bug289059Test/impl/ModelImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/bug289059Test/impl/ModelImpl.java @@ -99,6 +99,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public String getName() { return name; @@ -109,6 +110,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -122,6 +124,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public UnassignedAction getEnabled() { return enabled; @@ -149,6 +152,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setEnabled(UnassignedAction newEnabled) { if (newEnabled != enabled) @@ -170,6 +174,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public Model getReference() { if (reference != null && reference.eIsProxy()) @@ -200,6 +205,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setReference(Model newReference) { Model oldReference = reference; @@ -321,7 +327,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/bug313089/Bar.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/bug313089/Bar.java index ec02ada7a..a70e4a664 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/bug313089/Bar.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/bug313089/Bar.java @@ -26,10 +26,6 @@ public interface Bar 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) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/bug313089/Baz.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/bug313089/Baz.java index c841e7fb3..4bc5dfc71 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/bug313089/Baz.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/bug313089/Baz.java @@ -27,10 +27,6 @@ public interface Baz 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) @@ -53,10 +49,6 @@ public interface Baz extends EObject /** * Returns the value of the 'Child' containment reference. * - *

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

* * @return the value of the 'Child' containment reference. * @see #setChild(Baz) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/bug313089/Foo.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/bug313089/Foo.java index 7c6393ef8..feda874b2 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/bug313089/Foo.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/bug313089/Foo.java @@ -29,10 +29,6 @@ public interface Foo 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) @@ -55,10 +51,6 @@ public interface Foo extends EObject /** * Returns the value of the 'Bar' containment reference. * - *

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

* * @return the value of the 'Bar' containment reference. * @see #setBar(Bar) @@ -81,10 +73,6 @@ public interface Foo extends EObject /** * Returns the value of the 'Baz' containment reference. * - *

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

* * @return the value of the 'Baz' containment reference. * @see #setBaz(Baz) @@ -107,10 +95,6 @@ public interface Foo extends EObject /** * Returns the value of the 'Ref' reference. * - *

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

* * @return the value of the 'Ref' reference. * @see #setRef(Foo) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/bug313089/impl/BarImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/bug313089/impl/BarImpl.java index 2ab9f4f1e..ba4c96454 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/bug313089/impl/BarImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/bug313089/impl/BarImpl.java @@ -74,6 +74,7 @@ public class BarImpl extends MinimalEObjectImpl.Container implements Bar * * @generated */ + @Override public String getName() { return name; @@ -84,6 +85,7 @@ public class BarImpl extends MinimalEObjectImpl.Container implements Bar * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -168,7 +170,7 @@ public class BarImpl extends MinimalEObjectImpl.Container implements Bar { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/bug313089/impl/BazImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/bug313089/impl/BazImpl.java index 373fd4796..5aa5e7394 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/bug313089/impl/BazImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/bug313089/impl/BazImpl.java @@ -87,6 +87,7 @@ public class BazImpl extends MinimalEObjectImpl.Container implements Baz * * @generated */ + @Override public String getName() { return name; @@ -97,6 +98,7 @@ public class BazImpl extends MinimalEObjectImpl.Container implements Baz * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -110,6 +112,7 @@ public class BazImpl extends MinimalEObjectImpl.Container implements Baz * * @generated */ + @Override public Baz getChild() { return child; @@ -137,6 +140,7 @@ public class BazImpl extends MinimalEObjectImpl.Container implements Baz * * @generated */ + @Override public void setChild(Baz newChild) { if (newChild != child) @@ -255,7 +259,7 @@ public class BazImpl extends MinimalEObjectImpl.Container implements Baz { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/bug313089/impl/Bug313089FactoryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/bug313089/impl/Bug313089FactoryImpl.java index b4f65e993..aaffbcee3 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/bug313089/impl/Bug313089FactoryImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/bug313089/impl/Bug313089FactoryImpl.java @@ -78,6 +78,7 @@ public class Bug313089FactoryImpl extends EFactoryImpl implements Bug313089Facto * * @generated */ + @Override public Foo createFoo() { FooImpl foo = new FooImpl(); @@ -89,6 +90,7 @@ public class Bug313089FactoryImpl extends EFactoryImpl implements Bug313089Facto * * @generated */ + @Override public Bar createBar() { BarImpl bar = new BarImpl(); @@ -100,6 +102,7 @@ public class Bug313089FactoryImpl extends EFactoryImpl implements Bug313089Facto * * @generated */ + @Override public Baz createBaz() { BazImpl baz = new BazImpl(); @@ -111,6 +114,7 @@ public class Bug313089FactoryImpl extends EFactoryImpl implements Bug313089Facto * * @generated */ + @Override public Bug313089Package getBug313089Package() { return (Bug313089Package)getEPackage(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/bug313089/impl/Bug313089PackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/bug313089/impl/Bug313089PackageImpl.java index 2c05e76f0..327f51c89 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/bug313089/impl/Bug313089PackageImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/bug313089/impl/Bug313089PackageImpl.java @@ -75,7 +75,7 @@ public class Bug313089PackageImpl extends EPackageImpl implements Bug313089Packa /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link Bug313089Package#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -90,7 +90,8 @@ public class Bug313089PackageImpl extends EPackageImpl implements Bug313089Packa if (isInited) return (Bug313089Package)EPackage.Registry.INSTANCE.getEPackage(Bug313089Package.eNS_URI); // Obtain or create and register package - Bug313089PackageImpl theBug313089Package = (Bug313089PackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof Bug313089PackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new Bug313089PackageImpl()); + Object registeredBug313089Package = EPackage.Registry.INSTANCE.get(eNS_URI); + Bug313089PackageImpl theBug313089Package = registeredBug313089Package instanceof Bug313089PackageImpl ? (Bug313089PackageImpl)registeredBug313089Package : new Bug313089PackageImpl(); isInited = true; @@ -106,7 +107,6 @@ public class Bug313089PackageImpl extends EPackageImpl implements Bug313089Packa // Mark meta-data to indicate it can't be changed theBug313089Package.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(Bug313089Package.eNS_URI, theBug313089Package); return theBug313089Package; @@ -117,6 +117,7 @@ public class Bug313089PackageImpl extends EPackageImpl implements Bug313089Packa * * @generated */ + @Override public EClass getFoo() { return fooEClass; @@ -127,6 +128,7 @@ public class Bug313089PackageImpl extends EPackageImpl implements Bug313089Packa * * @generated */ + @Override public EAttribute getFoo_Name() { return (EAttribute)fooEClass.getEStructuralFeatures().get(0); @@ -137,6 +139,7 @@ public class Bug313089PackageImpl extends EPackageImpl implements Bug313089Packa * * @generated */ + @Override public EReference getFoo_Bar() { return (EReference)fooEClass.getEStructuralFeatures().get(1); @@ -147,6 +150,7 @@ public class Bug313089PackageImpl extends EPackageImpl implements Bug313089Packa * * @generated */ + @Override public EReference getFoo_Baz() { return (EReference)fooEClass.getEStructuralFeatures().get(2); @@ -157,6 +161,7 @@ public class Bug313089PackageImpl extends EPackageImpl implements Bug313089Packa * * @generated */ + @Override public EReference getFoo_Ref() { return (EReference)fooEClass.getEStructuralFeatures().get(3); @@ -167,6 +172,7 @@ public class Bug313089PackageImpl extends EPackageImpl implements Bug313089Packa * * @generated */ + @Override public EClass getBar() { return barEClass; @@ -177,6 +183,7 @@ public class Bug313089PackageImpl extends EPackageImpl implements Bug313089Packa * * @generated */ + @Override public EAttribute getBar_Name() { return (EAttribute)barEClass.getEStructuralFeatures().get(0); @@ -187,6 +194,7 @@ public class Bug313089PackageImpl extends EPackageImpl implements Bug313089Packa * * @generated */ + @Override public EClass getBaz() { return bazEClass; @@ -197,6 +205,7 @@ public class Bug313089PackageImpl extends EPackageImpl implements Bug313089Packa * * @generated */ + @Override public EAttribute getBaz_Name() { return (EAttribute)bazEClass.getEStructuralFeatures().get(0); @@ -207,6 +216,7 @@ public class Bug313089PackageImpl extends EPackageImpl implements Bug313089Packa * * @generated */ + @Override public EReference getBaz_Child() { return (EReference)bazEClass.getEStructuralFeatures().get(1); @@ -217,6 +227,7 @@ public class Bug313089PackageImpl extends EPackageImpl implements Bug313089Packa * * @generated */ + @Override public Bug313089Factory getBug313089Factory() { return (Bug313089Factory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/bug313089/impl/FooImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/bug313089/impl/FooImpl.java index bc60f744e..5b3d04239 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/bug313089/impl/FooImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/bug313089/impl/FooImpl.java @@ -111,6 +111,7 @@ public class FooImpl extends MinimalEObjectImpl.Container implements Foo * * @generated */ + @Override public String getName() { return name; @@ -121,6 +122,7 @@ public class FooImpl extends MinimalEObjectImpl.Container implements Foo * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -134,6 +136,7 @@ public class FooImpl extends MinimalEObjectImpl.Container implements Foo * * @generated */ + @Override public Bar getBar() { return bar; @@ -161,6 +164,7 @@ public class FooImpl extends MinimalEObjectImpl.Container implements Foo * * @generated */ + @Override public void setBar(Bar newBar) { if (newBar != bar) @@ -182,6 +186,7 @@ public class FooImpl extends MinimalEObjectImpl.Container implements Foo * * @generated */ + @Override public Baz getBaz() { return baz; @@ -209,6 +214,7 @@ public class FooImpl extends MinimalEObjectImpl.Container implements Foo * * @generated */ + @Override public void setBaz(Baz newBaz) { if (newBaz != baz) @@ -230,6 +236,7 @@ public class FooImpl extends MinimalEObjectImpl.Container implements Foo * * @generated */ + @Override public Foo getRef() { if (ref != null && ref.eIsProxy()) @@ -260,6 +267,7 @@ public class FooImpl extends MinimalEObjectImpl.Container implements Foo * * @generated */ + @Override public void setRef(Foo newRef) { Foo oldRef = ref; @@ -393,7 +401,7 @@ public class FooImpl extends MinimalEObjectImpl.Container implements Foo { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/bug362902/Greeting.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/bug362902/Greeting.java index b40d1a0e1..7f793024e 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/bug362902/Greeting.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/bug362902/Greeting.java @@ -26,10 +26,6 @@ public interface Greeting 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) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/bug362902/Model.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/bug362902/Model.java index 1f3db1717..fdc920bfb 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/bug362902/Model.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/bug362902/Model.java @@ -30,10 +30,6 @@ public interface Model extends EObject * Returns the value of the 'Greetings' containment reference list. * The list contents are of type {@link org.eclipse.xtext.linking.bug362902.Greeting}. * - *

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

* * @return the value of the 'Greetings' containment reference list. * @see org.eclipse.xtext.linking.bug362902.Bug362902Package#getModel_Greetings() @@ -45,10 +41,6 @@ public interface Model extends EObject /** * Returns the value of the 'Favourite' reference. * - *

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

* * @return the value of the 'Favourite' reference. * @see #setFavourite(Greeting) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/bug362902/impl/Bug362902FactoryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/bug362902/impl/Bug362902FactoryImpl.java index 7774604e4..c4e499ff8 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/bug362902/impl/Bug362902FactoryImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/bug362902/impl/Bug362902FactoryImpl.java @@ -77,6 +77,7 @@ public class Bug362902FactoryImpl extends EFactoryImpl implements Bug362902Facto * * @generated */ + @Override public Model createModel() { ModelImpl model = new ModelImpl(); @@ -88,6 +89,7 @@ public class Bug362902FactoryImpl extends EFactoryImpl implements Bug362902Facto * * @generated */ + @Override public Greeting createGreeting() { GreetingImpl greeting = new GreetingImpl(); @@ -99,6 +101,7 @@ public class Bug362902FactoryImpl extends EFactoryImpl implements Bug362902Facto * * @generated */ + @Override public Bug362902Package getBug362902Package() { return (Bug362902Package)getEPackage(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/bug362902/impl/Bug362902PackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/bug362902/impl/Bug362902PackageImpl.java index 421cf6f10..cc03c3a72 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/bug362902/impl/Bug362902PackageImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/bug362902/impl/Bug362902PackageImpl.java @@ -67,7 +67,7 @@ public class Bug362902PackageImpl extends EPackageImpl implements Bug362902Packa /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link Bug362902Package#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -82,7 +82,8 @@ public class Bug362902PackageImpl extends EPackageImpl implements Bug362902Packa if (isInited) return (Bug362902Package)EPackage.Registry.INSTANCE.getEPackage(Bug362902Package.eNS_URI); // Obtain or create and register package - Bug362902PackageImpl theBug362902Package = (Bug362902PackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof Bug362902PackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new Bug362902PackageImpl()); + Object registeredBug362902Package = EPackage.Registry.INSTANCE.get(eNS_URI); + Bug362902PackageImpl theBug362902Package = registeredBug362902Package instanceof Bug362902PackageImpl ? (Bug362902PackageImpl)registeredBug362902Package : new Bug362902PackageImpl(); isInited = true; @@ -98,7 +99,6 @@ public class Bug362902PackageImpl extends EPackageImpl implements Bug362902Packa // Mark meta-data to indicate it can't be changed theBug362902Package.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(Bug362902Package.eNS_URI, theBug362902Package); return theBug362902Package; @@ -109,6 +109,7 @@ public class Bug362902PackageImpl extends EPackageImpl implements Bug362902Packa * * @generated */ + @Override public EClass getModel() { return modelEClass; @@ -119,6 +120,7 @@ public class Bug362902PackageImpl extends EPackageImpl implements Bug362902Packa * * @generated */ + @Override public EReference getModel_Greetings() { return (EReference)modelEClass.getEStructuralFeatures().get(0); @@ -129,6 +131,7 @@ public class Bug362902PackageImpl extends EPackageImpl implements Bug362902Packa * * @generated */ + @Override public EReference getModel_Favourite() { return (EReference)modelEClass.getEStructuralFeatures().get(1); @@ -139,6 +142,7 @@ public class Bug362902PackageImpl extends EPackageImpl implements Bug362902Packa * * @generated */ + @Override public EClass getGreeting() { return greetingEClass; @@ -149,6 +153,7 @@ public class Bug362902PackageImpl extends EPackageImpl implements Bug362902Packa * * @generated */ + @Override public EAttribute getGreeting_Name() { return (EAttribute)greetingEClass.getEStructuralFeatures().get(0); @@ -159,6 +164,7 @@ public class Bug362902PackageImpl extends EPackageImpl implements Bug362902Packa * * @generated */ + @Override public Bug362902Factory getBug362902Factory() { return (Bug362902Factory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/bug362902/impl/GreetingImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/bug362902/impl/GreetingImpl.java index b0e913005..919c37471 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/bug362902/impl/GreetingImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/bug362902/impl/GreetingImpl.java @@ -74,6 +74,7 @@ public class GreetingImpl extends MinimalEObjectImpl.Container implements Greeti * * @generated */ + @Override public String getName() { return name; @@ -84,6 +85,7 @@ public class GreetingImpl extends MinimalEObjectImpl.Container implements Greeti * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -168,7 +170,7 @@ public class GreetingImpl extends MinimalEObjectImpl.Container implements Greeti { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/bug362902/impl/ModelImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/bug362902/impl/ModelImpl.java index c8b130fd8..0bee709ae 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/bug362902/impl/ModelImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/bug362902/impl/ModelImpl.java @@ -85,6 +85,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public EList getGreetings() { if (greetings == null) @@ -99,6 +100,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public Greeting getFavourite() { if (favourite != null && favourite.eIsProxy()) @@ -129,6 +131,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setFavourite(Greeting newFavourite) { Greeting oldFavourite = favourite; diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/ignoreCaseImportsTest/Import.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/ignoreCaseImportsTest/Import.java index 964bb9631..b1b44488d 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/ignoreCaseImportsTest/Import.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/ignoreCaseImportsTest/Import.java @@ -26,10 +26,6 @@ public interface Import extends EObject /** * Returns the value of the 'Import URI' attribute. * - *

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

* * @return the value of the 'Import URI' attribute. * @see #setImportURI(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/ignoreCaseImportsTest/Model.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/ignoreCaseImportsTest/Model.java index 6c3781efa..984e13646 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/ignoreCaseImportsTest/Model.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/ignoreCaseImportsTest/Model.java @@ -27,10 +27,6 @@ public interface Model extends org.eclipse.xtext.linking.ignoreCaseLinkingTest.M * Returns the value of the 'Imports' containment reference list. * The list contents are of type {@link org.eclipse.xtext.linking.ignoreCaseImportsTest.Import}. * - *

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

* * @return the value of the 'Imports' containment reference list. * @see org.eclipse.xtext.linking.ignoreCaseImportsTest.IgnoreCaseImportsTestPackage#getModel_Imports() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/ignoreCaseImportsTest/impl/IgnoreCaseImportsTestFactoryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/ignoreCaseImportsTest/impl/IgnoreCaseImportsTestFactoryImpl.java index 73510908b..1979dd640 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/ignoreCaseImportsTest/impl/IgnoreCaseImportsTestFactoryImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/ignoreCaseImportsTest/impl/IgnoreCaseImportsTestFactoryImpl.java @@ -77,6 +77,7 @@ public class IgnoreCaseImportsTestFactoryImpl extends EFactoryImpl implements Ig * * @generated */ + @Override public Model createModel() { ModelImpl model = new ModelImpl(); @@ -88,6 +89,7 @@ public class IgnoreCaseImportsTestFactoryImpl extends EFactoryImpl implements Ig * * @generated */ + @Override public Import createImport() { ImportImpl import_ = new ImportImpl(); @@ -99,6 +101,7 @@ public class IgnoreCaseImportsTestFactoryImpl extends EFactoryImpl implements Ig * * @generated */ + @Override public IgnoreCaseImportsTestPackage getIgnoreCaseImportsTestPackage() { return (IgnoreCaseImportsTestPackage)getEPackage(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/ignoreCaseImportsTest/impl/IgnoreCaseImportsTestPackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/ignoreCaseImportsTest/impl/IgnoreCaseImportsTestPackageImpl.java index b8bf4f624..7663765bc 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/ignoreCaseImportsTest/impl/IgnoreCaseImportsTestPackageImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/ignoreCaseImportsTest/impl/IgnoreCaseImportsTestPackageImpl.java @@ -69,7 +69,7 @@ public class IgnoreCaseImportsTestPackageImpl extends EPackageImpl implements Ig /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link IgnoreCaseImportsTestPackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -84,11 +84,13 @@ public class IgnoreCaseImportsTestPackageImpl extends EPackageImpl implements Ig if (isInited) return (IgnoreCaseImportsTestPackage)EPackage.Registry.INSTANCE.getEPackage(IgnoreCaseImportsTestPackage.eNS_URI); // Obtain or create and register package - IgnoreCaseImportsTestPackageImpl theIgnoreCaseImportsTestPackage = (IgnoreCaseImportsTestPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof IgnoreCaseImportsTestPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new IgnoreCaseImportsTestPackageImpl()); + Object registeredIgnoreCaseImportsTestPackage = EPackage.Registry.INSTANCE.get(eNS_URI); + IgnoreCaseImportsTestPackageImpl theIgnoreCaseImportsTestPackage = registeredIgnoreCaseImportsTestPackage instanceof IgnoreCaseImportsTestPackageImpl ? (IgnoreCaseImportsTestPackageImpl)registeredIgnoreCaseImportsTestPackage : new IgnoreCaseImportsTestPackageImpl(); isInited = true; // Initialize simple dependencies + EcorePackage.eINSTANCE.eClass(); IgnoreCaseLinkingTestPackage.eINSTANCE.eClass(); // Create package meta-data objects @@ -100,7 +102,6 @@ public class IgnoreCaseImportsTestPackageImpl extends EPackageImpl implements Ig // Mark meta-data to indicate it can't be changed theIgnoreCaseImportsTestPackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(IgnoreCaseImportsTestPackage.eNS_URI, theIgnoreCaseImportsTestPackage); return theIgnoreCaseImportsTestPackage; @@ -111,6 +112,7 @@ public class IgnoreCaseImportsTestPackageImpl extends EPackageImpl implements Ig * * @generated */ + @Override public EClass getModel() { return modelEClass; @@ -121,6 +123,7 @@ public class IgnoreCaseImportsTestPackageImpl extends EPackageImpl implements Ig * * @generated */ + @Override public EReference getModel_Imports() { return (EReference)modelEClass.getEStructuralFeatures().get(0); @@ -131,6 +134,7 @@ public class IgnoreCaseImportsTestPackageImpl extends EPackageImpl implements Ig * * @generated */ + @Override public EClass getImport() { return importEClass; @@ -141,6 +145,7 @@ public class IgnoreCaseImportsTestPackageImpl extends EPackageImpl implements Ig * * @generated */ + @Override public EAttribute getImport_ImportURI() { return (EAttribute)importEClass.getEStructuralFeatures().get(0); @@ -151,6 +156,7 @@ public class IgnoreCaseImportsTestPackageImpl extends EPackageImpl implements Ig * * @generated */ + @Override public IgnoreCaseImportsTestFactory getIgnoreCaseImportsTestFactory() { return (IgnoreCaseImportsTestFactory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/ignoreCaseImportsTest/impl/ImportImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/ignoreCaseImportsTest/impl/ImportImpl.java index 765c5fbcd..fe57bdb51 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/ignoreCaseImportsTest/impl/ImportImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/ignoreCaseImportsTest/impl/ImportImpl.java @@ -74,6 +74,7 @@ public class ImportImpl extends MinimalEObjectImpl.Container implements Import * * @generated */ + @Override public String getImportURI() { return importURI; @@ -84,6 +85,7 @@ public class ImportImpl extends MinimalEObjectImpl.Container implements Import * * @generated */ + @Override public void setImportURI(String newImportURI) { String oldImportURI = importURI; @@ -168,7 +170,7 @@ public class ImportImpl extends MinimalEObjectImpl.Container implements Import { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (importURI: "); result.append(importURI); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/ignoreCaseImportsTest/impl/ModelImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/ignoreCaseImportsTest/impl/ModelImpl.java index a9fdad235..0ef306396 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/ignoreCaseImportsTest/impl/ModelImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/ignoreCaseImportsTest/impl/ModelImpl.java @@ -70,6 +70,7 @@ public class ModelImpl extends org.eclipse.xtext.linking.ignoreCaseLinkingTest.i * * @generated */ + @Override public EList getImports() { if (imports == null) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/ignoreCaseLinkingTest/Element.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/ignoreCaseLinkingTest/Element.java index d5ff627dc..8e69b622d 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/ignoreCaseLinkingTest/Element.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/ignoreCaseLinkingTest/Element.java @@ -30,10 +30,6 @@ public interface Element 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) @@ -56,10 +52,6 @@ public interface Element extends EObject /** * Returns the value of the 'Reference' reference. * - *

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

* * @return the value of the 'Reference' reference. * @see #setReference(Element) @@ -83,10 +75,6 @@ public interface Element extends EObject * Returns the value of the 'Elements' containment reference list. * The list contents are of type {@link org.eclipse.xtext.linking.ignoreCaseLinkingTest.Element}. * - *

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

* * @return the value of the 'Elements' containment reference list. * @see org.eclipse.xtext.linking.ignoreCaseLinkingTest.IgnoreCaseLinkingTestPackage#getElement_Elements() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/ignoreCaseLinkingTest/Model.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/ignoreCaseLinkingTest/Model.java index c530021a1..1592a3352 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/ignoreCaseLinkingTest/Model.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/ignoreCaseLinkingTest/Model.java @@ -29,10 +29,6 @@ public interface Model extends EObject * Returns the value of the 'Elements' containment reference list. * The list contents are of type {@link org.eclipse.xtext.linking.ignoreCaseLinkingTest.Element}. * - *

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

* * @return the value of the 'Elements' containment reference list. * @see org.eclipse.xtext.linking.ignoreCaseLinkingTest.IgnoreCaseLinkingTestPackage#getModel_Elements() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/ignoreCaseLinkingTest/impl/ElementImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/ignoreCaseLinkingTest/impl/ElementImpl.java index 5e43e8454..593224b11 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/ignoreCaseLinkingTest/impl/ElementImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/ignoreCaseLinkingTest/impl/ElementImpl.java @@ -105,6 +105,7 @@ public class ElementImpl extends MinimalEObjectImpl.Container implements Element * * @generated */ + @Override public String getName() { return name; @@ -115,6 +116,7 @@ public class ElementImpl extends MinimalEObjectImpl.Container implements Element * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -128,6 +130,7 @@ public class ElementImpl extends MinimalEObjectImpl.Container implements Element * * @generated */ + @Override public Element getReference() { if (reference != null && reference.eIsProxy()) @@ -158,6 +161,7 @@ public class ElementImpl extends MinimalEObjectImpl.Container implements Element * * @generated */ + @Override public void setReference(Element newReference) { Element oldReference = reference; @@ -171,6 +175,7 @@ public class ElementImpl extends MinimalEObjectImpl.Container implements Element * * @generated */ + @Override public EList getElements() { if (elements == null) @@ -295,7 +300,7 @@ public class ElementImpl extends MinimalEObjectImpl.Container implements Element { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/ignoreCaseLinkingTest/impl/IgnoreCaseLinkingTestFactoryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/ignoreCaseLinkingTest/impl/IgnoreCaseLinkingTestFactoryImpl.java index 2c7fe0119..01c45a0ee 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/ignoreCaseLinkingTest/impl/IgnoreCaseLinkingTestFactoryImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/ignoreCaseLinkingTest/impl/IgnoreCaseLinkingTestFactoryImpl.java @@ -77,6 +77,7 @@ public class IgnoreCaseLinkingTestFactoryImpl extends EFactoryImpl implements Ig * * @generated */ + @Override public Model createModel() { ModelImpl model = new ModelImpl(); @@ -88,6 +89,7 @@ public class IgnoreCaseLinkingTestFactoryImpl extends EFactoryImpl implements Ig * * @generated */ + @Override public Element createElement() { ElementImpl element = new ElementImpl(); @@ -99,6 +101,7 @@ public class IgnoreCaseLinkingTestFactoryImpl extends EFactoryImpl implements Ig * * @generated */ + @Override public IgnoreCaseLinkingTestPackage getIgnoreCaseLinkingTestPackage() { return (IgnoreCaseLinkingTestPackage)getEPackage(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/ignoreCaseLinkingTest/impl/IgnoreCaseLinkingTestPackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/ignoreCaseLinkingTest/impl/IgnoreCaseLinkingTestPackageImpl.java index 0dcdf8256..341a92954 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/ignoreCaseLinkingTest/impl/IgnoreCaseLinkingTestPackageImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/ignoreCaseLinkingTest/impl/IgnoreCaseLinkingTestPackageImpl.java @@ -67,7 +67,7 @@ public class IgnoreCaseLinkingTestPackageImpl extends EPackageImpl implements Ig /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link IgnoreCaseLinkingTestPackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -82,7 +82,8 @@ public class IgnoreCaseLinkingTestPackageImpl extends EPackageImpl implements Ig if (isInited) return (IgnoreCaseLinkingTestPackage)EPackage.Registry.INSTANCE.getEPackage(IgnoreCaseLinkingTestPackage.eNS_URI); // Obtain or create and register package - IgnoreCaseLinkingTestPackageImpl theIgnoreCaseLinkingTestPackage = (IgnoreCaseLinkingTestPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof IgnoreCaseLinkingTestPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new IgnoreCaseLinkingTestPackageImpl()); + Object registeredIgnoreCaseLinkingTestPackage = EPackage.Registry.INSTANCE.get(eNS_URI); + IgnoreCaseLinkingTestPackageImpl theIgnoreCaseLinkingTestPackage = registeredIgnoreCaseLinkingTestPackage instanceof IgnoreCaseLinkingTestPackageImpl ? (IgnoreCaseLinkingTestPackageImpl)registeredIgnoreCaseLinkingTestPackage : new IgnoreCaseLinkingTestPackageImpl(); isInited = true; @@ -98,7 +99,6 @@ public class IgnoreCaseLinkingTestPackageImpl extends EPackageImpl implements Ig // Mark meta-data to indicate it can't be changed theIgnoreCaseLinkingTestPackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(IgnoreCaseLinkingTestPackage.eNS_URI, theIgnoreCaseLinkingTestPackage); return theIgnoreCaseLinkingTestPackage; @@ -109,6 +109,7 @@ public class IgnoreCaseLinkingTestPackageImpl extends EPackageImpl implements Ig * * @generated */ + @Override public EClass getModel() { return modelEClass; @@ -119,6 +120,7 @@ public class IgnoreCaseLinkingTestPackageImpl extends EPackageImpl implements Ig * * @generated */ + @Override public EReference getModel_Elements() { return (EReference)modelEClass.getEStructuralFeatures().get(0); @@ -129,6 +131,7 @@ public class IgnoreCaseLinkingTestPackageImpl extends EPackageImpl implements Ig * * @generated */ + @Override public EClass getElement() { return elementEClass; @@ -139,6 +142,7 @@ public class IgnoreCaseLinkingTestPackageImpl extends EPackageImpl implements Ig * * @generated */ + @Override public EAttribute getElement_Name() { return (EAttribute)elementEClass.getEStructuralFeatures().get(0); @@ -149,6 +153,7 @@ public class IgnoreCaseLinkingTestPackageImpl extends EPackageImpl implements Ig * * @generated */ + @Override public EReference getElement_Reference() { return (EReference)elementEClass.getEStructuralFeatures().get(1); @@ -159,6 +164,7 @@ public class IgnoreCaseLinkingTestPackageImpl extends EPackageImpl implements Ig * * @generated */ + @Override public EReference getElement_Elements() { return (EReference)elementEClass.getEStructuralFeatures().get(2); @@ -169,6 +175,7 @@ public class IgnoreCaseLinkingTestPackageImpl extends EPackageImpl implements Ig * * @generated */ + @Override public IgnoreCaseLinkingTestFactory getIgnoreCaseLinkingTestFactory() { return (IgnoreCaseLinkingTestFactory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/ignoreCaseLinkingTest/impl/ModelImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/ignoreCaseLinkingTest/impl/ModelImpl.java index 3264c6659..88c7636ce 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/ignoreCaseLinkingTest/impl/ModelImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/ignoreCaseLinkingTest/impl/ModelImpl.java @@ -72,6 +72,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public EList getElements() { if (elements == null) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/ignoreCaseNamespacesTest/Import.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/ignoreCaseNamespacesTest/Import.java index a638cd90d..53ea7618e 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/ignoreCaseNamespacesTest/Import.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/ignoreCaseNamespacesTest/Import.java @@ -26,10 +26,6 @@ public interface Import extends EObject /** * Returns the value of the 'Imported Namespace' attribute. * - *

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

* * @return the value of the 'Imported Namespace' attribute. * @see #setImportedNamespace(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/ignoreCaseNamespacesTest/Model.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/ignoreCaseNamespacesTest/Model.java index 7a82ab738..2163c0d48 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/ignoreCaseNamespacesTest/Model.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/ignoreCaseNamespacesTest/Model.java @@ -27,10 +27,6 @@ public interface Model extends org.eclipse.xtext.linking.ignoreCaseLinkingTest.M * Returns the value of the 'Imports' containment reference list. * The list contents are of type {@link org.eclipse.xtext.linking.ignoreCaseNamespacesTest.Import}. * - *

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

* * @return the value of the 'Imports' containment reference list. * @see org.eclipse.xtext.linking.ignoreCaseNamespacesTest.IgnoreCaseNamespacesTestPackage#getModel_Imports() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/ignoreCaseNamespacesTest/impl/IgnoreCaseNamespacesTestFactoryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/ignoreCaseNamespacesTest/impl/IgnoreCaseNamespacesTestFactoryImpl.java index dbf3e4fd3..ed0ec07fd 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/ignoreCaseNamespacesTest/impl/IgnoreCaseNamespacesTestFactoryImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/ignoreCaseNamespacesTest/impl/IgnoreCaseNamespacesTestFactoryImpl.java @@ -77,6 +77,7 @@ public class IgnoreCaseNamespacesTestFactoryImpl extends EFactoryImpl implements * * @generated */ + @Override public Model createModel() { ModelImpl model = new ModelImpl(); @@ -88,6 +89,7 @@ public class IgnoreCaseNamespacesTestFactoryImpl extends EFactoryImpl implements * * @generated */ + @Override public Import createImport() { ImportImpl import_ = new ImportImpl(); @@ -99,6 +101,7 @@ public class IgnoreCaseNamespacesTestFactoryImpl extends EFactoryImpl implements * * @generated */ + @Override public IgnoreCaseNamespacesTestPackage getIgnoreCaseNamespacesTestPackage() { return (IgnoreCaseNamespacesTestPackage)getEPackage(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/ignoreCaseNamespacesTest/impl/IgnoreCaseNamespacesTestPackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/ignoreCaseNamespacesTest/impl/IgnoreCaseNamespacesTestPackageImpl.java index 2ccf6eb87..3584bd3d9 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/ignoreCaseNamespacesTest/impl/IgnoreCaseNamespacesTestPackageImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/ignoreCaseNamespacesTest/impl/IgnoreCaseNamespacesTestPackageImpl.java @@ -69,7 +69,7 @@ public class IgnoreCaseNamespacesTestPackageImpl extends EPackageImpl implements /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link IgnoreCaseNamespacesTestPackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -84,11 +84,13 @@ public class IgnoreCaseNamespacesTestPackageImpl extends EPackageImpl implements if (isInited) return (IgnoreCaseNamespacesTestPackage)EPackage.Registry.INSTANCE.getEPackage(IgnoreCaseNamespacesTestPackage.eNS_URI); // Obtain or create and register package - IgnoreCaseNamespacesTestPackageImpl theIgnoreCaseNamespacesTestPackage = (IgnoreCaseNamespacesTestPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof IgnoreCaseNamespacesTestPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new IgnoreCaseNamespacesTestPackageImpl()); + Object registeredIgnoreCaseNamespacesTestPackage = EPackage.Registry.INSTANCE.get(eNS_URI); + IgnoreCaseNamespacesTestPackageImpl theIgnoreCaseNamespacesTestPackage = registeredIgnoreCaseNamespacesTestPackage instanceof IgnoreCaseNamespacesTestPackageImpl ? (IgnoreCaseNamespacesTestPackageImpl)registeredIgnoreCaseNamespacesTestPackage : new IgnoreCaseNamespacesTestPackageImpl(); isInited = true; // Initialize simple dependencies + EcorePackage.eINSTANCE.eClass(); IgnoreCaseLinkingTestPackage.eINSTANCE.eClass(); // Create package meta-data objects @@ -100,7 +102,6 @@ public class IgnoreCaseNamespacesTestPackageImpl extends EPackageImpl implements // Mark meta-data to indicate it can't be changed theIgnoreCaseNamespacesTestPackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(IgnoreCaseNamespacesTestPackage.eNS_URI, theIgnoreCaseNamespacesTestPackage); return theIgnoreCaseNamespacesTestPackage; @@ -111,6 +112,7 @@ public class IgnoreCaseNamespacesTestPackageImpl extends EPackageImpl implements * * @generated */ + @Override public EClass getModel() { return modelEClass; @@ -121,6 +123,7 @@ public class IgnoreCaseNamespacesTestPackageImpl extends EPackageImpl implements * * @generated */ + @Override public EReference getModel_Imports() { return (EReference)modelEClass.getEStructuralFeatures().get(0); @@ -131,6 +134,7 @@ public class IgnoreCaseNamespacesTestPackageImpl extends EPackageImpl implements * * @generated */ + @Override public EClass getImport() { return importEClass; @@ -141,6 +145,7 @@ public class IgnoreCaseNamespacesTestPackageImpl extends EPackageImpl implements * * @generated */ + @Override public EAttribute getImport_ImportedNamespace() { return (EAttribute)importEClass.getEStructuralFeatures().get(0); @@ -151,6 +156,7 @@ public class IgnoreCaseNamespacesTestPackageImpl extends EPackageImpl implements * * @generated */ + @Override public IgnoreCaseNamespacesTestFactory getIgnoreCaseNamespacesTestFactory() { return (IgnoreCaseNamespacesTestFactory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/ignoreCaseNamespacesTest/impl/ImportImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/ignoreCaseNamespacesTest/impl/ImportImpl.java index 28a9ceda8..fbef642a0 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/ignoreCaseNamespacesTest/impl/ImportImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/ignoreCaseNamespacesTest/impl/ImportImpl.java @@ -74,6 +74,7 @@ public class ImportImpl extends MinimalEObjectImpl.Container implements Import * * @generated */ + @Override public String getImportedNamespace() { return importedNamespace; @@ -84,6 +85,7 @@ public class ImportImpl extends MinimalEObjectImpl.Container implements Import * * @generated */ + @Override public void setImportedNamespace(String newImportedNamespace) { String oldImportedNamespace = importedNamespace; @@ -168,7 +170,7 @@ public class ImportImpl extends MinimalEObjectImpl.Container implements Import { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (importedNamespace: "); result.append(importedNamespace); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/ignoreCaseNamespacesTest/impl/ModelImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/ignoreCaseNamespacesTest/impl/ModelImpl.java index d4f418000..d0e15ef6e 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/ignoreCaseNamespacesTest/impl/ModelImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/ignoreCaseNamespacesTest/impl/ModelImpl.java @@ -70,6 +70,7 @@ public class ModelImpl extends org.eclipse.xtext.linking.ignoreCaseLinkingTest.i * * @generated */ + @Override public EList getImports() { if (imports == null) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/importedURI/Import.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/importedURI/Import.java index d476b35fa..5801d4333 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/importedURI/Import.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/importedURI/Import.java @@ -26,10 +26,6 @@ public interface Import extends EObject /** * Returns the value of the 'Import URI' attribute. * - *

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

* * @return the value of the 'Import URI' attribute. * @see #setImportURI(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/importedURI/Main.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/importedURI/Main.java index d97df1437..82f95d9d4 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/importedURI/Main.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/importedURI/Main.java @@ -30,10 +30,6 @@ public interface Main extends EObject * Returns the value of the 'Imports' containment reference list. * The list contents are of type {@link org.eclipse.xtext.linking.importedURI.Import}. * - *

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

* * @return the value of the 'Imports' containment reference list. * @see org.eclipse.xtext.linking.importedURI.ImportedURIPackage#getMain_Imports() @@ -46,10 +42,6 @@ public interface Main extends EObject * Returns the value of the 'Types' containment reference list. * The list contents are of type {@link org.eclipse.xtext.linking.importedURI.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.importedURI.ImportedURIPackage#getMain_Types() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/importedURI/Type.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/importedURI/Type.java index 5e567d4d0..239578ddc 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/importedURI/Type.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/importedURI/Type.java @@ -27,10 +27,6 @@ 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) @@ -53,10 +49,6 @@ public interface Type extends EObject /** * Returns the value of the 'Extends' reference. * - *

- * 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) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/importedURI/impl/ImportImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/importedURI/impl/ImportImpl.java index 70ba4348d..57f0d5cd0 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/importedURI/impl/ImportImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/importedURI/impl/ImportImpl.java @@ -74,6 +74,7 @@ public class ImportImpl extends MinimalEObjectImpl.Container implements Import * * @generated */ + @Override public String getImportURI() { return importURI; @@ -84,6 +85,7 @@ public class ImportImpl extends MinimalEObjectImpl.Container implements Import * * @generated */ + @Override public void setImportURI(String newImportURI) { String oldImportURI = importURI; @@ -168,7 +170,7 @@ public class ImportImpl extends MinimalEObjectImpl.Container implements Import { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (importURI: "); result.append(importURI); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/importedURI/impl/ImportedURIFactoryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/importedURI/impl/ImportedURIFactoryImpl.java index 7f71f82a7..0b49db6d6 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/importedURI/impl/ImportedURIFactoryImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/importedURI/impl/ImportedURIFactoryImpl.java @@ -78,6 +78,7 @@ public class ImportedURIFactoryImpl extends EFactoryImpl implements ImportedURIF * * @generated */ + @Override public Main createMain() { MainImpl main = new MainImpl(); @@ -89,6 +90,7 @@ public class ImportedURIFactoryImpl extends EFactoryImpl implements ImportedURIF * * @generated */ + @Override public Import createImport() { ImportImpl import_ = new ImportImpl(); @@ -100,6 +102,7 @@ public class ImportedURIFactoryImpl extends EFactoryImpl implements ImportedURIF * * @generated */ + @Override public Type createType() { TypeImpl type = new TypeImpl(); @@ -111,6 +114,7 @@ public class ImportedURIFactoryImpl extends EFactoryImpl implements ImportedURIF * * @generated */ + @Override public ImportedURIPackage getImportedURIPackage() { return (ImportedURIPackage)getEPackage(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/importedURI/impl/ImportedURIPackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/importedURI/impl/ImportedURIPackageImpl.java index ee7060448..14a5d8d85 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/importedURI/impl/ImportedURIPackageImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/importedURI/impl/ImportedURIPackageImpl.java @@ -75,7 +75,7 @@ public class ImportedURIPackageImpl extends EPackageImpl implements ImportedURIP /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link ImportedURIPackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -90,7 +90,8 @@ public class ImportedURIPackageImpl extends EPackageImpl implements ImportedURIP if (isInited) return (ImportedURIPackage)EPackage.Registry.INSTANCE.getEPackage(ImportedURIPackage.eNS_URI); // Obtain or create and register package - ImportedURIPackageImpl theImportedURIPackage = (ImportedURIPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof ImportedURIPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new ImportedURIPackageImpl()); + Object registeredImportedURIPackage = EPackage.Registry.INSTANCE.get(eNS_URI); + ImportedURIPackageImpl theImportedURIPackage = registeredImportedURIPackage instanceof ImportedURIPackageImpl ? (ImportedURIPackageImpl)registeredImportedURIPackage : new ImportedURIPackageImpl(); isInited = true; @@ -106,7 +107,6 @@ public class ImportedURIPackageImpl extends EPackageImpl implements ImportedURIP // Mark meta-data to indicate it can't be changed theImportedURIPackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(ImportedURIPackage.eNS_URI, theImportedURIPackage); return theImportedURIPackage; @@ -117,6 +117,7 @@ public class ImportedURIPackageImpl extends EPackageImpl implements ImportedURIP * * @generated */ + @Override public EClass getMain() { return mainEClass; @@ -127,6 +128,7 @@ public class ImportedURIPackageImpl extends EPackageImpl implements ImportedURIP * * @generated */ + @Override public EReference getMain_Imports() { return (EReference)mainEClass.getEStructuralFeatures().get(0); @@ -137,6 +139,7 @@ public class ImportedURIPackageImpl extends EPackageImpl implements ImportedURIP * * @generated */ + @Override public EReference getMain_Types() { return (EReference)mainEClass.getEStructuralFeatures().get(1); @@ -147,6 +150,7 @@ public class ImportedURIPackageImpl extends EPackageImpl implements ImportedURIP * * @generated */ + @Override public EClass getImport() { return importEClass; @@ -157,6 +161,7 @@ public class ImportedURIPackageImpl extends EPackageImpl implements ImportedURIP * * @generated */ + @Override public EAttribute getImport_ImportURI() { return (EAttribute)importEClass.getEStructuralFeatures().get(0); @@ -167,6 +172,7 @@ public class ImportedURIPackageImpl extends EPackageImpl implements ImportedURIP * * @generated */ + @Override public EClass getType() { return typeEClass; @@ -177,6 +183,7 @@ public class ImportedURIPackageImpl extends EPackageImpl implements ImportedURIP * * @generated */ + @Override public EAttribute getType_Name() { return (EAttribute)typeEClass.getEStructuralFeatures().get(0); @@ -187,6 +194,7 @@ public class ImportedURIPackageImpl extends EPackageImpl implements ImportedURIP * * @generated */ + @Override public EReference getType_Extends() { return (EReference)typeEClass.getEStructuralFeatures().get(1); @@ -197,6 +205,7 @@ public class ImportedURIPackageImpl extends EPackageImpl implements ImportedURIP * * @generated */ + @Override public ImportedURIFactory getImportedURIFactory() { return (ImportedURIFactory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/importedURI/impl/MainImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/importedURI/impl/MainImpl.java index 655cb80f5..80675e9b9 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/importedURI/impl/MainImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/importedURI/impl/MainImpl.java @@ -84,6 +84,7 @@ public class MainImpl extends MinimalEObjectImpl.Container implements Main * * @generated */ + @Override public EList getImports() { if (imports == null) @@ -98,6 +99,7 @@ public class MainImpl extends MinimalEObjectImpl.Container implements Main * * @generated */ + @Override public EList getTypes() { if (types == null) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/importedURI/impl/TypeImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/importedURI/impl/TypeImpl.java index aa84899da..1eda05acc 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/importedURI/impl/TypeImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/importedURI/impl/TypeImpl.java @@ -86,6 +86,7 @@ public class TypeImpl extends MinimalEObjectImpl.Container implements Type * * @generated */ + @Override public String getName() { return name; @@ -96,6 +97,7 @@ public class TypeImpl extends MinimalEObjectImpl.Container implements Type * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -109,6 +111,7 @@ public class TypeImpl extends MinimalEObjectImpl.Container implements Type * * @generated */ + @Override public Type getExtends() { if (extends_ != null && extends_.eIsProxy()) @@ -139,6 +142,7 @@ public class TypeImpl extends MinimalEObjectImpl.Container implements Type * * @generated */ + @Override public void setExtends(Type newExtends) { Type oldExtends = extends_; @@ -234,7 +238,7 @@ public class TypeImpl extends MinimalEObjectImpl.Container implements Type { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/langATestLanguage/Import.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/langATestLanguage/Import.java index 625daa05c..ad0e39e84 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/langATestLanguage/Import.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/langATestLanguage/Import.java @@ -26,10 +26,6 @@ public interface Import extends EObject /** * Returns the value of the 'Uri' attribute. * - *

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

* * @return the value of the 'Uri' attribute. * @see #setUri(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/langATestLanguage/Main.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/langATestLanguage/Main.java index 1a829e88b..add2377e0 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/langATestLanguage/Main.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/langATestLanguage/Main.java @@ -30,10 +30,6 @@ public interface Main extends EObject * Returns the value of the 'Imports' containment reference list. * The list contents are of type {@link org.eclipse.xtext.linking.langATestLanguage.Import}. * - *

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

* * @return the value of the 'Imports' containment reference list. * @see org.eclipse.xtext.linking.langATestLanguage.LangATestLanguagePackage#getMain_Imports() @@ -46,10 +42,6 @@ public interface Main extends EObject * Returns the value of the 'Types' containment reference list. * The list contents are of type {@link org.eclipse.xtext.linking.langATestLanguage.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.langATestLanguage.LangATestLanguagePackage#getMain_Types() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/langATestLanguage/Type.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/langATestLanguage/Type.java index ea48b13ee..0a3718b25 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/langATestLanguage/Type.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/langATestLanguage/Type.java @@ -30,10 +30,6 @@ 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) @@ -56,10 +52,6 @@ public interface Type extends EObject /** * Returns the value of the 'Extends' reference. * - *

- * 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) @@ -83,10 +75,6 @@ public interface Type extends EObject * Returns the value of the 'Implements' reference list. * The list contents are of type {@link org.eclipse.xtext.linking.langATestLanguage.Type}. * - *

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

* * @return the value of the 'Implements' reference list. * @see org.eclipse.xtext.linking.langATestLanguage.LangATestLanguagePackage#getType_Implements() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/langATestLanguage/impl/ImportImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/langATestLanguage/impl/ImportImpl.java index 28d9380e0..5001e6ae1 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/langATestLanguage/impl/ImportImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/langATestLanguage/impl/ImportImpl.java @@ -74,6 +74,7 @@ public class ImportImpl extends MinimalEObjectImpl.Container implements Import * * @generated */ + @Override public String getUri() { return uri; @@ -84,6 +85,7 @@ public class ImportImpl extends MinimalEObjectImpl.Container implements Import * * @generated */ + @Override public void setUri(String newUri) { String oldUri = uri; @@ -168,7 +170,7 @@ public class ImportImpl extends MinimalEObjectImpl.Container implements Import { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (uri: "); result.append(uri); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/langATestLanguage/impl/LangATestLanguageFactoryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/langATestLanguage/impl/LangATestLanguageFactoryImpl.java index 73423ca24..1ba4ba77e 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/langATestLanguage/impl/LangATestLanguageFactoryImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/langATestLanguage/impl/LangATestLanguageFactoryImpl.java @@ -78,6 +78,7 @@ public class LangATestLanguageFactoryImpl extends EFactoryImpl implements LangAT * * @generated */ + @Override public Main createMain() { MainImpl main = new MainImpl(); @@ -89,6 +90,7 @@ public class LangATestLanguageFactoryImpl extends EFactoryImpl implements LangAT * * @generated */ + @Override public Import createImport() { ImportImpl import_ = new ImportImpl(); @@ -100,6 +102,7 @@ public class LangATestLanguageFactoryImpl extends EFactoryImpl implements LangAT * * @generated */ + @Override public Type createType() { TypeImpl type = new TypeImpl(); @@ -111,6 +114,7 @@ public class LangATestLanguageFactoryImpl extends EFactoryImpl implements LangAT * * @generated */ + @Override public LangATestLanguagePackage getLangATestLanguagePackage() { return (LangATestLanguagePackage)getEPackage(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/langATestLanguage/impl/LangATestLanguagePackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/langATestLanguage/impl/LangATestLanguagePackageImpl.java index 4fb709561..3ebbefac4 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/langATestLanguage/impl/LangATestLanguagePackageImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/langATestLanguage/impl/LangATestLanguagePackageImpl.java @@ -75,7 +75,7 @@ public class LangATestLanguagePackageImpl extends EPackageImpl implements LangAT /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link LangATestLanguagePackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -90,7 +90,8 @@ public class LangATestLanguagePackageImpl extends EPackageImpl implements LangAT if (isInited) return (LangATestLanguagePackage)EPackage.Registry.INSTANCE.getEPackage(LangATestLanguagePackage.eNS_URI); // Obtain or create and register package - LangATestLanguagePackageImpl theLangATestLanguagePackage = (LangATestLanguagePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof LangATestLanguagePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new LangATestLanguagePackageImpl()); + Object registeredLangATestLanguagePackage = EPackage.Registry.INSTANCE.get(eNS_URI); + LangATestLanguagePackageImpl theLangATestLanguagePackage = registeredLangATestLanguagePackage instanceof LangATestLanguagePackageImpl ? (LangATestLanguagePackageImpl)registeredLangATestLanguagePackage : new LangATestLanguagePackageImpl(); isInited = true; @@ -106,7 +107,6 @@ public class LangATestLanguagePackageImpl extends EPackageImpl implements LangAT // Mark meta-data to indicate it can't be changed theLangATestLanguagePackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(LangATestLanguagePackage.eNS_URI, theLangATestLanguagePackage); return theLangATestLanguagePackage; @@ -117,6 +117,7 @@ public class LangATestLanguagePackageImpl extends EPackageImpl implements LangAT * * @generated */ + @Override public EClass getMain() { return mainEClass; @@ -127,6 +128,7 @@ public class LangATestLanguagePackageImpl extends EPackageImpl implements LangAT * * @generated */ + @Override public EReference getMain_Imports() { return (EReference)mainEClass.getEStructuralFeatures().get(0); @@ -137,6 +139,7 @@ public class LangATestLanguagePackageImpl extends EPackageImpl implements LangAT * * @generated */ + @Override public EReference getMain_Types() { return (EReference)mainEClass.getEStructuralFeatures().get(1); @@ -147,6 +150,7 @@ public class LangATestLanguagePackageImpl extends EPackageImpl implements LangAT * * @generated */ + @Override public EClass getImport() { return importEClass; @@ -157,6 +161,7 @@ public class LangATestLanguagePackageImpl extends EPackageImpl implements LangAT * * @generated */ + @Override public EAttribute getImport_Uri() { return (EAttribute)importEClass.getEStructuralFeatures().get(0); @@ -167,6 +172,7 @@ public class LangATestLanguagePackageImpl extends EPackageImpl implements LangAT * * @generated */ + @Override public EClass getType() { return typeEClass; @@ -177,6 +183,7 @@ public class LangATestLanguagePackageImpl extends EPackageImpl implements LangAT * * @generated */ + @Override public EAttribute getType_Name() { return (EAttribute)typeEClass.getEStructuralFeatures().get(0); @@ -187,6 +194,7 @@ public class LangATestLanguagePackageImpl extends EPackageImpl implements LangAT * * @generated */ + @Override public EReference getType_Extends() { return (EReference)typeEClass.getEStructuralFeatures().get(1); @@ -197,6 +205,7 @@ public class LangATestLanguagePackageImpl extends EPackageImpl implements LangAT * * @generated */ + @Override public EReference getType_Implements() { return (EReference)typeEClass.getEStructuralFeatures().get(2); @@ -207,6 +216,7 @@ public class LangATestLanguagePackageImpl extends EPackageImpl implements LangAT * * @generated */ + @Override public LangATestLanguageFactory getLangATestLanguageFactory() { return (LangATestLanguageFactory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/langATestLanguage/impl/MainImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/langATestLanguage/impl/MainImpl.java index 6c9d956aa..122258f5e 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/langATestLanguage/impl/MainImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/langATestLanguage/impl/MainImpl.java @@ -84,6 +84,7 @@ public class MainImpl extends MinimalEObjectImpl.Container implements Main * * @generated */ + @Override public EList getImports() { if (imports == null) @@ -98,6 +99,7 @@ public class MainImpl extends MinimalEObjectImpl.Container implements Main * * @generated */ + @Override public EList getTypes() { if (types == null) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/langATestLanguage/impl/TypeImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/langATestLanguage/impl/TypeImpl.java index 56fe0b053..70d35bd23 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/langATestLanguage/impl/TypeImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/langATestLanguage/impl/TypeImpl.java @@ -103,6 +103,7 @@ public class TypeImpl extends MinimalEObjectImpl.Container implements Type * * @generated */ + @Override public String getName() { return name; @@ -113,6 +114,7 @@ public class TypeImpl extends MinimalEObjectImpl.Container implements Type * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -126,6 +128,7 @@ public class TypeImpl extends MinimalEObjectImpl.Container implements Type * * @generated */ + @Override public Type getExtends() { if (extends_ != null && extends_.eIsProxy()) @@ -156,6 +159,7 @@ public class TypeImpl extends MinimalEObjectImpl.Container implements Type * * @generated */ + @Override public void setExtends(Type newExtends) { Type oldExtends = extends_; @@ -169,6 +173,7 @@ public class TypeImpl extends MinimalEObjectImpl.Container implements Type * * @generated */ + @Override public EList getImplements() { if (implements_ == null) @@ -277,7 +282,7 @@ public class TypeImpl extends MinimalEObjectImpl.Container implements Type { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/Bug311337TestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/Bug311337TestLanguage.genmodel index 646e7705f..274c74a49 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/Bug311337TestLanguage.genmodel +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/Bug311337TestLanguage.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="Bug311337TestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> + complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/bug311337/Child.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/bug311337/Child.java index 0a093d0e7..40b968601 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/bug311337/Child.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/bug311337/Child.java @@ -27,10 +27,6 @@ public interface Child 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) @@ -53,10 +49,6 @@ public interface Child extends EObject /** * Returns the value of the 'Link' reference. * - *

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

* * @return the value of the 'Link' reference. * @see #setLink(Definition) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/bug311337/Definition.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/bug311337/Definition.java index 1c980abd3..0779525f8 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/bug311337/Definition.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/bug311337/Definition.java @@ -30,10 +30,6 @@ public interface Definition 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) @@ -57,10 +53,6 @@ public interface Definition extends EObject * Returns the value of the 'Child' containment reference list. * The list contents are of type {@link org.eclipse.xtext.linking.lazy.bug311337.Child}. * - *

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

* * @return the value of the 'Child' containment reference list. * @see org.eclipse.xtext.linking.lazy.bug311337.Bug311337Package#getDefinition_Child() @@ -73,10 +65,6 @@ public interface Definition extends EObject * Returns the value of the 'Ref' containment reference list. * The list contents are of type {@link org.eclipse.xtext.linking.lazy.bug311337.Reference}. * - *

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

* * @return the value of the 'Ref' containment reference list. * @see org.eclipse.xtext.linking.lazy.bug311337.Bug311337Package#getDefinition_Ref() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/bug311337/Model.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/bug311337/Model.java index 45b588469..1cf546de3 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/bug311337/Model.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/bug311337/Model.java @@ -29,10 +29,6 @@ public interface Model extends EObject * Returns the value of the 'Def' containment reference list. * The list contents are of type {@link org.eclipse.xtext.linking.lazy.bug311337.Definition}. * - *

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

* * @return the value of the 'Def' containment reference list. * @see org.eclipse.xtext.linking.lazy.bug311337.Bug311337Package#getModel_Def() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/bug311337/NestedRef.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/bug311337/NestedRef.java index 84b4f5659..e00d7e36b 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/bug311337/NestedRef.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/bug311337/NestedRef.java @@ -25,10 +25,6 @@ public interface NestedRef extends Reference /** * Returns the value of the 'Left' containment reference. * - *

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

* * @return the value of the 'Left' containment reference. * @see #setLeft(Reference) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/bug311337/Reference.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/bug311337/Reference.java index 67eb6fe1a..e92331033 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/bug311337/Reference.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/bug311337/Reference.java @@ -26,10 +26,6 @@ public interface Reference extends EObject /** * Returns the value of the 'Ref Child' reference. * - *

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

* * @return the value of the 'Ref Child' reference. * @see #setRefChild(Child) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/bug311337/impl/Bug311337FactoryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/bug311337/impl/Bug311337FactoryImpl.java index 11ad3d177..743d4c47d 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/bug311337/impl/Bug311337FactoryImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/bug311337/impl/Bug311337FactoryImpl.java @@ -80,6 +80,7 @@ public class Bug311337FactoryImpl extends EFactoryImpl implements Bug311337Facto * * @generated */ + @Override public Model createModel() { ModelImpl model = new ModelImpl(); @@ -91,6 +92,7 @@ public class Bug311337FactoryImpl extends EFactoryImpl implements Bug311337Facto * * @generated */ + @Override public Definition createDefinition() { DefinitionImpl definition = new DefinitionImpl(); @@ -102,6 +104,7 @@ public class Bug311337FactoryImpl extends EFactoryImpl implements Bug311337Facto * * @generated */ + @Override public Child createChild() { ChildImpl child = new ChildImpl(); @@ -113,6 +116,7 @@ public class Bug311337FactoryImpl extends EFactoryImpl implements Bug311337Facto * * @generated */ + @Override public Reference createReference() { ReferenceImpl reference = new ReferenceImpl(); @@ -124,6 +128,7 @@ public class Bug311337FactoryImpl extends EFactoryImpl implements Bug311337Facto * * @generated */ + @Override public NestedRef createNestedRef() { NestedRefImpl nestedRef = new NestedRefImpl(); @@ -135,6 +140,7 @@ public class Bug311337FactoryImpl extends EFactoryImpl implements Bug311337Facto * * @generated */ + @Override public Bug311337Package getBug311337Package() { return (Bug311337Package)getEPackage(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/bug311337/impl/Bug311337PackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/bug311337/impl/Bug311337PackageImpl.java index 0405a6582..2db590b51 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/bug311337/impl/Bug311337PackageImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/bug311337/impl/Bug311337PackageImpl.java @@ -91,7 +91,7 @@ public class Bug311337PackageImpl extends EPackageImpl implements Bug311337Packa /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link Bug311337Package#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -106,7 +106,8 @@ public class Bug311337PackageImpl extends EPackageImpl implements Bug311337Packa if (isInited) return (Bug311337Package)EPackage.Registry.INSTANCE.getEPackage(Bug311337Package.eNS_URI); // Obtain or create and register package - Bug311337PackageImpl theBug311337Package = (Bug311337PackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof Bug311337PackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new Bug311337PackageImpl()); + Object registeredBug311337Package = EPackage.Registry.INSTANCE.get(eNS_URI); + Bug311337PackageImpl theBug311337Package = registeredBug311337Package instanceof Bug311337PackageImpl ? (Bug311337PackageImpl)registeredBug311337Package : new Bug311337PackageImpl(); isInited = true; @@ -122,7 +123,6 @@ public class Bug311337PackageImpl extends EPackageImpl implements Bug311337Packa // Mark meta-data to indicate it can't be changed theBug311337Package.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(Bug311337Package.eNS_URI, theBug311337Package); return theBug311337Package; @@ -133,6 +133,7 @@ public class Bug311337PackageImpl extends EPackageImpl implements Bug311337Packa * * @generated */ + @Override public EClass getModel() { return modelEClass; @@ -143,6 +144,7 @@ public class Bug311337PackageImpl extends EPackageImpl implements Bug311337Packa * * @generated */ + @Override public EReference getModel_Def() { return (EReference)modelEClass.getEStructuralFeatures().get(0); @@ -153,6 +155,7 @@ public class Bug311337PackageImpl extends EPackageImpl implements Bug311337Packa * * @generated */ + @Override public EClass getDefinition() { return definitionEClass; @@ -163,6 +166,7 @@ public class Bug311337PackageImpl extends EPackageImpl implements Bug311337Packa * * @generated */ + @Override public EAttribute getDefinition_Name() { return (EAttribute)definitionEClass.getEStructuralFeatures().get(0); @@ -173,6 +177,7 @@ public class Bug311337PackageImpl extends EPackageImpl implements Bug311337Packa * * @generated */ + @Override public EReference getDefinition_Child() { return (EReference)definitionEClass.getEStructuralFeatures().get(1); @@ -183,6 +188,7 @@ public class Bug311337PackageImpl extends EPackageImpl implements Bug311337Packa * * @generated */ + @Override public EReference getDefinition_Ref() { return (EReference)definitionEClass.getEStructuralFeatures().get(2); @@ -193,6 +199,7 @@ public class Bug311337PackageImpl extends EPackageImpl implements Bug311337Packa * * @generated */ + @Override public EClass getChild() { return childEClass; @@ -203,6 +210,7 @@ public class Bug311337PackageImpl extends EPackageImpl implements Bug311337Packa * * @generated */ + @Override public EAttribute getChild_Name() { return (EAttribute)childEClass.getEStructuralFeatures().get(0); @@ -213,6 +221,7 @@ public class Bug311337PackageImpl extends EPackageImpl implements Bug311337Packa * * @generated */ + @Override public EReference getChild_Link() { return (EReference)childEClass.getEStructuralFeatures().get(1); @@ -223,6 +232,7 @@ public class Bug311337PackageImpl extends EPackageImpl implements Bug311337Packa * * @generated */ + @Override public EClass getReference() { return referenceEClass; @@ -233,6 +243,7 @@ public class Bug311337PackageImpl extends EPackageImpl implements Bug311337Packa * * @generated */ + @Override public EReference getReference_RefChild() { return (EReference)referenceEClass.getEStructuralFeatures().get(0); @@ -243,6 +254,7 @@ public class Bug311337PackageImpl extends EPackageImpl implements Bug311337Packa * * @generated */ + @Override public EClass getNestedRef() { return nestedRefEClass; @@ -253,6 +265,7 @@ public class Bug311337PackageImpl extends EPackageImpl implements Bug311337Packa * * @generated */ + @Override public EReference getNestedRef_Left() { return (EReference)nestedRefEClass.getEStructuralFeatures().get(0); @@ -263,6 +276,7 @@ public class Bug311337PackageImpl extends EPackageImpl implements Bug311337Packa * * @generated */ + @Override public Bug311337Factory getBug311337Factory() { return (Bug311337Factory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/bug311337/impl/ChildImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/bug311337/impl/ChildImpl.java index bb35c7e38..f82cad66a 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/bug311337/impl/ChildImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/bug311337/impl/ChildImpl.java @@ -87,6 +87,7 @@ public class ChildImpl extends MinimalEObjectImpl.Container implements Child * * @generated */ + @Override public String getName() { return name; @@ -97,6 +98,7 @@ public class ChildImpl extends MinimalEObjectImpl.Container implements Child * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -110,6 +112,7 @@ public class ChildImpl extends MinimalEObjectImpl.Container implements Child * * @generated */ + @Override public Definition getLink() { if (link != null && link.eIsProxy()) @@ -140,6 +143,7 @@ public class ChildImpl extends MinimalEObjectImpl.Container implements Child * * @generated */ + @Override public void setLink(Definition newLink) { Definition oldLink = link; @@ -235,7 +239,7 @@ public class ChildImpl extends MinimalEObjectImpl.Container implements Child { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/bug311337/impl/DefinitionImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/bug311337/impl/DefinitionImpl.java index 7d39d942d..aff6df563 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/bug311337/impl/DefinitionImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/bug311337/impl/DefinitionImpl.java @@ -107,6 +107,7 @@ public class DefinitionImpl extends MinimalEObjectImpl.Container implements Defi * * @generated */ + @Override public String getName() { return name; @@ -117,6 +118,7 @@ public class DefinitionImpl extends MinimalEObjectImpl.Container implements Defi * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -130,6 +132,7 @@ public class DefinitionImpl extends MinimalEObjectImpl.Container implements Defi * * @generated */ + @Override public EList getChild() { if (child == null) @@ -144,6 +147,7 @@ public class DefinitionImpl extends MinimalEObjectImpl.Container implements Defi * * @generated */ + @Override public EList getRef() { if (ref == null) @@ -270,7 +274,7 @@ public class DefinitionImpl extends MinimalEObjectImpl.Container implements Defi { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/bug311337/impl/ModelImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/bug311337/impl/ModelImpl.java index 148b252bc..269792fee 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/bug311337/impl/ModelImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/bug311337/impl/ModelImpl.java @@ -72,6 +72,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public EList getDef() { if (def == null) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/bug311337/impl/NestedRefImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/bug311337/impl/NestedRefImpl.java index f10eeb0dc..ca108b4b4 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/bug311337/impl/NestedRefImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/bug311337/impl/NestedRefImpl.java @@ -66,6 +66,7 @@ public class NestedRefImpl extends ReferenceImpl implements NestedRef * * @generated */ + @Override public Reference getLeft() { return left; @@ -93,6 +94,7 @@ public class NestedRefImpl extends ReferenceImpl implements NestedRef * * @generated */ + @Override public void setLeft(Reference newLeft) { if (newLeft != left) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/bug311337/impl/ReferenceImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/bug311337/impl/ReferenceImpl.java index faff1f169..31d45d24b 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/bug311337/impl/ReferenceImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/bug311337/impl/ReferenceImpl.java @@ -66,6 +66,7 @@ public class ReferenceImpl extends MinimalEObjectImpl.Container implements Refer * * @generated */ + @Override public Child getRefChild() { if (refChild != null && refChild.eIsProxy()) @@ -96,6 +97,7 @@ public class ReferenceImpl extends MinimalEObjectImpl.Container implements Refer * * @generated */ + @Override public void setRefChild(Child newRefChild) { Child oldRefChild = refChild; diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/EcoreReferenceTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/EcoreReferenceTestLanguage.genmodel index 010e232fd..efafa4f34 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/EcoreReferenceTestLanguage.genmodel +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/EcoreReferenceTestLanguage.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="EcoreReferenceTestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../../../../../src/org/eclipse/xtext/metamodelreferencing/tests/EcoreReferences.genmodel#//ecorePerNsURI ../../../../../../src/org/eclipse/xtext/metamodelreferencing/tests/EcoreReferences.genmodel#//ecorePerPlatformPlugin ../../../../../../src/org/eclipse/xtext/metamodelreferencing/tests/EcoreReferences.genmodel#//ecorePerPlatformResource"> + complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../../../../../src/org/eclipse/xtext/metamodelreferencing/tests/EcoreReferences.genmodel#//ecorePerNsURI ../../../../../../src/org/eclipse/xtext/metamodelreferencing/tests/EcoreReferences.genmodel#//ecorePerPlatformPlugin ../../../../../../src/org/eclipse/xtext/metamodelreferencing/tests/EcoreReferences.genmodel#//ecorePerPlatformResource"> diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/MetamodelRefTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/MetamodelRefTestLanguage.genmodel index da13c6bb3..704f8abdf 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/MetamodelRefTestLanguage.genmodel +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/MetamodelRefTestLanguage.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="MetamodelRefTestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore platform:/resource/org.eclipse.xtext/org/eclipse/xtext/Xtext.genmodel#//xtext"> + complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore platform:/resource/org.eclipse.xtext/org/eclipse/xtext/Xtext.genmodel#//xtext"> diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/MultiGenMMTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/MultiGenMMTestLanguage.genmodel index 8e5aca4dc..8d411902f 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/MultiGenMMTestLanguage.genmodel +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/MultiGenMMTestLanguage.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="MultiGenMMTestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> + complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/anotherSimpleTest/Foo.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/anotherSimpleTest/Foo.java index 66d4b7c3a..199fa295a 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/anotherSimpleTest/Foo.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/anotherSimpleTest/Foo.java @@ -31,10 +31,6 @@ public interface Foo 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) @@ -58,10 +54,6 @@ public interface Foo extends EObject * Returns the value of the 'Name Refs' containment reference list. * The list contents are of type {@link org.eclipse.xtext.RuleCall}. * - *

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

* * @return the value of the 'Name Refs' containment reference list. * @see org.eclipse.xtext.metamodelreferencing.tests.anotherSimpleTest.AnotherSimpleTestPackage#getFoo_NameRefs() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/anotherSimpleTest/impl/AnotherSimpleTestFactoryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/anotherSimpleTest/impl/AnotherSimpleTestFactoryImpl.java index 87e3a58c1..a228e6a23 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/anotherSimpleTest/impl/AnotherSimpleTestFactoryImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/anotherSimpleTest/impl/AnotherSimpleTestFactoryImpl.java @@ -76,6 +76,7 @@ public class AnotherSimpleTestFactoryImpl extends EFactoryImpl implements Anothe * * @generated */ + @Override public Foo createFoo() { FooImpl foo = new FooImpl(); @@ -87,6 +88,7 @@ public class AnotherSimpleTestFactoryImpl extends EFactoryImpl implements Anothe * * @generated */ + @Override public AnotherSimpleTestPackage getAnotherSimpleTestPackage() { return (AnotherSimpleTestPackage)getEPackage(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/anotherSimpleTest/impl/AnotherSimpleTestPackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/anotherSimpleTest/impl/AnotherSimpleTestPackageImpl.java index 9b7d79933..e78879185 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/anotherSimpleTest/impl/AnotherSimpleTestPackageImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/anotherSimpleTest/impl/AnotherSimpleTestPackageImpl.java @@ -61,7 +61,7 @@ public class AnotherSimpleTestPackageImpl extends EPackageImpl implements Anothe /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link AnotherSimpleTestPackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -76,11 +76,13 @@ public class AnotherSimpleTestPackageImpl extends EPackageImpl implements Anothe if (isInited) return (AnotherSimpleTestPackage)EPackage.Registry.INSTANCE.getEPackage(AnotherSimpleTestPackage.eNS_URI); // Obtain or create and register package - AnotherSimpleTestPackageImpl theAnotherSimpleTestPackage = (AnotherSimpleTestPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof AnotherSimpleTestPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new AnotherSimpleTestPackageImpl()); + Object registeredAnotherSimpleTestPackage = EPackage.Registry.INSTANCE.get(eNS_URI); + AnotherSimpleTestPackageImpl theAnotherSimpleTestPackage = registeredAnotherSimpleTestPackage instanceof AnotherSimpleTestPackageImpl ? (AnotherSimpleTestPackageImpl)registeredAnotherSimpleTestPackage : new AnotherSimpleTestPackageImpl(); isInited = true; // Initialize simple dependencies + EcorePackage.eINSTANCE.eClass(); XtextPackage.eINSTANCE.eClass(); // Create package meta-data objects @@ -92,7 +94,6 @@ public class AnotherSimpleTestPackageImpl extends EPackageImpl implements Anothe // Mark meta-data to indicate it can't be changed theAnotherSimpleTestPackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(AnotherSimpleTestPackage.eNS_URI, theAnotherSimpleTestPackage); return theAnotherSimpleTestPackage; @@ -103,6 +104,7 @@ public class AnotherSimpleTestPackageImpl extends EPackageImpl implements Anothe * * @generated */ + @Override public EClass getFoo() { return fooEClass; @@ -113,6 +115,7 @@ public class AnotherSimpleTestPackageImpl extends EPackageImpl implements Anothe * * @generated */ + @Override public EAttribute getFoo_Name() { return (EAttribute)fooEClass.getEStructuralFeatures().get(0); @@ -123,6 +126,7 @@ public class AnotherSimpleTestPackageImpl extends EPackageImpl implements Anothe * * @generated */ + @Override public EReference getFoo_NameRefs() { return (EReference)fooEClass.getEStructuralFeatures().get(1); @@ -133,6 +137,7 @@ public class AnotherSimpleTestPackageImpl extends EPackageImpl implements Anothe * * @generated */ + @Override public AnotherSimpleTestFactory getAnotherSimpleTestFactory() { return (AnotherSimpleTestFactory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/anotherSimpleTest/impl/FooImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/anotherSimpleTest/impl/FooImpl.java index b8a1265e5..a17b45443 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/anotherSimpleTest/impl/FooImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/anotherSimpleTest/impl/FooImpl.java @@ -96,6 +96,7 @@ public class FooImpl extends MinimalEObjectImpl.Container implements Foo * * @generated */ + @Override public String getName() { return name; @@ -106,6 +107,7 @@ public class FooImpl extends MinimalEObjectImpl.Container implements Foo * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -119,6 +121,7 @@ public class FooImpl extends MinimalEObjectImpl.Container implements Foo * * @generated */ + @Override public EList getNameRefs() { if (nameRefs == null) @@ -232,7 +235,7 @@ public class FooImpl extends MinimalEObjectImpl.Container implements Foo { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/ecoreReference/Model.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/ecoreReference/Model.java index f0987bb0d..ebe506058 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/ecoreReference/Model.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/ecoreReference/Model.java @@ -29,10 +29,6 @@ public interface Model extends EObject * Returns the value of the 'Extends' containment reference list. * The list contents are of type {@link org.eclipse.emf.ecore.EObject}. * - *

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

* * @return the value of the 'Extends' containment reference list. * @see org.eclipse.xtext.metamodelreferencing.tests.ecoreReference.EcoreReferencePackage#getModel_Extends() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/ecoreReference/impl/EcoreReferenceFactoryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/ecoreReference/impl/EcoreReferenceFactoryImpl.java index 718a06d1b..95fd93ebd 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/ecoreReference/impl/EcoreReferenceFactoryImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/ecoreReference/impl/EcoreReferenceFactoryImpl.java @@ -79,6 +79,7 @@ public class EcoreReferenceFactoryImpl extends EFactoryImpl implements EcoreRefe * * @generated */ + @Override public Model createModel() { ModelImpl model = new ModelImpl(); @@ -90,6 +91,7 @@ public class EcoreReferenceFactoryImpl extends EFactoryImpl implements EcoreRefe * * @generated */ + @Override public MyNamedElement_01 createMyNamedElement_01() { MyNamedElement_01Impl myNamedElement_01 = new MyNamedElement_01Impl(); @@ -101,6 +103,7 @@ public class EcoreReferenceFactoryImpl extends EFactoryImpl implements EcoreRefe * * @generated */ + @Override public MyNamedElement_02 createMyNamedElement_02() { MyNamedElement_02Impl myNamedElement_02 = new MyNamedElement_02Impl(); @@ -112,6 +115,7 @@ public class EcoreReferenceFactoryImpl extends EFactoryImpl implements EcoreRefe * * @generated */ + @Override public MyNamedElement_03 createMyNamedElement_03() { MyNamedElement_03Impl myNamedElement_03 = new MyNamedElement_03Impl(); @@ -123,6 +127,7 @@ public class EcoreReferenceFactoryImpl extends EFactoryImpl implements EcoreRefe * * @generated */ + @Override public EcoreReferencePackage getEcoreReferencePackage() { return (EcoreReferencePackage)getEPackage(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/ecoreReference/impl/EcoreReferencePackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/ecoreReference/impl/EcoreReferencePackageImpl.java index d2d88bc6f..f39645d3a 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/ecoreReference/impl/EcoreReferencePackageImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/ecoreReference/impl/EcoreReferencePackageImpl.java @@ -88,7 +88,7 @@ public class EcoreReferencePackageImpl extends EPackageImpl implements EcoreRefe /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link EcoreReferencePackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -103,11 +103,13 @@ public class EcoreReferencePackageImpl extends EPackageImpl implements EcoreRefe if (isInited) return (EcoreReferencePackage)EPackage.Registry.INSTANCE.getEPackage(EcoreReferencePackage.eNS_URI); // Obtain or create and register package - EcoreReferencePackageImpl theEcoreReferencePackage = (EcoreReferencePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof EcoreReferencePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new EcoreReferencePackageImpl()); + Object registeredEcoreReferencePackage = EPackage.Registry.INSTANCE.get(eNS_URI); + EcoreReferencePackageImpl theEcoreReferencePackage = registeredEcoreReferencePackage instanceof EcoreReferencePackageImpl ? (EcoreReferencePackageImpl)registeredEcoreReferencePackage : new EcoreReferencePackageImpl(); isInited = true; // Initialize simple dependencies + EcorePackage.eINSTANCE.eClass(); EcorePerNsURIPackage.eINSTANCE.eClass(); EcorePerPlatformPluginPackage.eINSTANCE.eClass(); EcorePerPlatformResourcePackage.eINSTANCE.eClass(); @@ -121,7 +123,6 @@ public class EcoreReferencePackageImpl extends EPackageImpl implements EcoreRefe // Mark meta-data to indicate it can't be changed theEcoreReferencePackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(EcoreReferencePackage.eNS_URI, theEcoreReferencePackage); return theEcoreReferencePackage; @@ -132,6 +133,7 @@ public class EcoreReferencePackageImpl extends EPackageImpl implements EcoreRefe * * @generated */ + @Override public EClass getModel() { return modelEClass; @@ -142,6 +144,7 @@ public class EcoreReferencePackageImpl extends EPackageImpl implements EcoreRefe * * @generated */ + @Override public EReference getModel_Extends() { return (EReference)modelEClass.getEStructuralFeatures().get(0); @@ -152,6 +155,7 @@ public class EcoreReferencePackageImpl extends EPackageImpl implements EcoreRefe * * @generated */ + @Override public EClass getMyNamedElement_01() { return myNamedElement_01EClass; @@ -162,6 +166,7 @@ public class EcoreReferencePackageImpl extends EPackageImpl implements EcoreRefe * * @generated */ + @Override public EClass getMyNamedElement_02() { return myNamedElement_02EClass; @@ -172,6 +177,7 @@ public class EcoreReferencePackageImpl extends EPackageImpl implements EcoreRefe * * @generated */ + @Override public EClass getMyNamedElement_03() { return myNamedElement_03EClass; @@ -182,6 +188,7 @@ public class EcoreReferencePackageImpl extends EPackageImpl implements EcoreRefe * * @generated */ + @Override public EcoreReferenceFactory getEcoreReferenceFactory() { return (EcoreReferenceFactory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/ecoreReference/impl/ModelImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/ecoreReference/impl/ModelImpl.java index e44430501..0e320acb2 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/ecoreReference/impl/ModelImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/ecoreReference/impl/ModelImpl.java @@ -72,6 +72,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public EList getExtends() { if (extends_ == null) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/otherTest/FooBar.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/otherTest/FooBar.java index 8c3384097..c074a0813 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/otherTest/FooBar.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/otherTest/FooBar.java @@ -26,10 +26,6 @@ public interface FooBar 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) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/otherTest/impl/FooBarImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/otherTest/impl/FooBarImpl.java index bd57ce8fb..df48ed6fd 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/otherTest/impl/FooBarImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/otherTest/impl/FooBarImpl.java @@ -74,6 +74,7 @@ public class FooBarImpl extends MinimalEObjectImpl.Container implements FooBar * * @generated */ + @Override public String getName() { return name; @@ -84,6 +85,7 @@ public class FooBarImpl extends MinimalEObjectImpl.Container implements FooBar * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -168,7 +170,7 @@ public class FooBarImpl extends MinimalEObjectImpl.Container implements FooBar { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/otherTest/impl/OtherTestFactoryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/otherTest/impl/OtherTestFactoryImpl.java index 715d58d7d..e24dbd132 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/otherTest/impl/OtherTestFactoryImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/otherTest/impl/OtherTestFactoryImpl.java @@ -76,6 +76,7 @@ public class OtherTestFactoryImpl extends EFactoryImpl implements OtherTestFacto * * @generated */ + @Override public FooBar createFooBar() { FooBarImpl fooBar = new FooBarImpl(); @@ -87,6 +88,7 @@ public class OtherTestFactoryImpl extends EFactoryImpl implements OtherTestFacto * * @generated */ + @Override public OtherTestPackage getOtherTestPackage() { return (OtherTestPackage)getEPackage(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/otherTest/impl/OtherTestPackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/otherTest/impl/OtherTestPackageImpl.java index 20982f1e9..62372f7c1 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/otherTest/impl/OtherTestPackageImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/otherTest/impl/OtherTestPackageImpl.java @@ -62,7 +62,7 @@ public class OtherTestPackageImpl extends EPackageImpl implements OtherTestPacka /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link OtherTestPackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -77,7 +77,8 @@ public class OtherTestPackageImpl extends EPackageImpl implements OtherTestPacka if (isInited) return (OtherTestPackage)EPackage.Registry.INSTANCE.getEPackage(OtherTestPackage.eNS_URI); // Obtain or create and register package - OtherTestPackageImpl theOtherTestPackage = (OtherTestPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof OtherTestPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new OtherTestPackageImpl()); + Object registeredOtherTestPackage = EPackage.Registry.INSTANCE.get(eNS_URI); + OtherTestPackageImpl theOtherTestPackage = registeredOtherTestPackage instanceof OtherTestPackageImpl ? (OtherTestPackageImpl)registeredOtherTestPackage : new OtherTestPackageImpl(); isInited = true; @@ -85,7 +86,8 @@ public class OtherTestPackageImpl extends EPackageImpl implements OtherTestPacka EcorePackage.eINSTANCE.eClass(); // Obtain or create and register interdependencies - SimpleTestPackageImpl theSimpleTestPackage = (SimpleTestPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(SimpleTestPackage.eNS_URI) instanceof SimpleTestPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(SimpleTestPackage.eNS_URI) : SimpleTestPackage.eINSTANCE); + Object registeredPackage = EPackage.Registry.INSTANCE.getEPackage(SimpleTestPackage.eNS_URI); + SimpleTestPackageImpl theSimpleTestPackage = (SimpleTestPackageImpl)(registeredPackage instanceof SimpleTestPackageImpl ? registeredPackage : SimpleTestPackage.eINSTANCE); // Create package meta-data objects theOtherTestPackage.createPackageContents(); @@ -98,7 +100,6 @@ public class OtherTestPackageImpl extends EPackageImpl implements OtherTestPacka // Mark meta-data to indicate it can't be changed theOtherTestPackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(OtherTestPackage.eNS_URI, theOtherTestPackage); return theOtherTestPackage; @@ -109,6 +110,7 @@ public class OtherTestPackageImpl extends EPackageImpl implements OtherTestPacka * * @generated */ + @Override public EClass getFooBar() { return fooBarEClass; @@ -119,6 +121,7 @@ public class OtherTestPackageImpl extends EPackageImpl implements OtherTestPacka * * @generated */ + @Override public EAttribute getFooBar_Name() { return (EAttribute)fooBarEClass.getEStructuralFeatures().get(0); @@ -129,6 +132,7 @@ public class OtherTestPackageImpl extends EPackageImpl implements OtherTestPacka * * @generated */ + @Override public OtherTestFactory getOtherTestFactory() { return (OtherTestFactory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/simpleTest/Foo.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/simpleTest/Foo.java index 96b54e55d..19249e12d 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/simpleTest/Foo.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/simpleTest/Foo.java @@ -31,10 +31,6 @@ public interface Foo 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) @@ -58,10 +54,6 @@ public interface Foo extends EObject * Returns the value of the 'Name Refs' containment reference list. * The list contents are of type {@link org.eclipse.xtext.metamodelreferencing.tests.otherTest.FooBar}. * - *

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

* * @return the value of the 'Name Refs' containment reference list. * @see org.eclipse.xtext.metamodelreferencing.tests.simpleTest.SimpleTestPackage#getFoo_NameRefs() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/simpleTest/impl/FooImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/simpleTest/impl/FooImpl.java index 980cb6632..276a34ea8 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/simpleTest/impl/FooImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/simpleTest/impl/FooImpl.java @@ -96,6 +96,7 @@ public class FooImpl extends MinimalEObjectImpl.Container implements Foo * * @generated */ + @Override public String getName() { return name; @@ -106,6 +107,7 @@ public class FooImpl extends MinimalEObjectImpl.Container implements Foo * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -119,6 +121,7 @@ public class FooImpl extends MinimalEObjectImpl.Container implements Foo * * @generated */ + @Override public EList getNameRefs() { if (nameRefs == null) @@ -232,7 +235,7 @@ public class FooImpl extends MinimalEObjectImpl.Container implements Foo { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/simpleTest/impl/SimpleTestFactoryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/simpleTest/impl/SimpleTestFactoryImpl.java index 8ff1e4cab..82fd751e8 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/simpleTest/impl/SimpleTestFactoryImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/simpleTest/impl/SimpleTestFactoryImpl.java @@ -76,6 +76,7 @@ public class SimpleTestFactoryImpl extends EFactoryImpl implements SimpleTestFac * * @generated */ + @Override public Foo createFoo() { FooImpl foo = new FooImpl(); @@ -87,6 +88,7 @@ public class SimpleTestFactoryImpl extends EFactoryImpl implements SimpleTestFac * * @generated */ + @Override public SimpleTestPackage getSimpleTestPackage() { return (SimpleTestPackage)getEPackage(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/simpleTest/impl/SimpleTestPackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/simpleTest/impl/SimpleTestPackageImpl.java index 8a7566fad..bf63315f3 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/simpleTest/impl/SimpleTestPackageImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/metamodelreferencing/tests/simpleTest/impl/SimpleTestPackageImpl.java @@ -63,7 +63,7 @@ public class SimpleTestPackageImpl extends EPackageImpl implements SimpleTestPac /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link SimpleTestPackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -78,7 +78,8 @@ public class SimpleTestPackageImpl extends EPackageImpl implements SimpleTestPac if (isInited) return (SimpleTestPackage)EPackage.Registry.INSTANCE.getEPackage(SimpleTestPackage.eNS_URI); // Obtain or create and register package - SimpleTestPackageImpl theSimpleTestPackage = (SimpleTestPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof SimpleTestPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new SimpleTestPackageImpl()); + Object registeredSimpleTestPackage = EPackage.Registry.INSTANCE.get(eNS_URI); + SimpleTestPackageImpl theSimpleTestPackage = registeredSimpleTestPackage instanceof SimpleTestPackageImpl ? (SimpleTestPackageImpl)registeredSimpleTestPackage : new SimpleTestPackageImpl(); isInited = true; @@ -86,7 +87,8 @@ public class SimpleTestPackageImpl extends EPackageImpl implements SimpleTestPac EcorePackage.eINSTANCE.eClass(); // Obtain or create and register interdependencies - OtherTestPackageImpl theOtherTestPackage = (OtherTestPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(OtherTestPackage.eNS_URI) instanceof OtherTestPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(OtherTestPackage.eNS_URI) : OtherTestPackage.eINSTANCE); + Object registeredPackage = EPackage.Registry.INSTANCE.getEPackage(OtherTestPackage.eNS_URI); + OtherTestPackageImpl theOtherTestPackage = (OtherTestPackageImpl)(registeredPackage instanceof OtherTestPackageImpl ? registeredPackage : OtherTestPackage.eINSTANCE); // Create package meta-data objects theSimpleTestPackage.createPackageContents(); @@ -99,7 +101,6 @@ public class SimpleTestPackageImpl extends EPackageImpl implements SimpleTestPac // Mark meta-data to indicate it can't be changed theSimpleTestPackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(SimpleTestPackage.eNS_URI, theSimpleTestPackage); return theSimpleTestPackage; @@ -110,6 +111,7 @@ public class SimpleTestPackageImpl extends EPackageImpl implements SimpleTestPac * * @generated */ + @Override public EClass getFoo() { return fooEClass; @@ -120,6 +122,7 @@ public class SimpleTestPackageImpl extends EPackageImpl implements SimpleTestPac * * @generated */ + @Override public EAttribute getFoo_Name() { return (EAttribute)fooEClass.getEStructuralFeatures().get(0); @@ -130,6 +133,7 @@ public class SimpleTestPackageImpl extends EPackageImpl implements SimpleTestPac * * @generated */ + @Override public EReference getFoo_NameRefs() { return (EReference)fooEClass.getEStructuralFeatures().get(1); @@ -140,6 +144,7 @@ public class SimpleTestPackageImpl extends EPackageImpl implements SimpleTestPac * * @generated */ + @Override public SimpleTestFactory getSimpleTestFactory() { return (SimpleTestFactory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/Bug289515TestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/Bug289515TestLanguage.genmodel index 6e58caffb..c0fb595b2 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/Bug289515TestLanguage.genmodel +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/Bug289515TestLanguage.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="Bug289515TestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> + complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20" 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/Bug289524ExTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/Bug289524ExTestLanguage.genmodel index 606d5dba2..4e891f8f2 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/Bug289524ExTestLanguage.genmodel +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/Bug289524ExTestLanguage.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="Bug289524ExTestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> + complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20" 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/Bug289524TestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/Bug289524TestLanguage.genmodel index 03fa04a38..69dede962 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/Bug289524TestLanguage.genmodel +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/Bug289524TestLanguage.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="Bug289524TestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> + complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20" 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/Bug296889ExTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/Bug296889ExTestLanguage.genmodel index 211a9c295..b531c1a39 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/Bug296889ExTestLanguage.genmodel +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/Bug296889ExTestLanguage.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="Bug296889ExTestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> + complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20" 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/Bug296889TestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/Bug296889TestLanguage.genmodel index 054b68e39..486dc30d4 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/Bug296889TestLanguage.genmodel +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/Bug296889TestLanguage.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="Bug296889TestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> + complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20" 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/Bug299237TestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/Bug299237TestLanguage.genmodel index d991e1ce4..41a6ce585 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/Bug299237TestLanguage.genmodel +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/Bug299237TestLanguage.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="Bug299237TestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> + complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20" 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/Bug301935TestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/Bug301935TestLanguage.genmodel index f2c84eb3a..78b4538f4 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="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> + complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20" 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/Bug378967TestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/Bug378967TestLanguage.genmodel index ef98a7d72..ec4dcd154 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/Bug378967TestLanguage.genmodel +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/Bug378967TestLanguage.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="Bug378967TestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> + complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20" 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.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/Bug406914TestLanguage.genmodel index b4549e39a..fdfa273b6 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="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> + complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20" 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/Bug443221TestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/Bug443221TestLanguage.genmodel index 0dd595f76..03e97d238 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/Bug443221TestLanguage.genmodel +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/Bug443221TestLanguage.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="Bug443221TestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> + complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20" 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/bug289515Test/Model.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug289515Test/Model.java index eab762649..b77507f7b 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug289515Test/Model.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug289515Test/Model.java @@ -26,10 +26,6 @@ public interface Model extends EObject /** * Returns the value of the 'Value' attribute. * - *

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

* * @return the value of the 'Value' attribute. * @see #setValue(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug289515Test/impl/Bug289515TestFactoryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug289515Test/impl/Bug289515TestFactoryImpl.java index 8c9ed02b2..0895f2eb9 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug289515Test/impl/Bug289515TestFactoryImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug289515Test/impl/Bug289515TestFactoryImpl.java @@ -76,6 +76,7 @@ public class Bug289515TestFactoryImpl extends EFactoryImpl implements Bug289515T * * @generated */ + @Override public Model createModel() { ModelImpl model = new ModelImpl(); @@ -87,6 +88,7 @@ public class Bug289515TestFactoryImpl extends EFactoryImpl implements Bug289515T * * @generated */ + @Override public Bug289515TestPackage getBug289515TestPackage() { return (Bug289515TestPackage)getEPackage(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug289515Test/impl/Bug289515TestPackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug289515Test/impl/Bug289515TestPackageImpl.java index f0c74cab2..4b3a60bfc 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug289515Test/impl/Bug289515TestPackageImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug289515Test/impl/Bug289515TestPackageImpl.java @@ -58,7 +58,7 @@ public class Bug289515TestPackageImpl extends EPackageImpl implements Bug289515T /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link Bug289515TestPackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -73,7 +73,8 @@ public class Bug289515TestPackageImpl extends EPackageImpl implements Bug289515T if (isInited) return (Bug289515TestPackage)EPackage.Registry.INSTANCE.getEPackage(Bug289515TestPackage.eNS_URI); // Obtain or create and register package - Bug289515TestPackageImpl theBug289515TestPackage = (Bug289515TestPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof Bug289515TestPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new Bug289515TestPackageImpl()); + Object registeredBug289515TestPackage = EPackage.Registry.INSTANCE.get(eNS_URI); + Bug289515TestPackageImpl theBug289515TestPackage = registeredBug289515TestPackage instanceof Bug289515TestPackageImpl ? (Bug289515TestPackageImpl)registeredBug289515TestPackage : new Bug289515TestPackageImpl(); isInited = true; @@ -89,7 +90,6 @@ public class Bug289515TestPackageImpl extends EPackageImpl implements Bug289515T // Mark meta-data to indicate it can't be changed theBug289515TestPackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(Bug289515TestPackage.eNS_URI, theBug289515TestPackage); return theBug289515TestPackage; @@ -100,6 +100,7 @@ public class Bug289515TestPackageImpl extends EPackageImpl implements Bug289515T * * @generated */ + @Override public EClass getModel() { return modelEClass; @@ -110,6 +111,7 @@ public class Bug289515TestPackageImpl extends EPackageImpl implements Bug289515T * * @generated */ + @Override public EAttribute getModel_Value() { return (EAttribute)modelEClass.getEStructuralFeatures().get(0); @@ -120,6 +122,7 @@ public class Bug289515TestPackageImpl extends EPackageImpl implements Bug289515T * * @generated */ + @Override public Bug289515TestFactory getBug289515TestFactory() { return (Bug289515TestFactory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug289515Test/impl/ModelImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug289515Test/impl/ModelImpl.java index 0150706fe..19e48d86c 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug289515Test/impl/ModelImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug289515Test/impl/ModelImpl.java @@ -74,6 +74,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public String getValue() { return value; @@ -84,6 +85,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setValue(String newValue) { String oldValue = value; @@ -168,7 +170,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (value: "); result.append(value); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug289524ExTest/Contained.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug289524ExTest/Contained.java index c9e89654a..ffac97f32 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug289524ExTest/Contained.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug289524ExTest/Contained.java @@ -26,10 +26,6 @@ public interface Contained 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) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug289524ExTest/Model.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug289524ExTest/Model.java index b6e18d65d..d939fc3bc 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug289524ExTest/Model.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug289524ExTest/Model.java @@ -29,10 +29,6 @@ public interface Model extends EObject * Returns the value of the 'Refs' containment reference list. * The list contents are of type {@link org.eclipse.xtext.parser.antlr.bug289524ExTest.ModelElement}. * - *

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

* * @return the value of the 'Refs' containment reference list. * @see org.eclipse.xtext.parser.antlr.bug289524ExTest.Bug289524ExTestPackage#getModel_Refs() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug289524ExTest/ModelElement.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug289524ExTest/ModelElement.java index d1d6fe0ae..93d57e2af 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug289524ExTest/ModelElement.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug289524ExTest/ModelElement.java @@ -30,10 +30,6 @@ public interface ModelElement extends EObject * Returns the value of the 'Containments' containment reference list. * The list contents are of type {@link org.eclipse.xtext.parser.antlr.bug289524ExTest.Contained}. * - *

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

* * @return the value of the 'Containments' containment reference list. * @see org.eclipse.xtext.parser.antlr.bug289524ExTest.Bug289524ExTestPackage#getModelElement_Containments() @@ -46,10 +42,6 @@ public interface ModelElement extends EObject * Returns the value of the 'Refs' reference list. * The list contents are of type {@link org.eclipse.xtext.parser.antlr.bug289524ExTest.Contained}. * - *

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

* * @return the value of the 'Refs' reference list. * @see org.eclipse.xtext.parser.antlr.bug289524ExTest.Bug289524ExTestPackage#getModelElement_Refs() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug289524ExTest/impl/Bug289524ExTestFactoryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug289524ExTest/impl/Bug289524ExTestFactoryImpl.java index 90f7cc992..632c4aa51 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug289524ExTest/impl/Bug289524ExTestFactoryImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug289524ExTest/impl/Bug289524ExTestFactoryImpl.java @@ -78,6 +78,7 @@ public class Bug289524ExTestFactoryImpl extends EFactoryImpl implements Bug28952 * * @generated */ + @Override public Model createModel() { ModelImpl model = new ModelImpl(); @@ -89,6 +90,7 @@ public class Bug289524ExTestFactoryImpl extends EFactoryImpl implements Bug28952 * * @generated */ + @Override public ModelElement createModelElement() { ModelElementImpl modelElement = new ModelElementImpl(); @@ -100,6 +102,7 @@ public class Bug289524ExTestFactoryImpl extends EFactoryImpl implements Bug28952 * * @generated */ + @Override public Contained createContained() { ContainedImpl contained = new ContainedImpl(); @@ -111,6 +114,7 @@ public class Bug289524ExTestFactoryImpl extends EFactoryImpl implements Bug28952 * * @generated */ + @Override public Bug289524ExTestPackage getBug289524ExTestPackage() { return (Bug289524ExTestPackage)getEPackage(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug289524ExTest/impl/Bug289524ExTestPackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug289524ExTest/impl/Bug289524ExTestPackageImpl.java index d06f4884f..225ec9b9b 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug289524ExTest/impl/Bug289524ExTestPackageImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug289524ExTest/impl/Bug289524ExTestPackageImpl.java @@ -75,7 +75,7 @@ public class Bug289524ExTestPackageImpl extends EPackageImpl implements Bug28952 /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link Bug289524ExTestPackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -90,7 +90,8 @@ public class Bug289524ExTestPackageImpl extends EPackageImpl implements Bug28952 if (isInited) return (Bug289524ExTestPackage)EPackage.Registry.INSTANCE.getEPackage(Bug289524ExTestPackage.eNS_URI); // Obtain or create and register package - Bug289524ExTestPackageImpl theBug289524ExTestPackage = (Bug289524ExTestPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof Bug289524ExTestPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new Bug289524ExTestPackageImpl()); + Object registeredBug289524ExTestPackage = EPackage.Registry.INSTANCE.get(eNS_URI); + Bug289524ExTestPackageImpl theBug289524ExTestPackage = registeredBug289524ExTestPackage instanceof Bug289524ExTestPackageImpl ? (Bug289524ExTestPackageImpl)registeredBug289524ExTestPackage : new Bug289524ExTestPackageImpl(); isInited = true; @@ -106,7 +107,6 @@ public class Bug289524ExTestPackageImpl extends EPackageImpl implements Bug28952 // Mark meta-data to indicate it can't be changed theBug289524ExTestPackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(Bug289524ExTestPackage.eNS_URI, theBug289524ExTestPackage); return theBug289524ExTestPackage; @@ -117,6 +117,7 @@ public class Bug289524ExTestPackageImpl extends EPackageImpl implements Bug28952 * * @generated */ + @Override public EClass getModel() { return modelEClass; @@ -127,6 +128,7 @@ public class Bug289524ExTestPackageImpl extends EPackageImpl implements Bug28952 * * @generated */ + @Override public EReference getModel_Refs() { return (EReference)modelEClass.getEStructuralFeatures().get(0); @@ -137,6 +139,7 @@ public class Bug289524ExTestPackageImpl extends EPackageImpl implements Bug28952 * * @generated */ + @Override public EClass getModelElement() { return modelElementEClass; @@ -147,6 +150,7 @@ public class Bug289524ExTestPackageImpl extends EPackageImpl implements Bug28952 * * @generated */ + @Override public EReference getModelElement_Containments() { return (EReference)modelElementEClass.getEStructuralFeatures().get(0); @@ -157,6 +161,7 @@ public class Bug289524ExTestPackageImpl extends EPackageImpl implements Bug28952 * * @generated */ + @Override public EReference getModelElement_Refs() { return (EReference)modelElementEClass.getEStructuralFeatures().get(1); @@ -167,6 +172,7 @@ public class Bug289524ExTestPackageImpl extends EPackageImpl implements Bug28952 * * @generated */ + @Override public EClass getContained() { return containedEClass; @@ -177,6 +183,7 @@ public class Bug289524ExTestPackageImpl extends EPackageImpl implements Bug28952 * * @generated */ + @Override public EAttribute getContained_Name() { return (EAttribute)containedEClass.getEStructuralFeatures().get(0); @@ -187,6 +194,7 @@ public class Bug289524ExTestPackageImpl extends EPackageImpl implements Bug28952 * * @generated */ + @Override public Bug289524ExTestFactory getBug289524ExTestFactory() { return (Bug289524ExTestFactory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug289524ExTest/impl/ContainedImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug289524ExTest/impl/ContainedImpl.java index 8d76b3b27..e6d94c973 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug289524ExTest/impl/ContainedImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug289524ExTest/impl/ContainedImpl.java @@ -74,6 +74,7 @@ public class ContainedImpl extends MinimalEObjectImpl.Container implements Conta * * @generated */ + @Override public String getName() { return name; @@ -84,6 +85,7 @@ public class ContainedImpl extends MinimalEObjectImpl.Container implements Conta * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -168,7 +170,7 @@ public class ContainedImpl extends MinimalEObjectImpl.Container implements Conta { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug289524ExTest/impl/ModelElementImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug289524ExTest/impl/ModelElementImpl.java index b48775e98..9535608ec 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug289524ExTest/impl/ModelElementImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug289524ExTest/impl/ModelElementImpl.java @@ -84,6 +84,7 @@ public class ModelElementImpl extends MinimalEObjectImpl.Container implements Mo * * @generated */ + @Override public EList getContainments() { if (containments == null) @@ -98,6 +99,7 @@ public class ModelElementImpl extends MinimalEObjectImpl.Container implements Mo * * @generated */ + @Override public EList getRefs() { if (refs == null) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug289524ExTest/impl/ModelImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug289524ExTest/impl/ModelImpl.java index 6e769eb2f..0f3d1cebc 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug289524ExTest/impl/ModelImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug289524ExTest/impl/ModelImpl.java @@ -72,6 +72,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public EList getRefs() { if (refs == null) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug289524Test/Contained.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug289524Test/Contained.java index 89855d9b0..0755919c5 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug289524Test/Contained.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug289524Test/Contained.java @@ -26,10 +26,6 @@ public interface Contained 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) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug289524Test/Model.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug289524Test/Model.java index b8d7354c5..8fc2c90ab 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug289524Test/Model.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug289524Test/Model.java @@ -29,10 +29,6 @@ public interface Model extends EObject * Returns the value of the 'Refs' containment reference list. * The list contents are of type {@link org.eclipse.xtext.parser.antlr.bug289524Test.ModelElement}. * - *

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

* * @return the value of the 'Refs' containment reference list. * @see org.eclipse.xtext.parser.antlr.bug289524Test.Bug289524TestPackage#getModel_Refs() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug289524Test/ModelElement.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug289524Test/ModelElement.java index 9052a5a11..b0eba061b 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug289524Test/ModelElement.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug289524Test/ModelElement.java @@ -30,10 +30,6 @@ public interface ModelElement extends EObject * Returns the value of the 'Containments' containment reference list. * The list contents are of type {@link org.eclipse.xtext.parser.antlr.bug289524Test.Contained}. * - *

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

* * @return the value of the 'Containments' containment reference list. * @see org.eclipse.xtext.parser.antlr.bug289524Test.Bug289524TestPackage#getModelElement_Containments() @@ -46,10 +42,6 @@ public interface ModelElement extends EObject * Returns the value of the 'Refs' reference list. * The list contents are of type {@link org.eclipse.xtext.parser.antlr.bug289524Test.Contained}. * - *

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

* * @return the value of the 'Refs' reference list. * @see org.eclipse.xtext.parser.antlr.bug289524Test.Bug289524TestPackage#getModelElement_Refs() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug289524Test/impl/Bug289524TestFactoryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug289524Test/impl/Bug289524TestFactoryImpl.java index 91bfc273e..c2a03406b 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug289524Test/impl/Bug289524TestFactoryImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug289524Test/impl/Bug289524TestFactoryImpl.java @@ -78,6 +78,7 @@ public class Bug289524TestFactoryImpl extends EFactoryImpl implements Bug289524T * * @generated */ + @Override public Model createModel() { ModelImpl model = new ModelImpl(); @@ -89,6 +90,7 @@ public class Bug289524TestFactoryImpl extends EFactoryImpl implements Bug289524T * * @generated */ + @Override public ModelElement createModelElement() { ModelElementImpl modelElement = new ModelElementImpl(); @@ -100,6 +102,7 @@ public class Bug289524TestFactoryImpl extends EFactoryImpl implements Bug289524T * * @generated */ + @Override public Contained createContained() { ContainedImpl contained = new ContainedImpl(); @@ -111,6 +114,7 @@ public class Bug289524TestFactoryImpl extends EFactoryImpl implements Bug289524T * * @generated */ + @Override public Bug289524TestPackage getBug289524TestPackage() { return (Bug289524TestPackage)getEPackage(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug289524Test/impl/Bug289524TestPackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug289524Test/impl/Bug289524TestPackageImpl.java index 856e3243e..db19d6657 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug289524Test/impl/Bug289524TestPackageImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug289524Test/impl/Bug289524TestPackageImpl.java @@ -75,7 +75,7 @@ public class Bug289524TestPackageImpl extends EPackageImpl implements Bug289524T /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link Bug289524TestPackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -90,7 +90,8 @@ public class Bug289524TestPackageImpl extends EPackageImpl implements Bug289524T if (isInited) return (Bug289524TestPackage)EPackage.Registry.INSTANCE.getEPackage(Bug289524TestPackage.eNS_URI); // Obtain or create and register package - Bug289524TestPackageImpl theBug289524TestPackage = (Bug289524TestPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof Bug289524TestPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new Bug289524TestPackageImpl()); + Object registeredBug289524TestPackage = EPackage.Registry.INSTANCE.get(eNS_URI); + Bug289524TestPackageImpl theBug289524TestPackage = registeredBug289524TestPackage instanceof Bug289524TestPackageImpl ? (Bug289524TestPackageImpl)registeredBug289524TestPackage : new Bug289524TestPackageImpl(); isInited = true; @@ -106,7 +107,6 @@ public class Bug289524TestPackageImpl extends EPackageImpl implements Bug289524T // Mark meta-data to indicate it can't be changed theBug289524TestPackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(Bug289524TestPackage.eNS_URI, theBug289524TestPackage); return theBug289524TestPackage; @@ -117,6 +117,7 @@ public class Bug289524TestPackageImpl extends EPackageImpl implements Bug289524T * * @generated */ + @Override public EClass getModel() { return modelEClass; @@ -127,6 +128,7 @@ public class Bug289524TestPackageImpl extends EPackageImpl implements Bug289524T * * @generated */ + @Override public EReference getModel_Refs() { return (EReference)modelEClass.getEStructuralFeatures().get(0); @@ -137,6 +139,7 @@ public class Bug289524TestPackageImpl extends EPackageImpl implements Bug289524T * * @generated */ + @Override public EClass getModelElement() { return modelElementEClass; @@ -147,6 +150,7 @@ public class Bug289524TestPackageImpl extends EPackageImpl implements Bug289524T * * @generated */ + @Override public EReference getModelElement_Containments() { return (EReference)modelElementEClass.getEStructuralFeatures().get(0); @@ -157,6 +161,7 @@ public class Bug289524TestPackageImpl extends EPackageImpl implements Bug289524T * * @generated */ + @Override public EReference getModelElement_Refs() { return (EReference)modelElementEClass.getEStructuralFeatures().get(1); @@ -167,6 +172,7 @@ public class Bug289524TestPackageImpl extends EPackageImpl implements Bug289524T * * @generated */ + @Override public EClass getContained() { return containedEClass; @@ -177,6 +183,7 @@ public class Bug289524TestPackageImpl extends EPackageImpl implements Bug289524T * * @generated */ + @Override public EAttribute getContained_Name() { return (EAttribute)containedEClass.getEStructuralFeatures().get(0); @@ -187,6 +194,7 @@ public class Bug289524TestPackageImpl extends EPackageImpl implements Bug289524T * * @generated */ + @Override public Bug289524TestFactory getBug289524TestFactory() { return (Bug289524TestFactory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug289524Test/impl/ContainedImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug289524Test/impl/ContainedImpl.java index 32e507aa8..a3bb0cf80 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug289524Test/impl/ContainedImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug289524Test/impl/ContainedImpl.java @@ -74,6 +74,7 @@ public class ContainedImpl extends MinimalEObjectImpl.Container implements Conta * * @generated */ + @Override public String getName() { return name; @@ -84,6 +85,7 @@ public class ContainedImpl extends MinimalEObjectImpl.Container implements Conta * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -168,7 +170,7 @@ public class ContainedImpl extends MinimalEObjectImpl.Container implements Conta { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug289524Test/impl/ModelElementImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug289524Test/impl/ModelElementImpl.java index 42c975c09..2293769b0 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug289524Test/impl/ModelElementImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug289524Test/impl/ModelElementImpl.java @@ -84,6 +84,7 @@ public class ModelElementImpl extends MinimalEObjectImpl.Container implements Mo * * @generated */ + @Override public EList getContainments() { if (containments == null) @@ -98,6 +99,7 @@ public class ModelElementImpl extends MinimalEObjectImpl.Container implements Mo * * @generated */ + @Override public EList getRefs() { if (refs == null) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug289524Test/impl/ModelImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug289524Test/impl/ModelImpl.java index 56ba08d9b..b0a66d1be 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug289524Test/impl/ModelImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug289524Test/impl/ModelImpl.java @@ -72,6 +72,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public EList getRefs() { if (refs == null) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug296889ExTest/Model.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug296889ExTest/Model.java index 9fcbcd23e..3f54b3d0c 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug296889ExTest/Model.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug296889ExTest/Model.java @@ -30,10 +30,6 @@ public interface Model extends EObject * Returns the value of the 'Expressions' containment reference list. * The list contents are of type {@link org.eclipse.xtext.parser.antlr.bug296889ExTest.Expression}. * - *

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

* * @return the value of the 'Expressions' containment reference list. * @see org.eclipse.xtext.parser.antlr.bug296889ExTest.Bug296889ExTestPackage#getModel_Expressions() @@ -46,10 +42,6 @@ public interface Model extends EObject * Returns the value of the 'Values' attribute list. * The list contents are of type {@link java.lang.String}. * - *

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

* * @return the value of the 'Values' attribute list. * @see org.eclipse.xtext.parser.antlr.bug296889ExTest.Bug296889ExTestPackage#getModel_Values() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug296889ExTest/Postop.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug296889ExTest/Postop.java index 9b10e6199..3db2603a4 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug296889ExTest/Postop.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug296889ExTest/Postop.java @@ -26,10 +26,6 @@ public interface Postop extends Expression /** * Returns the value of the 'Expr' containment reference. * - *

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

* * @return the value of the 'Expr' containment reference. * @see #setExpr(Expression) @@ -52,10 +48,6 @@ public interface Postop extends Expression /** * Returns the value of the 'Function Name' attribute. * - *

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

* * @return the value of the 'Function Name' attribute. * @see #setFunctionName(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug296889ExTest/Preop.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug296889ExTest/Preop.java index 748bbf77c..1a802051e 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug296889ExTest/Preop.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug296889ExTest/Preop.java @@ -26,10 +26,6 @@ public interface Preop extends Expression /** * Returns the value of the 'Function Name' attribute. * - *

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

* * @return the value of the 'Function Name' attribute. * @see #setFunctionName(String) @@ -52,10 +48,6 @@ public interface Preop extends Expression /** * Returns the value of the 'Expr' containment reference. * - *

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

* * @return the value of the 'Expr' containment reference. * @see #setExpr(Expression) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug296889ExTest/Variable.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug296889ExTest/Variable.java index b02340357..97bcbaba4 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug296889ExTest/Variable.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug296889ExTest/Variable.java @@ -25,10 +25,6 @@ public interface Variable extends Expression /** * 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) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug296889ExTest/impl/Bug296889ExTestFactoryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug296889ExTest/impl/Bug296889ExTestFactoryImpl.java index 03f1bbb66..a7847a439 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug296889ExTest/impl/Bug296889ExTestFactoryImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug296889ExTest/impl/Bug296889ExTestFactoryImpl.java @@ -80,6 +80,7 @@ public class Bug296889ExTestFactoryImpl extends EFactoryImpl implements Bug29688 * * @generated */ + @Override public Model createModel() { ModelImpl model = new ModelImpl(); @@ -91,6 +92,7 @@ public class Bug296889ExTestFactoryImpl extends EFactoryImpl implements Bug29688 * * @generated */ + @Override public Expression createExpression() { ExpressionImpl expression = new ExpressionImpl(); @@ -102,6 +104,7 @@ public class Bug296889ExTestFactoryImpl extends EFactoryImpl implements Bug29688 * * @generated */ + @Override public Preop createPreop() { PreopImpl preop = new PreopImpl(); @@ -113,6 +116,7 @@ public class Bug296889ExTestFactoryImpl extends EFactoryImpl implements Bug29688 * * @generated */ + @Override public Postop createPostop() { PostopImpl postop = new PostopImpl(); @@ -124,6 +128,7 @@ public class Bug296889ExTestFactoryImpl extends EFactoryImpl implements Bug29688 * * @generated */ + @Override public Variable createVariable() { VariableImpl variable = new VariableImpl(); @@ -135,6 +140,7 @@ public class Bug296889ExTestFactoryImpl extends EFactoryImpl implements Bug29688 * * @generated */ + @Override public Bug296889ExTestPackage getBug296889ExTestPackage() { return (Bug296889ExTestPackage)getEPackage(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug296889ExTest/impl/Bug296889ExTestPackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug296889ExTest/impl/Bug296889ExTestPackageImpl.java index cfc3f72ae..e7db59941 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug296889ExTest/impl/Bug296889ExTestPackageImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug296889ExTest/impl/Bug296889ExTestPackageImpl.java @@ -91,7 +91,7 @@ public class Bug296889ExTestPackageImpl extends EPackageImpl implements Bug29688 /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link Bug296889ExTestPackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -106,7 +106,8 @@ public class Bug296889ExTestPackageImpl extends EPackageImpl implements Bug29688 if (isInited) return (Bug296889ExTestPackage)EPackage.Registry.INSTANCE.getEPackage(Bug296889ExTestPackage.eNS_URI); // Obtain or create and register package - Bug296889ExTestPackageImpl theBug296889ExTestPackage = (Bug296889ExTestPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof Bug296889ExTestPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new Bug296889ExTestPackageImpl()); + Object registeredBug296889ExTestPackage = EPackage.Registry.INSTANCE.get(eNS_URI); + Bug296889ExTestPackageImpl theBug296889ExTestPackage = registeredBug296889ExTestPackage instanceof Bug296889ExTestPackageImpl ? (Bug296889ExTestPackageImpl)registeredBug296889ExTestPackage : new Bug296889ExTestPackageImpl(); isInited = true; @@ -122,7 +123,6 @@ public class Bug296889ExTestPackageImpl extends EPackageImpl implements Bug29688 // Mark meta-data to indicate it can't be changed theBug296889ExTestPackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(Bug296889ExTestPackage.eNS_URI, theBug296889ExTestPackage); return theBug296889ExTestPackage; @@ -133,6 +133,7 @@ public class Bug296889ExTestPackageImpl extends EPackageImpl implements Bug29688 * * @generated */ + @Override public EClass getModel() { return modelEClass; @@ -143,6 +144,7 @@ public class Bug296889ExTestPackageImpl extends EPackageImpl implements Bug29688 * * @generated */ + @Override public EReference getModel_Expressions() { return (EReference)modelEClass.getEStructuralFeatures().get(0); @@ -153,6 +155,7 @@ public class Bug296889ExTestPackageImpl extends EPackageImpl implements Bug29688 * * @generated */ + @Override public EAttribute getModel_Values() { return (EAttribute)modelEClass.getEStructuralFeatures().get(1); @@ -163,6 +166,7 @@ public class Bug296889ExTestPackageImpl extends EPackageImpl implements Bug29688 * * @generated */ + @Override public EClass getExpression() { return expressionEClass; @@ -173,6 +177,7 @@ public class Bug296889ExTestPackageImpl extends EPackageImpl implements Bug29688 * * @generated */ + @Override public EClass getPreop() { return preopEClass; @@ -183,6 +188,7 @@ public class Bug296889ExTestPackageImpl extends EPackageImpl implements Bug29688 * * @generated */ + @Override public EAttribute getPreop_FunctionName() { return (EAttribute)preopEClass.getEStructuralFeatures().get(0); @@ -193,6 +199,7 @@ public class Bug296889ExTestPackageImpl extends EPackageImpl implements Bug29688 * * @generated */ + @Override public EReference getPreop_Expr() { return (EReference)preopEClass.getEStructuralFeatures().get(1); @@ -203,6 +210,7 @@ public class Bug296889ExTestPackageImpl extends EPackageImpl implements Bug29688 * * @generated */ + @Override public EClass getPostop() { return postopEClass; @@ -213,6 +221,7 @@ public class Bug296889ExTestPackageImpl extends EPackageImpl implements Bug29688 * * @generated */ + @Override public EReference getPostop_Expr() { return (EReference)postopEClass.getEStructuralFeatures().get(0); @@ -223,6 +232,7 @@ public class Bug296889ExTestPackageImpl extends EPackageImpl implements Bug29688 * * @generated */ + @Override public EAttribute getPostop_FunctionName() { return (EAttribute)postopEClass.getEStructuralFeatures().get(1); @@ -233,6 +243,7 @@ public class Bug296889ExTestPackageImpl extends EPackageImpl implements Bug29688 * * @generated */ + @Override public EClass getVariable() { return variableEClass; @@ -243,6 +254,7 @@ public class Bug296889ExTestPackageImpl extends EPackageImpl implements Bug29688 * * @generated */ + @Override public EAttribute getVariable_Name() { return (EAttribute)variableEClass.getEStructuralFeatures().get(0); @@ -253,6 +265,7 @@ public class Bug296889ExTestPackageImpl extends EPackageImpl implements Bug29688 * * @generated */ + @Override public Bug296889ExTestFactory getBug296889ExTestFactory() { return (Bug296889ExTestFactory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug296889ExTest/impl/ModelImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug296889ExTest/impl/ModelImpl.java index 0ae759211..b44179da5 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug296889ExTest/impl/ModelImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug296889ExTest/impl/ModelImpl.java @@ -84,6 +84,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public EList getExpressions() { if (expressions == null) @@ -98,6 +99,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public EList getValues() { if (values == null) @@ -212,7 +214,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (values: "); result.append(values); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug296889ExTest/impl/PostopImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug296889ExTest/impl/PostopImpl.java index 9ad08c12e..00faa738f 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug296889ExTest/impl/PostopImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug296889ExTest/impl/PostopImpl.java @@ -87,6 +87,7 @@ public class PostopImpl extends ExpressionImpl implements Postop * * @generated */ + @Override public Expression getExpr() { return expr; @@ -114,6 +115,7 @@ public class PostopImpl extends ExpressionImpl implements Postop * * @generated */ + @Override public void setExpr(Expression newExpr) { if (newExpr != expr) @@ -135,6 +137,7 @@ public class PostopImpl extends ExpressionImpl implements Postop * * @generated */ + @Override public String getFunctionName() { return functionName; @@ -145,6 +148,7 @@ public class PostopImpl extends ExpressionImpl implements Postop * * @generated */ + @Override public void setFunctionName(String newFunctionName) { String oldFunctionName = functionName; @@ -255,7 +259,7 @@ public class PostopImpl extends ExpressionImpl implements Postop { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (functionName: "); result.append(functionName); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug296889ExTest/impl/PreopImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug296889ExTest/impl/PreopImpl.java index 83da0d9c7..20962c0cc 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug296889ExTest/impl/PreopImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug296889ExTest/impl/PreopImpl.java @@ -87,6 +87,7 @@ public class PreopImpl extends ExpressionImpl implements Preop * * @generated */ + @Override public String getFunctionName() { return functionName; @@ -97,6 +98,7 @@ public class PreopImpl extends ExpressionImpl implements Preop * * @generated */ + @Override public void setFunctionName(String newFunctionName) { String oldFunctionName = functionName; @@ -110,6 +112,7 @@ public class PreopImpl extends ExpressionImpl implements Preop * * @generated */ + @Override public Expression getExpr() { return expr; @@ -137,6 +140,7 @@ public class PreopImpl extends ExpressionImpl implements Preop * * @generated */ + @Override public void setExpr(Expression newExpr) { if (newExpr != expr) @@ -255,7 +259,7 @@ public class PreopImpl extends ExpressionImpl implements Preop { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (functionName: "); result.append(functionName); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug296889ExTest/impl/VariableImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug296889ExTest/impl/VariableImpl.java index 8c20d5690..312a2d512 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug296889ExTest/impl/VariableImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug296889ExTest/impl/VariableImpl.java @@ -73,6 +73,7 @@ public class VariableImpl extends ExpressionImpl implements Variable * * @generated */ + @Override public String getName() { return name; @@ -83,6 +84,7 @@ public class VariableImpl extends ExpressionImpl implements Variable * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -167,7 +169,7 @@ public class VariableImpl extends ExpressionImpl implements Variable { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug296889Test/Model.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug296889Test/Model.java index 4af68d48c..a795ce152 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug296889Test/Model.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug296889Test/Model.java @@ -30,10 +30,6 @@ public interface Model extends EObject * Returns the value of the 'Expressions' containment reference list. * The list contents are of type {@link org.eclipse.xtext.parser.antlr.bug296889Test.Expression}. * - *

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

* * @return the value of the 'Expressions' containment reference list. * @see org.eclipse.xtext.parser.antlr.bug296889Test.Bug296889TestPackage#getModel_Expressions() @@ -46,10 +42,6 @@ public interface Model extends EObject * Returns the value of the 'Values' attribute list. * The list contents are of type {@link java.lang.String}. * - *

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

* * @return the value of the 'Values' attribute list. * @see org.eclipse.xtext.parser.antlr.bug296889Test.Bug296889TestPackage#getModel_Values() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug296889Test/Postop.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug296889Test/Postop.java index 41818fd2e..7464b86bb 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug296889Test/Postop.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug296889Test/Postop.java @@ -26,10 +26,6 @@ public interface Postop extends Expression /** * Returns the value of the 'Expr' containment reference. * - *

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

* * @return the value of the 'Expr' containment reference. * @see #setExpr(Expression) @@ -52,10 +48,6 @@ public interface Postop extends Expression /** * Returns the value of the 'Function Name' attribute. * - *

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

* * @return the value of the 'Function Name' attribute. * @see #setFunctionName(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug296889Test/Preop.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug296889Test/Preop.java index 950d114cc..b1b540bf9 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug296889Test/Preop.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug296889Test/Preop.java @@ -26,10 +26,6 @@ public interface Preop extends Expression /** * Returns the value of the 'Function Name' attribute. * - *

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

* * @return the value of the 'Function Name' attribute. * @see #setFunctionName(String) @@ -52,10 +48,6 @@ public interface Preop extends Expression /** * Returns the value of the 'Expr' containment reference. * - *

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

* * @return the value of the 'Expr' containment reference. * @see #setExpr(Expression) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug296889Test/Variable.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug296889Test/Variable.java index 478703692..ac0ad8889 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug296889Test/Variable.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug296889Test/Variable.java @@ -25,10 +25,6 @@ public interface Variable extends Expression /** * 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) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug296889Test/impl/Bug296889TestFactoryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug296889Test/impl/Bug296889TestFactoryImpl.java index 7d81f6409..2b21b6fe4 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug296889Test/impl/Bug296889TestFactoryImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug296889Test/impl/Bug296889TestFactoryImpl.java @@ -80,6 +80,7 @@ public class Bug296889TestFactoryImpl extends EFactoryImpl implements Bug296889T * * @generated */ + @Override public Model createModel() { ModelImpl model = new ModelImpl(); @@ -91,6 +92,7 @@ public class Bug296889TestFactoryImpl extends EFactoryImpl implements Bug296889T * * @generated */ + @Override public Expression createExpression() { ExpressionImpl expression = new ExpressionImpl(); @@ -102,6 +104,7 @@ public class Bug296889TestFactoryImpl extends EFactoryImpl implements Bug296889T * * @generated */ + @Override public Preop createPreop() { PreopImpl preop = new PreopImpl(); @@ -113,6 +116,7 @@ public class Bug296889TestFactoryImpl extends EFactoryImpl implements Bug296889T * * @generated */ + @Override public Postop createPostop() { PostopImpl postop = new PostopImpl(); @@ -124,6 +128,7 @@ public class Bug296889TestFactoryImpl extends EFactoryImpl implements Bug296889T * * @generated */ + @Override public Variable createVariable() { VariableImpl variable = new VariableImpl(); @@ -135,6 +140,7 @@ public class Bug296889TestFactoryImpl extends EFactoryImpl implements Bug296889T * * @generated */ + @Override public Bug296889TestPackage getBug296889TestPackage() { return (Bug296889TestPackage)getEPackage(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug296889Test/impl/Bug296889TestPackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug296889Test/impl/Bug296889TestPackageImpl.java index 8cafa704c..bc73007d3 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug296889Test/impl/Bug296889TestPackageImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug296889Test/impl/Bug296889TestPackageImpl.java @@ -91,7 +91,7 @@ public class Bug296889TestPackageImpl extends EPackageImpl implements Bug296889T /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link Bug296889TestPackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -106,7 +106,8 @@ public class Bug296889TestPackageImpl extends EPackageImpl implements Bug296889T if (isInited) return (Bug296889TestPackage)EPackage.Registry.INSTANCE.getEPackage(Bug296889TestPackage.eNS_URI); // Obtain or create and register package - Bug296889TestPackageImpl theBug296889TestPackage = (Bug296889TestPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof Bug296889TestPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new Bug296889TestPackageImpl()); + Object registeredBug296889TestPackage = EPackage.Registry.INSTANCE.get(eNS_URI); + Bug296889TestPackageImpl theBug296889TestPackage = registeredBug296889TestPackage instanceof Bug296889TestPackageImpl ? (Bug296889TestPackageImpl)registeredBug296889TestPackage : new Bug296889TestPackageImpl(); isInited = true; @@ -122,7 +123,6 @@ public class Bug296889TestPackageImpl extends EPackageImpl implements Bug296889T // Mark meta-data to indicate it can't be changed theBug296889TestPackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(Bug296889TestPackage.eNS_URI, theBug296889TestPackage); return theBug296889TestPackage; @@ -133,6 +133,7 @@ public class Bug296889TestPackageImpl extends EPackageImpl implements Bug296889T * * @generated */ + @Override public EClass getModel() { return modelEClass; @@ -143,6 +144,7 @@ public class Bug296889TestPackageImpl extends EPackageImpl implements Bug296889T * * @generated */ + @Override public EReference getModel_Expressions() { return (EReference)modelEClass.getEStructuralFeatures().get(0); @@ -153,6 +155,7 @@ public class Bug296889TestPackageImpl extends EPackageImpl implements Bug296889T * * @generated */ + @Override public EAttribute getModel_Values() { return (EAttribute)modelEClass.getEStructuralFeatures().get(1); @@ -163,6 +166,7 @@ public class Bug296889TestPackageImpl extends EPackageImpl implements Bug296889T * * @generated */ + @Override public EClass getExpression() { return expressionEClass; @@ -173,6 +177,7 @@ public class Bug296889TestPackageImpl extends EPackageImpl implements Bug296889T * * @generated */ + @Override public EClass getPreop() { return preopEClass; @@ -183,6 +188,7 @@ public class Bug296889TestPackageImpl extends EPackageImpl implements Bug296889T * * @generated */ + @Override public EAttribute getPreop_FunctionName() { return (EAttribute)preopEClass.getEStructuralFeatures().get(0); @@ -193,6 +199,7 @@ public class Bug296889TestPackageImpl extends EPackageImpl implements Bug296889T * * @generated */ + @Override public EReference getPreop_Expr() { return (EReference)preopEClass.getEStructuralFeatures().get(1); @@ -203,6 +210,7 @@ public class Bug296889TestPackageImpl extends EPackageImpl implements Bug296889T * * @generated */ + @Override public EClass getPostop() { return postopEClass; @@ -213,6 +221,7 @@ public class Bug296889TestPackageImpl extends EPackageImpl implements Bug296889T * * @generated */ + @Override public EReference getPostop_Expr() { return (EReference)postopEClass.getEStructuralFeatures().get(0); @@ -223,6 +232,7 @@ public class Bug296889TestPackageImpl extends EPackageImpl implements Bug296889T * * @generated */ + @Override public EAttribute getPostop_FunctionName() { return (EAttribute)postopEClass.getEStructuralFeatures().get(1); @@ -233,6 +243,7 @@ public class Bug296889TestPackageImpl extends EPackageImpl implements Bug296889T * * @generated */ + @Override public EClass getVariable() { return variableEClass; @@ -243,6 +254,7 @@ public class Bug296889TestPackageImpl extends EPackageImpl implements Bug296889T * * @generated */ + @Override public EAttribute getVariable_Name() { return (EAttribute)variableEClass.getEStructuralFeatures().get(0); @@ -253,6 +265,7 @@ public class Bug296889TestPackageImpl extends EPackageImpl implements Bug296889T * * @generated */ + @Override public Bug296889TestFactory getBug296889TestFactory() { return (Bug296889TestFactory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug296889Test/impl/ModelImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug296889Test/impl/ModelImpl.java index 710532f9f..437346bbf 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug296889Test/impl/ModelImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug296889Test/impl/ModelImpl.java @@ -84,6 +84,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public EList getExpressions() { if (expressions == null) @@ -98,6 +99,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public EList getValues() { if (values == null) @@ -212,7 +214,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (values: "); result.append(values); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug296889Test/impl/PostopImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug296889Test/impl/PostopImpl.java index ecacb4425..6c64cffdd 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug296889Test/impl/PostopImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug296889Test/impl/PostopImpl.java @@ -87,6 +87,7 @@ public class PostopImpl extends ExpressionImpl implements Postop * * @generated */ + @Override public Expression getExpr() { return expr; @@ -114,6 +115,7 @@ public class PostopImpl extends ExpressionImpl implements Postop * * @generated */ + @Override public void setExpr(Expression newExpr) { if (newExpr != expr) @@ -135,6 +137,7 @@ public class PostopImpl extends ExpressionImpl implements Postop * * @generated */ + @Override public String getFunctionName() { return functionName; @@ -145,6 +148,7 @@ public class PostopImpl extends ExpressionImpl implements Postop * * @generated */ + @Override public void setFunctionName(String newFunctionName) { String oldFunctionName = functionName; @@ -255,7 +259,7 @@ public class PostopImpl extends ExpressionImpl implements Postop { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (functionName: "); result.append(functionName); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug296889Test/impl/PreopImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug296889Test/impl/PreopImpl.java index 9c297409b..ea71ed513 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug296889Test/impl/PreopImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug296889Test/impl/PreopImpl.java @@ -87,6 +87,7 @@ public class PreopImpl extends ExpressionImpl implements Preop * * @generated */ + @Override public String getFunctionName() { return functionName; @@ -97,6 +98,7 @@ public class PreopImpl extends ExpressionImpl implements Preop * * @generated */ + @Override public void setFunctionName(String newFunctionName) { String oldFunctionName = functionName; @@ -110,6 +112,7 @@ public class PreopImpl extends ExpressionImpl implements Preop * * @generated */ + @Override public Expression getExpr() { return expr; @@ -137,6 +140,7 @@ public class PreopImpl extends ExpressionImpl implements Preop * * @generated */ + @Override public void setExpr(Expression newExpr) { if (newExpr != expr) @@ -255,7 +259,7 @@ public class PreopImpl extends ExpressionImpl implements Preop { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (functionName: "); result.append(functionName); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug296889Test/impl/VariableImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug296889Test/impl/VariableImpl.java index 7c1428d2e..0ad5d8a16 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug296889Test/impl/VariableImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug296889Test/impl/VariableImpl.java @@ -73,6 +73,7 @@ public class VariableImpl extends ExpressionImpl implements Variable * * @generated */ + @Override public String getName() { return name; @@ -83,6 +84,7 @@ public class VariableImpl extends ExpressionImpl implements Variable * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -167,7 +169,7 @@ public class VariableImpl extends ExpressionImpl implements Variable { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug299237Test/Model.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug299237Test/Model.java index 54a12ea82..18c8605d4 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug299237Test/Model.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug299237Test/Model.java @@ -26,10 +26,6 @@ public interface Model 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) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug299237Test/impl/Bug299237TestFactoryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug299237Test/impl/Bug299237TestFactoryImpl.java index a1f9d707c..f2d140331 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug299237Test/impl/Bug299237TestFactoryImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug299237Test/impl/Bug299237TestFactoryImpl.java @@ -76,6 +76,7 @@ public class Bug299237TestFactoryImpl extends EFactoryImpl implements Bug299237T * * @generated */ + @Override public Model createModel() { ModelImpl model = new ModelImpl(); @@ -87,6 +88,7 @@ public class Bug299237TestFactoryImpl extends EFactoryImpl implements Bug299237T * * @generated */ + @Override public Bug299237TestPackage getBug299237TestPackage() { return (Bug299237TestPackage)getEPackage(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug299237Test/impl/Bug299237TestPackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug299237Test/impl/Bug299237TestPackageImpl.java index f4e65c387..c488771a1 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug299237Test/impl/Bug299237TestPackageImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug299237Test/impl/Bug299237TestPackageImpl.java @@ -58,7 +58,7 @@ public class Bug299237TestPackageImpl extends EPackageImpl implements Bug299237T /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link Bug299237TestPackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -73,7 +73,8 @@ public class Bug299237TestPackageImpl extends EPackageImpl implements Bug299237T if (isInited) return (Bug299237TestPackage)EPackage.Registry.INSTANCE.getEPackage(Bug299237TestPackage.eNS_URI); // Obtain or create and register package - Bug299237TestPackageImpl theBug299237TestPackage = (Bug299237TestPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof Bug299237TestPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new Bug299237TestPackageImpl()); + Object registeredBug299237TestPackage = EPackage.Registry.INSTANCE.get(eNS_URI); + Bug299237TestPackageImpl theBug299237TestPackage = registeredBug299237TestPackage instanceof Bug299237TestPackageImpl ? (Bug299237TestPackageImpl)registeredBug299237TestPackage : new Bug299237TestPackageImpl(); isInited = true; @@ -89,7 +90,6 @@ public class Bug299237TestPackageImpl extends EPackageImpl implements Bug299237T // Mark meta-data to indicate it can't be changed theBug299237TestPackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(Bug299237TestPackage.eNS_URI, theBug299237TestPackage); return theBug299237TestPackage; @@ -100,6 +100,7 @@ public class Bug299237TestPackageImpl extends EPackageImpl implements Bug299237T * * @generated */ + @Override public EClass getModel() { return modelEClass; @@ -110,6 +111,7 @@ public class Bug299237TestPackageImpl extends EPackageImpl implements Bug299237T * * @generated */ + @Override public EAttribute getModel_Name() { return (EAttribute)modelEClass.getEStructuralFeatures().get(0); @@ -120,6 +122,7 @@ public class Bug299237TestPackageImpl extends EPackageImpl implements Bug299237T * * @generated */ + @Override public Bug299237TestFactory getBug299237TestFactory() { return (Bug299237TestFactory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug299237Test/impl/ModelImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug299237Test/impl/ModelImpl.java index a2a0fe2d4..cf5645d43 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug299237Test/impl/ModelImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug299237Test/impl/ModelImpl.java @@ -74,6 +74,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public String getName() { return name; @@ -84,6 +85,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -168,7 +170,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug301935Test/Model.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug301935Test/Model.java index a1884b2fb..b680e638b 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug301935Test/Model.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug301935Test/Model.java @@ -28,10 +28,6 @@ public interface Model 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) @@ -54,10 +50,6 @@ public interface Model extends EObject /** * Returns the value of the 'Value' attribute. * - *

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

* * @return the value of the 'Value' attribute. * @see #setValue(String) @@ -80,10 +72,6 @@ public interface Model extends EObject /** * Returns the value of the 'Value2' attribute. * - *

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

* * @return the value of the 'Value2' attribute. * @see #setValue2(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug301935Test/impl/Bug301935TestFactoryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug301935Test/impl/Bug301935TestFactoryImpl.java index b79e1b0fb..c8bdaefb2 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug301935Test/impl/Bug301935TestFactoryImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug301935Test/impl/Bug301935TestFactoryImpl.java @@ -76,6 +76,7 @@ public class Bug301935TestFactoryImpl extends EFactoryImpl implements Bug301935T * * @generated */ + @Override public Model createModel() { ModelImpl model = new ModelImpl(); @@ -87,6 +88,7 @@ public class Bug301935TestFactoryImpl extends EFactoryImpl implements Bug301935T * * @generated */ + @Override public Bug301935TestPackage getBug301935TestPackage() { return (Bug301935TestPackage)getEPackage(); 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 fa8149ffe..4eb7609eb 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 @@ -58,7 +58,7 @@ public class Bug301935TestPackageImpl extends EPackageImpl implements Bug301935T /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link Bug301935TestPackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -73,7 +73,8 @@ public class Bug301935TestPackageImpl extends EPackageImpl implements Bug301935T if (isInited) return (Bug301935TestPackage)EPackage.Registry.INSTANCE.getEPackage(Bug301935TestPackage.eNS_URI); // Obtain or create and register package - Bug301935TestPackageImpl theBug301935TestPackage = (Bug301935TestPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof Bug301935TestPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new Bug301935TestPackageImpl()); + Object registeredBug301935TestPackage = EPackage.Registry.INSTANCE.get(eNS_URI); + Bug301935TestPackageImpl theBug301935TestPackage = registeredBug301935TestPackage instanceof Bug301935TestPackageImpl ? (Bug301935TestPackageImpl)registeredBug301935TestPackage : new Bug301935TestPackageImpl(); isInited = true; @@ -89,7 +90,6 @@ public class Bug301935TestPackageImpl extends EPackageImpl implements Bug301935T // Mark meta-data to indicate it can't be changed theBug301935TestPackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(Bug301935TestPackage.eNS_URI, theBug301935TestPackage); return theBug301935TestPackage; @@ -100,6 +100,7 @@ public class Bug301935TestPackageImpl extends EPackageImpl implements Bug301935T * * @generated */ + @Override public EClass getModel() { return modelEClass; @@ -110,6 +111,7 @@ public class Bug301935TestPackageImpl extends EPackageImpl implements Bug301935T * * @generated */ + @Override public EAttribute getModel_Name() { return (EAttribute)modelEClass.getEStructuralFeatures().get(0); @@ -120,6 +122,7 @@ public class Bug301935TestPackageImpl extends EPackageImpl implements Bug301935T * * @generated */ + @Override public EAttribute getModel_Value() { return (EAttribute)modelEClass.getEStructuralFeatures().get(1); @@ -130,6 +133,7 @@ public class Bug301935TestPackageImpl extends EPackageImpl implements Bug301935T * * @generated */ + @Override public EAttribute getModel_Value2() { return (EAttribute)modelEClass.getEStructuralFeatures().get(2); @@ -140,6 +144,7 @@ public class Bug301935TestPackageImpl extends EPackageImpl implements Bug301935T * * @generated */ + @Override public Bug301935TestFactory getBug301935TestFactory() { return (Bug301935TestFactory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug301935Test/impl/ModelImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug301935Test/impl/ModelImpl.java index c2d9b886c..af7ca0e39 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug301935Test/impl/ModelImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug301935Test/impl/ModelImpl.java @@ -116,6 +116,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public String getName() { return name; @@ -126,6 +127,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -139,6 +141,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public String getValue() { return value; @@ -149,6 +152,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setValue(String newValue) { String oldValue = value; @@ -162,6 +166,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public String getValue2() { return value2; @@ -172,6 +177,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setValue2(String newValue2) { String oldValue2 = value2; @@ -276,7 +282,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(", value: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug378967Test/AfterObj.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug378967Test/AfterObj.java index eb4e3131b..68ae2a594 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug378967Test/AfterObj.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug378967Test/AfterObj.java @@ -26,10 +26,6 @@ public interface AfterObj extends EObject /** * Returns the value of the 'Value' attribute. * - *

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

* * @return the value of the 'Value' attribute. * @see #setValue(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug378967Test/FirstEnum.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug378967Test/FirstEnum.java index f99d56c94..3644e18a5 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug378967Test/FirstEnum.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug378967Test/FirstEnum.java @@ -33,10 +33,6 @@ public enum FirstEnum implements Enumerator /** * The 'Value' literal value. * - *

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

* * @see #VALUE * @model name="value" literal="after" @@ -163,6 +159,7 @@ public enum FirstEnum implements Enumerator * * @generated */ + @Override public int getValue() { return value; @@ -173,6 +170,7 @@ public enum FirstEnum implements Enumerator * * @generated */ + @Override public String getName() { return name; @@ -183,6 +181,7 @@ public enum FirstEnum implements Enumerator * * @generated */ + @Override public String getLiteral() { return literal; diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug378967Test/Root.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug378967Test/Root.java index 8ef30417a..c21488ee6 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug378967Test/Root.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug378967Test/Root.java @@ -26,10 +26,6 @@ public interface Root extends EObject /** * Returns the value of the 'Element' containment reference. * - *

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

* * @return the value of the 'Element' containment reference. * @see #setElement(EObject) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug378967Test/Rule1.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug378967Test/Rule1.java index ab753b78f..187bc824d 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug378967Test/Rule1.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug378967Test/Rule1.java @@ -29,10 +29,6 @@ public interface Rule1 extends EObject * Returns the value of the 'Type' attribute. * The literals are from the enumeration {@link org.eclipse.xtext.parser.antlr.bug378967Test.FirstEnum}. * - *

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

* * @return the value of the 'Type' attribute. * @see org.eclipse.xtext.parser.antlr.bug378967Test.FirstEnum @@ -57,10 +53,6 @@ public interface Rule1 extends EObject /** * Returns the value of the 'Value' attribute. * - *

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

* * @return the value of the 'Value' attribute. * @see #setValue(int) @@ -84,10 +76,6 @@ public interface Rule1 extends EObject * Returns the value of the 'Unit' attribute. * The literals are from the enumeration {@link org.eclipse.xtext.parser.antlr.bug378967Test.SecondEnum}. * - *

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

* * @return the value of the 'Unit' attribute. * @see org.eclipse.xtext.parser.antlr.bug378967Test.SecondEnum diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug378967Test/Rule2.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug378967Test/Rule2.java index a02ab203a..56cbed4d0 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug378967Test/Rule2.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug378967Test/Rule2.java @@ -26,10 +26,6 @@ public interface Rule2 extends EObject /** * Returns the value of the 'Value' attribute. * - *

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

* * @return the value of the 'Value' attribute. * @see #setValue(int) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug378967Test/Rule3.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug378967Test/Rule3.java index 78c8afdeb..334a86735 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug378967Test/Rule3.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug378967Test/Rule3.java @@ -26,10 +26,6 @@ public interface Rule3 extends EObject /** * Returns the value of the 'Value' attribute. * - *

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

* * @return the value of the 'Value' attribute. * @see #setValue(int) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug378967Test/Rule4.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug378967Test/Rule4.java index bd1f024a9..46064a835 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug378967Test/Rule4.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug378967Test/Rule4.java @@ -28,10 +28,6 @@ public interface Rule4 extends EObject /** * Returns the value of the 'After' containment reference. * - *

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

* * @return the value of the 'After' containment reference. * @see #setAfter(AfterObj) @@ -54,10 +50,6 @@ public interface Rule4 extends EObject /** * Returns the value of the 'Value' attribute. * - *

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

* * @return the value of the 'Value' attribute. * @see #setValue(int) @@ -80,10 +72,6 @@ public interface Rule4 extends EObject /** * Returns the value of the 'S' containment reference. * - *

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

* * @return the value of the 'S' containment reference. * @see #setS(SObj) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug378967Test/SObj.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug378967Test/SObj.java index e782f3cee..dec62d281 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug378967Test/SObj.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug378967Test/SObj.java @@ -26,10 +26,6 @@ public interface SObj extends EObject /** * Returns the value of the 'Value' attribute. * - *

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

* * @return the value of the 'Value' attribute. * @see #setValue(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug378967Test/SecondEnum.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug378967Test/SecondEnum.java index df4dbf449..23b104ea5 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug378967Test/SecondEnum.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug378967Test/SecondEnum.java @@ -33,10 +33,6 @@ public enum SecondEnum implements Enumerator /** * The 'Value' literal value. * - *

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

* * @see #VALUE * @model name="value" literal="s" @@ -163,6 +159,7 @@ public enum SecondEnum implements Enumerator * * @generated */ + @Override public int getValue() { return value; @@ -173,6 +170,7 @@ public enum SecondEnum implements Enumerator * * @generated */ + @Override public String getName() { return name; @@ -183,6 +181,7 @@ public enum SecondEnum implements Enumerator * * @generated */ + @Override public String getLiteral() { return literal; diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug378967Test/impl/AfterObjImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug378967Test/impl/AfterObjImpl.java index bba68a821..d71731c25 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug378967Test/impl/AfterObjImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug378967Test/impl/AfterObjImpl.java @@ -74,6 +74,7 @@ public class AfterObjImpl extends MinimalEObjectImpl.Container implements AfterO * * @generated */ + @Override public String getValue() { return value; @@ -84,6 +85,7 @@ public class AfterObjImpl extends MinimalEObjectImpl.Container implements AfterO * * @generated */ + @Override public void setValue(String newValue) { String oldValue = value; @@ -168,7 +170,7 @@ public class AfterObjImpl extends MinimalEObjectImpl.Container implements AfterO { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (value: "); result.append(value); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug378967Test/impl/Bug378967TestFactoryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug378967Test/impl/Bug378967TestFactoryImpl.java index 6953dfe75..8beb113ef 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug378967Test/impl/Bug378967TestFactoryImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug378967Test/impl/Bug378967TestFactoryImpl.java @@ -121,6 +121,7 @@ public class Bug378967TestFactoryImpl extends EFactoryImpl implements Bug378967T * * @generated */ + @Override public Root createRoot() { RootImpl root = new RootImpl(); @@ -132,6 +133,7 @@ public class Bug378967TestFactoryImpl extends EFactoryImpl implements Bug378967T * * @generated */ + @Override public Rule1 createRule1() { Rule1Impl rule1 = new Rule1Impl(); @@ -143,6 +145,7 @@ public class Bug378967TestFactoryImpl extends EFactoryImpl implements Bug378967T * * @generated */ + @Override public Rule2 createRule2() { Rule2Impl rule2 = new Rule2Impl(); @@ -154,6 +157,7 @@ public class Bug378967TestFactoryImpl extends EFactoryImpl implements Bug378967T * * @generated */ + @Override public Rule3 createRule3() { Rule3Impl rule3 = new Rule3Impl(); @@ -165,6 +169,7 @@ public class Bug378967TestFactoryImpl extends EFactoryImpl implements Bug378967T * * @generated */ + @Override public Rule4 createRule4() { Rule4Impl rule4 = new Rule4Impl(); @@ -176,6 +181,7 @@ public class Bug378967TestFactoryImpl extends EFactoryImpl implements Bug378967T * * @generated */ + @Override public AfterObj createAfterObj() { AfterObjImpl afterObj = new AfterObjImpl(); @@ -187,6 +193,7 @@ public class Bug378967TestFactoryImpl extends EFactoryImpl implements Bug378967T * * @generated */ + @Override public SObj createSObj() { SObjImpl sObj = new SObjImpl(); @@ -242,6 +249,7 @@ public class Bug378967TestFactoryImpl extends EFactoryImpl implements Bug378967T * * @generated */ + @Override public Bug378967TestPackage getBug378967TestPackage() { return (Bug378967TestPackage)getEPackage(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug378967Test/impl/Bug378967TestPackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug378967Test/impl/Bug378967TestPackageImpl.java index e40d2434c..42c8339e4 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug378967Test/impl/Bug378967TestPackageImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug378967Test/impl/Bug378967TestPackageImpl.java @@ -124,7 +124,7 @@ public class Bug378967TestPackageImpl extends EPackageImpl implements Bug378967T /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link Bug378967TestPackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -139,7 +139,8 @@ public class Bug378967TestPackageImpl extends EPackageImpl implements Bug378967T if (isInited) return (Bug378967TestPackage)EPackage.Registry.INSTANCE.getEPackage(Bug378967TestPackage.eNS_URI); // Obtain or create and register package - Bug378967TestPackageImpl theBug378967TestPackage = (Bug378967TestPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof Bug378967TestPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new Bug378967TestPackageImpl()); + Object registeredBug378967TestPackage = EPackage.Registry.INSTANCE.get(eNS_URI); + Bug378967TestPackageImpl theBug378967TestPackage = registeredBug378967TestPackage instanceof Bug378967TestPackageImpl ? (Bug378967TestPackageImpl)registeredBug378967TestPackage : new Bug378967TestPackageImpl(); isInited = true; @@ -155,7 +156,6 @@ public class Bug378967TestPackageImpl extends EPackageImpl implements Bug378967T // Mark meta-data to indicate it can't be changed theBug378967TestPackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(Bug378967TestPackage.eNS_URI, theBug378967TestPackage); return theBug378967TestPackage; @@ -166,6 +166,7 @@ public class Bug378967TestPackageImpl extends EPackageImpl implements Bug378967T * * @generated */ + @Override public EClass getRoot() { return rootEClass; @@ -176,6 +177,7 @@ public class Bug378967TestPackageImpl extends EPackageImpl implements Bug378967T * * @generated */ + @Override public EReference getRoot_Element() { return (EReference)rootEClass.getEStructuralFeatures().get(0); @@ -186,6 +188,7 @@ public class Bug378967TestPackageImpl extends EPackageImpl implements Bug378967T * * @generated */ + @Override public EClass getRule1() { return rule1EClass; @@ -196,6 +199,7 @@ public class Bug378967TestPackageImpl extends EPackageImpl implements Bug378967T * * @generated */ + @Override public EAttribute getRule1_Type() { return (EAttribute)rule1EClass.getEStructuralFeatures().get(0); @@ -206,6 +210,7 @@ public class Bug378967TestPackageImpl extends EPackageImpl implements Bug378967T * * @generated */ + @Override public EAttribute getRule1_Value() { return (EAttribute)rule1EClass.getEStructuralFeatures().get(1); @@ -216,6 +221,7 @@ public class Bug378967TestPackageImpl extends EPackageImpl implements Bug378967T * * @generated */ + @Override public EAttribute getRule1_Unit() { return (EAttribute)rule1EClass.getEStructuralFeatures().get(2); @@ -226,6 +232,7 @@ public class Bug378967TestPackageImpl extends EPackageImpl implements Bug378967T * * @generated */ + @Override public EClass getRule2() { return rule2EClass; @@ -236,6 +243,7 @@ public class Bug378967TestPackageImpl extends EPackageImpl implements Bug378967T * * @generated */ + @Override public EAttribute getRule2_Value() { return (EAttribute)rule2EClass.getEStructuralFeatures().get(0); @@ -246,6 +254,7 @@ public class Bug378967TestPackageImpl extends EPackageImpl implements Bug378967T * * @generated */ + @Override public EClass getRule3() { return rule3EClass; @@ -256,6 +265,7 @@ public class Bug378967TestPackageImpl extends EPackageImpl implements Bug378967T * * @generated */ + @Override public EAttribute getRule3_Value() { return (EAttribute)rule3EClass.getEStructuralFeatures().get(0); @@ -266,6 +276,7 @@ public class Bug378967TestPackageImpl extends EPackageImpl implements Bug378967T * * @generated */ + @Override public EClass getRule4() { return rule4EClass; @@ -276,6 +287,7 @@ public class Bug378967TestPackageImpl extends EPackageImpl implements Bug378967T * * @generated */ + @Override public EReference getRule4_After() { return (EReference)rule4EClass.getEStructuralFeatures().get(0); @@ -286,6 +298,7 @@ public class Bug378967TestPackageImpl extends EPackageImpl implements Bug378967T * * @generated */ + @Override public EAttribute getRule4_Value() { return (EAttribute)rule4EClass.getEStructuralFeatures().get(1); @@ -296,6 +309,7 @@ public class Bug378967TestPackageImpl extends EPackageImpl implements Bug378967T * * @generated */ + @Override public EReference getRule4_S() { return (EReference)rule4EClass.getEStructuralFeatures().get(2); @@ -306,6 +320,7 @@ public class Bug378967TestPackageImpl extends EPackageImpl implements Bug378967T * * @generated */ + @Override public EClass getAfterObj() { return afterObjEClass; @@ -316,6 +331,7 @@ public class Bug378967TestPackageImpl extends EPackageImpl implements Bug378967T * * @generated */ + @Override public EAttribute getAfterObj_Value() { return (EAttribute)afterObjEClass.getEStructuralFeatures().get(0); @@ -326,6 +342,7 @@ public class Bug378967TestPackageImpl extends EPackageImpl implements Bug378967T * * @generated */ + @Override public EClass getSObj() { return sObjEClass; @@ -336,6 +353,7 @@ public class Bug378967TestPackageImpl extends EPackageImpl implements Bug378967T * * @generated */ + @Override public EAttribute getSObj_Value() { return (EAttribute)sObjEClass.getEStructuralFeatures().get(0); @@ -346,6 +364,7 @@ public class Bug378967TestPackageImpl extends EPackageImpl implements Bug378967T * * @generated */ + @Override public EEnum getFirstEnum() { return firstEnumEEnum; @@ -356,6 +375,7 @@ public class Bug378967TestPackageImpl extends EPackageImpl implements Bug378967T * * @generated */ + @Override public EEnum getSecondEnum() { return secondEnumEEnum; @@ -366,6 +386,7 @@ public class Bug378967TestPackageImpl extends EPackageImpl implements Bug378967T * * @generated */ + @Override public Bug378967TestFactory getBug378967TestFactory() { return (Bug378967TestFactory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug378967Test/impl/RootImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug378967Test/impl/RootImpl.java index ad8ded8ad..f37bd9328 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug378967Test/impl/RootImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug378967Test/impl/RootImpl.java @@ -67,6 +67,7 @@ public class RootImpl extends MinimalEObjectImpl.Container implements Root * * @generated */ + @Override public EObject getElement() { return element; @@ -94,6 +95,7 @@ public class RootImpl extends MinimalEObjectImpl.Container implements Root * * @generated */ + @Override public void setElement(EObject newElement) { if (newElement != element) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug378967Test/impl/Rule1Impl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug378967Test/impl/Rule1Impl.java index 330259965..c1ac45c25 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug378967Test/impl/Rule1Impl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug378967Test/impl/Rule1Impl.java @@ -118,6 +118,7 @@ public class Rule1Impl extends MinimalEObjectImpl.Container implements Rule1 * * @generated */ + @Override public FirstEnum getType() { return type; @@ -128,6 +129,7 @@ public class Rule1Impl extends MinimalEObjectImpl.Container implements Rule1 * * @generated */ + @Override public void setType(FirstEnum newType) { FirstEnum oldType = type; @@ -141,6 +143,7 @@ public class Rule1Impl extends MinimalEObjectImpl.Container implements Rule1 * * @generated */ + @Override public int getValue() { return value; @@ -151,6 +154,7 @@ public class Rule1Impl extends MinimalEObjectImpl.Container implements Rule1 * * @generated */ + @Override public void setValue(int newValue) { int oldValue = value; @@ -164,6 +168,7 @@ public class Rule1Impl extends MinimalEObjectImpl.Container implements Rule1 * * @generated */ + @Override public SecondEnum getUnit() { return unit; @@ -174,6 +179,7 @@ public class Rule1Impl extends MinimalEObjectImpl.Container implements Rule1 * * @generated */ + @Override public void setUnit(SecondEnum newUnit) { SecondEnum oldUnit = unit; @@ -278,7 +284,7 @@ public class Rule1Impl extends MinimalEObjectImpl.Container implements Rule1 { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (type: "); result.append(type); result.append(", value: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug378967Test/impl/Rule2Impl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug378967Test/impl/Rule2Impl.java index 1409bebe4..ac1bb151b 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug378967Test/impl/Rule2Impl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug378967Test/impl/Rule2Impl.java @@ -74,6 +74,7 @@ public class Rule2Impl extends MinimalEObjectImpl.Container implements Rule2 * * @generated */ + @Override public int getValue() { return value; @@ -84,6 +85,7 @@ public class Rule2Impl extends MinimalEObjectImpl.Container implements Rule2 * * @generated */ + @Override public void setValue(int newValue) { int oldValue = value; @@ -168,7 +170,7 @@ public class Rule2Impl extends MinimalEObjectImpl.Container implements Rule2 { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (value: "); result.append(value); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug378967Test/impl/Rule3Impl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug378967Test/impl/Rule3Impl.java index f06c2b8e1..0646905ad 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug378967Test/impl/Rule3Impl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug378967Test/impl/Rule3Impl.java @@ -74,6 +74,7 @@ public class Rule3Impl extends MinimalEObjectImpl.Container implements Rule3 * * @generated */ + @Override public int getValue() { return value; @@ -84,6 +85,7 @@ public class Rule3Impl extends MinimalEObjectImpl.Container implements Rule3 * * @generated */ + @Override public void setValue(int newValue) { int oldValue = value; @@ -168,7 +170,7 @@ public class Rule3Impl extends MinimalEObjectImpl.Container implements Rule3 { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (value: "); result.append(value); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug378967Test/impl/Rule4Impl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug378967Test/impl/Rule4Impl.java index 9a2776664..801be8b64 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug378967Test/impl/Rule4Impl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug378967Test/impl/Rule4Impl.java @@ -100,6 +100,7 @@ public class Rule4Impl extends MinimalEObjectImpl.Container implements Rule4 * * @generated */ + @Override public AfterObj getAfter() { return after; @@ -127,6 +128,7 @@ public class Rule4Impl extends MinimalEObjectImpl.Container implements Rule4 * * @generated */ + @Override public void setAfter(AfterObj newAfter) { if (newAfter != after) @@ -148,6 +150,7 @@ public class Rule4Impl extends MinimalEObjectImpl.Container implements Rule4 * * @generated */ + @Override public int getValue() { return value; @@ -158,6 +161,7 @@ public class Rule4Impl extends MinimalEObjectImpl.Container implements Rule4 * * @generated */ + @Override public void setValue(int newValue) { int oldValue = value; @@ -171,6 +175,7 @@ public class Rule4Impl extends MinimalEObjectImpl.Container implements Rule4 * * @generated */ + @Override public SObj getS() { return s; @@ -198,6 +203,7 @@ public class Rule4Impl extends MinimalEObjectImpl.Container implements Rule4 * * @generated */ + @Override public void setS(SObj newS) { if (newS != s) @@ -328,7 +334,7 @@ public class Rule4Impl extends MinimalEObjectImpl.Container implements Rule4 { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (value: "); result.append(value); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug378967Test/impl/SObjImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug378967Test/impl/SObjImpl.java index 64cc95993..8508d4dd3 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug378967Test/impl/SObjImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug378967Test/impl/SObjImpl.java @@ -74,6 +74,7 @@ public class SObjImpl extends MinimalEObjectImpl.Container implements SObj * * @generated */ + @Override public String getValue() { return value; @@ -84,6 +85,7 @@ public class SObjImpl extends MinimalEObjectImpl.Container implements SObj * * @generated */ + @Override public void setValue(String newValue) { String oldValue = value; @@ -168,7 +170,7 @@ public class SObjImpl extends MinimalEObjectImpl.Container implements SObj { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (value: "); result.append(value); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug406914Test/Model.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug406914Test/Model.java index dfc23025a..dd2d580cb 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug406914Test/Model.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug406914Test/Model.java @@ -26,10 +26,6 @@ public interface Model 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) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug406914Test/impl/Bug406914TestFactoryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug406914Test/impl/Bug406914TestFactoryImpl.java index 086543aec..dd8d6070e 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug406914Test/impl/Bug406914TestFactoryImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug406914Test/impl/Bug406914TestFactoryImpl.java @@ -76,6 +76,7 @@ public class Bug406914TestFactoryImpl extends EFactoryImpl implements Bug406914T * * @generated */ + @Override public Model createModel() { ModelImpl model = new ModelImpl(); @@ -87,6 +88,7 @@ public class Bug406914TestFactoryImpl extends EFactoryImpl implements Bug406914T * * @generated */ + @Override public Bug406914TestPackage getBug406914TestPackage() { return (Bug406914TestPackage)getEPackage(); 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 4f2ed1dfe..a47215286 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 @@ -58,7 +58,7 @@ public class Bug406914TestPackageImpl extends EPackageImpl implements Bug406914T /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link Bug406914TestPackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -73,7 +73,8 @@ public class Bug406914TestPackageImpl extends EPackageImpl implements Bug406914T if (isInited) return (Bug406914TestPackage)EPackage.Registry.INSTANCE.getEPackage(Bug406914TestPackage.eNS_URI); // Obtain or create and register package - Bug406914TestPackageImpl theBug406914TestPackage = (Bug406914TestPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof Bug406914TestPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new Bug406914TestPackageImpl()); + Object registeredBug406914TestPackage = EPackage.Registry.INSTANCE.get(eNS_URI); + Bug406914TestPackageImpl theBug406914TestPackage = registeredBug406914TestPackage instanceof Bug406914TestPackageImpl ? (Bug406914TestPackageImpl)registeredBug406914TestPackage : new Bug406914TestPackageImpl(); isInited = true; @@ -89,7 +90,6 @@ public class Bug406914TestPackageImpl extends EPackageImpl implements Bug406914T // Mark meta-data to indicate it can't be changed theBug406914TestPackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(Bug406914TestPackage.eNS_URI, theBug406914TestPackage); return theBug406914TestPackage; @@ -100,6 +100,7 @@ public class Bug406914TestPackageImpl extends EPackageImpl implements Bug406914T * * @generated */ + @Override public EClass getModel() { return modelEClass; @@ -110,6 +111,7 @@ public class Bug406914TestPackageImpl extends EPackageImpl implements Bug406914T * * @generated */ + @Override public EAttribute getModel_Name() { return (EAttribute)modelEClass.getEStructuralFeatures().get(0); @@ -120,6 +122,7 @@ public class Bug406914TestPackageImpl extends EPackageImpl implements Bug406914T * * @generated */ + @Override public Bug406914TestFactory getBug406914TestFactory() { return (Bug406914TestFactory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug406914Test/impl/ModelImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug406914Test/impl/ModelImpl.java index f1136242a..5de38234f 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug406914Test/impl/ModelImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug406914Test/impl/ModelImpl.java @@ -74,6 +74,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public String getName() { return name; @@ -84,6 +85,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -168,7 +170,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug443221Test/Model.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug443221Test/Model.java index 5aa3f6ce7..b6963359d 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug443221Test/Model.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug443221Test/Model.java @@ -26,10 +26,6 @@ public interface Model 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) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug443221Test/impl/Bug443221TestFactoryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug443221Test/impl/Bug443221TestFactoryImpl.java index 37b8ab9e6..136218828 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug443221Test/impl/Bug443221TestFactoryImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug443221Test/impl/Bug443221TestFactoryImpl.java @@ -76,6 +76,7 @@ public class Bug443221TestFactoryImpl extends EFactoryImpl implements Bug443221T * * @generated */ + @Override public Model createModel() { ModelImpl model = new ModelImpl(); @@ -87,6 +88,7 @@ public class Bug443221TestFactoryImpl extends EFactoryImpl implements Bug443221T * * @generated */ + @Override public Bug443221TestPackage getBug443221TestPackage() { return (Bug443221TestPackage)getEPackage(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug443221Test/impl/Bug443221TestPackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug443221Test/impl/Bug443221TestPackageImpl.java index 48afa89ae..7c98b2fe8 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug443221Test/impl/Bug443221TestPackageImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug443221Test/impl/Bug443221TestPackageImpl.java @@ -58,7 +58,7 @@ public class Bug443221TestPackageImpl extends EPackageImpl implements Bug443221T /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link Bug443221TestPackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -73,7 +73,8 @@ public class Bug443221TestPackageImpl extends EPackageImpl implements Bug443221T if (isInited) return (Bug443221TestPackage)EPackage.Registry.INSTANCE.getEPackage(Bug443221TestPackage.eNS_URI); // Obtain or create and register package - Bug443221TestPackageImpl theBug443221TestPackage = (Bug443221TestPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof Bug443221TestPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new Bug443221TestPackageImpl()); + Object registeredBug443221TestPackage = EPackage.Registry.INSTANCE.get(eNS_URI); + Bug443221TestPackageImpl theBug443221TestPackage = registeredBug443221TestPackage instanceof Bug443221TestPackageImpl ? (Bug443221TestPackageImpl)registeredBug443221TestPackage : new Bug443221TestPackageImpl(); isInited = true; @@ -89,7 +90,6 @@ public class Bug443221TestPackageImpl extends EPackageImpl implements Bug443221T // Mark meta-data to indicate it can't be changed theBug443221TestPackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(Bug443221TestPackage.eNS_URI, theBug443221TestPackage); return theBug443221TestPackage; @@ -100,6 +100,7 @@ public class Bug443221TestPackageImpl extends EPackageImpl implements Bug443221T * * @generated */ + @Override public EClass getModel() { return modelEClass; @@ -110,6 +111,7 @@ public class Bug443221TestPackageImpl extends EPackageImpl implements Bug443221T * * @generated */ + @Override public EAttribute getModel_Name() { return (EAttribute)modelEClass.getEStructuralFeatures().get(0); @@ -120,6 +122,7 @@ public class Bug443221TestPackageImpl extends EPackageImpl implements Bug443221T * * @generated */ + @Override public Bug443221TestFactory getBug443221TestFactory() { return (Bug443221TestFactory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug443221Test/impl/ModelImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug443221Test/impl/ModelImpl.java index 7f3343ff0..9f90c7cdd 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug443221Test/impl/ModelImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug443221Test/impl/ModelImpl.java @@ -74,6 +74,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public String getName() { return name; @@ -84,6 +85,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -168,7 +170,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/AssignmentsTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/AssignmentsTestLanguage.genmodel index c35822f44..3784fc694 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/AssignmentsTestLanguage.genmodel +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/AssignmentsTestLanguage.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="AssignmentsTestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> + complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/Bug287184TestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/Bug287184TestLanguage.genmodel index ab1337b04..e577d548a 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/Bug287184TestLanguage.genmodel +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/Bug287184TestLanguage.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="Bug287184TestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> + complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/Bug288432TestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/Bug288432TestLanguage.genmodel index b3097b8f9..7c4a7064b 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/Bug288432TestLanguage.genmodel +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/Bug288432TestLanguage.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="Bug288432TestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> + complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/assignmentsTestLanguage/Model.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/assignmentsTestLanguage/Model.java index ed631abf9..60291448e 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/assignmentsTestLanguage/Model.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/assignmentsTestLanguage/Model.java @@ -28,10 +28,6 @@ public interface Model extends EObject /** * Returns the value of the 'Single' containment reference. * - *

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

* * @return the value of the 'Single' containment reference. * @see #setSingle(SingleValue) @@ -54,10 +50,6 @@ public interface Model extends EObject /** * Returns the value of the 'Multi' containment reference. * - *

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

* * @return the value of the 'Multi' containment reference. * @see #setMulti(MultiValue) @@ -80,10 +72,6 @@ public interface Model extends EObject /** * Returns the value of the 'Object' containment reference. * - *

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

* * @return the value of the 'Object' containment reference. * @see #setObject(EObject) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/assignmentsTestLanguage/MultiValue.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/assignmentsTestLanguage/MultiValue.java index 5290c7ea3..bd60677fe 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/assignmentsTestLanguage/MultiValue.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/assignmentsTestLanguage/MultiValue.java @@ -29,10 +29,6 @@ public interface MultiValue extends EObject * Returns the value of the 'Value' attribute list. * The list contents are of type {@link java.lang.String}. * - *

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

* * @return the value of the 'Value' attribute list. * @see org.eclipse.xtext.parser.assignments.assignmentsTestLanguage.AssignmentsTestLanguagePackage#getMultiValue_Value() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/assignmentsTestLanguage/SingleValue.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/assignmentsTestLanguage/SingleValue.java index 0ea213cc6..16db643a8 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/assignmentsTestLanguage/SingleValue.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/assignmentsTestLanguage/SingleValue.java @@ -26,10 +26,6 @@ public interface SingleValue extends EObject /** * Returns the value of the 'Value' attribute. * - *

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

* * @return the value of the 'Value' attribute. * @see #setValue(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/assignmentsTestLanguage/impl/AssignmentsTestLanguageFactoryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/assignmentsTestLanguage/impl/AssignmentsTestLanguageFactoryImpl.java index f1e2182d3..34fb1025b 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/assignmentsTestLanguage/impl/AssignmentsTestLanguageFactoryImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/assignmentsTestLanguage/impl/AssignmentsTestLanguageFactoryImpl.java @@ -78,6 +78,7 @@ public class AssignmentsTestLanguageFactoryImpl extends EFactoryImpl implements * * @generated */ + @Override public Model createModel() { ModelImpl model = new ModelImpl(); @@ -89,6 +90,7 @@ public class AssignmentsTestLanguageFactoryImpl extends EFactoryImpl implements * * @generated */ + @Override public SingleValue createSingleValue() { SingleValueImpl singleValue = new SingleValueImpl(); @@ -100,6 +102,7 @@ public class AssignmentsTestLanguageFactoryImpl extends EFactoryImpl implements * * @generated */ + @Override public MultiValue createMultiValue() { MultiValueImpl multiValue = new MultiValueImpl(); @@ -111,6 +114,7 @@ public class AssignmentsTestLanguageFactoryImpl extends EFactoryImpl implements * * @generated */ + @Override public AssignmentsTestLanguagePackage getAssignmentsTestLanguagePackage() { return (AssignmentsTestLanguagePackage)getEPackage(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/assignmentsTestLanguage/impl/AssignmentsTestLanguagePackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/assignmentsTestLanguage/impl/AssignmentsTestLanguagePackageImpl.java index 56984a32f..eeac8a300 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/assignmentsTestLanguage/impl/AssignmentsTestLanguagePackageImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/assignmentsTestLanguage/impl/AssignmentsTestLanguagePackageImpl.java @@ -75,7 +75,7 @@ public class AssignmentsTestLanguagePackageImpl extends EPackageImpl implements /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link AssignmentsTestLanguagePackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -90,7 +90,8 @@ public class AssignmentsTestLanguagePackageImpl extends EPackageImpl implements if (isInited) return (AssignmentsTestLanguagePackage)EPackage.Registry.INSTANCE.getEPackage(AssignmentsTestLanguagePackage.eNS_URI); // Obtain or create and register package - AssignmentsTestLanguagePackageImpl theAssignmentsTestLanguagePackage = (AssignmentsTestLanguagePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof AssignmentsTestLanguagePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new AssignmentsTestLanguagePackageImpl()); + Object registeredAssignmentsTestLanguagePackage = EPackage.Registry.INSTANCE.get(eNS_URI); + AssignmentsTestLanguagePackageImpl theAssignmentsTestLanguagePackage = registeredAssignmentsTestLanguagePackage instanceof AssignmentsTestLanguagePackageImpl ? (AssignmentsTestLanguagePackageImpl)registeredAssignmentsTestLanguagePackage : new AssignmentsTestLanguagePackageImpl(); isInited = true; @@ -106,7 +107,6 @@ public class AssignmentsTestLanguagePackageImpl extends EPackageImpl implements // Mark meta-data to indicate it can't be changed theAssignmentsTestLanguagePackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(AssignmentsTestLanguagePackage.eNS_URI, theAssignmentsTestLanguagePackage); return theAssignmentsTestLanguagePackage; @@ -117,6 +117,7 @@ public class AssignmentsTestLanguagePackageImpl extends EPackageImpl implements * * @generated */ + @Override public EClass getModel() { return modelEClass; @@ -127,6 +128,7 @@ public class AssignmentsTestLanguagePackageImpl extends EPackageImpl implements * * @generated */ + @Override public EReference getModel_Single() { return (EReference)modelEClass.getEStructuralFeatures().get(0); @@ -137,6 +139,7 @@ public class AssignmentsTestLanguagePackageImpl extends EPackageImpl implements * * @generated */ + @Override public EReference getModel_Multi() { return (EReference)modelEClass.getEStructuralFeatures().get(1); @@ -147,6 +150,7 @@ public class AssignmentsTestLanguagePackageImpl extends EPackageImpl implements * * @generated */ + @Override public EReference getModel_Object() { return (EReference)modelEClass.getEStructuralFeatures().get(2); @@ -157,6 +161,7 @@ public class AssignmentsTestLanguagePackageImpl extends EPackageImpl implements * * @generated */ + @Override public EClass getSingleValue() { return singleValueEClass; @@ -167,6 +172,7 @@ public class AssignmentsTestLanguagePackageImpl extends EPackageImpl implements * * @generated */ + @Override public EAttribute getSingleValue_Value() { return (EAttribute)singleValueEClass.getEStructuralFeatures().get(0); @@ -177,6 +183,7 @@ public class AssignmentsTestLanguagePackageImpl extends EPackageImpl implements * * @generated */ + @Override public EClass getMultiValue() { return multiValueEClass; @@ -187,6 +194,7 @@ public class AssignmentsTestLanguagePackageImpl extends EPackageImpl implements * * @generated */ + @Override public EAttribute getMultiValue_Value() { return (EAttribute)multiValueEClass.getEStructuralFeatures().get(0); @@ -197,6 +205,7 @@ public class AssignmentsTestLanguagePackageImpl extends EPackageImpl implements * * @generated */ + @Override public AssignmentsTestLanguageFactory getAssignmentsTestLanguageFactory() { return (AssignmentsTestLanguageFactory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/assignmentsTestLanguage/impl/ModelImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/assignmentsTestLanguage/impl/ModelImpl.java index 5768bf160..3a156ab1b 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/assignmentsTestLanguage/impl/ModelImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/assignmentsTestLanguage/impl/ModelImpl.java @@ -91,6 +91,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public SingleValue getSingle() { return single; @@ -118,6 +119,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setSingle(SingleValue newSingle) { if (newSingle != single) @@ -139,6 +141,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public MultiValue getMulti() { return multi; @@ -166,6 +169,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setMulti(MultiValue newMulti) { if (newMulti != multi) @@ -187,6 +191,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public EObject getObject() { return object; @@ -214,6 +219,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setObject(EObject newObject) { if (newObject != object) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/assignmentsTestLanguage/impl/MultiValueImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/assignmentsTestLanguage/impl/MultiValueImpl.java index 1ef3922fe..a5408c527 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/assignmentsTestLanguage/impl/MultiValueImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/assignmentsTestLanguage/impl/MultiValueImpl.java @@ -67,6 +67,7 @@ public class MultiValueImpl extends MinimalEObjectImpl.Container implements Mult * * @generated */ + @Override public EList getValue() { if (value == null) @@ -154,7 +155,7 @@ public class MultiValueImpl extends MinimalEObjectImpl.Container implements Mult { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (value: "); result.append(value); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/assignmentsTestLanguage/impl/SingleValueImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/assignmentsTestLanguage/impl/SingleValueImpl.java index 7c47e9a26..b1a082494 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/assignmentsTestLanguage/impl/SingleValueImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/assignmentsTestLanguage/impl/SingleValueImpl.java @@ -74,6 +74,7 @@ public class SingleValueImpl extends MinimalEObjectImpl.Container implements Sin * * @generated */ + @Override public String getValue() { return value; @@ -84,6 +85,7 @@ public class SingleValueImpl extends MinimalEObjectImpl.Container implements Sin * * @generated */ + @Override public void setValue(String newValue) { String oldValue = value; @@ -168,7 +170,7 @@ public class SingleValueImpl extends MinimalEObjectImpl.Container implements Sin { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (value: "); result.append(value); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/bug287184Test/AbstractDetail.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/bug287184Test/AbstractDetail.java index b43eefdda..211c9f1e6 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/bug287184Test/AbstractDetail.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/bug287184Test/AbstractDetail.java @@ -26,10 +26,6 @@ public interface AbstractDetail extends EObject /** * Returns the value of the 'Detail Class' reference. * - *

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

* * @return the value of the 'Detail Class' reference. * @see #setDetailClass(Model) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/bug287184Test/Detail.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/bug287184Test/Detail.java index 1885b8d75..9e27295b0 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/bug287184Test/Detail.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/bug287184Test/Detail.java @@ -25,10 +25,6 @@ public interface Detail extends AbstractDetail /** * Returns the value of the 'Visibility' attribute. * - *

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

* * @return the value of the 'Visibility' attribute. * @see #setVisibility(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/bug287184Test/Model.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/bug287184Test/Model.java index c782ef6b9..19453545f 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/bug287184Test/Model.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/bug287184Test/Model.java @@ -29,10 +29,6 @@ public interface Model 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) @@ -56,10 +52,6 @@ public interface Model extends EObject * Returns the value of the 'Detail' containment reference list. * The list contents are of type {@link org.eclipse.xtext.parser.assignments.bug287184Test.AbstractDetail}. * - *

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

* * @return the value of the 'Detail' containment reference list. * @see org.eclipse.xtext.parser.assignments.bug287184Test.Bug287184TestPackage#getModel_Detail() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/bug287184Test/impl/AbstractDetailImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/bug287184Test/impl/AbstractDetailImpl.java index aced115df..3a17c72e7 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/bug287184Test/impl/AbstractDetailImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/bug287184Test/impl/AbstractDetailImpl.java @@ -66,6 +66,7 @@ public class AbstractDetailImpl extends MinimalEObjectImpl.Container implements * * @generated */ + @Override public Model getDetailClass() { if (detailClass != null && detailClass.eIsProxy()) @@ -96,6 +97,7 @@ public class AbstractDetailImpl extends MinimalEObjectImpl.Container implements * * @generated */ + @Override public void setDetailClass(Model newDetailClass) { Model oldDetailClass = detailClass; diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/bug287184Test/impl/Bug287184TestFactoryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/bug287184Test/impl/Bug287184TestFactoryImpl.java index 2d2ff7876..d06e9253f 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/bug287184Test/impl/Bug287184TestFactoryImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/bug287184Test/impl/Bug287184TestFactoryImpl.java @@ -79,6 +79,7 @@ public class Bug287184TestFactoryImpl extends EFactoryImpl implements Bug287184T * * @generated */ + @Override public Model createModel() { ModelImpl model = new ModelImpl(); @@ -90,6 +91,7 @@ public class Bug287184TestFactoryImpl extends EFactoryImpl implements Bug287184T * * @generated */ + @Override public AbstractDetail createAbstractDetail() { AbstractDetailImpl abstractDetail = new AbstractDetailImpl(); @@ -101,6 +103,7 @@ public class Bug287184TestFactoryImpl extends EFactoryImpl implements Bug287184T * * @generated */ + @Override public Detail createDetail() { DetailImpl detail = new DetailImpl(); @@ -112,6 +115,7 @@ public class Bug287184TestFactoryImpl extends EFactoryImpl implements Bug287184T * * @generated */ + @Override public AssociatedDetail createAssociatedDetail() { AssociatedDetailImpl associatedDetail = new AssociatedDetailImpl(); @@ -123,6 +127,7 @@ public class Bug287184TestFactoryImpl extends EFactoryImpl implements Bug287184T * * @generated */ + @Override public Bug287184TestPackage getBug287184TestPackage() { return (Bug287184TestPackage)getEPackage(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/bug287184Test/impl/Bug287184TestPackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/bug287184Test/impl/Bug287184TestPackageImpl.java index d9877f087..df78fc6d6 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/bug287184Test/impl/Bug287184TestPackageImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/bug287184Test/impl/Bug287184TestPackageImpl.java @@ -83,7 +83,7 @@ public class Bug287184TestPackageImpl extends EPackageImpl implements Bug287184T /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link Bug287184TestPackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -98,7 +98,8 @@ public class Bug287184TestPackageImpl extends EPackageImpl implements Bug287184T if (isInited) return (Bug287184TestPackage)EPackage.Registry.INSTANCE.getEPackage(Bug287184TestPackage.eNS_URI); // Obtain or create and register package - Bug287184TestPackageImpl theBug287184TestPackage = (Bug287184TestPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof Bug287184TestPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new Bug287184TestPackageImpl()); + Object registeredBug287184TestPackage = EPackage.Registry.INSTANCE.get(eNS_URI); + Bug287184TestPackageImpl theBug287184TestPackage = registeredBug287184TestPackage instanceof Bug287184TestPackageImpl ? (Bug287184TestPackageImpl)registeredBug287184TestPackage : new Bug287184TestPackageImpl(); isInited = true; @@ -114,7 +115,6 @@ public class Bug287184TestPackageImpl extends EPackageImpl implements Bug287184T // Mark meta-data to indicate it can't be changed theBug287184TestPackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(Bug287184TestPackage.eNS_URI, theBug287184TestPackage); return theBug287184TestPackage; @@ -125,6 +125,7 @@ public class Bug287184TestPackageImpl extends EPackageImpl implements Bug287184T * * @generated */ + @Override public EClass getModel() { return modelEClass; @@ -135,6 +136,7 @@ public class Bug287184TestPackageImpl extends EPackageImpl implements Bug287184T * * @generated */ + @Override public EAttribute getModel_Name() { return (EAttribute)modelEClass.getEStructuralFeatures().get(0); @@ -145,6 +147,7 @@ public class Bug287184TestPackageImpl extends EPackageImpl implements Bug287184T * * @generated */ + @Override public EReference getModel_Detail() { return (EReference)modelEClass.getEStructuralFeatures().get(1); @@ -155,6 +158,7 @@ public class Bug287184TestPackageImpl extends EPackageImpl implements Bug287184T * * @generated */ + @Override public EClass getAbstractDetail() { return abstractDetailEClass; @@ -165,6 +169,7 @@ public class Bug287184TestPackageImpl extends EPackageImpl implements Bug287184T * * @generated */ + @Override public EReference getAbstractDetail_DetailClass() { return (EReference)abstractDetailEClass.getEStructuralFeatures().get(0); @@ -175,6 +180,7 @@ public class Bug287184TestPackageImpl extends EPackageImpl implements Bug287184T * * @generated */ + @Override public EClass getDetail() { return detailEClass; @@ -185,6 +191,7 @@ public class Bug287184TestPackageImpl extends EPackageImpl implements Bug287184T * * @generated */ + @Override public EAttribute getDetail_Visibility() { return (EAttribute)detailEClass.getEStructuralFeatures().get(0); @@ -195,6 +202,7 @@ public class Bug287184TestPackageImpl extends EPackageImpl implements Bug287184T * * @generated */ + @Override public EClass getAssociatedDetail() { return associatedDetailEClass; @@ -205,6 +213,7 @@ public class Bug287184TestPackageImpl extends EPackageImpl implements Bug287184T * * @generated */ + @Override public Bug287184TestFactory getBug287184TestFactory() { return (Bug287184TestFactory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/bug287184Test/impl/DetailImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/bug287184Test/impl/DetailImpl.java index 881637247..4a824f8e9 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/bug287184Test/impl/DetailImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/bug287184Test/impl/DetailImpl.java @@ -73,6 +73,7 @@ public class DetailImpl extends AbstractDetailImpl implements Detail * * @generated */ + @Override public String getVisibility() { return visibility; @@ -83,6 +84,7 @@ public class DetailImpl extends AbstractDetailImpl implements Detail * * @generated */ + @Override public void setVisibility(String newVisibility) { String oldVisibility = visibility; @@ -167,7 +169,7 @@ public class DetailImpl extends AbstractDetailImpl implements Detail { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (visibility: "); result.append(visibility); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/bug287184Test/impl/ModelImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/bug287184Test/impl/ModelImpl.java index de17eb8a1..7e68ee34e 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/bug287184Test/impl/ModelImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/bug287184Test/impl/ModelImpl.java @@ -95,6 +95,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public String getName() { return name; @@ -105,6 +106,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -118,6 +120,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public EList getDetail() { if (detail == null) @@ -231,7 +234,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/bug288432Test/Body.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/bug288432Test/Body.java index d2c2d78cd..97a48662c 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/bug288432Test/Body.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/bug288432Test/Body.java @@ -31,10 +31,6 @@ public interface Body extends EObject * Returns the value of the 'Parameter' containment reference list. * The list contents are of type {@link org.eclipse.xtext.parser.assignments.bug288432Test.Parameter}. * - *

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

* * @return the value of the 'Parameter' containment reference list. * @see org.eclipse.xtext.parser.assignments.bug288432Test.Bug288432TestPackage#getBody_Parameter() @@ -46,10 +42,6 @@ public interface Body extends EObject /** * Returns the value of the 'Content' containment reference. * - *

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

* * @return the value of the 'Content' containment reference. * @see #setContent(ParameterObject) @@ -73,10 +65,6 @@ public interface Body extends EObject * Returns the value of the 'Foo' containment reference list. * The list contents are of type {@link org.eclipse.xtext.parser.assignments.bug288432Test.Foo}. * - *

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

* * @return the value of the 'Foo' containment reference list. * @see org.eclipse.xtext.parser.assignments.bug288432Test.Bug288432TestPackage#getBody_Foo() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/bug288432Test/Foo.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/bug288432Test/Foo.java index bc718a0f1..2bcd4a234 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/bug288432Test/Foo.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/bug288432Test/Foo.java @@ -26,10 +26,6 @@ public interface Foo extends EObject /** * Returns the value of the 'Foo Value' attribute. * - *

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

* * @return the value of the 'Foo Value' attribute. * @see #setFooValue(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/bug288432Test/MyElement.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/bug288432Test/MyElement.java index 67156b775..4bd89b5ab 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/bug288432Test/MyElement.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/bug288432Test/MyElement.java @@ -25,10 +25,6 @@ public interface MyElement extends Content /** * Returns the value of the 'Bar' containment reference. * - *

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

* * @return the value of the 'Bar' containment reference. * @see #setBar(ParameterObject) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/bug288432Test/MyInt.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/bug288432Test/MyInt.java index 3cd23e5bb..2f1c9dab4 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/bug288432Test/MyInt.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/bug288432Test/MyInt.java @@ -25,10 +25,6 @@ public interface MyInt extends ParameterObject /** * Returns the value of the 'Int' attribute. * - *

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

* * @return the value of the 'Int' attribute. * @see #setInt(int) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/bug288432Test/Parameter.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/bug288432Test/Parameter.java index f4dbd1b47..7c3215b03 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/bug288432Test/Parameter.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/bug288432Test/Parameter.java @@ -27,10 +27,6 @@ public interface Parameter 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) @@ -53,10 +49,6 @@ public interface Parameter extends EObject /** * Returns the value of the 'Value' reference. * - *

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

* * @return the value of the 'Value' reference. * @see #setValue(ParameterObject) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/bug288432Test/ParameterRef.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/bug288432Test/ParameterRef.java index 41fee86db..c85147f8c 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/bug288432Test/ParameterRef.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/bug288432Test/ParameterRef.java @@ -25,10 +25,6 @@ public interface ParameterRef extends ParameterObject /** * Returns the value of the 'Parameter' reference. * - *

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

* * @return the value of the 'Parameter' reference. * @see #setParameter(Parameter) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/bug288432Test/impl/BodyImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/bug288432Test/impl/BodyImpl.java index 05f989ba1..f2d488f04 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/bug288432Test/impl/BodyImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/bug288432Test/impl/BodyImpl.java @@ -98,6 +98,7 @@ public class BodyImpl extends MinimalEObjectImpl.Container implements Body * * @generated */ + @Override public EList getParameter() { if (parameter == null) @@ -112,6 +113,7 @@ public class BodyImpl extends MinimalEObjectImpl.Container implements Body * * @generated */ + @Override public ParameterObject getContent() { return content; @@ -139,6 +141,7 @@ public class BodyImpl extends MinimalEObjectImpl.Container implements Body * * @generated */ + @Override public void setContent(ParameterObject newContent) { if (newContent != content) @@ -160,6 +163,7 @@ public class BodyImpl extends MinimalEObjectImpl.Container implements Body * * @generated */ + @Override public EList getFoo() { if (foo == null) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/bug288432Test/impl/Bug288432TestFactoryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/bug288432Test/impl/Bug288432TestFactoryImpl.java index 5949ef102..c28addaee 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/bug288432Test/impl/Bug288432TestFactoryImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/bug288432Test/impl/Bug288432TestFactoryImpl.java @@ -83,6 +83,7 @@ public class Bug288432TestFactoryImpl extends EFactoryImpl implements Bug288432T * * @generated */ + @Override public Body createBody() { BodyImpl body = new BodyImpl(); @@ -94,6 +95,7 @@ public class Bug288432TestFactoryImpl extends EFactoryImpl implements Bug288432T * * @generated */ + @Override public Foo createFoo() { FooImpl foo = new FooImpl(); @@ -105,6 +107,7 @@ public class Bug288432TestFactoryImpl extends EFactoryImpl implements Bug288432T * * @generated */ + @Override public Content createContent() { ContentImpl content = new ContentImpl(); @@ -116,6 +119,7 @@ public class Bug288432TestFactoryImpl extends EFactoryImpl implements Bug288432T * * @generated */ + @Override public MyElement createMyElement() { MyElementImpl myElement = new MyElementImpl(); @@ -127,6 +131,7 @@ public class Bug288432TestFactoryImpl extends EFactoryImpl implements Bug288432T * * @generated */ + @Override public ParameterObject createParameterObject() { ParameterObjectImpl parameterObject = new ParameterObjectImpl(); @@ -138,6 +143,7 @@ public class Bug288432TestFactoryImpl extends EFactoryImpl implements Bug288432T * * @generated */ + @Override public Parameter createParameter() { ParameterImpl parameter = new ParameterImpl(); @@ -149,6 +155,7 @@ public class Bug288432TestFactoryImpl extends EFactoryImpl implements Bug288432T * * @generated */ + @Override public ParameterRef createParameterRef() { ParameterRefImpl parameterRef = new ParameterRefImpl(); @@ -160,6 +167,7 @@ public class Bug288432TestFactoryImpl extends EFactoryImpl implements Bug288432T * * @generated */ + @Override public MyInt createMyInt() { MyIntImpl myInt = new MyIntImpl(); @@ -171,6 +179,7 @@ public class Bug288432TestFactoryImpl extends EFactoryImpl implements Bug288432T * * @generated */ + @Override public Bug288432TestPackage getBug288432TestPackage() { return (Bug288432TestPackage)getEPackage(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/bug288432Test/impl/Bug288432TestPackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/bug288432Test/impl/Bug288432TestPackageImpl.java index 0e4d09225..37ee42363 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/bug288432Test/impl/Bug288432TestPackageImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/bug288432Test/impl/Bug288432TestPackageImpl.java @@ -115,7 +115,7 @@ public class Bug288432TestPackageImpl extends EPackageImpl implements Bug288432T /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link Bug288432TestPackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -130,7 +130,8 @@ public class Bug288432TestPackageImpl extends EPackageImpl implements Bug288432T if (isInited) return (Bug288432TestPackage)EPackage.Registry.INSTANCE.getEPackage(Bug288432TestPackage.eNS_URI); // Obtain or create and register package - Bug288432TestPackageImpl theBug288432TestPackage = (Bug288432TestPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof Bug288432TestPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new Bug288432TestPackageImpl()); + Object registeredBug288432TestPackage = EPackage.Registry.INSTANCE.get(eNS_URI); + Bug288432TestPackageImpl theBug288432TestPackage = registeredBug288432TestPackage instanceof Bug288432TestPackageImpl ? (Bug288432TestPackageImpl)registeredBug288432TestPackage : new Bug288432TestPackageImpl(); isInited = true; @@ -146,7 +147,6 @@ public class Bug288432TestPackageImpl extends EPackageImpl implements Bug288432T // Mark meta-data to indicate it can't be changed theBug288432TestPackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(Bug288432TestPackage.eNS_URI, theBug288432TestPackage); return theBug288432TestPackage; @@ -157,6 +157,7 @@ public class Bug288432TestPackageImpl extends EPackageImpl implements Bug288432T * * @generated */ + @Override public EClass getBody() { return bodyEClass; @@ -167,6 +168,7 @@ public class Bug288432TestPackageImpl extends EPackageImpl implements Bug288432T * * @generated */ + @Override public EReference getBody_Parameter() { return (EReference)bodyEClass.getEStructuralFeatures().get(0); @@ -177,6 +179,7 @@ public class Bug288432TestPackageImpl extends EPackageImpl implements Bug288432T * * @generated */ + @Override public EReference getBody_Content() { return (EReference)bodyEClass.getEStructuralFeatures().get(1); @@ -187,6 +190,7 @@ public class Bug288432TestPackageImpl extends EPackageImpl implements Bug288432T * * @generated */ + @Override public EReference getBody_Foo() { return (EReference)bodyEClass.getEStructuralFeatures().get(2); @@ -197,6 +201,7 @@ public class Bug288432TestPackageImpl extends EPackageImpl implements Bug288432T * * @generated */ + @Override public EClass getFoo() { return fooEClass; @@ -207,6 +212,7 @@ public class Bug288432TestPackageImpl extends EPackageImpl implements Bug288432T * * @generated */ + @Override public EAttribute getFoo_FooValue() { return (EAttribute)fooEClass.getEStructuralFeatures().get(0); @@ -217,6 +223,7 @@ public class Bug288432TestPackageImpl extends EPackageImpl implements Bug288432T * * @generated */ + @Override public EClass getContent() { return contentEClass; @@ -227,6 +234,7 @@ public class Bug288432TestPackageImpl extends EPackageImpl implements Bug288432T * * @generated */ + @Override public EClass getMyElement() { return myElementEClass; @@ -237,6 +245,7 @@ public class Bug288432TestPackageImpl extends EPackageImpl implements Bug288432T * * @generated */ + @Override public EReference getMyElement_Bar() { return (EReference)myElementEClass.getEStructuralFeatures().get(0); @@ -247,6 +256,7 @@ public class Bug288432TestPackageImpl extends EPackageImpl implements Bug288432T * * @generated */ + @Override public EClass getParameterObject() { return parameterObjectEClass; @@ -257,6 +267,7 @@ public class Bug288432TestPackageImpl extends EPackageImpl implements Bug288432T * * @generated */ + @Override public EClass getParameter() { return parameterEClass; @@ -267,6 +278,7 @@ public class Bug288432TestPackageImpl extends EPackageImpl implements Bug288432T * * @generated */ + @Override public EAttribute getParameter_Name() { return (EAttribute)parameterEClass.getEStructuralFeatures().get(0); @@ -277,6 +289,7 @@ public class Bug288432TestPackageImpl extends EPackageImpl implements Bug288432T * * @generated */ + @Override public EReference getParameter_Value() { return (EReference)parameterEClass.getEStructuralFeatures().get(1); @@ -287,6 +300,7 @@ public class Bug288432TestPackageImpl extends EPackageImpl implements Bug288432T * * @generated */ + @Override public EClass getParameterRef() { return parameterRefEClass; @@ -297,6 +311,7 @@ public class Bug288432TestPackageImpl extends EPackageImpl implements Bug288432T * * @generated */ + @Override public EReference getParameterRef_Parameter() { return (EReference)parameterRefEClass.getEStructuralFeatures().get(0); @@ -307,6 +322,7 @@ public class Bug288432TestPackageImpl extends EPackageImpl implements Bug288432T * * @generated */ + @Override public EClass getMyInt() { return myIntEClass; @@ -317,6 +333,7 @@ public class Bug288432TestPackageImpl extends EPackageImpl implements Bug288432T * * @generated */ + @Override public EAttribute getMyInt_Int() { return (EAttribute)myIntEClass.getEStructuralFeatures().get(0); @@ -327,6 +344,7 @@ public class Bug288432TestPackageImpl extends EPackageImpl implements Bug288432T * * @generated */ + @Override public Bug288432TestFactory getBug288432TestFactory() { return (Bug288432TestFactory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/bug288432Test/impl/FooImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/bug288432Test/impl/FooImpl.java index 72d754416..cb1d7f9ad 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/bug288432Test/impl/FooImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/bug288432Test/impl/FooImpl.java @@ -74,6 +74,7 @@ public class FooImpl extends MinimalEObjectImpl.Container implements Foo * * @generated */ + @Override public String getFooValue() { return fooValue; @@ -84,6 +85,7 @@ public class FooImpl extends MinimalEObjectImpl.Container implements Foo * * @generated */ + @Override public void setFooValue(String newFooValue) { String oldFooValue = fooValue; @@ -168,7 +170,7 @@ public class FooImpl extends MinimalEObjectImpl.Container implements Foo { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (fooValue: "); result.append(fooValue); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/bug288432Test/impl/MyElementImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/bug288432Test/impl/MyElementImpl.java index 3417a80cd..e727ecd4d 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/bug288432Test/impl/MyElementImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/bug288432Test/impl/MyElementImpl.java @@ -66,6 +66,7 @@ public class MyElementImpl extends ContentImpl implements MyElement * * @generated */ + @Override public ParameterObject getBar() { return bar; @@ -93,6 +94,7 @@ public class MyElementImpl extends ContentImpl implements MyElement * * @generated */ + @Override public void setBar(ParameterObject newBar) { if (newBar != bar) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/bug288432Test/impl/MyIntImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/bug288432Test/impl/MyIntImpl.java index dac4254d1..6c2aee86e 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/bug288432Test/impl/MyIntImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/bug288432Test/impl/MyIntImpl.java @@ -73,6 +73,7 @@ public class MyIntImpl extends ParameterObjectImpl implements MyInt * * @generated */ + @Override public int getInt() { return int_; @@ -83,6 +84,7 @@ public class MyIntImpl extends ParameterObjectImpl implements MyInt * * @generated */ + @Override public void setInt(int newInt) { int oldInt = int_; @@ -167,7 +169,7 @@ public class MyIntImpl extends ParameterObjectImpl implements MyInt { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (int: "); result.append(int_); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/bug288432Test/impl/ParameterImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/bug288432Test/impl/ParameterImpl.java index 0968e751e..6db900c4b 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/bug288432Test/impl/ParameterImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/bug288432Test/impl/ParameterImpl.java @@ -87,6 +87,7 @@ public class ParameterImpl extends MinimalEObjectImpl.Container implements Param * * @generated */ + @Override public String getName() { return name; @@ -97,6 +98,7 @@ public class ParameterImpl extends MinimalEObjectImpl.Container implements Param * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -110,6 +112,7 @@ public class ParameterImpl extends MinimalEObjectImpl.Container implements Param * * @generated */ + @Override public ParameterObject getValue() { if (value != null && value.eIsProxy()) @@ -140,6 +143,7 @@ public class ParameterImpl extends MinimalEObjectImpl.Container implements Param * * @generated */ + @Override public void setValue(ParameterObject newValue) { ParameterObject oldValue = value; @@ -235,7 +239,7 @@ public class ParameterImpl extends MinimalEObjectImpl.Container implements Param { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/bug288432Test/impl/ParameterRefImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/bug288432Test/impl/ParameterRefImpl.java index eea1b200b..525aedb08 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/bug288432Test/impl/ParameterRefImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/assignments/bug288432Test/impl/ParameterRefImpl.java @@ -65,6 +65,7 @@ public class ParameterRefImpl extends ParameterObjectImpl implements ParameterRe * * @generated */ + @Override public Parameter getParameter() { if (parameter != null && parameter.eIsProxy()) @@ -95,6 +96,7 @@ public class ParameterRefImpl extends ParameterObjectImpl implements ParameterRe * * @generated */ + @Override public void setParameter(Parameter newParameter) { Parameter oldParameter = parameter; diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.genmodel index e38472e7e..fd1cdc4e8 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.genmodel +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/datatyperules/DatatypeRulesTestLanguage.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="DatatypeRulesTestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> + complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/datatyperules/datatypeRulesTestLanguage/CompositeModel.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/datatyperules/datatypeRulesTestLanguage/CompositeModel.java index cfd8e030f..019232698 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/datatyperules/datatypeRulesTestLanguage/CompositeModel.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/datatyperules/datatypeRulesTestLanguage/CompositeModel.java @@ -29,10 +29,6 @@ public interface CompositeModel extends EObject * Returns the value of the 'Model' containment reference list. * The list contents are of type {@link org.eclipse.xtext.parser.datatyperules.datatypeRulesTestLanguage.Model}. * - *

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

* * @return the value of the 'Model' containment reference list. * @see org.eclipse.xtext.parser.datatyperules.datatypeRulesTestLanguage.DatatypeRulesTestLanguagePackage#getCompositeModel_Model() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/datatyperules/datatypeRulesTestLanguage/Model.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/datatyperules/datatypeRulesTestLanguage/Model.java index 24a5e6a3c..336aa1086 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/datatyperules/datatypeRulesTestLanguage/Model.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/datatyperules/datatypeRulesTestLanguage/Model.java @@ -32,10 +32,6 @@ public interface Model extends EObject /** * Returns the value of the 'Id' attribute. * - *

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

* * @return the value of the 'Id' attribute. * @see #setId(String) @@ -58,10 +54,6 @@ public interface Model extends EObject /** * Returns the value of the 'Value' attribute. * - *

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

* * @return the value of the 'Value' attribute. * @see #setValue(BigDecimal) @@ -84,10 +76,6 @@ public interface Model extends EObject /** * Returns the value of the 'Vector' attribute. * - *

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

* * @return the value of the 'Vector' attribute. * @see #setVector(String) @@ -110,10 +98,6 @@ public interface Model extends EObject /** * Returns the value of the 'Dots' attribute. * - *

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

* * @return the value of the 'Dots' attribute. * @see #setDots(String) @@ -136,10 +120,6 @@ public interface Model extends EObject /** * Returns the value of the 'Double' attribute. * - *

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

* * @return the value of the 'Double' attribute. * @see #setDouble(double) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/datatyperules/datatypeRulesTestLanguage/impl/CompositeModelImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/datatyperules/datatypeRulesTestLanguage/impl/CompositeModelImpl.java index e7b847d50..68e4948c9 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/datatyperules/datatypeRulesTestLanguage/impl/CompositeModelImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/datatyperules/datatypeRulesTestLanguage/impl/CompositeModelImpl.java @@ -72,6 +72,7 @@ public class CompositeModelImpl extends MinimalEObjectImpl.Container implements * * @generated */ + @Override public EList getModel() { if (model == null) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/datatyperules/datatypeRulesTestLanguage/impl/DatatypeRulesTestLanguageFactoryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/datatyperules/datatypeRulesTestLanguage/impl/DatatypeRulesTestLanguageFactoryImpl.java index 8a3297baa..0e489729d 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/datatyperules/datatypeRulesTestLanguage/impl/DatatypeRulesTestLanguageFactoryImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/datatyperules/datatypeRulesTestLanguage/impl/DatatypeRulesTestLanguageFactoryImpl.java @@ -77,6 +77,7 @@ public class DatatypeRulesTestLanguageFactoryImpl extends EFactoryImpl implement * * @generated */ + @Override public CompositeModel createCompositeModel() { CompositeModelImpl compositeModel = new CompositeModelImpl(); @@ -88,6 +89,7 @@ public class DatatypeRulesTestLanguageFactoryImpl extends EFactoryImpl implement * * @generated */ + @Override public Model createModel() { ModelImpl model = new ModelImpl(); @@ -99,6 +101,7 @@ public class DatatypeRulesTestLanguageFactoryImpl extends EFactoryImpl implement * * @generated */ + @Override public DatatypeRulesTestLanguagePackage getDatatypeRulesTestLanguagePackage() { return (DatatypeRulesTestLanguagePackage)getEPackage(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/datatyperules/datatypeRulesTestLanguage/impl/DatatypeRulesTestLanguagePackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/datatyperules/datatypeRulesTestLanguage/impl/DatatypeRulesTestLanguagePackageImpl.java index b29196ba3..d337a9665 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/datatyperules/datatypeRulesTestLanguage/impl/DatatypeRulesTestLanguagePackageImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/datatyperules/datatypeRulesTestLanguage/impl/DatatypeRulesTestLanguagePackageImpl.java @@ -67,7 +67,7 @@ public class DatatypeRulesTestLanguagePackageImpl extends EPackageImpl implement /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link DatatypeRulesTestLanguagePackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -82,7 +82,8 @@ public class DatatypeRulesTestLanguagePackageImpl extends EPackageImpl implement if (isInited) return (DatatypeRulesTestLanguagePackage)EPackage.Registry.INSTANCE.getEPackage(DatatypeRulesTestLanguagePackage.eNS_URI); // Obtain or create and register package - DatatypeRulesTestLanguagePackageImpl theDatatypeRulesTestLanguagePackage = (DatatypeRulesTestLanguagePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof DatatypeRulesTestLanguagePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new DatatypeRulesTestLanguagePackageImpl()); + Object registeredDatatypeRulesTestLanguagePackage = EPackage.Registry.INSTANCE.get(eNS_URI); + DatatypeRulesTestLanguagePackageImpl theDatatypeRulesTestLanguagePackage = registeredDatatypeRulesTestLanguagePackage instanceof DatatypeRulesTestLanguagePackageImpl ? (DatatypeRulesTestLanguagePackageImpl)registeredDatatypeRulesTestLanguagePackage : new DatatypeRulesTestLanguagePackageImpl(); isInited = true; @@ -98,7 +99,6 @@ public class DatatypeRulesTestLanguagePackageImpl extends EPackageImpl implement // Mark meta-data to indicate it can't be changed theDatatypeRulesTestLanguagePackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(DatatypeRulesTestLanguagePackage.eNS_URI, theDatatypeRulesTestLanguagePackage); return theDatatypeRulesTestLanguagePackage; @@ -109,6 +109,7 @@ public class DatatypeRulesTestLanguagePackageImpl extends EPackageImpl implement * * @generated */ + @Override public EClass getCompositeModel() { return compositeModelEClass; @@ -119,6 +120,7 @@ public class DatatypeRulesTestLanguagePackageImpl extends EPackageImpl implement * * @generated */ + @Override public EReference getCompositeModel_Model() { return (EReference)compositeModelEClass.getEStructuralFeatures().get(0); @@ -129,6 +131,7 @@ public class DatatypeRulesTestLanguagePackageImpl extends EPackageImpl implement * * @generated */ + @Override public EClass getModel() { return modelEClass; @@ -139,6 +142,7 @@ public class DatatypeRulesTestLanguagePackageImpl extends EPackageImpl implement * * @generated */ + @Override public EAttribute getModel_Id() { return (EAttribute)modelEClass.getEStructuralFeatures().get(0); @@ -149,6 +153,7 @@ public class DatatypeRulesTestLanguagePackageImpl extends EPackageImpl implement * * @generated */ + @Override public EAttribute getModel_Value() { return (EAttribute)modelEClass.getEStructuralFeatures().get(1); @@ -159,6 +164,7 @@ public class DatatypeRulesTestLanguagePackageImpl extends EPackageImpl implement * * @generated */ + @Override public EAttribute getModel_Vector() { return (EAttribute)modelEClass.getEStructuralFeatures().get(2); @@ -169,6 +175,7 @@ public class DatatypeRulesTestLanguagePackageImpl extends EPackageImpl implement * * @generated */ + @Override public EAttribute getModel_Dots() { return (EAttribute)modelEClass.getEStructuralFeatures().get(3); @@ -179,6 +186,7 @@ public class DatatypeRulesTestLanguagePackageImpl extends EPackageImpl implement * * @generated */ + @Override public EAttribute getModel_Double() { return (EAttribute)modelEClass.getEStructuralFeatures().get(4); @@ -189,6 +197,7 @@ public class DatatypeRulesTestLanguagePackageImpl extends EPackageImpl implement * * @generated */ + @Override public DatatypeRulesTestLanguageFactory getDatatypeRulesTestLanguageFactory() { return (DatatypeRulesTestLanguageFactory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/datatyperules/datatypeRulesTestLanguage/impl/ModelImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/datatyperules/datatypeRulesTestLanguage/impl/ModelImpl.java index 630335c9d..979809b80 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/datatyperules/datatypeRulesTestLanguage/impl/ModelImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/datatyperules/datatypeRulesTestLanguage/impl/ModelImpl.java @@ -160,6 +160,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public String getId() { return id; @@ -170,6 +171,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setId(String newId) { String oldId = id; @@ -183,6 +185,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public BigDecimal getValue() { return value; @@ -193,6 +196,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setValue(BigDecimal newValue) { BigDecimal oldValue = value; @@ -206,6 +210,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public String getVector() { return vector; @@ -216,6 +221,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setVector(String newVector) { String oldVector = vector; @@ -229,6 +235,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public String getDots() { return dots; @@ -239,6 +246,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setDots(String newDots) { String oldDots = dots; @@ -252,6 +260,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public double getDouble() { return double_; @@ -262,6 +271,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setDouble(double newDouble) { double oldDouble = double_; @@ -386,7 +396,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (id: "); result.append(id); result.append(", value: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/EncodingTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/EncodingTestLanguage.genmodel index bf1860d0f..c65e7e229 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/EncodingTestLanguage.genmodel +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/EncodingTestLanguage.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="EncodingTestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> + complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/encodingTest/Model.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/encodingTest/Model.java index 3633452b7..b44a6236b 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/encodingTest/Model.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/encodingTest/Model.java @@ -29,10 +29,6 @@ public interface Model extends EObject * Returns the value of the 'Words' containment reference list. * The list contents are of type {@link org.eclipse.xtext.parser.encoding.encodingTest.Word}. * - *

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

* * @return the value of the 'Words' containment reference list. * @see org.eclipse.xtext.parser.encoding.encodingTest.EncodingTestPackage#getModel_Words() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/encodingTest/Word.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/encodingTest/Word.java index 3f8adb7b9..9dd06a2f4 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/encodingTest/Word.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/encodingTest/Word.java @@ -26,10 +26,6 @@ public interface Word extends EObject /** * Returns the value of the 'Value' attribute. * - *

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

* * @return the value of the 'Value' attribute. * @see #setValue(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/encodingTest/impl/EncodingTestFactoryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/encodingTest/impl/EncodingTestFactoryImpl.java index 0f1bdfcab..29ce56bdd 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/encodingTest/impl/EncodingTestFactoryImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/encodingTest/impl/EncodingTestFactoryImpl.java @@ -77,6 +77,7 @@ public class EncodingTestFactoryImpl extends EFactoryImpl implements EncodingTes * * @generated */ + @Override public Model createModel() { ModelImpl model = new ModelImpl(); @@ -88,6 +89,7 @@ public class EncodingTestFactoryImpl extends EFactoryImpl implements EncodingTes * * @generated */ + @Override public Word createWord() { WordImpl word = new WordImpl(); @@ -99,6 +101,7 @@ public class EncodingTestFactoryImpl extends EFactoryImpl implements EncodingTes * * @generated */ + @Override public EncodingTestPackage getEncodingTestPackage() { return (EncodingTestPackage)getEPackage(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/encodingTest/impl/EncodingTestPackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/encodingTest/impl/EncodingTestPackageImpl.java index 9972ad94b..3a8c4ab05 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/encodingTest/impl/EncodingTestPackageImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/encodingTest/impl/EncodingTestPackageImpl.java @@ -67,7 +67,7 @@ public class EncodingTestPackageImpl extends EPackageImpl implements EncodingTes /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link EncodingTestPackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -82,7 +82,8 @@ public class EncodingTestPackageImpl extends EPackageImpl implements EncodingTes if (isInited) return (EncodingTestPackage)EPackage.Registry.INSTANCE.getEPackage(EncodingTestPackage.eNS_URI); // Obtain or create and register package - EncodingTestPackageImpl theEncodingTestPackage = (EncodingTestPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof EncodingTestPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new EncodingTestPackageImpl()); + Object registeredEncodingTestPackage = EPackage.Registry.INSTANCE.get(eNS_URI); + EncodingTestPackageImpl theEncodingTestPackage = registeredEncodingTestPackage instanceof EncodingTestPackageImpl ? (EncodingTestPackageImpl)registeredEncodingTestPackage : new EncodingTestPackageImpl(); isInited = true; @@ -98,7 +99,6 @@ public class EncodingTestPackageImpl extends EPackageImpl implements EncodingTes // Mark meta-data to indicate it can't be changed theEncodingTestPackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(EncodingTestPackage.eNS_URI, theEncodingTestPackage); return theEncodingTestPackage; @@ -109,6 +109,7 @@ public class EncodingTestPackageImpl extends EPackageImpl implements EncodingTes * * @generated */ + @Override public EClass getModel() { return modelEClass; @@ -119,6 +120,7 @@ public class EncodingTestPackageImpl extends EPackageImpl implements EncodingTes * * @generated */ + @Override public EReference getModel_Words() { return (EReference)modelEClass.getEStructuralFeatures().get(0); @@ -129,6 +131,7 @@ public class EncodingTestPackageImpl extends EPackageImpl implements EncodingTes * * @generated */ + @Override public EClass getWord() { return wordEClass; @@ -139,6 +142,7 @@ public class EncodingTestPackageImpl extends EPackageImpl implements EncodingTes * * @generated */ + @Override public EAttribute getWord_Value() { return (EAttribute)wordEClass.getEStructuralFeatures().get(0); @@ -149,6 +153,7 @@ public class EncodingTestPackageImpl extends EPackageImpl implements EncodingTes * * @generated */ + @Override public EncodingTestFactory getEncodingTestFactory() { return (EncodingTestFactory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/encodingTest/impl/ModelImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/encodingTest/impl/ModelImpl.java index fab64565d..1d8d25d9c 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/encodingTest/impl/ModelImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/encodingTest/impl/ModelImpl.java @@ -72,6 +72,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public EList getWords() { if (words == null) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/encodingTest/impl/WordImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/encodingTest/impl/WordImpl.java index 1b6812449..2ad6fbfcb 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/encodingTest/impl/WordImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/encoding/encodingTest/impl/WordImpl.java @@ -74,6 +74,7 @@ public class WordImpl extends MinimalEObjectImpl.Container implements Word * * @generated */ + @Override public String getValue() { return value; @@ -84,6 +85,7 @@ public class WordImpl extends MinimalEObjectImpl.Container implements Word * * @generated */ + @Override public void setValue(String newValue) { String oldValue = value; @@ -168,7 +170,7 @@ public class WordImpl extends MinimalEObjectImpl.Container implements Word { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (value: "); result.append(value); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/EpatchTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/EpatchTestLanguage.genmodel index f43a5ac2a..411fd6835 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/EpatchTestLanguage.genmodel +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/EpatchTestLanguage.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="EpatchTestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> + complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/Assignment.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/Assignment.java index 1de05320e..05c2d1510 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/Assignment.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/Assignment.java @@ -26,10 +26,6 @@ public interface Assignment extends EObject /** * Returns the value of the 'Feature' attribute. * - *

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

* * @return the value of the 'Feature' attribute. * @see #setFeature(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/AssignmentValue.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/AssignmentValue.java index 6bee1141c..1e3a31c18 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/AssignmentValue.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/AssignmentValue.java @@ -34,10 +34,6 @@ public interface AssignmentValue extends EObject /** * Returns the value of the 'Value' attribute. * - *

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

* * @return the value of the 'Value' attribute. * @see #setValue(String) @@ -60,10 +56,6 @@ public interface AssignmentValue extends EObject /** * Returns the value of the 'Ref Object' reference. * - *

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

* * @return the value of the 'Ref Object' reference. * @see #setRefObject(NamedObject) @@ -86,10 +78,6 @@ public interface AssignmentValue extends EObject /** * Returns the value of the 'Ref Feature' attribute. * - *

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

* * @return the value of the 'Ref Feature' attribute. * @see #setRefFeature(String) @@ -112,10 +100,6 @@ public interface AssignmentValue extends EObject /** * Returns the value of the 'Ref Index' attribute. * - *

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

* * @return the value of the 'Ref Index' attribute. * @see #setRefIndex(int) @@ -138,10 +122,6 @@ public interface AssignmentValue extends EObject /** * Returns the value of the 'New Object' containment reference. * - *

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

* * @return the value of the 'New Object' containment reference. * @see #setNewObject(CreatedObject) @@ -164,10 +144,6 @@ public interface AssignmentValue extends EObject /** * Returns the value of the 'Import' reference. * - *

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

* * @return the value of the 'Import' reference. * @see #setImport(Import) @@ -190,10 +166,6 @@ public interface AssignmentValue extends EObject /** * Returns the value of the 'Imp Frag' attribute. * - *

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

* * @return the value of the 'Imp Frag' attribute. * @see #setImpFrag(String) @@ -216,10 +188,6 @@ public interface AssignmentValue extends EObject /** * Returns the value of the 'Index' attribute. * - *

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

* * @return the value of the 'Index' attribute. * @see #setIndex(int) @@ -242,10 +210,6 @@ public interface AssignmentValue extends EObject /** * Returns the value of the 'Keyword' attribute. * - *

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

* * @return the value of the 'Keyword' attribute. * @see #setKeyword(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/EPackageImport.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/EPackageImport.java index 65ffbcc50..d19663e81 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/EPackageImport.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/EPackageImport.java @@ -25,10 +25,6 @@ public interface EPackageImport extends ModelImport /** * Returns the value of the 'Ns URI' attribute. * - *

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

* * @return the value of the 'Ns URI' attribute. * @see #setNsURI(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/EPatch.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/EPatch.java index dc29e85a7..181a37670 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/EPatch.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/EPatch.java @@ -31,10 +31,6 @@ public interface EPatch 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) @@ -58,10 +54,6 @@ public interface EPatch extends EObject * Returns the value of the 'Imports' containment reference list. * The list contents are of type {@link org.eclipse.xtext.parser.epatch.epatchTestLanguage.Import}. * - *

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

* * @return the value of the 'Imports' containment reference list. * @see org.eclipse.xtext.parser.epatch.epatchTestLanguage.EpatchTestLanguagePackage#getEPatch_Imports() @@ -74,10 +66,6 @@ public interface EPatch extends EObject * Returns the value of the 'Resources' containment reference list. * The list contents are of type {@link org.eclipse.xtext.parser.epatch.epatchTestLanguage.NamedResource}. * - *

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

* * @return the value of the 'Resources' containment reference list. * @see org.eclipse.xtext.parser.epatch.epatchTestLanguage.EpatchTestLanguagePackage#getEPatch_Resources() @@ -90,10 +78,6 @@ public interface EPatch extends EObject * Returns the value of the 'Objects' containment reference list. * The list contents are of type {@link org.eclipse.xtext.parser.epatch.epatchTestLanguage.ObjectRef}. * - *

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

* * @return the value of the 'Objects' containment reference list. * @see org.eclipse.xtext.parser.epatch.epatchTestLanguage.EpatchTestLanguagePackage#getEPatch_Objects() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/ExpressionExecutable.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/ExpressionExecutable.java index ab4a4d4e8..84f225249 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/ExpressionExecutable.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/ExpressionExecutable.java @@ -25,10 +25,6 @@ public interface ExpressionExecutable extends Executable /** * Returns the value of the 'Exprstr' attribute. * - *

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

* * @return the value of the 'Exprstr' attribute. * @see #setExprstr(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/ExtensionImport.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/ExtensionImport.java index ed8c8e138..fa2d9119e 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/ExtensionImport.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/ExtensionImport.java @@ -27,10 +27,6 @@ public interface ExtensionImport extends Import * Returns the value of the 'Path' attribute list. * The list contents are of type {@link java.lang.String}. * - *

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

* * @return the value of the 'Path' attribute list. * @see org.eclipse.xtext.parser.epatch.epatchTestLanguage.EpatchTestLanguagePackage#getExtensionImport_Path() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/JavaExecutable.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/JavaExecutable.java index a93fd8631..71113d35e 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/JavaExecutable.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/JavaExecutable.java @@ -25,10 +25,6 @@ public interface JavaExecutable extends Executable /** * Returns the value of the 'Method' attribute. * - *

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

* * @return the value of the 'Method' attribute. * @see #setMethod(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/JavaImport.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/JavaImport.java index 63f2491cb..2593a0040 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/JavaImport.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/JavaImport.java @@ -27,10 +27,6 @@ public interface JavaImport extends Import * Returns the value of the 'Path' attribute list. * The list contents are of type {@link java.lang.String}. * - *

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

* * @return the value of the 'Path' attribute list. * @see org.eclipse.xtext.parser.epatch.epatchTestLanguage.EpatchTestLanguagePackage#getJavaImport_Path() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/ListAssignment.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/ListAssignment.java index c013f99e7..50e85a5e3 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/ListAssignment.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/ListAssignment.java @@ -28,10 +28,6 @@ public interface ListAssignment extends Assignment * Returns the value of the 'Left Values' containment reference list. * The list contents are of type {@link org.eclipse.xtext.parser.epatch.epatchTestLanguage.AssignmentValue}. * - *

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

* * @return the value of the 'Left Values' containment reference list. * @see org.eclipse.xtext.parser.epatch.epatchTestLanguage.EpatchTestLanguagePackage#getListAssignment_LeftValues() @@ -44,10 +40,6 @@ public interface ListAssignment extends Assignment * Returns the value of the 'Right Values' containment reference list. * The list contents are of type {@link org.eclipse.xtext.parser.epatch.epatchTestLanguage.AssignmentValue}. * - *

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

* * @return the value of the 'Right Values' containment reference list. * @see org.eclipse.xtext.parser.epatch.epatchTestLanguage.EpatchTestLanguagePackage#getListAssignment_RightValues() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/Migration.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/Migration.java index d1620f959..38bf1c66f 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/Migration.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/Migration.java @@ -28,10 +28,6 @@ public interface Migration extends EObject /** * Returns the value of the 'First' containment reference. * - *

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

* * @return the value of the 'First' containment reference. * @see #setFirst(Executable) @@ -54,10 +50,6 @@ public interface Migration extends EObject /** * Returns the value of the 'As Op' containment reference. * - *

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

* * @return the value of the 'As Op' containment reference. * @see #setAsOp(Executable) @@ -80,10 +72,6 @@ public interface Migration extends EObject /** * Returns the value of the 'Each Op' containment reference. * - *

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

* * @return the value of the 'Each Op' containment reference. * @see #setEachOp(Executable) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/ModelImport.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/ModelImport.java index 86da43229..023300dfe 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/ModelImport.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/ModelImport.java @@ -25,10 +25,6 @@ public interface ModelImport extends Import /** * 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) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/NamedObject.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/NamedObject.java index 849f18a89..050c2095a 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/NamedObject.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/NamedObject.java @@ -30,10 +30,6 @@ public interface NamedObject 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) @@ -57,10 +53,6 @@ public interface NamedObject extends EObject * Returns the value of the 'Assignments' containment reference list. * The list contents are of type {@link org.eclipse.xtext.parser.epatch.epatchTestLanguage.Assignment}. * - *

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

* * @return the value of the 'Assignments' containment reference list. * @see org.eclipse.xtext.parser.epatch.epatchTestLanguage.EpatchTestLanguagePackage#getNamedObject_Assignments() @@ -72,10 +64,6 @@ public interface NamedObject extends EObject /** * Returns the value of the 'Left Mig' containment reference. * - *

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

* * @return the value of the 'Left Mig' containment reference. * @see #setLeftMig(Migration) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/NamedResource.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/NamedResource.java index 278088d4e..9e78a840a 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/NamedResource.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/NamedResource.java @@ -30,10 +30,6 @@ public interface NamedResource 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) @@ -56,10 +52,6 @@ public interface NamedResource extends EObject /** * Returns the value of the 'Left Uri' attribute. * - *

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

* * @return the value of the 'Left Uri' attribute. * @see #setLeftUri(String) @@ -82,10 +74,6 @@ public interface NamedResource extends EObject /** * Returns the value of the 'Left Root' containment reference. * - *

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

* * @return the value of the 'Left Root' containment reference. * @see #setLeftRoot(CreatedObject) @@ -108,10 +96,6 @@ public interface NamedResource extends EObject /** * Returns the value of the 'Right Uri' attribute. * - *

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

* * @return the value of the 'Right Uri' attribute. * @see #setRightUri(String) @@ -134,10 +118,6 @@ public interface NamedResource extends EObject /** * Returns the value of the 'Right Root' containment reference. * - *

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

* * @return the value of the 'Right Root' containment reference. * @see #setRightRoot(CreatedObject) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/ObjectCopy.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/ObjectCopy.java index 7c9da954a..6dc30a33a 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/ObjectCopy.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/ObjectCopy.java @@ -26,10 +26,6 @@ public interface ObjectCopy extends CreatedObject /** * Returns the value of the 'Resource' reference. * - *

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

* * @return the value of the 'Resource' reference. * @see #setResource(NamedResource) @@ -52,10 +48,6 @@ public interface ObjectCopy extends CreatedObject /** * Returns the value of the 'Fragment' attribute. * - *

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

* * @return the value of the 'Fragment' attribute. * @see #setFragment(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/ObjectNew.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/ObjectNew.java index 9028ec05f..00238121c 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/ObjectNew.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/ObjectNew.java @@ -26,10 +26,6 @@ public interface ObjectNew extends CreatedObject /** * Returns the value of the 'Import' reference. * - *

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

* * @return the value of the 'Import' reference. * @see #setImport(Import) @@ -52,10 +48,6 @@ public interface ObjectNew extends CreatedObject /** * Returns the value of the 'Imp Frag' attribute. * - *

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

* * @return the value of the 'Imp Frag' attribute. * @see #setImpFrag(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/ObjectRef.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/ObjectRef.java index aa4080f39..bcb5ea15c 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/ObjectRef.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/ObjectRef.java @@ -29,10 +29,6 @@ public interface ObjectRef extends NamedObject /** * Returns the value of the 'Left Res' reference. * - *

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

* * @return the value of the 'Left Res' reference. * @see #setLeftRes(NamedResource) @@ -55,10 +51,6 @@ public interface ObjectRef extends NamedObject /** * Returns the value of the 'Left Frag' attribute. * - *

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

* * @return the value of the 'Left Frag' attribute. * @see #setLeftFrag(String) @@ -81,10 +73,6 @@ public interface ObjectRef extends NamedObject /** * Returns the value of the 'Right Res' reference. * - *

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

* * @return the value of the 'Right Res' reference. * @see #setRightRes(NamedResource) @@ -107,10 +95,6 @@ public interface ObjectRef extends NamedObject /** * Returns the value of the 'Right Frag' attribute. * - *

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

* * @return the value of the 'Right Frag' attribute. * @see #setRightFrag(String) @@ -133,10 +117,6 @@ public interface ObjectRef extends NamedObject /** * Returns the value of the 'Right Mig' containment reference. * - *

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

* * @return the value of the 'Right Mig' containment reference. * @see #setRightMig(Migration) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/ResourceImport.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/ResourceImport.java index 39747df05..80c6bba7d 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/ResourceImport.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/ResourceImport.java @@ -25,10 +25,6 @@ public interface ResourceImport extends ModelImport /** * Returns the value of the 'Uri' attribute. * - *

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

* * @return the value of the 'Uri' attribute. * @see #setUri(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/SingleAssignment.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/SingleAssignment.java index f60b289e0..b9691c9a3 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/SingleAssignment.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/SingleAssignment.java @@ -26,10 +26,6 @@ public interface SingleAssignment extends Assignment /** * Returns the value of the 'Left Value' containment reference. * - *

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

* * @return the value of the 'Left Value' containment reference. * @see #setLeftValue(AssignmentValue) @@ -52,10 +48,6 @@ public interface SingleAssignment extends Assignment /** * Returns the value of the 'Right Value' containment reference. * - *

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

* * @return the value of the 'Right Value' containment reference. * @see #setRightValue(AssignmentValue) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/impl/AssignmentImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/impl/AssignmentImpl.java index dfb1bd8aa..c524c5284 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/impl/AssignmentImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/impl/AssignmentImpl.java @@ -74,6 +74,7 @@ public class AssignmentImpl extends MinimalEObjectImpl.Container implements Assi * * @generated */ + @Override public String getFeature() { return feature; @@ -84,6 +85,7 @@ public class AssignmentImpl extends MinimalEObjectImpl.Container implements Assi * * @generated */ + @Override public void setFeature(String newFeature) { String oldFeature = feature; @@ -168,7 +170,7 @@ public class AssignmentImpl extends MinimalEObjectImpl.Container implements Assi { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (feature: "); result.append(feature); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/impl/AssignmentValueImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/impl/AssignmentValueImpl.java index 34300dbd1..29f2c6542 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/impl/AssignmentValueImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/impl/AssignmentValueImpl.java @@ -217,6 +217,7 @@ public class AssignmentValueImpl extends MinimalEObjectImpl.Container implements * * @generated */ + @Override public String getValue() { return value; @@ -227,6 +228,7 @@ public class AssignmentValueImpl extends MinimalEObjectImpl.Container implements * * @generated */ + @Override public void setValue(String newValue) { String oldValue = value; @@ -240,6 +242,7 @@ public class AssignmentValueImpl extends MinimalEObjectImpl.Container implements * * @generated */ + @Override public NamedObject getRefObject() { if (refObject != null && refObject.eIsProxy()) @@ -270,6 +273,7 @@ public class AssignmentValueImpl extends MinimalEObjectImpl.Container implements * * @generated */ + @Override public void setRefObject(NamedObject newRefObject) { NamedObject oldRefObject = refObject; @@ -283,6 +287,7 @@ public class AssignmentValueImpl extends MinimalEObjectImpl.Container implements * * @generated */ + @Override public String getRefFeature() { return refFeature; @@ -293,6 +298,7 @@ public class AssignmentValueImpl extends MinimalEObjectImpl.Container implements * * @generated */ + @Override public void setRefFeature(String newRefFeature) { String oldRefFeature = refFeature; @@ -306,6 +312,7 @@ public class AssignmentValueImpl extends MinimalEObjectImpl.Container implements * * @generated */ + @Override public int getRefIndex() { return refIndex; @@ -316,6 +323,7 @@ public class AssignmentValueImpl extends MinimalEObjectImpl.Container implements * * @generated */ + @Override public void setRefIndex(int newRefIndex) { int oldRefIndex = refIndex; @@ -329,6 +337,7 @@ public class AssignmentValueImpl extends MinimalEObjectImpl.Container implements * * @generated */ + @Override public CreatedObject getNewObject() { return newObject; @@ -356,6 +365,7 @@ public class AssignmentValueImpl extends MinimalEObjectImpl.Container implements * * @generated */ + @Override public void setNewObject(CreatedObject newNewObject) { if (newNewObject != newObject) @@ -377,6 +387,7 @@ public class AssignmentValueImpl extends MinimalEObjectImpl.Container implements * * @generated */ + @Override public Import getImport() { if (import_ != null && import_.eIsProxy()) @@ -407,6 +418,7 @@ public class AssignmentValueImpl extends MinimalEObjectImpl.Container implements * * @generated */ + @Override public void setImport(Import newImport) { Import oldImport = import_; @@ -420,6 +432,7 @@ public class AssignmentValueImpl extends MinimalEObjectImpl.Container implements * * @generated */ + @Override public String getImpFrag() { return impFrag; @@ -430,6 +443,7 @@ public class AssignmentValueImpl extends MinimalEObjectImpl.Container implements * * @generated */ + @Override public void setImpFrag(String newImpFrag) { String oldImpFrag = impFrag; @@ -443,6 +457,7 @@ public class AssignmentValueImpl extends MinimalEObjectImpl.Container implements * * @generated */ + @Override public int getIndex() { return index; @@ -453,6 +468,7 @@ public class AssignmentValueImpl extends MinimalEObjectImpl.Container implements * * @generated */ + @Override public void setIndex(int newIndex) { int oldIndex = index; @@ -466,6 +482,7 @@ public class AssignmentValueImpl extends MinimalEObjectImpl.Container implements * * @generated */ + @Override public String getKeyword() { return keyword; @@ -476,6 +493,7 @@ public class AssignmentValueImpl extends MinimalEObjectImpl.Container implements * * @generated */ + @Override public void setKeyword(String newKeyword) { String oldKeyword = keyword; @@ -658,7 +676,7 @@ public class AssignmentValueImpl extends MinimalEObjectImpl.Container implements { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (value: "); result.append(value); result.append(", refFeature: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/impl/EPackageImportImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/impl/EPackageImportImpl.java index 4b1517f5f..b220d39cc 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/impl/EPackageImportImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/impl/EPackageImportImpl.java @@ -73,6 +73,7 @@ public class EPackageImportImpl extends ModelImportImpl implements EPackageImpor * * @generated */ + @Override public String getNsURI() { return nsURI; @@ -83,6 +84,7 @@ public class EPackageImportImpl extends ModelImportImpl implements EPackageImpor * * @generated */ + @Override public void setNsURI(String newNsURI) { String oldNsURI = nsURI; @@ -167,7 +169,7 @@ public class EPackageImportImpl extends ModelImportImpl implements EPackageImpor { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (nsURI: "); result.append(nsURI); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/impl/EPatchImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/impl/EPatchImpl.java index f26e6bc87..53df2457e 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/impl/EPatchImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/impl/EPatchImpl.java @@ -119,6 +119,7 @@ public class EPatchImpl extends MinimalEObjectImpl.Container implements EPatch * * @generated */ + @Override public String getName() { return name; @@ -129,6 +130,7 @@ public class EPatchImpl extends MinimalEObjectImpl.Container implements EPatch * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -142,6 +144,7 @@ public class EPatchImpl extends MinimalEObjectImpl.Container implements EPatch * * @generated */ + @Override public EList getImports() { if (imports == null) @@ -156,6 +159,7 @@ public class EPatchImpl extends MinimalEObjectImpl.Container implements EPatch * * @generated */ + @Override public EList getResources() { if (resources == null) @@ -170,6 +174,7 @@ public class EPatchImpl extends MinimalEObjectImpl.Container implements EPatch * * @generated */ + @Override public EList getObjects() { if (objects == null) @@ -309,7 +314,7 @@ public class EPatchImpl extends MinimalEObjectImpl.Container implements EPatch { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/impl/EpatchTestLanguageFactoryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/impl/EpatchTestLanguageFactoryImpl.java index 2b74dc999..a7a976ea5 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/impl/EpatchTestLanguageFactoryImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/impl/EpatchTestLanguageFactoryImpl.java @@ -96,6 +96,7 @@ public class EpatchTestLanguageFactoryImpl extends EFactoryImpl implements Epatc * * @generated */ + @Override public EPatch createEPatch() { EPatchImpl ePatch = new EPatchImpl(); @@ -107,6 +108,7 @@ public class EpatchTestLanguageFactoryImpl extends EFactoryImpl implements Epatc * * @generated */ + @Override public Import createImport() { ImportImpl import_ = new ImportImpl(); @@ -118,6 +120,7 @@ public class EpatchTestLanguageFactoryImpl extends EFactoryImpl implements Epatc * * @generated */ + @Override public ModelImport createModelImport() { ModelImportImpl modelImport = new ModelImportImpl(); @@ -129,6 +132,7 @@ public class EpatchTestLanguageFactoryImpl extends EFactoryImpl implements Epatc * * @generated */ + @Override public ResourceImport createResourceImport() { ResourceImportImpl resourceImport = new ResourceImportImpl(); @@ -140,6 +144,7 @@ public class EpatchTestLanguageFactoryImpl extends EFactoryImpl implements Epatc * * @generated */ + @Override public EPackageImport createEPackageImport() { EPackageImportImpl ePackageImport = new EPackageImportImpl(); @@ -151,6 +156,7 @@ public class EpatchTestLanguageFactoryImpl extends EFactoryImpl implements Epatc * * @generated */ + @Override public JavaImport createJavaImport() { JavaImportImpl javaImport = new JavaImportImpl(); @@ -162,6 +168,7 @@ public class EpatchTestLanguageFactoryImpl extends EFactoryImpl implements Epatc * * @generated */ + @Override public ExtensionImport createExtensionImport() { ExtensionImportImpl extensionImport = new ExtensionImportImpl(); @@ -173,6 +180,7 @@ public class EpatchTestLanguageFactoryImpl extends EFactoryImpl implements Epatc * * @generated */ + @Override public NamedResource createNamedResource() { NamedResourceImpl namedResource = new NamedResourceImpl(); @@ -184,6 +192,7 @@ public class EpatchTestLanguageFactoryImpl extends EFactoryImpl implements Epatc * * @generated */ + @Override public NamedObject createNamedObject() { NamedObjectImpl namedObject = new NamedObjectImpl(); @@ -195,6 +204,7 @@ public class EpatchTestLanguageFactoryImpl extends EFactoryImpl implements Epatc * * @generated */ + @Override public ObjectRef createObjectRef() { ObjectRefImpl objectRef = new ObjectRefImpl(); @@ -206,6 +216,7 @@ public class EpatchTestLanguageFactoryImpl extends EFactoryImpl implements Epatc * * @generated */ + @Override public Assignment createAssignment() { AssignmentImpl assignment = new AssignmentImpl(); @@ -217,6 +228,7 @@ public class EpatchTestLanguageFactoryImpl extends EFactoryImpl implements Epatc * * @generated */ + @Override public SingleAssignment createSingleAssignment() { SingleAssignmentImpl singleAssignment = new SingleAssignmentImpl(); @@ -228,6 +240,7 @@ public class EpatchTestLanguageFactoryImpl extends EFactoryImpl implements Epatc * * @generated */ + @Override public ListAssignment createListAssignment() { ListAssignmentImpl listAssignment = new ListAssignmentImpl(); @@ -239,6 +252,7 @@ public class EpatchTestLanguageFactoryImpl extends EFactoryImpl implements Epatc * * @generated */ + @Override public AssignmentValue createAssignmentValue() { AssignmentValueImpl assignmentValue = new AssignmentValueImpl(); @@ -250,6 +264,7 @@ public class EpatchTestLanguageFactoryImpl extends EFactoryImpl implements Epatc * * @generated */ + @Override public CreatedObject createCreatedObject() { CreatedObjectImpl createdObject = new CreatedObjectImpl(); @@ -261,6 +276,7 @@ public class EpatchTestLanguageFactoryImpl extends EFactoryImpl implements Epatc * * @generated */ + @Override public ObjectNew createObjectNew() { ObjectNewImpl objectNew = new ObjectNewImpl(); @@ -272,6 +288,7 @@ public class EpatchTestLanguageFactoryImpl extends EFactoryImpl implements Epatc * * @generated */ + @Override public ObjectCopy createObjectCopy() { ObjectCopyImpl objectCopy = new ObjectCopyImpl(); @@ -283,6 +300,7 @@ public class EpatchTestLanguageFactoryImpl extends EFactoryImpl implements Epatc * * @generated */ + @Override public Migration createMigration() { MigrationImpl migration = new MigrationImpl(); @@ -294,6 +312,7 @@ public class EpatchTestLanguageFactoryImpl extends EFactoryImpl implements Epatc * * @generated */ + @Override public Executable createExecutable() { ExecutableImpl executable = new ExecutableImpl(); @@ -305,6 +324,7 @@ public class EpatchTestLanguageFactoryImpl extends EFactoryImpl implements Epatc * * @generated */ + @Override public JavaExecutable createJavaExecutable() { JavaExecutableImpl javaExecutable = new JavaExecutableImpl(); @@ -316,6 +336,7 @@ public class EpatchTestLanguageFactoryImpl extends EFactoryImpl implements Epatc * * @generated */ + @Override public ExpressionExecutable createExpressionExecutable() { ExpressionExecutableImpl expressionExecutable = new ExpressionExecutableImpl(); @@ -327,6 +348,7 @@ public class EpatchTestLanguageFactoryImpl extends EFactoryImpl implements Epatc * * @generated */ + @Override public EpatchTestLanguagePackage getEpatchTestLanguagePackage() { return (EpatchTestLanguagePackage)getEPackage(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/impl/EpatchTestLanguagePackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/impl/EpatchTestLanguagePackageImpl.java index aeabd2c2d..2836a9b7b 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/impl/EpatchTestLanguagePackageImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/impl/EpatchTestLanguagePackageImpl.java @@ -219,7 +219,7 @@ public class EpatchTestLanguagePackageImpl extends EPackageImpl implements Epatc /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link EpatchTestLanguagePackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -234,7 +234,8 @@ public class EpatchTestLanguagePackageImpl extends EPackageImpl implements Epatc if (isInited) return (EpatchTestLanguagePackage)EPackage.Registry.INSTANCE.getEPackage(EpatchTestLanguagePackage.eNS_URI); // Obtain or create and register package - EpatchTestLanguagePackageImpl theEpatchTestLanguagePackage = (EpatchTestLanguagePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof EpatchTestLanguagePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new EpatchTestLanguagePackageImpl()); + Object registeredEpatchTestLanguagePackage = EPackage.Registry.INSTANCE.get(eNS_URI); + EpatchTestLanguagePackageImpl theEpatchTestLanguagePackage = registeredEpatchTestLanguagePackage instanceof EpatchTestLanguagePackageImpl ? (EpatchTestLanguagePackageImpl)registeredEpatchTestLanguagePackage : new EpatchTestLanguagePackageImpl(); isInited = true; @@ -250,7 +251,6 @@ public class EpatchTestLanguagePackageImpl extends EPackageImpl implements Epatc // Mark meta-data to indicate it can't be changed theEpatchTestLanguagePackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(EpatchTestLanguagePackage.eNS_URI, theEpatchTestLanguagePackage); return theEpatchTestLanguagePackage; @@ -261,6 +261,7 @@ public class EpatchTestLanguagePackageImpl extends EPackageImpl implements Epatc * * @generated */ + @Override public EClass getEPatch() { return ePatchEClass; @@ -271,6 +272,7 @@ public class EpatchTestLanguagePackageImpl extends EPackageImpl implements Epatc * * @generated */ + @Override public EAttribute getEPatch_Name() { return (EAttribute)ePatchEClass.getEStructuralFeatures().get(0); @@ -281,6 +283,7 @@ public class EpatchTestLanguagePackageImpl extends EPackageImpl implements Epatc * * @generated */ + @Override public EReference getEPatch_Imports() { return (EReference)ePatchEClass.getEStructuralFeatures().get(1); @@ -291,6 +294,7 @@ public class EpatchTestLanguagePackageImpl extends EPackageImpl implements Epatc * * @generated */ + @Override public EReference getEPatch_Resources() { return (EReference)ePatchEClass.getEStructuralFeatures().get(2); @@ -301,6 +305,7 @@ public class EpatchTestLanguagePackageImpl extends EPackageImpl implements Epatc * * @generated */ + @Override public EReference getEPatch_Objects() { return (EReference)ePatchEClass.getEStructuralFeatures().get(3); @@ -311,6 +316,7 @@ public class EpatchTestLanguagePackageImpl extends EPackageImpl implements Epatc * * @generated */ + @Override public EClass getImport() { return importEClass; @@ -321,6 +327,7 @@ public class EpatchTestLanguagePackageImpl extends EPackageImpl implements Epatc * * @generated */ + @Override public EClass getModelImport() { return modelImportEClass; @@ -331,6 +338,7 @@ public class EpatchTestLanguagePackageImpl extends EPackageImpl implements Epatc * * @generated */ + @Override public EAttribute getModelImport_Name() { return (EAttribute)modelImportEClass.getEStructuralFeatures().get(0); @@ -341,6 +349,7 @@ public class EpatchTestLanguagePackageImpl extends EPackageImpl implements Epatc * * @generated */ + @Override public EClass getResourceImport() { return resourceImportEClass; @@ -351,6 +360,7 @@ public class EpatchTestLanguagePackageImpl extends EPackageImpl implements Epatc * * @generated */ + @Override public EAttribute getResourceImport_Uri() { return (EAttribute)resourceImportEClass.getEStructuralFeatures().get(0); @@ -361,6 +371,7 @@ public class EpatchTestLanguagePackageImpl extends EPackageImpl implements Epatc * * @generated */ + @Override public EClass getEPackageImport() { return ePackageImportEClass; @@ -371,6 +382,7 @@ public class EpatchTestLanguagePackageImpl extends EPackageImpl implements Epatc * * @generated */ + @Override public EAttribute getEPackageImport_NsURI() { return (EAttribute)ePackageImportEClass.getEStructuralFeatures().get(0); @@ -381,6 +393,7 @@ public class EpatchTestLanguagePackageImpl extends EPackageImpl implements Epatc * * @generated */ + @Override public EClass getJavaImport() { return javaImportEClass; @@ -391,6 +404,7 @@ public class EpatchTestLanguagePackageImpl extends EPackageImpl implements Epatc * * @generated */ + @Override public EAttribute getJavaImport_Path() { return (EAttribute)javaImportEClass.getEStructuralFeatures().get(0); @@ -401,6 +415,7 @@ public class EpatchTestLanguagePackageImpl extends EPackageImpl implements Epatc * * @generated */ + @Override public EClass getExtensionImport() { return extensionImportEClass; @@ -411,6 +426,7 @@ public class EpatchTestLanguagePackageImpl extends EPackageImpl implements Epatc * * @generated */ + @Override public EAttribute getExtensionImport_Path() { return (EAttribute)extensionImportEClass.getEStructuralFeatures().get(0); @@ -421,6 +437,7 @@ public class EpatchTestLanguagePackageImpl extends EPackageImpl implements Epatc * * @generated */ + @Override public EClass getNamedResource() { return namedResourceEClass; @@ -431,6 +448,7 @@ public class EpatchTestLanguagePackageImpl extends EPackageImpl implements Epatc * * @generated */ + @Override public EAttribute getNamedResource_Name() { return (EAttribute)namedResourceEClass.getEStructuralFeatures().get(0); @@ -441,6 +459,7 @@ public class EpatchTestLanguagePackageImpl extends EPackageImpl implements Epatc * * @generated */ + @Override public EAttribute getNamedResource_LeftUri() { return (EAttribute)namedResourceEClass.getEStructuralFeatures().get(1); @@ -451,6 +470,7 @@ public class EpatchTestLanguagePackageImpl extends EPackageImpl implements Epatc * * @generated */ + @Override public EReference getNamedResource_LeftRoot() { return (EReference)namedResourceEClass.getEStructuralFeatures().get(2); @@ -461,6 +481,7 @@ public class EpatchTestLanguagePackageImpl extends EPackageImpl implements Epatc * * @generated */ + @Override public EAttribute getNamedResource_RightUri() { return (EAttribute)namedResourceEClass.getEStructuralFeatures().get(3); @@ -471,6 +492,7 @@ public class EpatchTestLanguagePackageImpl extends EPackageImpl implements Epatc * * @generated */ + @Override public EReference getNamedResource_RightRoot() { return (EReference)namedResourceEClass.getEStructuralFeatures().get(4); @@ -481,6 +503,7 @@ public class EpatchTestLanguagePackageImpl extends EPackageImpl implements Epatc * * @generated */ + @Override public EClass getNamedObject() { return namedObjectEClass; @@ -491,6 +514,7 @@ public class EpatchTestLanguagePackageImpl extends EPackageImpl implements Epatc * * @generated */ + @Override public EAttribute getNamedObject_Name() { return (EAttribute)namedObjectEClass.getEStructuralFeatures().get(0); @@ -501,6 +525,7 @@ public class EpatchTestLanguagePackageImpl extends EPackageImpl implements Epatc * * @generated */ + @Override public EReference getNamedObject_Assignments() { return (EReference)namedObjectEClass.getEStructuralFeatures().get(1); @@ -511,6 +536,7 @@ public class EpatchTestLanguagePackageImpl extends EPackageImpl implements Epatc * * @generated */ + @Override public EReference getNamedObject_LeftMig() { return (EReference)namedObjectEClass.getEStructuralFeatures().get(2); @@ -521,6 +547,7 @@ public class EpatchTestLanguagePackageImpl extends EPackageImpl implements Epatc * * @generated */ + @Override public EClass getObjectRef() { return objectRefEClass; @@ -531,6 +558,7 @@ public class EpatchTestLanguagePackageImpl extends EPackageImpl implements Epatc * * @generated */ + @Override public EReference getObjectRef_LeftRes() { return (EReference)objectRefEClass.getEStructuralFeatures().get(0); @@ -541,6 +569,7 @@ public class EpatchTestLanguagePackageImpl extends EPackageImpl implements Epatc * * @generated */ + @Override public EAttribute getObjectRef_LeftFrag() { return (EAttribute)objectRefEClass.getEStructuralFeatures().get(1); @@ -551,6 +580,7 @@ public class EpatchTestLanguagePackageImpl extends EPackageImpl implements Epatc * * @generated */ + @Override public EReference getObjectRef_RightRes() { return (EReference)objectRefEClass.getEStructuralFeatures().get(2); @@ -561,6 +591,7 @@ public class EpatchTestLanguagePackageImpl extends EPackageImpl implements Epatc * * @generated */ + @Override public EAttribute getObjectRef_RightFrag() { return (EAttribute)objectRefEClass.getEStructuralFeatures().get(3); @@ -571,6 +602,7 @@ public class EpatchTestLanguagePackageImpl extends EPackageImpl implements Epatc * * @generated */ + @Override public EReference getObjectRef_RightMig() { return (EReference)objectRefEClass.getEStructuralFeatures().get(4); @@ -581,6 +613,7 @@ public class EpatchTestLanguagePackageImpl extends EPackageImpl implements Epatc * * @generated */ + @Override public EClass getAssignment() { return assignmentEClass; @@ -591,6 +624,7 @@ public class EpatchTestLanguagePackageImpl extends EPackageImpl implements Epatc * * @generated */ + @Override public EAttribute getAssignment_Feature() { return (EAttribute)assignmentEClass.getEStructuralFeatures().get(0); @@ -601,6 +635,7 @@ public class EpatchTestLanguagePackageImpl extends EPackageImpl implements Epatc * * @generated */ + @Override public EClass getSingleAssignment() { return singleAssignmentEClass; @@ -611,6 +646,7 @@ public class EpatchTestLanguagePackageImpl extends EPackageImpl implements Epatc * * @generated */ + @Override public EReference getSingleAssignment_LeftValue() { return (EReference)singleAssignmentEClass.getEStructuralFeatures().get(0); @@ -621,6 +657,7 @@ public class EpatchTestLanguagePackageImpl extends EPackageImpl implements Epatc * * @generated */ + @Override public EReference getSingleAssignment_RightValue() { return (EReference)singleAssignmentEClass.getEStructuralFeatures().get(1); @@ -631,6 +668,7 @@ public class EpatchTestLanguagePackageImpl extends EPackageImpl implements Epatc * * @generated */ + @Override public EClass getListAssignment() { return listAssignmentEClass; @@ -641,6 +679,7 @@ public class EpatchTestLanguagePackageImpl extends EPackageImpl implements Epatc * * @generated */ + @Override public EReference getListAssignment_LeftValues() { return (EReference)listAssignmentEClass.getEStructuralFeatures().get(0); @@ -651,6 +690,7 @@ public class EpatchTestLanguagePackageImpl extends EPackageImpl implements Epatc * * @generated */ + @Override public EReference getListAssignment_RightValues() { return (EReference)listAssignmentEClass.getEStructuralFeatures().get(1); @@ -661,6 +701,7 @@ public class EpatchTestLanguagePackageImpl extends EPackageImpl implements Epatc * * @generated */ + @Override public EClass getAssignmentValue() { return assignmentValueEClass; @@ -671,6 +712,7 @@ public class EpatchTestLanguagePackageImpl extends EPackageImpl implements Epatc * * @generated */ + @Override public EAttribute getAssignmentValue_Value() { return (EAttribute)assignmentValueEClass.getEStructuralFeatures().get(0); @@ -681,6 +723,7 @@ public class EpatchTestLanguagePackageImpl extends EPackageImpl implements Epatc * * @generated */ + @Override public EReference getAssignmentValue_RefObject() { return (EReference)assignmentValueEClass.getEStructuralFeatures().get(1); @@ -691,6 +734,7 @@ public class EpatchTestLanguagePackageImpl extends EPackageImpl implements Epatc * * @generated */ + @Override public EAttribute getAssignmentValue_RefFeature() { return (EAttribute)assignmentValueEClass.getEStructuralFeatures().get(2); @@ -701,6 +745,7 @@ public class EpatchTestLanguagePackageImpl extends EPackageImpl implements Epatc * * @generated */ + @Override public EAttribute getAssignmentValue_RefIndex() { return (EAttribute)assignmentValueEClass.getEStructuralFeatures().get(3); @@ -711,6 +756,7 @@ public class EpatchTestLanguagePackageImpl extends EPackageImpl implements Epatc * * @generated */ + @Override public EReference getAssignmentValue_NewObject() { return (EReference)assignmentValueEClass.getEStructuralFeatures().get(4); @@ -721,6 +767,7 @@ public class EpatchTestLanguagePackageImpl extends EPackageImpl implements Epatc * * @generated */ + @Override public EReference getAssignmentValue_Import() { return (EReference)assignmentValueEClass.getEStructuralFeatures().get(5); @@ -731,6 +778,7 @@ public class EpatchTestLanguagePackageImpl extends EPackageImpl implements Epatc * * @generated */ + @Override public EAttribute getAssignmentValue_ImpFrag() { return (EAttribute)assignmentValueEClass.getEStructuralFeatures().get(6); @@ -741,6 +789,7 @@ public class EpatchTestLanguagePackageImpl extends EPackageImpl implements Epatc * * @generated */ + @Override public EAttribute getAssignmentValue_Index() { return (EAttribute)assignmentValueEClass.getEStructuralFeatures().get(7); @@ -751,6 +800,7 @@ public class EpatchTestLanguagePackageImpl extends EPackageImpl implements Epatc * * @generated */ + @Override public EAttribute getAssignmentValue_Keyword() { return (EAttribute)assignmentValueEClass.getEStructuralFeatures().get(8); @@ -761,6 +811,7 @@ public class EpatchTestLanguagePackageImpl extends EPackageImpl implements Epatc * * @generated */ + @Override public EClass getCreatedObject() { return createdObjectEClass; @@ -771,6 +822,7 @@ public class EpatchTestLanguagePackageImpl extends EPackageImpl implements Epatc * * @generated */ + @Override public EClass getObjectNew() { return objectNewEClass; @@ -781,6 +833,7 @@ public class EpatchTestLanguagePackageImpl extends EPackageImpl implements Epatc * * @generated */ + @Override public EReference getObjectNew_Import() { return (EReference)objectNewEClass.getEStructuralFeatures().get(0); @@ -791,6 +844,7 @@ public class EpatchTestLanguagePackageImpl extends EPackageImpl implements Epatc * * @generated */ + @Override public EAttribute getObjectNew_ImpFrag() { return (EAttribute)objectNewEClass.getEStructuralFeatures().get(1); @@ -801,6 +855,7 @@ public class EpatchTestLanguagePackageImpl extends EPackageImpl implements Epatc * * @generated */ + @Override public EClass getObjectCopy() { return objectCopyEClass; @@ -811,6 +866,7 @@ public class EpatchTestLanguagePackageImpl extends EPackageImpl implements Epatc * * @generated */ + @Override public EReference getObjectCopy_Resource() { return (EReference)objectCopyEClass.getEStructuralFeatures().get(0); @@ -821,6 +877,7 @@ public class EpatchTestLanguagePackageImpl extends EPackageImpl implements Epatc * * @generated */ + @Override public EAttribute getObjectCopy_Fragment() { return (EAttribute)objectCopyEClass.getEStructuralFeatures().get(1); @@ -831,6 +888,7 @@ public class EpatchTestLanguagePackageImpl extends EPackageImpl implements Epatc * * @generated */ + @Override public EClass getMigration() { return migrationEClass; @@ -841,6 +899,7 @@ public class EpatchTestLanguagePackageImpl extends EPackageImpl implements Epatc * * @generated */ + @Override public EReference getMigration_First() { return (EReference)migrationEClass.getEStructuralFeatures().get(0); @@ -851,6 +910,7 @@ public class EpatchTestLanguagePackageImpl extends EPackageImpl implements Epatc * * @generated */ + @Override public EReference getMigration_AsOp() { return (EReference)migrationEClass.getEStructuralFeatures().get(1); @@ -861,6 +921,7 @@ public class EpatchTestLanguagePackageImpl extends EPackageImpl implements Epatc * * @generated */ + @Override public EReference getMigration_EachOp() { return (EReference)migrationEClass.getEStructuralFeatures().get(2); @@ -871,6 +932,7 @@ public class EpatchTestLanguagePackageImpl extends EPackageImpl implements Epatc * * @generated */ + @Override public EClass getExecutable() { return executableEClass; @@ -881,6 +943,7 @@ public class EpatchTestLanguagePackageImpl extends EPackageImpl implements Epatc * * @generated */ + @Override public EClass getJavaExecutable() { return javaExecutableEClass; @@ -891,6 +954,7 @@ public class EpatchTestLanguagePackageImpl extends EPackageImpl implements Epatc * * @generated */ + @Override public EAttribute getJavaExecutable_Method() { return (EAttribute)javaExecutableEClass.getEStructuralFeatures().get(0); @@ -901,6 +965,7 @@ public class EpatchTestLanguagePackageImpl extends EPackageImpl implements Epatc * * @generated */ + @Override public EClass getExpressionExecutable() { return expressionExecutableEClass; @@ -911,6 +976,7 @@ public class EpatchTestLanguagePackageImpl extends EPackageImpl implements Epatc * * @generated */ + @Override public EAttribute getExpressionExecutable_Exprstr() { return (EAttribute)expressionExecutableEClass.getEStructuralFeatures().get(0); @@ -921,6 +987,7 @@ public class EpatchTestLanguagePackageImpl extends EPackageImpl implements Epatc * * @generated */ + @Override public EpatchTestLanguageFactory getEpatchTestLanguageFactory() { return (EpatchTestLanguageFactory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/impl/ExpressionExecutableImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/impl/ExpressionExecutableImpl.java index 57377ff3f..38d39a294 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/impl/ExpressionExecutableImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/impl/ExpressionExecutableImpl.java @@ -73,6 +73,7 @@ public class ExpressionExecutableImpl extends ExecutableImpl implements Expressi * * @generated */ + @Override public String getExprstr() { return exprstr; @@ -83,6 +84,7 @@ public class ExpressionExecutableImpl extends ExecutableImpl implements Expressi * * @generated */ + @Override public void setExprstr(String newExprstr) { String oldExprstr = exprstr; @@ -167,7 +169,7 @@ public class ExpressionExecutableImpl extends ExecutableImpl implements Expressi { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (exprstr: "); result.append(exprstr); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/impl/ExtensionImportImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/impl/ExtensionImportImpl.java index ee2d249b9..48faa526d 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/impl/ExtensionImportImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/impl/ExtensionImportImpl.java @@ -65,6 +65,7 @@ public class ExtensionImportImpl extends ImportImpl implements ExtensionImport * * @generated */ + @Override public EList getPath() { if (path == null) @@ -152,7 +153,7 @@ public class ExtensionImportImpl extends ImportImpl implements ExtensionImport { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (path: "); result.append(path); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/impl/JavaExecutableImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/impl/JavaExecutableImpl.java index 9b0d7da17..885af6abb 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/impl/JavaExecutableImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/impl/JavaExecutableImpl.java @@ -73,6 +73,7 @@ public class JavaExecutableImpl extends ExecutableImpl implements JavaExecutable * * @generated */ + @Override public String getMethod() { return method; @@ -83,6 +84,7 @@ public class JavaExecutableImpl extends ExecutableImpl implements JavaExecutable * * @generated */ + @Override public void setMethod(String newMethod) { String oldMethod = method; @@ -167,7 +169,7 @@ public class JavaExecutableImpl extends ExecutableImpl implements JavaExecutable { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (method: "); result.append(method); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/impl/JavaImportImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/impl/JavaImportImpl.java index 2981ddeb7..e01d3c3ee 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/impl/JavaImportImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/impl/JavaImportImpl.java @@ -65,6 +65,7 @@ public class JavaImportImpl extends ImportImpl implements JavaImport * * @generated */ + @Override public EList getPath() { if (path == null) @@ -152,7 +153,7 @@ public class JavaImportImpl extends ImportImpl implements JavaImport { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (path: "); result.append(path); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/impl/ListAssignmentImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/impl/ListAssignmentImpl.java index b41dca58c..d9b892ad6 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/impl/ListAssignmentImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/impl/ListAssignmentImpl.java @@ -81,6 +81,7 @@ public class ListAssignmentImpl extends AssignmentImpl implements ListAssignment * * @generated */ + @Override public EList getLeftValues() { if (leftValues == null) @@ -95,6 +96,7 @@ public class ListAssignmentImpl extends AssignmentImpl implements ListAssignment * * @generated */ + @Override public EList getRightValues() { if (rightValues == null) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/impl/MigrationImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/impl/MigrationImpl.java index bd1aa1e4d..5378678a7 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/impl/MigrationImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/impl/MigrationImpl.java @@ -89,6 +89,7 @@ public class MigrationImpl extends MinimalEObjectImpl.Container implements Migra * * @generated */ + @Override public Executable getFirst() { return first; @@ -116,6 +117,7 @@ public class MigrationImpl extends MinimalEObjectImpl.Container implements Migra * * @generated */ + @Override public void setFirst(Executable newFirst) { if (newFirst != first) @@ -137,6 +139,7 @@ public class MigrationImpl extends MinimalEObjectImpl.Container implements Migra * * @generated */ + @Override public Executable getAsOp() { return asOp; @@ -164,6 +167,7 @@ public class MigrationImpl extends MinimalEObjectImpl.Container implements Migra * * @generated */ + @Override public void setAsOp(Executable newAsOp) { if (newAsOp != asOp) @@ -185,6 +189,7 @@ public class MigrationImpl extends MinimalEObjectImpl.Container implements Migra * * @generated */ + @Override public Executable getEachOp() { return eachOp; @@ -212,6 +217,7 @@ public class MigrationImpl extends MinimalEObjectImpl.Container implements Migra * * @generated */ + @Override public void setEachOp(Executable newEachOp) { if (newEachOp != eachOp) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/impl/ModelImportImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/impl/ModelImportImpl.java index 0c6b73d18..c0a16395a 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/impl/ModelImportImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/impl/ModelImportImpl.java @@ -73,6 +73,7 @@ public class ModelImportImpl extends ImportImpl implements ModelImport * * @generated */ + @Override public String getName() { return name; @@ -83,6 +84,7 @@ public class ModelImportImpl extends ImportImpl implements ModelImport * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -167,7 +169,7 @@ public class ModelImportImpl extends ImportImpl implements ModelImport { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/impl/NamedObjectImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/impl/NamedObjectImpl.java index ca5046e35..e2d8e31ec 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/impl/NamedObjectImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/impl/NamedObjectImpl.java @@ -107,6 +107,7 @@ public class NamedObjectImpl extends MinimalEObjectImpl.Container implements Nam * * @generated */ + @Override public String getName() { return name; @@ -117,6 +118,7 @@ public class NamedObjectImpl extends MinimalEObjectImpl.Container implements Nam * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -130,6 +132,7 @@ public class NamedObjectImpl extends MinimalEObjectImpl.Container implements Nam * * @generated */ + @Override public EList getAssignments() { if (assignments == null) @@ -144,6 +147,7 @@ public class NamedObjectImpl extends MinimalEObjectImpl.Container implements Nam * * @generated */ + @Override public Migration getLeftMig() { return leftMig; @@ -171,6 +175,7 @@ public class NamedObjectImpl extends MinimalEObjectImpl.Container implements Nam * * @generated */ + @Override public void setLeftMig(Migration newLeftMig) { if (newLeftMig != leftMig) @@ -303,7 +308,7 @@ public class NamedObjectImpl extends MinimalEObjectImpl.Container implements Nam { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/impl/NamedResourceImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/impl/NamedResourceImpl.java index ab87af111..443c79920 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/impl/NamedResourceImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/impl/NamedResourceImpl.java @@ -141,6 +141,7 @@ public class NamedResourceImpl extends MinimalEObjectImpl.Container implements N * * @generated */ + @Override public String getName() { return name; @@ -151,6 +152,7 @@ public class NamedResourceImpl extends MinimalEObjectImpl.Container implements N * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -164,6 +166,7 @@ public class NamedResourceImpl extends MinimalEObjectImpl.Container implements N * * @generated */ + @Override public String getLeftUri() { return leftUri; @@ -174,6 +177,7 @@ public class NamedResourceImpl extends MinimalEObjectImpl.Container implements N * * @generated */ + @Override public void setLeftUri(String newLeftUri) { String oldLeftUri = leftUri; @@ -187,6 +191,7 @@ public class NamedResourceImpl extends MinimalEObjectImpl.Container implements N * * @generated */ + @Override public CreatedObject getLeftRoot() { return leftRoot; @@ -214,6 +219,7 @@ public class NamedResourceImpl extends MinimalEObjectImpl.Container implements N * * @generated */ + @Override public void setLeftRoot(CreatedObject newLeftRoot) { if (newLeftRoot != leftRoot) @@ -235,6 +241,7 @@ public class NamedResourceImpl extends MinimalEObjectImpl.Container implements N * * @generated */ + @Override public String getRightUri() { return rightUri; @@ -245,6 +252,7 @@ public class NamedResourceImpl extends MinimalEObjectImpl.Container implements N * * @generated */ + @Override public void setRightUri(String newRightUri) { String oldRightUri = rightUri; @@ -258,6 +266,7 @@ public class NamedResourceImpl extends MinimalEObjectImpl.Container implements N * * @generated */ + @Override public CreatedObject getRightRoot() { return rightRoot; @@ -285,6 +294,7 @@ public class NamedResourceImpl extends MinimalEObjectImpl.Container implements N * * @generated */ + @Override public void setRightRoot(CreatedObject newRightRoot) { if (newRightRoot != rightRoot) @@ -435,7 +445,7 @@ public class NamedResourceImpl extends MinimalEObjectImpl.Container implements N { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(", leftUri: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/impl/ObjectCopyImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/impl/ObjectCopyImpl.java index dd84023d5..cb568d76c 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/impl/ObjectCopyImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/impl/ObjectCopyImpl.java @@ -86,6 +86,7 @@ public class ObjectCopyImpl extends CreatedObjectImpl implements ObjectCopy * * @generated */ + @Override public NamedResource getResource() { if (resource != null && resource.eIsProxy()) @@ -116,6 +117,7 @@ public class ObjectCopyImpl extends CreatedObjectImpl implements ObjectCopy * * @generated */ + @Override public void setResource(NamedResource newResource) { NamedResource oldResource = resource; @@ -129,6 +131,7 @@ public class ObjectCopyImpl extends CreatedObjectImpl implements ObjectCopy * * @generated */ + @Override public String getFragment() { return fragment; @@ -139,6 +142,7 @@ public class ObjectCopyImpl extends CreatedObjectImpl implements ObjectCopy * * @generated */ + @Override public void setFragment(String newFragment) { String oldFragment = fragment; @@ -234,7 +238,7 @@ public class ObjectCopyImpl extends CreatedObjectImpl implements ObjectCopy { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (fragment: "); result.append(fragment); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/impl/ObjectNewImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/impl/ObjectNewImpl.java index 880796f62..b8c8a4d39 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/impl/ObjectNewImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/impl/ObjectNewImpl.java @@ -86,6 +86,7 @@ public class ObjectNewImpl extends CreatedObjectImpl implements ObjectNew * * @generated */ + @Override public Import getImport() { if (import_ != null && import_.eIsProxy()) @@ -116,6 +117,7 @@ public class ObjectNewImpl extends CreatedObjectImpl implements ObjectNew * * @generated */ + @Override public void setImport(Import newImport) { Import oldImport = import_; @@ -129,6 +131,7 @@ public class ObjectNewImpl extends CreatedObjectImpl implements ObjectNew * * @generated */ + @Override public String getImpFrag() { return impFrag; @@ -139,6 +142,7 @@ public class ObjectNewImpl extends CreatedObjectImpl implements ObjectNew * * @generated */ + @Override public void setImpFrag(String newImpFrag) { String oldImpFrag = impFrag; @@ -234,7 +238,7 @@ public class ObjectNewImpl extends CreatedObjectImpl implements ObjectNew { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (impFrag: "); result.append(impFrag); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/impl/ObjectRefImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/impl/ObjectRefImpl.java index 3ec7bfa82..ccd411ed2 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/impl/ObjectRefImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/impl/ObjectRefImpl.java @@ -131,6 +131,7 @@ public class ObjectRefImpl extends NamedObjectImpl implements ObjectRef * * @generated */ + @Override public NamedResource getLeftRes() { if (leftRes != null && leftRes.eIsProxy()) @@ -161,6 +162,7 @@ public class ObjectRefImpl extends NamedObjectImpl implements ObjectRef * * @generated */ + @Override public void setLeftRes(NamedResource newLeftRes) { NamedResource oldLeftRes = leftRes; @@ -174,6 +176,7 @@ public class ObjectRefImpl extends NamedObjectImpl implements ObjectRef * * @generated */ + @Override public String getLeftFrag() { return leftFrag; @@ -184,6 +187,7 @@ public class ObjectRefImpl extends NamedObjectImpl implements ObjectRef * * @generated */ + @Override public void setLeftFrag(String newLeftFrag) { String oldLeftFrag = leftFrag; @@ -197,6 +201,7 @@ public class ObjectRefImpl extends NamedObjectImpl implements ObjectRef * * @generated */ + @Override public NamedResource getRightRes() { if (rightRes != null && rightRes.eIsProxy()) @@ -227,6 +232,7 @@ public class ObjectRefImpl extends NamedObjectImpl implements ObjectRef * * @generated */ + @Override public void setRightRes(NamedResource newRightRes) { NamedResource oldRightRes = rightRes; @@ -240,6 +246,7 @@ public class ObjectRefImpl extends NamedObjectImpl implements ObjectRef * * @generated */ + @Override public String getRightFrag() { return rightFrag; @@ -250,6 +257,7 @@ public class ObjectRefImpl extends NamedObjectImpl implements ObjectRef * * @generated */ + @Override public void setRightFrag(String newRightFrag) { String oldRightFrag = rightFrag; @@ -263,6 +271,7 @@ public class ObjectRefImpl extends NamedObjectImpl implements ObjectRef * * @generated */ + @Override public Migration getRightMig() { return rightMig; @@ -290,6 +299,7 @@ public class ObjectRefImpl extends NamedObjectImpl implements ObjectRef * * @generated */ + @Override public void setRightMig(Migration newRightMig) { if (newRightMig != rightMig) @@ -440,7 +450,7 @@ public class ObjectRefImpl extends NamedObjectImpl implements ObjectRef { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (leftFrag: "); result.append(leftFrag); result.append(", rightFrag: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/impl/ResourceImportImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/impl/ResourceImportImpl.java index 0d422f31f..3a277835d 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/impl/ResourceImportImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/impl/ResourceImportImpl.java @@ -73,6 +73,7 @@ public class ResourceImportImpl extends ModelImportImpl implements ResourceImpor * * @generated */ + @Override public String getUri() { return uri; @@ -83,6 +84,7 @@ public class ResourceImportImpl extends ModelImportImpl implements ResourceImpor * * @generated */ + @Override public void setUri(String newUri) { String oldUri = uri; @@ -167,7 +169,7 @@ public class ResourceImportImpl extends ModelImportImpl implements ResourceImpor { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (uri: "); result.append(uri); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/impl/SingleAssignmentImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/impl/SingleAssignmentImpl.java index 298ca42aa..62311d783 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/impl/SingleAssignmentImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/epatch/epatchTestLanguage/impl/SingleAssignmentImpl.java @@ -77,6 +77,7 @@ public class SingleAssignmentImpl extends AssignmentImpl implements SingleAssign * * @generated */ + @Override public AssignmentValue getLeftValue() { return leftValue; @@ -104,6 +105,7 @@ public class SingleAssignmentImpl extends AssignmentImpl implements SingleAssign * * @generated */ + @Override public void setLeftValue(AssignmentValue newLeftValue) { if (newLeftValue != leftValue) @@ -125,6 +127,7 @@ public class SingleAssignmentImpl extends AssignmentImpl implements SingleAssign * * @generated */ + @Override public AssignmentValue getRightValue() { return rightValue; @@ -152,6 +155,7 @@ public class SingleAssignmentImpl extends AssignmentImpl implements SingleAssign * * @generated */ + @Override public void setRightValue(AssignmentValue newRightValue) { if (newRightValue != rightValue) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/fragments/FragmentTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/fragments/FragmentTestLanguage.genmodel index 7246155ce..b38396367 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/fragments/FragmentTestLanguage.genmodel +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/fragments/FragmentTestLanguage.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="FragmentTestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> + complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/fragments/fragmentTestLanguage/PRFNamed.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/fragments/fragmentTestLanguage/PRFNamed.java index 9ebb1e0cc..504b67292 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/fragments/fragmentTestLanguage/PRFNamed.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/fragments/fragmentTestLanguage/PRFNamed.java @@ -27,10 +27,6 @@ public interface PRFNamed extends EObject /** * Returns the value of the 'Ref' reference. * - *

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

* * @return the value of the 'Ref' reference. * @see #setRef(PRFNamed) @@ -53,10 +49,6 @@ public interface PRFNamed 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) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/fragments/fragmentTestLanguage/PRFNamedWithAction.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/fragments/fragmentTestLanguage/PRFNamedWithAction.java index 57c27c081..8c2292bf3 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/fragments/fragmentTestLanguage/PRFNamedWithAction.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/fragments/fragmentTestLanguage/PRFNamedWithAction.java @@ -26,10 +26,6 @@ public interface PRFNamedWithAction extends PRFNamed /** * Returns the value of the 'Prev' containment reference. * - *

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

* * @return the value of the 'Prev' containment reference. * @see #setPrev(PRFNamed) @@ -52,10 +48,6 @@ public interface PRFNamedWithAction extends PRFNamed /** * Returns the value of the 'Ref2' reference. * - *

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

* * @return the value of the 'Ref2' reference. * @see #setRef2(PRFNamed) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/fragments/fragmentTestLanguage/ParserRuleFragments.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/fragments/fragmentTestLanguage/ParserRuleFragments.java index 78536b3cd..5958c7508 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/fragments/fragmentTestLanguage/ParserRuleFragments.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/fragments/fragmentTestLanguage/ParserRuleFragments.java @@ -27,10 +27,6 @@ public interface ParserRuleFragments extends EObject /** * Returns the value of the 'Element' containment reference. * - *

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

* * @return the value of the 'Element' containment reference. * @see #setElement(PRFNamed) @@ -53,10 +49,6 @@ public interface ParserRuleFragments extends EObject /** * Returns the value of the 'Ref' reference. * - *

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

* * @return the value of the 'Ref' reference. * @see #setRef(PRFNamed) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/fragments/fragmentTestLanguage/impl/FragmentTestLanguageFactoryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/fragments/fragmentTestLanguage/impl/FragmentTestLanguageFactoryImpl.java index 68cfd6461..110f229f8 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/fragments/fragmentTestLanguage/impl/FragmentTestLanguageFactoryImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/fragments/fragmentTestLanguage/impl/FragmentTestLanguageFactoryImpl.java @@ -78,6 +78,7 @@ public class FragmentTestLanguageFactoryImpl extends EFactoryImpl implements Fra * * @generated */ + @Override public ParserRuleFragments createParserRuleFragments() { ParserRuleFragmentsImpl parserRuleFragments = new ParserRuleFragmentsImpl(); @@ -89,6 +90,7 @@ public class FragmentTestLanguageFactoryImpl extends EFactoryImpl implements Fra * * @generated */ + @Override public PRFNamed createPRFNamed() { PRFNamedImpl prfNamed = new PRFNamedImpl(); @@ -100,6 +102,7 @@ public class FragmentTestLanguageFactoryImpl extends EFactoryImpl implements Fra * * @generated */ + @Override public PRFNamedWithAction createPRFNamedWithAction() { PRFNamedWithActionImpl prfNamedWithAction = new PRFNamedWithActionImpl(); @@ -111,6 +114,7 @@ public class FragmentTestLanguageFactoryImpl extends EFactoryImpl implements Fra * * @generated */ + @Override public FragmentTestLanguagePackage getFragmentTestLanguagePackage() { return (FragmentTestLanguagePackage)getEPackage(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/fragments/fragmentTestLanguage/impl/FragmentTestLanguagePackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/fragments/fragmentTestLanguage/impl/FragmentTestLanguagePackageImpl.java index af6f9c0f6..3d8c4b7e6 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/fragments/fragmentTestLanguage/impl/FragmentTestLanguagePackageImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/fragments/fragmentTestLanguage/impl/FragmentTestLanguagePackageImpl.java @@ -75,7 +75,7 @@ public class FragmentTestLanguagePackageImpl extends EPackageImpl implements Fra /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link FragmentTestLanguagePackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -90,7 +90,8 @@ public class FragmentTestLanguagePackageImpl extends EPackageImpl implements Fra if (isInited) return (FragmentTestLanguagePackage)EPackage.Registry.INSTANCE.getEPackage(FragmentTestLanguagePackage.eNS_URI); // Obtain or create and register package - FragmentTestLanguagePackageImpl theFragmentTestLanguagePackage = (FragmentTestLanguagePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof FragmentTestLanguagePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new FragmentTestLanguagePackageImpl()); + Object registeredFragmentTestLanguagePackage = EPackage.Registry.INSTANCE.get(eNS_URI); + FragmentTestLanguagePackageImpl theFragmentTestLanguagePackage = registeredFragmentTestLanguagePackage instanceof FragmentTestLanguagePackageImpl ? (FragmentTestLanguagePackageImpl)registeredFragmentTestLanguagePackage : new FragmentTestLanguagePackageImpl(); isInited = true; @@ -106,7 +107,6 @@ public class FragmentTestLanguagePackageImpl extends EPackageImpl implements Fra // Mark meta-data to indicate it can't be changed theFragmentTestLanguagePackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(FragmentTestLanguagePackage.eNS_URI, theFragmentTestLanguagePackage); return theFragmentTestLanguagePackage; @@ -117,6 +117,7 @@ public class FragmentTestLanguagePackageImpl extends EPackageImpl implements Fra * * @generated */ + @Override public EClass getParserRuleFragments() { return parserRuleFragmentsEClass; @@ -127,6 +128,7 @@ public class FragmentTestLanguagePackageImpl extends EPackageImpl implements Fra * * @generated */ + @Override public EReference getParserRuleFragments_Element() { return (EReference)parserRuleFragmentsEClass.getEStructuralFeatures().get(0); @@ -137,6 +139,7 @@ public class FragmentTestLanguagePackageImpl extends EPackageImpl implements Fra * * @generated */ + @Override public EReference getParserRuleFragments_Ref() { return (EReference)parserRuleFragmentsEClass.getEStructuralFeatures().get(1); @@ -147,6 +150,7 @@ public class FragmentTestLanguagePackageImpl extends EPackageImpl implements Fra * * @generated */ + @Override public EClass getPRFNamed() { return prfNamedEClass; @@ -157,6 +161,7 @@ public class FragmentTestLanguagePackageImpl extends EPackageImpl implements Fra * * @generated */ + @Override public EReference getPRFNamed_Ref() { return (EReference)prfNamedEClass.getEStructuralFeatures().get(0); @@ -167,6 +172,7 @@ public class FragmentTestLanguagePackageImpl extends EPackageImpl implements Fra * * @generated */ + @Override public EAttribute getPRFNamed_Name() { return (EAttribute)prfNamedEClass.getEStructuralFeatures().get(1); @@ -177,6 +183,7 @@ public class FragmentTestLanguagePackageImpl extends EPackageImpl implements Fra * * @generated */ + @Override public EClass getPRFNamedWithAction() { return prfNamedWithActionEClass; @@ -187,6 +194,7 @@ public class FragmentTestLanguagePackageImpl extends EPackageImpl implements Fra * * @generated */ + @Override public EReference getPRFNamedWithAction_Prev() { return (EReference)prfNamedWithActionEClass.getEStructuralFeatures().get(0); @@ -197,6 +205,7 @@ public class FragmentTestLanguagePackageImpl extends EPackageImpl implements Fra * * @generated */ + @Override public EReference getPRFNamedWithAction_Ref2() { return (EReference)prfNamedWithActionEClass.getEStructuralFeatures().get(1); @@ -207,6 +216,7 @@ public class FragmentTestLanguagePackageImpl extends EPackageImpl implements Fra * * @generated */ + @Override public FragmentTestLanguageFactory getFragmentTestLanguageFactory() { return (FragmentTestLanguageFactory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/fragments/fragmentTestLanguage/impl/PRFNamedImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/fragments/fragmentTestLanguage/impl/PRFNamedImpl.java index 77fe21ef4..81b75fd40 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/fragments/fragmentTestLanguage/impl/PRFNamedImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/fragments/fragmentTestLanguage/impl/PRFNamedImpl.java @@ -86,6 +86,7 @@ public class PRFNamedImpl extends MinimalEObjectImpl.Container implements PRFNam * * @generated */ + @Override public PRFNamed getRef() { if (ref != null && ref.eIsProxy()) @@ -116,6 +117,7 @@ public class PRFNamedImpl extends MinimalEObjectImpl.Container implements PRFNam * * @generated */ + @Override public void setRef(PRFNamed newRef) { PRFNamed oldRef = ref; @@ -129,6 +131,7 @@ public class PRFNamedImpl extends MinimalEObjectImpl.Container implements PRFNam * * @generated */ + @Override public String getName() { return name; @@ -139,6 +142,7 @@ public class PRFNamedImpl extends MinimalEObjectImpl.Container implements PRFNam * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -234,7 +238,7 @@ public class PRFNamedImpl extends MinimalEObjectImpl.Container implements PRFNam { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/fragments/fragmentTestLanguage/impl/PRFNamedWithActionImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/fragments/fragmentTestLanguage/impl/PRFNamedWithActionImpl.java index fa6413458..7c339265b 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/fragments/fragmentTestLanguage/impl/PRFNamedWithActionImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/fragments/fragmentTestLanguage/impl/PRFNamedWithActionImpl.java @@ -77,6 +77,7 @@ public class PRFNamedWithActionImpl extends PRFNamedImpl implements PRFNamedWith * * @generated */ + @Override public PRFNamed getPrev() { return prev; @@ -104,6 +105,7 @@ public class PRFNamedWithActionImpl extends PRFNamedImpl implements PRFNamedWith * * @generated */ + @Override public void setPrev(PRFNamed newPrev) { if (newPrev != prev) @@ -125,6 +127,7 @@ public class PRFNamedWithActionImpl extends PRFNamedImpl implements PRFNamedWith * * @generated */ + @Override public PRFNamed getRef2() { if (ref2 != null && ref2.eIsProxy()) @@ -155,6 +158,7 @@ public class PRFNamedWithActionImpl extends PRFNamedImpl implements PRFNamedWith * * @generated */ + @Override public void setRef2(PRFNamed newRef2) { PRFNamed oldRef2 = ref2; diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/fragments/fragmentTestLanguage/impl/ParserRuleFragmentsImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/fragments/fragmentTestLanguage/impl/ParserRuleFragmentsImpl.java index 36f47528c..86e13238e 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/fragments/fragmentTestLanguage/impl/ParserRuleFragmentsImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/fragments/fragmentTestLanguage/impl/ParserRuleFragmentsImpl.java @@ -78,6 +78,7 @@ public class ParserRuleFragmentsImpl extends MinimalEObjectImpl.Container implem * * @generated */ + @Override public PRFNamed getElement() { return element; @@ -105,6 +106,7 @@ public class ParserRuleFragmentsImpl extends MinimalEObjectImpl.Container implem * * @generated */ + @Override public void setElement(PRFNamed newElement) { if (newElement != element) @@ -126,6 +128,7 @@ public class ParserRuleFragmentsImpl extends MinimalEObjectImpl.Container implem * * @generated */ + @Override public PRFNamed getRef() { if (ref != null && ref.eIsProxy()) @@ -156,6 +159,7 @@ public class ParserRuleFragmentsImpl extends MinimalEObjectImpl.Container implem * * @generated */ + @Override public void setRef(PRFNamed newRef) { PRFNamed oldRef = ref; diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/indentation/IndentationAwareTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/indentation/IndentationAwareTestLanguage.genmodel index 93df2bbfd..549a26bde 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/indentation/IndentationAwareTestLanguage.genmodel +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/indentation/IndentationAwareTestLanguage.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="IndentationAwareTestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> + complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/indentation/indentationAwareTestLanguage/ChildList.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/indentation/indentationAwareTestLanguage/ChildList.java index 9d9101aed..d5f3fc8a8 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/indentation/indentationAwareTestLanguage/ChildList.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/indentation/indentationAwareTestLanguage/ChildList.java @@ -29,10 +29,6 @@ public interface ChildList extends EObject * Returns the value of the 'Children' containment reference list. * The list contents are of type {@link org.eclipse.xtext.parser.indentation.indentationAwareTestLanguage.OtherTreeNode}. * - *

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

* * @return the value of the 'Children' containment reference list. * @see org.eclipse.xtext.parser.indentation.indentationAwareTestLanguage.IndentationAwareTestLanguagePackage#getChildList_Children() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/indentation/indentationAwareTestLanguage/OtherTreeNode.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/indentation/indentationAwareTestLanguage/OtherTreeNode.java index 7398a3c3f..db91374e7 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/indentation/indentationAwareTestLanguage/OtherTreeNode.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/indentation/indentationAwareTestLanguage/OtherTreeNode.java @@ -27,10 +27,6 @@ public interface OtherTreeNode 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) @@ -53,10 +49,6 @@ public interface OtherTreeNode extends EObject /** * Returns the value of the 'Child List' containment reference. * - *

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

* * @return the value of the 'Child List' containment reference. * @see #setChildList(ChildList) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/indentation/indentationAwareTestLanguage/Tree.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/indentation/indentationAwareTestLanguage/Tree.java index d885e4a65..9d2e83325 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/indentation/indentationAwareTestLanguage/Tree.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/indentation/indentationAwareTestLanguage/Tree.java @@ -30,10 +30,6 @@ public interface Tree extends EObject * Returns the value of the 'Nodes' containment reference list. * The list contents are of type {@link org.eclipse.xtext.parser.indentation.indentationAwareTestLanguage.TreeNode}. * - *

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

* * @return the value of the 'Nodes' containment reference list. * @see org.eclipse.xtext.parser.indentation.indentationAwareTestLanguage.IndentationAwareTestLanguagePackage#getTree_Nodes() @@ -46,10 +42,6 @@ public interface Tree extends EObject * Returns the value of the 'More Nodes' containment reference list. * The list contents are of type {@link org.eclipse.xtext.parser.indentation.indentationAwareTestLanguage.OtherTreeNode}. * - *

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

* * @return the value of the 'More Nodes' containment reference list. * @see org.eclipse.xtext.parser.indentation.indentationAwareTestLanguage.IndentationAwareTestLanguagePackage#getTree_MoreNodes() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/indentation/indentationAwareTestLanguage/TreeNode.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/indentation/indentationAwareTestLanguage/TreeNode.java index b8bd66b30..dccdc885c 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/indentation/indentationAwareTestLanguage/TreeNode.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/indentation/indentationAwareTestLanguage/TreeNode.java @@ -29,10 +29,6 @@ public interface TreeNode 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) @@ -56,10 +52,6 @@ public interface TreeNode extends EObject * Returns the value of the 'Children' containment reference list. * The list contents are of type {@link org.eclipse.xtext.parser.indentation.indentationAwareTestLanguage.TreeNode}. * - *

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

* * @return the value of the 'Children' containment reference list. * @see org.eclipse.xtext.parser.indentation.indentationAwareTestLanguage.IndentationAwareTestLanguagePackage#getTreeNode_Children() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/indentation/indentationAwareTestLanguage/impl/ChildListImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/indentation/indentationAwareTestLanguage/impl/ChildListImpl.java index 5a1e60672..7b92cc639 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/indentation/indentationAwareTestLanguage/impl/ChildListImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/indentation/indentationAwareTestLanguage/impl/ChildListImpl.java @@ -72,6 +72,7 @@ public class ChildListImpl extends MinimalEObjectImpl.Container implements Child * * @generated */ + @Override public EList getChildren() { if (children == null) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/indentation/indentationAwareTestLanguage/impl/IndentationAwareTestLanguageFactoryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/indentation/indentationAwareTestLanguage/impl/IndentationAwareTestLanguageFactoryImpl.java index 80edf05e2..ce6202168 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/indentation/indentationAwareTestLanguage/impl/IndentationAwareTestLanguageFactoryImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/indentation/indentationAwareTestLanguage/impl/IndentationAwareTestLanguageFactoryImpl.java @@ -79,6 +79,7 @@ public class IndentationAwareTestLanguageFactoryImpl extends EFactoryImpl implem * * @generated */ + @Override public Tree createTree() { TreeImpl tree = new TreeImpl(); @@ -90,6 +91,7 @@ public class IndentationAwareTestLanguageFactoryImpl extends EFactoryImpl implem * * @generated */ + @Override public TreeNode createTreeNode() { TreeNodeImpl treeNode = new TreeNodeImpl(); @@ -101,6 +103,7 @@ public class IndentationAwareTestLanguageFactoryImpl extends EFactoryImpl implem * * @generated */ + @Override public OtherTreeNode createOtherTreeNode() { OtherTreeNodeImpl otherTreeNode = new OtherTreeNodeImpl(); @@ -112,6 +115,7 @@ public class IndentationAwareTestLanguageFactoryImpl extends EFactoryImpl implem * * @generated */ + @Override public ChildList createChildList() { ChildListImpl childList = new ChildListImpl(); @@ -123,6 +127,7 @@ public class IndentationAwareTestLanguageFactoryImpl extends EFactoryImpl implem * * @generated */ + @Override public IndentationAwareTestLanguagePackage getIndentationAwareTestLanguagePackage() { return (IndentationAwareTestLanguagePackage)getEPackage(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/indentation/indentationAwareTestLanguage/impl/IndentationAwareTestLanguagePackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/indentation/indentationAwareTestLanguage/impl/IndentationAwareTestLanguagePackageImpl.java index 36051da40..34d47a640 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/indentation/indentationAwareTestLanguage/impl/IndentationAwareTestLanguagePackageImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/indentation/indentationAwareTestLanguage/impl/IndentationAwareTestLanguagePackageImpl.java @@ -83,7 +83,7 @@ public class IndentationAwareTestLanguagePackageImpl extends EPackageImpl implem /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link IndentationAwareTestLanguagePackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -98,7 +98,8 @@ public class IndentationAwareTestLanguagePackageImpl extends EPackageImpl implem if (isInited) return (IndentationAwareTestLanguagePackage)EPackage.Registry.INSTANCE.getEPackage(IndentationAwareTestLanguagePackage.eNS_URI); // Obtain or create and register package - IndentationAwareTestLanguagePackageImpl theIndentationAwareTestLanguagePackage = (IndentationAwareTestLanguagePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof IndentationAwareTestLanguagePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new IndentationAwareTestLanguagePackageImpl()); + Object registeredIndentationAwareTestLanguagePackage = EPackage.Registry.INSTANCE.get(eNS_URI); + IndentationAwareTestLanguagePackageImpl theIndentationAwareTestLanguagePackage = registeredIndentationAwareTestLanguagePackage instanceof IndentationAwareTestLanguagePackageImpl ? (IndentationAwareTestLanguagePackageImpl)registeredIndentationAwareTestLanguagePackage : new IndentationAwareTestLanguagePackageImpl(); isInited = true; @@ -114,7 +115,6 @@ public class IndentationAwareTestLanguagePackageImpl extends EPackageImpl implem // Mark meta-data to indicate it can't be changed theIndentationAwareTestLanguagePackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(IndentationAwareTestLanguagePackage.eNS_URI, theIndentationAwareTestLanguagePackage); return theIndentationAwareTestLanguagePackage; @@ -125,6 +125,7 @@ public class IndentationAwareTestLanguagePackageImpl extends EPackageImpl implem * * @generated */ + @Override public EClass getTree() { return treeEClass; @@ -135,6 +136,7 @@ public class IndentationAwareTestLanguagePackageImpl extends EPackageImpl implem * * @generated */ + @Override public EReference getTree_Nodes() { return (EReference)treeEClass.getEStructuralFeatures().get(0); @@ -145,6 +147,7 @@ public class IndentationAwareTestLanguagePackageImpl extends EPackageImpl implem * * @generated */ + @Override public EReference getTree_MoreNodes() { return (EReference)treeEClass.getEStructuralFeatures().get(1); @@ -155,6 +158,7 @@ public class IndentationAwareTestLanguagePackageImpl extends EPackageImpl implem * * @generated */ + @Override public EClass getTreeNode() { return treeNodeEClass; @@ -165,6 +169,7 @@ public class IndentationAwareTestLanguagePackageImpl extends EPackageImpl implem * * @generated */ + @Override public EAttribute getTreeNode_Name() { return (EAttribute)treeNodeEClass.getEStructuralFeatures().get(0); @@ -175,6 +180,7 @@ public class IndentationAwareTestLanguagePackageImpl extends EPackageImpl implem * * @generated */ + @Override public EReference getTreeNode_Children() { return (EReference)treeNodeEClass.getEStructuralFeatures().get(1); @@ -185,6 +191,7 @@ public class IndentationAwareTestLanguagePackageImpl extends EPackageImpl implem * * @generated */ + @Override public EClass getOtherTreeNode() { return otherTreeNodeEClass; @@ -195,6 +202,7 @@ public class IndentationAwareTestLanguagePackageImpl extends EPackageImpl implem * * @generated */ + @Override public EAttribute getOtherTreeNode_Name() { return (EAttribute)otherTreeNodeEClass.getEStructuralFeatures().get(0); @@ -205,6 +213,7 @@ public class IndentationAwareTestLanguagePackageImpl extends EPackageImpl implem * * @generated */ + @Override public EReference getOtherTreeNode_ChildList() { return (EReference)otherTreeNodeEClass.getEStructuralFeatures().get(1); @@ -215,6 +224,7 @@ public class IndentationAwareTestLanguagePackageImpl extends EPackageImpl implem * * @generated */ + @Override public EClass getChildList() { return childListEClass; @@ -225,6 +235,7 @@ public class IndentationAwareTestLanguagePackageImpl extends EPackageImpl implem * * @generated */ + @Override public EReference getChildList_Children() { return (EReference)childListEClass.getEStructuralFeatures().get(0); @@ -235,6 +246,7 @@ public class IndentationAwareTestLanguagePackageImpl extends EPackageImpl implem * * @generated */ + @Override public IndentationAwareTestLanguageFactory getIndentationAwareTestLanguageFactory() { return (IndentationAwareTestLanguageFactory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/indentation/indentationAwareTestLanguage/impl/OtherTreeNodeImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/indentation/indentationAwareTestLanguage/impl/OtherTreeNodeImpl.java index 718de9809..1a7381092 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/indentation/indentationAwareTestLanguage/impl/OtherTreeNodeImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/indentation/indentationAwareTestLanguage/impl/OtherTreeNodeImpl.java @@ -88,6 +88,7 @@ public class OtherTreeNodeImpl extends MinimalEObjectImpl.Container implements O * * @generated */ + @Override public String getName() { return name; @@ -98,6 +99,7 @@ public class OtherTreeNodeImpl extends MinimalEObjectImpl.Container implements O * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -111,6 +113,7 @@ public class OtherTreeNodeImpl extends MinimalEObjectImpl.Container implements O * * @generated */ + @Override public ChildList getChildList() { return childList; @@ -138,6 +141,7 @@ public class OtherTreeNodeImpl extends MinimalEObjectImpl.Container implements O * * @generated */ + @Override public void setChildList(ChildList newChildList) { if (newChildList != childList) @@ -256,7 +260,7 @@ public class OtherTreeNodeImpl extends MinimalEObjectImpl.Container implements O { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/indentation/indentationAwareTestLanguage/impl/TreeImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/indentation/indentationAwareTestLanguage/impl/TreeImpl.java index c7a17e06b..8d0c534c7 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/indentation/indentationAwareTestLanguage/impl/TreeImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/indentation/indentationAwareTestLanguage/impl/TreeImpl.java @@ -84,6 +84,7 @@ public class TreeImpl extends MinimalEObjectImpl.Container implements Tree * * @generated */ + @Override public EList getNodes() { if (nodes == null) @@ -98,6 +99,7 @@ public class TreeImpl extends MinimalEObjectImpl.Container implements Tree * * @generated */ + @Override public EList getMoreNodes() { if (moreNodes == null) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/indentation/indentationAwareTestLanguage/impl/TreeNodeImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/indentation/indentationAwareTestLanguage/impl/TreeNodeImpl.java index 82c219893..c3587fa8e 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/indentation/indentationAwareTestLanguage/impl/TreeNodeImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/indentation/indentationAwareTestLanguage/impl/TreeNodeImpl.java @@ -94,6 +94,7 @@ public class TreeNodeImpl extends MinimalEObjectImpl.Container implements TreeNo * * @generated */ + @Override public String getName() { return name; @@ -104,6 +105,7 @@ public class TreeNodeImpl extends MinimalEObjectImpl.Container implements TreeNo * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -117,6 +119,7 @@ public class TreeNodeImpl extends MinimalEObjectImpl.Container implements TreeNo * * @generated */ + @Override public EList getChildren() { if (children == null) @@ -230,7 +233,7 @@ public class TreeNodeImpl extends MinimalEObjectImpl.Container implements TreeNo { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/keywords/KeywordsTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/keywords/KeywordsTestLanguage.genmodel index 944533883..1001115b0 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/keywords/KeywordsTestLanguage.genmodel +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/keywords/KeywordsTestLanguage.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="KeywordsTestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> + complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/keywords/keywordsTestLanguage/Model.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/keywords/keywordsTestLanguage/Model.java index c08090088..d65641190 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/keywords/keywordsTestLanguage/Model.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/keywords/keywordsTestLanguage/Model.java @@ -33,10 +33,6 @@ public interface Model extends EObject /** * Returns the value of the 'First' attribute. * - *

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

* * @return the value of the 'First' attribute. * @see #setFirst(boolean) @@ -59,10 +55,6 @@ public interface Model extends EObject /** * Returns the value of the 'Second' attribute. * - *

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

* * @return the value of the 'Second' attribute. * @see #setSecond(boolean) @@ -85,10 +77,6 @@ public interface Model extends EObject /** * Returns the value of the 'Third' attribute. * - *

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

* * @return the value of the 'Third' attribute. * @see #setThird(boolean) @@ -111,10 +99,6 @@ public interface Model extends EObject /** * Returns the value of the 'Forth' attribute. * - *

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

* * @return the value of the 'Forth' attribute. * @see #setForth(boolean) @@ -137,10 +121,6 @@ public interface Model extends EObject /** * Returns the value of the 'Fifth' attribute. * - *

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

* * @return the value of the 'Fifth' attribute. * @see #setFifth(boolean) @@ -163,10 +143,6 @@ public interface Model extends EObject /** * Returns the value of the 'Sixth' attribute. * - *

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

* * @return the value of the 'Sixth' attribute. * @see #setSixth(boolean) @@ -189,10 +165,6 @@ public interface Model extends EObject /** * Returns the value of the 'Seventh' attribute. * - *

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

* * @return the value of the 'Seventh' attribute. * @see #setSeventh(boolean) @@ -215,10 +187,6 @@ public interface Model extends EObject /** * Returns the value of the 'Eighth' attribute. * - *

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

* * @return the value of the 'Eighth' attribute. * @see #setEighth(boolean) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/keywords/keywordsTestLanguage/impl/KeywordsTestLanguageFactoryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/keywords/keywordsTestLanguage/impl/KeywordsTestLanguageFactoryImpl.java index 4772c132b..71f54dc3d 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/keywords/keywordsTestLanguage/impl/KeywordsTestLanguageFactoryImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/keywords/keywordsTestLanguage/impl/KeywordsTestLanguageFactoryImpl.java @@ -76,6 +76,7 @@ public class KeywordsTestLanguageFactoryImpl extends EFactoryImpl implements Key * * @generated */ + @Override public Model createModel() { ModelImpl model = new ModelImpl(); @@ -87,6 +88,7 @@ public class KeywordsTestLanguageFactoryImpl extends EFactoryImpl implements Key * * @generated */ + @Override public KeywordsTestLanguagePackage getKeywordsTestLanguagePackage() { return (KeywordsTestLanguagePackage)getEPackage(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/keywords/keywordsTestLanguage/impl/KeywordsTestLanguagePackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/keywords/keywordsTestLanguage/impl/KeywordsTestLanguagePackageImpl.java index 900cd6354..5454d9b7d 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/keywords/keywordsTestLanguage/impl/KeywordsTestLanguagePackageImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/keywords/keywordsTestLanguage/impl/KeywordsTestLanguagePackageImpl.java @@ -58,7 +58,7 @@ public class KeywordsTestLanguagePackageImpl extends EPackageImpl implements Key /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link KeywordsTestLanguagePackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -73,7 +73,8 @@ public class KeywordsTestLanguagePackageImpl extends EPackageImpl implements Key if (isInited) return (KeywordsTestLanguagePackage)EPackage.Registry.INSTANCE.getEPackage(KeywordsTestLanguagePackage.eNS_URI); // Obtain or create and register package - KeywordsTestLanguagePackageImpl theKeywordsTestLanguagePackage = (KeywordsTestLanguagePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof KeywordsTestLanguagePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new KeywordsTestLanguagePackageImpl()); + Object registeredKeywordsTestLanguagePackage = EPackage.Registry.INSTANCE.get(eNS_URI); + KeywordsTestLanguagePackageImpl theKeywordsTestLanguagePackage = registeredKeywordsTestLanguagePackage instanceof KeywordsTestLanguagePackageImpl ? (KeywordsTestLanguagePackageImpl)registeredKeywordsTestLanguagePackage : new KeywordsTestLanguagePackageImpl(); isInited = true; @@ -89,7 +90,6 @@ public class KeywordsTestLanguagePackageImpl extends EPackageImpl implements Key // Mark meta-data to indicate it can't be changed theKeywordsTestLanguagePackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(KeywordsTestLanguagePackage.eNS_URI, theKeywordsTestLanguagePackage); return theKeywordsTestLanguagePackage; @@ -100,6 +100,7 @@ public class KeywordsTestLanguagePackageImpl extends EPackageImpl implements Key * * @generated */ + @Override public EClass getModel() { return modelEClass; @@ -110,6 +111,7 @@ public class KeywordsTestLanguagePackageImpl extends EPackageImpl implements Key * * @generated */ + @Override public EAttribute getModel_First() { return (EAttribute)modelEClass.getEStructuralFeatures().get(0); @@ -120,6 +122,7 @@ public class KeywordsTestLanguagePackageImpl extends EPackageImpl implements Key * * @generated */ + @Override public EAttribute getModel_Second() { return (EAttribute)modelEClass.getEStructuralFeatures().get(1); @@ -130,6 +133,7 @@ public class KeywordsTestLanguagePackageImpl extends EPackageImpl implements Key * * @generated */ + @Override public EAttribute getModel_Third() { return (EAttribute)modelEClass.getEStructuralFeatures().get(2); @@ -140,6 +144,7 @@ public class KeywordsTestLanguagePackageImpl extends EPackageImpl implements Key * * @generated */ + @Override public EAttribute getModel_Forth() { return (EAttribute)modelEClass.getEStructuralFeatures().get(3); @@ -150,6 +155,7 @@ public class KeywordsTestLanguagePackageImpl extends EPackageImpl implements Key * * @generated */ + @Override public EAttribute getModel_Fifth() { return (EAttribute)modelEClass.getEStructuralFeatures().get(4); @@ -160,6 +166,7 @@ public class KeywordsTestLanguagePackageImpl extends EPackageImpl implements Key * * @generated */ + @Override public EAttribute getModel_Sixth() { return (EAttribute)modelEClass.getEStructuralFeatures().get(5); @@ -170,6 +177,7 @@ public class KeywordsTestLanguagePackageImpl extends EPackageImpl implements Key * * @generated */ + @Override public EAttribute getModel_Seventh() { return (EAttribute)modelEClass.getEStructuralFeatures().get(6); @@ -180,6 +188,7 @@ public class KeywordsTestLanguagePackageImpl extends EPackageImpl implements Key * * @generated */ + @Override public EAttribute getModel_Eighth() { return (EAttribute)modelEClass.getEStructuralFeatures().get(7); @@ -190,6 +199,7 @@ public class KeywordsTestLanguagePackageImpl extends EPackageImpl implements Key * * @generated */ + @Override public KeywordsTestLanguageFactory getKeywordsTestLanguageFactory() { return (KeywordsTestLanguageFactory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/keywords/keywordsTestLanguage/impl/ModelImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/keywords/keywordsTestLanguage/impl/ModelImpl.java index 3b7b003dd..d0c9db2c4 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/keywords/keywordsTestLanguage/impl/ModelImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/keywords/keywordsTestLanguage/impl/ModelImpl.java @@ -221,6 +221,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public boolean isFirst() { return first; @@ -231,6 +232,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setFirst(boolean newFirst) { boolean oldFirst = first; @@ -244,6 +246,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public boolean isSecond() { return second; @@ -254,6 +257,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setSecond(boolean newSecond) { boolean oldSecond = second; @@ -267,6 +271,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public boolean isThird() { return third; @@ -277,6 +282,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setThird(boolean newThird) { boolean oldThird = third; @@ -290,6 +296,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public boolean isForth() { return forth; @@ -300,6 +307,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setForth(boolean newForth) { boolean oldForth = forth; @@ -313,6 +321,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public boolean isFifth() { return fifth; @@ -323,6 +332,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setFifth(boolean newFifth) { boolean oldFifth = fifth; @@ -336,6 +346,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public boolean isSixth() { return sixth; @@ -346,6 +357,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setSixth(boolean newSixth) { boolean oldSixth = sixth; @@ -359,6 +371,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public boolean isSeventh() { return seventh; @@ -369,6 +382,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setSeventh(boolean newSeventh) { boolean oldSeventh = seventh; @@ -382,6 +396,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public boolean isEighth() { return eighth; @@ -392,6 +407,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setEighth(boolean newEighth) { boolean oldEighth = eighth; @@ -546,7 +562,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (first: "); result.append(first); result.append(", second: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/ParametersTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/ParametersTestLanguage.genmodel index 2f18f510c..11193ab5f 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/ParametersTestLanguage.genmodel +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/ParametersTestLanguage.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="ParametersTestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> + complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/parametersTestLanguage/ParserRuleParameters.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/parametersTestLanguage/ParserRuleParameters.java index 01aaa71f8..676e66dcc 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/parametersTestLanguage/ParserRuleParameters.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/parametersTestLanguage/ParserRuleParameters.java @@ -26,10 +26,6 @@ public interface ParserRuleParameters extends EObject /** * Returns the value of the 'Scenario' containment reference. * - *

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

* * @return the value of the 'Scenario' containment reference. * @see #setScenario(Scenario) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/parametersTestLanguage/Scenario.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/parametersTestLanguage/Scenario.java index b2dfdbc8e..4bc1ffab1 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/parametersTestLanguage/Scenario.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/parametersTestLanguage/Scenario.java @@ -27,10 +27,6 @@ public interface Scenario extends EObject /** * Returns the value of the 'First' attribute. * - *

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

* * @return the value of the 'First' attribute. * @see #setFirst(String) @@ -53,10 +49,6 @@ public interface Scenario extends EObject /** * Returns the value of the 'Second' attribute. * - *

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

* * @return the value of the 'Second' attribute. * @see #setSecond(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/parametersTestLanguage/impl/ParametersTestLanguageFactoryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/parametersTestLanguage/impl/ParametersTestLanguageFactoryImpl.java index 0981d6102..c8d4fad46 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/parametersTestLanguage/impl/ParametersTestLanguageFactoryImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/parametersTestLanguage/impl/ParametersTestLanguageFactoryImpl.java @@ -77,6 +77,7 @@ public class ParametersTestLanguageFactoryImpl extends EFactoryImpl implements P * * @generated */ + @Override public ParserRuleParameters createParserRuleParameters() { ParserRuleParametersImpl parserRuleParameters = new ParserRuleParametersImpl(); @@ -88,6 +89,7 @@ public class ParametersTestLanguageFactoryImpl extends EFactoryImpl implements P * * @generated */ + @Override public Scenario createScenario() { ScenarioImpl scenario = new ScenarioImpl(); @@ -99,6 +101,7 @@ public class ParametersTestLanguageFactoryImpl extends EFactoryImpl implements P * * @generated */ + @Override public ParametersTestLanguagePackage getParametersTestLanguagePackage() { return (ParametersTestLanguagePackage)getEPackage(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/parametersTestLanguage/impl/ParametersTestLanguagePackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/parametersTestLanguage/impl/ParametersTestLanguagePackageImpl.java index ad7398644..1e02ad565 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/parametersTestLanguage/impl/ParametersTestLanguagePackageImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/parametersTestLanguage/impl/ParametersTestLanguagePackageImpl.java @@ -67,7 +67,7 @@ public class ParametersTestLanguagePackageImpl extends EPackageImpl implements P /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link ParametersTestLanguagePackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -82,7 +82,8 @@ public class ParametersTestLanguagePackageImpl extends EPackageImpl implements P if (isInited) return (ParametersTestLanguagePackage)EPackage.Registry.INSTANCE.getEPackage(ParametersTestLanguagePackage.eNS_URI); // Obtain or create and register package - ParametersTestLanguagePackageImpl theParametersTestLanguagePackage = (ParametersTestLanguagePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof ParametersTestLanguagePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new ParametersTestLanguagePackageImpl()); + Object registeredParametersTestLanguagePackage = EPackage.Registry.INSTANCE.get(eNS_URI); + ParametersTestLanguagePackageImpl theParametersTestLanguagePackage = registeredParametersTestLanguagePackage instanceof ParametersTestLanguagePackageImpl ? (ParametersTestLanguagePackageImpl)registeredParametersTestLanguagePackage : new ParametersTestLanguagePackageImpl(); isInited = true; @@ -98,7 +99,6 @@ public class ParametersTestLanguagePackageImpl extends EPackageImpl implements P // Mark meta-data to indicate it can't be changed theParametersTestLanguagePackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(ParametersTestLanguagePackage.eNS_URI, theParametersTestLanguagePackage); return theParametersTestLanguagePackage; @@ -109,6 +109,7 @@ public class ParametersTestLanguagePackageImpl extends EPackageImpl implements P * * @generated */ + @Override public EClass getParserRuleParameters() { return parserRuleParametersEClass; @@ -119,6 +120,7 @@ public class ParametersTestLanguagePackageImpl extends EPackageImpl implements P * * @generated */ + @Override public EReference getParserRuleParameters_Scenario() { return (EReference)parserRuleParametersEClass.getEStructuralFeatures().get(0); @@ -129,6 +131,7 @@ public class ParametersTestLanguagePackageImpl extends EPackageImpl implements P * * @generated */ + @Override public EClass getScenario() { return scenarioEClass; @@ -139,6 +142,7 @@ public class ParametersTestLanguagePackageImpl extends EPackageImpl implements P * * @generated */ + @Override public EAttribute getScenario_First() { return (EAttribute)scenarioEClass.getEStructuralFeatures().get(0); @@ -149,6 +153,7 @@ public class ParametersTestLanguagePackageImpl extends EPackageImpl implements P * * @generated */ + @Override public EAttribute getScenario_Second() { return (EAttribute)scenarioEClass.getEStructuralFeatures().get(1); @@ -159,6 +164,7 @@ public class ParametersTestLanguagePackageImpl extends EPackageImpl implements P * * @generated */ + @Override public ParametersTestLanguageFactory getParametersTestLanguageFactory() { return (ParametersTestLanguageFactory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/parametersTestLanguage/impl/ParserRuleParametersImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/parametersTestLanguage/impl/ParserRuleParametersImpl.java index bf33a4040..ebe70c60e 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/parametersTestLanguage/impl/ParserRuleParametersImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/parametersTestLanguage/impl/ParserRuleParametersImpl.java @@ -67,6 +67,7 @@ public class ParserRuleParametersImpl extends MinimalEObjectImpl.Container imple * * @generated */ + @Override public Scenario getScenario() { return scenario; @@ -94,6 +95,7 @@ public class ParserRuleParametersImpl extends MinimalEObjectImpl.Container imple * * @generated */ + @Override public void setScenario(Scenario newScenario) { if (newScenario != scenario) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/parametersTestLanguage/impl/ScenarioImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/parametersTestLanguage/impl/ScenarioImpl.java index 7df0637e2..b81b91c51 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/parametersTestLanguage/impl/ScenarioImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/parametersTestLanguage/impl/ScenarioImpl.java @@ -95,6 +95,7 @@ public class ScenarioImpl extends MinimalEObjectImpl.Container implements Scenar * * @generated */ + @Override public String getFirst() { return first; @@ -105,6 +106,7 @@ public class ScenarioImpl extends MinimalEObjectImpl.Container implements Scenar * * @generated */ + @Override public void setFirst(String newFirst) { String oldFirst = first; @@ -118,6 +120,7 @@ public class ScenarioImpl extends MinimalEObjectImpl.Container implements Scenar * * @generated */ + @Override public String getSecond() { return second; @@ -128,6 +131,7 @@ public class ScenarioImpl extends MinimalEObjectImpl.Container implements Scenar * * @generated */ + @Override public void setSecond(String newSecond) { String oldSecond = second; @@ -222,7 +226,7 @@ public class ScenarioImpl extends MinimalEObjectImpl.Container implements Scenar { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (first: "); result.append(first); result.append(", second: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/Bug292245TestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/Bug292245TestLanguage.genmodel index c5dde0b7f..6e0d6b646 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/Bug292245TestLanguage.genmodel +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/Bug292245TestLanguage.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="Bug292245TestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> + complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/Bug297105TestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/Bug297105TestLanguage.genmodel index 3326087c5..0164ac256 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/Bug297105TestLanguage.genmodel +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/Bug297105TestLanguage.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="Bug297105TestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> + complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/Bug317840TestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/Bug317840TestLanguage.genmodel index 48ff564b6..c2461c40e 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/Bug317840TestLanguage.genmodel +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/Bug317840TestLanguage.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="Bug317840TestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> + complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/EcoreTerminalsTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/EcoreTerminalsTestLanguage.genmodel index bedfbfbf8..3043548fb 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/EcoreTerminalsTestLanguage.genmodel +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/EcoreTerminalsTestLanguage.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="EcoreTerminalsTestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> + complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.genmodel index 7f55d8367..403ab7fa2 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.genmodel +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.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="HiddenTerminalsTestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> + complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/TerminalRulesTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/TerminalRulesTestLanguage.genmodel index 14a4ad997..68c5686b7 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/TerminalRulesTestLanguage.genmodel +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/TerminalRulesTestLanguage.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="TerminalRulesTestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> + complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/UnicodeTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/UnicodeTestLanguage.genmodel index 873204a54..e4ec9a752 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/UnicodeTestLanguage.genmodel +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/UnicodeTestLanguage.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="UnicodeTestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> + complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.genmodel index afb8da608..99aa77b5c 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.genmodel +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/XtextTerminalsTestLanguage.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="XtextTerminalsTestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> + complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/bug292245TestLanguage/Model.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/bug292245TestLanguage/Model.java index 728b6eb29..b088f7982 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/bug292245TestLanguage/Model.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/bug292245TestLanguage/Model.java @@ -31,10 +31,6 @@ public interface Model extends EObject * Returns the value of the 'Fix' attribute list. * The list contents are of type {@link java.lang.String}. * - *

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

* * @return the value of the 'Fix' attribute list. * @see org.eclipse.xtext.parser.terminalrules.bug292245TestLanguage.Bug292245TestLanguagePackage#getModel_Fix() @@ -47,10 +43,6 @@ public interface Model extends EObject * Returns the value of the 'Error' attribute list. * The list contents are of type {@link java.lang.String}. * - *

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

* * @return the value of the 'Error' attribute list. * @see org.eclipse.xtext.parser.terminalrules.bug292245TestLanguage.Bug292245TestLanguagePackage#getModel_Error() @@ -63,10 +55,6 @@ public interface Model extends EObject * Returns the value of the 'Tick' attribute list. * The list contents are of type {@link java.lang.String}. * - *

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

* * @return the value of the 'Tick' attribute list. * @see org.eclipse.xtext.parser.terminalrules.bug292245TestLanguage.Bug292245TestLanguagePackage#getModel_Tick() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/bug292245TestLanguage/impl/Bug292245TestLanguageFactoryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/bug292245TestLanguage/impl/Bug292245TestLanguageFactoryImpl.java index b3ed8bb11..da197f9c3 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/bug292245TestLanguage/impl/Bug292245TestLanguageFactoryImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/bug292245TestLanguage/impl/Bug292245TestLanguageFactoryImpl.java @@ -76,6 +76,7 @@ public class Bug292245TestLanguageFactoryImpl extends EFactoryImpl implements Bu * * @generated */ + @Override public Model createModel() { ModelImpl model = new ModelImpl(); @@ -87,6 +88,7 @@ public class Bug292245TestLanguageFactoryImpl extends EFactoryImpl implements Bu * * @generated */ + @Override public Bug292245TestLanguagePackage getBug292245TestLanguagePackage() { return (Bug292245TestLanguagePackage)getEPackage(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/bug292245TestLanguage/impl/Bug292245TestLanguagePackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/bug292245TestLanguage/impl/Bug292245TestLanguagePackageImpl.java index 5f17de7ff..a56e3d7cc 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/bug292245TestLanguage/impl/Bug292245TestLanguagePackageImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/bug292245TestLanguage/impl/Bug292245TestLanguagePackageImpl.java @@ -58,7 +58,7 @@ public class Bug292245TestLanguagePackageImpl extends EPackageImpl implements Bu /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link Bug292245TestLanguagePackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -73,7 +73,8 @@ public class Bug292245TestLanguagePackageImpl extends EPackageImpl implements Bu if (isInited) return (Bug292245TestLanguagePackage)EPackage.Registry.INSTANCE.getEPackage(Bug292245TestLanguagePackage.eNS_URI); // Obtain or create and register package - Bug292245TestLanguagePackageImpl theBug292245TestLanguagePackage = (Bug292245TestLanguagePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof Bug292245TestLanguagePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new Bug292245TestLanguagePackageImpl()); + Object registeredBug292245TestLanguagePackage = EPackage.Registry.INSTANCE.get(eNS_URI); + Bug292245TestLanguagePackageImpl theBug292245TestLanguagePackage = registeredBug292245TestLanguagePackage instanceof Bug292245TestLanguagePackageImpl ? (Bug292245TestLanguagePackageImpl)registeredBug292245TestLanguagePackage : new Bug292245TestLanguagePackageImpl(); isInited = true; @@ -89,7 +90,6 @@ public class Bug292245TestLanguagePackageImpl extends EPackageImpl implements Bu // Mark meta-data to indicate it can't be changed theBug292245TestLanguagePackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(Bug292245TestLanguagePackage.eNS_URI, theBug292245TestLanguagePackage); return theBug292245TestLanguagePackage; @@ -100,6 +100,7 @@ public class Bug292245TestLanguagePackageImpl extends EPackageImpl implements Bu * * @generated */ + @Override public EClass getModel() { return modelEClass; @@ -110,6 +111,7 @@ public class Bug292245TestLanguagePackageImpl extends EPackageImpl implements Bu * * @generated */ + @Override public EAttribute getModel_Fix() { return (EAttribute)modelEClass.getEStructuralFeatures().get(0); @@ -120,6 +122,7 @@ public class Bug292245TestLanguagePackageImpl extends EPackageImpl implements Bu * * @generated */ + @Override public EAttribute getModel_Error() { return (EAttribute)modelEClass.getEStructuralFeatures().get(1); @@ -130,6 +133,7 @@ public class Bug292245TestLanguagePackageImpl extends EPackageImpl implements Bu * * @generated */ + @Override public EAttribute getModel_Tick() { return (EAttribute)modelEClass.getEStructuralFeatures().get(2); @@ -140,6 +144,7 @@ public class Bug292245TestLanguagePackageImpl extends EPackageImpl implements Bu * * @generated */ + @Override public Bug292245TestLanguageFactory getBug292245TestLanguageFactory() { return (Bug292245TestLanguageFactory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/bug292245TestLanguage/impl/ModelImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/bug292245TestLanguage/impl/ModelImpl.java index fc85acb08..c55b1c66b 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/bug292245TestLanguage/impl/ModelImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/bug292245TestLanguage/impl/ModelImpl.java @@ -89,6 +89,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public EList getFix() { if (fix == null) @@ -103,6 +104,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public EList getError() { if (error == null) @@ -117,6 +119,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public EList getTick() { if (tick == null) @@ -226,7 +229,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (fix: "); result.append(fix); result.append(", error: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/bug297105TestLanguage/Expression.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/bug297105TestLanguage/Expression.java index 6c079f374..ecd4d6bfd 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/bug297105TestLanguage/Expression.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/bug297105TestLanguage/Expression.java @@ -27,10 +27,6 @@ public interface Expression extends EObject /** * Returns the value of the 'Left' containment reference. * - *

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

* * @return the value of the 'Left' containment reference. * @see #setLeft(Literal) @@ -53,10 +49,6 @@ public interface Expression extends EObject /** * Returns the value of the 'Right' containment reference. * - *

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

* * @return the value of the 'Right' containment reference. * @see #setRight(Literal) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/bug297105TestLanguage/Literal.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/bug297105TestLanguage/Literal.java index ff302e6e2..6125b72ec 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/bug297105TestLanguage/Literal.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/bug297105TestLanguage/Literal.java @@ -26,10 +26,6 @@ public interface Literal extends EObject /** * Returns the value of the 'Value' attribute. * - *

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

* * @return the value of the 'Value' attribute. * @see #setValue(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/bug297105TestLanguage/Model.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/bug297105TestLanguage/Model.java index 8ff98e2f5..affc9fcdf 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/bug297105TestLanguage/Model.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/bug297105TestLanguage/Model.java @@ -29,10 +29,6 @@ public interface Model extends EObject * Returns the value of the 'Expressions' containment reference list. * The list contents are of type {@link org.eclipse.xtext.parser.terminalrules.bug297105TestLanguage.Expression}. * - *

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

* * @return the value of the 'Expressions' containment reference list. * @see org.eclipse.xtext.parser.terminalrules.bug297105TestLanguage.Bug297105TestLanguagePackage#getModel_Expressions() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/bug297105TestLanguage/impl/Bug297105TestLanguageFactoryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/bug297105TestLanguage/impl/Bug297105TestLanguageFactoryImpl.java index 998b11a01..8ff940e1a 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/bug297105TestLanguage/impl/Bug297105TestLanguageFactoryImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/bug297105TestLanguage/impl/Bug297105TestLanguageFactoryImpl.java @@ -80,6 +80,7 @@ public class Bug297105TestLanguageFactoryImpl extends EFactoryImpl implements Bu * * @generated */ + @Override public Model createModel() { ModelImpl model = new ModelImpl(); @@ -91,6 +92,7 @@ public class Bug297105TestLanguageFactoryImpl extends EFactoryImpl implements Bu * * @generated */ + @Override public Expression createExpression() { ExpressionImpl expression = new ExpressionImpl(); @@ -102,6 +104,7 @@ public class Bug297105TestLanguageFactoryImpl extends EFactoryImpl implements Bu * * @generated */ + @Override public Literal createLiteral() { LiteralImpl literal = new LiteralImpl(); @@ -113,6 +116,7 @@ public class Bug297105TestLanguageFactoryImpl extends EFactoryImpl implements Bu * * @generated */ + @Override public IntLiteral createIntLiteral() { IntLiteralImpl intLiteral = new IntLiteralImpl(); @@ -124,6 +128,7 @@ public class Bug297105TestLanguageFactoryImpl extends EFactoryImpl implements Bu * * @generated */ + @Override public RealLiteral createRealLiteral() { RealLiteralImpl realLiteral = new RealLiteralImpl(); @@ -135,6 +140,7 @@ public class Bug297105TestLanguageFactoryImpl extends EFactoryImpl implements Bu * * @generated */ + @Override public Bug297105TestLanguagePackage getBug297105TestLanguagePackage() { return (Bug297105TestLanguagePackage)getEPackage(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/bug297105TestLanguage/impl/Bug297105TestLanguagePackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/bug297105TestLanguage/impl/Bug297105TestLanguagePackageImpl.java index ee6b2d81d..dee36c649 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/bug297105TestLanguage/impl/Bug297105TestLanguagePackageImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/bug297105TestLanguage/impl/Bug297105TestLanguagePackageImpl.java @@ -91,7 +91,7 @@ public class Bug297105TestLanguagePackageImpl extends EPackageImpl implements Bu /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link Bug297105TestLanguagePackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -106,7 +106,8 @@ public class Bug297105TestLanguagePackageImpl extends EPackageImpl implements Bu if (isInited) return (Bug297105TestLanguagePackage)EPackage.Registry.INSTANCE.getEPackage(Bug297105TestLanguagePackage.eNS_URI); // Obtain or create and register package - Bug297105TestLanguagePackageImpl theBug297105TestLanguagePackage = (Bug297105TestLanguagePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof Bug297105TestLanguagePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new Bug297105TestLanguagePackageImpl()); + Object registeredBug297105TestLanguagePackage = EPackage.Registry.INSTANCE.get(eNS_URI); + Bug297105TestLanguagePackageImpl theBug297105TestLanguagePackage = registeredBug297105TestLanguagePackage instanceof Bug297105TestLanguagePackageImpl ? (Bug297105TestLanguagePackageImpl)registeredBug297105TestLanguagePackage : new Bug297105TestLanguagePackageImpl(); isInited = true; @@ -122,7 +123,6 @@ public class Bug297105TestLanguagePackageImpl extends EPackageImpl implements Bu // Mark meta-data to indicate it can't be changed theBug297105TestLanguagePackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(Bug297105TestLanguagePackage.eNS_URI, theBug297105TestLanguagePackage); return theBug297105TestLanguagePackage; @@ -133,6 +133,7 @@ public class Bug297105TestLanguagePackageImpl extends EPackageImpl implements Bu * * @generated */ + @Override public EClass getModel() { return modelEClass; @@ -143,6 +144,7 @@ public class Bug297105TestLanguagePackageImpl extends EPackageImpl implements Bu * * @generated */ + @Override public EReference getModel_Expressions() { return (EReference)modelEClass.getEStructuralFeatures().get(0); @@ -153,6 +155,7 @@ public class Bug297105TestLanguagePackageImpl extends EPackageImpl implements Bu * * @generated */ + @Override public EClass getExpression() { return expressionEClass; @@ -163,6 +166,7 @@ public class Bug297105TestLanguagePackageImpl extends EPackageImpl implements Bu * * @generated */ + @Override public EReference getExpression_Left() { return (EReference)expressionEClass.getEStructuralFeatures().get(0); @@ -173,6 +177,7 @@ public class Bug297105TestLanguagePackageImpl extends EPackageImpl implements Bu * * @generated */ + @Override public EReference getExpression_Right() { return (EReference)expressionEClass.getEStructuralFeatures().get(1); @@ -183,6 +188,7 @@ public class Bug297105TestLanguagePackageImpl extends EPackageImpl implements Bu * * @generated */ + @Override public EClass getLiteral() { return literalEClass; @@ -193,6 +199,7 @@ public class Bug297105TestLanguagePackageImpl extends EPackageImpl implements Bu * * @generated */ + @Override public EAttribute getLiteral_Value() { return (EAttribute)literalEClass.getEStructuralFeatures().get(0); @@ -203,6 +210,7 @@ public class Bug297105TestLanguagePackageImpl extends EPackageImpl implements Bu * * @generated */ + @Override public EClass getIntLiteral() { return intLiteralEClass; @@ -213,6 +221,7 @@ public class Bug297105TestLanguagePackageImpl extends EPackageImpl implements Bu * * @generated */ + @Override public EClass getRealLiteral() { return realLiteralEClass; @@ -223,6 +232,7 @@ public class Bug297105TestLanguagePackageImpl extends EPackageImpl implements Bu * * @generated */ + @Override public Bug297105TestLanguageFactory getBug297105TestLanguageFactory() { return (Bug297105TestLanguageFactory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/bug297105TestLanguage/impl/ExpressionImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/bug297105TestLanguage/impl/ExpressionImpl.java index 0e0759129..9984ccbbf 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/bug297105TestLanguage/impl/ExpressionImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/bug297105TestLanguage/impl/ExpressionImpl.java @@ -78,6 +78,7 @@ public class ExpressionImpl extends MinimalEObjectImpl.Container implements Expr * * @generated */ + @Override public Literal getLeft() { return left; @@ -105,6 +106,7 @@ public class ExpressionImpl extends MinimalEObjectImpl.Container implements Expr * * @generated */ + @Override public void setLeft(Literal newLeft) { if (newLeft != left) @@ -126,6 +128,7 @@ public class ExpressionImpl extends MinimalEObjectImpl.Container implements Expr * * @generated */ + @Override public Literal getRight() { return right; @@ -153,6 +156,7 @@ public class ExpressionImpl extends MinimalEObjectImpl.Container implements Expr * * @generated */ + @Override public void setRight(Literal newRight) { if (newRight != right) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/bug297105TestLanguage/impl/LiteralImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/bug297105TestLanguage/impl/LiteralImpl.java index 749f13204..5c1f8f89c 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/bug297105TestLanguage/impl/LiteralImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/bug297105TestLanguage/impl/LiteralImpl.java @@ -74,6 +74,7 @@ public class LiteralImpl extends MinimalEObjectImpl.Container implements Literal * * @generated */ + @Override public String getValue() { return value; @@ -84,6 +85,7 @@ public class LiteralImpl extends MinimalEObjectImpl.Container implements Literal * * @generated */ + @Override public void setValue(String newValue) { String oldValue = value; @@ -168,7 +170,7 @@ public class LiteralImpl extends MinimalEObjectImpl.Container implements Literal { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (value: "); result.append(value); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/bug297105TestLanguage/impl/ModelImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/bug297105TestLanguage/impl/ModelImpl.java index 3121eaf4d..07b4ec069 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/bug297105TestLanguage/impl/ModelImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/bug297105TestLanguage/impl/ModelImpl.java @@ -72,6 +72,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public EList getExpressions() { if (expressions == null) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/bug317840TestLanguage/Element.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/bug317840TestLanguage/Element.java index 73e4c620d..876f2870d 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/bug317840TestLanguage/Element.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/bug317840TestLanguage/Element.java @@ -31,10 +31,6 @@ public interface Element extends EObject /** * Returns the value of the 'First' containment reference. * - *

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

* * @return the value of the 'First' containment reference. * @see #setFirst(Named) @@ -57,10 +53,6 @@ public interface Element extends EObject /** * Returns the value of the 'Second' containment reference. * - *

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

* * @return the value of the 'Second' containment reference. * @see #setSecond(Named) @@ -84,10 +76,6 @@ public interface Element extends EObject * Returns the value of the 'Third' containment reference list. * The list contents are of type {@link org.eclipse.xtext.parser.terminalrules.bug317840TestLanguage.Named}. * - *

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

* * @return the value of the 'Third' containment reference list. * @see org.eclipse.xtext.parser.terminalrules.bug317840TestLanguage.Bug317840TestLanguagePackage#getElement_Third() @@ -100,10 +88,6 @@ public interface Element extends EObject * Returns the value of the 'Forth' containment reference list. * The list contents are of type {@link org.eclipse.xtext.parser.terminalrules.bug317840TestLanguage.Named}. * - *

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

* * @return the value of the 'Forth' containment reference list. * @see org.eclipse.xtext.parser.terminalrules.bug317840TestLanguage.Bug317840TestLanguagePackage#getElement_Forth() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/bug317840TestLanguage/Model.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/bug317840TestLanguage/Model.java index 8944c4de1..d9e4986d6 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/bug317840TestLanguage/Model.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/bug317840TestLanguage/Model.java @@ -29,10 +29,6 @@ public interface Model extends EObject * Returns the value of the 'Elements' containment reference list. * The list contents are of type {@link org.eclipse.xtext.parser.terminalrules.bug317840TestLanguage.Element}. * - *

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

* * @return the value of the 'Elements' containment reference list. * @see org.eclipse.xtext.parser.terminalrules.bug317840TestLanguage.Bug317840TestLanguagePackage#getModel_Elements() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/bug317840TestLanguage/Named.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/bug317840TestLanguage/Named.java index 5f7414ef0..98307142f 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/bug317840TestLanguage/Named.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/bug317840TestLanguage/Named.java @@ -26,10 +26,6 @@ public interface Named 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) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/bug317840TestLanguage/impl/Bug317840TestLanguageFactoryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/bug317840TestLanguage/impl/Bug317840TestLanguageFactoryImpl.java index 3f6de8eea..754bddf91 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/bug317840TestLanguage/impl/Bug317840TestLanguageFactoryImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/bug317840TestLanguage/impl/Bug317840TestLanguageFactoryImpl.java @@ -78,6 +78,7 @@ public class Bug317840TestLanguageFactoryImpl extends EFactoryImpl implements Bu * * @generated */ + @Override public Model createModel() { ModelImpl model = new ModelImpl(); @@ -89,6 +90,7 @@ public class Bug317840TestLanguageFactoryImpl extends EFactoryImpl implements Bu * * @generated */ + @Override public Element createElement() { ElementImpl element = new ElementImpl(); @@ -100,6 +102,7 @@ public class Bug317840TestLanguageFactoryImpl extends EFactoryImpl implements Bu * * @generated */ + @Override public Named createNamed() { NamedImpl named = new NamedImpl(); @@ -111,6 +114,7 @@ public class Bug317840TestLanguageFactoryImpl extends EFactoryImpl implements Bu * * @generated */ + @Override public Bug317840TestLanguagePackage getBug317840TestLanguagePackage() { return (Bug317840TestLanguagePackage)getEPackage(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/bug317840TestLanguage/impl/Bug317840TestLanguagePackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/bug317840TestLanguage/impl/Bug317840TestLanguagePackageImpl.java index 734885175..33aac4e11 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/bug317840TestLanguage/impl/Bug317840TestLanguagePackageImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/bug317840TestLanguage/impl/Bug317840TestLanguagePackageImpl.java @@ -75,7 +75,7 @@ public class Bug317840TestLanguagePackageImpl extends EPackageImpl implements Bu /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link Bug317840TestLanguagePackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -90,7 +90,8 @@ public class Bug317840TestLanguagePackageImpl extends EPackageImpl implements Bu if (isInited) return (Bug317840TestLanguagePackage)EPackage.Registry.INSTANCE.getEPackage(Bug317840TestLanguagePackage.eNS_URI); // Obtain or create and register package - Bug317840TestLanguagePackageImpl theBug317840TestLanguagePackage = (Bug317840TestLanguagePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof Bug317840TestLanguagePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new Bug317840TestLanguagePackageImpl()); + Object registeredBug317840TestLanguagePackage = EPackage.Registry.INSTANCE.get(eNS_URI); + Bug317840TestLanguagePackageImpl theBug317840TestLanguagePackage = registeredBug317840TestLanguagePackage instanceof Bug317840TestLanguagePackageImpl ? (Bug317840TestLanguagePackageImpl)registeredBug317840TestLanguagePackage : new Bug317840TestLanguagePackageImpl(); isInited = true; @@ -106,7 +107,6 @@ public class Bug317840TestLanguagePackageImpl extends EPackageImpl implements Bu // Mark meta-data to indicate it can't be changed theBug317840TestLanguagePackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(Bug317840TestLanguagePackage.eNS_URI, theBug317840TestLanguagePackage); return theBug317840TestLanguagePackage; @@ -117,6 +117,7 @@ public class Bug317840TestLanguagePackageImpl extends EPackageImpl implements Bu * * @generated */ + @Override public EClass getModel() { return modelEClass; @@ -127,6 +128,7 @@ public class Bug317840TestLanguagePackageImpl extends EPackageImpl implements Bu * * @generated */ + @Override public EReference getModel_Elements() { return (EReference)modelEClass.getEStructuralFeatures().get(0); @@ -137,6 +139,7 @@ public class Bug317840TestLanguagePackageImpl extends EPackageImpl implements Bu * * @generated */ + @Override public EClass getElement() { return elementEClass; @@ -147,6 +150,7 @@ public class Bug317840TestLanguagePackageImpl extends EPackageImpl implements Bu * * @generated */ + @Override public EReference getElement_First() { return (EReference)elementEClass.getEStructuralFeatures().get(0); @@ -157,6 +161,7 @@ public class Bug317840TestLanguagePackageImpl extends EPackageImpl implements Bu * * @generated */ + @Override public EReference getElement_Second() { return (EReference)elementEClass.getEStructuralFeatures().get(1); @@ -167,6 +172,7 @@ public class Bug317840TestLanguagePackageImpl extends EPackageImpl implements Bu * * @generated */ + @Override public EReference getElement_Third() { return (EReference)elementEClass.getEStructuralFeatures().get(2); @@ -177,6 +183,7 @@ public class Bug317840TestLanguagePackageImpl extends EPackageImpl implements Bu * * @generated */ + @Override public EReference getElement_Forth() { return (EReference)elementEClass.getEStructuralFeatures().get(3); @@ -187,6 +194,7 @@ public class Bug317840TestLanguagePackageImpl extends EPackageImpl implements Bu * * @generated */ + @Override public EClass getNamed() { return namedEClass; @@ -197,6 +205,7 @@ public class Bug317840TestLanguagePackageImpl extends EPackageImpl implements Bu * * @generated */ + @Override public EAttribute getNamed_Name() { return (EAttribute)namedEClass.getEStructuralFeatures().get(0); @@ -207,6 +216,7 @@ public class Bug317840TestLanguagePackageImpl extends EPackageImpl implements Bu * * @generated */ + @Override public Bug317840TestLanguageFactory getBug317840TestLanguageFactory() { return (Bug317840TestLanguageFactory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/bug317840TestLanguage/impl/ElementImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/bug317840TestLanguage/impl/ElementImpl.java index 7bbef6a3b..2dc9fe7b9 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/bug317840TestLanguage/impl/ElementImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/bug317840TestLanguage/impl/ElementImpl.java @@ -107,6 +107,7 @@ public class ElementImpl extends MinimalEObjectImpl.Container implements Element * * @generated */ + @Override public Named getFirst() { return first; @@ -134,6 +135,7 @@ public class ElementImpl extends MinimalEObjectImpl.Container implements Element * * @generated */ + @Override public void setFirst(Named newFirst) { if (newFirst != first) @@ -155,6 +157,7 @@ public class ElementImpl extends MinimalEObjectImpl.Container implements Element * * @generated */ + @Override public Named getSecond() { return second; @@ -182,6 +185,7 @@ public class ElementImpl extends MinimalEObjectImpl.Container implements Element * * @generated */ + @Override public void setSecond(Named newSecond) { if (newSecond != second) @@ -203,6 +207,7 @@ public class ElementImpl extends MinimalEObjectImpl.Container implements Element * * @generated */ + @Override public EList getThird() { if (third == null) @@ -217,6 +222,7 @@ public class ElementImpl extends MinimalEObjectImpl.Container implements Element * * @generated */ + @Override public EList getForth() { if (forth == null) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/bug317840TestLanguage/impl/ModelImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/bug317840TestLanguage/impl/ModelImpl.java index f49b14fa6..5970f1c1f 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/bug317840TestLanguage/impl/ModelImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/bug317840TestLanguage/impl/ModelImpl.java @@ -72,6 +72,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public EList getElements() { if (elements == null) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/bug317840TestLanguage/impl/NamedImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/bug317840TestLanguage/impl/NamedImpl.java index 0c9a60f0f..f9dd9eca9 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/bug317840TestLanguage/impl/NamedImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/bug317840TestLanguage/impl/NamedImpl.java @@ -74,6 +74,7 @@ public class NamedImpl extends MinimalEObjectImpl.Container implements Named * * @generated */ + @Override public String getName() { return name; @@ -84,6 +85,7 @@ public class NamedImpl extends MinimalEObjectImpl.Container implements Named * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -168,7 +170,7 @@ public class NamedImpl extends MinimalEObjectImpl.Container implements Named { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/ecoreTerminalsTestLanguage/Model.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/ecoreTerminalsTestLanguage/Model.java index 2b4a5abf2..9418f14f9 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/ecoreTerminalsTestLanguage/Model.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/ecoreTerminalsTestLanguage/Model.java @@ -33,10 +33,6 @@ public interface Model extends EObject * Returns the value of the 'Int Values' attribute list. * The list contents are of type {@link java.lang.Integer}. * - *

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

* * @return the value of the 'Int Values' attribute list. * @see org.eclipse.xtext.parser.terminalrules.ecoreTerminalsTestLanguage.EcoreTerminalsTestLanguagePackage#getModel_IntValues() @@ -49,10 +45,6 @@ public interface Model extends EObject * Returns the value of the 'Double Values' attribute list. * The list contents are of type {@link java.lang.Double}. * - *

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

* * @return the value of the 'Double Values' attribute list. * @see org.eclipse.xtext.parser.terminalrules.ecoreTerminalsTestLanguage.EcoreTerminalsTestLanguagePackage#getModel_DoubleValues() @@ -65,10 +57,6 @@ public interface Model extends EObject * Returns the value of the 'Date Values' attribute list. * The list contents are of type {@link java.util.Date}. * - *

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

* * @return the value of the 'Date Values' attribute list. * @see org.eclipse.xtext.parser.terminalrules.ecoreTerminalsTestLanguage.EcoreTerminalsTestLanguagePackage#getModel_DateValues() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/ecoreTerminalsTestLanguage/impl/EcoreTerminalsTestLanguageFactoryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/ecoreTerminalsTestLanguage/impl/EcoreTerminalsTestLanguageFactoryImpl.java index 55510f3b3..ee6f265df 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/ecoreTerminalsTestLanguage/impl/EcoreTerminalsTestLanguageFactoryImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/ecoreTerminalsTestLanguage/impl/EcoreTerminalsTestLanguageFactoryImpl.java @@ -76,6 +76,7 @@ public class EcoreTerminalsTestLanguageFactoryImpl extends EFactoryImpl implemen * * @generated */ + @Override public Model createModel() { ModelImpl model = new ModelImpl(); @@ -87,6 +88,7 @@ public class EcoreTerminalsTestLanguageFactoryImpl extends EFactoryImpl implemen * * @generated */ + @Override public EcoreTerminalsTestLanguagePackage getEcoreTerminalsTestLanguagePackage() { return (EcoreTerminalsTestLanguagePackage)getEPackage(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/ecoreTerminalsTestLanguage/impl/EcoreTerminalsTestLanguagePackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/ecoreTerminalsTestLanguage/impl/EcoreTerminalsTestLanguagePackageImpl.java index a57a3119b..7b963019e 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/ecoreTerminalsTestLanguage/impl/EcoreTerminalsTestLanguagePackageImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/ecoreTerminalsTestLanguage/impl/EcoreTerminalsTestLanguagePackageImpl.java @@ -58,7 +58,7 @@ public class EcoreTerminalsTestLanguagePackageImpl extends EPackageImpl implemen /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link EcoreTerminalsTestLanguagePackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -73,7 +73,8 @@ public class EcoreTerminalsTestLanguagePackageImpl extends EPackageImpl implemen if (isInited) return (EcoreTerminalsTestLanguagePackage)EPackage.Registry.INSTANCE.getEPackage(EcoreTerminalsTestLanguagePackage.eNS_URI); // Obtain or create and register package - EcoreTerminalsTestLanguagePackageImpl theEcoreTerminalsTestLanguagePackage = (EcoreTerminalsTestLanguagePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof EcoreTerminalsTestLanguagePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new EcoreTerminalsTestLanguagePackageImpl()); + Object registeredEcoreTerminalsTestLanguagePackage = EPackage.Registry.INSTANCE.get(eNS_URI); + EcoreTerminalsTestLanguagePackageImpl theEcoreTerminalsTestLanguagePackage = registeredEcoreTerminalsTestLanguagePackage instanceof EcoreTerminalsTestLanguagePackageImpl ? (EcoreTerminalsTestLanguagePackageImpl)registeredEcoreTerminalsTestLanguagePackage : new EcoreTerminalsTestLanguagePackageImpl(); isInited = true; @@ -89,7 +90,6 @@ public class EcoreTerminalsTestLanguagePackageImpl extends EPackageImpl implemen // Mark meta-data to indicate it can't be changed theEcoreTerminalsTestLanguagePackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(EcoreTerminalsTestLanguagePackage.eNS_URI, theEcoreTerminalsTestLanguagePackage); return theEcoreTerminalsTestLanguagePackage; @@ -100,6 +100,7 @@ public class EcoreTerminalsTestLanguagePackageImpl extends EPackageImpl implemen * * @generated */ + @Override public EClass getModel() { return modelEClass; @@ -110,6 +111,7 @@ public class EcoreTerminalsTestLanguagePackageImpl extends EPackageImpl implemen * * @generated */ + @Override public EAttribute getModel_IntValues() { return (EAttribute)modelEClass.getEStructuralFeatures().get(0); @@ -120,6 +122,7 @@ public class EcoreTerminalsTestLanguagePackageImpl extends EPackageImpl implemen * * @generated */ + @Override public EAttribute getModel_DoubleValues() { return (EAttribute)modelEClass.getEStructuralFeatures().get(1); @@ -130,6 +133,7 @@ public class EcoreTerminalsTestLanguagePackageImpl extends EPackageImpl implemen * * @generated */ + @Override public EAttribute getModel_DateValues() { return (EAttribute)modelEClass.getEStructuralFeatures().get(2); @@ -140,6 +144,7 @@ public class EcoreTerminalsTestLanguagePackageImpl extends EPackageImpl implemen * * @generated */ + @Override public EcoreTerminalsTestLanguageFactory getEcoreTerminalsTestLanguageFactory() { return (EcoreTerminalsTestLanguageFactory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/ecoreTerminalsTestLanguage/impl/ModelImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/ecoreTerminalsTestLanguage/impl/ModelImpl.java index 036407660..0f96c711d 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/ecoreTerminalsTestLanguage/impl/ModelImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/ecoreTerminalsTestLanguage/impl/ModelImpl.java @@ -90,6 +90,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public EList getIntValues() { if (intValues == null) @@ -104,6 +105,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public EList getDoubleValues() { if (doubleValues == null) @@ -118,6 +120,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public EList getDateValues() { if (dateValues == null) @@ -227,7 +230,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (intValues: "); result.append(intValues); result.append(", doubleValues: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/hiddenTerminalsTestLanguage/HidingHiddens.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/hiddenTerminalsTestLanguage/HidingHiddens.java index 7968c0321..cf6e0bf3f 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/hiddenTerminalsTestLanguage/HidingHiddens.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/hiddenTerminalsTestLanguage/HidingHiddens.java @@ -27,10 +27,6 @@ public interface HidingHiddens extends EObject /** * Returns the value of the 'Space' attribute. * - *

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

* * @return the value of the 'Space' attribute. * @see #setSpace(String) @@ -53,10 +49,6 @@ public interface HidingHiddens extends EObject /** * Returns the value of the 'Called' containment reference. * - *

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

* * @return the value of the 'Called' containment reference. * @see #setCalled(InheritingHiddensCall) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/hiddenTerminalsTestLanguage/InheritingHiddens.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/hiddenTerminalsTestLanguage/InheritingHiddens.java index 538e06fd7..ba8749639 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/hiddenTerminalsTestLanguage/InheritingHiddens.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/hiddenTerminalsTestLanguage/InheritingHiddens.java @@ -26,10 +26,6 @@ public interface InheritingHiddens extends Model /** * Returns the value of the 'Called' containment reference. * - *

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

* * @return the value of the 'Called' containment reference. * @see #setCalled(InheritingHiddensCall) @@ -52,10 +48,6 @@ public interface InheritingHiddens extends Model /** * Returns the value of the 'Hiding Called' containment reference. * - *

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

* * @return the value of the 'Hiding Called' containment reference. * @see #setHidingCalled(HidingHiddens) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/hiddenTerminalsTestLanguage/InheritingHiddensCall.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/hiddenTerminalsTestLanguage/InheritingHiddensCall.java index a0fd1adf8..5e58e14de 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/hiddenTerminalsTestLanguage/InheritingHiddensCall.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/hiddenTerminalsTestLanguage/InheritingHiddensCall.java @@ -26,10 +26,6 @@ public interface InheritingHiddensCall extends EObject /** * Returns the value of the 'Valid' attribute. * - *

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

* * @return the value of the 'Valid' attribute. * @see #setValid(boolean) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/hiddenTerminalsTestLanguage/Model.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/hiddenTerminalsTestLanguage/Model.java index dd593aaae..dbe11fe7e 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/hiddenTerminalsTestLanguage/Model.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/hiddenTerminalsTestLanguage/Model.java @@ -26,10 +26,6 @@ public interface Model extends EObject /** * Returns the value of the 'Valid' attribute. * - *

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

* * @return the value of the 'Valid' attribute. * @see #setValid(boolean) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/hiddenTerminalsTestLanguage/OverridingHiddens.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/hiddenTerminalsTestLanguage/OverridingHiddens.java index d369e0f87..a557d0ade 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/hiddenTerminalsTestLanguage/OverridingHiddens.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/hiddenTerminalsTestLanguage/OverridingHiddens.java @@ -25,10 +25,6 @@ public interface OverridingHiddens extends Model /** * Returns the value of the 'Called' containment reference. * - *

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

* * @return the value of the 'Called' containment reference. * @see #setCalled(OverridingHiddensCall) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/hiddenTerminalsTestLanguage/OverridingHiddensCall.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/hiddenTerminalsTestLanguage/OverridingHiddensCall.java index f551a0136..e2180a4ed 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/hiddenTerminalsTestLanguage/OverridingHiddensCall.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/hiddenTerminalsTestLanguage/OverridingHiddensCall.java @@ -30,10 +30,6 @@ public interface OverridingHiddensCall extends EObject * Returns the value of the 'Spaces' attribute list. * The list contents are of type {@link java.lang.String}. * - *

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

* * @return the value of the 'Spaces' attribute list. * @see org.eclipse.xtext.parser.terminalrules.hiddenTerminalsTestLanguage.HiddenTerminalsTestLanguagePackage#getOverridingHiddensCall_Spaces() @@ -45,10 +41,6 @@ public interface OverridingHiddensCall extends EObject /** * Returns the value of the 'Valid' attribute. * - *

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

* * @return the value of the 'Valid' attribute. * @see #setValid(boolean) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/hiddenTerminalsTestLanguage/WithoutHiddens.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/hiddenTerminalsTestLanguage/WithoutHiddens.java index 30c60c7a2..3f43704bc 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/hiddenTerminalsTestLanguage/WithoutHiddens.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/hiddenTerminalsTestLanguage/WithoutHiddens.java @@ -27,10 +27,6 @@ public interface WithoutHiddens extends Model * Returns the value of the 'Spaces' attribute list. * The list contents are of type {@link java.lang.String}. * - *

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

* * @return the value of the 'Spaces' attribute list. * @see org.eclipse.xtext.parser.terminalrules.hiddenTerminalsTestLanguage.HiddenTerminalsTestLanguagePackage#getWithoutHiddens_Spaces() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/hiddenTerminalsTestLanguage/impl/HiddenTerminalsTestLanguageFactoryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/hiddenTerminalsTestLanguage/impl/HiddenTerminalsTestLanguageFactoryImpl.java index 20e12d185..68b7dc716 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/hiddenTerminalsTestLanguage/impl/HiddenTerminalsTestLanguageFactoryImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/hiddenTerminalsTestLanguage/impl/HiddenTerminalsTestLanguageFactoryImpl.java @@ -84,6 +84,7 @@ public class HiddenTerminalsTestLanguageFactoryImpl extends EFactoryImpl impleme * * @generated */ + @Override public Model createModel() { ModelImpl model = new ModelImpl(); @@ -95,6 +96,7 @@ public class HiddenTerminalsTestLanguageFactoryImpl extends EFactoryImpl impleme * * @generated */ + @Override public WithoutHiddens createWithoutHiddens() { WithoutHiddensImpl withoutHiddens = new WithoutHiddensImpl(); @@ -106,6 +108,7 @@ public class HiddenTerminalsTestLanguageFactoryImpl extends EFactoryImpl impleme * * @generated */ + @Override public WithHiddens createWithHiddens() { WithHiddensImpl withHiddens = new WithHiddensImpl(); @@ -117,6 +120,7 @@ public class HiddenTerminalsTestLanguageFactoryImpl extends EFactoryImpl impleme * * @generated */ + @Override public OverridingHiddens createOverridingHiddens() { OverridingHiddensImpl overridingHiddens = new OverridingHiddensImpl(); @@ -128,6 +132,7 @@ public class HiddenTerminalsTestLanguageFactoryImpl extends EFactoryImpl impleme * * @generated */ + @Override public OverridingHiddensCall createOverridingHiddensCall() { OverridingHiddensCallImpl overridingHiddensCall = new OverridingHiddensCallImpl(); @@ -139,6 +144,7 @@ public class HiddenTerminalsTestLanguageFactoryImpl extends EFactoryImpl impleme * * @generated */ + @Override public InheritingHiddens createInheritingHiddens() { InheritingHiddensImpl inheritingHiddens = new InheritingHiddensImpl(); @@ -150,6 +156,7 @@ public class HiddenTerminalsTestLanguageFactoryImpl extends EFactoryImpl impleme * * @generated */ + @Override public DatatypeHiddens createDatatypeHiddens() { DatatypeHiddensImpl datatypeHiddens = new DatatypeHiddensImpl(); @@ -161,6 +168,7 @@ public class HiddenTerminalsTestLanguageFactoryImpl extends EFactoryImpl impleme * * @generated */ + @Override public HidingHiddens createHidingHiddens() { HidingHiddensImpl hidingHiddens = new HidingHiddensImpl(); @@ -172,6 +180,7 @@ public class HiddenTerminalsTestLanguageFactoryImpl extends EFactoryImpl impleme * * @generated */ + @Override public InheritingHiddensCall createInheritingHiddensCall() { InheritingHiddensCallImpl inheritingHiddensCall = new InheritingHiddensCallImpl(); @@ -183,6 +192,7 @@ public class HiddenTerminalsTestLanguageFactoryImpl extends EFactoryImpl impleme * * @generated */ + @Override public HiddenTerminalsTestLanguagePackage getHiddenTerminalsTestLanguagePackage() { return (HiddenTerminalsTestLanguagePackage)getEPackage(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/hiddenTerminalsTestLanguage/impl/HiddenTerminalsTestLanguagePackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/hiddenTerminalsTestLanguage/impl/HiddenTerminalsTestLanguagePackageImpl.java index 2b7bd9b7c..f96cae58e 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/hiddenTerminalsTestLanguage/impl/HiddenTerminalsTestLanguagePackageImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/hiddenTerminalsTestLanguage/impl/HiddenTerminalsTestLanguagePackageImpl.java @@ -123,7 +123,7 @@ public class HiddenTerminalsTestLanguagePackageImpl extends EPackageImpl impleme /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link HiddenTerminalsTestLanguagePackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -138,7 +138,8 @@ public class HiddenTerminalsTestLanguagePackageImpl extends EPackageImpl impleme if (isInited) return (HiddenTerminalsTestLanguagePackage)EPackage.Registry.INSTANCE.getEPackage(HiddenTerminalsTestLanguagePackage.eNS_URI); // Obtain or create and register package - HiddenTerminalsTestLanguagePackageImpl theHiddenTerminalsTestLanguagePackage = (HiddenTerminalsTestLanguagePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof HiddenTerminalsTestLanguagePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new HiddenTerminalsTestLanguagePackageImpl()); + Object registeredHiddenTerminalsTestLanguagePackage = EPackage.Registry.INSTANCE.get(eNS_URI); + HiddenTerminalsTestLanguagePackageImpl theHiddenTerminalsTestLanguagePackage = registeredHiddenTerminalsTestLanguagePackage instanceof HiddenTerminalsTestLanguagePackageImpl ? (HiddenTerminalsTestLanguagePackageImpl)registeredHiddenTerminalsTestLanguagePackage : new HiddenTerminalsTestLanguagePackageImpl(); isInited = true; @@ -154,7 +155,6 @@ public class HiddenTerminalsTestLanguagePackageImpl extends EPackageImpl impleme // Mark meta-data to indicate it can't be changed theHiddenTerminalsTestLanguagePackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(HiddenTerminalsTestLanguagePackage.eNS_URI, theHiddenTerminalsTestLanguagePackage); return theHiddenTerminalsTestLanguagePackage; @@ -165,6 +165,7 @@ public class HiddenTerminalsTestLanguagePackageImpl extends EPackageImpl impleme * * @generated */ + @Override public EClass getModel() { return modelEClass; @@ -175,6 +176,7 @@ public class HiddenTerminalsTestLanguagePackageImpl extends EPackageImpl impleme * * @generated */ + @Override public EAttribute getModel_Valid() { return (EAttribute)modelEClass.getEStructuralFeatures().get(0); @@ -185,6 +187,7 @@ public class HiddenTerminalsTestLanguagePackageImpl extends EPackageImpl impleme * * @generated */ + @Override public EClass getWithoutHiddens() { return withoutHiddensEClass; @@ -195,6 +198,7 @@ public class HiddenTerminalsTestLanguagePackageImpl extends EPackageImpl impleme * * @generated */ + @Override public EAttribute getWithoutHiddens_Spaces() { return (EAttribute)withoutHiddensEClass.getEStructuralFeatures().get(0); @@ -205,6 +209,7 @@ public class HiddenTerminalsTestLanguagePackageImpl extends EPackageImpl impleme * * @generated */ + @Override public EClass getWithHiddens() { return withHiddensEClass; @@ -215,6 +220,7 @@ public class HiddenTerminalsTestLanguagePackageImpl extends EPackageImpl impleme * * @generated */ + @Override public EClass getOverridingHiddens() { return overridingHiddensEClass; @@ -225,6 +231,7 @@ public class HiddenTerminalsTestLanguagePackageImpl extends EPackageImpl impleme * * @generated */ + @Override public EReference getOverridingHiddens_Called() { return (EReference)overridingHiddensEClass.getEStructuralFeatures().get(0); @@ -235,6 +242,7 @@ public class HiddenTerminalsTestLanguagePackageImpl extends EPackageImpl impleme * * @generated */ + @Override public EClass getOverridingHiddensCall() { return overridingHiddensCallEClass; @@ -245,6 +253,7 @@ public class HiddenTerminalsTestLanguagePackageImpl extends EPackageImpl impleme * * @generated */ + @Override public EAttribute getOverridingHiddensCall_Spaces() { return (EAttribute)overridingHiddensCallEClass.getEStructuralFeatures().get(0); @@ -255,6 +264,7 @@ public class HiddenTerminalsTestLanguagePackageImpl extends EPackageImpl impleme * * @generated */ + @Override public EAttribute getOverridingHiddensCall_Valid() { return (EAttribute)overridingHiddensCallEClass.getEStructuralFeatures().get(1); @@ -265,6 +275,7 @@ public class HiddenTerminalsTestLanguagePackageImpl extends EPackageImpl impleme * * @generated */ + @Override public EClass getInheritingHiddens() { return inheritingHiddensEClass; @@ -275,6 +286,7 @@ public class HiddenTerminalsTestLanguagePackageImpl extends EPackageImpl impleme * * @generated */ + @Override public EReference getInheritingHiddens_Called() { return (EReference)inheritingHiddensEClass.getEStructuralFeatures().get(0); @@ -285,6 +297,7 @@ public class HiddenTerminalsTestLanguagePackageImpl extends EPackageImpl impleme * * @generated */ + @Override public EReference getInheritingHiddens_HidingCalled() { return (EReference)inheritingHiddensEClass.getEStructuralFeatures().get(1); @@ -295,6 +308,7 @@ public class HiddenTerminalsTestLanguagePackageImpl extends EPackageImpl impleme * * @generated */ + @Override public EClass getDatatypeHiddens() { return datatypeHiddensEClass; @@ -305,6 +319,7 @@ public class HiddenTerminalsTestLanguagePackageImpl extends EPackageImpl impleme * * @generated */ + @Override public EClass getHidingHiddens() { return hidingHiddensEClass; @@ -315,6 +330,7 @@ public class HiddenTerminalsTestLanguagePackageImpl extends EPackageImpl impleme * * @generated */ + @Override public EAttribute getHidingHiddens_Space() { return (EAttribute)hidingHiddensEClass.getEStructuralFeatures().get(0); @@ -325,6 +341,7 @@ public class HiddenTerminalsTestLanguagePackageImpl extends EPackageImpl impleme * * @generated */ + @Override public EReference getHidingHiddens_Called() { return (EReference)hidingHiddensEClass.getEStructuralFeatures().get(1); @@ -335,6 +352,7 @@ public class HiddenTerminalsTestLanguagePackageImpl extends EPackageImpl impleme * * @generated */ + @Override public EClass getInheritingHiddensCall() { return inheritingHiddensCallEClass; @@ -345,6 +363,7 @@ public class HiddenTerminalsTestLanguagePackageImpl extends EPackageImpl impleme * * @generated */ + @Override public EAttribute getInheritingHiddensCall_Valid() { return (EAttribute)inheritingHiddensCallEClass.getEStructuralFeatures().get(0); @@ -355,6 +374,7 @@ public class HiddenTerminalsTestLanguagePackageImpl extends EPackageImpl impleme * * @generated */ + @Override public HiddenTerminalsTestLanguageFactory getHiddenTerminalsTestLanguageFactory() { return (HiddenTerminalsTestLanguageFactory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/hiddenTerminalsTestLanguage/impl/HidingHiddensImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/hiddenTerminalsTestLanguage/impl/HidingHiddensImpl.java index 5432428f9..b4c2bae64 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/hiddenTerminalsTestLanguage/impl/HidingHiddensImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/hiddenTerminalsTestLanguage/impl/HidingHiddensImpl.java @@ -88,6 +88,7 @@ public class HidingHiddensImpl extends MinimalEObjectImpl.Container implements H * * @generated */ + @Override public String getSpace() { return space; @@ -98,6 +99,7 @@ public class HidingHiddensImpl extends MinimalEObjectImpl.Container implements H * * @generated */ + @Override public void setSpace(String newSpace) { String oldSpace = space; @@ -111,6 +113,7 @@ public class HidingHiddensImpl extends MinimalEObjectImpl.Container implements H * * @generated */ + @Override public InheritingHiddensCall getCalled() { return called; @@ -138,6 +141,7 @@ public class HidingHiddensImpl extends MinimalEObjectImpl.Container implements H * * @generated */ + @Override public void setCalled(InheritingHiddensCall newCalled) { if (newCalled != called) @@ -256,7 +260,7 @@ public class HidingHiddensImpl extends MinimalEObjectImpl.Container implements H { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (space: "); result.append(space); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/hiddenTerminalsTestLanguage/impl/InheritingHiddensCallImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/hiddenTerminalsTestLanguage/impl/InheritingHiddensCallImpl.java index 85ce75ced..df8dacdb1 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/hiddenTerminalsTestLanguage/impl/InheritingHiddensCallImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/hiddenTerminalsTestLanguage/impl/InheritingHiddensCallImpl.java @@ -74,6 +74,7 @@ public class InheritingHiddensCallImpl extends MinimalEObjectImpl.Container impl * * @generated */ + @Override public boolean isValid() { return valid; @@ -84,6 +85,7 @@ public class InheritingHiddensCallImpl extends MinimalEObjectImpl.Container impl * * @generated */ + @Override public void setValid(boolean newValid) { boolean oldValid = valid; @@ -168,7 +170,7 @@ public class InheritingHiddensCallImpl extends MinimalEObjectImpl.Container impl { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (valid: "); result.append(valid); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/hiddenTerminalsTestLanguage/impl/InheritingHiddensImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/hiddenTerminalsTestLanguage/impl/InheritingHiddensImpl.java index 14108d062..e0a18d565 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/hiddenTerminalsTestLanguage/impl/InheritingHiddensImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/hiddenTerminalsTestLanguage/impl/InheritingHiddensImpl.java @@ -78,6 +78,7 @@ public class InheritingHiddensImpl extends ModelImpl implements InheritingHidden * * @generated */ + @Override public InheritingHiddensCall getCalled() { return called; @@ -105,6 +106,7 @@ public class InheritingHiddensImpl extends ModelImpl implements InheritingHidden * * @generated */ + @Override public void setCalled(InheritingHiddensCall newCalled) { if (newCalled != called) @@ -126,6 +128,7 @@ public class InheritingHiddensImpl extends ModelImpl implements InheritingHidden * * @generated */ + @Override public HidingHiddens getHidingCalled() { return hidingCalled; @@ -153,6 +156,7 @@ public class InheritingHiddensImpl extends ModelImpl implements InheritingHidden * * @generated */ + @Override public void setHidingCalled(HidingHiddens newHidingCalled) { if (newHidingCalled != hidingCalled) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/hiddenTerminalsTestLanguage/impl/ModelImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/hiddenTerminalsTestLanguage/impl/ModelImpl.java index 175495af4..40d581f79 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/hiddenTerminalsTestLanguage/impl/ModelImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/hiddenTerminalsTestLanguage/impl/ModelImpl.java @@ -74,6 +74,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public boolean isValid() { return valid; @@ -84,6 +85,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setValid(boolean newValid) { boolean oldValid = valid; @@ -168,7 +170,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (valid: "); result.append(valid); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/hiddenTerminalsTestLanguage/impl/OverridingHiddensCallImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/hiddenTerminalsTestLanguage/impl/OverridingHiddensCallImpl.java index b477884b0..9afaada42 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/hiddenTerminalsTestLanguage/impl/OverridingHiddensCallImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/hiddenTerminalsTestLanguage/impl/OverridingHiddensCallImpl.java @@ -91,6 +91,7 @@ public class OverridingHiddensCallImpl extends MinimalEObjectImpl.Container impl * * @generated */ + @Override public EList getSpaces() { if (spaces == null) @@ -105,6 +106,7 @@ public class OverridingHiddensCallImpl extends MinimalEObjectImpl.Container impl * * @generated */ + @Override public boolean isValid() { return valid; @@ -115,6 +117,7 @@ public class OverridingHiddensCallImpl extends MinimalEObjectImpl.Container impl * * @generated */ + @Override public void setValid(boolean newValid) { boolean oldValid = valid; @@ -211,7 +214,7 @@ public class OverridingHiddensCallImpl extends MinimalEObjectImpl.Container impl { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (spaces: "); result.append(spaces); result.append(", valid: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/hiddenTerminalsTestLanguage/impl/OverridingHiddensImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/hiddenTerminalsTestLanguage/impl/OverridingHiddensImpl.java index b52546fe5..a2e0f86c7 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/hiddenTerminalsTestLanguage/impl/OverridingHiddensImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/hiddenTerminalsTestLanguage/impl/OverridingHiddensImpl.java @@ -66,6 +66,7 @@ public class OverridingHiddensImpl extends ModelImpl implements OverridingHidden * * @generated */ + @Override public OverridingHiddensCall getCalled() { return called; @@ -93,6 +94,7 @@ public class OverridingHiddensImpl extends ModelImpl implements OverridingHidden * * @generated */ + @Override public void setCalled(OverridingHiddensCall newCalled) { if (newCalled != called) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/hiddenTerminalsTestLanguage/impl/WithoutHiddensImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/hiddenTerminalsTestLanguage/impl/WithoutHiddensImpl.java index a1d370add..1aff43a57 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/hiddenTerminalsTestLanguage/impl/WithoutHiddensImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/hiddenTerminalsTestLanguage/impl/WithoutHiddensImpl.java @@ -65,6 +65,7 @@ public class WithoutHiddensImpl extends ModelImpl implements WithoutHiddens * * @generated */ + @Override public EList getSpaces() { if (spaces == null) @@ -152,7 +153,7 @@ public class WithoutHiddensImpl extends ModelImpl implements WithoutHiddens { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (spaces: "); result.append(spaces); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/terminalRulesTestLanguage/Model.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/terminalRulesTestLanguage/Model.java index f2afb8d17..c9c83c003 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/terminalRulesTestLanguage/Model.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/terminalRulesTestLanguage/Model.java @@ -33,10 +33,6 @@ public interface Model extends EObject /** * Returns the value of the 'Id Value' attribute. * - *

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

* * @return the value of the 'Id Value' attribute. * @see #setIdValue(String) @@ -59,10 +55,6 @@ public interface Model extends EObject /** * Returns the value of the 'Int Value' attribute. * - *

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

* * @return the value of the 'Int Value' attribute. * @see #setIntValue(String) @@ -85,10 +77,6 @@ public interface Model extends EObject /** * Returns the value of the 'String Value' attribute. * - *

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

* * @return the value of the 'String Value' attribute. * @see #setStringValue(String) @@ -111,10 +99,6 @@ public interface Model extends EObject /** * Returns the value of the 'Rich String Value' attribute. * - *

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

* * @return the value of the 'Rich String Value' attribute. * @see #setRichStringValue(String) @@ -137,10 +121,6 @@ public interface Model extends EObject /** * Returns the value of the 'Ml Comment Value' attribute. * - *

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

* * @return the value of the 'Ml Comment Value' attribute. * @see #setMlCommentValue(String) @@ -163,10 +143,6 @@ public interface Model extends EObject /** * Returns the value of the 'Sl Comment Value' attribute. * - *

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

* * @return the value of the 'Sl Comment Value' attribute. * @see #setSlCommentValue(String) @@ -189,10 +165,6 @@ public interface Model extends EObject /** * Returns the value of the 'Ws Value' attribute. * - *

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

* * @return the value of the 'Ws Value' attribute. * @see #setWsValue(String) @@ -215,10 +187,6 @@ public interface Model extends EObject /** * Returns the value of the 'Any Value' attribute. * - *

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

* * @return the value of the 'Any Value' attribute. * @see #setAnyValue(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/terminalRulesTestLanguage/impl/ModelImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/terminalRulesTestLanguage/impl/ModelImpl.java index 626175e37..0551c83e0 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/terminalRulesTestLanguage/impl/ModelImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/terminalRulesTestLanguage/impl/ModelImpl.java @@ -221,6 +221,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public String getIdValue() { return idValue; @@ -231,6 +232,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setIdValue(String newIdValue) { String oldIdValue = idValue; @@ -244,6 +246,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public String getIntValue() { return intValue; @@ -254,6 +257,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setIntValue(String newIntValue) { String oldIntValue = intValue; @@ -267,6 +271,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public String getStringValue() { return stringValue; @@ -277,6 +282,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setStringValue(String newStringValue) { String oldStringValue = stringValue; @@ -290,6 +296,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public String getRichStringValue() { return richStringValue; @@ -300,6 +307,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setRichStringValue(String newRichStringValue) { String oldRichStringValue = richStringValue; @@ -313,6 +321,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public String getMlCommentValue() { return mlCommentValue; @@ -323,6 +332,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setMlCommentValue(String newMlCommentValue) { String oldMlCommentValue = mlCommentValue; @@ -336,6 +346,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public String getSlCommentValue() { return slCommentValue; @@ -346,6 +357,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setSlCommentValue(String newSlCommentValue) { String oldSlCommentValue = slCommentValue; @@ -359,6 +371,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public String getWsValue() { return wsValue; @@ -369,6 +382,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setWsValue(String newWsValue) { String oldWsValue = wsValue; @@ -382,6 +396,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public String getAnyValue() { return anyValue; @@ -392,6 +407,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setAnyValue(String newAnyValue) { String oldAnyValue = anyValue; @@ -546,7 +562,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (idValue: "); result.append(idValue); result.append(", intValue: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/terminalRulesTestLanguage/impl/TerminalRulesTestLanguageFactoryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/terminalRulesTestLanguage/impl/TerminalRulesTestLanguageFactoryImpl.java index b943e60f5..497ebcec1 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/terminalRulesTestLanguage/impl/TerminalRulesTestLanguageFactoryImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/terminalRulesTestLanguage/impl/TerminalRulesTestLanguageFactoryImpl.java @@ -76,6 +76,7 @@ public class TerminalRulesTestLanguageFactoryImpl extends EFactoryImpl implement * * @generated */ + @Override public Model createModel() { ModelImpl model = new ModelImpl(); @@ -87,6 +88,7 @@ public class TerminalRulesTestLanguageFactoryImpl extends EFactoryImpl implement * * @generated */ + @Override public TerminalRulesTestLanguagePackage getTerminalRulesTestLanguagePackage() { return (TerminalRulesTestLanguagePackage)getEPackage(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/terminalRulesTestLanguage/impl/TerminalRulesTestLanguagePackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/terminalRulesTestLanguage/impl/TerminalRulesTestLanguagePackageImpl.java index 18a68123f..48a3e2519 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/terminalRulesTestLanguage/impl/TerminalRulesTestLanguagePackageImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/terminalRulesTestLanguage/impl/TerminalRulesTestLanguagePackageImpl.java @@ -58,7 +58,7 @@ public class TerminalRulesTestLanguagePackageImpl extends EPackageImpl implement /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link TerminalRulesTestLanguagePackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -73,7 +73,8 @@ public class TerminalRulesTestLanguagePackageImpl extends EPackageImpl implement if (isInited) return (TerminalRulesTestLanguagePackage)EPackage.Registry.INSTANCE.getEPackage(TerminalRulesTestLanguagePackage.eNS_URI); // Obtain or create and register package - TerminalRulesTestLanguagePackageImpl theTerminalRulesTestLanguagePackage = (TerminalRulesTestLanguagePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof TerminalRulesTestLanguagePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new TerminalRulesTestLanguagePackageImpl()); + Object registeredTerminalRulesTestLanguagePackage = EPackage.Registry.INSTANCE.get(eNS_URI); + TerminalRulesTestLanguagePackageImpl theTerminalRulesTestLanguagePackage = registeredTerminalRulesTestLanguagePackage instanceof TerminalRulesTestLanguagePackageImpl ? (TerminalRulesTestLanguagePackageImpl)registeredTerminalRulesTestLanguagePackage : new TerminalRulesTestLanguagePackageImpl(); isInited = true; @@ -89,7 +90,6 @@ public class TerminalRulesTestLanguagePackageImpl extends EPackageImpl implement // Mark meta-data to indicate it can't be changed theTerminalRulesTestLanguagePackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(TerminalRulesTestLanguagePackage.eNS_URI, theTerminalRulesTestLanguagePackage); return theTerminalRulesTestLanguagePackage; @@ -100,6 +100,7 @@ public class TerminalRulesTestLanguagePackageImpl extends EPackageImpl implement * * @generated */ + @Override public EClass getModel() { return modelEClass; @@ -110,6 +111,7 @@ public class TerminalRulesTestLanguagePackageImpl extends EPackageImpl implement * * @generated */ + @Override public EAttribute getModel_IdValue() { return (EAttribute)modelEClass.getEStructuralFeatures().get(0); @@ -120,6 +122,7 @@ public class TerminalRulesTestLanguagePackageImpl extends EPackageImpl implement * * @generated */ + @Override public EAttribute getModel_IntValue() { return (EAttribute)modelEClass.getEStructuralFeatures().get(1); @@ -130,6 +133,7 @@ public class TerminalRulesTestLanguagePackageImpl extends EPackageImpl implement * * @generated */ + @Override public EAttribute getModel_StringValue() { return (EAttribute)modelEClass.getEStructuralFeatures().get(2); @@ -140,6 +144,7 @@ public class TerminalRulesTestLanguagePackageImpl extends EPackageImpl implement * * @generated */ + @Override public EAttribute getModel_RichStringValue() { return (EAttribute)modelEClass.getEStructuralFeatures().get(3); @@ -150,6 +155,7 @@ public class TerminalRulesTestLanguagePackageImpl extends EPackageImpl implement * * @generated */ + @Override public EAttribute getModel_MlCommentValue() { return (EAttribute)modelEClass.getEStructuralFeatures().get(4); @@ -160,6 +166,7 @@ public class TerminalRulesTestLanguagePackageImpl extends EPackageImpl implement * * @generated */ + @Override public EAttribute getModel_SlCommentValue() { return (EAttribute)modelEClass.getEStructuralFeatures().get(5); @@ -170,6 +177,7 @@ public class TerminalRulesTestLanguagePackageImpl extends EPackageImpl implement * * @generated */ + @Override public EAttribute getModel_WsValue() { return (EAttribute)modelEClass.getEStructuralFeatures().get(6); @@ -180,6 +188,7 @@ public class TerminalRulesTestLanguagePackageImpl extends EPackageImpl implement * * @generated */ + @Override public EAttribute getModel_AnyValue() { return (EAttribute)modelEClass.getEStructuralFeatures().get(7); @@ -190,6 +199,7 @@ public class TerminalRulesTestLanguagePackageImpl extends EPackageImpl implement * * @generated */ + @Override public TerminalRulesTestLanguageFactory getTerminalRulesTestLanguageFactory() { return (TerminalRulesTestLanguageFactory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/unicode/AbstractString.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/unicode/AbstractString.java index 470941f32..2ff473118 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/unicode/AbstractString.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/unicode/AbstractString.java @@ -26,10 +26,6 @@ public interface AbstractString 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) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/unicode/Model.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/unicode/Model.java index a7493cd3b..6202e8270 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/unicode/Model.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/unicode/Model.java @@ -29,10 +29,6 @@ public interface Model extends EObject * Returns the value of the 'Strings' containment reference list. * The list contents are of type {@link org.eclipse.xtext.parser.terminalrules.unicode.AbstractString}. * - *

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

* * @return the value of the 'Strings' containment reference list. * @see org.eclipse.xtext.parser.terminalrules.unicode.UnicodePackage#getModel_Strings() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/unicode/impl/AbstractStringImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/unicode/impl/AbstractStringImpl.java index 596b78822..035023230 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/unicode/impl/AbstractStringImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/unicode/impl/AbstractStringImpl.java @@ -74,6 +74,7 @@ public class AbstractStringImpl extends MinimalEObjectImpl.Container implements * * @generated */ + @Override public String getName() { return name; @@ -84,6 +85,7 @@ public class AbstractStringImpl extends MinimalEObjectImpl.Container implements * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -168,7 +170,7 @@ public class AbstractStringImpl extends MinimalEObjectImpl.Container implements { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/unicode/impl/ModelImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/unicode/impl/ModelImpl.java index 554da13a0..184f249bf 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/unicode/impl/ModelImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/unicode/impl/ModelImpl.java @@ -72,6 +72,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public EList getStrings() { if (strings == null) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/unicode/impl/UnicodeFactoryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/unicode/impl/UnicodeFactoryImpl.java index d2ba47ade..07f47a08a 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/unicode/impl/UnicodeFactoryImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/unicode/impl/UnicodeFactoryImpl.java @@ -79,6 +79,7 @@ public class UnicodeFactoryImpl extends EFactoryImpl implements UnicodeFactory * * @generated */ + @Override public Model createModel() { ModelImpl model = new ModelImpl(); @@ -90,6 +91,7 @@ public class UnicodeFactoryImpl extends EFactoryImpl implements UnicodeFactory * * @generated */ + @Override public AbstractString createAbstractString() { AbstractStringImpl abstractString = new AbstractStringImpl(); @@ -101,6 +103,7 @@ public class UnicodeFactoryImpl extends EFactoryImpl implements UnicodeFactory * * @generated */ + @Override public GString createGString() { GStringImpl gString = new GStringImpl(); @@ -112,6 +115,7 @@ public class UnicodeFactoryImpl extends EFactoryImpl implements UnicodeFactory * * @generated */ + @Override public QuotedString createQuotedString() { QuotedStringImpl quotedString = new QuotedStringImpl(); @@ -123,6 +127,7 @@ public class UnicodeFactoryImpl extends EFactoryImpl implements UnicodeFactory * * @generated */ + @Override public UnicodePackage getUnicodePackage() { return (UnicodePackage)getEPackage(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/unicode/impl/UnicodePackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/unicode/impl/UnicodePackageImpl.java index b242bc229..ef463c87f 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/unicode/impl/UnicodePackageImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/unicode/impl/UnicodePackageImpl.java @@ -83,7 +83,7 @@ public class UnicodePackageImpl extends EPackageImpl implements UnicodePackage /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link UnicodePackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -98,7 +98,8 @@ public class UnicodePackageImpl extends EPackageImpl implements UnicodePackage if (isInited) return (UnicodePackage)EPackage.Registry.INSTANCE.getEPackage(UnicodePackage.eNS_URI); // Obtain or create and register package - UnicodePackageImpl theUnicodePackage = (UnicodePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof UnicodePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new UnicodePackageImpl()); + Object registeredUnicodePackage = EPackage.Registry.INSTANCE.get(eNS_URI); + UnicodePackageImpl theUnicodePackage = registeredUnicodePackage instanceof UnicodePackageImpl ? (UnicodePackageImpl)registeredUnicodePackage : new UnicodePackageImpl(); isInited = true; @@ -114,7 +115,6 @@ public class UnicodePackageImpl extends EPackageImpl implements UnicodePackage // Mark meta-data to indicate it can't be changed theUnicodePackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(UnicodePackage.eNS_URI, theUnicodePackage); return theUnicodePackage; @@ -125,6 +125,7 @@ public class UnicodePackageImpl extends EPackageImpl implements UnicodePackage * * @generated */ + @Override public EClass getModel() { return modelEClass; @@ -135,6 +136,7 @@ public class UnicodePackageImpl extends EPackageImpl implements UnicodePackage * * @generated */ + @Override public EReference getModel_Strings() { return (EReference)modelEClass.getEStructuralFeatures().get(0); @@ -145,6 +147,7 @@ public class UnicodePackageImpl extends EPackageImpl implements UnicodePackage * * @generated */ + @Override public EClass getAbstractString() { return abstractStringEClass; @@ -155,6 +158,7 @@ public class UnicodePackageImpl extends EPackageImpl implements UnicodePackage * * @generated */ + @Override public EAttribute getAbstractString_Name() { return (EAttribute)abstractStringEClass.getEStructuralFeatures().get(0); @@ -165,6 +169,7 @@ public class UnicodePackageImpl extends EPackageImpl implements UnicodePackage * * @generated */ + @Override public EClass getGString() { return gStringEClass; @@ -175,6 +180,7 @@ public class UnicodePackageImpl extends EPackageImpl implements UnicodePackage * * @generated */ + @Override public EClass getQuotedString() { return quotedStringEClass; @@ -185,6 +191,7 @@ public class UnicodePackageImpl extends EPackageImpl implements UnicodePackage * * @generated */ + @Override public UnicodeFactory getUnicodeFactory() { return (UnicodeFactory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/AbstractElement.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/AbstractElement.java index 78c6b3d87..2d66498cd 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/AbstractElement.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/AbstractElement.java @@ -26,10 +26,6 @@ public interface AbstractElement extends EObject /** * Returns the value of the 'Cardinality' attribute. * - *

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

* * @return the value of the 'Cardinality' attribute. * @see #setCardinality(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/AbstractMetamodelDeclaration.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/AbstractMetamodelDeclaration.java index 1928fc727..6e65d41d9 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/AbstractMetamodelDeclaration.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/AbstractMetamodelDeclaration.java @@ -28,10 +28,6 @@ public interface AbstractMetamodelDeclaration extends EObject /** * Returns the value of the 'EPackage' reference. * - *

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

* * @return the value of the 'EPackage' reference. * @see #setEPackage(EPackage) @@ -54,10 +50,6 @@ public interface AbstractMetamodelDeclaration extends EObject /** * Returns the value of the 'Alias' attribute. * - *

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

* * @return the value of the 'Alias' attribute. * @see #setAlias(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/AbstractNegatedToken.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/AbstractNegatedToken.java index 8cb98a632..313e3eb2a 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/AbstractNegatedToken.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/AbstractNegatedToken.java @@ -25,10 +25,6 @@ public interface AbstractNegatedToken extends AbstractElement /** * Returns the value of the 'Terminal' containment reference. * - *

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

* * @return the value of the 'Terminal' containment reference. * @see #setTerminal(AbstractElement) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/AbstractRule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/AbstractRule.java index 7e3822a2c..e2beb1c8c 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/AbstractRule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/AbstractRule.java @@ -28,10 +28,6 @@ public interface AbstractRule 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) @@ -54,10 +50,6 @@ public interface AbstractRule extends EObject /** * Returns the value of the 'Type' containment reference. * - *

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

* * @return the value of the 'Type' containment reference. * @see #setType(TypeRef) @@ -80,10 +72,6 @@ public interface AbstractRule extends EObject /** * Returns the value of the 'Alternatives' containment reference. * - *

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

* * @return the value of the 'Alternatives' containment reference. * @see #setAlternatives(AbstractElement) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/Action.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/Action.java index bd96d7577..9bd8162d7 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/Action.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/Action.java @@ -27,10 +27,6 @@ public interface Action extends AbstractElement /** * Returns the value of the 'Type' containment reference. * - *

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

* * @return the value of the 'Type' containment reference. * @see #setType(TypeRef) @@ -53,10 +49,6 @@ public interface Action extends AbstractElement /** * Returns the value of the 'Feature' attribute. * - *

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

* * @return the value of the 'Feature' attribute. * @see #setFeature(String) @@ -79,10 +71,6 @@ public interface Action extends AbstractElement /** * Returns the value of the 'Operator' attribute. * - *

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

* * @return the value of the 'Operator' attribute. * @see #setOperator(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/Alternatives.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/Alternatives.java index a2723859e..3a6fdc364 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/Alternatives.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/Alternatives.java @@ -27,10 +27,6 @@ public interface Alternatives extends AbstractElement * Returns the value of the 'Groups' containment reference list. * The list contents are of type {@link org.eclipse.xtext.parser.terminalrules.xtextTerminalsTestLanguage.AbstractElement}. * - *

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

* * @return the value of the 'Groups' containment reference list. * @see org.eclipse.xtext.parser.terminalrules.xtextTerminalsTestLanguage.XtextTerminalsTestLanguagePackage#getAlternatives_Groups() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/Assignment.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/Assignment.java index 4a97d043d..96bd1972a 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/Assignment.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/Assignment.java @@ -27,10 +27,6 @@ public interface Assignment extends AbstractElement /** * Returns the value of the 'Feature' attribute. * - *

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

* * @return the value of the 'Feature' attribute. * @see #setFeature(String) @@ -53,10 +49,6 @@ public interface Assignment extends AbstractElement /** * Returns the value of the 'Operator' attribute. * - *

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

* * @return the value of the 'Operator' attribute. * @see #setOperator(String) @@ -79,10 +71,6 @@ public interface Assignment extends AbstractElement /** * Returns the value of the 'Terminal' containment reference. * - *

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

* * @return the value of the 'Terminal' containment reference. * @see #setTerminal(AbstractElement) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/CharacterRange.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/CharacterRange.java index 398dcbb7d..52fbf6da2 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/CharacterRange.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/CharacterRange.java @@ -26,10 +26,6 @@ public interface CharacterRange extends AbstractElement /** * Returns the value of the 'Left' containment reference. * - *

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

* * @return the value of the 'Left' containment reference. * @see #setLeft(Keyword) @@ -52,10 +48,6 @@ public interface CharacterRange extends AbstractElement /** * Returns the value of the 'Right' containment reference. * - *

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

* * @return the value of the 'Right' containment reference. * @see #setRight(Keyword) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/CrossReference.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/CrossReference.java index d01c49b66..ad379098d 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/CrossReference.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/CrossReference.java @@ -26,10 +26,6 @@ public interface CrossReference extends AbstractElement /** * Returns the value of the 'Type' containment reference. * - *

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

* * @return the value of the 'Type' containment reference. * @see #setType(TypeRef) @@ -52,10 +48,6 @@ public interface CrossReference extends AbstractElement /** * Returns the value of the 'Terminal' containment reference. * - *

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

* * @return the value of the 'Terminal' containment reference. * @see #setTerminal(AbstractElement) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/EnumLiteralDeclaration.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/EnumLiteralDeclaration.java index a5a50ed14..b784acb92 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/EnumLiteralDeclaration.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/EnumLiteralDeclaration.java @@ -27,10 +27,6 @@ public interface EnumLiteralDeclaration extends AbstractElement /** * Returns the value of the 'Enum Literal' reference. * - *

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

* * @return the value of the 'Enum Literal' reference. * @see #setEnumLiteral(EEnumLiteral) @@ -53,10 +49,6 @@ public interface EnumLiteralDeclaration extends AbstractElement /** * Returns the value of the 'Literal' containment reference. * - *

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

* * @return the value of the 'Literal' containment reference. * @see #setLiteral(Keyword) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/GeneratedMetamodel.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/GeneratedMetamodel.java index f559e15e5..1a6de7925 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/GeneratedMetamodel.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/GeneratedMetamodel.java @@ -25,10 +25,6 @@ public interface GeneratedMetamodel extends AbstractMetamodelDeclaration /** * 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) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/Grammar.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/Grammar.java index fa61921f5..a340f7cce 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/Grammar.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/Grammar.java @@ -33,10 +33,6 @@ public interface Grammar 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) @@ -60,10 +56,6 @@ public interface Grammar extends EObject * Returns the value of the 'Used Grammars' reference list. * The list contents are of type {@link org.eclipse.xtext.parser.terminalrules.xtextTerminalsTestLanguage.Grammar}. * - *

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

* * @return the value of the 'Used Grammars' reference list. * @see org.eclipse.xtext.parser.terminalrules.xtextTerminalsTestLanguage.XtextTerminalsTestLanguagePackage#getGrammar_UsedGrammars() @@ -75,10 +67,6 @@ public interface Grammar extends EObject /** * Returns the value of the 'Defines Hidden Tokens' attribute. * - *

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

* * @return the value of the 'Defines Hidden Tokens' attribute. * @see #setDefinesHiddenTokens(boolean) @@ -102,10 +90,6 @@ public interface Grammar extends EObject * Returns the value of the 'Hidden Tokens' reference list. * The list contents are of type {@link org.eclipse.xtext.parser.terminalrules.xtextTerminalsTestLanguage.AbstractRule}. * - *

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

* * @return the value of the 'Hidden Tokens' reference list. * @see org.eclipse.xtext.parser.terminalrules.xtextTerminalsTestLanguage.XtextTerminalsTestLanguagePackage#getGrammar_HiddenTokens() @@ -118,10 +102,6 @@ public interface Grammar extends EObject * Returns the value of the 'Metamodel Declarations' containment reference list. * The list contents are of type {@link org.eclipse.xtext.parser.terminalrules.xtextTerminalsTestLanguage.AbstractMetamodelDeclaration}. * - *

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

* * @return the value of the 'Metamodel Declarations' containment reference list. * @see org.eclipse.xtext.parser.terminalrules.xtextTerminalsTestLanguage.XtextTerminalsTestLanguagePackage#getGrammar_MetamodelDeclarations() @@ -134,10 +114,6 @@ public interface Grammar extends EObject * Returns the value of the 'Rules' containment reference list. * The list contents are of type {@link org.eclipse.xtext.parser.terminalrules.xtextTerminalsTestLanguage.AbstractRule}. * - *

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

* * @return the value of the 'Rules' containment reference list. * @see org.eclipse.xtext.parser.terminalrules.xtextTerminalsTestLanguage.XtextTerminalsTestLanguagePackage#getGrammar_Rules() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/Group.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/Group.java index 8f4d703b9..11a888315 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/Group.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/Group.java @@ -27,10 +27,6 @@ public interface Group extends AbstractElement * Returns the value of the 'Tokens' containment reference list. * The list contents are of type {@link org.eclipse.xtext.parser.terminalrules.xtextTerminalsTestLanguage.AbstractElement}. * - *

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

* * @return the value of the 'Tokens' containment reference list. * @see org.eclipse.xtext.parser.terminalrules.xtextTerminalsTestLanguage.XtextTerminalsTestLanguagePackage#getGroup_Tokens() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/Keyword.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/Keyword.java index 53599f1f1..5b7af9473 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/Keyword.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/Keyword.java @@ -25,10 +25,6 @@ public interface Keyword extends AbstractElement /** * Returns the value of the 'Value' attribute. * - *

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

* * @return the value of the 'Value' attribute. * @see #setValue(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/ParserRule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/ParserRule.java index 37912212b..341b3f419 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/ParserRule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/ParserRule.java @@ -27,10 +27,6 @@ public interface ParserRule extends AbstractRule /** * Returns the value of the 'Defines Hidden Tokens' attribute. * - *

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

* * @return the value of the 'Defines Hidden Tokens' attribute. * @see #setDefinesHiddenTokens(boolean) @@ -54,10 +50,6 @@ public interface ParserRule extends AbstractRule * Returns the value of the 'Hidden Tokens' reference list. * The list contents are of type {@link org.eclipse.xtext.parser.terminalrules.xtextTerminalsTestLanguage.AbstractRule}. * - *

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

* * @return the value of the 'Hidden Tokens' reference list. * @see org.eclipse.xtext.parser.terminalrules.xtextTerminalsTestLanguage.XtextTerminalsTestLanguagePackage#getParserRule_HiddenTokens() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/RuleCall.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/RuleCall.java index e36834731..e28ce6af1 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/RuleCall.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/RuleCall.java @@ -25,10 +25,6 @@ public interface RuleCall extends AbstractElement /** * Returns the value of the 'Rule' reference. * - *

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

* * @return the value of the 'Rule' reference. * @see #setRule(AbstractRule) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/TypeRef.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/TypeRef.java index 5a828f272..8e4fd9c57 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/TypeRef.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/TypeRef.java @@ -28,10 +28,6 @@ public interface TypeRef extends EObject /** * Returns the value of the 'Metamodel' reference. * - *

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

* * @return the value of the 'Metamodel' reference. * @see #setMetamodel(AbstractMetamodelDeclaration) @@ -54,10 +50,6 @@ public interface TypeRef extends EObject /** * Returns the value of the 'Classifier' reference. * - *

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

* * @return the value of the 'Classifier' reference. * @see #setClassifier(EClassifier) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/impl/AbstractElementImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/impl/AbstractElementImpl.java index 2f3e9ee5d..86f1b613c 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/impl/AbstractElementImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/impl/AbstractElementImpl.java @@ -74,6 +74,7 @@ public class AbstractElementImpl extends MinimalEObjectImpl.Container implements * * @generated */ + @Override public String getCardinality() { return cardinality; @@ -84,6 +85,7 @@ public class AbstractElementImpl extends MinimalEObjectImpl.Container implements * * @generated */ + @Override public void setCardinality(String newCardinality) { String oldCardinality = cardinality; @@ -168,7 +170,7 @@ public class AbstractElementImpl extends MinimalEObjectImpl.Container implements { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (cardinality: "); result.append(cardinality); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/impl/AbstractMetamodelDeclarationImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/impl/AbstractMetamodelDeclarationImpl.java index db1dc1b68..9a576b9e8 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/impl/AbstractMetamodelDeclarationImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/impl/AbstractMetamodelDeclarationImpl.java @@ -87,6 +87,7 @@ public class AbstractMetamodelDeclarationImpl extends MinimalEObjectImpl.Contain * * @generated */ + @Override public EPackage getEPackage() { if (ePackage != null && ePackage.eIsProxy()) @@ -117,6 +118,7 @@ public class AbstractMetamodelDeclarationImpl extends MinimalEObjectImpl.Contain * * @generated */ + @Override public void setEPackage(EPackage newEPackage) { EPackage oldEPackage = ePackage; @@ -130,6 +132,7 @@ public class AbstractMetamodelDeclarationImpl extends MinimalEObjectImpl.Contain * * @generated */ + @Override public String getAlias() { return alias; @@ -140,6 +143,7 @@ public class AbstractMetamodelDeclarationImpl extends MinimalEObjectImpl.Contain * * @generated */ + @Override public void setAlias(String newAlias) { String oldAlias = alias; @@ -235,7 +239,7 @@ public class AbstractMetamodelDeclarationImpl extends MinimalEObjectImpl.Contain { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (alias: "); result.append(alias); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/impl/AbstractNegatedTokenImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/impl/AbstractNegatedTokenImpl.java index 930a6565c..0456943e7 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/impl/AbstractNegatedTokenImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/impl/AbstractNegatedTokenImpl.java @@ -66,6 +66,7 @@ public class AbstractNegatedTokenImpl extends AbstractElementImpl implements Abs * * @generated */ + @Override public AbstractElement getTerminal() { return terminal; @@ -93,6 +94,7 @@ public class AbstractNegatedTokenImpl extends AbstractElementImpl implements Abs * * @generated */ + @Override public void setTerminal(AbstractElement newTerminal) { if (newTerminal != terminal) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/impl/AbstractRuleImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/impl/AbstractRuleImpl.java index c6693aa8b..ae83a9ffe 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/impl/AbstractRuleImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/impl/AbstractRuleImpl.java @@ -100,6 +100,7 @@ public class AbstractRuleImpl extends MinimalEObjectImpl.Container implements Ab * * @generated */ + @Override public String getName() { return name; @@ -110,6 +111,7 @@ public class AbstractRuleImpl extends MinimalEObjectImpl.Container implements Ab * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -123,6 +125,7 @@ public class AbstractRuleImpl extends MinimalEObjectImpl.Container implements Ab * * @generated */ + @Override public TypeRef getType() { return type; @@ -150,6 +153,7 @@ public class AbstractRuleImpl extends MinimalEObjectImpl.Container implements Ab * * @generated */ + @Override public void setType(TypeRef newType) { if (newType != type) @@ -171,6 +175,7 @@ public class AbstractRuleImpl extends MinimalEObjectImpl.Container implements Ab * * @generated */ + @Override public AbstractElement getAlternatives() { return alternatives; @@ -198,6 +203,7 @@ public class AbstractRuleImpl extends MinimalEObjectImpl.Container implements Ab * * @generated */ + @Override public void setAlternatives(AbstractElement newAlternatives) { if (newAlternatives != alternatives) @@ -328,7 +334,7 @@ public class AbstractRuleImpl extends MinimalEObjectImpl.Container implements Ab { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/impl/ActionImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/impl/ActionImpl.java index ffd87645e..8c2f323d3 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/impl/ActionImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/impl/ActionImpl.java @@ -108,6 +108,7 @@ public class ActionImpl extends AbstractElementImpl implements Action * * @generated */ + @Override public TypeRef getType() { return type; @@ -135,6 +136,7 @@ public class ActionImpl extends AbstractElementImpl implements Action * * @generated */ + @Override public void setType(TypeRef newType) { if (newType != type) @@ -156,6 +158,7 @@ public class ActionImpl extends AbstractElementImpl implements Action * * @generated */ + @Override public String getFeature() { return feature; @@ -166,6 +169,7 @@ public class ActionImpl extends AbstractElementImpl implements Action * * @generated */ + @Override public void setFeature(String newFeature) { String oldFeature = feature; @@ -179,6 +183,7 @@ public class ActionImpl extends AbstractElementImpl implements Action * * @generated */ + @Override public String getOperator() { return operator; @@ -189,6 +194,7 @@ public class ActionImpl extends AbstractElementImpl implements Action * * @generated */ + @Override public void setOperator(String newOperator) { String oldOperator = operator; @@ -309,7 +315,7 @@ public class ActionImpl extends AbstractElementImpl implements Action { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (feature: "); result.append(feature); result.append(", operator: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/impl/AlternativesImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/impl/AlternativesImpl.java index 67b57ff8a..09fcbe994 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/impl/AlternativesImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/impl/AlternativesImpl.java @@ -70,6 +70,7 @@ public class AlternativesImpl extends AbstractElementImpl implements Alternative * * @generated */ + @Override public EList getGroups() { if (groups == null) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/impl/AssignmentImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/impl/AssignmentImpl.java index 065760d4f..7f0233e6b 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/impl/AssignmentImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/impl/AssignmentImpl.java @@ -108,6 +108,7 @@ public class AssignmentImpl extends AbstractElementImpl implements Assignment * * @generated */ + @Override public String getFeature() { return feature; @@ -118,6 +119,7 @@ public class AssignmentImpl extends AbstractElementImpl implements Assignment * * @generated */ + @Override public void setFeature(String newFeature) { String oldFeature = feature; @@ -131,6 +133,7 @@ public class AssignmentImpl extends AbstractElementImpl implements Assignment * * @generated */ + @Override public String getOperator() { return operator; @@ -141,6 +144,7 @@ public class AssignmentImpl extends AbstractElementImpl implements Assignment * * @generated */ + @Override public void setOperator(String newOperator) { String oldOperator = operator; @@ -154,6 +158,7 @@ public class AssignmentImpl extends AbstractElementImpl implements Assignment * * @generated */ + @Override public AbstractElement getTerminal() { return terminal; @@ -181,6 +186,7 @@ public class AssignmentImpl extends AbstractElementImpl implements Assignment * * @generated */ + @Override public void setTerminal(AbstractElement newTerminal) { if (newTerminal != terminal) @@ -309,7 +315,7 @@ public class AssignmentImpl extends AbstractElementImpl implements Assignment { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (feature: "); result.append(feature); result.append(", operator: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/impl/CharacterRangeImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/impl/CharacterRangeImpl.java index e04d89601..16f16958e 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/impl/CharacterRangeImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/impl/CharacterRangeImpl.java @@ -77,6 +77,7 @@ public class CharacterRangeImpl extends AbstractElementImpl implements Character * * @generated */ + @Override public Keyword getLeft() { return left; @@ -104,6 +105,7 @@ public class CharacterRangeImpl extends AbstractElementImpl implements Character * * @generated */ + @Override public void setLeft(Keyword newLeft) { if (newLeft != left) @@ -125,6 +127,7 @@ public class CharacterRangeImpl extends AbstractElementImpl implements Character * * @generated */ + @Override public Keyword getRight() { return right; @@ -152,6 +155,7 @@ public class CharacterRangeImpl extends AbstractElementImpl implements Character * * @generated */ + @Override public void setRight(Keyword newRight) { if (newRight != right) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/impl/CrossReferenceImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/impl/CrossReferenceImpl.java index b5bf74b33..20f277372 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/impl/CrossReferenceImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/impl/CrossReferenceImpl.java @@ -78,6 +78,7 @@ public class CrossReferenceImpl extends AbstractElementImpl implements CrossRefe * * @generated */ + @Override public TypeRef getType() { return type; @@ -105,6 +106,7 @@ public class CrossReferenceImpl extends AbstractElementImpl implements CrossRefe * * @generated */ + @Override public void setType(TypeRef newType) { if (newType != type) @@ -126,6 +128,7 @@ public class CrossReferenceImpl extends AbstractElementImpl implements CrossRefe * * @generated */ + @Override public AbstractElement getTerminal() { return terminal; @@ -153,6 +156,7 @@ public class CrossReferenceImpl extends AbstractElementImpl implements CrossRefe * * @generated */ + @Override public void setTerminal(AbstractElement newTerminal) { if (newTerminal != terminal) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/impl/EnumLiteralDeclarationImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/impl/EnumLiteralDeclarationImpl.java index a8fce99cb..88c8a27b0 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/impl/EnumLiteralDeclarationImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/impl/EnumLiteralDeclarationImpl.java @@ -78,6 +78,7 @@ public class EnumLiteralDeclarationImpl extends AbstractElementImpl implements E * * @generated */ + @Override public EEnumLiteral getEnumLiteral() { if (enumLiteral != null && enumLiteral.eIsProxy()) @@ -108,6 +109,7 @@ public class EnumLiteralDeclarationImpl extends AbstractElementImpl implements E * * @generated */ + @Override public void setEnumLiteral(EEnumLiteral newEnumLiteral) { EEnumLiteral oldEnumLiteral = enumLiteral; @@ -121,6 +123,7 @@ public class EnumLiteralDeclarationImpl extends AbstractElementImpl implements E * * @generated */ + @Override public Keyword getLiteral() { return literal; @@ -148,6 +151,7 @@ public class EnumLiteralDeclarationImpl extends AbstractElementImpl implements E * * @generated */ + @Override public void setLiteral(Keyword newLiteral) { if (newLiteral != literal) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/impl/GeneratedMetamodelImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/impl/GeneratedMetamodelImpl.java index 73785d57a..fca6ae269 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/impl/GeneratedMetamodelImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/impl/GeneratedMetamodelImpl.java @@ -73,6 +73,7 @@ public class GeneratedMetamodelImpl extends AbstractMetamodelDeclarationImpl imp * * @generated */ + @Override public String getName() { return name; @@ -83,6 +84,7 @@ public class GeneratedMetamodelImpl extends AbstractMetamodelDeclarationImpl imp * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -167,7 +169,7 @@ public class GeneratedMetamodelImpl extends AbstractMetamodelDeclarationImpl imp { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/impl/GrammarImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/impl/GrammarImpl.java index 9b2414f2e..9a59e62a7 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/impl/GrammarImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/impl/GrammarImpl.java @@ -151,6 +151,7 @@ public class GrammarImpl extends MinimalEObjectImpl.Container implements Grammar * * @generated */ + @Override public String getName() { return name; @@ -161,6 +162,7 @@ public class GrammarImpl extends MinimalEObjectImpl.Container implements Grammar * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -174,6 +176,7 @@ public class GrammarImpl extends MinimalEObjectImpl.Container implements Grammar * * @generated */ + @Override public EList getUsedGrammars() { if (usedGrammars == null) @@ -188,6 +191,7 @@ public class GrammarImpl extends MinimalEObjectImpl.Container implements Grammar * * @generated */ + @Override public boolean isDefinesHiddenTokens() { return definesHiddenTokens; @@ -198,6 +202,7 @@ public class GrammarImpl extends MinimalEObjectImpl.Container implements Grammar * * @generated */ + @Override public void setDefinesHiddenTokens(boolean newDefinesHiddenTokens) { boolean oldDefinesHiddenTokens = definesHiddenTokens; @@ -211,6 +216,7 @@ public class GrammarImpl extends MinimalEObjectImpl.Container implements Grammar * * @generated */ + @Override public EList getHiddenTokens() { if (hiddenTokens == null) @@ -225,6 +231,7 @@ public class GrammarImpl extends MinimalEObjectImpl.Container implements Grammar * * @generated */ + @Override public EList getMetamodelDeclarations() { if (metamodelDeclarations == null) @@ -239,6 +246,7 @@ public class GrammarImpl extends MinimalEObjectImpl.Container implements Grammar * * @generated */ + @Override public EList getRules() { if (rules == null) @@ -397,7 +405,7 @@ public class GrammarImpl extends MinimalEObjectImpl.Container implements Grammar { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(", definesHiddenTokens: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/impl/GroupImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/impl/GroupImpl.java index 15e365ea7..172227c93 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/impl/GroupImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/impl/GroupImpl.java @@ -70,6 +70,7 @@ public class GroupImpl extends AbstractElementImpl implements Group * * @generated */ + @Override public EList getTokens() { if (tokens == null) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/impl/KeywordImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/impl/KeywordImpl.java index 750d4530a..0b2d21ce4 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/impl/KeywordImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/impl/KeywordImpl.java @@ -73,6 +73,7 @@ public class KeywordImpl extends AbstractElementImpl implements Keyword * * @generated */ + @Override public String getValue() { return value; @@ -83,6 +84,7 @@ public class KeywordImpl extends AbstractElementImpl implements Keyword * * @generated */ + @Override public void setValue(String newValue) { String oldValue = value; @@ -167,7 +169,7 @@ public class KeywordImpl extends AbstractElementImpl implements Keyword { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (value: "); result.append(value); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/impl/ParserRuleImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/impl/ParserRuleImpl.java index 9f31ffcf6..57975e0c2 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/impl/ParserRuleImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/impl/ParserRuleImpl.java @@ -91,6 +91,7 @@ public class ParserRuleImpl extends AbstractRuleImpl implements ParserRule * * @generated */ + @Override public boolean isDefinesHiddenTokens() { return definesHiddenTokens; @@ -101,6 +102,7 @@ public class ParserRuleImpl extends AbstractRuleImpl implements ParserRule * * @generated */ + @Override public void setDefinesHiddenTokens(boolean newDefinesHiddenTokens) { boolean oldDefinesHiddenTokens = definesHiddenTokens; @@ -114,6 +116,7 @@ public class ParserRuleImpl extends AbstractRuleImpl implements ParserRule * * @generated */ + @Override public EList getHiddenTokens() { if (hiddenTokens == null) @@ -211,7 +214,7 @@ public class ParserRuleImpl extends AbstractRuleImpl implements ParserRule { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (definesHiddenTokens: "); result.append(definesHiddenTokens); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/impl/RuleCallImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/impl/RuleCallImpl.java index 860dd8f2a..ff8cc5ffb 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/impl/RuleCallImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/impl/RuleCallImpl.java @@ -65,6 +65,7 @@ public class RuleCallImpl extends AbstractElementImpl implements RuleCall * * @generated */ + @Override public AbstractRule getRule() { if (rule != null && rule.eIsProxy()) @@ -95,6 +96,7 @@ public class RuleCallImpl extends AbstractElementImpl implements RuleCall * * @generated */ + @Override public void setRule(AbstractRule newRule) { AbstractRule oldRule = rule; diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/impl/TypeRefImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/impl/TypeRefImpl.java index 08dab635e..7bf2df7dd 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/impl/TypeRefImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/impl/TypeRefImpl.java @@ -78,6 +78,7 @@ public class TypeRefImpl extends MinimalEObjectImpl.Container implements TypeRef * * @generated */ + @Override public AbstractMetamodelDeclaration getMetamodel() { if (metamodel != null && metamodel.eIsProxy()) @@ -108,6 +109,7 @@ public class TypeRefImpl extends MinimalEObjectImpl.Container implements TypeRef * * @generated */ + @Override public void setMetamodel(AbstractMetamodelDeclaration newMetamodel) { AbstractMetamodelDeclaration oldMetamodel = metamodel; @@ -121,6 +123,7 @@ public class TypeRefImpl extends MinimalEObjectImpl.Container implements TypeRef * * @generated */ + @Override public EClassifier getClassifier() { if (classifier != null && classifier.eIsProxy()) @@ -151,6 +154,7 @@ public class TypeRefImpl extends MinimalEObjectImpl.Container implements TypeRef * * @generated */ + @Override public void setClassifier(EClassifier newClassifier) { EClassifier oldClassifier = classifier; diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/impl/XtextTerminalsTestLanguageFactoryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/impl/XtextTerminalsTestLanguageFactoryImpl.java index 05e88e352..9d688e125 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/impl/XtextTerminalsTestLanguageFactoryImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/impl/XtextTerminalsTestLanguageFactoryImpl.java @@ -98,6 +98,7 @@ public class XtextTerminalsTestLanguageFactoryImpl extends EFactoryImpl implemen * * @generated */ + @Override public Grammar createGrammar() { GrammarImpl grammar = new GrammarImpl(); @@ -109,6 +110,7 @@ public class XtextTerminalsTestLanguageFactoryImpl extends EFactoryImpl implemen * * @generated */ + @Override public AbstractRule createAbstractRule() { AbstractRuleImpl abstractRule = new AbstractRuleImpl(); @@ -120,6 +122,7 @@ public class XtextTerminalsTestLanguageFactoryImpl extends EFactoryImpl implemen * * @generated */ + @Override public AbstractMetamodelDeclaration createAbstractMetamodelDeclaration() { AbstractMetamodelDeclarationImpl abstractMetamodelDeclaration = new AbstractMetamodelDeclarationImpl(); @@ -131,6 +134,7 @@ public class XtextTerminalsTestLanguageFactoryImpl extends EFactoryImpl implemen * * @generated */ + @Override public GeneratedMetamodel createGeneratedMetamodel() { GeneratedMetamodelImpl generatedMetamodel = new GeneratedMetamodelImpl(); @@ -142,6 +146,7 @@ public class XtextTerminalsTestLanguageFactoryImpl extends EFactoryImpl implemen * * @generated */ + @Override public ReferencedMetamodel createReferencedMetamodel() { ReferencedMetamodelImpl referencedMetamodel = new ReferencedMetamodelImpl(); @@ -153,6 +158,7 @@ public class XtextTerminalsTestLanguageFactoryImpl extends EFactoryImpl implemen * * @generated */ + @Override public ParserRule createParserRule() { ParserRuleImpl parserRule = new ParserRuleImpl(); @@ -164,6 +170,7 @@ public class XtextTerminalsTestLanguageFactoryImpl extends EFactoryImpl implemen * * @generated */ + @Override public TypeRef createTypeRef() { TypeRefImpl typeRef = new TypeRefImpl(); @@ -175,6 +182,7 @@ public class XtextTerminalsTestLanguageFactoryImpl extends EFactoryImpl implemen * * @generated */ + @Override public AbstractElement createAbstractElement() { AbstractElementImpl abstractElement = new AbstractElementImpl(); @@ -186,6 +194,7 @@ public class XtextTerminalsTestLanguageFactoryImpl extends EFactoryImpl implemen * * @generated */ + @Override public Action createAction() { ActionImpl action = new ActionImpl(); @@ -197,6 +206,7 @@ public class XtextTerminalsTestLanguageFactoryImpl extends EFactoryImpl implemen * * @generated */ + @Override public Keyword createKeyword() { KeywordImpl keyword = new KeywordImpl(); @@ -208,6 +218,7 @@ public class XtextTerminalsTestLanguageFactoryImpl extends EFactoryImpl implemen * * @generated */ + @Override public RuleCall createRuleCall() { RuleCallImpl ruleCall = new RuleCallImpl(); @@ -219,6 +230,7 @@ public class XtextTerminalsTestLanguageFactoryImpl extends EFactoryImpl implemen * * @generated */ + @Override public Assignment createAssignment() { AssignmentImpl assignment = new AssignmentImpl(); @@ -230,6 +242,7 @@ public class XtextTerminalsTestLanguageFactoryImpl extends EFactoryImpl implemen * * @generated */ + @Override public CrossReference createCrossReference() { CrossReferenceImpl crossReference = new CrossReferenceImpl(); @@ -241,6 +254,7 @@ public class XtextTerminalsTestLanguageFactoryImpl extends EFactoryImpl implemen * * @generated */ + @Override public TerminalRule createTerminalRule() { TerminalRuleImpl terminalRule = new TerminalRuleImpl(); @@ -252,6 +266,7 @@ public class XtextTerminalsTestLanguageFactoryImpl extends EFactoryImpl implemen * * @generated */ + @Override public AbstractNegatedToken createAbstractNegatedToken() { AbstractNegatedTokenImpl abstractNegatedToken = new AbstractNegatedTokenImpl(); @@ -263,6 +278,7 @@ public class XtextTerminalsTestLanguageFactoryImpl extends EFactoryImpl implemen * * @generated */ + @Override public NegatedToken createNegatedToken() { NegatedTokenImpl negatedToken = new NegatedTokenImpl(); @@ -274,6 +290,7 @@ public class XtextTerminalsTestLanguageFactoryImpl extends EFactoryImpl implemen * * @generated */ + @Override public UntilToken createUntilToken() { UntilTokenImpl untilToken = new UntilTokenImpl(); @@ -285,6 +302,7 @@ public class XtextTerminalsTestLanguageFactoryImpl extends EFactoryImpl implemen * * @generated */ + @Override public Wildcard createWildcard() { WildcardImpl wildcard = new WildcardImpl(); @@ -296,6 +314,7 @@ public class XtextTerminalsTestLanguageFactoryImpl extends EFactoryImpl implemen * * @generated */ + @Override public EnumRule createEnumRule() { EnumRuleImpl enumRule = new EnumRuleImpl(); @@ -307,6 +326,7 @@ public class XtextTerminalsTestLanguageFactoryImpl extends EFactoryImpl implemen * * @generated */ + @Override public EnumLiteralDeclaration createEnumLiteralDeclaration() { EnumLiteralDeclarationImpl enumLiteralDeclaration = new EnumLiteralDeclarationImpl(); @@ -318,6 +338,7 @@ public class XtextTerminalsTestLanguageFactoryImpl extends EFactoryImpl implemen * * @generated */ + @Override public Alternatives createAlternatives() { AlternativesImpl alternatives = new AlternativesImpl(); @@ -329,6 +350,7 @@ public class XtextTerminalsTestLanguageFactoryImpl extends EFactoryImpl implemen * * @generated */ + @Override public Group createGroup() { GroupImpl group = new GroupImpl(); @@ -340,6 +362,7 @@ public class XtextTerminalsTestLanguageFactoryImpl extends EFactoryImpl implemen * * @generated */ + @Override public CharacterRange createCharacterRange() { CharacterRangeImpl characterRange = new CharacterRangeImpl(); @@ -351,6 +374,7 @@ public class XtextTerminalsTestLanguageFactoryImpl extends EFactoryImpl implemen * * @generated */ + @Override public XtextTerminalsTestLanguagePackage getXtextTerminalsTestLanguagePackage() { return (XtextTerminalsTestLanguagePackage)getEPackage(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/impl/XtextTerminalsTestLanguagePackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/impl/XtextTerminalsTestLanguagePackageImpl.java index 9b14eebca..44a70be6d 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/impl/XtextTerminalsTestLanguagePackageImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/xtextTerminalsTestLanguage/impl/XtextTerminalsTestLanguagePackageImpl.java @@ -235,7 +235,7 @@ public class XtextTerminalsTestLanguagePackageImpl extends EPackageImpl implemen /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link XtextTerminalsTestLanguagePackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -250,7 +250,8 @@ public class XtextTerminalsTestLanguagePackageImpl extends EPackageImpl implemen if (isInited) return (XtextTerminalsTestLanguagePackage)EPackage.Registry.INSTANCE.getEPackage(XtextTerminalsTestLanguagePackage.eNS_URI); // Obtain or create and register package - XtextTerminalsTestLanguagePackageImpl theXtextTerminalsTestLanguagePackage = (XtextTerminalsTestLanguagePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof XtextTerminalsTestLanguagePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new XtextTerminalsTestLanguagePackageImpl()); + Object registeredXtextTerminalsTestLanguagePackage = EPackage.Registry.INSTANCE.get(eNS_URI); + XtextTerminalsTestLanguagePackageImpl theXtextTerminalsTestLanguagePackage = registeredXtextTerminalsTestLanguagePackage instanceof XtextTerminalsTestLanguagePackageImpl ? (XtextTerminalsTestLanguagePackageImpl)registeredXtextTerminalsTestLanguagePackage : new XtextTerminalsTestLanguagePackageImpl(); isInited = true; @@ -266,7 +267,6 @@ public class XtextTerminalsTestLanguagePackageImpl extends EPackageImpl implemen // Mark meta-data to indicate it can't be changed theXtextTerminalsTestLanguagePackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(XtextTerminalsTestLanguagePackage.eNS_URI, theXtextTerminalsTestLanguagePackage); return theXtextTerminalsTestLanguagePackage; @@ -277,6 +277,7 @@ public class XtextTerminalsTestLanguagePackageImpl extends EPackageImpl implemen * * @generated */ + @Override public EClass getGrammar() { return grammarEClass; @@ -287,6 +288,7 @@ public class XtextTerminalsTestLanguagePackageImpl extends EPackageImpl implemen * * @generated */ + @Override public EAttribute getGrammar_Name() { return (EAttribute)grammarEClass.getEStructuralFeatures().get(0); @@ -297,6 +299,7 @@ public class XtextTerminalsTestLanguagePackageImpl extends EPackageImpl implemen * * @generated */ + @Override public EReference getGrammar_UsedGrammars() { return (EReference)grammarEClass.getEStructuralFeatures().get(1); @@ -307,6 +310,7 @@ public class XtextTerminalsTestLanguagePackageImpl extends EPackageImpl implemen * * @generated */ + @Override public EAttribute getGrammar_DefinesHiddenTokens() { return (EAttribute)grammarEClass.getEStructuralFeatures().get(2); @@ -317,6 +321,7 @@ public class XtextTerminalsTestLanguagePackageImpl extends EPackageImpl implemen * * @generated */ + @Override public EReference getGrammar_HiddenTokens() { return (EReference)grammarEClass.getEStructuralFeatures().get(3); @@ -327,6 +332,7 @@ public class XtextTerminalsTestLanguagePackageImpl extends EPackageImpl implemen * * @generated */ + @Override public EReference getGrammar_MetamodelDeclarations() { return (EReference)grammarEClass.getEStructuralFeatures().get(4); @@ -337,6 +343,7 @@ public class XtextTerminalsTestLanguagePackageImpl extends EPackageImpl implemen * * @generated */ + @Override public EReference getGrammar_Rules() { return (EReference)grammarEClass.getEStructuralFeatures().get(5); @@ -347,6 +354,7 @@ public class XtextTerminalsTestLanguagePackageImpl extends EPackageImpl implemen * * @generated */ + @Override public EClass getAbstractRule() { return abstractRuleEClass; @@ -357,6 +365,7 @@ public class XtextTerminalsTestLanguagePackageImpl extends EPackageImpl implemen * * @generated */ + @Override public EAttribute getAbstractRule_Name() { return (EAttribute)abstractRuleEClass.getEStructuralFeatures().get(0); @@ -367,6 +376,7 @@ public class XtextTerminalsTestLanguagePackageImpl extends EPackageImpl implemen * * @generated */ + @Override public EReference getAbstractRule_Type() { return (EReference)abstractRuleEClass.getEStructuralFeatures().get(1); @@ -377,6 +387,7 @@ public class XtextTerminalsTestLanguagePackageImpl extends EPackageImpl implemen * * @generated */ + @Override public EReference getAbstractRule_Alternatives() { return (EReference)abstractRuleEClass.getEStructuralFeatures().get(2); @@ -387,6 +398,7 @@ public class XtextTerminalsTestLanguagePackageImpl extends EPackageImpl implemen * * @generated */ + @Override public EClass getAbstractMetamodelDeclaration() { return abstractMetamodelDeclarationEClass; @@ -397,6 +409,7 @@ public class XtextTerminalsTestLanguagePackageImpl extends EPackageImpl implemen * * @generated */ + @Override public EReference getAbstractMetamodelDeclaration_EPackage() { return (EReference)abstractMetamodelDeclarationEClass.getEStructuralFeatures().get(0); @@ -407,6 +420,7 @@ public class XtextTerminalsTestLanguagePackageImpl extends EPackageImpl implemen * * @generated */ + @Override public EAttribute getAbstractMetamodelDeclaration_Alias() { return (EAttribute)abstractMetamodelDeclarationEClass.getEStructuralFeatures().get(1); @@ -417,6 +431,7 @@ public class XtextTerminalsTestLanguagePackageImpl extends EPackageImpl implemen * * @generated */ + @Override public EClass getGeneratedMetamodel() { return generatedMetamodelEClass; @@ -427,6 +442,7 @@ public class XtextTerminalsTestLanguagePackageImpl extends EPackageImpl implemen * * @generated */ + @Override public EAttribute getGeneratedMetamodel_Name() { return (EAttribute)generatedMetamodelEClass.getEStructuralFeatures().get(0); @@ -437,6 +453,7 @@ public class XtextTerminalsTestLanguagePackageImpl extends EPackageImpl implemen * * @generated */ + @Override public EClass getReferencedMetamodel() { return referencedMetamodelEClass; @@ -447,6 +464,7 @@ public class XtextTerminalsTestLanguagePackageImpl extends EPackageImpl implemen * * @generated */ + @Override public EClass getParserRule() { return parserRuleEClass; @@ -457,6 +475,7 @@ public class XtextTerminalsTestLanguagePackageImpl extends EPackageImpl implemen * * @generated */ + @Override public EAttribute getParserRule_DefinesHiddenTokens() { return (EAttribute)parserRuleEClass.getEStructuralFeatures().get(0); @@ -467,6 +486,7 @@ public class XtextTerminalsTestLanguagePackageImpl extends EPackageImpl implemen * * @generated */ + @Override public EReference getParserRule_HiddenTokens() { return (EReference)parserRuleEClass.getEStructuralFeatures().get(1); @@ -477,6 +497,7 @@ public class XtextTerminalsTestLanguagePackageImpl extends EPackageImpl implemen * * @generated */ + @Override public EClass getTypeRef() { return typeRefEClass; @@ -487,6 +508,7 @@ public class XtextTerminalsTestLanguagePackageImpl extends EPackageImpl implemen * * @generated */ + @Override public EReference getTypeRef_Metamodel() { return (EReference)typeRefEClass.getEStructuralFeatures().get(0); @@ -497,6 +519,7 @@ public class XtextTerminalsTestLanguagePackageImpl extends EPackageImpl implemen * * @generated */ + @Override public EReference getTypeRef_Classifier() { return (EReference)typeRefEClass.getEStructuralFeatures().get(1); @@ -507,6 +530,7 @@ public class XtextTerminalsTestLanguagePackageImpl extends EPackageImpl implemen * * @generated */ + @Override public EClass getAbstractElement() { return abstractElementEClass; @@ -517,6 +541,7 @@ public class XtextTerminalsTestLanguagePackageImpl extends EPackageImpl implemen * * @generated */ + @Override public EAttribute getAbstractElement_Cardinality() { return (EAttribute)abstractElementEClass.getEStructuralFeatures().get(0); @@ -527,6 +552,7 @@ public class XtextTerminalsTestLanguagePackageImpl extends EPackageImpl implemen * * @generated */ + @Override public EClass getAction() { return actionEClass; @@ -537,6 +563,7 @@ public class XtextTerminalsTestLanguagePackageImpl extends EPackageImpl implemen * * @generated */ + @Override public EReference getAction_Type() { return (EReference)actionEClass.getEStructuralFeatures().get(0); @@ -547,6 +574,7 @@ public class XtextTerminalsTestLanguagePackageImpl extends EPackageImpl implemen * * @generated */ + @Override public EAttribute getAction_Feature() { return (EAttribute)actionEClass.getEStructuralFeatures().get(1); @@ -557,6 +585,7 @@ public class XtextTerminalsTestLanguagePackageImpl extends EPackageImpl implemen * * @generated */ + @Override public EAttribute getAction_Operator() { return (EAttribute)actionEClass.getEStructuralFeatures().get(2); @@ -567,6 +596,7 @@ public class XtextTerminalsTestLanguagePackageImpl extends EPackageImpl implemen * * @generated */ + @Override public EClass getKeyword() { return keywordEClass; @@ -577,6 +607,7 @@ public class XtextTerminalsTestLanguagePackageImpl extends EPackageImpl implemen * * @generated */ + @Override public EAttribute getKeyword_Value() { return (EAttribute)keywordEClass.getEStructuralFeatures().get(0); @@ -587,6 +618,7 @@ public class XtextTerminalsTestLanguagePackageImpl extends EPackageImpl implemen * * @generated */ + @Override public EClass getRuleCall() { return ruleCallEClass; @@ -597,6 +629,7 @@ public class XtextTerminalsTestLanguagePackageImpl extends EPackageImpl implemen * * @generated */ + @Override public EReference getRuleCall_Rule() { return (EReference)ruleCallEClass.getEStructuralFeatures().get(0); @@ -607,6 +640,7 @@ public class XtextTerminalsTestLanguagePackageImpl extends EPackageImpl implemen * * @generated */ + @Override public EClass getAssignment() { return assignmentEClass; @@ -617,6 +651,7 @@ public class XtextTerminalsTestLanguagePackageImpl extends EPackageImpl implemen * * @generated */ + @Override public EAttribute getAssignment_Feature() { return (EAttribute)assignmentEClass.getEStructuralFeatures().get(0); @@ -627,6 +662,7 @@ public class XtextTerminalsTestLanguagePackageImpl extends EPackageImpl implemen * * @generated */ + @Override public EAttribute getAssignment_Operator() { return (EAttribute)assignmentEClass.getEStructuralFeatures().get(1); @@ -637,6 +673,7 @@ public class XtextTerminalsTestLanguagePackageImpl extends EPackageImpl implemen * * @generated */ + @Override public EReference getAssignment_Terminal() { return (EReference)assignmentEClass.getEStructuralFeatures().get(2); @@ -647,6 +684,7 @@ public class XtextTerminalsTestLanguagePackageImpl extends EPackageImpl implemen * * @generated */ + @Override public EClass getCrossReference() { return crossReferenceEClass; @@ -657,6 +695,7 @@ public class XtextTerminalsTestLanguagePackageImpl extends EPackageImpl implemen * * @generated */ + @Override public EReference getCrossReference_Type() { return (EReference)crossReferenceEClass.getEStructuralFeatures().get(0); @@ -667,6 +706,7 @@ public class XtextTerminalsTestLanguagePackageImpl extends EPackageImpl implemen * * @generated */ + @Override public EReference getCrossReference_Terminal() { return (EReference)crossReferenceEClass.getEStructuralFeatures().get(1); @@ -677,6 +717,7 @@ public class XtextTerminalsTestLanguagePackageImpl extends EPackageImpl implemen * * @generated */ + @Override public EClass getTerminalRule() { return terminalRuleEClass; @@ -687,6 +728,7 @@ public class XtextTerminalsTestLanguagePackageImpl extends EPackageImpl implemen * * @generated */ + @Override public EClass getAbstractNegatedToken() { return abstractNegatedTokenEClass; @@ -697,6 +739,7 @@ public class XtextTerminalsTestLanguagePackageImpl extends EPackageImpl implemen * * @generated */ + @Override public EReference getAbstractNegatedToken_Terminal() { return (EReference)abstractNegatedTokenEClass.getEStructuralFeatures().get(0); @@ -707,6 +750,7 @@ public class XtextTerminalsTestLanguagePackageImpl extends EPackageImpl implemen * * @generated */ + @Override public EClass getNegatedToken() { return negatedTokenEClass; @@ -717,6 +761,7 @@ public class XtextTerminalsTestLanguagePackageImpl extends EPackageImpl implemen * * @generated */ + @Override public EClass getUntilToken() { return untilTokenEClass; @@ -727,6 +772,7 @@ public class XtextTerminalsTestLanguagePackageImpl extends EPackageImpl implemen * * @generated */ + @Override public EClass getWildcard() { return wildcardEClass; @@ -737,6 +783,7 @@ public class XtextTerminalsTestLanguagePackageImpl extends EPackageImpl implemen * * @generated */ + @Override public EClass getEnumRule() { return enumRuleEClass; @@ -747,6 +794,7 @@ public class XtextTerminalsTestLanguagePackageImpl extends EPackageImpl implemen * * @generated */ + @Override public EClass getEnumLiteralDeclaration() { return enumLiteralDeclarationEClass; @@ -757,6 +805,7 @@ public class XtextTerminalsTestLanguagePackageImpl extends EPackageImpl implemen * * @generated */ + @Override public EReference getEnumLiteralDeclaration_EnumLiteral() { return (EReference)enumLiteralDeclarationEClass.getEStructuralFeatures().get(0); @@ -767,6 +816,7 @@ public class XtextTerminalsTestLanguagePackageImpl extends EPackageImpl implemen * * @generated */ + @Override public EReference getEnumLiteralDeclaration_Literal() { return (EReference)enumLiteralDeclarationEClass.getEStructuralFeatures().get(1); @@ -777,6 +827,7 @@ public class XtextTerminalsTestLanguagePackageImpl extends EPackageImpl implemen * * @generated */ + @Override public EClass getAlternatives() { return alternativesEClass; @@ -787,6 +838,7 @@ public class XtextTerminalsTestLanguagePackageImpl extends EPackageImpl implemen * * @generated */ + @Override public EReference getAlternatives_Groups() { return (EReference)alternativesEClass.getEStructuralFeatures().get(0); @@ -797,6 +849,7 @@ public class XtextTerminalsTestLanguagePackageImpl extends EPackageImpl implemen * * @generated */ + @Override public EClass getGroup() { return groupEClass; @@ -807,6 +860,7 @@ public class XtextTerminalsTestLanguagePackageImpl extends EPackageImpl implemen * * @generated */ + @Override public EReference getGroup_Tokens() { return (EReference)groupEClass.getEStructuralFeatures().get(0); @@ -817,6 +871,7 @@ public class XtextTerminalsTestLanguagePackageImpl extends EPackageImpl implemen * * @generated */ + @Override public EClass getCharacterRange() { return characterRangeEClass; @@ -827,6 +882,7 @@ public class XtextTerminalsTestLanguagePackageImpl extends EPackageImpl implemen * * @generated */ + @Override public EReference getCharacterRange_Left() { return (EReference)characterRangeEClass.getEStructuralFeatures().get(0); @@ -837,6 +893,7 @@ public class XtextTerminalsTestLanguagePackageImpl extends EPackageImpl implemen * * @generated */ + @Override public EReference getCharacterRange_Right() { return (EReference)characterRangeEClass.getEStructuralFeatures().get(1); @@ -847,6 +904,7 @@ public class XtextTerminalsTestLanguagePackageImpl extends EPackageImpl implemen * * @generated */ + @Override public XtextTerminalsTestLanguageFactory getXtextTerminalsTestLanguageFactory() { return (XtextTerminalsTestLanguageFactory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/BacktrackingBug325745TestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/BacktrackingBug325745TestLanguage.genmodel index 15ab319b6..9dec6f9a9 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/BacktrackingBug325745TestLanguage.genmodel +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/BacktrackingBug325745TestLanguage.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="BacktrackingBug325745TestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> + complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/UnorderedGroupsTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/UnorderedGroupsTestLanguage.genmodel index e1907bf35..164a06cfe 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/UnorderedGroupsTestLanguage.genmodel +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/UnorderedGroupsTestLanguage.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="UnorderedGroupsTestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> + complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/backtrackingBug325745TestLanguage/DataType.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/backtrackingBug325745TestLanguage/DataType.java index d64453b7d..a4054e849 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/backtrackingBug325745TestLanguage/DataType.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/backtrackingBug325745TestLanguage/DataType.java @@ -27,10 +27,6 @@ public interface DataType extends EObject /** * Returns the value of the 'Base Type' attribute. * - *

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

* * @return the value of the 'Base Type' attribute. * @see #setBaseType(String) @@ -53,10 +49,6 @@ public interface DataType extends EObject /** * Returns the value of the 'Default Value' attribute. * - *

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

* * @return the value of the 'Default Value' attribute. * @see #setDefaultValue(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/backtrackingBug325745TestLanguage/Element.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/backtrackingBug325745TestLanguage/Element.java index 17ee871fb..a6b5c3842 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/backtrackingBug325745TestLanguage/Element.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/backtrackingBug325745TestLanguage/Element.java @@ -28,10 +28,6 @@ public interface Element 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) @@ -54,10 +50,6 @@ public interface Element extends EObject /** * Returns the value of the 'Data Type' containment reference. * - *

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

* * @return the value of the 'Data Type' containment reference. * @see #setDataType(DataType) @@ -80,10 +72,6 @@ public interface Element extends EObject /** * Returns the value of the 'Expression' containment reference. * - *

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

* * @return the value of the 'Expression' containment reference. * @see #setExpression(Expression) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/backtrackingBug325745TestLanguage/Expression.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/backtrackingBug325745TestLanguage/Expression.java index 5d767e1e1..3f9f896c8 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/backtrackingBug325745TestLanguage/Expression.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/backtrackingBug325745TestLanguage/Expression.java @@ -30,10 +30,6 @@ public interface Expression extends EObject /** * Returns the value of the 'Prefix' attribute. * - *

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

* * @return the value of the 'Prefix' attribute. * @see #setPrefix(String) @@ -57,10 +53,6 @@ public interface Expression extends EObject * Returns the value of the 'Terms' containment reference list. * The list contents are of type {@link org.eclipse.xtext.parser.unorderedGroups.backtrackingBug325745TestLanguage.SimpleTerm}. * - *

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

* * @return the value of the 'Terms' containment reference list. * @see org.eclipse.xtext.parser.unorderedGroups.backtrackingBug325745TestLanguage.BacktrackingBug325745TestLanguagePackage#getExpression_Terms() @@ -72,10 +64,6 @@ public interface Expression extends EObject /** * Returns the value of the 'Postfix' attribute. * - *

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

* * @return the value of the 'Postfix' attribute. * @see #setPostfix(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/backtrackingBug325745TestLanguage/Model.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/backtrackingBug325745TestLanguage/Model.java index 46dd44ff2..865c1e39d 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/backtrackingBug325745TestLanguage/Model.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/backtrackingBug325745TestLanguage/Model.java @@ -29,10 +29,6 @@ public interface Model extends EObject * Returns the value of the 'Fields' containment reference list. * The list contents are of type {@link org.eclipse.xtext.parser.unorderedGroups.backtrackingBug325745TestLanguage.Element}. * - *

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

* * @return the value of the 'Fields' containment reference list. * @see org.eclipse.xtext.parser.unorderedGroups.backtrackingBug325745TestLanguage.BacktrackingBug325745TestLanguagePackage#getModel_Fields() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/backtrackingBug325745TestLanguage/SimpleTerm.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/backtrackingBug325745TestLanguage/SimpleTerm.java index c113d86da..64b017861 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/backtrackingBug325745TestLanguage/SimpleTerm.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/backtrackingBug325745TestLanguage/SimpleTerm.java @@ -29,10 +29,6 @@ public interface SimpleTerm extends EObject /** * Returns the value of the 'Line Count' attribute. * - *

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

* * @return the value of the 'Line Count' attribute. * @see #setLineCount(int) @@ -55,10 +51,6 @@ public interface SimpleTerm extends EObject /** * Returns the value of the 'Char Count' attribute. * - *

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

* * @return the value of the 'Char Count' attribute. * @see #setCharCount(int) @@ -81,10 +73,6 @@ public interface SimpleTerm extends EObject /** * Returns the value of the 'Char Set' attribute. * - *

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

* * @return the value of the 'Char Set' attribute. * @see #setCharSet(String) @@ -107,10 +95,6 @@ public interface SimpleTerm extends EObject /** * Returns the value of the 'Ref Char' attribute. * - *

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

* * @return the value of the 'Ref Char' attribute. * @see #setRefChar(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/backtrackingBug325745TestLanguage/impl/BacktrackingBug325745TestLanguageFactoryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/backtrackingBug325745TestLanguage/impl/BacktrackingBug325745TestLanguageFactoryImpl.java index f924b70c0..2f62f11c2 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/backtrackingBug325745TestLanguage/impl/BacktrackingBug325745TestLanguageFactoryImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/backtrackingBug325745TestLanguage/impl/BacktrackingBug325745TestLanguageFactoryImpl.java @@ -80,6 +80,7 @@ public class BacktrackingBug325745TestLanguageFactoryImpl extends EFactoryImpl i * * @generated */ + @Override public Model createModel() { ModelImpl model = new ModelImpl(); @@ -91,6 +92,7 @@ public class BacktrackingBug325745TestLanguageFactoryImpl extends EFactoryImpl i * * @generated */ + @Override public Element createElement() { ElementImpl element = new ElementImpl(); @@ -102,6 +104,7 @@ public class BacktrackingBug325745TestLanguageFactoryImpl extends EFactoryImpl i * * @generated */ + @Override public DataType createDataType() { DataTypeImpl dataType = new DataTypeImpl(); @@ -113,6 +116,7 @@ public class BacktrackingBug325745TestLanguageFactoryImpl extends EFactoryImpl i * * @generated */ + @Override public Expression createExpression() { ExpressionImpl expression = new ExpressionImpl(); @@ -124,6 +128,7 @@ public class BacktrackingBug325745TestLanguageFactoryImpl extends EFactoryImpl i * * @generated */ + @Override public SimpleTerm createSimpleTerm() { SimpleTermImpl simpleTerm = new SimpleTermImpl(); @@ -135,6 +140,7 @@ public class BacktrackingBug325745TestLanguageFactoryImpl extends EFactoryImpl i * * @generated */ + @Override public BacktrackingBug325745TestLanguagePackage getBacktrackingBug325745TestLanguagePackage() { return (BacktrackingBug325745TestLanguagePackage)getEPackage(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/backtrackingBug325745TestLanguage/impl/BacktrackingBug325745TestLanguagePackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/backtrackingBug325745TestLanguage/impl/BacktrackingBug325745TestLanguagePackageImpl.java index 0e4d8d75c..9feed912a 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/backtrackingBug325745TestLanguage/impl/BacktrackingBug325745TestLanguagePackageImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/backtrackingBug325745TestLanguage/impl/BacktrackingBug325745TestLanguagePackageImpl.java @@ -91,7 +91,7 @@ public class BacktrackingBug325745TestLanguagePackageImpl extends EPackageImpl i /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link BacktrackingBug325745TestLanguagePackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -106,7 +106,8 @@ public class BacktrackingBug325745TestLanguagePackageImpl extends EPackageImpl i if (isInited) return (BacktrackingBug325745TestLanguagePackage)EPackage.Registry.INSTANCE.getEPackage(BacktrackingBug325745TestLanguagePackage.eNS_URI); // Obtain or create and register package - BacktrackingBug325745TestLanguagePackageImpl theBacktrackingBug325745TestLanguagePackage = (BacktrackingBug325745TestLanguagePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof BacktrackingBug325745TestLanguagePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new BacktrackingBug325745TestLanguagePackageImpl()); + Object registeredBacktrackingBug325745TestLanguagePackage = EPackage.Registry.INSTANCE.get(eNS_URI); + BacktrackingBug325745TestLanguagePackageImpl theBacktrackingBug325745TestLanguagePackage = registeredBacktrackingBug325745TestLanguagePackage instanceof BacktrackingBug325745TestLanguagePackageImpl ? (BacktrackingBug325745TestLanguagePackageImpl)registeredBacktrackingBug325745TestLanguagePackage : new BacktrackingBug325745TestLanguagePackageImpl(); isInited = true; @@ -122,7 +123,6 @@ public class BacktrackingBug325745TestLanguagePackageImpl extends EPackageImpl i // Mark meta-data to indicate it can't be changed theBacktrackingBug325745TestLanguagePackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(BacktrackingBug325745TestLanguagePackage.eNS_URI, theBacktrackingBug325745TestLanguagePackage); return theBacktrackingBug325745TestLanguagePackage; @@ -133,6 +133,7 @@ public class BacktrackingBug325745TestLanguagePackageImpl extends EPackageImpl i * * @generated */ + @Override public EClass getModel() { return modelEClass; @@ -143,6 +144,7 @@ public class BacktrackingBug325745TestLanguagePackageImpl extends EPackageImpl i * * @generated */ + @Override public EReference getModel_Fields() { return (EReference)modelEClass.getEStructuralFeatures().get(0); @@ -153,6 +155,7 @@ public class BacktrackingBug325745TestLanguagePackageImpl extends EPackageImpl i * * @generated */ + @Override public EClass getElement() { return elementEClass; @@ -163,6 +166,7 @@ public class BacktrackingBug325745TestLanguagePackageImpl extends EPackageImpl i * * @generated */ + @Override public EAttribute getElement_Name() { return (EAttribute)elementEClass.getEStructuralFeatures().get(0); @@ -173,6 +177,7 @@ public class BacktrackingBug325745TestLanguagePackageImpl extends EPackageImpl i * * @generated */ + @Override public EReference getElement_DataType() { return (EReference)elementEClass.getEStructuralFeatures().get(1); @@ -183,6 +188,7 @@ public class BacktrackingBug325745TestLanguagePackageImpl extends EPackageImpl i * * @generated */ + @Override public EReference getElement_Expression() { return (EReference)elementEClass.getEStructuralFeatures().get(2); @@ -193,6 +199,7 @@ public class BacktrackingBug325745TestLanguagePackageImpl extends EPackageImpl i * * @generated */ + @Override public EClass getDataType() { return dataTypeEClass; @@ -203,6 +210,7 @@ public class BacktrackingBug325745TestLanguagePackageImpl extends EPackageImpl i * * @generated */ + @Override public EAttribute getDataType_BaseType() { return (EAttribute)dataTypeEClass.getEStructuralFeatures().get(0); @@ -213,6 +221,7 @@ public class BacktrackingBug325745TestLanguagePackageImpl extends EPackageImpl i * * @generated */ + @Override public EAttribute getDataType_DefaultValue() { return (EAttribute)dataTypeEClass.getEStructuralFeatures().get(1); @@ -223,6 +232,7 @@ public class BacktrackingBug325745TestLanguagePackageImpl extends EPackageImpl i * * @generated */ + @Override public EClass getExpression() { return expressionEClass; @@ -233,6 +243,7 @@ public class BacktrackingBug325745TestLanguagePackageImpl extends EPackageImpl i * * @generated */ + @Override public EAttribute getExpression_Prefix() { return (EAttribute)expressionEClass.getEStructuralFeatures().get(0); @@ -243,6 +254,7 @@ public class BacktrackingBug325745TestLanguagePackageImpl extends EPackageImpl i * * @generated */ + @Override public EReference getExpression_Terms() { return (EReference)expressionEClass.getEStructuralFeatures().get(1); @@ -253,6 +265,7 @@ public class BacktrackingBug325745TestLanguagePackageImpl extends EPackageImpl i * * @generated */ + @Override public EAttribute getExpression_Postfix() { return (EAttribute)expressionEClass.getEStructuralFeatures().get(2); @@ -263,6 +276,7 @@ public class BacktrackingBug325745TestLanguagePackageImpl extends EPackageImpl i * * @generated */ + @Override public EClass getSimpleTerm() { return simpleTermEClass; @@ -273,6 +287,7 @@ public class BacktrackingBug325745TestLanguagePackageImpl extends EPackageImpl i * * @generated */ + @Override public EAttribute getSimpleTerm_LineCount() { return (EAttribute)simpleTermEClass.getEStructuralFeatures().get(0); @@ -283,6 +298,7 @@ public class BacktrackingBug325745TestLanguagePackageImpl extends EPackageImpl i * * @generated */ + @Override public EAttribute getSimpleTerm_CharCount() { return (EAttribute)simpleTermEClass.getEStructuralFeatures().get(1); @@ -293,6 +309,7 @@ public class BacktrackingBug325745TestLanguagePackageImpl extends EPackageImpl i * * @generated */ + @Override public EAttribute getSimpleTerm_CharSet() { return (EAttribute)simpleTermEClass.getEStructuralFeatures().get(2); @@ -303,6 +320,7 @@ public class BacktrackingBug325745TestLanguagePackageImpl extends EPackageImpl i * * @generated */ + @Override public EAttribute getSimpleTerm_RefChar() { return (EAttribute)simpleTermEClass.getEStructuralFeatures().get(3); @@ -313,6 +331,7 @@ public class BacktrackingBug325745TestLanguagePackageImpl extends EPackageImpl i * * @generated */ + @Override public BacktrackingBug325745TestLanguageFactory getBacktrackingBug325745TestLanguageFactory() { return (BacktrackingBug325745TestLanguageFactory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/backtrackingBug325745TestLanguage/impl/DataTypeImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/backtrackingBug325745TestLanguage/impl/DataTypeImpl.java index 8a6a56168..d737a727b 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/backtrackingBug325745TestLanguage/impl/DataTypeImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/backtrackingBug325745TestLanguage/impl/DataTypeImpl.java @@ -95,6 +95,7 @@ public class DataTypeImpl extends MinimalEObjectImpl.Container implements DataTy * * @generated */ + @Override public String getBaseType() { return baseType; @@ -105,6 +106,7 @@ public class DataTypeImpl extends MinimalEObjectImpl.Container implements DataTy * * @generated */ + @Override public void setBaseType(String newBaseType) { String oldBaseType = baseType; @@ -118,6 +120,7 @@ public class DataTypeImpl extends MinimalEObjectImpl.Container implements DataTy * * @generated */ + @Override public String getDefaultValue() { return defaultValue; @@ -128,6 +131,7 @@ public class DataTypeImpl extends MinimalEObjectImpl.Container implements DataTy * * @generated */ + @Override public void setDefaultValue(String newDefaultValue) { String oldDefaultValue = defaultValue; @@ -222,7 +226,7 @@ public class DataTypeImpl extends MinimalEObjectImpl.Container implements DataTy { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (baseType: "); result.append(baseType); result.append(", defaultValue: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/backtrackingBug325745TestLanguage/impl/ElementImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/backtrackingBug325745TestLanguage/impl/ElementImpl.java index 7290c7799..66f2269cc 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/backtrackingBug325745TestLanguage/impl/ElementImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/backtrackingBug325745TestLanguage/impl/ElementImpl.java @@ -100,6 +100,7 @@ public class ElementImpl extends MinimalEObjectImpl.Container implements Element * * @generated */ + @Override public String getName() { return name; @@ -110,6 +111,7 @@ public class ElementImpl extends MinimalEObjectImpl.Container implements Element * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -123,6 +125,7 @@ public class ElementImpl extends MinimalEObjectImpl.Container implements Element * * @generated */ + @Override public DataType getDataType() { return dataType; @@ -150,6 +153,7 @@ public class ElementImpl extends MinimalEObjectImpl.Container implements Element * * @generated */ + @Override public void setDataType(DataType newDataType) { if (newDataType != dataType) @@ -171,6 +175,7 @@ public class ElementImpl extends MinimalEObjectImpl.Container implements Element * * @generated */ + @Override public Expression getExpression() { return expression; @@ -198,6 +203,7 @@ public class ElementImpl extends MinimalEObjectImpl.Container implements Element * * @generated */ + @Override public void setExpression(Expression newExpression) { if (newExpression != expression) @@ -328,7 +334,7 @@ public class ElementImpl extends MinimalEObjectImpl.Container implements Element { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/backtrackingBug325745TestLanguage/impl/ExpressionImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/backtrackingBug325745TestLanguage/impl/ExpressionImpl.java index c7e738f55..20d8bf8fa 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/backtrackingBug325745TestLanguage/impl/ExpressionImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/backtrackingBug325745TestLanguage/impl/ExpressionImpl.java @@ -116,6 +116,7 @@ public class ExpressionImpl extends MinimalEObjectImpl.Container implements Expr * * @generated */ + @Override public String getPrefix() { return prefix; @@ -126,6 +127,7 @@ public class ExpressionImpl extends MinimalEObjectImpl.Container implements Expr * * @generated */ + @Override public void setPrefix(String newPrefix) { String oldPrefix = prefix; @@ -139,6 +141,7 @@ public class ExpressionImpl extends MinimalEObjectImpl.Container implements Expr * * @generated */ + @Override public EList getTerms() { if (terms == null) @@ -153,6 +156,7 @@ public class ExpressionImpl extends MinimalEObjectImpl.Container implements Expr * * @generated */ + @Override public String getPostfix() { return postfix; @@ -163,6 +167,7 @@ public class ExpressionImpl extends MinimalEObjectImpl.Container implements Expr * * @generated */ + @Override public void setPostfix(String newPostfix) { String oldPostfix = postfix; @@ -285,7 +290,7 @@ public class ExpressionImpl extends MinimalEObjectImpl.Container implements Expr { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (prefix: "); result.append(prefix); result.append(", postfix: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/backtrackingBug325745TestLanguage/impl/ModelImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/backtrackingBug325745TestLanguage/impl/ModelImpl.java index 3afb977fe..89c5c57da 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/backtrackingBug325745TestLanguage/impl/ModelImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/backtrackingBug325745TestLanguage/impl/ModelImpl.java @@ -72,6 +72,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public EList getFields() { if (fields == null) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/backtrackingBug325745TestLanguage/impl/SimpleTermImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/backtrackingBug325745TestLanguage/impl/SimpleTermImpl.java index 9027d878c..5ac61918b 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/backtrackingBug325745TestLanguage/impl/SimpleTermImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/backtrackingBug325745TestLanguage/impl/SimpleTermImpl.java @@ -137,6 +137,7 @@ public class SimpleTermImpl extends MinimalEObjectImpl.Container implements Simp * * @generated */ + @Override public int getLineCount() { return lineCount; @@ -147,6 +148,7 @@ public class SimpleTermImpl extends MinimalEObjectImpl.Container implements Simp * * @generated */ + @Override public void setLineCount(int newLineCount) { int oldLineCount = lineCount; @@ -160,6 +162,7 @@ public class SimpleTermImpl extends MinimalEObjectImpl.Container implements Simp * * @generated */ + @Override public int getCharCount() { return charCount; @@ -170,6 +173,7 @@ public class SimpleTermImpl extends MinimalEObjectImpl.Container implements Simp * * @generated */ + @Override public void setCharCount(int newCharCount) { int oldCharCount = charCount; @@ -183,6 +187,7 @@ public class SimpleTermImpl extends MinimalEObjectImpl.Container implements Simp * * @generated */ + @Override public String getCharSet() { return charSet; @@ -193,6 +198,7 @@ public class SimpleTermImpl extends MinimalEObjectImpl.Container implements Simp * * @generated */ + @Override public void setCharSet(String newCharSet) { String oldCharSet = charSet; @@ -206,6 +212,7 @@ public class SimpleTermImpl extends MinimalEObjectImpl.Container implements Simp * * @generated */ + @Override public String getRefChar() { return refChar; @@ -216,6 +223,7 @@ public class SimpleTermImpl extends MinimalEObjectImpl.Container implements Simp * * @generated */ + @Override public void setRefChar(String newRefChar) { String oldRefChar = refChar; @@ -330,7 +338,7 @@ public class SimpleTermImpl extends MinimalEObjectImpl.Container implements Simp { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (lineCount: "); result.append(lineCount); result.append(", charCount: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/unorderedGroupsTestLanguage/Model.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/unorderedGroupsTestLanguage/Model.java index 764c6148e..b989da4a4 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/unorderedGroupsTestLanguage/Model.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/unorderedGroupsTestLanguage/Model.java @@ -38,10 +38,6 @@ public interface Model extends EObject /** * Returns the value of the 'First' attribute. * - *

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

* * @return the value of the 'First' attribute. * @see #setFirst(boolean) @@ -64,10 +60,6 @@ public interface Model extends EObject /** * Returns the value of the 'Second' attribute. * - *

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

* * @return the value of the 'Second' attribute. * @see #setSecond(boolean) @@ -90,10 +82,6 @@ public interface Model extends EObject /** * Returns the value of the 'Third' attribute. * - *

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

* * @return the value of the 'Third' attribute. * @see #setThird(boolean) @@ -116,10 +104,6 @@ public interface Model extends EObject /** * Returns the value of the 'Forth' attribute. * - *

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

* * @return the value of the 'Forth' attribute. * @see #setForth(boolean) @@ -143,10 +127,6 @@ public interface Model extends EObject * Returns the value of the 'First As List' attribute list. * The list contents are of type {@link java.lang.String}. * - *

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

* * @return the value of the 'First As List' attribute list. * @see org.eclipse.xtext.parser.unorderedGroups.unorderedGroupsTestLanguage.UnorderedGroupsTestLanguagePackage#getModel_FirstAsList() @@ -159,10 +139,6 @@ public interface Model extends EObject * Returns the value of the 'Second As List' attribute list. * The list contents are of type {@link java.lang.String}. * - *

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

* * @return the value of the 'Second As List' attribute list. * @see org.eclipse.xtext.parser.unorderedGroups.unorderedGroupsTestLanguage.UnorderedGroupsTestLanguagePackage#getModel_SecondAsList() @@ -175,10 +151,6 @@ public interface Model extends EObject * Returns the value of the 'Third As List' attribute list. * The list contents are of type {@link java.lang.String}. * - *

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

* * @return the value of the 'Third As List' attribute list. * @see org.eclipse.xtext.parser.unorderedGroups.unorderedGroupsTestLanguage.UnorderedGroupsTestLanguagePackage#getModel_ThirdAsList() @@ -191,10 +163,6 @@ public interface Model extends EObject * Returns the value of the 'Forth As List' attribute list. * The list contents are of type {@link java.lang.String}. * - *

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

* * @return the value of the 'Forth As List' attribute list. * @see org.eclipse.xtext.parser.unorderedGroups.unorderedGroupsTestLanguage.UnorderedGroupsTestLanguagePackage#getModel_ForthAsList() @@ -206,10 +174,6 @@ public interface Model extends EObject /** * Returns the value of the 'Value' attribute. * - *

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

* * @return the value of the 'Value' attribute. * @see #setValue(String) @@ -232,10 +196,6 @@ public interface Model extends EObject /** * Returns the value of the 'Serialized' containment reference. * - *

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

* * @return the value of the 'Serialized' containment reference. * @see #setSerialized(UnorderedSerialization) @@ -259,10 +219,6 @@ public interface Model extends EObject * Returns the value of the 'Nested Model' containment reference list. * The list contents are of type {@link org.eclipse.xtext.parser.unorderedGroups.unorderedGroupsTestLanguage.NestedModel}. * - *

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

* * @return the value of the 'Nested Model' containment reference list. * @see org.eclipse.xtext.parser.unorderedGroups.unorderedGroupsTestLanguage.UnorderedGroupsTestLanguagePackage#getModel_NestedModel() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/unorderedGroupsTestLanguage/NestedModel.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/unorderedGroupsTestLanguage/NestedModel.java index 9912a98cb..bbd42b0c6 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/unorderedGroupsTestLanguage/NestedModel.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/unorderedGroupsTestLanguage/NestedModel.java @@ -27,10 +27,6 @@ public interface NestedModel extends EObject /** * Returns the value of the 'First' attribute. * - *

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

* * @return the value of the 'First' attribute. * @see #setFirst(boolean) @@ -53,10 +49,6 @@ public interface NestedModel extends EObject /** * Returns the value of the 'Second' attribute. * - *

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

* * @return the value of the 'Second' attribute. * @see #setSecond(boolean) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/unorderedGroupsTestLanguage/UnorderedSerialization.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/unorderedGroupsTestLanguage/UnorderedSerialization.java index 5cfd800bb..4dca69990 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/unorderedGroupsTestLanguage/UnorderedSerialization.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/unorderedGroupsTestLanguage/UnorderedSerialization.java @@ -33,10 +33,6 @@ public interface UnorderedSerialization extends EObject /** * Returns the value of the 'First' attribute. * - *

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

* * @return the value of the 'First' attribute. * @see #setFirst(boolean) @@ -59,10 +55,6 @@ public interface UnorderedSerialization extends EObject /** * Returns the value of the 'Second' attribute. * - *

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

* * @return the value of the 'Second' attribute. * @see #setSecond(boolean) @@ -85,10 +77,6 @@ public interface UnorderedSerialization extends EObject /** * Returns the value of the 'Third' attribute. * - *

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

* * @return the value of the 'Third' attribute. * @see #setThird(boolean) @@ -111,10 +99,6 @@ public interface UnorderedSerialization extends EObject /** * Returns the value of the 'Forth' attribute. * - *

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

* * @return the value of the 'Forth' attribute. * @see #setForth(boolean) @@ -138,10 +122,6 @@ public interface UnorderedSerialization extends EObject * Returns the value of the 'First As List' attribute list. * The list contents are of type {@link java.lang.String}. * - *

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

* * @return the value of the 'First As List' attribute list. * @see org.eclipse.xtext.parser.unorderedGroups.unorderedGroupsTestLanguage.UnorderedGroupsTestLanguagePackage#getUnorderedSerialization_FirstAsList() @@ -154,10 +134,6 @@ public interface UnorderedSerialization extends EObject * Returns the value of the 'Second As List' attribute list. * The list contents are of type {@link java.lang.String}. * - *

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

* * @return the value of the 'Second As List' attribute list. * @see org.eclipse.xtext.parser.unorderedGroups.unorderedGroupsTestLanguage.UnorderedGroupsTestLanguagePackage#getUnorderedSerialization_SecondAsList() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/unorderedGroupsTestLanguage/impl/ModelImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/unorderedGroupsTestLanguage/impl/ModelImpl.java index 6bd2b1509..8cf89d372 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/unorderedGroupsTestLanguage/impl/ModelImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/unorderedGroupsTestLanguage/impl/ModelImpl.java @@ -236,6 +236,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public boolean isFirst() { return first; @@ -246,6 +247,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setFirst(boolean newFirst) { boolean oldFirst = first; @@ -259,6 +261,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public boolean isSecond() { return second; @@ -269,6 +272,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setSecond(boolean newSecond) { boolean oldSecond = second; @@ -282,6 +286,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public boolean isThird() { return third; @@ -292,6 +297,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setThird(boolean newThird) { boolean oldThird = third; @@ -305,6 +311,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public boolean isForth() { return forth; @@ -315,6 +322,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setForth(boolean newForth) { boolean oldForth = forth; @@ -328,6 +336,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public EList getFirstAsList() { if (firstAsList == null) @@ -342,6 +351,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public EList getSecondAsList() { if (secondAsList == null) @@ -356,6 +366,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public EList getThirdAsList() { if (thirdAsList == null) @@ -370,6 +381,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public EList getForthAsList() { if (forthAsList == null) @@ -384,6 +396,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public String getValue() { return value; @@ -394,6 +407,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setValue(String newValue) { String oldValue = value; @@ -407,6 +421,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public UnorderedSerialization getSerialized() { return serialized; @@ -434,6 +449,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setSerialized(UnorderedSerialization newSerialized) { if (newSerialized != serialized) @@ -455,6 +471,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public EList getNestedModel() { if (nestedModel == null) @@ -664,7 +681,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (first: "); result.append(first); result.append(", second: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/unorderedGroupsTestLanguage/impl/NestedModelImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/unorderedGroupsTestLanguage/impl/NestedModelImpl.java index cf7c9a5e7..2db46c8f0 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/unorderedGroupsTestLanguage/impl/NestedModelImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/unorderedGroupsTestLanguage/impl/NestedModelImpl.java @@ -95,6 +95,7 @@ public class NestedModelImpl extends MinimalEObjectImpl.Container implements Nes * * @generated */ + @Override public boolean isFirst() { return first; @@ -105,6 +106,7 @@ public class NestedModelImpl extends MinimalEObjectImpl.Container implements Nes * * @generated */ + @Override public void setFirst(boolean newFirst) { boolean oldFirst = first; @@ -118,6 +120,7 @@ public class NestedModelImpl extends MinimalEObjectImpl.Container implements Nes * * @generated */ + @Override public boolean isSecond() { return second; @@ -128,6 +131,7 @@ public class NestedModelImpl extends MinimalEObjectImpl.Container implements Nes * * @generated */ + @Override public void setSecond(boolean newSecond) { boolean oldSecond = second; @@ -222,7 +226,7 @@ public class NestedModelImpl extends MinimalEObjectImpl.Container implements Nes { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (first: "); result.append(first); result.append(", second: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/unorderedGroupsTestLanguage/impl/UnorderedGroupsTestLanguageFactoryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/unorderedGroupsTestLanguage/impl/UnorderedGroupsTestLanguageFactoryImpl.java index 8b2c0bc68..90bec7b3b 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/unorderedGroupsTestLanguage/impl/UnorderedGroupsTestLanguageFactoryImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/unorderedGroupsTestLanguage/impl/UnorderedGroupsTestLanguageFactoryImpl.java @@ -78,6 +78,7 @@ public class UnorderedGroupsTestLanguageFactoryImpl extends EFactoryImpl impleme * * @generated */ + @Override public Model createModel() { ModelImpl model = new ModelImpl(); @@ -89,6 +90,7 @@ public class UnorderedGroupsTestLanguageFactoryImpl extends EFactoryImpl impleme * * @generated */ + @Override public NestedModel createNestedModel() { NestedModelImpl nestedModel = new NestedModelImpl(); @@ -100,6 +102,7 @@ public class UnorderedGroupsTestLanguageFactoryImpl extends EFactoryImpl impleme * * @generated */ + @Override public UnorderedSerialization createUnorderedSerialization() { UnorderedSerializationImpl unorderedSerialization = new UnorderedSerializationImpl(); @@ -111,6 +114,7 @@ public class UnorderedGroupsTestLanguageFactoryImpl extends EFactoryImpl impleme * * @generated */ + @Override public UnorderedGroupsTestLanguagePackage getUnorderedGroupsTestLanguagePackage() { return (UnorderedGroupsTestLanguagePackage)getEPackage(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/unorderedGroupsTestLanguage/impl/UnorderedGroupsTestLanguagePackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/unorderedGroupsTestLanguage/impl/UnorderedGroupsTestLanguagePackageImpl.java index ac19b1cfb..bcac93afa 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/unorderedGroupsTestLanguage/impl/UnorderedGroupsTestLanguagePackageImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/unorderedGroupsTestLanguage/impl/UnorderedGroupsTestLanguagePackageImpl.java @@ -75,7 +75,7 @@ public class UnorderedGroupsTestLanguagePackageImpl extends EPackageImpl impleme /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link UnorderedGroupsTestLanguagePackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -90,7 +90,8 @@ public class UnorderedGroupsTestLanguagePackageImpl extends EPackageImpl impleme if (isInited) return (UnorderedGroupsTestLanguagePackage)EPackage.Registry.INSTANCE.getEPackage(UnorderedGroupsTestLanguagePackage.eNS_URI); // Obtain or create and register package - UnorderedGroupsTestLanguagePackageImpl theUnorderedGroupsTestLanguagePackage = (UnorderedGroupsTestLanguagePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof UnorderedGroupsTestLanguagePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new UnorderedGroupsTestLanguagePackageImpl()); + Object registeredUnorderedGroupsTestLanguagePackage = EPackage.Registry.INSTANCE.get(eNS_URI); + UnorderedGroupsTestLanguagePackageImpl theUnorderedGroupsTestLanguagePackage = registeredUnorderedGroupsTestLanguagePackage instanceof UnorderedGroupsTestLanguagePackageImpl ? (UnorderedGroupsTestLanguagePackageImpl)registeredUnorderedGroupsTestLanguagePackage : new UnorderedGroupsTestLanguagePackageImpl(); isInited = true; @@ -106,7 +107,6 @@ public class UnorderedGroupsTestLanguagePackageImpl extends EPackageImpl impleme // Mark meta-data to indicate it can't be changed theUnorderedGroupsTestLanguagePackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(UnorderedGroupsTestLanguagePackage.eNS_URI, theUnorderedGroupsTestLanguagePackage); return theUnorderedGroupsTestLanguagePackage; @@ -117,6 +117,7 @@ public class UnorderedGroupsTestLanguagePackageImpl extends EPackageImpl impleme * * @generated */ + @Override public EClass getModel() { return modelEClass; @@ -127,6 +128,7 @@ public class UnorderedGroupsTestLanguagePackageImpl extends EPackageImpl impleme * * @generated */ + @Override public EAttribute getModel_First() { return (EAttribute)modelEClass.getEStructuralFeatures().get(0); @@ -137,6 +139,7 @@ public class UnorderedGroupsTestLanguagePackageImpl extends EPackageImpl impleme * * @generated */ + @Override public EAttribute getModel_Second() { return (EAttribute)modelEClass.getEStructuralFeatures().get(1); @@ -147,6 +150,7 @@ public class UnorderedGroupsTestLanguagePackageImpl extends EPackageImpl impleme * * @generated */ + @Override public EAttribute getModel_Third() { return (EAttribute)modelEClass.getEStructuralFeatures().get(2); @@ -157,6 +161,7 @@ public class UnorderedGroupsTestLanguagePackageImpl extends EPackageImpl impleme * * @generated */ + @Override public EAttribute getModel_Forth() { return (EAttribute)modelEClass.getEStructuralFeatures().get(3); @@ -167,6 +172,7 @@ public class UnorderedGroupsTestLanguagePackageImpl extends EPackageImpl impleme * * @generated */ + @Override public EAttribute getModel_FirstAsList() { return (EAttribute)modelEClass.getEStructuralFeatures().get(4); @@ -177,6 +183,7 @@ public class UnorderedGroupsTestLanguagePackageImpl extends EPackageImpl impleme * * @generated */ + @Override public EAttribute getModel_SecondAsList() { return (EAttribute)modelEClass.getEStructuralFeatures().get(5); @@ -187,6 +194,7 @@ public class UnorderedGroupsTestLanguagePackageImpl extends EPackageImpl impleme * * @generated */ + @Override public EAttribute getModel_ThirdAsList() { return (EAttribute)modelEClass.getEStructuralFeatures().get(6); @@ -197,6 +205,7 @@ public class UnorderedGroupsTestLanguagePackageImpl extends EPackageImpl impleme * * @generated */ + @Override public EAttribute getModel_ForthAsList() { return (EAttribute)modelEClass.getEStructuralFeatures().get(7); @@ -207,6 +216,7 @@ public class UnorderedGroupsTestLanguagePackageImpl extends EPackageImpl impleme * * @generated */ + @Override public EAttribute getModel_Value() { return (EAttribute)modelEClass.getEStructuralFeatures().get(8); @@ -217,6 +227,7 @@ public class UnorderedGroupsTestLanguagePackageImpl extends EPackageImpl impleme * * @generated */ + @Override public EReference getModel_Serialized() { return (EReference)modelEClass.getEStructuralFeatures().get(9); @@ -227,6 +238,7 @@ public class UnorderedGroupsTestLanguagePackageImpl extends EPackageImpl impleme * * @generated */ + @Override public EReference getModel_NestedModel() { return (EReference)modelEClass.getEStructuralFeatures().get(10); @@ -237,6 +249,7 @@ public class UnorderedGroupsTestLanguagePackageImpl extends EPackageImpl impleme * * @generated */ + @Override public EClass getNestedModel() { return nestedModelEClass; @@ -247,6 +260,7 @@ public class UnorderedGroupsTestLanguagePackageImpl extends EPackageImpl impleme * * @generated */ + @Override public EAttribute getNestedModel_First() { return (EAttribute)nestedModelEClass.getEStructuralFeatures().get(0); @@ -257,6 +271,7 @@ public class UnorderedGroupsTestLanguagePackageImpl extends EPackageImpl impleme * * @generated */ + @Override public EAttribute getNestedModel_Second() { return (EAttribute)nestedModelEClass.getEStructuralFeatures().get(1); @@ -267,6 +282,7 @@ public class UnorderedGroupsTestLanguagePackageImpl extends EPackageImpl impleme * * @generated */ + @Override public EClass getUnorderedSerialization() { return unorderedSerializationEClass; @@ -277,6 +293,7 @@ public class UnorderedGroupsTestLanguagePackageImpl extends EPackageImpl impleme * * @generated */ + @Override public EAttribute getUnorderedSerialization_First() { return (EAttribute)unorderedSerializationEClass.getEStructuralFeatures().get(0); @@ -287,6 +304,7 @@ public class UnorderedGroupsTestLanguagePackageImpl extends EPackageImpl impleme * * @generated */ + @Override public EAttribute getUnorderedSerialization_Second() { return (EAttribute)unorderedSerializationEClass.getEStructuralFeatures().get(1); @@ -297,6 +315,7 @@ public class UnorderedGroupsTestLanguagePackageImpl extends EPackageImpl impleme * * @generated */ + @Override public EAttribute getUnorderedSerialization_Third() { return (EAttribute)unorderedSerializationEClass.getEStructuralFeatures().get(2); @@ -307,6 +326,7 @@ public class UnorderedGroupsTestLanguagePackageImpl extends EPackageImpl impleme * * @generated */ + @Override public EAttribute getUnorderedSerialization_Forth() { return (EAttribute)unorderedSerializationEClass.getEStructuralFeatures().get(3); @@ -317,6 +337,7 @@ public class UnorderedGroupsTestLanguagePackageImpl extends EPackageImpl impleme * * @generated */ + @Override public EAttribute getUnorderedSerialization_FirstAsList() { return (EAttribute)unorderedSerializationEClass.getEStructuralFeatures().get(4); @@ -327,6 +348,7 @@ public class UnorderedGroupsTestLanguagePackageImpl extends EPackageImpl impleme * * @generated */ + @Override public EAttribute getUnorderedSerialization_SecondAsList() { return (EAttribute)unorderedSerializationEClass.getEStructuralFeatures().get(5); @@ -337,6 +359,7 @@ public class UnorderedGroupsTestLanguagePackageImpl extends EPackageImpl impleme * * @generated */ + @Override public UnorderedGroupsTestLanguageFactory getUnorderedGroupsTestLanguageFactory() { return (UnorderedGroupsTestLanguageFactory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/unorderedGroupsTestLanguage/impl/UnorderedSerializationImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/unorderedGroupsTestLanguage/impl/UnorderedSerializationImpl.java index 4e3605ad2..12279f968 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/unorderedGroupsTestLanguage/impl/UnorderedSerializationImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/unorderedGroupsTestLanguage/impl/UnorderedSerializationImpl.java @@ -165,6 +165,7 @@ public class UnorderedSerializationImpl extends MinimalEObjectImpl.Container imp * * @generated */ + @Override public boolean isFirst() { return first; @@ -175,6 +176,7 @@ public class UnorderedSerializationImpl extends MinimalEObjectImpl.Container imp * * @generated */ + @Override public void setFirst(boolean newFirst) { boolean oldFirst = first; @@ -188,6 +190,7 @@ public class UnorderedSerializationImpl extends MinimalEObjectImpl.Container imp * * @generated */ + @Override public boolean isSecond() { return second; @@ -198,6 +201,7 @@ public class UnorderedSerializationImpl extends MinimalEObjectImpl.Container imp * * @generated */ + @Override public void setSecond(boolean newSecond) { boolean oldSecond = second; @@ -211,6 +215,7 @@ public class UnorderedSerializationImpl extends MinimalEObjectImpl.Container imp * * @generated */ + @Override public boolean isThird() { return third; @@ -221,6 +226,7 @@ public class UnorderedSerializationImpl extends MinimalEObjectImpl.Container imp * * @generated */ + @Override public void setThird(boolean newThird) { boolean oldThird = third; @@ -234,6 +240,7 @@ public class UnorderedSerializationImpl extends MinimalEObjectImpl.Container imp * * @generated */ + @Override public boolean isForth() { return forth; @@ -244,6 +251,7 @@ public class UnorderedSerializationImpl extends MinimalEObjectImpl.Container imp * * @generated */ + @Override public void setForth(boolean newForth) { boolean oldForth = forth; @@ -257,6 +265,7 @@ public class UnorderedSerializationImpl extends MinimalEObjectImpl.Container imp * * @generated */ + @Override public EList getFirstAsList() { if (firstAsList == null) @@ -271,6 +280,7 @@ public class UnorderedSerializationImpl extends MinimalEObjectImpl.Container imp * * @generated */ + @Override public EList getSecondAsList() { if (secondAsList == null) @@ -409,7 +419,7 @@ public class UnorderedSerializationImpl extends MinimalEObjectImpl.Container imp { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (first: "); result.append(first); result.append(", second: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguage.genmodel index 546d7a39d..f73afe83b 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguage.genmodel +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguage.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="FormatterTestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> + complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguage2.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguage2.genmodel index c99ba60d1..33ee67a88 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguage2.genmodel +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguage2.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="FormatterTestLanguage2" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> + complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/Assign.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/Assign.java index c4d49b8b1..c19abf64f 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/Assign.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/Assign.java @@ -28,10 +28,6 @@ public interface Assign extends Line /** * Returns the value of the 'Var' attribute. * - *

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

* * @return the value of the 'Var' attribute. * @see #setVar(String) @@ -54,10 +50,6 @@ public interface Assign extends Line /** * Returns the value of the 'Op' attribute. * - *

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

* * @return the value of the 'Op' attribute. * @see #setOp(String) @@ -81,10 +73,6 @@ public interface Assign extends Line * Returns the value of the 'Val' attribute list. * The list contents are of type {@link java.lang.Integer}. * - *

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

* * @return the value of the 'Val' attribute list. * @see org.eclipse.xtext.parsetree.formatter.formattertestlanguage.FormattertestlanguagePackage#getAssign_Val() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/Datatypes.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/Datatypes.java index 3589a49dd..606d103c2 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/Datatypes.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/Datatypes.java @@ -27,10 +27,6 @@ public interface Datatypes extends Line /** * Returns the value of the 'Val1' attribute. * - *

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

* * @return the value of the 'Val1' attribute. * @see #setVal1(String) @@ -53,10 +49,6 @@ public interface Datatypes extends Line /** * Returns the value of the 'Val2' attribute. * - *

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

* * @return the value of the 'Val2' attribute. * @see #setVal2(String) @@ -79,10 +71,6 @@ public interface Datatypes extends Line /** * Returns the value of the 'Val3' attribute. * - *

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

* * @return the value of the 'Val3' attribute. * @see #setVal3(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/Decl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/Decl.java index 1d0eb01cd..459f15056 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/Decl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/Decl.java @@ -28,10 +28,6 @@ public interface Decl extends Line * Returns the value of the 'Type' attribute list. * The list contents are of type {@link java.lang.String}. * - *

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

* * @return the value of the 'Type' attribute list. * @see org.eclipse.xtext.parsetree.formatter.formattertestlanguage.FormattertestlanguagePackage#getDecl_Type() @@ -44,10 +40,6 @@ public interface Decl extends Line * Returns the value of the 'Name' attribute list. * The list contents are of type {@link java.lang.String}. * - *

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

* * @return the value of the 'Name' attribute list. * @see org.eclipse.xtext.parsetree.formatter.formattertestlanguage.FormattertestlanguagePackage#getDecl_Name() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/Enum1.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/Enum1.java index acb043b09..d2cffa548 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/Enum1.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/Enum1.java @@ -53,10 +53,6 @@ public enum Enum1 implements Enumerator /** * The 'Lit1' literal value. * - *

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

* * @see #LIT1 * @model name="lit1" @@ -68,10 +64,6 @@ public enum Enum1 implements Enumerator /** * The 'Lit2' literal value. * - *

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

* * @see #LIT2 * @model name="lit2" @@ -83,10 +75,6 @@ public enum Enum1 implements Enumerator /** * The 'Lit3' literal value. * - *

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

* * @see #LIT3 * @model name="lit3" @@ -217,6 +205,7 @@ public enum Enum1 implements Enumerator * * @generated */ + @Override public int getValue() { return value; @@ -227,6 +216,7 @@ public enum Enum1 implements Enumerator * * @generated */ + @Override public String getName() { return name; @@ -237,6 +227,7 @@ public enum Enum1 implements Enumerator * * @generated */ + @Override public String getLiteral() { return literal; diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/Enumeration.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/Enumeration.java index 4900ee985..c9b714a2d 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/Enumeration.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/Enumeration.java @@ -28,10 +28,6 @@ public interface Enumeration extends Line * The list contents are of type {@link org.eclipse.xtext.parsetree.formatter.formattertestlanguage.Enum1}. * The literals are from the enumeration {@link org.eclipse.xtext.parsetree.formatter.formattertestlanguage.Enum1}. * - *

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

* * @return the value of the 'Val' attribute list. * @see org.eclipse.xtext.parsetree.formatter.formattertestlanguage.Enum1 diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/FqnObj.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/FqnObj.java index a0b959993..d770895a5 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/FqnObj.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/FqnObj.java @@ -25,10 +25,6 @@ public interface FqnObj extends Line /** * 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) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/FqnRef.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/FqnRef.java index 7fd6ffad2..7bb33f437 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/FqnRef.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/FqnRef.java @@ -25,10 +25,6 @@ public interface FqnRef extends Line /** * Returns the value of the 'Ref' reference. * - *

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

* * @return the value of the 'Ref' reference. * @see #setRef(FqnObj) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/Meth.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/Meth.java index 4df1124cd..145a3f854 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/Meth.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/Meth.java @@ -27,10 +27,6 @@ public interface Meth extends Line /** * 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) @@ -54,10 +50,6 @@ public interface Meth extends Line * Returns the value of the 'Param' containment reference list. * The list contents are of type {@link org.eclipse.xtext.parsetree.formatter.formattertestlanguage.Param}. * - *

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

* * @return the value of the 'Param' containment reference list. * @see org.eclipse.xtext.parsetree.formatter.formattertestlanguage.FormattertestlanguagePackage#getMeth_Param() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/Param.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/Param.java index 64f3f0b3f..90957a317 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/Param.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/Param.java @@ -30,10 +30,6 @@ public interface Param extends EObject * Returns the value of the 'Name' attribute list. * The list contents are of type {@link java.lang.String}. * - *

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

* * @return the value of the 'Name' attribute list. * @see org.eclipse.xtext.parsetree.formatter.formattertestlanguage.FormattertestlanguagePackage#getParam_Name() @@ -46,10 +42,6 @@ public interface Param extends EObject * Returns the value of the 'Type' attribute list. * The list contents are of type {@link java.lang.String}. * - *

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

* * @return the value of the 'Type' attribute list. * @see org.eclipse.xtext.parsetree.formatter.formattertestlanguage.FormattertestlanguagePackage#getParam_Type() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/Space.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/Space.java index 942f2e00a..d047a2ef3 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/Space.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/Space.java @@ -25,10 +25,6 @@ public interface Space extends Line /** * Returns the value of the 'Val' attribute. * - *

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

* * @return the value of the 'Val' attribute. * @see #setVal(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/SuppressedHidden.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/SuppressedHidden.java index 54b5b931f..8cdcde707 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/SuppressedHidden.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/SuppressedHidden.java @@ -27,10 +27,6 @@ public interface SuppressedHidden extends Line * Returns the value of the 'Vals' containment reference list. * The list contents are of type {@link org.eclipse.xtext.parsetree.formatter.formattertestlanguage.SuppressedHiddenSub}. * - *

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

* * @return the value of the 'Vals' containment reference list. * @see org.eclipse.xtext.parsetree.formatter.formattertestlanguage.FormattertestlanguagePackage#getSuppressedHidden_Vals() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/SuppressedHiddenSub.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/SuppressedHiddenSub.java index 8477f18fd..b51f08d45 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/SuppressedHiddenSub.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/SuppressedHiddenSub.java @@ -26,10 +26,6 @@ public interface SuppressedHiddenSub extends EObject /** * Returns the value of the 'Idval' attribute. * - *

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

* * @return the value of the 'Idval' attribute. * @see #setIdval(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/TestIndentation.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/TestIndentation.java index 2bb832a0b..2814b99c4 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/TestIndentation.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/TestIndentation.java @@ -30,10 +30,6 @@ public interface TestIndentation extends Root * Returns the value of the 'Items' containment reference list. * The list contents are of type {@link org.eclipse.emf.ecore.EObject}. * - *

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

* * @return the value of the 'Items' containment reference list. * @see org.eclipse.xtext.parsetree.formatter.formattertestlanguage.FormattertestlanguagePackage#getTestIndentation_Items() @@ -45,10 +41,6 @@ public interface TestIndentation extends Root /** * Returns the value of the 'Semi' attribute. * - *

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

* * @return the value of the 'Semi' attribute. * @see #setSemi(boolean) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/TestLinewrap.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/TestLinewrap.java index 5fd0f6295..e4e26309d 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/TestLinewrap.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/TestLinewrap.java @@ -27,10 +27,6 @@ public interface TestLinewrap extends Root * Returns the value of the 'Items' containment reference list. * The list contents are of type {@link org.eclipse.xtext.parsetree.formatter.formattertestlanguage.Line}. * - *

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

* * @return the value of the 'Items' containment reference list. * @see org.eclipse.xtext.parsetree.formatter.formattertestlanguage.FormattertestlanguagePackage#getTestLinewrap_Items() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/TestLinewrapMinMax.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/TestLinewrapMinMax.java index b04310a4b..cae0ba192 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/TestLinewrapMinMax.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/TestLinewrapMinMax.java @@ -27,10 +27,6 @@ public interface TestLinewrapMinMax extends Root * Returns the value of the 'Items' containment reference list. * The list contents are of type {@link org.eclipse.xtext.parsetree.formatter.formattertestlanguage.Line}. * - *

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

* * @return the value of the 'Items' containment reference list. * @see org.eclipse.xtext.parsetree.formatter.formattertestlanguage.FormattertestlanguagePackage#getTestLinewrapMinMax_Items() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/WrappingDataTypeTest.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/WrappingDataTypeTest.java index 94bedb3e2..221fd3226 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/WrappingDataTypeTest.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/WrappingDataTypeTest.java @@ -25,10 +25,6 @@ public interface WrappingDataTypeTest extends Root /** * Returns the value of the 'Datatype' attribute. * - *

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

* * @return the value of the 'Datatype' attribute. * @see #setDatatype(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/impl/AssignImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/impl/AssignImpl.java index fc0f445a0..c28928461 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/impl/AssignImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/impl/AssignImpl.java @@ -111,6 +111,7 @@ public class AssignImpl extends LineImpl implements Assign * * @generated */ + @Override public String getVar() { return var; @@ -121,6 +122,7 @@ public class AssignImpl extends LineImpl implements Assign * * @generated */ + @Override public void setVar(String newVar) { String oldVar = var; @@ -134,6 +136,7 @@ public class AssignImpl extends LineImpl implements Assign * * @generated */ + @Override public String getOp() { return op; @@ -144,6 +147,7 @@ public class AssignImpl extends LineImpl implements Assign * * @generated */ + @Override public void setOp(String newOp) { String oldOp = op; @@ -157,6 +161,7 @@ public class AssignImpl extends LineImpl implements Assign * * @generated */ + @Override public EList getVal() { if (val == null) @@ -264,7 +269,7 @@ public class AssignImpl extends LineImpl implements Assign { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (var: "); result.append(var); result.append(", op: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/impl/DatatypesImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/impl/DatatypesImpl.java index 357337645..260f6a8fa 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/impl/DatatypesImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/impl/DatatypesImpl.java @@ -115,6 +115,7 @@ public class DatatypesImpl extends LineImpl implements Datatypes * * @generated */ + @Override public String getVal1() { return val1; @@ -125,6 +126,7 @@ public class DatatypesImpl extends LineImpl implements Datatypes * * @generated */ + @Override public void setVal1(String newVal1) { String oldVal1 = val1; @@ -138,6 +140,7 @@ public class DatatypesImpl extends LineImpl implements Datatypes * * @generated */ + @Override public String getVal2() { return val2; @@ -148,6 +151,7 @@ public class DatatypesImpl extends LineImpl implements Datatypes * * @generated */ + @Override public void setVal2(String newVal2) { String oldVal2 = val2; @@ -161,6 +165,7 @@ public class DatatypesImpl extends LineImpl implements Datatypes * * @generated */ + @Override public String getVal3() { return val3; @@ -171,6 +176,7 @@ public class DatatypesImpl extends LineImpl implements Datatypes * * @generated */ + @Override public void setVal3(String newVal3) { String oldVal3 = val3; @@ -275,7 +281,7 @@ public class DatatypesImpl extends LineImpl implements Datatypes { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (val1: "); result.append(val1); result.append(", val2: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/impl/DeclImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/impl/DeclImpl.java index dc541292d..0826eaffb 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/impl/DeclImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/impl/DeclImpl.java @@ -76,6 +76,7 @@ public class DeclImpl extends LineImpl implements Decl * * @generated */ + @Override public EList getType() { if (type == null) @@ -90,6 +91,7 @@ public class DeclImpl extends LineImpl implements Decl * * @generated */ + @Override public EList getName() { if (name == null) @@ -188,7 +190,7 @@ public class DeclImpl extends LineImpl implements Decl { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (type: "); result.append(type); result.append(", name: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/impl/EnumerationImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/impl/EnumerationImpl.java index f44646e3f..09a28c893 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/impl/EnumerationImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/impl/EnumerationImpl.java @@ -66,6 +66,7 @@ public class EnumerationImpl extends LineImpl implements Enumeration * * @generated */ + @Override public EList getVal() { if (val == null) @@ -153,7 +154,7 @@ public class EnumerationImpl extends LineImpl implements Enumeration { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (val: "); result.append(val); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/impl/FormattertestlanguageFactoryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/impl/FormattertestlanguageFactoryImpl.java index edaa404b5..4f4b5014c 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/impl/FormattertestlanguageFactoryImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/impl/FormattertestlanguageFactoryImpl.java @@ -129,6 +129,7 @@ public class FormattertestlanguageFactoryImpl extends EFactoryImpl implements Fo * * @generated */ + @Override public Root createRoot() { RootImpl root = new RootImpl(); @@ -140,6 +141,7 @@ public class FormattertestlanguageFactoryImpl extends EFactoryImpl implements Fo * * @generated */ + @Override public Line createLine() { LineImpl line = new LineImpl(); @@ -151,6 +153,7 @@ public class FormattertestlanguageFactoryImpl extends EFactoryImpl implements Fo * * @generated */ + @Override public Decl createDecl() { DeclImpl decl = new DeclImpl(); @@ -162,6 +165,7 @@ public class FormattertestlanguageFactoryImpl extends EFactoryImpl implements Fo * * @generated */ + @Override public Assign createAssign() { AssignImpl assign = new AssignImpl(); @@ -173,6 +177,7 @@ public class FormattertestlanguageFactoryImpl extends EFactoryImpl implements Fo * * @generated */ + @Override public Meth createMeth() { MethImpl meth = new MethImpl(); @@ -184,6 +189,7 @@ public class FormattertestlanguageFactoryImpl extends EFactoryImpl implements Fo * * @generated */ + @Override public Param createParam() { ParamImpl param = new ParamImpl(); @@ -195,6 +201,7 @@ public class FormattertestlanguageFactoryImpl extends EFactoryImpl implements Fo * * @generated */ + @Override public Space createSpace() { SpaceImpl space = new SpaceImpl(); @@ -206,6 +213,7 @@ public class FormattertestlanguageFactoryImpl extends EFactoryImpl implements Fo * * @generated */ + @Override public TestLinewrap createTestLinewrap() { TestLinewrapImpl testLinewrap = new TestLinewrapImpl(); @@ -217,6 +225,7 @@ public class FormattertestlanguageFactoryImpl extends EFactoryImpl implements Fo * * @generated */ + @Override public TestLinewrapMinMax createTestLinewrapMinMax() { TestLinewrapMinMaxImpl testLinewrapMinMax = new TestLinewrapMinMaxImpl(); @@ -228,6 +237,7 @@ public class FormattertestlanguageFactoryImpl extends EFactoryImpl implements Fo * * @generated */ + @Override public TestIndentation createTestIndentation() { TestIndentationImpl testIndentation = new TestIndentationImpl(); @@ -239,6 +249,7 @@ public class FormattertestlanguageFactoryImpl extends EFactoryImpl implements Fo * * @generated */ + @Override public FqnObj createFqnObj() { FqnObjImpl fqnObj = new FqnObjImpl(); @@ -250,6 +261,7 @@ public class FormattertestlanguageFactoryImpl extends EFactoryImpl implements Fo * * @generated */ + @Override public FqnRef createFqnRef() { FqnRefImpl fqnRef = new FqnRefImpl(); @@ -261,6 +273,7 @@ public class FormattertestlanguageFactoryImpl extends EFactoryImpl implements Fo * * @generated */ + @Override public Enumeration createEnumeration() { EnumerationImpl enumeration = new EnumerationImpl(); @@ -272,6 +285,7 @@ public class FormattertestlanguageFactoryImpl extends EFactoryImpl implements Fo * * @generated */ + @Override public SuppressedHidden createSuppressedHidden() { SuppressedHiddenImpl suppressedHidden = new SuppressedHiddenImpl(); @@ -283,6 +297,7 @@ public class FormattertestlanguageFactoryImpl extends EFactoryImpl implements Fo * * @generated */ + @Override public SuppressedHiddenSub createSuppressedHiddenSub() { SuppressedHiddenSubImpl suppressedHiddenSub = new SuppressedHiddenSubImpl(); @@ -294,6 +309,7 @@ public class FormattertestlanguageFactoryImpl extends EFactoryImpl implements Fo * * @generated */ + @Override public SuppressedHiddenSubSub createSuppressedHiddenSubSub() { SuppressedHiddenSubSubImpl suppressedHiddenSubSub = new SuppressedHiddenSubSubImpl(); @@ -305,6 +321,7 @@ public class FormattertestlanguageFactoryImpl extends EFactoryImpl implements Fo * * @generated */ + @Override public SuppressedHiddenSubID createSuppressedHiddenSubID() { SuppressedHiddenSubIDImpl suppressedHiddenSubID = new SuppressedHiddenSubIDImpl(); @@ -316,6 +333,7 @@ public class FormattertestlanguageFactoryImpl extends EFactoryImpl implements Fo * * @generated */ + @Override public Datatypes createDatatypes() { DatatypesImpl datatypes = new DatatypesImpl(); @@ -327,6 +345,7 @@ public class FormattertestlanguageFactoryImpl extends EFactoryImpl implements Fo * * @generated */ + @Override public WrappingDataTypeTest createWrappingDataTypeTest() { WrappingDataTypeTestImpl wrappingDataTypeTest = new WrappingDataTypeTestImpl(); @@ -360,6 +379,7 @@ public class FormattertestlanguageFactoryImpl extends EFactoryImpl implements Fo * * @generated */ + @Override public FormattertestlanguagePackage getFormattertestlanguagePackage() { return (FormattertestlanguagePackage)getEPackage(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/impl/FormattertestlanguagePackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/impl/FormattertestlanguagePackageImpl.java index 51fa389c3..bd2083b80 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/impl/FormattertestlanguagePackageImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/impl/FormattertestlanguagePackageImpl.java @@ -212,7 +212,7 @@ public class FormattertestlanguagePackageImpl extends EPackageImpl implements Fo /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link FormattertestlanguagePackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -227,7 +227,8 @@ public class FormattertestlanguagePackageImpl extends EPackageImpl implements Fo if (isInited) return (FormattertestlanguagePackage)EPackage.Registry.INSTANCE.getEPackage(FormattertestlanguagePackage.eNS_URI); // Obtain or create and register package - FormattertestlanguagePackageImpl theFormattertestlanguagePackage = (FormattertestlanguagePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof FormattertestlanguagePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new FormattertestlanguagePackageImpl()); + Object registeredFormattertestlanguagePackage = EPackage.Registry.INSTANCE.get(eNS_URI); + FormattertestlanguagePackageImpl theFormattertestlanguagePackage = registeredFormattertestlanguagePackage instanceof FormattertestlanguagePackageImpl ? (FormattertestlanguagePackageImpl)registeredFormattertestlanguagePackage : new FormattertestlanguagePackageImpl(); isInited = true; @@ -243,7 +244,6 @@ public class FormattertestlanguagePackageImpl extends EPackageImpl implements Fo // Mark meta-data to indicate it can't be changed theFormattertestlanguagePackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(FormattertestlanguagePackage.eNS_URI, theFormattertestlanguagePackage); return theFormattertestlanguagePackage; @@ -254,6 +254,7 @@ public class FormattertestlanguagePackageImpl extends EPackageImpl implements Fo * * @generated */ + @Override public EClass getRoot() { return rootEClass; @@ -264,6 +265,7 @@ public class FormattertestlanguagePackageImpl extends EPackageImpl implements Fo * * @generated */ + @Override public EClass getLine() { return lineEClass; @@ -274,6 +276,7 @@ public class FormattertestlanguagePackageImpl extends EPackageImpl implements Fo * * @generated */ + @Override public EClass getDecl() { return declEClass; @@ -284,6 +287,7 @@ public class FormattertestlanguagePackageImpl extends EPackageImpl implements Fo * * @generated */ + @Override public EAttribute getDecl_Type() { return (EAttribute)declEClass.getEStructuralFeatures().get(0); @@ -294,6 +298,7 @@ public class FormattertestlanguagePackageImpl extends EPackageImpl implements Fo * * @generated */ + @Override public EAttribute getDecl_Name() { return (EAttribute)declEClass.getEStructuralFeatures().get(1); @@ -304,6 +309,7 @@ public class FormattertestlanguagePackageImpl extends EPackageImpl implements Fo * * @generated */ + @Override public EClass getAssign() { return assignEClass; @@ -314,6 +320,7 @@ public class FormattertestlanguagePackageImpl extends EPackageImpl implements Fo * * @generated */ + @Override public EAttribute getAssign_Var() { return (EAttribute)assignEClass.getEStructuralFeatures().get(0); @@ -324,6 +331,7 @@ public class FormattertestlanguagePackageImpl extends EPackageImpl implements Fo * * @generated */ + @Override public EAttribute getAssign_Op() { return (EAttribute)assignEClass.getEStructuralFeatures().get(1); @@ -334,6 +342,7 @@ public class FormattertestlanguagePackageImpl extends EPackageImpl implements Fo * * @generated */ + @Override public EAttribute getAssign_Val() { return (EAttribute)assignEClass.getEStructuralFeatures().get(2); @@ -344,6 +353,7 @@ public class FormattertestlanguagePackageImpl extends EPackageImpl implements Fo * * @generated */ + @Override public EClass getMeth() { return methEClass; @@ -354,6 +364,7 @@ public class FormattertestlanguagePackageImpl extends EPackageImpl implements Fo * * @generated */ + @Override public EAttribute getMeth_Name() { return (EAttribute)methEClass.getEStructuralFeatures().get(0); @@ -364,6 +375,7 @@ public class FormattertestlanguagePackageImpl extends EPackageImpl implements Fo * * @generated */ + @Override public EReference getMeth_Param() { return (EReference)methEClass.getEStructuralFeatures().get(1); @@ -374,6 +386,7 @@ public class FormattertestlanguagePackageImpl extends EPackageImpl implements Fo * * @generated */ + @Override public EClass getParam() { return paramEClass; @@ -384,6 +397,7 @@ public class FormattertestlanguagePackageImpl extends EPackageImpl implements Fo * * @generated */ + @Override public EAttribute getParam_Name() { return (EAttribute)paramEClass.getEStructuralFeatures().get(0); @@ -394,6 +408,7 @@ public class FormattertestlanguagePackageImpl extends EPackageImpl implements Fo * * @generated */ + @Override public EAttribute getParam_Type() { return (EAttribute)paramEClass.getEStructuralFeatures().get(1); @@ -404,6 +419,7 @@ public class FormattertestlanguagePackageImpl extends EPackageImpl implements Fo * * @generated */ + @Override public EClass getSpace() { return spaceEClass; @@ -414,6 +430,7 @@ public class FormattertestlanguagePackageImpl extends EPackageImpl implements Fo * * @generated */ + @Override public EAttribute getSpace_Val() { return (EAttribute)spaceEClass.getEStructuralFeatures().get(0); @@ -424,6 +441,7 @@ public class FormattertestlanguagePackageImpl extends EPackageImpl implements Fo * * @generated */ + @Override public EClass getTestLinewrap() { return testLinewrapEClass; @@ -434,6 +452,7 @@ public class FormattertestlanguagePackageImpl extends EPackageImpl implements Fo * * @generated */ + @Override public EReference getTestLinewrap_Items() { return (EReference)testLinewrapEClass.getEStructuralFeatures().get(0); @@ -444,6 +463,7 @@ public class FormattertestlanguagePackageImpl extends EPackageImpl implements Fo * * @generated */ + @Override public EClass getTestLinewrapMinMax() { return testLinewrapMinMaxEClass; @@ -454,6 +474,7 @@ public class FormattertestlanguagePackageImpl extends EPackageImpl implements Fo * * @generated */ + @Override public EReference getTestLinewrapMinMax_Items() { return (EReference)testLinewrapMinMaxEClass.getEStructuralFeatures().get(0); @@ -464,6 +485,7 @@ public class FormattertestlanguagePackageImpl extends EPackageImpl implements Fo * * @generated */ + @Override public EClass getTestIndentation() { return testIndentationEClass; @@ -474,6 +496,7 @@ public class FormattertestlanguagePackageImpl extends EPackageImpl implements Fo * * @generated */ + @Override public EReference getTestIndentation_Items() { return (EReference)testIndentationEClass.getEStructuralFeatures().get(0); @@ -484,6 +507,7 @@ public class FormattertestlanguagePackageImpl extends EPackageImpl implements Fo * * @generated */ + @Override public EAttribute getTestIndentation_Semi() { return (EAttribute)testIndentationEClass.getEStructuralFeatures().get(1); @@ -494,6 +518,7 @@ public class FormattertestlanguagePackageImpl extends EPackageImpl implements Fo * * @generated */ + @Override public EClass getFqnObj() { return fqnObjEClass; @@ -504,6 +529,7 @@ public class FormattertestlanguagePackageImpl extends EPackageImpl implements Fo * * @generated */ + @Override public EAttribute getFqnObj_Name() { return (EAttribute)fqnObjEClass.getEStructuralFeatures().get(0); @@ -514,6 +540,7 @@ public class FormattertestlanguagePackageImpl extends EPackageImpl implements Fo * * @generated */ + @Override public EClass getFqnRef() { return fqnRefEClass; @@ -524,6 +551,7 @@ public class FormattertestlanguagePackageImpl extends EPackageImpl implements Fo * * @generated */ + @Override public EReference getFqnRef_Ref() { return (EReference)fqnRefEClass.getEStructuralFeatures().get(0); @@ -534,6 +562,7 @@ public class FormattertestlanguagePackageImpl extends EPackageImpl implements Fo * * @generated */ + @Override public EClass getEnumeration() { return enumerationEClass; @@ -544,6 +573,7 @@ public class FormattertestlanguagePackageImpl extends EPackageImpl implements Fo * * @generated */ + @Override public EAttribute getEnumeration_Val() { return (EAttribute)enumerationEClass.getEStructuralFeatures().get(0); @@ -554,6 +584,7 @@ public class FormattertestlanguagePackageImpl extends EPackageImpl implements Fo * * @generated */ + @Override public EClass getSuppressedHidden() { return suppressedHiddenEClass; @@ -564,6 +595,7 @@ public class FormattertestlanguagePackageImpl extends EPackageImpl implements Fo * * @generated */ + @Override public EReference getSuppressedHidden_Vals() { return (EReference)suppressedHiddenEClass.getEStructuralFeatures().get(0); @@ -574,6 +606,7 @@ public class FormattertestlanguagePackageImpl extends EPackageImpl implements Fo * * @generated */ + @Override public EClass getSuppressedHiddenSub() { return suppressedHiddenSubEClass; @@ -584,6 +617,7 @@ public class FormattertestlanguagePackageImpl extends EPackageImpl implements Fo * * @generated */ + @Override public EAttribute getSuppressedHiddenSub_Idval() { return (EAttribute)suppressedHiddenSubEClass.getEStructuralFeatures().get(0); @@ -594,6 +628,7 @@ public class FormattertestlanguagePackageImpl extends EPackageImpl implements Fo * * @generated */ + @Override public EClass getSuppressedHiddenSubSub() { return suppressedHiddenSubSubEClass; @@ -604,6 +639,7 @@ public class FormattertestlanguagePackageImpl extends EPackageImpl implements Fo * * @generated */ + @Override public EClass getSuppressedHiddenSubID() { return suppressedHiddenSubIDEClass; @@ -614,6 +650,7 @@ public class FormattertestlanguagePackageImpl extends EPackageImpl implements Fo * * @generated */ + @Override public EClass getDatatypes() { return datatypesEClass; @@ -624,6 +661,7 @@ public class FormattertestlanguagePackageImpl extends EPackageImpl implements Fo * * @generated */ + @Override public EAttribute getDatatypes_Val1() { return (EAttribute)datatypesEClass.getEStructuralFeatures().get(0); @@ -634,6 +672,7 @@ public class FormattertestlanguagePackageImpl extends EPackageImpl implements Fo * * @generated */ + @Override public EAttribute getDatatypes_Val2() { return (EAttribute)datatypesEClass.getEStructuralFeatures().get(1); @@ -644,6 +683,7 @@ public class FormattertestlanguagePackageImpl extends EPackageImpl implements Fo * * @generated */ + @Override public EAttribute getDatatypes_Val3() { return (EAttribute)datatypesEClass.getEStructuralFeatures().get(2); @@ -654,6 +694,7 @@ public class FormattertestlanguagePackageImpl extends EPackageImpl implements Fo * * @generated */ + @Override public EClass getWrappingDataTypeTest() { return wrappingDataTypeTestEClass; @@ -664,6 +705,7 @@ public class FormattertestlanguagePackageImpl extends EPackageImpl implements Fo * * @generated */ + @Override public EAttribute getWrappingDataTypeTest_Datatype() { return (EAttribute)wrappingDataTypeTestEClass.getEStructuralFeatures().get(0); @@ -674,6 +716,7 @@ public class FormattertestlanguagePackageImpl extends EPackageImpl implements Fo * * @generated */ + @Override public EEnum getEnum1() { return enum1EEnum; @@ -684,6 +727,7 @@ public class FormattertestlanguagePackageImpl extends EPackageImpl implements Fo * * @generated */ + @Override public FormattertestlanguageFactory getFormattertestlanguageFactory() { return (FormattertestlanguageFactory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/impl/FqnObjImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/impl/FqnObjImpl.java index 7e2e6e652..37f09e46e 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/impl/FqnObjImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/impl/FqnObjImpl.java @@ -73,6 +73,7 @@ public class FqnObjImpl extends LineImpl implements FqnObj * * @generated */ + @Override public String getName() { return name; @@ -83,6 +84,7 @@ public class FqnObjImpl extends LineImpl implements FqnObj * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -167,7 +169,7 @@ public class FqnObjImpl extends LineImpl implements FqnObj { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/impl/FqnRefImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/impl/FqnRefImpl.java index 9b4684734..628574179 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/impl/FqnRefImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/impl/FqnRefImpl.java @@ -65,6 +65,7 @@ public class FqnRefImpl extends LineImpl implements FqnRef * * @generated */ + @Override public FqnObj getRef() { if (ref != null && ref.eIsProxy()) @@ -95,6 +96,7 @@ public class FqnRefImpl extends LineImpl implements FqnRef * * @generated */ + @Override public void setRef(FqnObj newRef) { FqnObj oldRef = ref; diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/impl/MethImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/impl/MethImpl.java index 859273170..a3a348f35 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/impl/MethImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/impl/MethImpl.java @@ -94,6 +94,7 @@ public class MethImpl extends LineImpl implements Meth * * @generated */ + @Override public String getName() { return name; @@ -104,6 +105,7 @@ public class MethImpl extends LineImpl implements Meth * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -117,6 +119,7 @@ public class MethImpl extends LineImpl implements Meth * * @generated */ + @Override public EList getParam() { if (param == null) @@ -230,7 +233,7 @@ public class MethImpl extends LineImpl implements Meth { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/impl/ParamImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/impl/ParamImpl.java index 2f56bd529..59d4a1f91 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/impl/ParamImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/impl/ParamImpl.java @@ -78,6 +78,7 @@ public class ParamImpl extends MinimalEObjectImpl.Container implements Param * * @generated */ + @Override public EList getName() { if (name == null) @@ -92,6 +93,7 @@ public class ParamImpl extends MinimalEObjectImpl.Container implements Param * * @generated */ + @Override public EList getType() { if (type == null) @@ -190,7 +192,7 @@ public class ParamImpl extends MinimalEObjectImpl.Container implements Param { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(", type: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/impl/SpaceImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/impl/SpaceImpl.java index d284777e9..795dba8f6 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/impl/SpaceImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/impl/SpaceImpl.java @@ -73,6 +73,7 @@ public class SpaceImpl extends LineImpl implements Space * * @generated */ + @Override public String getVal() { return val; @@ -83,6 +84,7 @@ public class SpaceImpl extends LineImpl implements Space * * @generated */ + @Override public void setVal(String newVal) { String oldVal = val; @@ -167,7 +169,7 @@ public class SpaceImpl extends LineImpl implements Space { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (val: "); result.append(val); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/impl/SuppressedHiddenImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/impl/SuppressedHiddenImpl.java index 64b045e15..d1c8e7369 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/impl/SuppressedHiddenImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/impl/SuppressedHiddenImpl.java @@ -70,6 +70,7 @@ public class SuppressedHiddenImpl extends LineImpl implements SuppressedHidden * * @generated */ + @Override public EList getVals() { if (vals == null) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/impl/SuppressedHiddenSubImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/impl/SuppressedHiddenSubImpl.java index 3f11e35cd..040b392d3 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/impl/SuppressedHiddenSubImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/impl/SuppressedHiddenSubImpl.java @@ -74,6 +74,7 @@ public class SuppressedHiddenSubImpl extends MinimalEObjectImpl.Container implem * * @generated */ + @Override public String getIdval() { return idval; @@ -84,6 +85,7 @@ public class SuppressedHiddenSubImpl extends MinimalEObjectImpl.Container implem * * @generated */ + @Override public void setIdval(String newIdval) { String oldIdval = idval; @@ -168,7 +170,7 @@ public class SuppressedHiddenSubImpl extends MinimalEObjectImpl.Container implem { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (idval: "); result.append(idval); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/impl/TestIndentationImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/impl/TestIndentationImpl.java index d6c519e32..6baa47587 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/impl/TestIndentationImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/impl/TestIndentationImpl.java @@ -94,6 +94,7 @@ public class TestIndentationImpl extends RootImpl implements TestIndentation * * @generated */ + @Override public EList getItems() { if (items == null) @@ -108,6 +109,7 @@ public class TestIndentationImpl extends RootImpl implements TestIndentation * * @generated */ + @Override public boolean isSemi() { return semi; @@ -118,6 +120,7 @@ public class TestIndentationImpl extends RootImpl implements TestIndentation * * @generated */ + @Override public void setSemi(boolean newSemi) { boolean oldSemi = semi; @@ -230,7 +233,7 @@ public class TestIndentationImpl extends RootImpl implements TestIndentation { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (semi: "); result.append(semi); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/impl/TestLinewrapImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/impl/TestLinewrapImpl.java index 8c650a91b..7e6f388f6 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/impl/TestLinewrapImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/impl/TestLinewrapImpl.java @@ -70,6 +70,7 @@ public class TestLinewrapImpl extends RootImpl implements TestLinewrap * * @generated */ + @Override public EList getItems() { if (items == null) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/impl/TestLinewrapMinMaxImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/impl/TestLinewrapMinMaxImpl.java index 6aa5a558d..5b7527099 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/impl/TestLinewrapMinMaxImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/impl/TestLinewrapMinMaxImpl.java @@ -70,6 +70,7 @@ public class TestLinewrapMinMaxImpl extends RootImpl implements TestLinewrapMinM * * @generated */ + @Override public EList getItems() { if (items == null) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/impl/WrappingDataTypeTestImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/impl/WrappingDataTypeTestImpl.java index 18b253f40..4c7672ae2 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/impl/WrappingDataTypeTestImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage/impl/WrappingDataTypeTestImpl.java @@ -73,6 +73,7 @@ public class WrappingDataTypeTestImpl extends RootImpl implements WrappingDataTy * * @generated */ + @Override public String getDatatype() { return datatype; @@ -83,6 +84,7 @@ public class WrappingDataTypeTestImpl extends RootImpl implements WrappingDataTy * * @generated */ + @Override public void setDatatype(String newDatatype) { String oldDatatype = datatype; @@ -167,7 +169,7 @@ public class WrappingDataTypeTestImpl extends RootImpl implements WrappingDataTy { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (datatype: "); result.append(datatype); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage2/Root.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage2/Root.java index 49abb4a08..e2b78923d 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage2/Root.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage2/Root.java @@ -26,10 +26,6 @@ public interface Root 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) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage2/impl/Formattertestlanguage2FactoryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage2/impl/Formattertestlanguage2FactoryImpl.java index fbea614b5..282ddcd91 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage2/impl/Formattertestlanguage2FactoryImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage2/impl/Formattertestlanguage2FactoryImpl.java @@ -76,6 +76,7 @@ public class Formattertestlanguage2FactoryImpl extends EFactoryImpl implements F * * @generated */ + @Override public Root createRoot() { RootImpl root = new RootImpl(); @@ -87,6 +88,7 @@ public class Formattertestlanguage2FactoryImpl extends EFactoryImpl implements F * * @generated */ + @Override public Formattertestlanguage2Package getFormattertestlanguage2Package() { return (Formattertestlanguage2Package)getEPackage(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage2/impl/Formattertestlanguage2PackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage2/impl/Formattertestlanguage2PackageImpl.java index 51b62645a..ecde103e1 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage2/impl/Formattertestlanguage2PackageImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage2/impl/Formattertestlanguage2PackageImpl.java @@ -58,7 +58,7 @@ public class Formattertestlanguage2PackageImpl extends EPackageImpl implements F /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link Formattertestlanguage2Package#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -73,7 +73,8 @@ public class Formattertestlanguage2PackageImpl extends EPackageImpl implements F if (isInited) return (Formattertestlanguage2Package)EPackage.Registry.INSTANCE.getEPackage(Formattertestlanguage2Package.eNS_URI); // Obtain or create and register package - Formattertestlanguage2PackageImpl theFormattertestlanguage2Package = (Formattertestlanguage2PackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof Formattertestlanguage2PackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new Formattertestlanguage2PackageImpl()); + Object registeredFormattertestlanguage2Package = EPackage.Registry.INSTANCE.get(eNS_URI); + Formattertestlanguage2PackageImpl theFormattertestlanguage2Package = registeredFormattertestlanguage2Package instanceof Formattertestlanguage2PackageImpl ? (Formattertestlanguage2PackageImpl)registeredFormattertestlanguage2Package : new Formattertestlanguage2PackageImpl(); isInited = true; @@ -89,7 +90,6 @@ public class Formattertestlanguage2PackageImpl extends EPackageImpl implements F // Mark meta-data to indicate it can't be changed theFormattertestlanguage2Package.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(Formattertestlanguage2Package.eNS_URI, theFormattertestlanguage2Package); return theFormattertestlanguage2Package; @@ -100,6 +100,7 @@ public class Formattertestlanguage2PackageImpl extends EPackageImpl implements F * * @generated */ + @Override public EClass getRoot() { return rootEClass; @@ -110,6 +111,7 @@ public class Formattertestlanguage2PackageImpl extends EPackageImpl implements F * * @generated */ + @Override public EAttribute getRoot_Name() { return (EAttribute)rootEClass.getEStructuralFeatures().get(0); @@ -120,6 +122,7 @@ public class Formattertestlanguage2PackageImpl extends EPackageImpl implements F * * @generated */ + @Override public Formattertestlanguage2Factory getFormattertestlanguage2Factory() { return (Formattertestlanguage2Factory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage2/impl/RootImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage2/impl/RootImpl.java index aec86437b..39fdd7812 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage2/impl/RootImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/formattertestlanguage2/impl/RootImpl.java @@ -74,6 +74,7 @@ public class RootImpl extends MinimalEObjectImpl.Container implements Root * * @generated */ + @Override public String getName() { return name; @@ -84,6 +85,7 @@ public class RootImpl extends MinimalEObjectImpl.Container implements Root * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -168,7 +170,7 @@ public class RootImpl extends MinimalEObjectImpl.Container implements Root { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/impl/Bug305397.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/impl/Bug305397.genmodel index 68d7354c5..71ca64e52 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/impl/Bug305397.genmodel +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/impl/Bug305397.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="Bug305397" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> + complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/impl/CommentAssociationTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/impl/CommentAssociationTestLanguage.genmodel index 3cab84e50..994f5e0fd 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/impl/CommentAssociationTestLanguage.genmodel +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/impl/CommentAssociationTestLanguage.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="CommentAssociationTestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> + complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/impl/bug305397/Element.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/impl/bug305397/Element.java index d443b243a..55ca9639e 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/impl/bug305397/Element.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/impl/bug305397/Element.java @@ -30,10 +30,6 @@ public interface Element extends EObject /** * Returns the value of the 'A' attribute. * - *

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

* * @return the value of the 'A' attribute. * @see #setA(boolean) @@ -56,10 +52,6 @@ public interface Element 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) @@ -83,10 +75,6 @@ public interface Element extends EObject * Returns the value of the 'Elements' containment reference list. * The list contents are of type {@link org.eclipse.xtext.parsetree.impl.bug305397.Element}. * - *

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

* * @return the value of the 'Elements' containment reference list. * @see org.eclipse.xtext.parsetree.impl.bug305397.Bug305397Package#getElement_Elements() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/impl/bug305397/Model.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/impl/bug305397/Model.java index a221b2add..eab007723 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/impl/bug305397/Model.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/impl/bug305397/Model.java @@ -29,10 +29,6 @@ public interface Model extends EObject * Returns the value of the 'Elements' containment reference list. * The list contents are of type {@link org.eclipse.xtext.parsetree.impl.bug305397.Element}. * - *

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

* * @return the value of the 'Elements' containment reference list. * @see org.eclipse.xtext.parsetree.impl.bug305397.Bug305397Package#getModel_Elements() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/impl/bug305397/impl/Bug305397FactoryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/impl/bug305397/impl/Bug305397FactoryImpl.java index 841b42341..ccc42d14d 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/impl/bug305397/impl/Bug305397FactoryImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/impl/bug305397/impl/Bug305397FactoryImpl.java @@ -77,6 +77,7 @@ public class Bug305397FactoryImpl extends EFactoryImpl implements Bug305397Facto * * @generated */ + @Override public Model createModel() { ModelImpl model = new ModelImpl(); @@ -88,6 +89,7 @@ public class Bug305397FactoryImpl extends EFactoryImpl implements Bug305397Facto * * @generated */ + @Override public Element createElement() { ElementImpl element = new ElementImpl(); @@ -99,6 +101,7 @@ public class Bug305397FactoryImpl extends EFactoryImpl implements Bug305397Facto * * @generated */ + @Override public Bug305397Package getBug305397Package() { return (Bug305397Package)getEPackage(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/impl/bug305397/impl/Bug305397PackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/impl/bug305397/impl/Bug305397PackageImpl.java index c10a67182..2f16d111e 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/impl/bug305397/impl/Bug305397PackageImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/impl/bug305397/impl/Bug305397PackageImpl.java @@ -67,7 +67,7 @@ public class Bug305397PackageImpl extends EPackageImpl implements Bug305397Packa /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link Bug305397Package#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -82,7 +82,8 @@ public class Bug305397PackageImpl extends EPackageImpl implements Bug305397Packa if (isInited) return (Bug305397Package)EPackage.Registry.INSTANCE.getEPackage(Bug305397Package.eNS_URI); // Obtain or create and register package - Bug305397PackageImpl theBug305397Package = (Bug305397PackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof Bug305397PackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new Bug305397PackageImpl()); + Object registeredBug305397Package = EPackage.Registry.INSTANCE.get(eNS_URI); + Bug305397PackageImpl theBug305397Package = registeredBug305397Package instanceof Bug305397PackageImpl ? (Bug305397PackageImpl)registeredBug305397Package : new Bug305397PackageImpl(); isInited = true; @@ -98,7 +99,6 @@ public class Bug305397PackageImpl extends EPackageImpl implements Bug305397Packa // Mark meta-data to indicate it can't be changed theBug305397Package.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(Bug305397Package.eNS_URI, theBug305397Package); return theBug305397Package; @@ -109,6 +109,7 @@ public class Bug305397PackageImpl extends EPackageImpl implements Bug305397Packa * * @generated */ + @Override public EClass getModel() { return modelEClass; @@ -119,6 +120,7 @@ public class Bug305397PackageImpl extends EPackageImpl implements Bug305397Packa * * @generated */ + @Override public EReference getModel_Elements() { return (EReference)modelEClass.getEStructuralFeatures().get(0); @@ -129,6 +131,7 @@ public class Bug305397PackageImpl extends EPackageImpl implements Bug305397Packa * * @generated */ + @Override public EClass getElement() { return elementEClass; @@ -139,6 +142,7 @@ public class Bug305397PackageImpl extends EPackageImpl implements Bug305397Packa * * @generated */ + @Override public EAttribute getElement_A() { return (EAttribute)elementEClass.getEStructuralFeatures().get(0); @@ -149,6 +153,7 @@ public class Bug305397PackageImpl extends EPackageImpl implements Bug305397Packa * * @generated */ + @Override public EAttribute getElement_Name() { return (EAttribute)elementEClass.getEStructuralFeatures().get(1); @@ -159,6 +164,7 @@ public class Bug305397PackageImpl extends EPackageImpl implements Bug305397Packa * * @generated */ + @Override public EReference getElement_Elements() { return (EReference)elementEClass.getEStructuralFeatures().get(2); @@ -169,6 +175,7 @@ public class Bug305397PackageImpl extends EPackageImpl implements Bug305397Packa * * @generated */ + @Override public Bug305397Factory getBug305397Factory() { return (Bug305397Factory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/impl/bug305397/impl/ElementImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/impl/bug305397/impl/ElementImpl.java index d82cff9db..02033e77b 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/impl/bug305397/impl/ElementImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/impl/bug305397/impl/ElementImpl.java @@ -115,6 +115,7 @@ public class ElementImpl extends MinimalEObjectImpl.Container implements Element * * @generated */ + @Override public boolean isA() { return a; @@ -125,6 +126,7 @@ public class ElementImpl extends MinimalEObjectImpl.Container implements Element * * @generated */ + @Override public void setA(boolean newA) { boolean oldA = a; @@ -138,6 +140,7 @@ public class ElementImpl extends MinimalEObjectImpl.Container implements Element * * @generated */ + @Override public String getName() { return name; @@ -148,6 +151,7 @@ public class ElementImpl extends MinimalEObjectImpl.Container implements Element * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -161,6 +165,7 @@ public class ElementImpl extends MinimalEObjectImpl.Container implements Element * * @generated */ + @Override public EList getElements() { if (elements == null) @@ -284,7 +289,7 @@ public class ElementImpl extends MinimalEObjectImpl.Container implements Element { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (a: "); result.append(a); result.append(", name: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/impl/bug305397/impl/ModelImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/impl/bug305397/impl/ModelImpl.java index 6f36c5c1d..30f31c96d 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/impl/bug305397/impl/ModelImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/impl/bug305397/impl/ModelImpl.java @@ -72,6 +72,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public EList getElements() { if (elements == null) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/impl/commentAssociation/Element.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/impl/commentAssociation/Element.java index f4a145e72..f22474d45 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/impl/commentAssociation/Element.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/impl/commentAssociation/Element.java @@ -27,10 +27,6 @@ public interface Element 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) @@ -53,10 +49,6 @@ public interface Element extends EObject /** * Returns the value of the 'Child' containment reference. * - *

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

* * @return the value of the 'Child' containment reference. * @see #setChild(Element) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/impl/commentAssociation/Model.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/impl/commentAssociation/Model.java index bd24a24cc..19b6ae370 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/impl/commentAssociation/Model.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/impl/commentAssociation/Model.java @@ -29,10 +29,6 @@ public interface Model extends EObject * Returns the value of the 'Elements' containment reference list. * The list contents are of type {@link org.eclipse.xtext.parsetree.impl.commentAssociation.Element}. * - *

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

* * @return the value of the 'Elements' containment reference list. * @see org.eclipse.xtext.parsetree.impl.commentAssociation.CommentAssociationPackage#getModel_Elements() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/impl/commentAssociation/impl/CommentAssociationFactoryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/impl/commentAssociation/impl/CommentAssociationFactoryImpl.java index b205b1c1d..c1b3395b4 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/impl/commentAssociation/impl/CommentAssociationFactoryImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/impl/commentAssociation/impl/CommentAssociationFactoryImpl.java @@ -77,6 +77,7 @@ public class CommentAssociationFactoryImpl extends EFactoryImpl implements Comme * * @generated */ + @Override public Model createModel() { ModelImpl model = new ModelImpl(); @@ -88,6 +89,7 @@ public class CommentAssociationFactoryImpl extends EFactoryImpl implements Comme * * @generated */ + @Override public Element createElement() { ElementImpl element = new ElementImpl(); @@ -99,6 +101,7 @@ public class CommentAssociationFactoryImpl extends EFactoryImpl implements Comme * * @generated */ + @Override public CommentAssociationPackage getCommentAssociationPackage() { return (CommentAssociationPackage)getEPackage(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/impl/commentAssociation/impl/CommentAssociationPackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/impl/commentAssociation/impl/CommentAssociationPackageImpl.java index bade0cfee..a92740713 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/impl/commentAssociation/impl/CommentAssociationPackageImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/impl/commentAssociation/impl/CommentAssociationPackageImpl.java @@ -67,7 +67,7 @@ public class CommentAssociationPackageImpl extends EPackageImpl implements Comme /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link CommentAssociationPackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -82,7 +82,8 @@ public class CommentAssociationPackageImpl extends EPackageImpl implements Comme if (isInited) return (CommentAssociationPackage)EPackage.Registry.INSTANCE.getEPackage(CommentAssociationPackage.eNS_URI); // Obtain or create and register package - CommentAssociationPackageImpl theCommentAssociationPackage = (CommentAssociationPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof CommentAssociationPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new CommentAssociationPackageImpl()); + Object registeredCommentAssociationPackage = EPackage.Registry.INSTANCE.get(eNS_URI); + CommentAssociationPackageImpl theCommentAssociationPackage = registeredCommentAssociationPackage instanceof CommentAssociationPackageImpl ? (CommentAssociationPackageImpl)registeredCommentAssociationPackage : new CommentAssociationPackageImpl(); isInited = true; @@ -98,7 +99,6 @@ public class CommentAssociationPackageImpl extends EPackageImpl implements Comme // Mark meta-data to indicate it can't be changed theCommentAssociationPackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(CommentAssociationPackage.eNS_URI, theCommentAssociationPackage); return theCommentAssociationPackage; @@ -109,6 +109,7 @@ public class CommentAssociationPackageImpl extends EPackageImpl implements Comme * * @generated */ + @Override public EClass getModel() { return modelEClass; @@ -119,6 +120,7 @@ public class CommentAssociationPackageImpl extends EPackageImpl implements Comme * * @generated */ + @Override public EReference getModel_Elements() { return (EReference)modelEClass.getEStructuralFeatures().get(0); @@ -129,6 +131,7 @@ public class CommentAssociationPackageImpl extends EPackageImpl implements Comme * * @generated */ + @Override public EClass getElement() { return elementEClass; @@ -139,6 +142,7 @@ public class CommentAssociationPackageImpl extends EPackageImpl implements Comme * * @generated */ + @Override public EAttribute getElement_Name() { return (EAttribute)elementEClass.getEStructuralFeatures().get(0); @@ -149,6 +153,7 @@ public class CommentAssociationPackageImpl extends EPackageImpl implements Comme * * @generated */ + @Override public EReference getElement_Child() { return (EReference)elementEClass.getEStructuralFeatures().get(1); @@ -159,6 +164,7 @@ public class CommentAssociationPackageImpl extends EPackageImpl implements Comme * * @generated */ + @Override public CommentAssociationFactory getCommentAssociationFactory() { return (CommentAssociationFactory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/impl/commentAssociation/impl/ElementImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/impl/commentAssociation/impl/ElementImpl.java index dea641525..602bb4718 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/impl/commentAssociation/impl/ElementImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/impl/commentAssociation/impl/ElementImpl.java @@ -87,6 +87,7 @@ public class ElementImpl extends MinimalEObjectImpl.Container implements Element * * @generated */ + @Override public String getName() { return name; @@ -97,6 +98,7 @@ public class ElementImpl extends MinimalEObjectImpl.Container implements Element * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -110,6 +112,7 @@ public class ElementImpl extends MinimalEObjectImpl.Container implements Element * * @generated */ + @Override public Element getChild() { return child; @@ -137,6 +140,7 @@ public class ElementImpl extends MinimalEObjectImpl.Container implements Element * * @generated */ + @Override public void setChild(Element newChild) { if (newChild != child) @@ -255,7 +259,7 @@ public class ElementImpl extends MinimalEObjectImpl.Container implements Element { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/impl/commentAssociation/impl/ModelImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/impl/commentAssociation/impl/ModelImpl.java index feb2f9862..5b92f6dcc 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/impl/commentAssociation/impl/ModelImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/impl/commentAssociation/impl/ModelImpl.java @@ -72,6 +72,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public EList getElements() { if (elements == null) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/Bug299395TestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/Bug299395TestLanguage.genmodel index b734c19e1..bb196cd43 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/Bug299395TestLanguage.genmodel +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/Bug299395TestLanguage.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="Bug299395TestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> + complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/Bug302128TestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/Bug302128TestLanguage.genmodel index 237ac19fe..b0dea927e 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/Bug302128TestLanguage.genmodel +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/Bug302128TestLanguage.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="Bug302128TestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> + complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/ComplexReconstrTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/ComplexReconstrTestLanguage.genmodel index 9aa14140f..2031be699 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/ComplexReconstrTestLanguage.genmodel +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/ComplexReconstrTestLanguage.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="ComplexReconstrTestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> + complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/SerializationBug269362TestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/SerializationBug269362TestLanguage.genmodel index 63c8d3d94..369d57fe7 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/SerializationBug269362TestLanguage.genmodel +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/SerializationBug269362TestLanguage.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="SerializationBug269362TestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> + complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/SerializationErrorTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/SerializationErrorTestLanguage.genmodel index 05979aaea..5e80269ec 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/SerializationErrorTestLanguage.genmodel +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/SerializationErrorTestLanguage.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="SerializationErrorTestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> + complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/bug299395/Model.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/bug299395/Model.java index 853399b8e..258944265 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/bug299395/Model.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/bug299395/Model.java @@ -32,10 +32,6 @@ public interface Model extends EObject * Returns the value of the 'Strings' attribute list. * The list contents are of type {@link java.lang.String}. * - *

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

* * @return the value of the 'Strings' attribute list. * @see org.eclipse.xtext.parsetree.reconstr.bug299395.Bug299395Package#getModel_Strings() @@ -48,10 +44,6 @@ public interface Model extends EObject * Returns the value of the 'Keys' attribute list. * The list contents are of type {@link java.lang.String}. * - *

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

* * @return the value of the 'Keys' attribute list. * @see org.eclipse.xtext.parsetree.reconstr.bug299395.Bug299395Package#getModel_Keys() @@ -64,10 +56,6 @@ public interface Model extends EObject * Returns the value of the 'Values' attribute list. * The list contents are of type {@link java.lang.String}. * - *

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

* * @return the value of the 'Values' attribute list. * @see org.eclipse.xtext.parsetree.reconstr.bug299395.Bug299395Package#getModel_Values() @@ -79,10 +67,6 @@ public interface Model extends EObject /** * Returns the value of the 'Sub Model' containment reference. * - *

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

* * @return the value of the 'Sub Model' containment reference. * @see #setSubModel(SubModel) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/bug299395/SubModel.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/bug299395/SubModel.java index 9415dd30f..2282750ef 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/bug299395/SubModel.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/bug299395/SubModel.java @@ -29,10 +29,6 @@ public interface SubModel extends EObject * Returns the value of the 'Strings' attribute list. * The list contents are of type {@link java.lang.String}. * - *

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

* * @return the value of the 'Strings' attribute list. * @see org.eclipse.xtext.parsetree.reconstr.bug299395.Bug299395Package#getSubModel_Strings() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/bug299395/impl/Bug299395FactoryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/bug299395/impl/Bug299395FactoryImpl.java index 4a092915c..7f9ec7c1a 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/bug299395/impl/Bug299395FactoryImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/bug299395/impl/Bug299395FactoryImpl.java @@ -77,6 +77,7 @@ public class Bug299395FactoryImpl extends EFactoryImpl implements Bug299395Facto * * @generated */ + @Override public Model createModel() { ModelImpl model = new ModelImpl(); @@ -88,6 +89,7 @@ public class Bug299395FactoryImpl extends EFactoryImpl implements Bug299395Facto * * @generated */ + @Override public SubModel createSubModel() { SubModelImpl subModel = new SubModelImpl(); @@ -99,6 +101,7 @@ public class Bug299395FactoryImpl extends EFactoryImpl implements Bug299395Facto * * @generated */ + @Override public Bug299395Package getBug299395Package() { return (Bug299395Package)getEPackage(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/bug299395/impl/Bug299395PackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/bug299395/impl/Bug299395PackageImpl.java index 7290c0ef2..f79b8acc1 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/bug299395/impl/Bug299395PackageImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/bug299395/impl/Bug299395PackageImpl.java @@ -67,7 +67,7 @@ public class Bug299395PackageImpl extends EPackageImpl implements Bug299395Packa /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link Bug299395Package#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -82,7 +82,8 @@ public class Bug299395PackageImpl extends EPackageImpl implements Bug299395Packa if (isInited) return (Bug299395Package)EPackage.Registry.INSTANCE.getEPackage(Bug299395Package.eNS_URI); // Obtain or create and register package - Bug299395PackageImpl theBug299395Package = (Bug299395PackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof Bug299395PackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new Bug299395PackageImpl()); + Object registeredBug299395Package = EPackage.Registry.INSTANCE.get(eNS_URI); + Bug299395PackageImpl theBug299395Package = registeredBug299395Package instanceof Bug299395PackageImpl ? (Bug299395PackageImpl)registeredBug299395Package : new Bug299395PackageImpl(); isInited = true; @@ -98,7 +99,6 @@ public class Bug299395PackageImpl extends EPackageImpl implements Bug299395Packa // Mark meta-data to indicate it can't be changed theBug299395Package.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(Bug299395Package.eNS_URI, theBug299395Package); return theBug299395Package; @@ -109,6 +109,7 @@ public class Bug299395PackageImpl extends EPackageImpl implements Bug299395Packa * * @generated */ + @Override public EClass getModel() { return modelEClass; @@ -119,6 +120,7 @@ public class Bug299395PackageImpl extends EPackageImpl implements Bug299395Packa * * @generated */ + @Override public EAttribute getModel_Strings() { return (EAttribute)modelEClass.getEStructuralFeatures().get(0); @@ -129,6 +131,7 @@ public class Bug299395PackageImpl extends EPackageImpl implements Bug299395Packa * * @generated */ + @Override public EAttribute getModel_Keys() { return (EAttribute)modelEClass.getEStructuralFeatures().get(1); @@ -139,6 +142,7 @@ public class Bug299395PackageImpl extends EPackageImpl implements Bug299395Packa * * @generated */ + @Override public EAttribute getModel_Values() { return (EAttribute)modelEClass.getEStructuralFeatures().get(2); @@ -149,6 +153,7 @@ public class Bug299395PackageImpl extends EPackageImpl implements Bug299395Packa * * @generated */ + @Override public EReference getModel_SubModel() { return (EReference)modelEClass.getEStructuralFeatures().get(3); @@ -159,6 +164,7 @@ public class Bug299395PackageImpl extends EPackageImpl implements Bug299395Packa * * @generated */ + @Override public EClass getSubModel() { return subModelEClass; @@ -169,6 +175,7 @@ public class Bug299395PackageImpl extends EPackageImpl implements Bug299395Packa * * @generated */ + @Override public EAttribute getSubModel_Strings() { return (EAttribute)subModelEClass.getEStructuralFeatures().get(0); @@ -179,6 +186,7 @@ public class Bug299395PackageImpl extends EPackageImpl implements Bug299395Packa * * @generated */ + @Override public Bug299395Factory getBug299395Factory() { return (Bug299395Factory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/bug299395/impl/ModelImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/bug299395/impl/ModelImpl.java index e598b0ab3..1b8a4babe 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/bug299395/impl/ModelImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/bug299395/impl/ModelImpl.java @@ -106,6 +106,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public EList getStrings() { if (strings == null) @@ -120,6 +121,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public EList getKeys() { if (keys == null) @@ -134,6 +136,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public EList getValues() { if (values == null) @@ -148,6 +151,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public SubModel getSubModel() { return subModel; @@ -175,6 +179,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setSubModel(SubModel newSubModel) { if (newSubModel != subModel) @@ -317,7 +322,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (strings: "); result.append(strings); result.append(", keys: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/bug299395/impl/SubModelImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/bug299395/impl/SubModelImpl.java index 22e214976..c87453c28 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/bug299395/impl/SubModelImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/bug299395/impl/SubModelImpl.java @@ -67,6 +67,7 @@ public class SubModelImpl extends MinimalEObjectImpl.Container implements SubMod * * @generated */ + @Override public EList getStrings() { if (strings == null) @@ -154,7 +155,7 @@ public class SubModelImpl extends MinimalEObjectImpl.Container implements SubMod { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (strings: "); result.append(strings); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/bug302128/Element.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/bug302128/Element.java index eefbfb4de..84d33dd0c 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/bug302128/Element.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/bug302128/Element.java @@ -27,10 +27,6 @@ public interface Element 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) @@ -53,10 +49,6 @@ public interface Element extends EObject /** * Returns the value of the 'Value' attribute. * - *

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

* * @return the value of the 'Value' attribute. * @see #setValue(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/bug302128/Model.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/bug302128/Model.java index 8ad9dd588..993cb6e31 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/bug302128/Model.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/bug302128/Model.java @@ -29,10 +29,6 @@ public interface Model extends EObject * Returns the value of the 'Elements' containment reference list. * The list contents are of type {@link org.eclipse.xtext.parsetree.reconstr.bug302128.Element}. * - *

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

* * @return the value of the 'Elements' containment reference list. * @see org.eclipse.xtext.parsetree.reconstr.bug302128.Bug302128Package#getModel_Elements() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/bug302128/impl/Bug302128FactoryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/bug302128/impl/Bug302128FactoryImpl.java index 4a7e50399..7f6926124 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/bug302128/impl/Bug302128FactoryImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/bug302128/impl/Bug302128FactoryImpl.java @@ -77,6 +77,7 @@ public class Bug302128FactoryImpl extends EFactoryImpl implements Bug302128Facto * * @generated */ + @Override public Model createModel() { ModelImpl model = new ModelImpl(); @@ -88,6 +89,7 @@ public class Bug302128FactoryImpl extends EFactoryImpl implements Bug302128Facto * * @generated */ + @Override public Element createElement() { ElementImpl element = new ElementImpl(); @@ -99,6 +101,7 @@ public class Bug302128FactoryImpl extends EFactoryImpl implements Bug302128Facto * * @generated */ + @Override public Bug302128Package getBug302128Package() { return (Bug302128Package)getEPackage(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/bug302128/impl/Bug302128PackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/bug302128/impl/Bug302128PackageImpl.java index 4097ea796..5536e3b7e 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/bug302128/impl/Bug302128PackageImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/bug302128/impl/Bug302128PackageImpl.java @@ -67,7 +67,7 @@ public class Bug302128PackageImpl extends EPackageImpl implements Bug302128Packa /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link Bug302128Package#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -82,7 +82,8 @@ public class Bug302128PackageImpl extends EPackageImpl implements Bug302128Packa if (isInited) return (Bug302128Package)EPackage.Registry.INSTANCE.getEPackage(Bug302128Package.eNS_URI); // Obtain or create and register package - Bug302128PackageImpl theBug302128Package = (Bug302128PackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof Bug302128PackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new Bug302128PackageImpl()); + Object registeredBug302128Package = EPackage.Registry.INSTANCE.get(eNS_URI); + Bug302128PackageImpl theBug302128Package = registeredBug302128Package instanceof Bug302128PackageImpl ? (Bug302128PackageImpl)registeredBug302128Package : new Bug302128PackageImpl(); isInited = true; @@ -98,7 +99,6 @@ public class Bug302128PackageImpl extends EPackageImpl implements Bug302128Packa // Mark meta-data to indicate it can't be changed theBug302128Package.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(Bug302128Package.eNS_URI, theBug302128Package); return theBug302128Package; @@ -109,6 +109,7 @@ public class Bug302128PackageImpl extends EPackageImpl implements Bug302128Packa * * @generated */ + @Override public EClass getModel() { return modelEClass; @@ -119,6 +120,7 @@ public class Bug302128PackageImpl extends EPackageImpl implements Bug302128Packa * * @generated */ + @Override public EReference getModel_Elements() { return (EReference)modelEClass.getEStructuralFeatures().get(0); @@ -129,6 +131,7 @@ public class Bug302128PackageImpl extends EPackageImpl implements Bug302128Packa * * @generated */ + @Override public EClass getElement() { return elementEClass; @@ -139,6 +142,7 @@ public class Bug302128PackageImpl extends EPackageImpl implements Bug302128Packa * * @generated */ + @Override public EAttribute getElement_Name() { return (EAttribute)elementEClass.getEStructuralFeatures().get(0); @@ -149,6 +153,7 @@ public class Bug302128PackageImpl extends EPackageImpl implements Bug302128Packa * * @generated */ + @Override public EAttribute getElement_Value() { return (EAttribute)elementEClass.getEStructuralFeatures().get(1); @@ -159,6 +164,7 @@ public class Bug302128PackageImpl extends EPackageImpl implements Bug302128Packa * * @generated */ + @Override public Bug302128Factory getBug302128Factory() { return (Bug302128Factory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/bug302128/impl/ElementImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/bug302128/impl/ElementImpl.java index 47db6d6d0..2df50982e 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/bug302128/impl/ElementImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/bug302128/impl/ElementImpl.java @@ -95,6 +95,7 @@ public class ElementImpl extends MinimalEObjectImpl.Container implements Element * * @generated */ + @Override public String getName() { return name; @@ -105,6 +106,7 @@ public class ElementImpl extends MinimalEObjectImpl.Container implements Element * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -118,6 +120,7 @@ public class ElementImpl extends MinimalEObjectImpl.Container implements Element * * @generated */ + @Override public String getValue() { return value; @@ -128,6 +131,7 @@ public class ElementImpl extends MinimalEObjectImpl.Container implements Element * * @generated */ + @Override public void setValue(String newValue) { String oldValue = value; @@ -222,7 +226,7 @@ public class ElementImpl extends MinimalEObjectImpl.Container implements Element { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(", value: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/bug302128/impl/ModelImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/bug302128/impl/ModelImpl.java index 4dfc74051..dc272c0d4 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/bug302128/impl/ModelImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/bug302128/impl/ModelImpl.java @@ -72,6 +72,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public EList getElements() { if (elements == null) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/Add.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/Add.java index 2227e7c79..ee52de69f 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/Add.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/Add.java @@ -27,10 +27,6 @@ public interface Add extends Expression * Returns the value of the 'Add Operands' containment reference list. * The list contents are of type {@link org.eclipse.xtext.parsetree.reconstr.complexrewritetest.Expression}. * - *

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

* * @return the value of the 'Add Operands' containment reference list. * @see org.eclipse.xtext.parsetree.reconstr.complexrewritetest.ComplexrewritetestPackage#getAdd_AddOperands() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/Atom.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/Atom.java index f0a94b059..83ee3f3b8 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/Atom.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/Atom.java @@ -25,10 +25,6 @@ public interface Atom extends Expression /** * 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) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/C1.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/C1.java index 1e02cb9c6..44b10b180 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/C1.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/C1.java @@ -25,10 +25,6 @@ public interface C1 extends TrickyC /** * Returns the value of the 'X' containment reference. * - *

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

* * @return the value of the 'X' containment reference. * @see #setX(TrickyC) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/C2.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/C2.java index 904598a79..89d90f4b7 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/C2.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/C2.java @@ -25,10 +25,6 @@ public interface C2 extends TrickyC /** * Returns the value of the 'Y' containment reference. * - *

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

* * @return the value of the 'Y' containment reference. * @see #setY(TrickyC) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/C3.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/C3.java index 214bfe3d1..ab8ac8424 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/C3.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/C3.java @@ -25,10 +25,6 @@ public interface C3 extends TrickyC /** * Returns the value of the 'Z' containment reference. * - *

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

* * @return the value of the 'Z' containment reference. * @see #setZ(TrickyC) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/Expression.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/Expression.java index 379b945b0..5ba1f6af9 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/Expression.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/Expression.java @@ -25,10 +25,6 @@ public interface Expression extends Root /** * Returns the value of the 'Em' attribute. * - *

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

* * @return the value of the 'Em' attribute. * @see #setEm(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/Minus.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/Minus.java index fce21c38c..ba97a8805 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/Minus.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/Minus.java @@ -27,10 +27,6 @@ public interface Minus extends Expression * Returns the value of the 'Minus Operands' containment reference list. * The list contents are of type {@link org.eclipse.xtext.parsetree.reconstr.complexrewritetest.Expression}. * - *

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

* * @return the value of the 'Minus Operands' containment reference list. * @see org.eclipse.xtext.parsetree.reconstr.complexrewritetest.ComplexrewritetestPackage#getMinus_MinusOperands() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/TrickyB.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/TrickyB.java index fcfff0d27..dc0700f9c 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/TrickyB.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/TrickyB.java @@ -29,10 +29,6 @@ public interface TrickyB 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) @@ -56,10 +52,6 @@ public interface TrickyB extends EObject * Returns the value of the 'Type' attribute list. * The list contents are of type {@link java.lang.Integer}. * - *

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

* * @return the value of the 'Type' attribute list. * @see org.eclipse.xtext.parsetree.reconstr.complexrewritetest.ComplexrewritetestPackage#getTrickyB_Type() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/TrickyC.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/TrickyC.java index 1df5d4f58..0eb904d36 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/TrickyC.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/TrickyC.java @@ -26,10 +26,6 @@ public interface TrickyC 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) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/TrickyD.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/TrickyD.java index 51d9c6c59..b8b5f0594 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/TrickyD.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/TrickyD.java @@ -31,10 +31,6 @@ public interface TrickyD extends EObject * Returns the value of the 'Name' attribute list. * The list contents are of type {@link java.lang.Integer}. * - *

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

* * @return the value of the 'Name' attribute list. * @see org.eclipse.xtext.parsetree.reconstr.complexrewritetest.ComplexrewritetestPackage#getTrickyD_Name() @@ -46,10 +42,6 @@ public interface TrickyD extends EObject /** * Returns the value of the 'Foo' attribute. * - *

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

* * @return the value of the 'Foo' attribute. * @see #setFoo(String) @@ -73,10 +65,6 @@ public interface TrickyD extends EObject * Returns the value of the 'Type' attribute list. * The list contents are of type {@link java.lang.String}. * - *

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

* * @return the value of the 'Type' attribute list. * @see org.eclipse.xtext.parsetree.reconstr.complexrewritetest.ComplexrewritetestPackage#getTrickyD_Type() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/TrickyE.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/TrickyE.java index a27b0222e..daff7047b 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/TrickyE.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/TrickyE.java @@ -31,10 +31,6 @@ public interface TrickyE extends EObject * Returns the value of the 'Name' attribute list. * The list contents are of type {@link java.lang.Integer}. * - *

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

* * @return the value of the 'Name' attribute list. * @see org.eclipse.xtext.parsetree.reconstr.complexrewritetest.ComplexrewritetestPackage#getTrickyE_Name() @@ -47,10 +43,6 @@ public interface TrickyE extends EObject * Returns the value of the 'Foo' attribute list. * The list contents are of type {@link java.lang.String}. * - *

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

* * @return the value of the 'Foo' attribute list. * @see org.eclipse.xtext.parsetree.reconstr.complexrewritetest.ComplexrewritetestPackage#getTrickyE_Foo() @@ -63,10 +55,6 @@ public interface TrickyE extends EObject * Returns the value of the 'Type' attribute list. * The list contents are of type {@link java.lang.String}. * - *

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

* * @return the value of the 'Type' attribute list. * @see org.eclipse.xtext.parsetree.reconstr.complexrewritetest.ComplexrewritetestPackage#getTrickyE_Type() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/TrickyF.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/TrickyF.java index 0ca72eb84..d170916c4 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/TrickyF.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/TrickyF.java @@ -30,10 +30,6 @@ public interface TrickyF extends EObject * Returns the value of the 'Name' attribute list. * The list contents are of type {@link java.lang.String}. * - *

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

* * @return the value of the 'Name' attribute list. * @see org.eclipse.xtext.parsetree.reconstr.complexrewritetest.ComplexrewritetestPackage#getTrickyF_Name() @@ -46,10 +42,6 @@ public interface TrickyF extends EObject * Returns the value of the 'Type' attribute list. * The list contents are of type {@link java.lang.Integer}. * - *

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

* * @return the value of the 'Type' attribute list. * @see org.eclipse.xtext.parsetree.reconstr.complexrewritetest.ComplexrewritetestPackage#getTrickyF_Type() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/TrickyG.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/TrickyG.java index 096e26145..e41545c21 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/TrickyG.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/TrickyG.java @@ -25,10 +25,6 @@ public interface TrickyG extends Root /** * Returns the value of the 'Tree' containment reference. * - *

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

* * @return the value of the 'Tree' containment reference. * @see #setTree(TrickyG1) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/TrickyG1.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/TrickyG1.java index 8ff2c95de..1e74b4d0a 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/TrickyG1.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/TrickyG1.java @@ -27,10 +27,6 @@ public interface TrickyG1 extends TrickyG2 * Returns the value of the 'Vals' containment reference list. * The list contents are of type {@link org.eclipse.xtext.parsetree.reconstr.complexrewritetest.TrickyG2}. * - *

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

* * @return the value of the 'Vals' containment reference list. * @see org.eclipse.xtext.parsetree.reconstr.complexrewritetest.ComplexrewritetestPackage#getTrickyG1_Vals() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/TrickyG2.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/TrickyG2.java index db9e8fae7..a490e1897 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/TrickyG2.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/TrickyG2.java @@ -26,10 +26,6 @@ public interface TrickyG2 extends EObject /** * Returns the value of the 'Val' attribute. * - *

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

* * @return the value of the 'Val' attribute. * @see #setVal(int) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/impl/AddImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/impl/AddImpl.java index 6f99c0912..bf68d19e1 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/impl/AddImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/impl/AddImpl.java @@ -70,6 +70,7 @@ public class AddImpl extends ExpressionImpl implements Add * * @generated */ + @Override public EList getAddOperands() { if (addOperands == null) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/impl/AtomImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/impl/AtomImpl.java index a9bef68e7..c9cd07ccf 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/impl/AtomImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/impl/AtomImpl.java @@ -73,6 +73,7 @@ public class AtomImpl extends ExpressionImpl implements Atom * * @generated */ + @Override public String getName() { return name; @@ -83,6 +84,7 @@ public class AtomImpl extends ExpressionImpl implements Atom * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -167,7 +169,7 @@ public class AtomImpl extends ExpressionImpl implements Atom { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/impl/C1Impl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/impl/C1Impl.java index 406f3bfd3..3e62e7ed2 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/impl/C1Impl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/impl/C1Impl.java @@ -66,6 +66,7 @@ public class C1Impl extends TrickyCImpl implements C1 * * @generated */ + @Override public TrickyC getX() { return x; @@ -93,6 +94,7 @@ public class C1Impl extends TrickyCImpl implements C1 * * @generated */ + @Override public void setX(TrickyC newX) { if (newX != x) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/impl/C2Impl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/impl/C2Impl.java index 9cf102066..ed6f773a0 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/impl/C2Impl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/impl/C2Impl.java @@ -66,6 +66,7 @@ public class C2Impl extends TrickyCImpl implements C2 * * @generated */ + @Override public TrickyC getY() { return y; @@ -93,6 +94,7 @@ public class C2Impl extends TrickyCImpl implements C2 * * @generated */ + @Override public void setY(TrickyC newY) { if (newY != y) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/impl/C3Impl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/impl/C3Impl.java index d6abd3c6d..574482995 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/impl/C3Impl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/impl/C3Impl.java @@ -66,6 +66,7 @@ public class C3Impl extends TrickyCImpl implements C3 * * @generated */ + @Override public TrickyC getZ() { return z; @@ -93,6 +94,7 @@ public class C3Impl extends TrickyCImpl implements C3 * * @generated */ + @Override public void setZ(TrickyC newZ) { if (newZ != z) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/impl/ComplexrewritetestFactoryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/impl/ComplexrewritetestFactoryImpl.java index 44f80a183..a683fe757 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/impl/ComplexrewritetestFactoryImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/impl/ComplexrewritetestFactoryImpl.java @@ -91,6 +91,7 @@ public class ComplexrewritetestFactoryImpl extends EFactoryImpl implements Compl * * @generated */ + @Override public Root createRoot() { RootImpl root = new RootImpl(); @@ -102,6 +103,7 @@ public class ComplexrewritetestFactoryImpl extends EFactoryImpl implements Compl * * @generated */ + @Override public Expression createExpression() { ExpressionImpl expression = new ExpressionImpl(); @@ -113,6 +115,7 @@ public class ComplexrewritetestFactoryImpl extends EFactoryImpl implements Compl * * @generated */ + @Override public Atom createAtom() { AtomImpl atom = new AtomImpl(); @@ -124,6 +127,7 @@ public class ComplexrewritetestFactoryImpl extends EFactoryImpl implements Compl * * @generated */ + @Override public TrickyB createTrickyB() { TrickyBImpl trickyB = new TrickyBImpl(); @@ -135,6 +139,7 @@ public class ComplexrewritetestFactoryImpl extends EFactoryImpl implements Compl * * @generated */ + @Override public TrickyC createTrickyC() { TrickyCImpl trickyC = new TrickyCImpl(); @@ -146,6 +151,7 @@ public class ComplexrewritetestFactoryImpl extends EFactoryImpl implements Compl * * @generated */ + @Override public TrickyD createTrickyD() { TrickyDImpl trickyD = new TrickyDImpl(); @@ -157,6 +163,7 @@ public class ComplexrewritetestFactoryImpl extends EFactoryImpl implements Compl * * @generated */ + @Override public TrickyE createTrickyE() { TrickyEImpl trickyE = new TrickyEImpl(); @@ -168,6 +175,7 @@ public class ComplexrewritetestFactoryImpl extends EFactoryImpl implements Compl * * @generated */ + @Override public TrickyF createTrickyF() { TrickyFImpl trickyF = new TrickyFImpl(); @@ -179,6 +187,7 @@ public class ComplexrewritetestFactoryImpl extends EFactoryImpl implements Compl * * @generated */ + @Override public TrickyG createTrickyG() { TrickyGImpl trickyG = new TrickyGImpl(); @@ -190,6 +199,7 @@ public class ComplexrewritetestFactoryImpl extends EFactoryImpl implements Compl * * @generated */ + @Override public TrickyG1 createTrickyG1() { TrickyG1Impl trickyG1 = new TrickyG1Impl(); @@ -201,6 +211,7 @@ public class ComplexrewritetestFactoryImpl extends EFactoryImpl implements Compl * * @generated */ + @Override public TrickyG2 createTrickyG2() { TrickyG2Impl trickyG2 = new TrickyG2Impl(); @@ -212,6 +223,7 @@ public class ComplexrewritetestFactoryImpl extends EFactoryImpl implements Compl * * @generated */ + @Override public Add createAdd() { AddImpl add = new AddImpl(); @@ -223,6 +235,7 @@ public class ComplexrewritetestFactoryImpl extends EFactoryImpl implements Compl * * @generated */ + @Override public Minus createMinus() { MinusImpl minus = new MinusImpl(); @@ -234,6 +247,7 @@ public class ComplexrewritetestFactoryImpl extends EFactoryImpl implements Compl * * @generated */ + @Override public C1 createC1() { C1Impl c1 = new C1Impl(); @@ -245,6 +259,7 @@ public class ComplexrewritetestFactoryImpl extends EFactoryImpl implements Compl * * @generated */ + @Override public C2 createC2() { C2Impl c2 = new C2Impl(); @@ -256,6 +271,7 @@ public class ComplexrewritetestFactoryImpl extends EFactoryImpl implements Compl * * @generated */ + @Override public C3 createC3() { C3Impl c3 = new C3Impl(); @@ -267,6 +283,7 @@ public class ComplexrewritetestFactoryImpl extends EFactoryImpl implements Compl * * @generated */ + @Override public ComplexrewritetestPackage getComplexrewritetestPackage() { return (ComplexrewritetestPackage)getEPackage(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/impl/ComplexrewritetestPackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/impl/ComplexrewritetestPackageImpl.java index 99d779af2..c44326ec0 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/impl/ComplexrewritetestPackageImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/impl/ComplexrewritetestPackageImpl.java @@ -176,7 +176,7 @@ public class ComplexrewritetestPackageImpl extends EPackageImpl implements Compl /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link ComplexrewritetestPackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -191,7 +191,8 @@ public class ComplexrewritetestPackageImpl extends EPackageImpl implements Compl if (isInited) return (ComplexrewritetestPackage)EPackage.Registry.INSTANCE.getEPackage(ComplexrewritetestPackage.eNS_URI); // Obtain or create and register package - ComplexrewritetestPackageImpl theComplexrewritetestPackage = (ComplexrewritetestPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof ComplexrewritetestPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new ComplexrewritetestPackageImpl()); + Object registeredComplexrewritetestPackage = EPackage.Registry.INSTANCE.get(eNS_URI); + ComplexrewritetestPackageImpl theComplexrewritetestPackage = registeredComplexrewritetestPackage instanceof ComplexrewritetestPackageImpl ? (ComplexrewritetestPackageImpl)registeredComplexrewritetestPackage : new ComplexrewritetestPackageImpl(); isInited = true; @@ -207,7 +208,6 @@ public class ComplexrewritetestPackageImpl extends EPackageImpl implements Compl // Mark meta-data to indicate it can't be changed theComplexrewritetestPackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(ComplexrewritetestPackage.eNS_URI, theComplexrewritetestPackage); return theComplexrewritetestPackage; @@ -218,6 +218,7 @@ public class ComplexrewritetestPackageImpl extends EPackageImpl implements Compl * * @generated */ + @Override public EClass getRoot() { return rootEClass; @@ -228,6 +229,7 @@ public class ComplexrewritetestPackageImpl extends EPackageImpl implements Compl * * @generated */ + @Override public EClass getExpression() { return expressionEClass; @@ -238,6 +240,7 @@ public class ComplexrewritetestPackageImpl extends EPackageImpl implements Compl * * @generated */ + @Override public EAttribute getExpression_Em() { return (EAttribute)expressionEClass.getEStructuralFeatures().get(0); @@ -248,6 +251,7 @@ public class ComplexrewritetestPackageImpl extends EPackageImpl implements Compl * * @generated */ + @Override public EClass getAtom() { return atomEClass; @@ -258,6 +262,7 @@ public class ComplexrewritetestPackageImpl extends EPackageImpl implements Compl * * @generated */ + @Override public EAttribute getAtom_Name() { return (EAttribute)atomEClass.getEStructuralFeatures().get(0); @@ -268,6 +273,7 @@ public class ComplexrewritetestPackageImpl extends EPackageImpl implements Compl * * @generated */ + @Override public EClass getTrickyB() { return trickyBEClass; @@ -278,6 +284,7 @@ public class ComplexrewritetestPackageImpl extends EPackageImpl implements Compl * * @generated */ + @Override public EAttribute getTrickyB_Name() { return (EAttribute)trickyBEClass.getEStructuralFeatures().get(0); @@ -288,6 +295,7 @@ public class ComplexrewritetestPackageImpl extends EPackageImpl implements Compl * * @generated */ + @Override public EAttribute getTrickyB_Type() { return (EAttribute)trickyBEClass.getEStructuralFeatures().get(1); @@ -298,6 +306,7 @@ public class ComplexrewritetestPackageImpl extends EPackageImpl implements Compl * * @generated */ + @Override public EClass getTrickyC() { return trickyCEClass; @@ -308,6 +317,7 @@ public class ComplexrewritetestPackageImpl extends EPackageImpl implements Compl * * @generated */ + @Override public EAttribute getTrickyC_Name() { return (EAttribute)trickyCEClass.getEStructuralFeatures().get(0); @@ -318,6 +328,7 @@ public class ComplexrewritetestPackageImpl extends EPackageImpl implements Compl * * @generated */ + @Override public EClass getTrickyD() { return trickyDEClass; @@ -328,6 +339,7 @@ public class ComplexrewritetestPackageImpl extends EPackageImpl implements Compl * * @generated */ + @Override public EAttribute getTrickyD_Name() { return (EAttribute)trickyDEClass.getEStructuralFeatures().get(0); @@ -338,6 +350,7 @@ public class ComplexrewritetestPackageImpl extends EPackageImpl implements Compl * * @generated */ + @Override public EAttribute getTrickyD_Foo() { return (EAttribute)trickyDEClass.getEStructuralFeatures().get(1); @@ -348,6 +361,7 @@ public class ComplexrewritetestPackageImpl extends EPackageImpl implements Compl * * @generated */ + @Override public EAttribute getTrickyD_Type() { return (EAttribute)trickyDEClass.getEStructuralFeatures().get(2); @@ -358,6 +372,7 @@ public class ComplexrewritetestPackageImpl extends EPackageImpl implements Compl * * @generated */ + @Override public EClass getTrickyE() { return trickyEEClass; @@ -368,6 +383,7 @@ public class ComplexrewritetestPackageImpl extends EPackageImpl implements Compl * * @generated */ + @Override public EAttribute getTrickyE_Name() { return (EAttribute)trickyEEClass.getEStructuralFeatures().get(0); @@ -378,6 +394,7 @@ public class ComplexrewritetestPackageImpl extends EPackageImpl implements Compl * * @generated */ + @Override public EAttribute getTrickyE_Foo() { return (EAttribute)trickyEEClass.getEStructuralFeatures().get(1); @@ -388,6 +405,7 @@ public class ComplexrewritetestPackageImpl extends EPackageImpl implements Compl * * @generated */ + @Override public EAttribute getTrickyE_Type() { return (EAttribute)trickyEEClass.getEStructuralFeatures().get(2); @@ -398,6 +416,7 @@ public class ComplexrewritetestPackageImpl extends EPackageImpl implements Compl * * @generated */ + @Override public EClass getTrickyF() { return trickyFEClass; @@ -408,6 +427,7 @@ public class ComplexrewritetestPackageImpl extends EPackageImpl implements Compl * * @generated */ + @Override public EAttribute getTrickyF_Name() { return (EAttribute)trickyFEClass.getEStructuralFeatures().get(0); @@ -418,6 +438,7 @@ public class ComplexrewritetestPackageImpl extends EPackageImpl implements Compl * * @generated */ + @Override public EAttribute getTrickyF_Type() { return (EAttribute)trickyFEClass.getEStructuralFeatures().get(1); @@ -428,6 +449,7 @@ public class ComplexrewritetestPackageImpl extends EPackageImpl implements Compl * * @generated */ + @Override public EClass getTrickyG() { return trickyGEClass; @@ -438,6 +460,7 @@ public class ComplexrewritetestPackageImpl extends EPackageImpl implements Compl * * @generated */ + @Override public EReference getTrickyG_Tree() { return (EReference)trickyGEClass.getEStructuralFeatures().get(0); @@ -448,6 +471,7 @@ public class ComplexrewritetestPackageImpl extends EPackageImpl implements Compl * * @generated */ + @Override public EClass getTrickyG1() { return trickyG1EClass; @@ -458,6 +482,7 @@ public class ComplexrewritetestPackageImpl extends EPackageImpl implements Compl * * @generated */ + @Override public EReference getTrickyG1_Vals() { return (EReference)trickyG1EClass.getEStructuralFeatures().get(0); @@ -468,6 +493,7 @@ public class ComplexrewritetestPackageImpl extends EPackageImpl implements Compl * * @generated */ + @Override public EClass getTrickyG2() { return trickyG2EClass; @@ -478,6 +504,7 @@ public class ComplexrewritetestPackageImpl extends EPackageImpl implements Compl * * @generated */ + @Override public EAttribute getTrickyG2_Val() { return (EAttribute)trickyG2EClass.getEStructuralFeatures().get(0); @@ -488,6 +515,7 @@ public class ComplexrewritetestPackageImpl extends EPackageImpl implements Compl * * @generated */ + @Override public EClass getAdd() { return addEClass; @@ -498,6 +526,7 @@ public class ComplexrewritetestPackageImpl extends EPackageImpl implements Compl * * @generated */ + @Override public EReference getAdd_AddOperands() { return (EReference)addEClass.getEStructuralFeatures().get(0); @@ -508,6 +537,7 @@ public class ComplexrewritetestPackageImpl extends EPackageImpl implements Compl * * @generated */ + @Override public EClass getMinus() { return minusEClass; @@ -518,6 +548,7 @@ public class ComplexrewritetestPackageImpl extends EPackageImpl implements Compl * * @generated */ + @Override public EReference getMinus_MinusOperands() { return (EReference)minusEClass.getEStructuralFeatures().get(0); @@ -528,6 +559,7 @@ public class ComplexrewritetestPackageImpl extends EPackageImpl implements Compl * * @generated */ + @Override public EClass getC1() { return c1EClass; @@ -538,6 +570,7 @@ public class ComplexrewritetestPackageImpl extends EPackageImpl implements Compl * * @generated */ + @Override public EReference getC1_X() { return (EReference)c1EClass.getEStructuralFeatures().get(0); @@ -548,6 +581,7 @@ public class ComplexrewritetestPackageImpl extends EPackageImpl implements Compl * * @generated */ + @Override public EClass getC2() { return c2EClass; @@ -558,6 +592,7 @@ public class ComplexrewritetestPackageImpl extends EPackageImpl implements Compl * * @generated */ + @Override public EReference getC2_Y() { return (EReference)c2EClass.getEStructuralFeatures().get(0); @@ -568,6 +603,7 @@ public class ComplexrewritetestPackageImpl extends EPackageImpl implements Compl * * @generated */ + @Override public EClass getC3() { return c3EClass; @@ -578,6 +614,7 @@ public class ComplexrewritetestPackageImpl extends EPackageImpl implements Compl * * @generated */ + @Override public EReference getC3_Z() { return (EReference)c3EClass.getEStructuralFeatures().get(0); @@ -588,6 +625,7 @@ public class ComplexrewritetestPackageImpl extends EPackageImpl implements Compl * * @generated */ + @Override public ComplexrewritetestFactory getComplexrewritetestFactory() { return (ComplexrewritetestFactory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/impl/ExpressionImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/impl/ExpressionImpl.java index b819178f3..f64f56f68 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/impl/ExpressionImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/impl/ExpressionImpl.java @@ -73,6 +73,7 @@ public class ExpressionImpl extends RootImpl implements Expression * * @generated */ + @Override public String getEm() { return em; @@ -83,6 +84,7 @@ public class ExpressionImpl extends RootImpl implements Expression * * @generated */ + @Override public void setEm(String newEm) { String oldEm = em; @@ -167,7 +169,7 @@ public class ExpressionImpl extends RootImpl implements Expression { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (em: "); result.append(em); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/impl/MinusImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/impl/MinusImpl.java index 592367904..31901ba3f 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/impl/MinusImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/impl/MinusImpl.java @@ -70,6 +70,7 @@ public class MinusImpl extends ExpressionImpl implements Minus * * @generated */ + @Override public EList getMinusOperands() { if (minusOperands == null) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/impl/TrickyBImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/impl/TrickyBImpl.java index ebfd858e5..49613f388 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/impl/TrickyBImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/impl/TrickyBImpl.java @@ -91,6 +91,7 @@ public class TrickyBImpl extends MinimalEObjectImpl.Container implements TrickyB * * @generated */ + @Override public String getName() { return name; @@ -101,6 +102,7 @@ public class TrickyBImpl extends MinimalEObjectImpl.Container implements TrickyB * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -114,6 +116,7 @@ public class TrickyBImpl extends MinimalEObjectImpl.Container implements TrickyB * * @generated */ + @Override public EList getType() { if (type == null) @@ -211,7 +214,7 @@ public class TrickyBImpl extends MinimalEObjectImpl.Container implements TrickyB { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(", type: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/impl/TrickyCImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/impl/TrickyCImpl.java index 4db38f158..ac187876e 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/impl/TrickyCImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/impl/TrickyCImpl.java @@ -74,6 +74,7 @@ public class TrickyCImpl extends MinimalEObjectImpl.Container implements TrickyC * * @generated */ + @Override public String getName() { return name; @@ -84,6 +85,7 @@ public class TrickyCImpl extends MinimalEObjectImpl.Container implements TrickyC * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -168,7 +170,7 @@ public class TrickyCImpl extends MinimalEObjectImpl.Container implements TrickyC { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/impl/TrickyDImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/impl/TrickyDImpl.java index 2a7d3aba4..1953beb32 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/impl/TrickyDImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/impl/TrickyDImpl.java @@ -102,6 +102,7 @@ public class TrickyDImpl extends MinimalEObjectImpl.Container implements TrickyD * * @generated */ + @Override public EList getName() { if (name == null) @@ -116,6 +117,7 @@ public class TrickyDImpl extends MinimalEObjectImpl.Container implements TrickyD * * @generated */ + @Override public String getFoo() { return foo; @@ -126,6 +128,7 @@ public class TrickyDImpl extends MinimalEObjectImpl.Container implements TrickyD * * @generated */ + @Override public void setFoo(String newFoo) { String oldFoo = foo; @@ -139,6 +142,7 @@ public class TrickyDImpl extends MinimalEObjectImpl.Container implements TrickyD * * @generated */ + @Override public EList getType() { if (type == null) @@ -247,7 +251,7 @@ public class TrickyDImpl extends MinimalEObjectImpl.Container implements TrickyD { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(", foo: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/impl/TrickyEImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/impl/TrickyEImpl.java index bb77e1505..156ef4369 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/impl/TrickyEImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/impl/TrickyEImpl.java @@ -89,6 +89,7 @@ public class TrickyEImpl extends MinimalEObjectImpl.Container implements TrickyE * * @generated */ + @Override public EList getName() { if (name == null) @@ -103,6 +104,7 @@ public class TrickyEImpl extends MinimalEObjectImpl.Container implements TrickyE * * @generated */ + @Override public EList getFoo() { if (foo == null) @@ -117,6 +119,7 @@ public class TrickyEImpl extends MinimalEObjectImpl.Container implements TrickyE * * @generated */ + @Override public EList getType() { if (type == null) @@ -226,7 +229,7 @@ public class TrickyEImpl extends MinimalEObjectImpl.Container implements TrickyE { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(", foo: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/impl/TrickyFImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/impl/TrickyFImpl.java index 05eced413..5a72167e5 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/impl/TrickyFImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/impl/TrickyFImpl.java @@ -78,6 +78,7 @@ public class TrickyFImpl extends MinimalEObjectImpl.Container implements TrickyF * * @generated */ + @Override public EList getName() { if (name == null) @@ -92,6 +93,7 @@ public class TrickyFImpl extends MinimalEObjectImpl.Container implements TrickyF * * @generated */ + @Override public EList getType() { if (type == null) @@ -190,7 +192,7 @@ public class TrickyFImpl extends MinimalEObjectImpl.Container implements TrickyF { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(", type: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/impl/TrickyG1Impl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/impl/TrickyG1Impl.java index 6e99b0552..d2590dd3d 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/impl/TrickyG1Impl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/impl/TrickyG1Impl.java @@ -70,6 +70,7 @@ public class TrickyG1Impl extends TrickyG2Impl implements TrickyG1 * * @generated */ + @Override public EList getVals() { if (vals == null) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/impl/TrickyG2Impl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/impl/TrickyG2Impl.java index 9c980bcf2..8175ab5d9 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/impl/TrickyG2Impl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/impl/TrickyG2Impl.java @@ -74,6 +74,7 @@ public class TrickyG2Impl extends MinimalEObjectImpl.Container implements Tricky * * @generated */ + @Override public int getVal() { return val; @@ -84,6 +85,7 @@ public class TrickyG2Impl extends MinimalEObjectImpl.Container implements Tricky * * @generated */ + @Override public void setVal(int newVal) { int oldVal = val; @@ -168,7 +170,7 @@ public class TrickyG2Impl extends MinimalEObjectImpl.Container implements Tricky { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (val: "); result.append(val); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/impl/TrickyGImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/impl/TrickyGImpl.java index 2864468aa..1449af213 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/impl/TrickyGImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/complexrewritetest/impl/TrickyGImpl.java @@ -66,6 +66,7 @@ public class TrickyGImpl extends RootImpl implements TrickyG * * @generated */ + @Override public TrickyG1 getTree() { return tree; @@ -93,6 +94,7 @@ public class TrickyGImpl extends RootImpl implements TrickyG * * @generated */ + @Override public void setTree(TrickyG1 newTree) { if (newTree != tree) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/serializationBug269362TestLanguage/Model.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/serializationBug269362TestLanguage/Model.java index 6b3883164..3ad965c63 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/serializationBug269362TestLanguage/Model.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/serializationBug269362TestLanguage/Model.java @@ -27,10 +27,6 @@ public interface Model extends EObject /** * Returns the value of the 'Foo' attribute. * - *

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

* * @return the value of the 'Foo' attribute. * @see #setFoo(String) @@ -53,10 +49,6 @@ public interface Model extends EObject /** * Returns the value of the 'Bar' attribute. * - *

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

* * @return the value of the 'Bar' attribute. * @see #setBar(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/serializationBug269362TestLanguage/impl/ModelImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/serializationBug269362TestLanguage/impl/ModelImpl.java index 1e83f3538..8680c3fc0 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/serializationBug269362TestLanguage/impl/ModelImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/serializationBug269362TestLanguage/impl/ModelImpl.java @@ -95,6 +95,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public String getFoo() { return foo; @@ -105,6 +106,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setFoo(String newFoo) { String oldFoo = foo; @@ -118,6 +120,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public String getBar() { return bar; @@ -128,6 +131,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setBar(String newBar) { String oldBar = bar; @@ -222,7 +226,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (foo: "); result.append(foo); result.append(", bar: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/serializationBug269362TestLanguage/impl/SerializationBug269362TestLanguageFactoryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/serializationBug269362TestLanguage/impl/SerializationBug269362TestLanguageFactoryImpl.java index f67c75a7f..1754aebd4 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/serializationBug269362TestLanguage/impl/SerializationBug269362TestLanguageFactoryImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/serializationBug269362TestLanguage/impl/SerializationBug269362TestLanguageFactoryImpl.java @@ -76,6 +76,7 @@ public class SerializationBug269362TestLanguageFactoryImpl extends EFactoryImpl * * @generated */ + @Override public Model createModel() { ModelImpl model = new ModelImpl(); @@ -87,6 +88,7 @@ public class SerializationBug269362TestLanguageFactoryImpl extends EFactoryImpl * * @generated */ + @Override public SerializationBug269362TestLanguagePackage getSerializationBug269362TestLanguagePackage() { return (SerializationBug269362TestLanguagePackage)getEPackage(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/serializationBug269362TestLanguage/impl/SerializationBug269362TestLanguagePackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/serializationBug269362TestLanguage/impl/SerializationBug269362TestLanguagePackageImpl.java index 994dc1c94..76b6fdcd9 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/serializationBug269362TestLanguage/impl/SerializationBug269362TestLanguagePackageImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/serializationBug269362TestLanguage/impl/SerializationBug269362TestLanguagePackageImpl.java @@ -58,7 +58,7 @@ public class SerializationBug269362TestLanguagePackageImpl extends EPackageImpl /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link SerializationBug269362TestLanguagePackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -73,7 +73,8 @@ public class SerializationBug269362TestLanguagePackageImpl extends EPackageImpl if (isInited) return (SerializationBug269362TestLanguagePackage)EPackage.Registry.INSTANCE.getEPackage(SerializationBug269362TestLanguagePackage.eNS_URI); // Obtain or create and register package - SerializationBug269362TestLanguagePackageImpl theSerializationBug269362TestLanguagePackage = (SerializationBug269362TestLanguagePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof SerializationBug269362TestLanguagePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new SerializationBug269362TestLanguagePackageImpl()); + Object registeredSerializationBug269362TestLanguagePackage = EPackage.Registry.INSTANCE.get(eNS_URI); + SerializationBug269362TestLanguagePackageImpl theSerializationBug269362TestLanguagePackage = registeredSerializationBug269362TestLanguagePackage instanceof SerializationBug269362TestLanguagePackageImpl ? (SerializationBug269362TestLanguagePackageImpl)registeredSerializationBug269362TestLanguagePackage : new SerializationBug269362TestLanguagePackageImpl(); isInited = true; @@ -89,7 +90,6 @@ public class SerializationBug269362TestLanguagePackageImpl extends EPackageImpl // Mark meta-data to indicate it can't be changed theSerializationBug269362TestLanguagePackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(SerializationBug269362TestLanguagePackage.eNS_URI, theSerializationBug269362TestLanguagePackage); return theSerializationBug269362TestLanguagePackage; @@ -100,6 +100,7 @@ public class SerializationBug269362TestLanguagePackageImpl extends EPackageImpl * * @generated */ + @Override public EClass getModel() { return modelEClass; @@ -110,6 +111,7 @@ public class SerializationBug269362TestLanguagePackageImpl extends EPackageImpl * * @generated */ + @Override public EAttribute getModel_Foo() { return (EAttribute)modelEClass.getEStructuralFeatures().get(0); @@ -120,6 +122,7 @@ public class SerializationBug269362TestLanguagePackageImpl extends EPackageImpl * * @generated */ + @Override public EAttribute getModel_Bar() { return (EAttribute)modelEClass.getEStructuralFeatures().get(1); @@ -130,6 +133,7 @@ public class SerializationBug269362TestLanguagePackageImpl extends EPackageImpl * * @generated */ + @Override public SerializationBug269362TestLanguageFactory getSerializationBug269362TestLanguageFactory() { return (SerializationBug269362TestLanguageFactory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/serializationerror/Indent.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/serializationerror/Indent.java index b9f7e64d5..63b33b98c 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/serializationerror/Indent.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/serializationerror/Indent.java @@ -28,10 +28,6 @@ public interface Indent extends Test /** * Returns the value of the 'Req' containment reference. * - *

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

* * @return the value of the 'Req' containment reference. * @see #setReq(TwoRequired) @@ -54,10 +50,6 @@ public interface Indent extends Test /** * Returns the value of the 'Opt' containment reference. * - *

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

* * @return the value of the 'Opt' containment reference. * @see #setOpt(TwoOptions) @@ -81,10 +73,6 @@ public interface Indent extends Test * Returns the value of the 'Indent' containment reference list. * The list contents are of type {@link org.eclipse.xtext.parsetree.reconstr.serializationerror.Indent}. * - *

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

* * @return the value of the 'Indent' containment reference list. * @see org.eclipse.xtext.parsetree.reconstr.serializationerror.SerializationerrorPackage#getIndent_Indent() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/serializationerror/Model.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/serializationerror/Model.java index ad2f629cc..383df1d55 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/serializationerror/Model.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/serializationerror/Model.java @@ -26,10 +26,6 @@ public interface Model extends EObject /** * Returns the value of the 'Test' containment reference. * - *

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

* * @return the value of the 'Test' containment reference. * @see #setTest(Test) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/serializationerror/TwoOptions.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/serializationerror/TwoOptions.java index f0e6564f5..5e788509f 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/serializationerror/TwoOptions.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/serializationerror/TwoOptions.java @@ -26,10 +26,6 @@ public interface TwoOptions extends Test /** * Returns the value of the 'One' attribute. * - *

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

* * @return the value of the 'One' attribute. * @see #setOne(String) @@ -52,10 +48,6 @@ public interface TwoOptions extends Test /** * Returns the value of the 'Two' attribute. * - *

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

* * @return the value of the 'Two' attribute. * @see #setTwo(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/serializationerror/TwoRequired.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/serializationerror/TwoRequired.java index ad76de11c..70fbc199d 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/serializationerror/TwoRequired.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/serializationerror/TwoRequired.java @@ -26,10 +26,6 @@ public interface TwoRequired extends Test /** * Returns the value of the 'One' attribute. * - *

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

* * @return the value of the 'One' attribute. * @see #setOne(String) @@ -52,10 +48,6 @@ public interface TwoRequired extends Test /** * Returns the value of the 'Two' attribute. * - *

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

* * @return the value of the 'Two' attribute. * @see #setTwo(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/serializationerror/impl/IndentImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/serializationerror/impl/IndentImpl.java index ca6d855bb..d653dc64c 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/serializationerror/impl/IndentImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/serializationerror/impl/IndentImpl.java @@ -96,6 +96,7 @@ public class IndentImpl extends TestImpl implements Indent * * @generated */ + @Override public TwoRequired getReq() { return req; @@ -123,6 +124,7 @@ public class IndentImpl extends TestImpl implements Indent * * @generated */ + @Override public void setReq(TwoRequired newReq) { if (newReq != req) @@ -144,6 +146,7 @@ public class IndentImpl extends TestImpl implements Indent * * @generated */ + @Override public TwoOptions getOpt() { return opt; @@ -171,6 +174,7 @@ public class IndentImpl extends TestImpl implements Indent * * @generated */ + @Override public void setOpt(TwoOptions newOpt) { if (newOpt != opt) @@ -192,6 +196,7 @@ public class IndentImpl extends TestImpl implements Indent * * @generated */ + @Override public EList getIndent() { if (indent == null) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/serializationerror/impl/ModelImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/serializationerror/impl/ModelImpl.java index 8651d85ba..f6644d5b3 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/serializationerror/impl/ModelImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/serializationerror/impl/ModelImpl.java @@ -67,6 +67,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public Test getTest() { return test; @@ -94,6 +95,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setTest(Test newTest) { if (newTest != test) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/serializationerror/impl/SerializationerrorFactoryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/serializationerror/impl/SerializationerrorFactoryImpl.java index 1dad12183..c61341c67 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/serializationerror/impl/SerializationerrorFactoryImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/serializationerror/impl/SerializationerrorFactoryImpl.java @@ -80,6 +80,7 @@ public class SerializationerrorFactoryImpl extends EFactoryImpl implements Seria * * @generated */ + @Override public Model createModel() { ModelImpl model = new ModelImpl(); @@ -91,6 +92,7 @@ public class SerializationerrorFactoryImpl extends EFactoryImpl implements Seria * * @generated */ + @Override public Test createTest() { TestImpl test = new TestImpl(); @@ -102,6 +104,7 @@ public class SerializationerrorFactoryImpl extends EFactoryImpl implements Seria * * @generated */ + @Override public TwoRequired createTwoRequired() { TwoRequiredImpl twoRequired = new TwoRequiredImpl(); @@ -113,6 +116,7 @@ public class SerializationerrorFactoryImpl extends EFactoryImpl implements Seria * * @generated */ + @Override public TwoOptions createTwoOptions() { TwoOptionsImpl twoOptions = new TwoOptionsImpl(); @@ -124,6 +128,7 @@ public class SerializationerrorFactoryImpl extends EFactoryImpl implements Seria * * @generated */ + @Override public Indent createIndent() { IndentImpl indent = new IndentImpl(); @@ -135,6 +140,7 @@ public class SerializationerrorFactoryImpl extends EFactoryImpl implements Seria * * @generated */ + @Override public SerializationerrorPackage getSerializationerrorPackage() { return (SerializationerrorPackage)getEPackage(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/serializationerror/impl/SerializationerrorPackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/serializationerror/impl/SerializationerrorPackageImpl.java index d2615a110..4c91fdc08 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/serializationerror/impl/SerializationerrorPackageImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/serializationerror/impl/SerializationerrorPackageImpl.java @@ -91,7 +91,7 @@ public class SerializationerrorPackageImpl extends EPackageImpl implements Seria /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link SerializationerrorPackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -106,7 +106,8 @@ public class SerializationerrorPackageImpl extends EPackageImpl implements Seria if (isInited) return (SerializationerrorPackage)EPackage.Registry.INSTANCE.getEPackage(SerializationerrorPackage.eNS_URI); // Obtain or create and register package - SerializationerrorPackageImpl theSerializationerrorPackage = (SerializationerrorPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof SerializationerrorPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new SerializationerrorPackageImpl()); + Object registeredSerializationerrorPackage = EPackage.Registry.INSTANCE.get(eNS_URI); + SerializationerrorPackageImpl theSerializationerrorPackage = registeredSerializationerrorPackage instanceof SerializationerrorPackageImpl ? (SerializationerrorPackageImpl)registeredSerializationerrorPackage : new SerializationerrorPackageImpl(); isInited = true; @@ -122,7 +123,6 @@ public class SerializationerrorPackageImpl extends EPackageImpl implements Seria // Mark meta-data to indicate it can't be changed theSerializationerrorPackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(SerializationerrorPackage.eNS_URI, theSerializationerrorPackage); return theSerializationerrorPackage; @@ -133,6 +133,7 @@ public class SerializationerrorPackageImpl extends EPackageImpl implements Seria * * @generated */ + @Override public EClass getModel() { return modelEClass; @@ -143,6 +144,7 @@ public class SerializationerrorPackageImpl extends EPackageImpl implements Seria * * @generated */ + @Override public EReference getModel_Test() { return (EReference)modelEClass.getEStructuralFeatures().get(0); @@ -153,6 +155,7 @@ public class SerializationerrorPackageImpl extends EPackageImpl implements Seria * * @generated */ + @Override public EClass getTest() { return testEClass; @@ -163,6 +166,7 @@ public class SerializationerrorPackageImpl extends EPackageImpl implements Seria * * @generated */ + @Override public EClass getTwoRequired() { return twoRequiredEClass; @@ -173,6 +177,7 @@ public class SerializationerrorPackageImpl extends EPackageImpl implements Seria * * @generated */ + @Override public EAttribute getTwoRequired_One() { return (EAttribute)twoRequiredEClass.getEStructuralFeatures().get(0); @@ -183,6 +188,7 @@ public class SerializationerrorPackageImpl extends EPackageImpl implements Seria * * @generated */ + @Override public EAttribute getTwoRequired_Two() { return (EAttribute)twoRequiredEClass.getEStructuralFeatures().get(1); @@ -193,6 +199,7 @@ public class SerializationerrorPackageImpl extends EPackageImpl implements Seria * * @generated */ + @Override public EClass getTwoOptions() { return twoOptionsEClass; @@ -203,6 +210,7 @@ public class SerializationerrorPackageImpl extends EPackageImpl implements Seria * * @generated */ + @Override public EAttribute getTwoOptions_One() { return (EAttribute)twoOptionsEClass.getEStructuralFeatures().get(0); @@ -213,6 +221,7 @@ public class SerializationerrorPackageImpl extends EPackageImpl implements Seria * * @generated */ + @Override public EAttribute getTwoOptions_Two() { return (EAttribute)twoOptionsEClass.getEStructuralFeatures().get(1); @@ -223,6 +232,7 @@ public class SerializationerrorPackageImpl extends EPackageImpl implements Seria * * @generated */ + @Override public EClass getIndent() { return indentEClass; @@ -233,6 +243,7 @@ public class SerializationerrorPackageImpl extends EPackageImpl implements Seria * * @generated */ + @Override public EReference getIndent_Req() { return (EReference)indentEClass.getEStructuralFeatures().get(0); @@ -243,6 +254,7 @@ public class SerializationerrorPackageImpl extends EPackageImpl implements Seria * * @generated */ + @Override public EReference getIndent_Opt() { return (EReference)indentEClass.getEStructuralFeatures().get(1); @@ -253,6 +265,7 @@ public class SerializationerrorPackageImpl extends EPackageImpl implements Seria * * @generated */ + @Override public EReference getIndent_Indent() { return (EReference)indentEClass.getEStructuralFeatures().get(2); @@ -263,6 +276,7 @@ public class SerializationerrorPackageImpl extends EPackageImpl implements Seria * * @generated */ + @Override public SerializationerrorFactory getSerializationerrorFactory() { return (SerializationerrorFactory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/serializationerror/impl/TwoOptionsImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/serializationerror/impl/TwoOptionsImpl.java index 3cdce2602..fdc4e484b 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/serializationerror/impl/TwoOptionsImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/serializationerror/impl/TwoOptionsImpl.java @@ -94,6 +94,7 @@ public class TwoOptionsImpl extends TestImpl implements TwoOptions * * @generated */ + @Override public String getOne() { return one; @@ -104,6 +105,7 @@ public class TwoOptionsImpl extends TestImpl implements TwoOptions * * @generated */ + @Override public void setOne(String newOne) { String oldOne = one; @@ -117,6 +119,7 @@ public class TwoOptionsImpl extends TestImpl implements TwoOptions * * @generated */ + @Override public String getTwo() { return two; @@ -127,6 +130,7 @@ public class TwoOptionsImpl extends TestImpl implements TwoOptions * * @generated */ + @Override public void setTwo(String newTwo) { String oldTwo = two; @@ -221,7 +225,7 @@ public class TwoOptionsImpl extends TestImpl implements TwoOptions { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (one: "); result.append(one); result.append(", two: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/serializationerror/impl/TwoRequiredImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/serializationerror/impl/TwoRequiredImpl.java index b6eebbd38..88ba0ec82 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/serializationerror/impl/TwoRequiredImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/serializationerror/impl/TwoRequiredImpl.java @@ -94,6 +94,7 @@ public class TwoRequiredImpl extends TestImpl implements TwoRequired * * @generated */ + @Override public String getOne() { return one; @@ -104,6 +105,7 @@ public class TwoRequiredImpl extends TestImpl implements TwoRequired * * @generated */ + @Override public void setOne(String newOne) { String oldOne = one; @@ -117,6 +119,7 @@ public class TwoRequiredImpl extends TestImpl implements TwoRequired * * @generated */ + @Override public String getTwo() { return two; @@ -127,6 +130,7 @@ public class TwoRequiredImpl extends TestImpl implements TwoRequired * * @generated */ + @Override public void setTwo(String newTwo) { String oldTwo = two; @@ -221,7 +225,7 @@ public class TwoRequiredImpl extends TestImpl implements TwoRequired { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (one: "); result.append(one); result.append(", two: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/serializer/SerializationErrorTestLanguageSemanticSequencer.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/serializer/SerializationErrorTestLanguageSemanticSequencer.java index 4cca96dea..b605cd530 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/serializer/SerializationErrorTestLanguageSemanticSequencer.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/serializer/SerializationErrorTestLanguageSemanticSequencer.java @@ -59,7 +59,7 @@ public class SerializationErrorTestLanguageSemanticSequencer extends AbstractDel * Indent returns Indent * * Constraint: - * ((((req=TwoRequired opt=TwoOptions) | opt=TwoOptions)? indent+=Indent+) | indent+=Indent+)? + * ((req=TwoRequired? opt=TwoOptions indent+=Indent+) | (req=TwoRequired? indent+=Indent+) | indent+=Indent+)? */ protected void sequence_Indent(ISerializationContext context, Indent semanticObject) { genericSequencer.createSequence(context, semanticObject); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/TransientValuesTest.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/TransientValuesTest.genmodel index 8c8a0ac87..7d7d5b3ef 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/TransientValuesTest.genmodel +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/TransientValuesTest.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="TransientValuesTest" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> + complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/transientvaluestest/TestList.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/transientvaluestest/TestList.java index 0302fd951..afbf30c6a 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/transientvaluestest/TestList.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/transientvaluestest/TestList.java @@ -27,10 +27,6 @@ public interface TestList extends Root * Returns the value of the 'Item' attribute list. * The list contents are of type {@link java.lang.Integer}. * - *

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

* * @return the value of the 'Item' attribute list. * @see org.eclipse.xtext.parsetree.transientvalues.transientvaluestest.TransientvaluestestPackage#getTestList_Item() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/transientvaluestest/TestOptional.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/transientvaluestest/TestOptional.java index 1f9bcd86d..be61e3fc5 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/transientvaluestest/TestOptional.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/transientvaluestest/TestOptional.java @@ -26,10 +26,6 @@ public interface TestOptional extends Root /** * Returns the value of the 'Opt1' attribute. * - *

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

* * @return the value of the 'Opt1' attribute. * @see #setOpt1(int) @@ -52,10 +48,6 @@ public interface TestOptional extends Root /** * Returns the value of the 'Opt2' attribute. * - *

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

* * @return the value of the 'Opt2' attribute. * @see #setOpt2(int) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/transientvaluestest/TestRequired.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/transientvaluestest/TestRequired.java index 0bc7060c4..7f65dd8fc 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/transientvaluestest/TestRequired.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/transientvaluestest/TestRequired.java @@ -26,10 +26,6 @@ public interface TestRequired extends Root /** * Returns the value of the 'Required1' attribute. * - *

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

* * @return the value of the 'Required1' attribute. * @see #setRequired1(int) @@ -52,10 +48,6 @@ public interface TestRequired extends Root /** * Returns the value of the 'Required2' attribute. * - *

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

* * @return the value of the 'Required2' attribute. * @see #setRequired2(int) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/transientvaluestest/impl/TestListImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/transientvaluestest/impl/TestListImpl.java index 705548ede..aa3d7bff1 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/transientvaluestest/impl/TestListImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/transientvaluestest/impl/TestListImpl.java @@ -65,6 +65,7 @@ public class TestListImpl extends RootImpl implements TestList * * @generated */ + @Override public EList getItem() { if (item == null) @@ -152,7 +153,7 @@ public class TestListImpl extends RootImpl implements TestList { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (item: "); result.append(item); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/transientvaluestest/impl/TestOptionalImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/transientvaluestest/impl/TestOptionalImpl.java index b1b10e903..287f59295 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/transientvaluestest/impl/TestOptionalImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/transientvaluestest/impl/TestOptionalImpl.java @@ -94,6 +94,7 @@ public class TestOptionalImpl extends RootImpl implements TestOptional * * @generated */ + @Override public int getOpt1() { return opt1; @@ -104,6 +105,7 @@ public class TestOptionalImpl extends RootImpl implements TestOptional * * @generated */ + @Override public void setOpt1(int newOpt1) { int oldOpt1 = opt1; @@ -117,6 +119,7 @@ public class TestOptionalImpl extends RootImpl implements TestOptional * * @generated */ + @Override public int getOpt2() { return opt2; @@ -127,6 +130,7 @@ public class TestOptionalImpl extends RootImpl implements TestOptional * * @generated */ + @Override public void setOpt2(int newOpt2) { int oldOpt2 = opt2; @@ -221,7 +225,7 @@ public class TestOptionalImpl extends RootImpl implements TestOptional { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (opt1: "); result.append(opt1); result.append(", opt2: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/transientvaluestest/impl/TestRequiredImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/transientvaluestest/impl/TestRequiredImpl.java index 78529725b..0f2aa6665 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/transientvaluestest/impl/TestRequiredImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/transientvaluestest/impl/TestRequiredImpl.java @@ -94,6 +94,7 @@ public class TestRequiredImpl extends RootImpl implements TestRequired * * @generated */ + @Override public int getRequired1() { return required1; @@ -104,6 +105,7 @@ public class TestRequiredImpl extends RootImpl implements TestRequired * * @generated */ + @Override public void setRequired1(int newRequired1) { int oldRequired1 = required1; @@ -117,6 +119,7 @@ public class TestRequiredImpl extends RootImpl implements TestRequired * * @generated */ + @Override public int getRequired2() { return required2; @@ -127,6 +130,7 @@ public class TestRequiredImpl extends RootImpl implements TestRequired * * @generated */ + @Override public void setRequired2(int newRequired2) { int oldRequired2 = required2; @@ -221,7 +225,7 @@ public class TestRequiredImpl extends RootImpl implements TestRequired { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (required1: "); result.append(required1); result.append(", required2: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/transientvaluestest/impl/TransientvaluestestFactoryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/transientvaluestest/impl/TransientvaluestestFactoryImpl.java index 405a042ce..ccdb9a341 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/transientvaluestest/impl/TransientvaluestestFactoryImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/transientvaluestest/impl/TransientvaluestestFactoryImpl.java @@ -79,6 +79,7 @@ public class TransientvaluestestFactoryImpl extends EFactoryImpl implements Tran * * @generated */ + @Override public Root createRoot() { RootImpl root = new RootImpl(); @@ -90,6 +91,7 @@ public class TransientvaluestestFactoryImpl extends EFactoryImpl implements Tran * * @generated */ + @Override public TestRequired createTestRequired() { TestRequiredImpl testRequired = new TestRequiredImpl(); @@ -101,6 +103,7 @@ public class TransientvaluestestFactoryImpl extends EFactoryImpl implements Tran * * @generated */ + @Override public TestOptional createTestOptional() { TestOptionalImpl testOptional = new TestOptionalImpl(); @@ -112,6 +115,7 @@ public class TransientvaluestestFactoryImpl extends EFactoryImpl implements Tran * * @generated */ + @Override public TestList createTestList() { TestListImpl testList = new TestListImpl(); @@ -123,6 +127,7 @@ public class TransientvaluestestFactoryImpl extends EFactoryImpl implements Tran * * @generated */ + @Override public TransientvaluestestPackage getTransientvaluestestPackage() { return (TransientvaluestestPackage)getEPackage(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/transientvaluestest/impl/TransientvaluestestPackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/transientvaluestest/impl/TransientvaluestestPackageImpl.java index 1a9207128..131955299 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/transientvaluestest/impl/TransientvaluestestPackageImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/transientvalues/transientvaluestest/impl/TransientvaluestestPackageImpl.java @@ -82,7 +82,7 @@ public class TransientvaluestestPackageImpl extends EPackageImpl implements Tran /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link TransientvaluestestPackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -97,7 +97,8 @@ public class TransientvaluestestPackageImpl extends EPackageImpl implements Tran if (isInited) return (TransientvaluestestPackage)EPackage.Registry.INSTANCE.getEPackage(TransientvaluestestPackage.eNS_URI); // Obtain or create and register package - TransientvaluestestPackageImpl theTransientvaluestestPackage = (TransientvaluestestPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof TransientvaluestestPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new TransientvaluestestPackageImpl()); + Object registeredTransientvaluestestPackage = EPackage.Registry.INSTANCE.get(eNS_URI); + TransientvaluestestPackageImpl theTransientvaluestestPackage = registeredTransientvaluestestPackage instanceof TransientvaluestestPackageImpl ? (TransientvaluestestPackageImpl)registeredTransientvaluestestPackage : new TransientvaluestestPackageImpl(); isInited = true; @@ -113,7 +114,6 @@ public class TransientvaluestestPackageImpl extends EPackageImpl implements Tran // Mark meta-data to indicate it can't be changed theTransientvaluestestPackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(TransientvaluestestPackage.eNS_URI, theTransientvaluestestPackage); return theTransientvaluestestPackage; @@ -124,6 +124,7 @@ public class TransientvaluestestPackageImpl extends EPackageImpl implements Tran * * @generated */ + @Override public EClass getRoot() { return rootEClass; @@ -134,6 +135,7 @@ public class TransientvaluestestPackageImpl extends EPackageImpl implements Tran * * @generated */ + @Override public EClass getTestRequired() { return testRequiredEClass; @@ -144,6 +146,7 @@ public class TransientvaluestestPackageImpl extends EPackageImpl implements Tran * * @generated */ + @Override public EAttribute getTestRequired_Required1() { return (EAttribute)testRequiredEClass.getEStructuralFeatures().get(0); @@ -154,6 +157,7 @@ public class TransientvaluestestPackageImpl extends EPackageImpl implements Tran * * @generated */ + @Override public EAttribute getTestRequired_Required2() { return (EAttribute)testRequiredEClass.getEStructuralFeatures().get(1); @@ -164,6 +168,7 @@ public class TransientvaluestestPackageImpl extends EPackageImpl implements Tran * * @generated */ + @Override public EClass getTestOptional() { return testOptionalEClass; @@ -174,6 +179,7 @@ public class TransientvaluestestPackageImpl extends EPackageImpl implements Tran * * @generated */ + @Override public EAttribute getTestOptional_Opt1() { return (EAttribute)testOptionalEClass.getEStructuralFeatures().get(0); @@ -184,6 +190,7 @@ public class TransientvaluestestPackageImpl extends EPackageImpl implements Tran * * @generated */ + @Override public EAttribute getTestOptional_Opt2() { return (EAttribute)testOptionalEClass.getEStructuralFeatures().get(1); @@ -194,6 +201,7 @@ public class TransientvaluestestPackageImpl extends EPackageImpl implements Tran * * @generated */ + @Override public EClass getTestList() { return testListEClass; @@ -204,6 +212,7 @@ public class TransientvaluestestPackageImpl extends EPackageImpl implements Tran * * @generated */ + @Override public EAttribute getTestList_Item() { return (EAttribute)testListEClass.getEStructuralFeatures().get(0); @@ -214,6 +223,7 @@ public class TransientvaluestestPackageImpl extends EPackageImpl implements Tran * * @generated */ + @Override public TransientvaluestestFactory getTransientvaluestestFactory() { return (TransientvaluestestFactory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/unassignedtext/UnassignedTextTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/unassignedtext/UnassignedTextTestLanguage.genmodel index 3ffd040b5..c9f6d9b90 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/unassignedtext/UnassignedTextTestLanguage.genmodel +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/unassignedtext/UnassignedTextTestLanguage.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="UnassignedTextTestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> + complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/unassignedtext/unassignedtext/CaseInsensitiveKeywordRule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/unassignedtext/unassignedtext/CaseInsensitiveKeywordRule.java index 8e62026ec..2bffca364 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/unassignedtext/unassignedtext/CaseInsensitiveKeywordRule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/unassignedtext/unassignedtext/CaseInsensitiveKeywordRule.java @@ -25,10 +25,6 @@ public interface CaseInsensitiveKeywordRule extends Model /** * Returns the value of the 'Val' attribute. * - *

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

* * @return the value of the 'Val' attribute. * @see #setVal(int) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/unassignedtext/unassignedtext/CommonTerminalsRule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/unassignedtext/unassignedtext/CommonTerminalsRule.java index 6e52049eb..f34f098c3 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/unassignedtext/unassignedtext/CommonTerminalsRule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/unassignedtext/unassignedtext/CommonTerminalsRule.java @@ -25,10 +25,6 @@ public interface CommonTerminalsRule extends Model /** * Returns the value of the 'Val' attribute. * - *

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

* * @return the value of the 'Val' attribute. * @see #setVal(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/unassignedtext/unassignedtext/DatatypeRule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/unassignedtext/unassignedtext/DatatypeRule.java index c28ac6f7c..baf41c539 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/unassignedtext/unassignedtext/DatatypeRule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/unassignedtext/unassignedtext/DatatypeRule.java @@ -25,10 +25,6 @@ public interface DatatypeRule extends Model /** * Returns the value of the 'Val' attribute. * - *

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

* * @return the value of the 'Val' attribute. * @see #setVal(int) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/unassignedtext/unassignedtext/MultiRule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/unassignedtext/unassignedtext/MultiRule.java index 72c56a0b0..a34e4b93c 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/unassignedtext/unassignedtext/MultiRule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/unassignedtext/unassignedtext/MultiRule.java @@ -25,10 +25,6 @@ public interface MultiRule extends Model /** * Returns the value of the 'Val' attribute. * - *

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

* * @return the value of the 'Val' attribute. * @see #setVal(int) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/unassignedtext/unassignedtext/PluralRule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/unassignedtext/unassignedtext/PluralRule.java index 90c8ba87c..f521dd70a 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/unassignedtext/unassignedtext/PluralRule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/unassignedtext/unassignedtext/PluralRule.java @@ -25,10 +25,6 @@ public interface PluralRule extends Model /** * Returns the value of the 'Count' attribute. * - *

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

* * @return the value of the 'Count' attribute. * @see #setCount(int) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/unassignedtext/unassignedtext/impl/CaseInsensitiveKeywordRuleImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/unassignedtext/unassignedtext/impl/CaseInsensitiveKeywordRuleImpl.java index dbf0f775d..b98742f6f 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/unassignedtext/unassignedtext/impl/CaseInsensitiveKeywordRuleImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/unassignedtext/unassignedtext/impl/CaseInsensitiveKeywordRuleImpl.java @@ -73,6 +73,7 @@ public class CaseInsensitiveKeywordRuleImpl extends ModelImpl implements CaseIns * * @generated */ + @Override public int getVal() { return val; @@ -83,6 +84,7 @@ public class CaseInsensitiveKeywordRuleImpl extends ModelImpl implements CaseIns * * @generated */ + @Override public void setVal(int newVal) { int oldVal = val; @@ -167,7 +169,7 @@ public class CaseInsensitiveKeywordRuleImpl extends ModelImpl implements CaseIns { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (val: "); result.append(val); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/unassignedtext/unassignedtext/impl/CommonTerminalsRuleImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/unassignedtext/unassignedtext/impl/CommonTerminalsRuleImpl.java index 51c19c9dc..607b3dbb4 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/unassignedtext/unassignedtext/impl/CommonTerminalsRuleImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/unassignedtext/unassignedtext/impl/CommonTerminalsRuleImpl.java @@ -73,6 +73,7 @@ public class CommonTerminalsRuleImpl extends ModelImpl implements CommonTerminal * * @generated */ + @Override public String getVal() { return val; @@ -83,6 +84,7 @@ public class CommonTerminalsRuleImpl extends ModelImpl implements CommonTerminal * * @generated */ + @Override public void setVal(String newVal) { String oldVal = val; @@ -167,7 +169,7 @@ public class CommonTerminalsRuleImpl extends ModelImpl implements CommonTerminal { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (val: "); result.append(val); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/unassignedtext/unassignedtext/impl/DatatypeRuleImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/unassignedtext/unassignedtext/impl/DatatypeRuleImpl.java index 221af7ccd..4f6343bab 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/unassignedtext/unassignedtext/impl/DatatypeRuleImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/unassignedtext/unassignedtext/impl/DatatypeRuleImpl.java @@ -73,6 +73,7 @@ public class DatatypeRuleImpl extends ModelImpl implements DatatypeRule * * @generated */ + @Override public int getVal() { return val; @@ -83,6 +84,7 @@ public class DatatypeRuleImpl extends ModelImpl implements DatatypeRule * * @generated */ + @Override public void setVal(int newVal) { int oldVal = val; @@ -167,7 +169,7 @@ public class DatatypeRuleImpl extends ModelImpl implements DatatypeRule { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (val: "); result.append(val); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/unassignedtext/unassignedtext/impl/MultiRuleImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/unassignedtext/unassignedtext/impl/MultiRuleImpl.java index 93729aee5..f3f83660e 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/unassignedtext/unassignedtext/impl/MultiRuleImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/unassignedtext/unassignedtext/impl/MultiRuleImpl.java @@ -73,6 +73,7 @@ public class MultiRuleImpl extends ModelImpl implements MultiRule * * @generated */ + @Override public int getVal() { return val; @@ -83,6 +84,7 @@ public class MultiRuleImpl extends ModelImpl implements MultiRule * * @generated */ + @Override public void setVal(int newVal) { int oldVal = val; @@ -167,7 +169,7 @@ public class MultiRuleImpl extends ModelImpl implements MultiRule { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (val: "); result.append(val); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/unassignedtext/unassignedtext/impl/PluralRuleImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/unassignedtext/unassignedtext/impl/PluralRuleImpl.java index 0d4b15956..b53941046 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/unassignedtext/unassignedtext/impl/PluralRuleImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/unassignedtext/unassignedtext/impl/PluralRuleImpl.java @@ -73,6 +73,7 @@ public class PluralRuleImpl extends ModelImpl implements PluralRule * * @generated */ + @Override public int getCount() { return count; @@ -83,6 +84,7 @@ public class PluralRuleImpl extends ModelImpl implements PluralRule * * @generated */ + @Override public void setCount(int newCount) { int oldCount = count; @@ -167,7 +169,7 @@ public class PluralRuleImpl extends ModelImpl implements PluralRule { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (count: "); result.append(count); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/unassignedtext/unassignedtext/impl/UnassignedtextFactoryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/unassignedtext/unassignedtext/impl/UnassignedtextFactoryImpl.java index ef0fbb915..4aef251b4 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/unassignedtext/unassignedtext/impl/UnassignedtextFactoryImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/unassignedtext/unassignedtext/impl/UnassignedtextFactoryImpl.java @@ -82,6 +82,7 @@ public class UnassignedtextFactoryImpl extends EFactoryImpl implements Unassigne * * @generated */ + @Override public Model createModel() { ModelImpl model = new ModelImpl(); @@ -93,6 +94,7 @@ public class UnassignedtextFactoryImpl extends EFactoryImpl implements Unassigne * * @generated */ + @Override public CaseInsensitiveKeywordRule createCaseInsensitiveKeywordRule() { CaseInsensitiveKeywordRuleImpl caseInsensitiveKeywordRule = new CaseInsensitiveKeywordRuleImpl(); @@ -104,6 +106,7 @@ public class UnassignedtextFactoryImpl extends EFactoryImpl implements Unassigne * * @generated */ + @Override public PluralRule createPluralRule() { PluralRuleImpl pluralRule = new PluralRuleImpl(); @@ -115,6 +118,7 @@ public class UnassignedtextFactoryImpl extends EFactoryImpl implements Unassigne * * @generated */ + @Override public MultiRule createMultiRule() { MultiRuleImpl multiRule = new MultiRuleImpl(); @@ -126,6 +130,7 @@ public class UnassignedtextFactoryImpl extends EFactoryImpl implements Unassigne * * @generated */ + @Override public DatatypeRule createDatatypeRule() { DatatypeRuleImpl datatypeRule = new DatatypeRuleImpl(); @@ -137,6 +142,7 @@ public class UnassignedtextFactoryImpl extends EFactoryImpl implements Unassigne * * @generated */ + @Override public CommonTerminalsRule createCommonTerminalsRule() { CommonTerminalsRuleImpl commonTerminalsRule = new CommonTerminalsRuleImpl(); @@ -148,6 +154,7 @@ public class UnassignedtextFactoryImpl extends EFactoryImpl implements Unassigne * * @generated */ + @Override public GroupRule createGroupRule() { GroupRuleImpl groupRule = new GroupRuleImpl(); @@ -159,6 +166,7 @@ public class UnassignedtextFactoryImpl extends EFactoryImpl implements Unassigne * * @generated */ + @Override public UnassignedtextPackage getUnassignedtextPackage() { return (UnassignedtextPackage)getEPackage(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/unassignedtext/unassignedtext/impl/UnassignedtextPackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/unassignedtext/unassignedtext/impl/UnassignedtextPackageImpl.java index 19aa891d3..ed63b4dc0 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/unassignedtext/unassignedtext/impl/UnassignedtextPackageImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/unassignedtext/unassignedtext/impl/UnassignedtextPackageImpl.java @@ -106,7 +106,7 @@ public class UnassignedtextPackageImpl extends EPackageImpl implements Unassigne /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link UnassignedtextPackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -121,7 +121,8 @@ public class UnassignedtextPackageImpl extends EPackageImpl implements Unassigne if (isInited) return (UnassignedtextPackage)EPackage.Registry.INSTANCE.getEPackage(UnassignedtextPackage.eNS_URI); // Obtain or create and register package - UnassignedtextPackageImpl theUnassignedtextPackage = (UnassignedtextPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof UnassignedtextPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new UnassignedtextPackageImpl()); + Object registeredUnassignedtextPackage = EPackage.Registry.INSTANCE.get(eNS_URI); + UnassignedtextPackageImpl theUnassignedtextPackage = registeredUnassignedtextPackage instanceof UnassignedtextPackageImpl ? (UnassignedtextPackageImpl)registeredUnassignedtextPackage : new UnassignedtextPackageImpl(); isInited = true; @@ -137,7 +138,6 @@ public class UnassignedtextPackageImpl extends EPackageImpl implements Unassigne // Mark meta-data to indicate it can't be changed theUnassignedtextPackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(UnassignedtextPackage.eNS_URI, theUnassignedtextPackage); return theUnassignedtextPackage; @@ -148,6 +148,7 @@ public class UnassignedtextPackageImpl extends EPackageImpl implements Unassigne * * @generated */ + @Override public EClass getModel() { return modelEClass; @@ -158,6 +159,7 @@ public class UnassignedtextPackageImpl extends EPackageImpl implements Unassigne * * @generated */ + @Override public EClass getCaseInsensitiveKeywordRule() { return caseInsensitiveKeywordRuleEClass; @@ -168,6 +170,7 @@ public class UnassignedtextPackageImpl extends EPackageImpl implements Unassigne * * @generated */ + @Override public EAttribute getCaseInsensitiveKeywordRule_Val() { return (EAttribute)caseInsensitiveKeywordRuleEClass.getEStructuralFeatures().get(0); @@ -178,6 +181,7 @@ public class UnassignedtextPackageImpl extends EPackageImpl implements Unassigne * * @generated */ + @Override public EClass getPluralRule() { return pluralRuleEClass; @@ -188,6 +192,7 @@ public class UnassignedtextPackageImpl extends EPackageImpl implements Unassigne * * @generated */ + @Override public EAttribute getPluralRule_Count() { return (EAttribute)pluralRuleEClass.getEStructuralFeatures().get(0); @@ -198,6 +203,7 @@ public class UnassignedtextPackageImpl extends EPackageImpl implements Unassigne * * @generated */ + @Override public EClass getMultiRule() { return multiRuleEClass; @@ -208,6 +214,7 @@ public class UnassignedtextPackageImpl extends EPackageImpl implements Unassigne * * @generated */ + @Override public EAttribute getMultiRule_Val() { return (EAttribute)multiRuleEClass.getEStructuralFeatures().get(0); @@ -218,6 +225,7 @@ public class UnassignedtextPackageImpl extends EPackageImpl implements Unassigne * * @generated */ + @Override public EClass getDatatypeRule() { return datatypeRuleEClass; @@ -228,6 +236,7 @@ public class UnassignedtextPackageImpl extends EPackageImpl implements Unassigne * * @generated */ + @Override public EAttribute getDatatypeRule_Val() { return (EAttribute)datatypeRuleEClass.getEStructuralFeatures().get(0); @@ -238,6 +247,7 @@ public class UnassignedtextPackageImpl extends EPackageImpl implements Unassigne * * @generated */ + @Override public EClass getCommonTerminalsRule() { return commonTerminalsRuleEClass; @@ -248,6 +258,7 @@ public class UnassignedtextPackageImpl extends EPackageImpl implements Unassigne * * @generated */ + @Override public EAttribute getCommonTerminalsRule_Val() { return (EAttribute)commonTerminalsRuleEClass.getEStructuralFeatures().get(0); @@ -258,6 +269,7 @@ public class UnassignedtextPackageImpl extends EPackageImpl implements Unassigne * * @generated */ + @Override public EClass getGroupRule() { return groupRuleEClass; @@ -268,6 +280,7 @@ public class UnassignedtextPackageImpl extends EPackageImpl implements Unassigne * * @generated */ + @Override public UnassignedtextFactory getUnassignedtextFactory() { return (UnassignedtextFactory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/Bug385636.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/Bug385636.genmodel index 8ccfa0c15..77b83bc96 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/Bug385636.genmodel +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/Bug385636.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="Bug385636" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> + complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/EObjectAtOffsetTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/EObjectAtOffsetTestLanguage.genmodel index 72fb8c050..2aaadd4a8 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/EObjectAtOffsetTestLanguage.genmodel +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/EObjectAtOffsetTestLanguage.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="EObjectAtOffsetTestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> + complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/LiveContainerBuilderIntegerationTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/LiveContainerBuilderIntegerationTestLanguage.genmodel index b1f257f76..ed6b3b0db 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/LiveContainerBuilderIntegerationTestLanguage.genmodel +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/LiveContainerBuilderIntegerationTestLanguage.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="LiveContainerBuilderIntegerationTestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> + complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/LiveContainerTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/LiveContainerTestLanguage.genmodel index 680f667f8..67f9cee25 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/LiveContainerTestLanguage.genmodel +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/LiveContainerTestLanguage.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="LiveContainerTestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> + complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/LocationProviderTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/LocationProviderTestLanguage.genmodel index 643881c9b..c926e8ed4 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/LocationProviderTestLanguage.genmodel +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/LocationProviderTestLanguage.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="LocationProviderTestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> + complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/bug385636/DefineVariable.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/bug385636/DefineVariable.java index 5e73b1f87..334d72ba1 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/bug385636/DefineVariable.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/bug385636/DefineVariable.java @@ -26,10 +26,6 @@ public interface DefineVariable 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) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/bug385636/DefineVariables.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/bug385636/DefineVariables.java index 93bfe343d..62b8b5fc3 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/bug385636/DefineVariables.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/bug385636/DefineVariables.java @@ -29,10 +29,6 @@ public interface DefineVariables extends EObject * Returns the value of the 'Variables' containment reference list. * The list contents are of type {@link org.eclipse.xtext.resource.bug385636.DefineVariable}. * - *

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

* * @return the value of the 'Variables' containment reference list. * @see org.eclipse.xtext.resource.bug385636.Bug385636Package#getDefineVariables_Variables() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/bug385636/Expression_Equal.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/bug385636/Expression_Equal.java index 5565f1ea1..fc1abc265 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/bug385636/Expression_Equal.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/bug385636/Expression_Equal.java @@ -26,10 +26,6 @@ public interface Expression_Equal extends Expression /** * Returns the value of the 'Left' containment reference. * - *

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

* * @return the value of the 'Left' containment reference. * @see #setLeft(Expression) @@ -52,10 +48,6 @@ public interface Expression_Equal extends Expression /** * Returns the value of the 'Right' containment reference. * - *

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

* * @return the value of the 'Right' containment reference. * @see #setRight(Expression_VariableName) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/bug385636/Expression_Larger_Equal.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/bug385636/Expression_Larger_Equal.java index 0ab93a9b7..a93c19028 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/bug385636/Expression_Larger_Equal.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/bug385636/Expression_Larger_Equal.java @@ -26,10 +26,6 @@ public interface Expression_Larger_Equal extends Expression /** * Returns the value of the 'Left' containment reference. * - *

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

* * @return the value of the 'Left' containment reference. * @see #setLeft(Expression) @@ -52,10 +48,6 @@ public interface Expression_Larger_Equal extends Expression /** * Returns the value of the 'Right' containment reference. * - *

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

* * @return the value of the 'Right' containment reference. * @see #setRight(Expression_VariableName) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/bug385636/Expression_Not_Equal.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/bug385636/Expression_Not_Equal.java index d9c615bb6..b8b958f21 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/bug385636/Expression_Not_Equal.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/bug385636/Expression_Not_Equal.java @@ -26,10 +26,6 @@ public interface Expression_Not_Equal extends Expression /** * Returns the value of the 'Left' containment reference. * - *

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

* * @return the value of the 'Left' containment reference. * @see #setLeft(Expression) @@ -52,10 +48,6 @@ public interface Expression_Not_Equal extends Expression /** * Returns the value of the 'Right' containment reference. * - *

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

* * @return the value of the 'Right' containment reference. * @see #setRight(Expression_VariableName) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/bug385636/Expression_Not_Greater.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/bug385636/Expression_Not_Greater.java index 5b5779bda..9ae0a36e5 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/bug385636/Expression_Not_Greater.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/bug385636/Expression_Not_Greater.java @@ -26,10 +26,6 @@ public interface Expression_Not_Greater extends Expression /** * Returns the value of the 'Left' containment reference. * - *

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

* * @return the value of the 'Left' containment reference. * @see #setLeft(Expression) @@ -52,10 +48,6 @@ public interface Expression_Not_Greater extends Expression /** * Returns the value of the 'Right' containment reference. * - *

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

* * @return the value of the 'Right' containment reference. * @see #setRight(Expression_VariableName) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/bug385636/Expression_Not_Less.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/bug385636/Expression_Not_Less.java index 64fe82bc0..dc3a6f055 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/bug385636/Expression_Not_Less.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/bug385636/Expression_Not_Less.java @@ -26,10 +26,6 @@ public interface Expression_Not_Less extends Expression /** * Returns the value of the 'Left' containment reference. * - *

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

* * @return the value of the 'Left' containment reference. * @see #setLeft(Expression) @@ -52,10 +48,6 @@ public interface Expression_Not_Less extends Expression /** * Returns the value of the 'Right' containment reference. * - *

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

* * @return the value of the 'Right' containment reference. * @see #setRight(Expression_VariableName) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/bug385636/Expression_Smaller.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/bug385636/Expression_Smaller.java index e10511621..5f5afeba5 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/bug385636/Expression_Smaller.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/bug385636/Expression_Smaller.java @@ -26,10 +26,6 @@ public interface Expression_Smaller extends Expression /** * Returns the value of the 'Left' containment reference. * - *

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

* * @return the value of the 'Left' containment reference. * @see #setLeft(Expression) @@ -52,10 +48,6 @@ public interface Expression_Smaller extends Expression /** * Returns the value of the 'Right' containment reference. * - *

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

* * @return the value of the 'Right' containment reference. * @see #setRight(Expression_VariableName) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/bug385636/Expression_Smaller_Equal.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/bug385636/Expression_Smaller_Equal.java index 44264ef57..a43751869 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/bug385636/Expression_Smaller_Equal.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/bug385636/Expression_Smaller_Equal.java @@ -26,10 +26,6 @@ public interface Expression_Smaller_Equal extends Expression /** * Returns the value of the 'Left' containment reference. * - *

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

* * @return the value of the 'Left' containment reference. * @see #setLeft(Expression) @@ -52,10 +48,6 @@ public interface Expression_Smaller_Equal extends Expression /** * Returns the value of the 'Right' containment reference. * - *

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

* * @return the value of the 'Right' containment reference. * @see #setRight(Expression_VariableName) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/bug385636/Expression_VariableName.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/bug385636/Expression_VariableName.java index a36277c44..b3b3ef01c 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/bug385636/Expression_VariableName.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/bug385636/Expression_VariableName.java @@ -25,10 +25,6 @@ public interface Expression_VariableName extends Expression /** * Returns the value of the 'Variable' containment reference. * - *

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

* * @return the value of the 'Variable' containment reference. * @see #setVariable(NVariableAccess) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/bug385636/NVariableAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/bug385636/NVariableAccess.java index 9160a8a30..aa4f897a0 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/bug385636/NVariableAccess.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/bug385636/NVariableAccess.java @@ -26,10 +26,6 @@ public interface NVariableAccess extends EObject /** * Returns the value of the 'Variable' reference. * - *

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

* * @return the value of the 'Variable' reference. * @see #setVariable(DefineVariable) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/bug385636/Program.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/bug385636/Program.java index 8a3eee379..fd0216a7b 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/bug385636/Program.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/bug385636/Program.java @@ -29,10 +29,6 @@ public interface Program extends EObject /** * Returns the value of the 'Define' containment reference. * - *

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

* * @return the value of the 'Define' containment reference. * @see #setDefine(DefineVariables) @@ -56,10 +52,6 @@ public interface Program extends EObject * Returns the value of the 'Statements' containment reference list. * The list contents are of type {@link org.eclipse.xtext.resource.bug385636.Expression}. * - *

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

* * @return the value of the 'Statements' containment reference list. * @see org.eclipse.xtext.resource.bug385636.Bug385636Package#getProgram_Statements() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/bug385636/impl/Bug385636FactoryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/bug385636/impl/Bug385636FactoryImpl.java index 11eec14ff..fcd60a88a 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/bug385636/impl/Bug385636FactoryImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/bug385636/impl/Bug385636FactoryImpl.java @@ -88,6 +88,7 @@ public class Bug385636FactoryImpl extends EFactoryImpl implements Bug385636Facto * * @generated */ + @Override public Program createProgram() { ProgramImpl program = new ProgramImpl(); @@ -99,6 +100,7 @@ public class Bug385636FactoryImpl extends EFactoryImpl implements Bug385636Facto * * @generated */ + @Override public DefineVariables createDefineVariables() { DefineVariablesImpl defineVariables = new DefineVariablesImpl(); @@ -110,6 +112,7 @@ public class Bug385636FactoryImpl extends EFactoryImpl implements Bug385636Facto * * @generated */ + @Override public DefineVariable createDefineVariable() { DefineVariableImpl defineVariable = new DefineVariableImpl(); @@ -121,6 +124,7 @@ public class Bug385636FactoryImpl extends EFactoryImpl implements Bug385636Facto * * @generated */ + @Override public NVariableAccess createNVariableAccess() { NVariableAccessImpl nVariableAccess = new NVariableAccessImpl(); @@ -132,6 +136,7 @@ public class Bug385636FactoryImpl extends EFactoryImpl implements Bug385636Facto * * @generated */ + @Override public Expression createExpression() { ExpressionImpl expression = new ExpressionImpl(); @@ -143,6 +148,7 @@ public class Bug385636FactoryImpl extends EFactoryImpl implements Bug385636Facto * * @generated */ + @Override public Expression_VariableName createExpression_VariableName() { Expression_VariableNameImpl expression_VariableName = new Expression_VariableNameImpl(); @@ -154,6 +160,7 @@ public class Bug385636FactoryImpl extends EFactoryImpl implements Bug385636Facto * * @generated */ + @Override public Expression_Larger_Equal createExpression_Larger_Equal() { Expression_Larger_EqualImpl expression_Larger_Equal = new Expression_Larger_EqualImpl(); @@ -165,6 +172,7 @@ public class Bug385636FactoryImpl extends EFactoryImpl implements Bug385636Facto * * @generated */ + @Override public Expression_Smaller createExpression_Smaller() { Expression_SmallerImpl expression_Smaller = new Expression_SmallerImpl(); @@ -176,6 +184,7 @@ public class Bug385636FactoryImpl extends EFactoryImpl implements Bug385636Facto * * @generated */ + @Override public Expression_Smaller_Equal createExpression_Smaller_Equal() { Expression_Smaller_EqualImpl expression_Smaller_Equal = new Expression_Smaller_EqualImpl(); @@ -187,6 +196,7 @@ public class Bug385636FactoryImpl extends EFactoryImpl implements Bug385636Facto * * @generated */ + @Override public Expression_Equal createExpression_Equal() { Expression_EqualImpl expression_Equal = new Expression_EqualImpl(); @@ -198,6 +208,7 @@ public class Bug385636FactoryImpl extends EFactoryImpl implements Bug385636Facto * * @generated */ + @Override public Expression_Not_Equal createExpression_Not_Equal() { Expression_Not_EqualImpl expression_Not_Equal = new Expression_Not_EqualImpl(); @@ -209,6 +220,7 @@ public class Bug385636FactoryImpl extends EFactoryImpl implements Bug385636Facto * * @generated */ + @Override public Expression_Not_Less createExpression_Not_Less() { Expression_Not_LessImpl expression_Not_Less = new Expression_Not_LessImpl(); @@ -220,6 +232,7 @@ public class Bug385636FactoryImpl extends EFactoryImpl implements Bug385636Facto * * @generated */ + @Override public Expression_Not_Greater createExpression_Not_Greater() { Expression_Not_GreaterImpl expression_Not_Greater = new Expression_Not_GreaterImpl(); @@ -231,6 +244,7 @@ public class Bug385636FactoryImpl extends EFactoryImpl implements Bug385636Facto * * @generated */ + @Override public Bug385636Package getBug385636Package() { return (Bug385636Package)getEPackage(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/bug385636/impl/Bug385636PackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/bug385636/impl/Bug385636PackageImpl.java index 3745e383b..f39d02b6d 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/bug385636/impl/Bug385636PackageImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/bug385636/impl/Bug385636PackageImpl.java @@ -155,7 +155,7 @@ public class Bug385636PackageImpl extends EPackageImpl implements Bug385636Packa /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link Bug385636Package#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -170,7 +170,8 @@ public class Bug385636PackageImpl extends EPackageImpl implements Bug385636Packa if (isInited) return (Bug385636Package)EPackage.Registry.INSTANCE.getEPackage(Bug385636Package.eNS_URI); // Obtain or create and register package - Bug385636PackageImpl theBug385636Package = (Bug385636PackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof Bug385636PackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new Bug385636PackageImpl()); + Object registeredBug385636Package = EPackage.Registry.INSTANCE.get(eNS_URI); + Bug385636PackageImpl theBug385636Package = registeredBug385636Package instanceof Bug385636PackageImpl ? (Bug385636PackageImpl)registeredBug385636Package : new Bug385636PackageImpl(); isInited = true; @@ -186,7 +187,6 @@ public class Bug385636PackageImpl extends EPackageImpl implements Bug385636Packa // Mark meta-data to indicate it can't be changed theBug385636Package.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(Bug385636Package.eNS_URI, theBug385636Package); return theBug385636Package; @@ -197,6 +197,7 @@ public class Bug385636PackageImpl extends EPackageImpl implements Bug385636Packa * * @generated */ + @Override public EClass getProgram() { return programEClass; @@ -207,6 +208,7 @@ public class Bug385636PackageImpl extends EPackageImpl implements Bug385636Packa * * @generated */ + @Override public EReference getProgram_Define() { return (EReference)programEClass.getEStructuralFeatures().get(0); @@ -217,6 +219,7 @@ public class Bug385636PackageImpl extends EPackageImpl implements Bug385636Packa * * @generated */ + @Override public EReference getProgram_Statements() { return (EReference)programEClass.getEStructuralFeatures().get(1); @@ -227,6 +230,7 @@ public class Bug385636PackageImpl extends EPackageImpl implements Bug385636Packa * * @generated */ + @Override public EClass getDefineVariables() { return defineVariablesEClass; @@ -237,6 +241,7 @@ public class Bug385636PackageImpl extends EPackageImpl implements Bug385636Packa * * @generated */ + @Override public EReference getDefineVariables_Variables() { return (EReference)defineVariablesEClass.getEStructuralFeatures().get(0); @@ -247,6 +252,7 @@ public class Bug385636PackageImpl extends EPackageImpl implements Bug385636Packa * * @generated */ + @Override public EClass getDefineVariable() { return defineVariableEClass; @@ -257,6 +263,7 @@ public class Bug385636PackageImpl extends EPackageImpl implements Bug385636Packa * * @generated */ + @Override public EAttribute getDefineVariable_Name() { return (EAttribute)defineVariableEClass.getEStructuralFeatures().get(0); @@ -267,6 +274,7 @@ public class Bug385636PackageImpl extends EPackageImpl implements Bug385636Packa * * @generated */ + @Override public EClass getNVariableAccess() { return nVariableAccessEClass; @@ -277,6 +285,7 @@ public class Bug385636PackageImpl extends EPackageImpl implements Bug385636Packa * * @generated */ + @Override public EReference getNVariableAccess_Variable() { return (EReference)nVariableAccessEClass.getEStructuralFeatures().get(0); @@ -287,6 +296,7 @@ public class Bug385636PackageImpl extends EPackageImpl implements Bug385636Packa * * @generated */ + @Override public EClass getExpression() { return expressionEClass; @@ -297,6 +307,7 @@ public class Bug385636PackageImpl extends EPackageImpl implements Bug385636Packa * * @generated */ + @Override public EClass getExpression_VariableName() { return expression_VariableNameEClass; @@ -307,6 +318,7 @@ public class Bug385636PackageImpl extends EPackageImpl implements Bug385636Packa * * @generated */ + @Override public EReference getExpression_VariableName_Variable() { return (EReference)expression_VariableNameEClass.getEStructuralFeatures().get(0); @@ -317,6 +329,7 @@ public class Bug385636PackageImpl extends EPackageImpl implements Bug385636Packa * * @generated */ + @Override public EClass getExpression_Larger_Equal() { return expression_Larger_EqualEClass; @@ -327,6 +340,7 @@ public class Bug385636PackageImpl extends EPackageImpl implements Bug385636Packa * * @generated */ + @Override public EReference getExpression_Larger_Equal_Left() { return (EReference)expression_Larger_EqualEClass.getEStructuralFeatures().get(0); @@ -337,6 +351,7 @@ public class Bug385636PackageImpl extends EPackageImpl implements Bug385636Packa * * @generated */ + @Override public EReference getExpression_Larger_Equal_Right() { return (EReference)expression_Larger_EqualEClass.getEStructuralFeatures().get(1); @@ -347,6 +362,7 @@ public class Bug385636PackageImpl extends EPackageImpl implements Bug385636Packa * * @generated */ + @Override public EClass getExpression_Smaller() { return expression_SmallerEClass; @@ -357,6 +373,7 @@ public class Bug385636PackageImpl extends EPackageImpl implements Bug385636Packa * * @generated */ + @Override public EReference getExpression_Smaller_Left() { return (EReference)expression_SmallerEClass.getEStructuralFeatures().get(0); @@ -367,6 +384,7 @@ public class Bug385636PackageImpl extends EPackageImpl implements Bug385636Packa * * @generated */ + @Override public EReference getExpression_Smaller_Right() { return (EReference)expression_SmallerEClass.getEStructuralFeatures().get(1); @@ -377,6 +395,7 @@ public class Bug385636PackageImpl extends EPackageImpl implements Bug385636Packa * * @generated */ + @Override public EClass getExpression_Smaller_Equal() { return expression_Smaller_EqualEClass; @@ -387,6 +406,7 @@ public class Bug385636PackageImpl extends EPackageImpl implements Bug385636Packa * * @generated */ + @Override public EReference getExpression_Smaller_Equal_Left() { return (EReference)expression_Smaller_EqualEClass.getEStructuralFeatures().get(0); @@ -397,6 +417,7 @@ public class Bug385636PackageImpl extends EPackageImpl implements Bug385636Packa * * @generated */ + @Override public EReference getExpression_Smaller_Equal_Right() { return (EReference)expression_Smaller_EqualEClass.getEStructuralFeatures().get(1); @@ -407,6 +428,7 @@ public class Bug385636PackageImpl extends EPackageImpl implements Bug385636Packa * * @generated */ + @Override public EClass getExpression_Equal() { return expression_EqualEClass; @@ -417,6 +439,7 @@ public class Bug385636PackageImpl extends EPackageImpl implements Bug385636Packa * * @generated */ + @Override public EReference getExpression_Equal_Left() { return (EReference)expression_EqualEClass.getEStructuralFeatures().get(0); @@ -427,6 +450,7 @@ public class Bug385636PackageImpl extends EPackageImpl implements Bug385636Packa * * @generated */ + @Override public EReference getExpression_Equal_Right() { return (EReference)expression_EqualEClass.getEStructuralFeatures().get(1); @@ -437,6 +461,7 @@ public class Bug385636PackageImpl extends EPackageImpl implements Bug385636Packa * * @generated */ + @Override public EClass getExpression_Not_Equal() { return expression_Not_EqualEClass; @@ -447,6 +472,7 @@ public class Bug385636PackageImpl extends EPackageImpl implements Bug385636Packa * * @generated */ + @Override public EReference getExpression_Not_Equal_Left() { return (EReference)expression_Not_EqualEClass.getEStructuralFeatures().get(0); @@ -457,6 +483,7 @@ public class Bug385636PackageImpl extends EPackageImpl implements Bug385636Packa * * @generated */ + @Override public EReference getExpression_Not_Equal_Right() { return (EReference)expression_Not_EqualEClass.getEStructuralFeatures().get(1); @@ -467,6 +494,7 @@ public class Bug385636PackageImpl extends EPackageImpl implements Bug385636Packa * * @generated */ + @Override public EClass getExpression_Not_Less() { return expression_Not_LessEClass; @@ -477,6 +505,7 @@ public class Bug385636PackageImpl extends EPackageImpl implements Bug385636Packa * * @generated */ + @Override public EReference getExpression_Not_Less_Left() { return (EReference)expression_Not_LessEClass.getEStructuralFeatures().get(0); @@ -487,6 +516,7 @@ public class Bug385636PackageImpl extends EPackageImpl implements Bug385636Packa * * @generated */ + @Override public EReference getExpression_Not_Less_Right() { return (EReference)expression_Not_LessEClass.getEStructuralFeatures().get(1); @@ -497,6 +527,7 @@ public class Bug385636PackageImpl extends EPackageImpl implements Bug385636Packa * * @generated */ + @Override public EClass getExpression_Not_Greater() { return expression_Not_GreaterEClass; @@ -507,6 +538,7 @@ public class Bug385636PackageImpl extends EPackageImpl implements Bug385636Packa * * @generated */ + @Override public EReference getExpression_Not_Greater_Left() { return (EReference)expression_Not_GreaterEClass.getEStructuralFeatures().get(0); @@ -517,6 +549,7 @@ public class Bug385636PackageImpl extends EPackageImpl implements Bug385636Packa * * @generated */ + @Override public EReference getExpression_Not_Greater_Right() { return (EReference)expression_Not_GreaterEClass.getEStructuralFeatures().get(1); @@ -527,6 +560,7 @@ public class Bug385636PackageImpl extends EPackageImpl implements Bug385636Packa * * @generated */ + @Override public Bug385636Factory getBug385636Factory() { return (Bug385636Factory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/bug385636/impl/DefineVariableImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/bug385636/impl/DefineVariableImpl.java index 01f71b095..1ad4c5292 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/bug385636/impl/DefineVariableImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/bug385636/impl/DefineVariableImpl.java @@ -74,6 +74,7 @@ public class DefineVariableImpl extends MinimalEObjectImpl.Container implements * * @generated */ + @Override public String getName() { return name; @@ -84,6 +85,7 @@ public class DefineVariableImpl extends MinimalEObjectImpl.Container implements * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -168,7 +170,7 @@ public class DefineVariableImpl extends MinimalEObjectImpl.Container implements { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/bug385636/impl/DefineVariablesImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/bug385636/impl/DefineVariablesImpl.java index 034dae22e..32cef555a 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/bug385636/impl/DefineVariablesImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/bug385636/impl/DefineVariablesImpl.java @@ -72,6 +72,7 @@ public class DefineVariablesImpl extends MinimalEObjectImpl.Container implements * * @generated */ + @Override public EList getVariables() { if (variables == null) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/bug385636/impl/Expression_EqualImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/bug385636/impl/Expression_EqualImpl.java index c673b1ea9..8e7bcf3c6 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/bug385636/impl/Expression_EqualImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/bug385636/impl/Expression_EqualImpl.java @@ -78,6 +78,7 @@ public class Expression_EqualImpl extends ExpressionImpl implements Expression_E * * @generated */ + @Override public Expression getLeft() { return left; @@ -105,6 +106,7 @@ public class Expression_EqualImpl extends ExpressionImpl implements Expression_E * * @generated */ + @Override public void setLeft(Expression newLeft) { if (newLeft != left) @@ -126,6 +128,7 @@ public class Expression_EqualImpl extends ExpressionImpl implements Expression_E * * @generated */ + @Override public Expression_VariableName getRight() { return right; @@ -153,6 +156,7 @@ public class Expression_EqualImpl extends ExpressionImpl implements Expression_E * * @generated */ + @Override public void setRight(Expression_VariableName newRight) { if (newRight != right) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/bug385636/impl/Expression_Larger_EqualImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/bug385636/impl/Expression_Larger_EqualImpl.java index a10ceb03a..71f0eeb1c 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/bug385636/impl/Expression_Larger_EqualImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/bug385636/impl/Expression_Larger_EqualImpl.java @@ -78,6 +78,7 @@ public class Expression_Larger_EqualImpl extends ExpressionImpl implements Expre * * @generated */ + @Override public Expression getLeft() { return left; @@ -105,6 +106,7 @@ public class Expression_Larger_EqualImpl extends ExpressionImpl implements Expre * * @generated */ + @Override public void setLeft(Expression newLeft) { if (newLeft != left) @@ -126,6 +128,7 @@ public class Expression_Larger_EqualImpl extends ExpressionImpl implements Expre * * @generated */ + @Override public Expression_VariableName getRight() { return right; @@ -153,6 +156,7 @@ public class Expression_Larger_EqualImpl extends ExpressionImpl implements Expre * * @generated */ + @Override public void setRight(Expression_VariableName newRight) { if (newRight != right) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/bug385636/impl/Expression_Not_EqualImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/bug385636/impl/Expression_Not_EqualImpl.java index b0a70b806..4267e05f2 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/bug385636/impl/Expression_Not_EqualImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/bug385636/impl/Expression_Not_EqualImpl.java @@ -78,6 +78,7 @@ public class Expression_Not_EqualImpl extends ExpressionImpl implements Expressi * * @generated */ + @Override public Expression getLeft() { return left; @@ -105,6 +106,7 @@ public class Expression_Not_EqualImpl extends ExpressionImpl implements Expressi * * @generated */ + @Override public void setLeft(Expression newLeft) { if (newLeft != left) @@ -126,6 +128,7 @@ public class Expression_Not_EqualImpl extends ExpressionImpl implements Expressi * * @generated */ + @Override public Expression_VariableName getRight() { return right; @@ -153,6 +156,7 @@ public class Expression_Not_EqualImpl extends ExpressionImpl implements Expressi * * @generated */ + @Override public void setRight(Expression_VariableName newRight) { if (newRight != right) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/bug385636/impl/Expression_Not_GreaterImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/bug385636/impl/Expression_Not_GreaterImpl.java index 14b4bc58f..777d29566 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/bug385636/impl/Expression_Not_GreaterImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/bug385636/impl/Expression_Not_GreaterImpl.java @@ -78,6 +78,7 @@ public class Expression_Not_GreaterImpl extends ExpressionImpl implements Expres * * @generated */ + @Override public Expression getLeft() { return left; @@ -105,6 +106,7 @@ public class Expression_Not_GreaterImpl extends ExpressionImpl implements Expres * * @generated */ + @Override public void setLeft(Expression newLeft) { if (newLeft != left) @@ -126,6 +128,7 @@ public class Expression_Not_GreaterImpl extends ExpressionImpl implements Expres * * @generated */ + @Override public Expression_VariableName getRight() { return right; @@ -153,6 +156,7 @@ public class Expression_Not_GreaterImpl extends ExpressionImpl implements Expres * * @generated */ + @Override public void setRight(Expression_VariableName newRight) { if (newRight != right) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/bug385636/impl/Expression_Not_LessImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/bug385636/impl/Expression_Not_LessImpl.java index 0745b894f..0238a18e5 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/bug385636/impl/Expression_Not_LessImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/bug385636/impl/Expression_Not_LessImpl.java @@ -78,6 +78,7 @@ public class Expression_Not_LessImpl extends ExpressionImpl implements Expressio * * @generated */ + @Override public Expression getLeft() { return left; @@ -105,6 +106,7 @@ public class Expression_Not_LessImpl extends ExpressionImpl implements Expressio * * @generated */ + @Override public void setLeft(Expression newLeft) { if (newLeft != left) @@ -126,6 +128,7 @@ public class Expression_Not_LessImpl extends ExpressionImpl implements Expressio * * @generated */ + @Override public Expression_VariableName getRight() { return right; @@ -153,6 +156,7 @@ public class Expression_Not_LessImpl extends ExpressionImpl implements Expressio * * @generated */ + @Override public void setRight(Expression_VariableName newRight) { if (newRight != right) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/bug385636/impl/Expression_SmallerImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/bug385636/impl/Expression_SmallerImpl.java index 3ac371558..67ecba5e3 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/bug385636/impl/Expression_SmallerImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/bug385636/impl/Expression_SmallerImpl.java @@ -78,6 +78,7 @@ public class Expression_SmallerImpl extends ExpressionImpl implements Expression * * @generated */ + @Override public Expression getLeft() { return left; @@ -105,6 +106,7 @@ public class Expression_SmallerImpl extends ExpressionImpl implements Expression * * @generated */ + @Override public void setLeft(Expression newLeft) { if (newLeft != left) @@ -126,6 +128,7 @@ public class Expression_SmallerImpl extends ExpressionImpl implements Expression * * @generated */ + @Override public Expression_VariableName getRight() { return right; @@ -153,6 +156,7 @@ public class Expression_SmallerImpl extends ExpressionImpl implements Expression * * @generated */ + @Override public void setRight(Expression_VariableName newRight) { if (newRight != right) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/bug385636/impl/Expression_Smaller_EqualImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/bug385636/impl/Expression_Smaller_EqualImpl.java index dffa8ad7f..5e3fa1b2a 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/bug385636/impl/Expression_Smaller_EqualImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/bug385636/impl/Expression_Smaller_EqualImpl.java @@ -78,6 +78,7 @@ public class Expression_Smaller_EqualImpl extends ExpressionImpl implements Expr * * @generated */ + @Override public Expression getLeft() { return left; @@ -105,6 +106,7 @@ public class Expression_Smaller_EqualImpl extends ExpressionImpl implements Expr * * @generated */ + @Override public void setLeft(Expression newLeft) { if (newLeft != left) @@ -126,6 +128,7 @@ public class Expression_Smaller_EqualImpl extends ExpressionImpl implements Expr * * @generated */ + @Override public Expression_VariableName getRight() { return right; @@ -153,6 +156,7 @@ public class Expression_Smaller_EqualImpl extends ExpressionImpl implements Expr * * @generated */ + @Override public void setRight(Expression_VariableName newRight) { if (newRight != right) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/bug385636/impl/Expression_VariableNameImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/bug385636/impl/Expression_VariableNameImpl.java index 5965e984d..e3e4f4b74 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/bug385636/impl/Expression_VariableNameImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/bug385636/impl/Expression_VariableNameImpl.java @@ -66,6 +66,7 @@ public class Expression_VariableNameImpl extends ExpressionImpl implements Expre * * @generated */ + @Override public NVariableAccess getVariable() { return variable; @@ -93,6 +94,7 @@ public class Expression_VariableNameImpl extends ExpressionImpl implements Expre * * @generated */ + @Override public void setVariable(NVariableAccess newVariable) { if (newVariable != variable) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/bug385636/impl/NVariableAccessImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/bug385636/impl/NVariableAccessImpl.java index 9330132bd..185e49b3a 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/bug385636/impl/NVariableAccessImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/bug385636/impl/NVariableAccessImpl.java @@ -66,6 +66,7 @@ public class NVariableAccessImpl extends MinimalEObjectImpl.Container implements * * @generated */ + @Override public DefineVariable getVariable() { if (variable != null && variable.eIsProxy()) @@ -96,6 +97,7 @@ public class NVariableAccessImpl extends MinimalEObjectImpl.Container implements * * @generated */ + @Override public void setVariable(DefineVariable newVariable) { DefineVariable oldVariable = variable; diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/bug385636/impl/ProgramImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/bug385636/impl/ProgramImpl.java index 130e00e40..8e7dd8ba8 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/bug385636/impl/ProgramImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/bug385636/impl/ProgramImpl.java @@ -86,6 +86,7 @@ public class ProgramImpl extends MinimalEObjectImpl.Container implements Program * * @generated */ + @Override public DefineVariables getDefine() { return define; @@ -113,6 +114,7 @@ public class ProgramImpl extends MinimalEObjectImpl.Container implements Program * * @generated */ + @Override public void setDefine(DefineVariables newDefine) { if (newDefine != define) @@ -134,6 +136,7 @@ public class ProgramImpl extends MinimalEObjectImpl.Container implements Program * * @generated */ + @Override public EList getStatements() { if (statements == null) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/eObjectAtOffsetTestLanguage/AbstractBar.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/eObjectAtOffsetTestLanguage/AbstractBar.java index 2160eeb40..4daa084c6 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/eObjectAtOffsetTestLanguage/AbstractBar.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/eObjectAtOffsetTestLanguage/AbstractBar.java @@ -29,10 +29,6 @@ public interface AbstractBar extends EObject * Returns the value of the 'Foo' reference list. * The list contents are of type {@link org.eclipse.xtext.resource.eObjectAtOffsetTestLanguage.Foo}. * - *

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

* * @return the value of the 'Foo' reference list. * @see org.eclipse.xtext.resource.eObjectAtOffsetTestLanguage.EObjectAtOffsetTestLanguagePackage#getAbstractBar_Foo() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/eObjectAtOffsetTestLanguage/Bar.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/eObjectAtOffsetTestLanguage/Bar.java index 4284e6544..f6b1d124d 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/eObjectAtOffsetTestLanguage/Bar.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/eObjectAtOffsetTestLanguage/Bar.java @@ -25,10 +25,6 @@ public interface Bar extends AbstractBar /** * 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) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/eObjectAtOffsetTestLanguage/Foo.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/eObjectAtOffsetTestLanguage/Foo.java index 6473b0c23..41178d8d6 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/eObjectAtOffsetTestLanguage/Foo.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/eObjectAtOffsetTestLanguage/Foo.java @@ -26,10 +26,6 @@ public interface Foo 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) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/eObjectAtOffsetTestLanguage/FooBar.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/eObjectAtOffsetTestLanguage/FooBar.java index 51c132e85..2ddecd4bb 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/eObjectAtOffsetTestLanguage/FooBar.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/eObjectAtOffsetTestLanguage/FooBar.java @@ -25,10 +25,6 @@ public interface FooBar extends AbstractBar /** * Returns the value of the 'Bar' containment reference. * - *

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

* * @return the value of the 'Bar' containment reference. * @see #setBar(Bar) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/eObjectAtOffsetTestLanguage/Model.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/eObjectAtOffsetTestLanguage/Model.java index e00d33060..ebf74e7a7 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/eObjectAtOffsetTestLanguage/Model.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/eObjectAtOffsetTestLanguage/Model.java @@ -30,10 +30,6 @@ public interface Model extends EObject * Returns the value of the 'Foos' containment reference list. * The list contents are of type {@link org.eclipse.xtext.resource.eObjectAtOffsetTestLanguage.Foo}. * - *

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

* * @return the value of the 'Foos' containment reference list. * @see org.eclipse.xtext.resource.eObjectAtOffsetTestLanguage.EObjectAtOffsetTestLanguagePackage#getModel_Foos() @@ -46,10 +42,6 @@ public interface Model extends EObject * Returns the value of the 'Bars' containment reference list. * The list contents are of type {@link org.eclipse.xtext.resource.eObjectAtOffsetTestLanguage.AbstractBar}. * - *

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

* * @return the value of the 'Bars' containment reference list. * @see org.eclipse.xtext.resource.eObjectAtOffsetTestLanguage.EObjectAtOffsetTestLanguagePackage#getModel_Bars() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/eObjectAtOffsetTestLanguage/impl/AbstractBarImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/eObjectAtOffsetTestLanguage/impl/AbstractBarImpl.java index 44525171a..c7401c63d 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/eObjectAtOffsetTestLanguage/impl/AbstractBarImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/eObjectAtOffsetTestLanguage/impl/AbstractBarImpl.java @@ -68,6 +68,7 @@ public class AbstractBarImpl extends MinimalEObjectImpl.Container implements Abs * * @generated */ + @Override public EList getFoo() { if (foo == null) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/eObjectAtOffsetTestLanguage/impl/BarImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/eObjectAtOffsetTestLanguage/impl/BarImpl.java index 375252f38..0d537a751 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/eObjectAtOffsetTestLanguage/impl/BarImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/eObjectAtOffsetTestLanguage/impl/BarImpl.java @@ -73,6 +73,7 @@ public class BarImpl extends AbstractBarImpl implements Bar * * @generated */ + @Override public String getName() { return name; @@ -83,6 +84,7 @@ public class BarImpl extends AbstractBarImpl implements Bar * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -167,7 +169,7 @@ public class BarImpl extends AbstractBarImpl implements Bar { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/eObjectAtOffsetTestLanguage/impl/EObjectAtOffsetTestLanguageFactoryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/eObjectAtOffsetTestLanguage/impl/EObjectAtOffsetTestLanguageFactoryImpl.java index d265a67bf..27f6bc226 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/eObjectAtOffsetTestLanguage/impl/EObjectAtOffsetTestLanguageFactoryImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/eObjectAtOffsetTestLanguage/impl/EObjectAtOffsetTestLanguageFactoryImpl.java @@ -80,6 +80,7 @@ public class EObjectAtOffsetTestLanguageFactoryImpl extends EFactoryImpl impleme * * @generated */ + @Override public Model createModel() { ModelImpl model = new ModelImpl(); @@ -91,6 +92,7 @@ public class EObjectAtOffsetTestLanguageFactoryImpl extends EFactoryImpl impleme * * @generated */ + @Override public AbstractBar createAbstractBar() { AbstractBarImpl abstractBar = new AbstractBarImpl(); @@ -102,6 +104,7 @@ public class EObjectAtOffsetTestLanguageFactoryImpl extends EFactoryImpl impleme * * @generated */ + @Override public Bar createBar() { BarImpl bar = new BarImpl(); @@ -113,6 +116,7 @@ public class EObjectAtOffsetTestLanguageFactoryImpl extends EFactoryImpl impleme * * @generated */ + @Override public Foo createFoo() { FooImpl foo = new FooImpl(); @@ -124,6 +128,7 @@ public class EObjectAtOffsetTestLanguageFactoryImpl extends EFactoryImpl impleme * * @generated */ + @Override public FooBar createFooBar() { FooBarImpl fooBar = new FooBarImpl(); @@ -135,6 +140,7 @@ public class EObjectAtOffsetTestLanguageFactoryImpl extends EFactoryImpl impleme * * @generated */ + @Override public EObjectAtOffsetTestLanguagePackage getEObjectAtOffsetTestLanguagePackage() { return (EObjectAtOffsetTestLanguagePackage)getEPackage(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/eObjectAtOffsetTestLanguage/impl/EObjectAtOffsetTestLanguagePackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/eObjectAtOffsetTestLanguage/impl/EObjectAtOffsetTestLanguagePackageImpl.java index 6c0c4743c..6a46647b0 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/eObjectAtOffsetTestLanguage/impl/EObjectAtOffsetTestLanguagePackageImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/eObjectAtOffsetTestLanguage/impl/EObjectAtOffsetTestLanguagePackageImpl.java @@ -91,7 +91,7 @@ public class EObjectAtOffsetTestLanguagePackageImpl extends EPackageImpl impleme /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link EObjectAtOffsetTestLanguagePackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -106,7 +106,8 @@ public class EObjectAtOffsetTestLanguagePackageImpl extends EPackageImpl impleme if (isInited) return (EObjectAtOffsetTestLanguagePackage)EPackage.Registry.INSTANCE.getEPackage(EObjectAtOffsetTestLanguagePackage.eNS_URI); // Obtain or create and register package - EObjectAtOffsetTestLanguagePackageImpl theEObjectAtOffsetTestLanguagePackage = (EObjectAtOffsetTestLanguagePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof EObjectAtOffsetTestLanguagePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new EObjectAtOffsetTestLanguagePackageImpl()); + Object registeredEObjectAtOffsetTestLanguagePackage = EPackage.Registry.INSTANCE.get(eNS_URI); + EObjectAtOffsetTestLanguagePackageImpl theEObjectAtOffsetTestLanguagePackage = registeredEObjectAtOffsetTestLanguagePackage instanceof EObjectAtOffsetTestLanguagePackageImpl ? (EObjectAtOffsetTestLanguagePackageImpl)registeredEObjectAtOffsetTestLanguagePackage : new EObjectAtOffsetTestLanguagePackageImpl(); isInited = true; @@ -122,7 +123,6 @@ public class EObjectAtOffsetTestLanguagePackageImpl extends EPackageImpl impleme // Mark meta-data to indicate it can't be changed theEObjectAtOffsetTestLanguagePackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(EObjectAtOffsetTestLanguagePackage.eNS_URI, theEObjectAtOffsetTestLanguagePackage); return theEObjectAtOffsetTestLanguagePackage; @@ -133,6 +133,7 @@ public class EObjectAtOffsetTestLanguagePackageImpl extends EPackageImpl impleme * * @generated */ + @Override public EClass getModel() { return modelEClass; @@ -143,6 +144,7 @@ public class EObjectAtOffsetTestLanguagePackageImpl extends EPackageImpl impleme * * @generated */ + @Override public EReference getModel_Foos() { return (EReference)modelEClass.getEStructuralFeatures().get(0); @@ -153,6 +155,7 @@ public class EObjectAtOffsetTestLanguagePackageImpl extends EPackageImpl impleme * * @generated */ + @Override public EReference getModel_Bars() { return (EReference)modelEClass.getEStructuralFeatures().get(1); @@ -163,6 +166,7 @@ public class EObjectAtOffsetTestLanguagePackageImpl extends EPackageImpl impleme * * @generated */ + @Override public EClass getAbstractBar() { return abstractBarEClass; @@ -173,6 +177,7 @@ public class EObjectAtOffsetTestLanguagePackageImpl extends EPackageImpl impleme * * @generated */ + @Override public EReference getAbstractBar_Foo() { return (EReference)abstractBarEClass.getEStructuralFeatures().get(0); @@ -183,6 +188,7 @@ public class EObjectAtOffsetTestLanguagePackageImpl extends EPackageImpl impleme * * @generated */ + @Override public EClass getBar() { return barEClass; @@ -193,6 +199,7 @@ public class EObjectAtOffsetTestLanguagePackageImpl extends EPackageImpl impleme * * @generated */ + @Override public EAttribute getBar_Name() { return (EAttribute)barEClass.getEStructuralFeatures().get(0); @@ -203,6 +210,7 @@ public class EObjectAtOffsetTestLanguagePackageImpl extends EPackageImpl impleme * * @generated */ + @Override public EClass getFoo() { return fooEClass; @@ -213,6 +221,7 @@ public class EObjectAtOffsetTestLanguagePackageImpl extends EPackageImpl impleme * * @generated */ + @Override public EAttribute getFoo_Name() { return (EAttribute)fooEClass.getEStructuralFeatures().get(0); @@ -223,6 +232,7 @@ public class EObjectAtOffsetTestLanguagePackageImpl extends EPackageImpl impleme * * @generated */ + @Override public EClass getFooBar() { return fooBarEClass; @@ -233,6 +243,7 @@ public class EObjectAtOffsetTestLanguagePackageImpl extends EPackageImpl impleme * * @generated */ + @Override public EReference getFooBar_Bar() { return (EReference)fooBarEClass.getEStructuralFeatures().get(0); @@ -243,6 +254,7 @@ public class EObjectAtOffsetTestLanguagePackageImpl extends EPackageImpl impleme * * @generated */ + @Override public EObjectAtOffsetTestLanguageFactory getEObjectAtOffsetTestLanguageFactory() { return (EObjectAtOffsetTestLanguageFactory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/eObjectAtOffsetTestLanguage/impl/FooBarImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/eObjectAtOffsetTestLanguage/impl/FooBarImpl.java index 94f36bf68..069aa8f45 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/eObjectAtOffsetTestLanguage/impl/FooBarImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/eObjectAtOffsetTestLanguage/impl/FooBarImpl.java @@ -66,6 +66,7 @@ public class FooBarImpl extends AbstractBarImpl implements FooBar * * @generated */ + @Override public Bar getBar() { return bar; @@ -93,6 +94,7 @@ public class FooBarImpl extends AbstractBarImpl implements FooBar * * @generated */ + @Override public void setBar(Bar newBar) { if (newBar != bar) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/eObjectAtOffsetTestLanguage/impl/FooImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/eObjectAtOffsetTestLanguage/impl/FooImpl.java index 204432653..5e0bfd26b 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/eObjectAtOffsetTestLanguage/impl/FooImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/eObjectAtOffsetTestLanguage/impl/FooImpl.java @@ -74,6 +74,7 @@ public class FooImpl extends MinimalEObjectImpl.Container implements Foo * * @generated */ + @Override public String getName() { return name; @@ -84,6 +85,7 @@ public class FooImpl extends MinimalEObjectImpl.Container implements Foo * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -168,7 +170,7 @@ public class FooImpl extends MinimalEObjectImpl.Container implements Foo { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/eObjectAtOffsetTestLanguage/impl/ModelImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/eObjectAtOffsetTestLanguage/impl/ModelImpl.java index f6c7c54d1..c4a7db9f1 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/eObjectAtOffsetTestLanguage/impl/ModelImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/eObjectAtOffsetTestLanguage/impl/ModelImpl.java @@ -84,6 +84,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public EList getFoos() { if (foos == null) @@ -98,6 +99,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public EList getBars() { if (bars == null) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/liveContainerBuilderIntegerationTestLanguage/Model.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/liveContainerBuilderIntegerationTestLanguage/Model.java index 018c58933..d5d82a63b 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/liveContainerBuilderIntegerationTestLanguage/Model.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/liveContainerBuilderIntegerationTestLanguage/Model.java @@ -26,10 +26,6 @@ public interface Model 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) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/liveContainerBuilderIntegerationTestLanguage/impl/LiveContainerBuilderIntegerationTestLanguageFactoryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/liveContainerBuilderIntegerationTestLanguage/impl/LiveContainerBuilderIntegerationTestLanguageFactoryImpl.java index 35d1ff27a..898149454 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/liveContainerBuilderIntegerationTestLanguage/impl/LiveContainerBuilderIntegerationTestLanguageFactoryImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/liveContainerBuilderIntegerationTestLanguage/impl/LiveContainerBuilderIntegerationTestLanguageFactoryImpl.java @@ -76,6 +76,7 @@ public class LiveContainerBuilderIntegerationTestLanguageFactoryImpl extends EFa * * @generated */ + @Override public Model createModel() { ModelImpl model = new ModelImpl(); @@ -87,6 +88,7 @@ public class LiveContainerBuilderIntegerationTestLanguageFactoryImpl extends EFa * * @generated */ + @Override public LiveContainerBuilderIntegerationTestLanguagePackage getLiveContainerBuilderIntegerationTestLanguagePackage() { return (LiveContainerBuilderIntegerationTestLanguagePackage)getEPackage(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/liveContainerBuilderIntegerationTestLanguage/impl/LiveContainerBuilderIntegerationTestLanguagePackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/liveContainerBuilderIntegerationTestLanguage/impl/LiveContainerBuilderIntegerationTestLanguagePackageImpl.java index 91dcdca7e..0c489d5cb 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/liveContainerBuilderIntegerationTestLanguage/impl/LiveContainerBuilderIntegerationTestLanguagePackageImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/liveContainerBuilderIntegerationTestLanguage/impl/LiveContainerBuilderIntegerationTestLanguagePackageImpl.java @@ -58,7 +58,7 @@ public class LiveContainerBuilderIntegerationTestLanguagePackageImpl extends EPa /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link LiveContainerBuilderIntegerationTestLanguagePackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -73,7 +73,8 @@ public class LiveContainerBuilderIntegerationTestLanguagePackageImpl extends EPa if (isInited) return (LiveContainerBuilderIntegerationTestLanguagePackage)EPackage.Registry.INSTANCE.getEPackage(LiveContainerBuilderIntegerationTestLanguagePackage.eNS_URI); // Obtain or create and register package - LiveContainerBuilderIntegerationTestLanguagePackageImpl theLiveContainerBuilderIntegerationTestLanguagePackage = (LiveContainerBuilderIntegerationTestLanguagePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof LiveContainerBuilderIntegerationTestLanguagePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new LiveContainerBuilderIntegerationTestLanguagePackageImpl()); + Object registeredLiveContainerBuilderIntegerationTestLanguagePackage = EPackage.Registry.INSTANCE.get(eNS_URI); + LiveContainerBuilderIntegerationTestLanguagePackageImpl theLiveContainerBuilderIntegerationTestLanguagePackage = registeredLiveContainerBuilderIntegerationTestLanguagePackage instanceof LiveContainerBuilderIntegerationTestLanguagePackageImpl ? (LiveContainerBuilderIntegerationTestLanguagePackageImpl)registeredLiveContainerBuilderIntegerationTestLanguagePackage : new LiveContainerBuilderIntegerationTestLanguagePackageImpl(); isInited = true; @@ -89,7 +90,6 @@ public class LiveContainerBuilderIntegerationTestLanguagePackageImpl extends EPa // Mark meta-data to indicate it can't be changed theLiveContainerBuilderIntegerationTestLanguagePackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(LiveContainerBuilderIntegerationTestLanguagePackage.eNS_URI, theLiveContainerBuilderIntegerationTestLanguagePackage); return theLiveContainerBuilderIntegerationTestLanguagePackage; @@ -100,6 +100,7 @@ public class LiveContainerBuilderIntegerationTestLanguagePackageImpl extends EPa * * @generated */ + @Override public EClass getModel() { return modelEClass; @@ -110,6 +111,7 @@ public class LiveContainerBuilderIntegerationTestLanguagePackageImpl extends EPa * * @generated */ + @Override public EAttribute getModel_Name() { return (EAttribute)modelEClass.getEStructuralFeatures().get(0); @@ -120,6 +122,7 @@ public class LiveContainerBuilderIntegerationTestLanguagePackageImpl extends EPa * * @generated */ + @Override public LiveContainerBuilderIntegerationTestLanguageFactory getLiveContainerBuilderIntegerationTestLanguageFactory() { return (LiveContainerBuilderIntegerationTestLanguageFactory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/liveContainerBuilderIntegerationTestLanguage/impl/ModelImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/liveContainerBuilderIntegerationTestLanguage/impl/ModelImpl.java index 400ea8818..2ccc5fe74 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/liveContainerBuilderIntegerationTestLanguage/impl/ModelImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/liveContainerBuilderIntegerationTestLanguage/impl/ModelImpl.java @@ -74,6 +74,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public String getName() { return name; @@ -84,6 +85,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -168,7 +170,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/liveContainerTestLanguage/Model.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/liveContainerTestLanguage/Model.java index 35f6754e1..2f85322be 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/liveContainerTestLanguage/Model.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/liveContainerTestLanguage/Model.java @@ -26,10 +26,6 @@ public interface Model 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) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/liveContainerTestLanguage/impl/LiveContainerTestLanguageFactoryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/liveContainerTestLanguage/impl/LiveContainerTestLanguageFactoryImpl.java index e0f8d3605..09de67154 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/liveContainerTestLanguage/impl/LiveContainerTestLanguageFactoryImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/liveContainerTestLanguage/impl/LiveContainerTestLanguageFactoryImpl.java @@ -76,6 +76,7 @@ public class LiveContainerTestLanguageFactoryImpl extends EFactoryImpl implement * * @generated */ + @Override public Model createModel() { ModelImpl model = new ModelImpl(); @@ -87,6 +88,7 @@ public class LiveContainerTestLanguageFactoryImpl extends EFactoryImpl implement * * @generated */ + @Override public LiveContainerTestLanguagePackage getLiveContainerTestLanguagePackage() { return (LiveContainerTestLanguagePackage)getEPackage(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/liveContainerTestLanguage/impl/LiveContainerTestLanguagePackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/liveContainerTestLanguage/impl/LiveContainerTestLanguagePackageImpl.java index cca298305..b16b0ecb3 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/liveContainerTestLanguage/impl/LiveContainerTestLanguagePackageImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/liveContainerTestLanguage/impl/LiveContainerTestLanguagePackageImpl.java @@ -58,7 +58,7 @@ public class LiveContainerTestLanguagePackageImpl extends EPackageImpl implement /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link LiveContainerTestLanguagePackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -73,7 +73,8 @@ public class LiveContainerTestLanguagePackageImpl extends EPackageImpl implement if (isInited) return (LiveContainerTestLanguagePackage)EPackage.Registry.INSTANCE.getEPackage(LiveContainerTestLanguagePackage.eNS_URI); // Obtain or create and register package - LiveContainerTestLanguagePackageImpl theLiveContainerTestLanguagePackage = (LiveContainerTestLanguagePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof LiveContainerTestLanguagePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new LiveContainerTestLanguagePackageImpl()); + Object registeredLiveContainerTestLanguagePackage = EPackage.Registry.INSTANCE.get(eNS_URI); + LiveContainerTestLanguagePackageImpl theLiveContainerTestLanguagePackage = registeredLiveContainerTestLanguagePackage instanceof LiveContainerTestLanguagePackageImpl ? (LiveContainerTestLanguagePackageImpl)registeredLiveContainerTestLanguagePackage : new LiveContainerTestLanguagePackageImpl(); isInited = true; @@ -89,7 +90,6 @@ public class LiveContainerTestLanguagePackageImpl extends EPackageImpl implement // Mark meta-data to indicate it can't be changed theLiveContainerTestLanguagePackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(LiveContainerTestLanguagePackage.eNS_URI, theLiveContainerTestLanguagePackage); return theLiveContainerTestLanguagePackage; @@ -100,6 +100,7 @@ public class LiveContainerTestLanguagePackageImpl extends EPackageImpl implement * * @generated */ + @Override public EClass getModel() { return modelEClass; @@ -110,6 +111,7 @@ public class LiveContainerTestLanguagePackageImpl extends EPackageImpl implement * * @generated */ + @Override public EAttribute getModel_Name() { return (EAttribute)modelEClass.getEStructuralFeatures().get(0); @@ -120,6 +122,7 @@ public class LiveContainerTestLanguagePackageImpl extends EPackageImpl implement * * @generated */ + @Override public LiveContainerTestLanguageFactory getLiveContainerTestLanguageFactory() { return (LiveContainerTestLanguageFactory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/liveContainerTestLanguage/impl/ModelImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/liveContainerTestLanguage/impl/ModelImpl.java index 96fd3d8a0..3a6dd8c9d 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/liveContainerTestLanguage/impl/ModelImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/liveContainerTestLanguage/impl/ModelImpl.java @@ -74,6 +74,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public String getName() { return name; @@ -84,6 +85,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -168,7 +170,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/locationprovidertest/Bus.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/locationprovidertest/Bus.java index ef02ddadb..cb03b475c 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/locationprovidertest/Bus.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/locationprovidertest/Bus.java @@ -27,10 +27,6 @@ public interface Bus extends Component * Returns the value of the 'Port' containment reference list. * The list contents are of type {@link org.eclipse.xtext.resource.locationprovidertest.Port}. * - *

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

* * @return the value of the 'Port' containment reference list. * @see org.eclipse.xtext.resource.locationprovidertest.LocationprovidertestPackage#getBus_Port() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/locationprovidertest/Component.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/locationprovidertest/Component.java index 545049179..a21d564a3 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/locationprovidertest/Component.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/locationprovidertest/Component.java @@ -31,10 +31,6 @@ public interface Component extends EObject * Returns the value of the 'Mode' containment reference list. * The list contents are of type {@link org.eclipse.xtext.resource.locationprovidertest.Mode}. * - *

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

* * @return the value of the 'Mode' containment reference list. * @see org.eclipse.xtext.resource.locationprovidertest.LocationprovidertestPackage#getComponent_Mode() @@ -47,10 +43,6 @@ public interface Component extends EObject * Returns the value of the 'Transition' containment reference list. * The list contents are of type {@link org.eclipse.xtext.resource.locationprovidertest.Transition}. * - *

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

* * @return the value of the 'Transition' containment reference list. * @see org.eclipse.xtext.resource.locationprovidertest.LocationprovidertestPackage#getComponent_Transition() @@ -62,10 +54,6 @@ public interface Component 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) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/locationprovidertest/Data.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/locationprovidertest/Data.java index 567c8fd52..06909f8fa 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/locationprovidertest/Data.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/locationprovidertest/Data.java @@ -26,10 +26,6 @@ public interface Data 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) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/locationprovidertest/Element.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/locationprovidertest/Element.java index 3d672c792..6f5d3170d 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/locationprovidertest/Element.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/locationprovidertest/Element.java @@ -30,10 +30,6 @@ public interface Element 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) @@ -56,10 +52,6 @@ public interface Element extends EObject /** * Returns the value of the 'Singleref' reference. * - *

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

* * @return the value of the 'Singleref' reference. * @see #setSingleref(Element) @@ -83,10 +75,6 @@ public interface Element extends EObject * Returns the value of the 'Multirefs' reference list. * The list contents are of type {@link org.eclipse.xtext.resource.locationprovidertest.Element}. * - *

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

* * @return the value of the 'Multirefs' reference list. * @see org.eclipse.xtext.resource.locationprovidertest.LocationprovidertestPackage#getElement_Multirefs() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/locationprovidertest/Mode.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/locationprovidertest/Mode.java index e554d9b73..39e44d62d 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/locationprovidertest/Mode.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/locationprovidertest/Mode.java @@ -26,10 +26,6 @@ public interface Mode 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) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/locationprovidertest/Model.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/locationprovidertest/Model.java index eb9a7fbc9..bf460d7f4 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/locationprovidertest/Model.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/locationprovidertest/Model.java @@ -30,10 +30,6 @@ public interface Model extends EObject * Returns the value of the 'Elements' containment reference list. * The list contents are of type {@link org.eclipse.xtext.resource.locationprovidertest.Element}. * - *

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

* * @return the value of the 'Elements' containment reference list. * @see org.eclipse.xtext.resource.locationprovidertest.LocationprovidertestPackage#getModel_Elements() @@ -46,10 +42,6 @@ public interface Model extends EObject * Returns the value of the 'Components' containment reference list. * The list contents are of type {@link org.eclipse.xtext.resource.locationprovidertest.Component}. * - *

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

* * @return the value of the 'Components' containment reference list. * @see org.eclipse.xtext.resource.locationprovidertest.LocationprovidertestPackage#getModel_Components() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/locationprovidertest/Port.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/locationprovidertest/Port.java index dadc025e4..1cc8ddb9e 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/locationprovidertest/Port.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/locationprovidertest/Port.java @@ -26,10 +26,6 @@ public interface Port 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) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/locationprovidertest/Processor.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/locationprovidertest/Processor.java index 972cf905b..ff1438c9d 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/locationprovidertest/Processor.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/locationprovidertest/Processor.java @@ -27,10 +27,6 @@ public interface Processor extends Component * Returns the value of the 'Data' containment reference list. * The list contents are of type {@link org.eclipse.xtext.resource.locationprovidertest.Data}. * - *

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

* * @return the value of the 'Data' containment reference list. * @see org.eclipse.xtext.resource.locationprovidertest.LocationprovidertestPackage#getProcessor_Data() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/locationprovidertest/Transition.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/locationprovidertest/Transition.java index 4754a5c21..2ab07aba2 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/locationprovidertest/Transition.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/locationprovidertest/Transition.java @@ -28,10 +28,6 @@ public interface Transition 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) @@ -54,10 +50,6 @@ public interface Transition extends EObject /** * Returns the value of the 'Source' reference. * - *

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

* * @return the value of the 'Source' reference. * @see #setSource(Mode) @@ -80,10 +72,6 @@ public interface Transition extends EObject /** * Returns the value of the 'Destination' reference. * - *

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

* * @return the value of the 'Destination' reference. * @see #setDestination(Mode) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/locationprovidertest/impl/BusImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/locationprovidertest/impl/BusImpl.java index 2d2ac07f1..eba11544f 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/locationprovidertest/impl/BusImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/locationprovidertest/impl/BusImpl.java @@ -70,6 +70,7 @@ public class BusImpl extends ComponentImpl implements Bus * * @generated */ + @Override public EList getPort() { if (port == null) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/locationprovidertest/impl/ComponentImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/locationprovidertest/impl/ComponentImpl.java index b94c462c2..cccc36d2d 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/locationprovidertest/impl/ComponentImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/locationprovidertest/impl/ComponentImpl.java @@ -107,6 +107,7 @@ public class ComponentImpl extends MinimalEObjectImpl.Container implements Compo * * @generated */ + @Override public EList getMode() { if (mode == null) @@ -121,6 +122,7 @@ public class ComponentImpl extends MinimalEObjectImpl.Container implements Compo * * @generated */ + @Override public EList getTransition() { if (transition == null) @@ -135,6 +137,7 @@ public class ComponentImpl extends MinimalEObjectImpl.Container implements Compo * * @generated */ + @Override public String getName() { return name; @@ -145,6 +148,7 @@ public class ComponentImpl extends MinimalEObjectImpl.Container implements Compo * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -270,7 +274,7 @@ public class ComponentImpl extends MinimalEObjectImpl.Container implements Compo { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/locationprovidertest/impl/DataImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/locationprovidertest/impl/DataImpl.java index b379f12df..22d9f775d 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/locationprovidertest/impl/DataImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/locationprovidertest/impl/DataImpl.java @@ -74,6 +74,7 @@ public class DataImpl extends MinimalEObjectImpl.Container implements Data * * @generated */ + @Override public String getName() { return name; @@ -84,6 +85,7 @@ public class DataImpl extends MinimalEObjectImpl.Container implements Data * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -168,7 +170,7 @@ public class DataImpl extends MinimalEObjectImpl.Container implements Data { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/locationprovidertest/impl/ElementImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/locationprovidertest/impl/ElementImpl.java index ce1c86748..8ea38529c 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/locationprovidertest/impl/ElementImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/locationprovidertest/impl/ElementImpl.java @@ -103,6 +103,7 @@ public class ElementImpl extends MinimalEObjectImpl.Container implements Element * * @generated */ + @Override public String getName() { return name; @@ -113,6 +114,7 @@ public class ElementImpl extends MinimalEObjectImpl.Container implements Element * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -126,6 +128,7 @@ public class ElementImpl extends MinimalEObjectImpl.Container implements Element * * @generated */ + @Override public Element getSingleref() { if (singleref != null && singleref.eIsProxy()) @@ -156,6 +159,7 @@ public class ElementImpl extends MinimalEObjectImpl.Container implements Element * * @generated */ + @Override public void setSingleref(Element newSingleref) { Element oldSingleref = singleref; @@ -169,6 +173,7 @@ public class ElementImpl extends MinimalEObjectImpl.Container implements Element * * @generated */ + @Override public EList getMultirefs() { if (multirefs == null) @@ -277,7 +282,7 @@ public class ElementImpl extends MinimalEObjectImpl.Container implements Element { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/locationprovidertest/impl/LocationprovidertestFactoryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/locationprovidertest/impl/LocationprovidertestFactoryImpl.java index 263bb4377..aace7321a 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/locationprovidertest/impl/LocationprovidertestFactoryImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/locationprovidertest/impl/LocationprovidertestFactoryImpl.java @@ -84,6 +84,7 @@ public class LocationprovidertestFactoryImpl extends EFactoryImpl implements Loc * * @generated */ + @Override public Model createModel() { ModelImpl model = new ModelImpl(); @@ -95,6 +96,7 @@ public class LocationprovidertestFactoryImpl extends EFactoryImpl implements Loc * * @generated */ + @Override public Element createElement() { ElementImpl element = new ElementImpl(); @@ -106,6 +108,7 @@ public class LocationprovidertestFactoryImpl extends EFactoryImpl implements Loc * * @generated */ + @Override public Component createComponent() { ComponentImpl component = new ComponentImpl(); @@ -117,6 +120,7 @@ public class LocationprovidertestFactoryImpl extends EFactoryImpl implements Loc * * @generated */ + @Override public Bus createBus() { BusImpl bus = new BusImpl(); @@ -128,6 +132,7 @@ public class LocationprovidertestFactoryImpl extends EFactoryImpl implements Loc * * @generated */ + @Override public Processor createProcessor() { ProcessorImpl processor = new ProcessorImpl(); @@ -139,6 +144,7 @@ public class LocationprovidertestFactoryImpl extends EFactoryImpl implements Loc * * @generated */ + @Override public Mode createMode() { ModeImpl mode = new ModeImpl(); @@ -150,6 +156,7 @@ public class LocationprovidertestFactoryImpl extends EFactoryImpl implements Loc * * @generated */ + @Override public Transition createTransition() { TransitionImpl transition = new TransitionImpl(); @@ -161,6 +168,7 @@ public class LocationprovidertestFactoryImpl extends EFactoryImpl implements Loc * * @generated */ + @Override public Port createPort() { PortImpl port = new PortImpl(); @@ -172,6 +180,7 @@ public class LocationprovidertestFactoryImpl extends EFactoryImpl implements Loc * * @generated */ + @Override public Data createData() { DataImpl data = new DataImpl(); @@ -183,6 +192,7 @@ public class LocationprovidertestFactoryImpl extends EFactoryImpl implements Loc * * @generated */ + @Override public LocationprovidertestPackage getLocationprovidertestPackage() { return (LocationprovidertestPackage)getEPackage(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/locationprovidertest/impl/LocationprovidertestPackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/locationprovidertest/impl/LocationprovidertestPackageImpl.java index 9b335b19f..21c5d6309 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/locationprovidertest/impl/LocationprovidertestPackageImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/locationprovidertest/impl/LocationprovidertestPackageImpl.java @@ -123,7 +123,7 @@ public class LocationprovidertestPackageImpl extends EPackageImpl implements Loc /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link LocationprovidertestPackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -138,7 +138,8 @@ public class LocationprovidertestPackageImpl extends EPackageImpl implements Loc if (isInited) return (LocationprovidertestPackage)EPackage.Registry.INSTANCE.getEPackage(LocationprovidertestPackage.eNS_URI); // Obtain or create and register package - LocationprovidertestPackageImpl theLocationprovidertestPackage = (LocationprovidertestPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof LocationprovidertestPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new LocationprovidertestPackageImpl()); + Object registeredLocationprovidertestPackage = EPackage.Registry.INSTANCE.get(eNS_URI); + LocationprovidertestPackageImpl theLocationprovidertestPackage = registeredLocationprovidertestPackage instanceof LocationprovidertestPackageImpl ? (LocationprovidertestPackageImpl)registeredLocationprovidertestPackage : new LocationprovidertestPackageImpl(); isInited = true; @@ -154,7 +155,6 @@ public class LocationprovidertestPackageImpl extends EPackageImpl implements Loc // Mark meta-data to indicate it can't be changed theLocationprovidertestPackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(LocationprovidertestPackage.eNS_URI, theLocationprovidertestPackage); return theLocationprovidertestPackage; @@ -165,6 +165,7 @@ public class LocationprovidertestPackageImpl extends EPackageImpl implements Loc * * @generated */ + @Override public EClass getModel() { return modelEClass; @@ -175,6 +176,7 @@ public class LocationprovidertestPackageImpl extends EPackageImpl implements Loc * * @generated */ + @Override public EReference getModel_Elements() { return (EReference)modelEClass.getEStructuralFeatures().get(0); @@ -185,6 +187,7 @@ public class LocationprovidertestPackageImpl extends EPackageImpl implements Loc * * @generated */ + @Override public EReference getModel_Components() { return (EReference)modelEClass.getEStructuralFeatures().get(1); @@ -195,6 +198,7 @@ public class LocationprovidertestPackageImpl extends EPackageImpl implements Loc * * @generated */ + @Override public EClass getElement() { return elementEClass; @@ -205,6 +209,7 @@ public class LocationprovidertestPackageImpl extends EPackageImpl implements Loc * * @generated */ + @Override public EAttribute getElement_Name() { return (EAttribute)elementEClass.getEStructuralFeatures().get(0); @@ -215,6 +220,7 @@ public class LocationprovidertestPackageImpl extends EPackageImpl implements Loc * * @generated */ + @Override public EReference getElement_Singleref() { return (EReference)elementEClass.getEStructuralFeatures().get(1); @@ -225,6 +231,7 @@ public class LocationprovidertestPackageImpl extends EPackageImpl implements Loc * * @generated */ + @Override public EReference getElement_Multirefs() { return (EReference)elementEClass.getEStructuralFeatures().get(2); @@ -235,6 +242,7 @@ public class LocationprovidertestPackageImpl extends EPackageImpl implements Loc * * @generated */ + @Override public EClass getComponent() { return componentEClass; @@ -245,6 +253,7 @@ public class LocationprovidertestPackageImpl extends EPackageImpl implements Loc * * @generated */ + @Override public EReference getComponent_Mode() { return (EReference)componentEClass.getEStructuralFeatures().get(0); @@ -255,6 +264,7 @@ public class LocationprovidertestPackageImpl extends EPackageImpl implements Loc * * @generated */ + @Override public EReference getComponent_Transition() { return (EReference)componentEClass.getEStructuralFeatures().get(1); @@ -265,6 +275,7 @@ public class LocationprovidertestPackageImpl extends EPackageImpl implements Loc * * @generated */ + @Override public EAttribute getComponent_Name() { return (EAttribute)componentEClass.getEStructuralFeatures().get(2); @@ -275,6 +286,7 @@ public class LocationprovidertestPackageImpl extends EPackageImpl implements Loc * * @generated */ + @Override public EClass getBus() { return busEClass; @@ -285,6 +297,7 @@ public class LocationprovidertestPackageImpl extends EPackageImpl implements Loc * * @generated */ + @Override public EReference getBus_Port() { return (EReference)busEClass.getEStructuralFeatures().get(0); @@ -295,6 +308,7 @@ public class LocationprovidertestPackageImpl extends EPackageImpl implements Loc * * @generated */ + @Override public EClass getProcessor() { return processorEClass; @@ -305,6 +319,7 @@ public class LocationprovidertestPackageImpl extends EPackageImpl implements Loc * * @generated */ + @Override public EReference getProcessor_Data() { return (EReference)processorEClass.getEStructuralFeatures().get(0); @@ -315,6 +330,7 @@ public class LocationprovidertestPackageImpl extends EPackageImpl implements Loc * * @generated */ + @Override public EClass getMode() { return modeEClass; @@ -325,6 +341,7 @@ public class LocationprovidertestPackageImpl extends EPackageImpl implements Loc * * @generated */ + @Override public EAttribute getMode_Name() { return (EAttribute)modeEClass.getEStructuralFeatures().get(0); @@ -335,6 +352,7 @@ public class LocationprovidertestPackageImpl extends EPackageImpl implements Loc * * @generated */ + @Override public EClass getTransition() { return transitionEClass; @@ -345,6 +363,7 @@ public class LocationprovidertestPackageImpl extends EPackageImpl implements Loc * * @generated */ + @Override public EAttribute getTransition_Name() { return (EAttribute)transitionEClass.getEStructuralFeatures().get(0); @@ -355,6 +374,7 @@ public class LocationprovidertestPackageImpl extends EPackageImpl implements Loc * * @generated */ + @Override public EReference getTransition_Source() { return (EReference)transitionEClass.getEStructuralFeatures().get(1); @@ -365,6 +385,7 @@ public class LocationprovidertestPackageImpl extends EPackageImpl implements Loc * * @generated */ + @Override public EReference getTransition_Destination() { return (EReference)transitionEClass.getEStructuralFeatures().get(2); @@ -375,6 +396,7 @@ public class LocationprovidertestPackageImpl extends EPackageImpl implements Loc * * @generated */ + @Override public EClass getPort() { return portEClass; @@ -385,6 +407,7 @@ public class LocationprovidertestPackageImpl extends EPackageImpl implements Loc * * @generated */ + @Override public EAttribute getPort_Name() { return (EAttribute)portEClass.getEStructuralFeatures().get(0); @@ -395,6 +418,7 @@ public class LocationprovidertestPackageImpl extends EPackageImpl implements Loc * * @generated */ + @Override public EClass getData() { return dataEClass; @@ -405,6 +429,7 @@ public class LocationprovidertestPackageImpl extends EPackageImpl implements Loc * * @generated */ + @Override public EAttribute getData_Name() { return (EAttribute)dataEClass.getEStructuralFeatures().get(0); @@ -415,6 +440,7 @@ public class LocationprovidertestPackageImpl extends EPackageImpl implements Loc * * @generated */ + @Override public LocationprovidertestFactory getLocationprovidertestFactory() { return (LocationprovidertestFactory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/locationprovidertest/impl/ModeImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/locationprovidertest/impl/ModeImpl.java index 4a4418374..6f3818d1d 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/locationprovidertest/impl/ModeImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/locationprovidertest/impl/ModeImpl.java @@ -74,6 +74,7 @@ public class ModeImpl extends MinimalEObjectImpl.Container implements Mode * * @generated */ + @Override public String getName() { return name; @@ -84,6 +85,7 @@ public class ModeImpl extends MinimalEObjectImpl.Container implements Mode * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -168,7 +170,7 @@ public class ModeImpl extends MinimalEObjectImpl.Container implements Mode { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/locationprovidertest/impl/ModelImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/locationprovidertest/impl/ModelImpl.java index 661fc5fc2..191779291 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/locationprovidertest/impl/ModelImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/locationprovidertest/impl/ModelImpl.java @@ -84,6 +84,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public EList getElements() { if (elements == null) @@ -98,6 +99,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public EList getComponents() { if (components == null) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/locationprovidertest/impl/PortImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/locationprovidertest/impl/PortImpl.java index 193db659c..51b817531 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/locationprovidertest/impl/PortImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/locationprovidertest/impl/PortImpl.java @@ -74,6 +74,7 @@ public class PortImpl extends MinimalEObjectImpl.Container implements Port * * @generated */ + @Override public String getName() { return name; @@ -84,6 +85,7 @@ public class PortImpl extends MinimalEObjectImpl.Container implements Port * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -168,7 +170,7 @@ public class PortImpl extends MinimalEObjectImpl.Container implements Port { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/locationprovidertest/impl/ProcessorImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/locationprovidertest/impl/ProcessorImpl.java index 774d21cd5..3d590f15d 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/locationprovidertest/impl/ProcessorImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/locationprovidertest/impl/ProcessorImpl.java @@ -70,6 +70,7 @@ public class ProcessorImpl extends ComponentImpl implements Processor * * @generated */ + @Override public EList getData() { if (data == null) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/locationprovidertest/impl/TransitionImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/locationprovidertest/impl/TransitionImpl.java index a77c132d0..08b4e2ddc 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/locationprovidertest/impl/TransitionImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/resource/locationprovidertest/impl/TransitionImpl.java @@ -98,6 +98,7 @@ public class TransitionImpl extends MinimalEObjectImpl.Container implements Tran * * @generated */ + @Override public String getName() { return name; @@ -108,6 +109,7 @@ public class TransitionImpl extends MinimalEObjectImpl.Container implements Tran * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -121,6 +123,7 @@ public class TransitionImpl extends MinimalEObjectImpl.Container implements Tran * * @generated */ + @Override public Mode getSource() { if (source != null && source.eIsProxy()) @@ -151,6 +154,7 @@ public class TransitionImpl extends MinimalEObjectImpl.Container implements Tran * * @generated */ + @Override public void setSource(Mode newSource) { Mode oldSource = source; @@ -164,6 +168,7 @@ public class TransitionImpl extends MinimalEObjectImpl.Container implements Tran * * @generated */ + @Override public Mode getDestination() { if (destination != null && destination.eIsProxy()) @@ -194,6 +199,7 @@ public class TransitionImpl extends MinimalEObjectImpl.Container implements Tran * * @generated */ + @Override public void setDestination(Mode newDestination) { Mode oldDestination = destination; @@ -300,7 +306,7 @@ public class TransitionImpl extends MinimalEObjectImpl.Container implements Tran { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/AssignmentFinderTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/AssignmentFinderTestLanguage.genmodel index e1a738b14..27d1a0691 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/AssignmentFinderTestLanguage.genmodel +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/AssignmentFinderTestLanguage.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="AssignmentFinderTestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> + complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/ContextFinderTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/ContextFinderTestLanguage.genmodel index 735327474..1e4bac36d 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/ContextFinderTestLanguage.genmodel +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/ContextFinderTestLanguage.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="ContextFinderTestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> + complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/HiddenTokenSequencerTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/HiddenTokenSequencerTestLanguage.genmodel index 52ea7cf1e..5a9396ebc 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/HiddenTokenSequencerTestLanguage.genmodel +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/HiddenTokenSequencerTestLanguage.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="HiddenTokenSequencerTestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> + complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/SequencerTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/SequencerTestLanguage.genmodel index 57ab3c0e8..c343893cb 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/SequencerTestLanguage.genmodel +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/SequencerTestLanguage.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="SequencerTestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> + complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/SyntacticSequencerTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/SyntacticSequencerTestLanguage.genmodel index ff0d3946e..90b6b104e 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/SyntacticSequencerTestLanguage.genmodel +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/SyntacticSequencerTestLanguage.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="SyntacticSequencerTestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> + complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/ContainmentRef.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/ContainmentRef.java index 0bd42ce65..a666b8546 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/ContainmentRef.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/ContainmentRef.java @@ -26,10 +26,6 @@ public interface ContainmentRef extends EObject /** * Returns the value of the 'Ctx' containment reference. * - *

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

* * @return the value of the 'Ctx' containment reference. * @see #setCtx(ContainmentRefN) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/ContainmentRefN.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/ContainmentRefN.java index 284be3426..e977b4fbd 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/ContainmentRefN.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/ContainmentRefN.java @@ -27,10 +27,6 @@ public interface ContainmentRefN extends EObject /** * Returns the value of the 'Val1' attribute. * - *

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

* * @return the value of the 'Val1' attribute. * @see #setVal1(String) @@ -53,10 +49,6 @@ public interface ContainmentRefN extends EObject /** * Returns the value of the 'Val2' attribute. * - *

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

* * @return the value of the 'Val2' attribute. * @see #setVal2(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/CrossRef.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/CrossRef.java index 81ff59368..5de714529 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/CrossRef.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/CrossRef.java @@ -27,10 +27,6 @@ public interface CrossRef 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) @@ -53,10 +49,6 @@ public interface CrossRef extends EObject /** * Returns the value of the 'Cross Ref' reference. * - *

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

* * @return the value of the 'Cross Ref' reference. * @see #setCrossRef(CrossRef) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/EnumBool.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/EnumBool.java index 692e7d591..5b34a136b 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/EnumBool.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/EnumBool.java @@ -26,10 +26,6 @@ public interface EnumBool extends EObject /** * Returns the value of the 'En' attribute. * - *

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

* * @return the value of the 'En' attribute. * @see #setEn(boolean) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/EnumVal.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/EnumVal.java index 0d8ef63ba..898152a31 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/EnumVal.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/EnumVal.java @@ -27,10 +27,6 @@ public interface EnumVal extends EObject * Returns the value of the 'En' attribute. * The literals are from the enumeration {@link org.eclipse.xtext.serializer.assignmentFinderTest.TestEnum}. * - *

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

* * @return the value of the 'En' attribute. * @see org.eclipse.xtext.serializer.assignmentFinderTest.TestEnum diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/KeywordBool.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/KeywordBool.java index c636afa7e..2d74e4a95 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/KeywordBool.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/KeywordBool.java @@ -26,10 +26,6 @@ public interface KeywordBool extends EObject /** * Returns the value of the 'Kw' attribute. * - *

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

* * @return the value of the 'Kw' attribute. * @see #setKw(boolean) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/KeywordVal.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/KeywordVal.java index 43c0b920b..c97b568fc 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/KeywordVal.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/KeywordVal.java @@ -26,10 +26,6 @@ public interface KeywordVal extends EObject /** * Returns the value of the 'Kw' attribute. * - *

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

* * @return the value of the 'Kw' attribute. * @see #setKw(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/MixedBool.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/MixedBool.java index 2310e6edb..446eb0ad5 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/MixedBool.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/MixedBool.java @@ -26,10 +26,6 @@ public interface MixedBool extends EObject /** * Returns the value of the 'Val' attribute. * - *

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

* * @return the value of the 'Val' attribute. * @see #setVal(boolean) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/MixedValue.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/MixedValue.java index 2c9ff0f28..d44ad0f66 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/MixedValue.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/MixedValue.java @@ -27,10 +27,6 @@ public interface MixedValue extends EObject * Returns the value of the 'Val' attribute. * The literals are from the enumeration {@link org.eclipse.xtext.serializer.assignmentFinderTest.TestEnum}. * - *

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

* * @return the value of the 'Val' attribute. * @see org.eclipse.xtext.serializer.assignmentFinderTest.TestEnum diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/Model.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/Model.java index d9958f396..08e12dcf3 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/Model.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/Model.java @@ -35,10 +35,6 @@ public interface Model extends EObject /** * Returns the value of the 'Keyword Val' containment reference. * - *

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

* * @return the value of the 'Keyword Val' containment reference. * @see #setKeywordVal(KeywordVal) @@ -61,10 +57,6 @@ public interface Model extends EObject /** * Returns the value of the 'Terminal Val' containment reference. * - *

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

* * @return the value of the 'Terminal Val' containment reference. * @see #setTerminalVal(TerminalVal) @@ -87,10 +79,6 @@ public interface Model extends EObject /** * Returns the value of the 'Enum Val' containment reference. * - *

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

* * @return the value of the 'Enum Val' containment reference. * @see #setEnumVal(EnumVal) @@ -113,10 +101,6 @@ public interface Model extends EObject /** * Returns the value of the 'Keyword Bool' containment reference. * - *

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

* * @return the value of the 'Keyword Bool' containment reference. * @see #setKeywordBool(KeywordBool) @@ -139,10 +123,6 @@ public interface Model extends EObject /** * Returns the value of the 'Terminal Bool' containment reference. * - *

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

* * @return the value of the 'Terminal Bool' containment reference. * @see #setTerminalBool(TerminalBool) @@ -165,10 +145,6 @@ public interface Model extends EObject /** * Returns the value of the 'Enum Bool' containment reference. * - *

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

* * @return the value of the 'Enum Bool' containment reference. * @see #setEnumBool(EnumBool) @@ -191,10 +167,6 @@ public interface Model extends EObject /** * Returns the value of the 'Mixed Bool' containment reference. * - *

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

* * @return the value of the 'Mixed Bool' containment reference. * @see #setMixedBool(MixedBool) @@ -217,10 +189,6 @@ public interface Model extends EObject /** * Returns the value of the 'Mixed Value' containment reference. * - *

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

* * @return the value of the 'Mixed Value' containment reference. * @see #setMixedValue(MixedValue) @@ -243,10 +211,6 @@ public interface Model extends EObject /** * Returns the value of the 'Containment Ref' containment reference. * - *

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

* * @return the value of the 'Containment Ref' containment reference. * @see #setContainmentRef(ContainmentRef) @@ -269,10 +233,6 @@ public interface Model extends EObject /** * Returns the value of the 'Cross Ref' containment reference. * - *

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

* * @return the value of the 'Cross Ref' containment reference. * @see #setCrossRef(CrossRef) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/TerminalBool.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/TerminalBool.java index 8b9e755ad..69e0b2243 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/TerminalBool.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/TerminalBool.java @@ -26,10 +26,6 @@ public interface TerminalBool extends EObject /** * Returns the value of the 'Term' attribute. * - *

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

* * @return the value of the 'Term' attribute. * @see #setTerm(boolean) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/TerminalVal.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/TerminalVal.java index 70057086a..9abb6a684 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/TerminalVal.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/TerminalVal.java @@ -26,10 +26,6 @@ public interface TerminalVal extends EObject /** * Returns the value of the 'Term' attribute. * - *

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

* * @return the value of the 'Term' attribute. * @see #setTerm(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/TestEnum.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/TestEnum.java index 41c57fa16..421433f92 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/TestEnum.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/TestEnum.java @@ -53,10 +53,6 @@ public enum TestEnum implements Enumerator /** * The 'Lit1' literal value. * - *

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

* * @see #LIT1 * @model name="lit1" @@ -68,10 +64,6 @@ public enum TestEnum implements Enumerator /** * The 'Lit2' literal value. * - *

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

* * @see #LIT2 * @model name="lit2" @@ -83,10 +75,6 @@ public enum TestEnum implements Enumerator /** * The 'Lit3' literal value. * - *

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

* * @see #LIT3 * @model name="lit3" @@ -217,6 +205,7 @@ public enum TestEnum implements Enumerator * * @generated */ + @Override public int getValue() { return value; @@ -227,6 +216,7 @@ public enum TestEnum implements Enumerator * * @generated */ + @Override public String getName() { return name; @@ -237,6 +227,7 @@ public enum TestEnum implements Enumerator * * @generated */ + @Override public String getLiteral() { return literal; diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/impl/AssignmentFinderTestFactoryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/impl/AssignmentFinderTestFactoryImpl.java index fb3473d57..ce943e764 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/impl/AssignmentFinderTestFactoryImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/impl/AssignmentFinderTestFactoryImpl.java @@ -122,6 +122,7 @@ public class AssignmentFinderTestFactoryImpl extends EFactoryImpl implements Ass * * @generated */ + @Override public Model createModel() { ModelImpl model = new ModelImpl(); @@ -133,6 +134,7 @@ public class AssignmentFinderTestFactoryImpl extends EFactoryImpl implements Ass * * @generated */ + @Override public KeywordVal createKeywordVal() { KeywordValImpl keywordVal = new KeywordValImpl(); @@ -144,6 +146,7 @@ public class AssignmentFinderTestFactoryImpl extends EFactoryImpl implements Ass * * @generated */ + @Override public TerminalVal createTerminalVal() { TerminalValImpl terminalVal = new TerminalValImpl(); @@ -155,6 +158,7 @@ public class AssignmentFinderTestFactoryImpl extends EFactoryImpl implements Ass * * @generated */ + @Override public EnumVal createEnumVal() { EnumValImpl enumVal = new EnumValImpl(); @@ -166,6 +170,7 @@ public class AssignmentFinderTestFactoryImpl extends EFactoryImpl implements Ass * * @generated */ + @Override public KeywordBool createKeywordBool() { KeywordBoolImpl keywordBool = new KeywordBoolImpl(); @@ -177,6 +182,7 @@ public class AssignmentFinderTestFactoryImpl extends EFactoryImpl implements Ass * * @generated */ + @Override public TerminalBool createTerminalBool() { TerminalBoolImpl terminalBool = new TerminalBoolImpl(); @@ -188,6 +194,7 @@ public class AssignmentFinderTestFactoryImpl extends EFactoryImpl implements Ass * * @generated */ + @Override public EnumBool createEnumBool() { EnumBoolImpl enumBool = new EnumBoolImpl(); @@ -199,6 +206,7 @@ public class AssignmentFinderTestFactoryImpl extends EFactoryImpl implements Ass * * @generated */ + @Override public MixedBool createMixedBool() { MixedBoolImpl mixedBool = new MixedBoolImpl(); @@ -210,6 +218,7 @@ public class AssignmentFinderTestFactoryImpl extends EFactoryImpl implements Ass * * @generated */ + @Override public MixedValue createMixedValue() { MixedValueImpl mixedValue = new MixedValueImpl(); @@ -221,6 +230,7 @@ public class AssignmentFinderTestFactoryImpl extends EFactoryImpl implements Ass * * @generated */ + @Override public ContainmentRef createContainmentRef() { ContainmentRefImpl containmentRef = new ContainmentRefImpl(); @@ -232,6 +242,7 @@ public class AssignmentFinderTestFactoryImpl extends EFactoryImpl implements Ass * * @generated */ + @Override public ContainmentRefN createContainmentRefN() { ContainmentRefNImpl containmentRefN = new ContainmentRefNImpl(); @@ -243,6 +254,7 @@ public class AssignmentFinderTestFactoryImpl extends EFactoryImpl implements Ass * * @generated */ + @Override public CrossRef createCrossRef() { CrossRefImpl crossRef = new CrossRefImpl(); @@ -276,6 +288,7 @@ public class AssignmentFinderTestFactoryImpl extends EFactoryImpl implements Ass * * @generated */ + @Override public AssignmentFinderTestPackage getAssignmentFinderTestPackage() { return (AssignmentFinderTestPackage)getEPackage(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/impl/AssignmentFinderTestPackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/impl/AssignmentFinderTestPackageImpl.java index 1672d769c..7fa562469 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/impl/AssignmentFinderTestPackageImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/impl/AssignmentFinderTestPackageImpl.java @@ -156,7 +156,7 @@ public class AssignmentFinderTestPackageImpl extends EPackageImpl implements Ass /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link AssignmentFinderTestPackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -171,7 +171,8 @@ public class AssignmentFinderTestPackageImpl extends EPackageImpl implements Ass if (isInited) return (AssignmentFinderTestPackage)EPackage.Registry.INSTANCE.getEPackage(AssignmentFinderTestPackage.eNS_URI); // Obtain or create and register package - AssignmentFinderTestPackageImpl theAssignmentFinderTestPackage = (AssignmentFinderTestPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof AssignmentFinderTestPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new AssignmentFinderTestPackageImpl()); + Object registeredAssignmentFinderTestPackage = EPackage.Registry.INSTANCE.get(eNS_URI); + AssignmentFinderTestPackageImpl theAssignmentFinderTestPackage = registeredAssignmentFinderTestPackage instanceof AssignmentFinderTestPackageImpl ? (AssignmentFinderTestPackageImpl)registeredAssignmentFinderTestPackage : new AssignmentFinderTestPackageImpl(); isInited = true; @@ -187,7 +188,6 @@ public class AssignmentFinderTestPackageImpl extends EPackageImpl implements Ass // Mark meta-data to indicate it can't be changed theAssignmentFinderTestPackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(AssignmentFinderTestPackage.eNS_URI, theAssignmentFinderTestPackage); return theAssignmentFinderTestPackage; @@ -198,6 +198,7 @@ public class AssignmentFinderTestPackageImpl extends EPackageImpl implements Ass * * @generated */ + @Override public EClass getModel() { return modelEClass; @@ -208,6 +209,7 @@ public class AssignmentFinderTestPackageImpl extends EPackageImpl implements Ass * * @generated */ + @Override public EReference getModel_KeywordVal() { return (EReference)modelEClass.getEStructuralFeatures().get(0); @@ -218,6 +220,7 @@ public class AssignmentFinderTestPackageImpl extends EPackageImpl implements Ass * * @generated */ + @Override public EReference getModel_TerminalVal() { return (EReference)modelEClass.getEStructuralFeatures().get(1); @@ -228,6 +231,7 @@ public class AssignmentFinderTestPackageImpl extends EPackageImpl implements Ass * * @generated */ + @Override public EReference getModel_EnumVal() { return (EReference)modelEClass.getEStructuralFeatures().get(2); @@ -238,6 +242,7 @@ public class AssignmentFinderTestPackageImpl extends EPackageImpl implements Ass * * @generated */ + @Override public EReference getModel_KeywordBool() { return (EReference)modelEClass.getEStructuralFeatures().get(3); @@ -248,6 +253,7 @@ public class AssignmentFinderTestPackageImpl extends EPackageImpl implements Ass * * @generated */ + @Override public EReference getModel_TerminalBool() { return (EReference)modelEClass.getEStructuralFeatures().get(4); @@ -258,6 +264,7 @@ public class AssignmentFinderTestPackageImpl extends EPackageImpl implements Ass * * @generated */ + @Override public EReference getModel_EnumBool() { return (EReference)modelEClass.getEStructuralFeatures().get(5); @@ -268,6 +275,7 @@ public class AssignmentFinderTestPackageImpl extends EPackageImpl implements Ass * * @generated */ + @Override public EReference getModel_MixedBool() { return (EReference)modelEClass.getEStructuralFeatures().get(6); @@ -278,6 +286,7 @@ public class AssignmentFinderTestPackageImpl extends EPackageImpl implements Ass * * @generated */ + @Override public EReference getModel_MixedValue() { return (EReference)modelEClass.getEStructuralFeatures().get(7); @@ -288,6 +297,7 @@ public class AssignmentFinderTestPackageImpl extends EPackageImpl implements Ass * * @generated */ + @Override public EReference getModel_ContainmentRef() { return (EReference)modelEClass.getEStructuralFeatures().get(8); @@ -298,6 +308,7 @@ public class AssignmentFinderTestPackageImpl extends EPackageImpl implements Ass * * @generated */ + @Override public EReference getModel_CrossRef() { return (EReference)modelEClass.getEStructuralFeatures().get(9); @@ -308,6 +319,7 @@ public class AssignmentFinderTestPackageImpl extends EPackageImpl implements Ass * * @generated */ + @Override public EClass getKeywordVal() { return keywordValEClass; @@ -318,6 +330,7 @@ public class AssignmentFinderTestPackageImpl extends EPackageImpl implements Ass * * @generated */ + @Override public EAttribute getKeywordVal_Kw() { return (EAttribute)keywordValEClass.getEStructuralFeatures().get(0); @@ -328,6 +341,7 @@ public class AssignmentFinderTestPackageImpl extends EPackageImpl implements Ass * * @generated */ + @Override public EClass getTerminalVal() { return terminalValEClass; @@ -338,6 +352,7 @@ public class AssignmentFinderTestPackageImpl extends EPackageImpl implements Ass * * @generated */ + @Override public EAttribute getTerminalVal_Term() { return (EAttribute)terminalValEClass.getEStructuralFeatures().get(0); @@ -348,6 +363,7 @@ public class AssignmentFinderTestPackageImpl extends EPackageImpl implements Ass * * @generated */ + @Override public EClass getEnumVal() { return enumValEClass; @@ -358,6 +374,7 @@ public class AssignmentFinderTestPackageImpl extends EPackageImpl implements Ass * * @generated */ + @Override public EAttribute getEnumVal_En() { return (EAttribute)enumValEClass.getEStructuralFeatures().get(0); @@ -368,6 +385,7 @@ public class AssignmentFinderTestPackageImpl extends EPackageImpl implements Ass * * @generated */ + @Override public EClass getKeywordBool() { return keywordBoolEClass; @@ -378,6 +396,7 @@ public class AssignmentFinderTestPackageImpl extends EPackageImpl implements Ass * * @generated */ + @Override public EAttribute getKeywordBool_Kw() { return (EAttribute)keywordBoolEClass.getEStructuralFeatures().get(0); @@ -388,6 +407,7 @@ public class AssignmentFinderTestPackageImpl extends EPackageImpl implements Ass * * @generated */ + @Override public EClass getTerminalBool() { return terminalBoolEClass; @@ -398,6 +418,7 @@ public class AssignmentFinderTestPackageImpl extends EPackageImpl implements Ass * * @generated */ + @Override public EAttribute getTerminalBool_Term() { return (EAttribute)terminalBoolEClass.getEStructuralFeatures().get(0); @@ -408,6 +429,7 @@ public class AssignmentFinderTestPackageImpl extends EPackageImpl implements Ass * * @generated */ + @Override public EClass getEnumBool() { return enumBoolEClass; @@ -418,6 +440,7 @@ public class AssignmentFinderTestPackageImpl extends EPackageImpl implements Ass * * @generated */ + @Override public EAttribute getEnumBool_En() { return (EAttribute)enumBoolEClass.getEStructuralFeatures().get(0); @@ -428,6 +451,7 @@ public class AssignmentFinderTestPackageImpl extends EPackageImpl implements Ass * * @generated */ + @Override public EClass getMixedBool() { return mixedBoolEClass; @@ -438,6 +462,7 @@ public class AssignmentFinderTestPackageImpl extends EPackageImpl implements Ass * * @generated */ + @Override public EAttribute getMixedBool_Val() { return (EAttribute)mixedBoolEClass.getEStructuralFeatures().get(0); @@ -448,6 +473,7 @@ public class AssignmentFinderTestPackageImpl extends EPackageImpl implements Ass * * @generated */ + @Override public EClass getMixedValue() { return mixedValueEClass; @@ -458,6 +484,7 @@ public class AssignmentFinderTestPackageImpl extends EPackageImpl implements Ass * * @generated */ + @Override public EAttribute getMixedValue_Val() { return (EAttribute)mixedValueEClass.getEStructuralFeatures().get(0); @@ -468,6 +495,7 @@ public class AssignmentFinderTestPackageImpl extends EPackageImpl implements Ass * * @generated */ + @Override public EClass getContainmentRef() { return containmentRefEClass; @@ -478,6 +506,7 @@ public class AssignmentFinderTestPackageImpl extends EPackageImpl implements Ass * * @generated */ + @Override public EReference getContainmentRef_Ctx() { return (EReference)containmentRefEClass.getEStructuralFeatures().get(0); @@ -488,6 +517,7 @@ public class AssignmentFinderTestPackageImpl extends EPackageImpl implements Ass * * @generated */ + @Override public EClass getContainmentRefN() { return containmentRefNEClass; @@ -498,6 +528,7 @@ public class AssignmentFinderTestPackageImpl extends EPackageImpl implements Ass * * @generated */ + @Override public EAttribute getContainmentRefN_Val1() { return (EAttribute)containmentRefNEClass.getEStructuralFeatures().get(0); @@ -508,6 +539,7 @@ public class AssignmentFinderTestPackageImpl extends EPackageImpl implements Ass * * @generated */ + @Override public EAttribute getContainmentRefN_Val2() { return (EAttribute)containmentRefNEClass.getEStructuralFeatures().get(1); @@ -518,6 +550,7 @@ public class AssignmentFinderTestPackageImpl extends EPackageImpl implements Ass * * @generated */ + @Override public EClass getCrossRef() { return crossRefEClass; @@ -528,6 +561,7 @@ public class AssignmentFinderTestPackageImpl extends EPackageImpl implements Ass * * @generated */ + @Override public EAttribute getCrossRef_Name() { return (EAttribute)crossRefEClass.getEStructuralFeatures().get(0); @@ -538,6 +572,7 @@ public class AssignmentFinderTestPackageImpl extends EPackageImpl implements Ass * * @generated */ + @Override public EReference getCrossRef_CrossRef() { return (EReference)crossRefEClass.getEStructuralFeatures().get(1); @@ -548,6 +583,7 @@ public class AssignmentFinderTestPackageImpl extends EPackageImpl implements Ass * * @generated */ + @Override public EEnum getTestEnum() { return testEnumEEnum; @@ -558,6 +594,7 @@ public class AssignmentFinderTestPackageImpl extends EPackageImpl implements Ass * * @generated */ + @Override public AssignmentFinderTestFactory getAssignmentFinderTestFactory() { return (AssignmentFinderTestFactory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/impl/ContainmentRefImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/impl/ContainmentRefImpl.java index 73e164110..d2d962e50 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/impl/ContainmentRefImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/impl/ContainmentRefImpl.java @@ -67,6 +67,7 @@ public class ContainmentRefImpl extends MinimalEObjectImpl.Container implements * * @generated */ + @Override public ContainmentRefN getCtx() { return ctx; @@ -94,6 +95,7 @@ public class ContainmentRefImpl extends MinimalEObjectImpl.Container implements * * @generated */ + @Override public void setCtx(ContainmentRefN newCtx) { if (newCtx != ctx) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/impl/ContainmentRefNImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/impl/ContainmentRefNImpl.java index 55f2084ea..4de22d22b 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/impl/ContainmentRefNImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/impl/ContainmentRefNImpl.java @@ -95,6 +95,7 @@ public class ContainmentRefNImpl extends MinimalEObjectImpl.Container implements * * @generated */ + @Override public String getVal1() { return val1; @@ -105,6 +106,7 @@ public class ContainmentRefNImpl extends MinimalEObjectImpl.Container implements * * @generated */ + @Override public void setVal1(String newVal1) { String oldVal1 = val1; @@ -118,6 +120,7 @@ public class ContainmentRefNImpl extends MinimalEObjectImpl.Container implements * * @generated */ + @Override public String getVal2() { return val2; @@ -128,6 +131,7 @@ public class ContainmentRefNImpl extends MinimalEObjectImpl.Container implements * * @generated */ + @Override public void setVal2(String newVal2) { String oldVal2 = val2; @@ -222,7 +226,7 @@ public class ContainmentRefNImpl extends MinimalEObjectImpl.Container implements { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (val1: "); result.append(val1); result.append(", val2: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/impl/CrossRefImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/impl/CrossRefImpl.java index a5a7ccef6..80dd5639b 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/impl/CrossRefImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/impl/CrossRefImpl.java @@ -86,6 +86,7 @@ public class CrossRefImpl extends MinimalEObjectImpl.Container implements CrossR * * @generated */ + @Override public String getName() { return name; @@ -96,6 +97,7 @@ public class CrossRefImpl extends MinimalEObjectImpl.Container implements CrossR * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -109,6 +111,7 @@ public class CrossRefImpl extends MinimalEObjectImpl.Container implements CrossR * * @generated */ + @Override public CrossRef getCrossRef() { if (crossRef != null && crossRef.eIsProxy()) @@ -139,6 +142,7 @@ public class CrossRefImpl extends MinimalEObjectImpl.Container implements CrossR * * @generated */ + @Override public void setCrossRef(CrossRef newCrossRef) { CrossRef oldCrossRef = crossRef; @@ -234,7 +238,7 @@ public class CrossRefImpl extends MinimalEObjectImpl.Container implements CrossR { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/impl/EnumBoolImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/impl/EnumBoolImpl.java index ea6490911..1fe017d9f 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/impl/EnumBoolImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/impl/EnumBoolImpl.java @@ -74,6 +74,7 @@ public class EnumBoolImpl extends MinimalEObjectImpl.Container implements EnumBo * * @generated */ + @Override public boolean isEn() { return en; @@ -84,6 +85,7 @@ public class EnumBoolImpl extends MinimalEObjectImpl.Container implements EnumBo * * @generated */ + @Override public void setEn(boolean newEn) { boolean oldEn = en; @@ -168,7 +170,7 @@ public class EnumBoolImpl extends MinimalEObjectImpl.Container implements EnumBo { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (en: "); result.append(en); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/impl/EnumValImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/impl/EnumValImpl.java index bcf30e6d3..21898be5c 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/impl/EnumValImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/impl/EnumValImpl.java @@ -75,6 +75,7 @@ public class EnumValImpl extends MinimalEObjectImpl.Container implements EnumVal * * @generated */ + @Override public TestEnum getEn() { return en; @@ -85,6 +86,7 @@ public class EnumValImpl extends MinimalEObjectImpl.Container implements EnumVal * * @generated */ + @Override public void setEn(TestEnum newEn) { TestEnum oldEn = en; @@ -169,7 +171,7 @@ public class EnumValImpl extends MinimalEObjectImpl.Container implements EnumVal { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (en: "); result.append(en); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/impl/KeywordBoolImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/impl/KeywordBoolImpl.java index a99d9f02c..ac91a7642 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/impl/KeywordBoolImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/impl/KeywordBoolImpl.java @@ -74,6 +74,7 @@ public class KeywordBoolImpl extends MinimalEObjectImpl.Container implements Key * * @generated */ + @Override public boolean isKw() { return kw; @@ -84,6 +85,7 @@ public class KeywordBoolImpl extends MinimalEObjectImpl.Container implements Key * * @generated */ + @Override public void setKw(boolean newKw) { boolean oldKw = kw; @@ -168,7 +170,7 @@ public class KeywordBoolImpl extends MinimalEObjectImpl.Container implements Key { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (kw: "); result.append(kw); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/impl/KeywordValImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/impl/KeywordValImpl.java index 2fd7a6ef3..e6a57f668 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/impl/KeywordValImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/impl/KeywordValImpl.java @@ -74,6 +74,7 @@ public class KeywordValImpl extends MinimalEObjectImpl.Container implements Keyw * * @generated */ + @Override public String getKw() { return kw; @@ -84,6 +85,7 @@ public class KeywordValImpl extends MinimalEObjectImpl.Container implements Keyw * * @generated */ + @Override public void setKw(String newKw) { String oldKw = kw; @@ -168,7 +170,7 @@ public class KeywordValImpl extends MinimalEObjectImpl.Container implements Keyw { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (kw: "); result.append(kw); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/impl/MixedBoolImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/impl/MixedBoolImpl.java index 1263bfd8a..afed51760 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/impl/MixedBoolImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/impl/MixedBoolImpl.java @@ -74,6 +74,7 @@ public class MixedBoolImpl extends MinimalEObjectImpl.Container implements Mixed * * @generated */ + @Override public boolean isVal() { return val; @@ -84,6 +85,7 @@ public class MixedBoolImpl extends MinimalEObjectImpl.Container implements Mixed * * @generated */ + @Override public void setVal(boolean newVal) { boolean oldVal = val; @@ -168,7 +170,7 @@ public class MixedBoolImpl extends MinimalEObjectImpl.Container implements Mixed { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (val: "); result.append(val); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/impl/MixedValueImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/impl/MixedValueImpl.java index 1f8263f32..720d05d39 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/impl/MixedValueImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/impl/MixedValueImpl.java @@ -75,6 +75,7 @@ public class MixedValueImpl extends MinimalEObjectImpl.Container implements Mixe * * @generated */ + @Override public TestEnum getVal() { return val; @@ -85,6 +86,7 @@ public class MixedValueImpl extends MinimalEObjectImpl.Container implements Mixe * * @generated */ + @Override public void setVal(TestEnum newVal) { TestEnum oldVal = val; @@ -169,7 +171,7 @@ public class MixedValueImpl extends MinimalEObjectImpl.Container implements Mixe { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (val: "); result.append(val); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/impl/ModelImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/impl/ModelImpl.java index 362fc8e18..d6680e3d2 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/impl/ModelImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/impl/ModelImpl.java @@ -175,6 +175,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public KeywordVal getKeywordVal() { return keywordVal; @@ -202,6 +203,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setKeywordVal(KeywordVal newKeywordVal) { if (newKeywordVal != keywordVal) @@ -223,6 +225,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public TerminalVal getTerminalVal() { return terminalVal; @@ -250,6 +253,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setTerminalVal(TerminalVal newTerminalVal) { if (newTerminalVal != terminalVal) @@ -271,6 +275,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public EnumVal getEnumVal() { return enumVal; @@ -298,6 +303,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setEnumVal(EnumVal newEnumVal) { if (newEnumVal != enumVal) @@ -319,6 +325,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public KeywordBool getKeywordBool() { return keywordBool; @@ -346,6 +353,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setKeywordBool(KeywordBool newKeywordBool) { if (newKeywordBool != keywordBool) @@ -367,6 +375,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public TerminalBool getTerminalBool() { return terminalBool; @@ -394,6 +403,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setTerminalBool(TerminalBool newTerminalBool) { if (newTerminalBool != terminalBool) @@ -415,6 +425,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public EnumBool getEnumBool() { return enumBool; @@ -442,6 +453,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setEnumBool(EnumBool newEnumBool) { if (newEnumBool != enumBool) @@ -463,6 +475,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public MixedBool getMixedBool() { return mixedBool; @@ -490,6 +503,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setMixedBool(MixedBool newMixedBool) { if (newMixedBool != mixedBool) @@ -511,6 +525,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public MixedValue getMixedValue() { return mixedValue; @@ -538,6 +553,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setMixedValue(MixedValue newMixedValue) { if (newMixedValue != mixedValue) @@ -559,6 +575,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public ContainmentRef getContainmentRef() { return containmentRef; @@ -586,6 +603,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setContainmentRef(ContainmentRef newContainmentRef) { if (newContainmentRef != containmentRef) @@ -607,6 +625,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public CrossRef getCrossRef() { return crossRef; @@ -634,6 +653,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setCrossRef(CrossRef newCrossRef) { if (newCrossRef != crossRef) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/impl/TerminalBoolImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/impl/TerminalBoolImpl.java index c23276431..4b29be12a 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/impl/TerminalBoolImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/impl/TerminalBoolImpl.java @@ -74,6 +74,7 @@ public class TerminalBoolImpl extends MinimalEObjectImpl.Container implements Te * * @generated */ + @Override public boolean isTerm() { return term; @@ -84,6 +85,7 @@ public class TerminalBoolImpl extends MinimalEObjectImpl.Container implements Te * * @generated */ + @Override public void setTerm(boolean newTerm) { boolean oldTerm = term; @@ -168,7 +170,7 @@ public class TerminalBoolImpl extends MinimalEObjectImpl.Container implements Te { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (term: "); result.append(term); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/impl/TerminalValImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/impl/TerminalValImpl.java index caef778d0..0428f0dbd 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/impl/TerminalValImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/assignmentFinderTest/impl/TerminalValImpl.java @@ -74,6 +74,7 @@ public class TerminalValImpl extends MinimalEObjectImpl.Container implements Ter * * @generated */ + @Override public String getTerm() { return term; @@ -84,6 +85,7 @@ public class TerminalValImpl extends MinimalEObjectImpl.Container implements Ter * * @generated */ + @Override public void setTerm(String newTerm) { String oldTerm = term; @@ -168,7 +170,7 @@ public class TerminalValImpl extends MinimalEObjectImpl.Container implements Ter { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (term: "); result.append(term); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/AttributeExclusionTest.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/AttributeExclusionTest.java index 7ba75cc60..3b738f406 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/AttributeExclusionTest.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/AttributeExclusionTest.java @@ -27,10 +27,6 @@ public interface AttributeExclusionTest extends EObject /** * Returns the value of the 'Attr1' attribute. * - *

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

* * @return the value of the 'Attr1' attribute. * @see #setAttr1(String) @@ -53,10 +49,6 @@ public interface AttributeExclusionTest extends EObject /** * Returns the value of the 'Attr2' attribute. * - *

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

* * @return the value of the 'Attr2' attribute. * @see #setAttr2(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/Model.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/Model.java index dc638e12c..241e911de 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/Model.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/Model.java @@ -35,10 +35,6 @@ public interface Model extends EObject /** * Returns the value of the 'Model' containment reference. * - *

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

* * @return the value of the 'Model' containment reference. * @see #setModel(Model) @@ -61,10 +57,6 @@ public interface Model extends EObject /** * Returns the value of the 'Attribute Exclusion' containment reference. * - *

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

* * @return the value of the 'Attribute Exclusion' containment reference. * @see #setAttributeExclusion(AttributeExclusionTest) @@ -87,10 +79,6 @@ public interface Model extends EObject /** * Returns the value of the 'Nested Type' containment reference. * - *

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

* * @return the value of the 'Nested Type' containment reference. * @see #setNestedType(NestedTypeTest) @@ -113,10 +101,6 @@ public interface Model extends EObject /** * Returns the value of the 'Nested Type Recursive Test2' containment reference. * - *

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

* * @return the value of the 'Nested Type Recursive Test2' containment reference. * @see #setNestedTypeRecursiveTest2(NestedTypeRecursiveTest) @@ -139,10 +123,6 @@ public interface Model extends EObject /** * Returns the value of the 'Parent Ref' containment reference. * - *

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

* * @return the value of the 'Parent Ref' containment reference. * @see #setParentRef(EObject) @@ -165,10 +145,6 @@ public interface Model extends EObject /** * Returns the value of the 'Quantity Exclusion' containment reference. * - *

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

* * @return the value of the 'Quantity Exclusion' containment reference. * @see #setQuantityExclusion(QuantityExclusionTest) @@ -191,10 +167,6 @@ public interface Model extends EObject /** * Returns the value of the 'Value Exclusion' containment reference. * - *

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

* * @return the value of the 'Value Exclusion' containment reference. * @see #setValueExclusion(ValueExclusionTest) @@ -217,10 +189,6 @@ public interface Model 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) @@ -243,10 +211,6 @@ public interface Model extends EObject /** * Returns the value of the 'Node Exclusion' containment reference. * - *

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

* * @return the value of the 'Node Exclusion' containment reference. * @see #setNodeExclusion(NodeExclusion) @@ -269,10 +233,6 @@ public interface Model extends EObject /** * Returns the value of the 'Node Exclusion List' containment reference. * - *

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

* * @return the value of the 'Node Exclusion List' containment reference. * @see #setNodeExclusionList(NodeExclusionList) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/NestedTypeChild.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/NestedTypeChild.java index 5573eecbb..b5cc20847 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/NestedTypeChild.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/NestedTypeChild.java @@ -26,10 +26,6 @@ public interface NestedTypeChild extends EObject /** * Returns the value of the 'Val' attribute. * - *

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

* * @return the value of the 'Val' attribute. * @see #setVal(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/NestedTypeRecursiveTest.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/NestedTypeRecursiveTest.java index 1353d1e6d..add21443f 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/NestedTypeRecursiveTest.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/NestedTypeRecursiveTest.java @@ -26,10 +26,6 @@ public interface NestedTypeRecursiveTest extends EObject /** * Returns the value of the 'Left' containment reference. * - *

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

* * @return the value of the 'Left' containment reference. * @see #setLeft(NestedTypeRecursiveTest) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/NestedTypeTest.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/NestedTypeTest.java index 624ac084e..3582bb8eb 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/NestedTypeTest.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/NestedTypeTest.java @@ -26,10 +26,6 @@ public interface NestedTypeTest extends EObject /** * Returns the value of the 'Nested' containment reference. * - *

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

* * @return the value of the 'Nested' containment reference. * @see #setNested(NestedTypeChild) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/NodeExclusion.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/NodeExclusion.java index 204d41935..86039e9c4 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/NodeExclusion.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/NodeExclusion.java @@ -26,10 +26,6 @@ public interface NodeExclusion extends EObject /** * Returns the value of the 'Ref' reference. * - *

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

* * @return the value of the 'Ref' reference. * @see #setRef(Model) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/NodeExclusionList.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/NodeExclusionList.java index c00d3f8f5..cad81fed0 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/NodeExclusionList.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/NodeExclusionList.java @@ -29,10 +29,6 @@ public interface NodeExclusionList extends EObject * Returns the value of the 'Ref' reference list. * The list contents are of type {@link org.eclipse.xtext.serializer.contextFinderTest.Model}. * - *

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

* * @return the value of the 'Ref' reference list. * @see org.eclipse.xtext.serializer.contextFinderTest.ContextFinderTestPackage#getNodeExclusionList_Ref() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/ParentRefTest1.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/ParentRefTest1.java index c415e245d..200f8f51d 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/ParentRefTest1.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/ParentRefTest1.java @@ -26,10 +26,6 @@ public interface ParentRefTest1 extends EObject /** * Returns the value of the 'Child1' containment reference. * - *

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

* * @return the value of the 'Child1' containment reference. * @see #setChild1(ParentRefTestChild) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/ParentRefTest2.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/ParentRefTest2.java index 67bddbd2d..558d6f225 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/ParentRefTest2.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/ParentRefTest2.java @@ -26,10 +26,6 @@ public interface ParentRefTest2 extends EObject /** * Returns the value of the 'Child2' containment reference. * - *

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

* * @return the value of the 'Child2' containment reference. * @see #setChild2(ParentRefTestChild) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/ParentRefTestChild.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/ParentRefTestChild.java index 7261c0a78..7e38af878 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/ParentRefTestChild.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/ParentRefTestChild.java @@ -26,10 +26,6 @@ public interface ParentRefTestChild extends EObject /** * Returns the value of the 'Child' containment reference. * - *

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

* * @return the value of the 'Child' containment reference. * @see #setChild(ParentRefTestChild) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/QuantityExclusionTest.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/QuantityExclusionTest.java index ce2bb1f57..5830dd542 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/QuantityExclusionTest.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/QuantityExclusionTest.java @@ -27,10 +27,6 @@ public interface QuantityExclusionTest extends EObject /** * Returns the value of the 'Attr1' attribute. * - *

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

* * @return the value of the 'Attr1' attribute. * @see #setAttr1(String) @@ -53,10 +49,6 @@ public interface QuantityExclusionTest extends EObject /** * Returns the value of the 'Attr2' attribute. * - *

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

* * @return the value of the 'Attr2' attribute. * @see #setAttr2(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/ValueExclusionTest.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/ValueExclusionTest.java index 165118243..3b5763602 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/ValueExclusionTest.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/ValueExclusionTest.java @@ -27,10 +27,6 @@ public interface ValueExclusionTest extends EObject * Returns the value of the 'Val' attribute. * The literals are from the enumeration {@link org.eclipse.xtext.serializer.contextFinderTest.ValueExclusionTestEn}. * - *

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

* * @return the value of the 'Val' attribute. * @see org.eclipse.xtext.serializer.contextFinderTest.ValueExclusionTestEn diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/ValueExclusionTestEn.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/ValueExclusionTestEn.java index 40272c357..2be3f06fb 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/ValueExclusionTestEn.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/ValueExclusionTestEn.java @@ -53,10 +53,6 @@ public enum ValueExclusionTestEn implements Enumerator /** * The 'Lit0' literal value. * - *

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

* * @see #LIT0 * @model name="lit0" @@ -68,10 +64,6 @@ public enum ValueExclusionTestEn implements Enumerator /** * The 'Lit1' literal value. * - *

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

* * @see #LIT1 * @model name="lit1" @@ -83,10 +75,6 @@ public enum ValueExclusionTestEn implements Enumerator /** * The 'Lit2' literal value. * - *

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

* * @see #LIT2 * @model name="lit2" @@ -217,6 +205,7 @@ public enum ValueExclusionTestEn implements Enumerator * * @generated */ + @Override public int getValue() { return value; @@ -227,6 +216,7 @@ public enum ValueExclusionTestEn implements Enumerator * * @generated */ + @Override public String getName() { return name; @@ -237,6 +227,7 @@ public enum ValueExclusionTestEn implements Enumerator * * @generated */ + @Override public String getLiteral() { return literal; diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/impl/AttributeExclusionTestImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/impl/AttributeExclusionTestImpl.java index 7d7f77fe3..5ffdcc7b7 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/impl/AttributeExclusionTestImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/impl/AttributeExclusionTestImpl.java @@ -95,6 +95,7 @@ public class AttributeExclusionTestImpl extends MinimalEObjectImpl.Container imp * * @generated */ + @Override public String getAttr1() { return attr1; @@ -105,6 +106,7 @@ public class AttributeExclusionTestImpl extends MinimalEObjectImpl.Container imp * * @generated */ + @Override public void setAttr1(String newAttr1) { String oldAttr1 = attr1; @@ -118,6 +120,7 @@ public class AttributeExclusionTestImpl extends MinimalEObjectImpl.Container imp * * @generated */ + @Override public String getAttr2() { return attr2; @@ -128,6 +131,7 @@ public class AttributeExclusionTestImpl extends MinimalEObjectImpl.Container imp * * @generated */ + @Override public void setAttr2(String newAttr2) { String oldAttr2 = attr2; @@ -222,7 +226,7 @@ public class AttributeExclusionTestImpl extends MinimalEObjectImpl.Container imp { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (attr1: "); result.append(attr1); result.append(", attr2: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/impl/ContextFinderTestFactoryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/impl/ContextFinderTestFactoryImpl.java index 9805dbb5c..9f9cd7ab4 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/impl/ContextFinderTestFactoryImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/impl/ContextFinderTestFactoryImpl.java @@ -126,6 +126,7 @@ public class ContextFinderTestFactoryImpl extends EFactoryImpl implements Contex * * @generated */ + @Override public Model createModel() { ModelImpl model = new ModelImpl(); @@ -137,6 +138,7 @@ public class ContextFinderTestFactoryImpl extends EFactoryImpl implements Contex * * @generated */ + @Override public AttributeExclusionTest createAttributeExclusionTest() { AttributeExclusionTestImpl attributeExclusionTest = new AttributeExclusionTestImpl(); @@ -148,6 +150,7 @@ public class ContextFinderTestFactoryImpl extends EFactoryImpl implements Contex * * @generated */ + @Override public NestedTypeTest createNestedTypeTest() { NestedTypeTestImpl nestedTypeTest = new NestedTypeTestImpl(); @@ -159,6 +162,7 @@ public class ContextFinderTestFactoryImpl extends EFactoryImpl implements Contex * * @generated */ + @Override public NestedTypeChild createNestedTypeChild() { NestedTypeChildImpl nestedTypeChild = new NestedTypeChildImpl(); @@ -170,6 +174,7 @@ public class ContextFinderTestFactoryImpl extends EFactoryImpl implements Contex * * @generated */ + @Override public NestedTypeChild1 createNestedTypeChild1() { NestedTypeChild1Impl nestedTypeChild1 = new NestedTypeChild1Impl(); @@ -181,6 +186,7 @@ public class ContextFinderTestFactoryImpl extends EFactoryImpl implements Contex * * @generated */ + @Override public NestedTypeChild2 createNestedTypeChild2() { NestedTypeChild2Impl nestedTypeChild2 = new NestedTypeChild2Impl(); @@ -192,6 +198,7 @@ public class ContextFinderTestFactoryImpl extends EFactoryImpl implements Contex * * @generated */ + @Override public NestedTypeRecursiveTest createNestedTypeRecursiveTest() { NestedTypeRecursiveTestImpl nestedTypeRecursiveTest = new NestedTypeRecursiveTestImpl(); @@ -203,6 +210,7 @@ public class ContextFinderTestFactoryImpl extends EFactoryImpl implements Contex * * @generated */ + @Override public ParentRefTest1 createParentRefTest1() { ParentRefTest1Impl parentRefTest1 = new ParentRefTest1Impl(); @@ -214,6 +222,7 @@ public class ContextFinderTestFactoryImpl extends EFactoryImpl implements Contex * * @generated */ + @Override public ParentRefTest2 createParentRefTest2() { ParentRefTest2Impl parentRefTest2 = new ParentRefTest2Impl(); @@ -225,6 +234,7 @@ public class ContextFinderTestFactoryImpl extends EFactoryImpl implements Contex * * @generated */ + @Override public ParentRefTestChild createParentRefTestChild() { ParentRefTestChildImpl parentRefTestChild = new ParentRefTestChildImpl(); @@ -236,6 +246,7 @@ public class ContextFinderTestFactoryImpl extends EFactoryImpl implements Contex * * @generated */ + @Override public QuantityExclusionTest createQuantityExclusionTest() { QuantityExclusionTestImpl quantityExclusionTest = new QuantityExclusionTestImpl(); @@ -247,6 +258,7 @@ public class ContextFinderTestFactoryImpl extends EFactoryImpl implements Contex * * @generated */ + @Override public ValueExclusionTest createValueExclusionTest() { ValueExclusionTestImpl valueExclusionTest = new ValueExclusionTestImpl(); @@ -258,6 +270,7 @@ public class ContextFinderTestFactoryImpl extends EFactoryImpl implements Contex * * @generated */ + @Override public NodeExclusion createNodeExclusion() { NodeExclusionImpl nodeExclusion = new NodeExclusionImpl(); @@ -269,6 +282,7 @@ public class ContextFinderTestFactoryImpl extends EFactoryImpl implements Contex * * @generated */ + @Override public NodeExclusionList createNodeExclusionList() { NodeExclusionListImpl nodeExclusionList = new NodeExclusionListImpl(); @@ -280,6 +294,7 @@ public class ContextFinderTestFactoryImpl extends EFactoryImpl implements Contex * * @generated */ + @Override public NestedTypeRecursiveTest1 createNestedTypeRecursiveTest1() { NestedTypeRecursiveTest1Impl nestedTypeRecursiveTest1 = new NestedTypeRecursiveTest1Impl(); @@ -291,6 +306,7 @@ public class ContextFinderTestFactoryImpl extends EFactoryImpl implements Contex * * @generated */ + @Override public NestedTypeRecursiveTest2 createNestedTypeRecursiveTest2() { NestedTypeRecursiveTest2Impl nestedTypeRecursiveTest2 = new NestedTypeRecursiveTest2Impl(); @@ -324,6 +340,7 @@ public class ContextFinderTestFactoryImpl extends EFactoryImpl implements Contex * * @generated */ + @Override public ContextFinderTestPackage getContextFinderTestPackage() { return (ContextFinderTestPackage)getEPackage(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/impl/ContextFinderTestPackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/impl/ContextFinderTestPackageImpl.java index 321cdc34f..104b5991a 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/impl/ContextFinderTestPackageImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/impl/ContextFinderTestPackageImpl.java @@ -188,7 +188,7 @@ public class ContextFinderTestPackageImpl extends EPackageImpl implements Contex /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link ContextFinderTestPackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -203,7 +203,8 @@ public class ContextFinderTestPackageImpl extends EPackageImpl implements Contex if (isInited) return (ContextFinderTestPackage)EPackage.Registry.INSTANCE.getEPackage(ContextFinderTestPackage.eNS_URI); // Obtain or create and register package - ContextFinderTestPackageImpl theContextFinderTestPackage = (ContextFinderTestPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof ContextFinderTestPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new ContextFinderTestPackageImpl()); + Object registeredContextFinderTestPackage = EPackage.Registry.INSTANCE.get(eNS_URI); + ContextFinderTestPackageImpl theContextFinderTestPackage = registeredContextFinderTestPackage instanceof ContextFinderTestPackageImpl ? (ContextFinderTestPackageImpl)registeredContextFinderTestPackage : new ContextFinderTestPackageImpl(); isInited = true; @@ -219,7 +220,6 @@ public class ContextFinderTestPackageImpl extends EPackageImpl implements Contex // Mark meta-data to indicate it can't be changed theContextFinderTestPackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(ContextFinderTestPackage.eNS_URI, theContextFinderTestPackage); return theContextFinderTestPackage; @@ -230,6 +230,7 @@ public class ContextFinderTestPackageImpl extends EPackageImpl implements Contex * * @generated */ + @Override public EClass getModel() { return modelEClass; @@ -240,6 +241,7 @@ public class ContextFinderTestPackageImpl extends EPackageImpl implements Contex * * @generated */ + @Override public EReference getModel_Model() { return (EReference)modelEClass.getEStructuralFeatures().get(0); @@ -250,6 +252,7 @@ public class ContextFinderTestPackageImpl extends EPackageImpl implements Contex * * @generated */ + @Override public EReference getModel_AttributeExclusion() { return (EReference)modelEClass.getEStructuralFeatures().get(1); @@ -260,6 +263,7 @@ public class ContextFinderTestPackageImpl extends EPackageImpl implements Contex * * @generated */ + @Override public EReference getModel_NestedType() { return (EReference)modelEClass.getEStructuralFeatures().get(2); @@ -270,6 +274,7 @@ public class ContextFinderTestPackageImpl extends EPackageImpl implements Contex * * @generated */ + @Override public EReference getModel_NestedTypeRecursiveTest2() { return (EReference)modelEClass.getEStructuralFeatures().get(3); @@ -280,6 +285,7 @@ public class ContextFinderTestPackageImpl extends EPackageImpl implements Contex * * @generated */ + @Override public EReference getModel_ParentRef() { return (EReference)modelEClass.getEStructuralFeatures().get(4); @@ -290,6 +296,7 @@ public class ContextFinderTestPackageImpl extends EPackageImpl implements Contex * * @generated */ + @Override public EReference getModel_QuantityExclusion() { return (EReference)modelEClass.getEStructuralFeatures().get(5); @@ -300,6 +307,7 @@ public class ContextFinderTestPackageImpl extends EPackageImpl implements Contex * * @generated */ + @Override public EReference getModel_ValueExclusion() { return (EReference)modelEClass.getEStructuralFeatures().get(6); @@ -310,6 +318,7 @@ public class ContextFinderTestPackageImpl extends EPackageImpl implements Contex * * @generated */ + @Override public EAttribute getModel_Name() { return (EAttribute)modelEClass.getEStructuralFeatures().get(7); @@ -320,6 +329,7 @@ public class ContextFinderTestPackageImpl extends EPackageImpl implements Contex * * @generated */ + @Override public EReference getModel_NodeExclusion() { return (EReference)modelEClass.getEStructuralFeatures().get(8); @@ -330,6 +340,7 @@ public class ContextFinderTestPackageImpl extends EPackageImpl implements Contex * * @generated */ + @Override public EReference getModel_NodeExclusionList() { return (EReference)modelEClass.getEStructuralFeatures().get(9); @@ -340,6 +351,7 @@ public class ContextFinderTestPackageImpl extends EPackageImpl implements Contex * * @generated */ + @Override public EClass getAttributeExclusionTest() { return attributeExclusionTestEClass; @@ -350,6 +362,7 @@ public class ContextFinderTestPackageImpl extends EPackageImpl implements Contex * * @generated */ + @Override public EAttribute getAttributeExclusionTest_Attr1() { return (EAttribute)attributeExclusionTestEClass.getEStructuralFeatures().get(0); @@ -360,6 +373,7 @@ public class ContextFinderTestPackageImpl extends EPackageImpl implements Contex * * @generated */ + @Override public EAttribute getAttributeExclusionTest_Attr2() { return (EAttribute)attributeExclusionTestEClass.getEStructuralFeatures().get(1); @@ -370,6 +384,7 @@ public class ContextFinderTestPackageImpl extends EPackageImpl implements Contex * * @generated */ + @Override public EClass getNestedTypeTest() { return nestedTypeTestEClass; @@ -380,6 +395,7 @@ public class ContextFinderTestPackageImpl extends EPackageImpl implements Contex * * @generated */ + @Override public EReference getNestedTypeTest_Nested() { return (EReference)nestedTypeTestEClass.getEStructuralFeatures().get(0); @@ -390,6 +406,7 @@ public class ContextFinderTestPackageImpl extends EPackageImpl implements Contex * * @generated */ + @Override public EClass getNestedTypeChild() { return nestedTypeChildEClass; @@ -400,6 +417,7 @@ public class ContextFinderTestPackageImpl extends EPackageImpl implements Contex * * @generated */ + @Override public EAttribute getNestedTypeChild_Val() { return (EAttribute)nestedTypeChildEClass.getEStructuralFeatures().get(0); @@ -410,6 +428,7 @@ public class ContextFinderTestPackageImpl extends EPackageImpl implements Contex * * @generated */ + @Override public EClass getNestedTypeChild1() { return nestedTypeChild1EClass; @@ -420,6 +439,7 @@ public class ContextFinderTestPackageImpl extends EPackageImpl implements Contex * * @generated */ + @Override public EClass getNestedTypeChild2() { return nestedTypeChild2EClass; @@ -430,6 +450,7 @@ public class ContextFinderTestPackageImpl extends EPackageImpl implements Contex * * @generated */ + @Override public EClass getNestedTypeRecursiveTest() { return nestedTypeRecursiveTestEClass; @@ -440,6 +461,7 @@ public class ContextFinderTestPackageImpl extends EPackageImpl implements Contex * * @generated */ + @Override public EReference getNestedTypeRecursiveTest_Left() { return (EReference)nestedTypeRecursiveTestEClass.getEStructuralFeatures().get(0); @@ -450,6 +472,7 @@ public class ContextFinderTestPackageImpl extends EPackageImpl implements Contex * * @generated */ + @Override public EClass getParentRefTest1() { return parentRefTest1EClass; @@ -460,6 +483,7 @@ public class ContextFinderTestPackageImpl extends EPackageImpl implements Contex * * @generated */ + @Override public EReference getParentRefTest1_Child1() { return (EReference)parentRefTest1EClass.getEStructuralFeatures().get(0); @@ -470,6 +494,7 @@ public class ContextFinderTestPackageImpl extends EPackageImpl implements Contex * * @generated */ + @Override public EClass getParentRefTest2() { return parentRefTest2EClass; @@ -480,6 +505,7 @@ public class ContextFinderTestPackageImpl extends EPackageImpl implements Contex * * @generated */ + @Override public EReference getParentRefTest2_Child2() { return (EReference)parentRefTest2EClass.getEStructuralFeatures().get(0); @@ -490,6 +516,7 @@ public class ContextFinderTestPackageImpl extends EPackageImpl implements Contex * * @generated */ + @Override public EClass getParentRefTestChild() { return parentRefTestChildEClass; @@ -500,6 +527,7 @@ public class ContextFinderTestPackageImpl extends EPackageImpl implements Contex * * @generated */ + @Override public EReference getParentRefTestChild_Child() { return (EReference)parentRefTestChildEClass.getEStructuralFeatures().get(0); @@ -510,6 +538,7 @@ public class ContextFinderTestPackageImpl extends EPackageImpl implements Contex * * @generated */ + @Override public EClass getQuantityExclusionTest() { return quantityExclusionTestEClass; @@ -520,6 +549,7 @@ public class ContextFinderTestPackageImpl extends EPackageImpl implements Contex * * @generated */ + @Override public EAttribute getQuantityExclusionTest_Attr1() { return (EAttribute)quantityExclusionTestEClass.getEStructuralFeatures().get(0); @@ -530,6 +560,7 @@ public class ContextFinderTestPackageImpl extends EPackageImpl implements Contex * * @generated */ + @Override public EAttribute getQuantityExclusionTest_Attr2() { return (EAttribute)quantityExclusionTestEClass.getEStructuralFeatures().get(1); @@ -540,6 +571,7 @@ public class ContextFinderTestPackageImpl extends EPackageImpl implements Contex * * @generated */ + @Override public EClass getValueExclusionTest() { return valueExclusionTestEClass; @@ -550,6 +582,7 @@ public class ContextFinderTestPackageImpl extends EPackageImpl implements Contex * * @generated */ + @Override public EAttribute getValueExclusionTest_Val() { return (EAttribute)valueExclusionTestEClass.getEStructuralFeatures().get(0); @@ -560,6 +593,7 @@ public class ContextFinderTestPackageImpl extends EPackageImpl implements Contex * * @generated */ + @Override public EClass getNodeExclusion() { return nodeExclusionEClass; @@ -570,6 +604,7 @@ public class ContextFinderTestPackageImpl extends EPackageImpl implements Contex * * @generated */ + @Override public EReference getNodeExclusion_Ref() { return (EReference)nodeExclusionEClass.getEStructuralFeatures().get(0); @@ -580,6 +615,7 @@ public class ContextFinderTestPackageImpl extends EPackageImpl implements Contex * * @generated */ + @Override public EClass getNodeExclusionList() { return nodeExclusionListEClass; @@ -590,6 +626,7 @@ public class ContextFinderTestPackageImpl extends EPackageImpl implements Contex * * @generated */ + @Override public EReference getNodeExclusionList_Ref() { return (EReference)nodeExclusionListEClass.getEStructuralFeatures().get(0); @@ -600,6 +637,7 @@ public class ContextFinderTestPackageImpl extends EPackageImpl implements Contex * * @generated */ + @Override public EClass getNestedTypeRecursiveTest1() { return nestedTypeRecursiveTest1EClass; @@ -610,6 +648,7 @@ public class ContextFinderTestPackageImpl extends EPackageImpl implements Contex * * @generated */ + @Override public EClass getNestedTypeRecursiveTest2() { return nestedTypeRecursiveTest2EClass; @@ -620,6 +659,7 @@ public class ContextFinderTestPackageImpl extends EPackageImpl implements Contex * * @generated */ + @Override public EEnum getValueExclusionTestEn() { return valueExclusionTestEnEEnum; @@ -630,6 +670,7 @@ public class ContextFinderTestPackageImpl extends EPackageImpl implements Contex * * @generated */ + @Override public ContextFinderTestFactory getContextFinderTestFactory() { return (ContextFinderTestFactory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/impl/ModelImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/impl/ModelImpl.java index 3277c6539..1f0ab6966 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/impl/ModelImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/impl/ModelImpl.java @@ -183,6 +183,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public Model getModel() { return model; @@ -210,6 +211,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setModel(Model newModel) { if (newModel != model) @@ -231,6 +233,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public AttributeExclusionTest getAttributeExclusion() { return attributeExclusion; @@ -258,6 +261,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setAttributeExclusion(AttributeExclusionTest newAttributeExclusion) { if (newAttributeExclusion != attributeExclusion) @@ -279,6 +283,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public NestedTypeTest getNestedType() { return nestedType; @@ -306,6 +311,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setNestedType(NestedTypeTest newNestedType) { if (newNestedType != nestedType) @@ -327,6 +333,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public NestedTypeRecursiveTest getNestedTypeRecursiveTest2() { return nestedTypeRecursiveTest2; @@ -354,6 +361,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setNestedTypeRecursiveTest2(NestedTypeRecursiveTest newNestedTypeRecursiveTest2) { if (newNestedTypeRecursiveTest2 != nestedTypeRecursiveTest2) @@ -375,6 +383,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public EObject getParentRef() { return parentRef; @@ -402,6 +411,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setParentRef(EObject newParentRef) { if (newParentRef != parentRef) @@ -423,6 +433,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public QuantityExclusionTest getQuantityExclusion() { return quantityExclusion; @@ -450,6 +461,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setQuantityExclusion(QuantityExclusionTest newQuantityExclusion) { if (newQuantityExclusion != quantityExclusion) @@ -471,6 +483,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public ValueExclusionTest getValueExclusion() { return valueExclusion; @@ -498,6 +511,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setValueExclusion(ValueExclusionTest newValueExclusion) { if (newValueExclusion != valueExclusion) @@ -519,6 +533,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public String getName() { return name; @@ -529,6 +544,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -542,6 +558,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public NodeExclusion getNodeExclusion() { return nodeExclusion; @@ -569,6 +586,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setNodeExclusion(NodeExclusion newNodeExclusion) { if (newNodeExclusion != nodeExclusion) @@ -590,6 +608,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public NodeExclusionList getNodeExclusionList() { return nodeExclusionList; @@ -617,6 +636,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setNodeExclusionList(NodeExclusionList newNodeExclusionList) { if (newNodeExclusionList != nodeExclusionList) @@ -831,7 +851,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/impl/NestedTypeChildImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/impl/NestedTypeChildImpl.java index 66b5b402b..cbbcc93d4 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/impl/NestedTypeChildImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/impl/NestedTypeChildImpl.java @@ -74,6 +74,7 @@ public class NestedTypeChildImpl extends MinimalEObjectImpl.Container implements * * @generated */ + @Override public String getVal() { return val; @@ -84,6 +85,7 @@ public class NestedTypeChildImpl extends MinimalEObjectImpl.Container implements * * @generated */ + @Override public void setVal(String newVal) { String oldVal = val; @@ -168,7 +170,7 @@ public class NestedTypeChildImpl extends MinimalEObjectImpl.Container implements { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (val: "); result.append(val); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/impl/NestedTypeRecursiveTestImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/impl/NestedTypeRecursiveTestImpl.java index 8300d9eb8..46e23a03a 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/impl/NestedTypeRecursiveTestImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/impl/NestedTypeRecursiveTestImpl.java @@ -66,6 +66,7 @@ public class NestedTypeRecursiveTestImpl extends MinimalEObjectImpl.Container im * * @generated */ + @Override public NestedTypeRecursiveTest getLeft() { return left; @@ -93,6 +94,7 @@ public class NestedTypeRecursiveTestImpl extends MinimalEObjectImpl.Container im * * @generated */ + @Override public void setLeft(NestedTypeRecursiveTest newLeft) { if (newLeft != left) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/impl/NestedTypeTestImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/impl/NestedTypeTestImpl.java index 342c7a5c4..93a8d51f9 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/impl/NestedTypeTestImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/impl/NestedTypeTestImpl.java @@ -67,6 +67,7 @@ public class NestedTypeTestImpl extends MinimalEObjectImpl.Container implements * * @generated */ + @Override public NestedTypeChild getNested() { return nested; @@ -94,6 +95,7 @@ public class NestedTypeTestImpl extends MinimalEObjectImpl.Container implements * * @generated */ + @Override public void setNested(NestedTypeChild newNested) { if (newNested != nested) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/impl/NodeExclusionImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/impl/NodeExclusionImpl.java index 9aa19375c..0f150dd8b 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/impl/NodeExclusionImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/impl/NodeExclusionImpl.java @@ -66,6 +66,7 @@ public class NodeExclusionImpl extends MinimalEObjectImpl.Container implements N * * @generated */ + @Override public Model getRef() { if (ref != null && ref.eIsProxy()) @@ -96,6 +97,7 @@ public class NodeExclusionImpl extends MinimalEObjectImpl.Container implements N * * @generated */ + @Override public void setRef(Model newRef) { Model oldRef = ref; diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/impl/NodeExclusionListImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/impl/NodeExclusionListImpl.java index 8c1d59474..70e286db8 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/impl/NodeExclusionListImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/impl/NodeExclusionListImpl.java @@ -68,6 +68,7 @@ public class NodeExclusionListImpl extends MinimalEObjectImpl.Container implemen * * @generated */ + @Override public EList getRef() { if (ref == null) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/impl/ParentRefTest1Impl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/impl/ParentRefTest1Impl.java index 7b842ffa3..f7cd6ba1e 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/impl/ParentRefTest1Impl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/impl/ParentRefTest1Impl.java @@ -67,6 +67,7 @@ public class ParentRefTest1Impl extends MinimalEObjectImpl.Container implements * * @generated */ + @Override public ParentRefTestChild getChild1() { return child1; @@ -94,6 +95,7 @@ public class ParentRefTest1Impl extends MinimalEObjectImpl.Container implements * * @generated */ + @Override public void setChild1(ParentRefTestChild newChild1) { if (newChild1 != child1) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/impl/ParentRefTest2Impl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/impl/ParentRefTest2Impl.java index 70b3236f5..bd8c96628 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/impl/ParentRefTest2Impl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/impl/ParentRefTest2Impl.java @@ -67,6 +67,7 @@ public class ParentRefTest2Impl extends MinimalEObjectImpl.Container implements * * @generated */ + @Override public ParentRefTestChild getChild2() { return child2; @@ -94,6 +95,7 @@ public class ParentRefTest2Impl extends MinimalEObjectImpl.Container implements * * @generated */ + @Override public void setChild2(ParentRefTestChild newChild2) { if (newChild2 != child2) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/impl/ParentRefTestChildImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/impl/ParentRefTestChildImpl.java index d373b9f5c..04cdc17b8 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/impl/ParentRefTestChildImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/impl/ParentRefTestChildImpl.java @@ -66,6 +66,7 @@ public class ParentRefTestChildImpl extends MinimalEObjectImpl.Container impleme * * @generated */ + @Override public ParentRefTestChild getChild() { return child; @@ -93,6 +94,7 @@ public class ParentRefTestChildImpl extends MinimalEObjectImpl.Container impleme * * @generated */ + @Override public void setChild(ParentRefTestChild newChild) { if (newChild != child) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/impl/QuantityExclusionTestImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/impl/QuantityExclusionTestImpl.java index 22eaada8d..452432c2d 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/impl/QuantityExclusionTestImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/impl/QuantityExclusionTestImpl.java @@ -95,6 +95,7 @@ public class QuantityExclusionTestImpl extends MinimalEObjectImpl.Container impl * * @generated */ + @Override public String getAttr1() { return attr1; @@ -105,6 +106,7 @@ public class QuantityExclusionTestImpl extends MinimalEObjectImpl.Container impl * * @generated */ + @Override public void setAttr1(String newAttr1) { String oldAttr1 = attr1; @@ -118,6 +120,7 @@ public class QuantityExclusionTestImpl extends MinimalEObjectImpl.Container impl * * @generated */ + @Override public String getAttr2() { return attr2; @@ -128,6 +131,7 @@ public class QuantityExclusionTestImpl extends MinimalEObjectImpl.Container impl * * @generated */ + @Override public void setAttr2(String newAttr2) { String oldAttr2 = attr2; @@ -222,7 +226,7 @@ public class QuantityExclusionTestImpl extends MinimalEObjectImpl.Container impl { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (attr1: "); result.append(attr1); result.append(", attr2: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/impl/ValueExclusionTestImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/impl/ValueExclusionTestImpl.java index 78cea6899..9914dc6a9 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/impl/ValueExclusionTestImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/contextFinderTest/impl/ValueExclusionTestImpl.java @@ -75,6 +75,7 @@ public class ValueExclusionTestImpl extends MinimalEObjectImpl.Container impleme * * @generated */ + @Override public ValueExclusionTestEn getVal() { return val; @@ -85,6 +86,7 @@ public class ValueExclusionTestImpl extends MinimalEObjectImpl.Container impleme * * @generated */ + @Override public void setVal(ValueExclusionTestEn newVal) { ValueExclusionTestEn oldVal = val; @@ -169,7 +171,7 @@ public class ValueExclusionTestImpl extends MinimalEObjectImpl.Container impleme { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (val: "); result.append(val); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/hiddentokensequencertest/DomainModel.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/hiddentokensequencertest/DomainModel.java index f7251050e..9b8e6a406 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/hiddentokensequencertest/DomainModel.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/hiddentokensequencertest/DomainModel.java @@ -29,10 +29,6 @@ public interface DomainModel extends EObject * Returns the value of the 'Entities' containment reference list. * The list contents are of type {@link org.eclipse.xtext.serializer.hiddentokensequencertest.Entity}. * - *

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

* * @return the value of the 'Entities' containment reference list. * @see org.eclipse.xtext.serializer.hiddentokensequencertest.HiddentokensequencertestPackage#getDomainModel_Entities() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/hiddentokensequencertest/Entity.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/hiddentokensequencertest/Entity.java index 549e7e23e..b8ed52b76 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/hiddentokensequencertest/Entity.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/hiddentokensequencertest/Entity.java @@ -27,10 +27,6 @@ public interface Entity 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) @@ -53,10 +49,6 @@ public interface Entity extends EObject /** * Returns the value of the 'Description' attribute. * - *

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

* * @return the value of the 'Description' attribute. * @see #setDescription(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/hiddentokensequencertest/Model.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/hiddentokensequencertest/Model.java index d029a335c..824a84049 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/hiddentokensequencertest/Model.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/hiddentokensequencertest/Model.java @@ -26,10 +26,6 @@ public interface Model extends EObject /** * Returns the value of the 'Domain Model' containment reference. * - *

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

* * @return the value of the 'Domain Model' containment reference. * @see #setDomainModel(DomainModel) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/hiddentokensequencertest/impl/DomainModelImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/hiddentokensequencertest/impl/DomainModelImpl.java index 97927d0c8..bb31af521 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/hiddentokensequencertest/impl/DomainModelImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/hiddentokensequencertest/impl/DomainModelImpl.java @@ -72,6 +72,7 @@ public class DomainModelImpl extends MinimalEObjectImpl.Container implements Dom * * @generated */ + @Override public EList getEntities() { if (entities == null) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/hiddentokensequencertest/impl/EntityImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/hiddentokensequencertest/impl/EntityImpl.java index 41aa9514d..f130ab30a 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/hiddentokensequencertest/impl/EntityImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/hiddentokensequencertest/impl/EntityImpl.java @@ -95,6 +95,7 @@ public class EntityImpl extends MinimalEObjectImpl.Container implements Entity * * @generated */ + @Override public String getName() { return name; @@ -105,6 +106,7 @@ public class EntityImpl extends MinimalEObjectImpl.Container implements Entity * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -118,6 +120,7 @@ public class EntityImpl extends MinimalEObjectImpl.Container implements Entity * * @generated */ + @Override public String getDescription() { return description; @@ -128,6 +131,7 @@ public class EntityImpl extends MinimalEObjectImpl.Container implements Entity * * @generated */ + @Override public void setDescription(String newDescription) { String oldDescription = description; @@ -222,7 +226,7 @@ public class EntityImpl extends MinimalEObjectImpl.Container implements Entity { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(", description: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/hiddentokensequencertest/impl/HiddentokensequencertestFactoryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/hiddentokensequencertest/impl/HiddentokensequencertestFactoryImpl.java index d8234f7f2..a3344c470 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/hiddentokensequencertest/impl/HiddentokensequencertestFactoryImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/hiddentokensequencertest/impl/HiddentokensequencertestFactoryImpl.java @@ -78,6 +78,7 @@ public class HiddentokensequencertestFactoryImpl extends EFactoryImpl implements * * @generated */ + @Override public Model createModel() { ModelImpl model = new ModelImpl(); @@ -89,6 +90,7 @@ public class HiddentokensequencertestFactoryImpl extends EFactoryImpl implements * * @generated */ + @Override public DomainModel createDomainModel() { DomainModelImpl domainModel = new DomainModelImpl(); @@ -100,6 +102,7 @@ public class HiddentokensequencertestFactoryImpl extends EFactoryImpl implements * * @generated */ + @Override public Entity createEntity() { EntityImpl entity = new EntityImpl(); @@ -111,6 +114,7 @@ public class HiddentokensequencertestFactoryImpl extends EFactoryImpl implements * * @generated */ + @Override public HiddentokensequencertestPackage getHiddentokensequencertestPackage() { return (HiddentokensequencertestPackage)getEPackage(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/hiddentokensequencertest/impl/HiddentokensequencertestPackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/hiddentokensequencertest/impl/HiddentokensequencertestPackageImpl.java index 057748bb8..d62a3f517 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/hiddentokensequencertest/impl/HiddentokensequencertestPackageImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/hiddentokensequencertest/impl/HiddentokensequencertestPackageImpl.java @@ -75,7 +75,7 @@ public class HiddentokensequencertestPackageImpl extends EPackageImpl implements /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link HiddentokensequencertestPackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -90,7 +90,8 @@ public class HiddentokensequencertestPackageImpl extends EPackageImpl implements if (isInited) return (HiddentokensequencertestPackage)EPackage.Registry.INSTANCE.getEPackage(HiddentokensequencertestPackage.eNS_URI); // Obtain or create and register package - HiddentokensequencertestPackageImpl theHiddentokensequencertestPackage = (HiddentokensequencertestPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof HiddentokensequencertestPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new HiddentokensequencertestPackageImpl()); + Object registeredHiddentokensequencertestPackage = EPackage.Registry.INSTANCE.get(eNS_URI); + HiddentokensequencertestPackageImpl theHiddentokensequencertestPackage = registeredHiddentokensequencertestPackage instanceof HiddentokensequencertestPackageImpl ? (HiddentokensequencertestPackageImpl)registeredHiddentokensequencertestPackage : new HiddentokensequencertestPackageImpl(); isInited = true; @@ -106,7 +107,6 @@ public class HiddentokensequencertestPackageImpl extends EPackageImpl implements // Mark meta-data to indicate it can't be changed theHiddentokensequencertestPackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(HiddentokensequencertestPackage.eNS_URI, theHiddentokensequencertestPackage); return theHiddentokensequencertestPackage; @@ -117,6 +117,7 @@ public class HiddentokensequencertestPackageImpl extends EPackageImpl implements * * @generated */ + @Override public EClass getModel() { return modelEClass; @@ -127,6 +128,7 @@ public class HiddentokensequencertestPackageImpl extends EPackageImpl implements * * @generated */ + @Override public EReference getModel_DomainModel() { return (EReference)modelEClass.getEStructuralFeatures().get(0); @@ -137,6 +139,7 @@ public class HiddentokensequencertestPackageImpl extends EPackageImpl implements * * @generated */ + @Override public EClass getDomainModel() { return domainModelEClass; @@ -147,6 +150,7 @@ public class HiddentokensequencertestPackageImpl extends EPackageImpl implements * * @generated */ + @Override public EReference getDomainModel_Entities() { return (EReference)domainModelEClass.getEStructuralFeatures().get(0); @@ -157,6 +161,7 @@ public class HiddentokensequencertestPackageImpl extends EPackageImpl implements * * @generated */ + @Override public EClass getEntity() { return entityEClass; @@ -167,6 +172,7 @@ public class HiddentokensequencertestPackageImpl extends EPackageImpl implements * * @generated */ + @Override public EAttribute getEntity_Name() { return (EAttribute)entityEClass.getEStructuralFeatures().get(0); @@ -177,6 +183,7 @@ public class HiddentokensequencertestPackageImpl extends EPackageImpl implements * * @generated */ + @Override public EAttribute getEntity_Description() { return (EAttribute)entityEClass.getEStructuralFeatures().get(1); @@ -187,6 +194,7 @@ public class HiddentokensequencertestPackageImpl extends EPackageImpl implements * * @generated */ + @Override public HiddentokensequencertestFactory getHiddentokensequencertestFactory() { return (HiddentokensequencertestFactory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/hiddentokensequencertest/impl/ModelImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/hiddentokensequencertest/impl/ModelImpl.java index 59b0225b7..023b3a78f 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/hiddentokensequencertest/impl/ModelImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/hiddentokensequencertest/impl/ModelImpl.java @@ -67,6 +67,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public DomainModel getDomainModel() { return domainModel; @@ -94,6 +95,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setDomainModel(DomainModel newDomainModel) { if (newDomainModel != domainModel) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/AltList1.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/AltList1.java index 6b4bc1580..95a617724 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/AltList1.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/AltList1.java @@ -29,10 +29,6 @@ public interface AltList1 extends EObject /** * Returns the value of the 'Val1' attribute. * - *

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

* * @return the value of the 'Val1' attribute. * @see #setVal1(String) @@ -55,10 +51,6 @@ public interface AltList1 extends EObject /** * Returns the value of the 'Val2' attribute. * - *

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

* * @return the value of the 'Val2' attribute. * @see #setVal2(String) @@ -81,10 +73,6 @@ public interface AltList1 extends EObject /** * Returns the value of the 'Val3' attribute. * - *

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

* * @return the value of the 'Val3' attribute. * @see #setVal3(String) @@ -107,10 +95,6 @@ public interface AltList1 extends EObject /** * Returns the value of the 'Val4' attribute. * - *

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

* * @return the value of the 'Val4' attribute. * @see #setVal4(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/AltList2.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/AltList2.java index d0a9ffb21..9cf11bb95 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/AltList2.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/AltList2.java @@ -31,10 +31,6 @@ public interface AltList2 extends EObject * Returns the value of the 'Val1' attribute list. * The list contents are of type {@link java.lang.String}. * - *

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

* * @return the value of the 'Val1' attribute list. * @see org.eclipse.xtext.serializer.sequencertest.SequencertestPackage#getAltList2_Val1() @@ -46,10 +42,6 @@ public interface AltList2 extends EObject /** * Returns the value of the 'Val2' attribute. * - *

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

* * @return the value of the 'Val2' attribute. * @see #setVal2(String) @@ -72,10 +64,6 @@ public interface AltList2 extends EObject /** * Returns the value of the 'Val3' attribute. * - *

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

* * @return the value of the 'Val3' attribute. * @see #setVal3(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/AlternativeMultiplicities.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/AlternativeMultiplicities.java index 71e9e7705..9de221a69 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/AlternativeMultiplicities.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/AlternativeMultiplicities.java @@ -33,10 +33,6 @@ public interface AlternativeMultiplicities extends EObject /** * Returns the value of the 'Val2' attribute. * - *

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

* * @return the value of the 'Val2' attribute. * @see #setVal2(String) @@ -59,10 +55,6 @@ public interface AlternativeMultiplicities extends EObject /** * Returns the value of the 'Val3' attribute. * - *

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

* * @return the value of the 'Val3' attribute. * @see #setVal3(String) @@ -86,10 +78,6 @@ public interface AlternativeMultiplicities extends EObject * Returns the value of the 'Val4' attribute list. * The list contents are of type {@link java.lang.String}. * - *

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

* * @return the value of the 'Val4' attribute list. * @see org.eclipse.xtext.serializer.sequencertest.SequencertestPackage#getAlternativeMultiplicities_Val4() @@ -102,10 +90,6 @@ public interface AlternativeMultiplicities extends EObject * Returns the value of the 'Val5' attribute list. * The list contents are of type {@link java.lang.String}. * - *

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

* * @return the value of the 'Val5' attribute list. * @see org.eclipse.xtext.serializer.sequencertest.SequencertestPackage#getAlternativeMultiplicities_Val5() @@ -118,10 +102,6 @@ public interface AlternativeMultiplicities extends EObject * Returns the value of the 'Val6' attribute list. * The list contents are of type {@link java.lang.String}. * - *

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

* * @return the value of the 'Val6' attribute list. * @see org.eclipse.xtext.serializer.sequencertest.SequencertestPackage#getAlternativeMultiplicities_Val6() @@ -134,10 +114,6 @@ public interface AlternativeMultiplicities extends EObject * Returns the value of the 'Val7' attribute list. * The list contents are of type {@link java.lang.String}. * - *

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

* * @return the value of the 'Val7' attribute list. * @see org.eclipse.xtext.serializer.sequencertest.SequencertestPackage#getAlternativeMultiplicities_Val7() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/Complex1.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/Complex1.java index a323e0e19..a78f5bd97 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/Complex1.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/Complex1.java @@ -33,10 +33,6 @@ public interface Complex1 extends EObject /** * Returns the value of the 'Val1' attribute. * - *

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

* * @return the value of the 'Val1' attribute. * @see #setVal1(String) @@ -59,10 +55,6 @@ public interface Complex1 extends EObject /** * Returns the value of the 'Val2' attribute. * - *

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

* * @return the value of the 'Val2' attribute. * @see #setVal2(String) @@ -86,10 +78,6 @@ public interface Complex1 extends EObject * Returns the value of the 'Val3' attribute list. * The list contents are of type {@link java.lang.String}. * - *

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

* * @return the value of the 'Val3' attribute list. * @see org.eclipse.xtext.serializer.sequencertest.SequencertestPackage#getComplex1_Val3() @@ -102,10 +90,6 @@ public interface Complex1 extends EObject * Returns the value of the 'Val4' attribute list. * The list contents are of type {@link java.lang.String}. * - *

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

* * @return the value of the 'Val4' attribute list. * @see org.eclipse.xtext.serializer.sequencertest.SequencertestPackage#getComplex1_Val4() @@ -118,10 +102,6 @@ public interface Complex1 extends EObject * Returns the value of the 'Val5' attribute list. * The list contents are of type {@link java.lang.String}. * - *

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

* * @return the value of the 'Val5' attribute list. * @see org.eclipse.xtext.serializer.sequencertest.SequencertestPackage#getComplex1_Val5() @@ -134,10 +114,6 @@ public interface Complex1 extends EObject * Returns the value of the 'Val6' attribute list. * The list contents are of type {@link java.lang.String}. * - *

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

* * @return the value of the 'Val6' attribute list. * @see org.eclipse.xtext.serializer.sequencertest.SequencertestPackage#getComplex1_Val6() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/DefEnum.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/DefEnum.java index 5b146cbe1..12be21314 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/DefEnum.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/DefEnum.java @@ -53,10 +53,6 @@ public enum DefEnum implements Enumerator /** * The 'Kw1' literal value. * - *

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

* * @see #KW1 * @model name="kw1" @@ -68,10 +64,6 @@ public enum DefEnum implements Enumerator /** * The 'Kw2' literal value. * - *

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

* * @see #KW2 * @model name="kw2" @@ -83,10 +75,6 @@ public enum DefEnum implements Enumerator /** * The 'Kw3' literal value. * - *

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

* * @see #KW3 * @model name="kw3" @@ -217,6 +205,7 @@ public enum DefEnum implements Enumerator * * @generated */ + @Override public int getValue() { return value; @@ -227,6 +216,7 @@ public enum DefEnum implements Enumerator * * @generated */ + @Override public String getName() { return name; @@ -237,6 +227,7 @@ public enum DefEnum implements Enumerator * * @generated */ + @Override public String getLiteral() { return literal; diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/Delegation.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/Delegation.java index db009bc18..0d55630f1 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/Delegation.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/Delegation.java @@ -27,10 +27,6 @@ public interface Delegation extends EObject /** * Returns the value of the 'P' attribute. * - *

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

* * @return the value of the 'P' attribute. * @see #setP(String) @@ -53,10 +49,6 @@ public interface Delegation extends EObject /** * Returns the value of the 'Np' attribute. * - *

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

* * @return the value of the 'Np' attribute. * @see #setNp(int) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/DelegationA.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/DelegationA.java index 1d699514f..dbc2cea95 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/DelegationA.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/DelegationA.java @@ -26,10 +26,6 @@ public interface DelegationA extends Delegation /** * Returns the value of the 'Left' containment reference. * - *

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

* * @return the value of the 'Left' containment reference. * @see #setLeft(Delegation) @@ -52,10 +48,6 @@ public interface DelegationA extends Delegation /** * Returns the value of the 'Rc2' containment reference. * - *

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

* * @return the value of the 'Rc2' containment reference. * @see #setRc2(Delegation) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/DependentAlternative1.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/DependentAlternative1.java index 642b2ca63..0b9100f1f 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/DependentAlternative1.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/DependentAlternative1.java @@ -27,10 +27,6 @@ public interface DependentAlternative1 extends EObject /** * Returns the value of the 'Val' attribute. * - *

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

* * @return the value of the 'Val' attribute. * @see #setVal(String) @@ -53,10 +49,6 @@ public interface DependentAlternative1 extends EObject /** * Returns the value of the 'Flag' attribute. * - *

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

* * @return the value of the 'Flag' attribute. * @see #setFlag(boolean) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/DependentAlternative2.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/DependentAlternative2.java index 171e9d20d..3f87b379b 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/DependentAlternative2.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/DependentAlternative2.java @@ -30,10 +30,6 @@ public interface DependentAlternative2 extends EObject * Returns the value of the 'Val' attribute list. * The list contents are of type {@link java.lang.String}. * - *

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

* * @return the value of the 'Val' attribute list. * @see org.eclipse.xtext.serializer.sequencertest.SequencertestPackage#getDependentAlternative2_Val() @@ -45,10 +41,6 @@ public interface DependentAlternative2 extends EObject /** * Returns the value of the 'Flag' attribute. * - *

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

* * @return the value of the 'Flag' attribute. * @see #setFlag(boolean) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/FragmentCallerType.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/FragmentCallerType.java index b5b540d87..47d3ecde6 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/FragmentCallerType.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/FragmentCallerType.java @@ -28,10 +28,6 @@ public interface FragmentCallerType extends EObject /** * Returns the value of the 'Val1' attribute. * - *

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

* * @return the value of the 'Val1' attribute. * @see #setVal1(String) @@ -54,10 +50,6 @@ public interface FragmentCallerType extends EObject /** * Returns the value of the 'Val' attribute. * - *

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

* * @return the value of the 'Val' attribute. * @see #setVal(String) @@ -80,10 +72,6 @@ public interface FragmentCallerType extends EObject /** * Returns the value of the 'Frag Val' attribute. * - *

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

* * @return the value of the 'Frag Val' attribute. * @see #setFragVal(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/GroupMultiplicities.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/GroupMultiplicities.java index eafaf28f2..d249b09c2 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/GroupMultiplicities.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/GroupMultiplicities.java @@ -34,10 +34,6 @@ public interface GroupMultiplicities extends EObject /** * Returns the value of the 'Val1' attribute. * - *

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

* * @return the value of the 'Val1' attribute. * @see #setVal1(String) @@ -60,10 +56,6 @@ public interface GroupMultiplicities extends EObject /** * Returns the value of the 'Val2' attribute. * - *

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

* * @return the value of the 'Val2' attribute. * @see #setVal2(String) @@ -86,10 +78,6 @@ public interface GroupMultiplicities extends EObject /** * Returns the value of the 'Val3' attribute. * - *

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

* * @return the value of the 'Val3' attribute. * @see #setVal3(String) @@ -113,10 +101,6 @@ public interface GroupMultiplicities extends EObject * Returns the value of the 'Val4' attribute list. * The list contents are of type {@link java.lang.String}. * - *

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

* * @return the value of the 'Val4' attribute list. * @see org.eclipse.xtext.serializer.sequencertest.SequencertestPackage#getGroupMultiplicities_Val4() @@ -129,10 +113,6 @@ public interface GroupMultiplicities extends EObject * Returns the value of the 'Val5' attribute list. * The list contents are of type {@link java.lang.String}. * - *

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

* * @return the value of the 'Val5' attribute list. * @see org.eclipse.xtext.serializer.sequencertest.SequencertestPackage#getGroupMultiplicities_Val5() @@ -145,10 +125,6 @@ public interface GroupMultiplicities extends EObject * Returns the value of the 'Val6' attribute list. * The list contents are of type {@link java.lang.String}. * - *

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

* * @return the value of the 'Val6' attribute list. * @see org.eclipse.xtext.serializer.sequencertest.SequencertestPackage#getGroupMultiplicities_Val6() @@ -161,10 +137,6 @@ public interface GroupMultiplicities extends EObject * Returns the value of the 'Val7' attribute list. * The list contents are of type {@link java.lang.String}. * - *

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

* * @return the value of the 'Val7' attribute list. * @see org.eclipse.xtext.serializer.sequencertest.SequencertestPackage#getGroupMultiplicities_Val7() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/List1.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/List1.java index 6330f2eaf..889807c55 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/List1.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/List1.java @@ -29,10 +29,6 @@ public interface List1 extends EObject * Returns the value of the 'Val1' attribute list. * The list contents are of type {@link java.lang.String}. * - *

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

* * @return the value of the 'Val1' attribute list. * @see org.eclipse.xtext.serializer.sequencertest.SequencertestPackage#getList1_Val1() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/List2.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/List2.java index 2ffbcc6d2..b47754ca2 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/List2.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/List2.java @@ -29,10 +29,6 @@ public interface List2 extends EObject * Returns the value of the 'Val1' attribute list. * The list contents are of type {@link java.lang.String}. * - *

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

* * @return the value of the 'Val1' attribute list. * @see org.eclipse.xtext.serializer.sequencertest.SequencertestPackage#getList2_Val1() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/Model.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/Model.java index 7a52620e2..491a1eefd 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/Model.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/Model.java @@ -57,10 +57,6 @@ public interface Model extends EObject /** * Returns the value of the 'X1' containment reference. * - *

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

* * @return the value of the 'X1' containment reference. * @see #setX1(SimpleGroup) @@ -83,10 +79,6 @@ public interface Model extends EObject /** * Returns the value of the 'X2' containment reference. * - *

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

* * @return the value of the 'X2' containment reference. * @see #setX2(SimpleAlternative) @@ -109,10 +101,6 @@ public interface Model extends EObject /** * Returns the value of the 'X3' containment reference. * - *

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

* * @return the value of the 'X3' containment reference. * @see #setX3(SimpleMultiplicities) @@ -135,10 +123,6 @@ public interface Model extends EObject /** * Returns the value of the 'X4' containment reference. * - *

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

* * @return the value of the 'X4' containment reference. * @see #setX4(GroupMultiplicities) @@ -161,10 +145,6 @@ public interface Model extends EObject /** * Returns the value of the 'X5' containment reference. * - *

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

* * @return the value of the 'X5' containment reference. * @see #setX5(AlternativeMultiplicities) @@ -187,10 +167,6 @@ public interface Model extends EObject /** * Returns the value of the 'X6' containment reference. * - *

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

* * @return the value of the 'X6' containment reference. * @see #setX6(List1) @@ -213,10 +189,6 @@ public interface Model extends EObject /** * Returns the value of the 'X7' containment reference. * - *

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

* * @return the value of the 'X7' containment reference. * @see #setX7(List2) @@ -239,10 +211,6 @@ public interface Model extends EObject /** * Returns the value of the 'X8' containment reference. * - *

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

* * @return the value of the 'X8' containment reference. * @see #setX8(AltList1) @@ -265,10 +233,6 @@ public interface Model extends EObject /** * Returns the value of the 'X9' containment reference. * - *

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

* * @return the value of the 'X9' containment reference. * @see #setX9(AltList2) @@ -291,10 +255,6 @@ public interface Model extends EObject /** * Returns the value of the 'X10' containment reference. * - *

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

* * @return the value of the 'X10' containment reference. * @see #setX10(EObject) @@ -317,10 +277,6 @@ public interface Model extends EObject /** * Returns the value of the 'X11' containment reference. * - *

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

* * @return the value of the 'X11' containment reference. * @see #setX11(EObject) @@ -343,10 +299,6 @@ public interface Model extends EObject /** * Returns the value of the 'X12' containment reference. * - *

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

* * @return the value of the 'X12' containment reference. * @see #setX12(EObject) @@ -369,10 +321,6 @@ public interface Model extends EObject /** * Returns the value of the 'X13' containment reference. * - *

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

* * @return the value of the 'X13' containment reference. * @see #setX13(SingleEnum) @@ -395,10 +343,6 @@ public interface Model extends EObject /** * Returns the value of the 'X14' containment reference. * - *

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

* * @return the value of the 'X14' containment reference. * @see #setX14(SingleCrossReference) @@ -421,10 +365,6 @@ public interface Model extends EObject /** * Returns the value of the 'X15' containment reference. * - *

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

* * @return the value of the 'X15' containment reference. * @see #setX15(SingleContainmentReference) @@ -447,10 +387,6 @@ public interface Model extends EObject /** * Returns the value of the 'X19' containment reference. * - *

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

* * @return the value of the 'X19' containment reference. * @see #setX19(DependentAlternative1) @@ -473,10 +409,6 @@ public interface Model extends EObject /** * Returns the value of the 'X20' containment reference. * - *

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

* * @return the value of the 'X20' containment reference. * @see #setX20(DependentAlternative2) @@ -499,10 +431,6 @@ public interface Model extends EObject /** * Returns the value of the 'X21' containment reference. * - *

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

* * @return the value of the 'X21' containment reference. * @see #setX21(Optional) @@ -525,10 +453,6 @@ public interface Model extends EObject /** * Returns the value of the 'X22' containment reference. * - *

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

* * @return the value of the 'X22' containment reference. * @see #setX22(org.eclipse.xtext.serializer.sequencertest.Float) @@ -551,10 +475,6 @@ public interface Model extends EObject /** * Returns the value of the 'X23' containment reference. * - *

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

* * @return the value of the 'X23' containment reference. * @see #setX23(UnorderedAlternative) @@ -577,10 +497,6 @@ public interface Model extends EObject /** * Returns the value of the 'X24' containment reference. * - *

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

* * @return the value of the 'X24' containment reference. * @see #setX24(UnorderedGroup) @@ -603,10 +519,6 @@ public interface Model extends EObject /** * Returns the value of the 'X25' containment reference. * - *

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

* * @return the value of the 'X25' containment reference. * @see #setX25(UnorderedGroupOptional) @@ -629,10 +541,6 @@ public interface Model extends EObject /** * Returns the value of the 'X26' containment reference. * - *

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

* * @return the value of the 'X26' containment reference. * @see #setX26(UnorderedGroupBoolean) @@ -655,10 +563,6 @@ public interface Model extends EObject /** * Returns the value of the 'X27' containment reference. * - *

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

* * @return the value of the 'X27' containment reference. * @see #setX27(Complex1) @@ -681,10 +585,6 @@ public interface Model extends EObject /** * Returns the value of the 'X28' containment reference. * - *

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

* * @return the value of the 'X28' containment reference. * @see #setX28(OptionalDouble) @@ -707,10 +607,6 @@ public interface Model extends EObject /** * Returns the value of the 'X29' containment reference. * - *

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

* * @return the value of the 'X29' containment reference. * @see #setX29(NullValue) @@ -733,10 +629,6 @@ public interface Model extends EObject /** * Returns the value of the 'X30' containment reference. * - *

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

* * @return the value of the 'X30' containment reference. * @see #setX30(NullValue) @@ -759,10 +651,6 @@ public interface Model extends EObject /** * Returns the value of the 'X31' containment reference. * - *

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

* * @return the value of the 'X31' containment reference. * @see #setX31(NullCrossRef) @@ -785,10 +673,6 @@ public interface Model extends EObject /** * Returns the value of the 'X32' containment reference. * - *

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

* * @return the value of the 'X32' containment reference. * @see #setX32(NullCrossRef) @@ -811,10 +695,6 @@ public interface Model extends EObject /** * Returns the value of the 'X33' containment reference. * - *

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

* * @return the value of the 'X33' containment reference. * @see #setX33(FragmentCallerType) @@ -837,10 +717,6 @@ public interface Model extends EObject /** * Returns the value of the 'X34' containment reference. * - *

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

* * @return the value of the 'X34' containment reference. * @see #setX34(ParameterCaller) @@ -863,10 +739,6 @@ public interface Model extends EObject /** * Returns the value of the 'X35' containment reference. * - *

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

* * @return the value of the 'X35' containment reference. * @see #setX35(ParameterDelegation) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/MultiKeywords.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/MultiKeywords.java index e1043da72..a5722304c 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/MultiKeywords.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/MultiKeywords.java @@ -29,10 +29,6 @@ public interface MultiKeywords extends EObject * Returns the value of the 'Val' attribute list. * The list contents are of type {@link java.lang.String}. * - *

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

* * @return the value of the 'Val' attribute list. * @see org.eclipse.xtext.serializer.sequencertest.SequencertestPackage#getMultiKeywords_Val() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/MultiKeywordsOrID.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/MultiKeywordsOrID.java index 51ea48671..fd2ea392b 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/MultiKeywordsOrID.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/MultiKeywordsOrID.java @@ -29,10 +29,6 @@ public interface MultiKeywordsOrID extends EObject * Returns the value of the 'Val' attribute list. * The list contents are of type {@link java.lang.String}. * - *

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

* * @return the value of the 'Val' attribute list. * @see org.eclipse.xtext.serializer.sequencertest.SequencertestPackage#getMultiKeywordsOrID_Val() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/MultiTerminals.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/MultiTerminals.java index 10d9e9f1f..1d37664bd 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/MultiTerminals.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/MultiTerminals.java @@ -29,10 +29,6 @@ public interface MultiTerminals extends EObject * Returns the value of the 'Val' attribute list. * The list contents are of type {@link java.lang.String}. * - *

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

* * @return the value of the 'Val' attribute list. * @see org.eclipse.xtext.serializer.sequencertest.SequencertestPackage#getMultiTerminals_Val() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/NullCrossRef.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/NullCrossRef.java index 295a50c62..dd66bed3c 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/NullCrossRef.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/NullCrossRef.java @@ -27,10 +27,6 @@ public interface NullCrossRef extends EObject /** * Returns the value of the 'Ref' reference. * - *

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

* * @return the value of the 'Ref' reference. * @see #setRef(EObject) @@ -53,10 +49,6 @@ public interface NullCrossRef extends EObject /** * Returns the value of the 'Foo' attribute. * - *

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

* * @return the value of the 'Foo' attribute. * @see #setFoo(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/NullValue.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/NullValue.java index 6f6fa4ab1..f8a922734 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/NullValue.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/NullValue.java @@ -27,10 +27,6 @@ public interface NullValue extends EObject /** * Returns the value of the 'Value' attribute. * - *

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

* * @return the value of the 'Value' attribute. * @see #setValue(String) @@ -53,10 +49,6 @@ public interface NullValue extends EObject /** * Returns the value of the 'Foo' attribute. * - *

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

* * @return the value of the 'Foo' attribute. * @see #setFoo(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/Optional.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/Optional.java index e718ce3bf..7be02de90 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/Optional.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/Optional.java @@ -28,10 +28,6 @@ public interface Optional extends EObject /** * Returns the value of the 'Int0' attribute. * - *

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

* * @return the value of the 'Int0' attribute. * @see #setInt0(int) @@ -54,10 +50,6 @@ public interface Optional extends EObject /** * Returns the value of the 'Int1' attribute. * - *

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

* * @return the value of the 'Int1' attribute. * @see #setInt1(int) @@ -80,10 +72,6 @@ public interface Optional extends EObject /** * Returns the value of the 'Int2' attribute. * - *

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

* * @return the value of the 'Int2' attribute. * @see #setInt2(int) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/OptionalDouble.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/OptionalDouble.java index 615b0c369..df8c342c8 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/OptionalDouble.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/OptionalDouble.java @@ -28,10 +28,6 @@ public interface OptionalDouble extends EObject /** * Returns the value of the 'Double0' attribute. * - *

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

* * @return the value of the 'Double0' attribute. * @see #setDouble0(double) @@ -54,10 +50,6 @@ public interface OptionalDouble extends EObject /** * Returns the value of the 'Double1' attribute. * - *

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

* * @return the value of the 'Double1' attribute. * @see #setDouble1(double) @@ -80,10 +72,6 @@ public interface OptionalDouble extends EObject /** * Returns the value of the 'Double2' attribute. * - *

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

* * @return the value of the 'Double2' attribute. * @see #setDouble2(double) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/ParameterCaller.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/ParameterCaller.java index 6bf6ef05b..9f5f509a0 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/ParameterCaller.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/ParameterCaller.java @@ -26,10 +26,6 @@ public interface ParameterCaller extends EObject /** * Returns the value of the 'P' containment reference. * - *

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

* * @return the value of the 'P' containment reference. * @see #setP(Parameterized) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/ParameterDelegation.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/ParameterDelegation.java index 36babbd15..d47fe6201 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/ParameterDelegation.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/ParameterDelegation.java @@ -26,10 +26,6 @@ public interface ParameterDelegation extends EObject /** * Returns the value of the 'P' containment reference. * - *

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

* * @return the value of the 'P' containment reference. * @see #setP(Delegation) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/Parameterized.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/Parameterized.java index 998b4dd73..88ad8e510 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/Parameterized.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/Parameterized.java @@ -28,10 +28,6 @@ public interface Parameterized extends EObject /** * Returns the value of the 'V1' attribute. * - *

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

* * @return the value of the 'V1' attribute. * @see #setV1(String) @@ -54,10 +50,6 @@ public interface Parameterized extends EObject /** * Returns the value of the 'V2' attribute. * - *

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

* * @return the value of the 'V2' attribute. * @see #setV2(String) @@ -80,10 +72,6 @@ public interface Parameterized extends EObject /** * Returns the value of the 'V3' attribute. * - *

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

* * @return the value of the 'V3' attribute. * @see #setV3(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/SimpleAlternative.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/SimpleAlternative.java index 7f2be2759..b8cb72fd7 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/SimpleAlternative.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/SimpleAlternative.java @@ -27,10 +27,6 @@ public interface SimpleAlternative extends EObject /** * Returns the value of the 'Val1' attribute. * - *

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

* * @return the value of the 'Val1' attribute. * @see #setVal1(String) @@ -53,10 +49,6 @@ public interface SimpleAlternative extends EObject /** * Returns the value of the 'Val2' attribute. * - *

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

* * @return the value of the 'Val2' attribute. * @see #setVal2(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/SimpleGroup.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/SimpleGroup.java index 2a1438250..bc597133d 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/SimpleGroup.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/SimpleGroup.java @@ -27,10 +27,6 @@ public interface SimpleGroup extends EObject /** * Returns the value of the 'Val1' attribute. * - *

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

* * @return the value of the 'Val1' attribute. * @see #setVal1(String) @@ -53,10 +49,6 @@ public interface SimpleGroup extends EObject /** * Returns the value of the 'Val2' attribute. * - *

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

* * @return the value of the 'Val2' attribute. * @see #setVal2(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/SimpleMultiplicities.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/SimpleMultiplicities.java index db4cd4f4c..89ea542a6 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/SimpleMultiplicities.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/SimpleMultiplicities.java @@ -31,10 +31,6 @@ public interface SimpleMultiplicities extends EObject /** * Returns the value of the 'Val1' attribute. * - *

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

* * @return the value of the 'Val1' attribute. * @see #setVal1(String) @@ -57,10 +53,6 @@ public interface SimpleMultiplicities extends EObject /** * Returns the value of the 'Val2' attribute. * - *

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

* * @return the value of the 'Val2' attribute. * @see #setVal2(String) @@ -84,10 +76,6 @@ public interface SimpleMultiplicities extends EObject * Returns the value of the 'Val3' attribute list. * The list contents are of type {@link java.lang.String}. * - *

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

* * @return the value of the 'Val3' attribute list. * @see org.eclipse.xtext.serializer.sequencertest.SequencertestPackage#getSimpleMultiplicities_Val3() @@ -100,10 +88,6 @@ public interface SimpleMultiplicities extends EObject * Returns the value of the 'Val4' attribute list. * The list contents are of type {@link java.lang.String}. * - *

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

* * @return the value of the 'Val4' attribute list. * @see org.eclipse.xtext.serializer.sequencertest.SequencertestPackage#getSimpleMultiplicities_Val4() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/SingleContainmentReference.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/SingleContainmentReference.java index 088e45363..ac8aaf213 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/SingleContainmentReference.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/SingleContainmentReference.java @@ -26,10 +26,6 @@ public interface SingleContainmentReference extends EObject /** * Returns the value of the 'Child' containment reference. * - *

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

* * @return the value of the 'Child' containment reference. * @see #setChild(EObject) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/SingleContainmentReferenceChild1.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/SingleContainmentReferenceChild1.java index 7669fc45d..de59191a8 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/SingleContainmentReferenceChild1.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/SingleContainmentReferenceChild1.java @@ -26,10 +26,6 @@ public interface SingleContainmentReferenceChild1 extends EObject /** * Returns the value of the 'Val' attribute. * - *

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

* * @return the value of the 'Val' attribute. * @see #setVal(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/SingleContainmentReferenceChild2.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/SingleContainmentReferenceChild2.java index 73b65e851..8612ceae0 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/SingleContainmentReferenceChild2.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/SingleContainmentReferenceChild2.java @@ -26,10 +26,6 @@ public interface SingleContainmentReferenceChild2 extends EObject /** * Returns the value of the 'Val' attribute. * - *

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

* * @return the value of the 'Val' attribute. * @see #setVal(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/SingleContainmentReferenceChild3.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/SingleContainmentReferenceChild3.java index 1bb3dd0d4..5494a6a56 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/SingleContainmentReferenceChild3.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/SingleContainmentReferenceChild3.java @@ -26,10 +26,6 @@ public interface SingleContainmentReferenceChild3 extends EObject /** * Returns the value of the 'Val' attribute. * - *

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

* * @return the value of the 'Val' attribute. * @see #setVal(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/SingleCrossReference.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/SingleCrossReference.java index 9dd14901d..6db7f38d8 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/SingleCrossReference.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/SingleCrossReference.java @@ -27,10 +27,6 @@ public interface SingleCrossReference 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) @@ -53,10 +49,6 @@ public interface SingleCrossReference extends EObject /** * Returns the value of the 'Ref' reference. * - *

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

* * @return the value of the 'Ref' reference. * @see #setRef(SingleCrossReference) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/SingleEnum.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/SingleEnum.java index f421e4bf0..d975883c9 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/SingleEnum.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/SingleEnum.java @@ -27,10 +27,6 @@ public interface SingleEnum extends EObject * Returns the value of the 'Val' attribute. * The literals are from the enumeration {@link org.eclipse.xtext.serializer.sequencertest.DefEnum}. * - *

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

* * @return the value of the 'Val' attribute. * @see org.eclipse.xtext.serializer.sequencertest.DefEnum diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/SingleKeywords.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/SingleKeywords.java index 5f2f4a314..51bb9bc9b 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/SingleKeywords.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/SingleKeywords.java @@ -26,10 +26,6 @@ public interface SingleKeywords extends EObject /** * Returns the value of the 'Val' attribute. * - *

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

* * @return the value of the 'Val' attribute. * @see #setVal(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/SingleKeywordsOrID.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/SingleKeywordsOrID.java index dbeeaed40..32e28add7 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/SingleKeywordsOrID.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/SingleKeywordsOrID.java @@ -26,10 +26,6 @@ public interface SingleKeywordsOrID extends EObject /** * Returns the value of the 'Val' attribute. * - *

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

* * @return the value of the 'Val' attribute. * @see #setVal(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/SingleTerminals.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/SingleTerminals.java index 88ab26d50..37ac9f950 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/SingleTerminals.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/SingleTerminals.java @@ -26,10 +26,6 @@ public interface SingleTerminals extends EObject /** * Returns the value of the 'Val' attribute. * - *

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

* * @return the value of the 'Val' attribute. * @see #setVal(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/UnorderedAlternative.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/UnorderedAlternative.java index e077182d2..a13294658 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/UnorderedAlternative.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/UnorderedAlternative.java @@ -32,10 +32,6 @@ public interface UnorderedAlternative extends EObject * Returns the value of the 'Val1' attribute list. * The list contents are of type {@link java.lang.String}. * - *

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

* * @return the value of the 'Val1' attribute list. * @see org.eclipse.xtext.serializer.sequencertest.SequencertestPackage#getUnorderedAlternative_Val1() @@ -48,10 +44,6 @@ public interface UnorderedAlternative extends EObject * Returns the value of the 'Val2' attribute list. * The list contents are of type {@link java.lang.Integer}. * - *

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

* * @return the value of the 'Val2' attribute list. * @see org.eclipse.xtext.serializer.sequencertest.SequencertestPackage#getUnorderedAlternative_Val2() @@ -64,10 +56,6 @@ public interface UnorderedAlternative extends EObject * Returns the value of the 'Val3' containment reference list. * The list contents are of type {@link org.eclipse.xtext.serializer.sequencertest.UnorderedAlternativeVal}. * - *

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

* * @return the value of the 'Val3' containment reference list. * @see org.eclipse.xtext.serializer.sequencertest.SequencertestPackage#getUnorderedAlternative_Val3() @@ -80,10 +68,6 @@ public interface UnorderedAlternative extends EObject * Returns the value of the 'Val4' containment reference list. * The list contents are of type {@link org.eclipse.xtext.serializer.sequencertest.UnorderedAlternativeValDelegate}. * - *

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

* * @return the value of the 'Val4' containment reference list. * @see org.eclipse.xtext.serializer.sequencertest.SequencertestPackage#getUnorderedAlternative_Val4() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/UnorderedAlternativeVal.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/UnorderedAlternativeVal.java index 60f2a2829..5548e28b9 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/UnorderedAlternativeVal.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/UnorderedAlternativeVal.java @@ -26,10 +26,6 @@ public interface UnorderedAlternativeVal extends EObject /** * Returns the value of the 'Val' attribute. * - *

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

* * @return the value of the 'Val' attribute. * @see #setVal(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/UnorderedAlternativeVal2.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/UnorderedAlternativeVal2.java index d2483f645..978cebfe3 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/UnorderedAlternativeVal2.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/UnorderedAlternativeVal2.java @@ -25,10 +25,6 @@ public interface UnorderedAlternativeVal2 extends UnorderedAlternativeValDelegat /** * Returns the value of the 'Val' attribute. * - *

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

* * @return the value of the 'Val' attribute. * @see #setVal(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/UnorderedGroup.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/UnorderedGroup.java index ac2b60618..9179e0630 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/UnorderedGroup.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/UnorderedGroup.java @@ -29,10 +29,6 @@ public interface UnorderedGroup extends EObject /** * Returns the value of the 'Val1' attribute. * - *

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

* * @return the value of the 'Val1' attribute. * @see #setVal1(String) @@ -55,10 +51,6 @@ public interface UnorderedGroup extends EObject /** * Returns the value of the 'Val2' attribute. * - *

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

* * @return the value of the 'Val2' attribute. * @see #setVal2(int) @@ -81,10 +73,6 @@ public interface UnorderedGroup extends EObject /** * Returns the value of the 'Val3' containment reference. * - *

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

* * @return the value of the 'Val3' containment reference. * @see #setVal3(UnorderedGroupVal) @@ -107,10 +95,6 @@ public interface UnorderedGroup extends EObject /** * Returns the value of the 'Val4' containment reference. * - *

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

* * @return the value of the 'Val4' containment reference. * @see #setVal4(UnorderedGroupValDelegate) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/UnorderedGroupBoolean.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/UnorderedGroupBoolean.java index c45c57b79..24a26db10 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/UnorderedGroupBoolean.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/UnorderedGroupBoolean.java @@ -28,10 +28,6 @@ public interface UnorderedGroupBoolean extends EObject /** * Returns the value of the 'Val1' attribute. * - *

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

* * @return the value of the 'Val1' attribute. * @see #setVal1(boolean) @@ -54,10 +50,6 @@ public interface UnorderedGroupBoolean extends EObject /** * Returns the value of the 'Val2' attribute. * - *

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

* * @return the value of the 'Val2' attribute. * @see #setVal2(boolean) @@ -80,10 +72,6 @@ public interface UnorderedGroupBoolean extends EObject /** * Returns the value of the 'Val3' attribute. * - *

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

* * @return the value of the 'Val3' attribute. * @see #setVal3(boolean) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/UnorderedGroupOptional.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/UnorderedGroupOptional.java index d6fd71bea..fd390a1ce 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/UnorderedGroupOptional.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/UnorderedGroupOptional.java @@ -28,10 +28,6 @@ public interface UnorderedGroupOptional extends EObject /** * Returns the value of the 'Val1' attribute. * - *

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

* * @return the value of the 'Val1' attribute. * @see #setVal1(String) @@ -54,10 +50,6 @@ public interface UnorderedGroupOptional extends EObject /** * Returns the value of the 'Va2' attribute. * - *

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

* * @return the value of the 'Va2' attribute. * @see #setVa2(String) @@ -80,10 +72,6 @@ public interface UnorderedGroupOptional extends EObject /** * Returns the value of the 'Val3' attribute. * - *

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

* * @return the value of the 'Val3' attribute. * @see #setVal3(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/UnorderedGroupVal.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/UnorderedGroupVal.java index 221800092..820c19fc1 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/UnorderedGroupVal.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/UnorderedGroupVal.java @@ -26,10 +26,6 @@ public interface UnorderedGroupVal extends EObject /** * Returns the value of the 'Val' attribute. * - *

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

* * @return the value of the 'Val' attribute. * @see #setVal(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/UnorderedGroupVal2.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/UnorderedGroupVal2.java index aa9b4bd2e..dd133918e 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/UnorderedGroupVal2.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/UnorderedGroupVal2.java @@ -25,10 +25,6 @@ public interface UnorderedGroupVal2 extends UnorderedGroupValDelegate /** * Returns the value of the 'Val' attribute. * - *

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

* * @return the value of the 'Val' attribute. * @see #setVal(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/AltList1Impl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/AltList1Impl.java index bb6e249a6..1f9908340 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/AltList1Impl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/AltList1Impl.java @@ -137,6 +137,7 @@ public class AltList1Impl extends MinimalEObjectImpl.Container implements AltLis * * @generated */ + @Override public String getVal1() { return val1; @@ -147,6 +148,7 @@ public class AltList1Impl extends MinimalEObjectImpl.Container implements AltLis * * @generated */ + @Override public void setVal1(String newVal1) { String oldVal1 = val1; @@ -160,6 +162,7 @@ public class AltList1Impl extends MinimalEObjectImpl.Container implements AltLis * * @generated */ + @Override public String getVal2() { return val2; @@ -170,6 +173,7 @@ public class AltList1Impl extends MinimalEObjectImpl.Container implements AltLis * * @generated */ + @Override public void setVal2(String newVal2) { String oldVal2 = val2; @@ -183,6 +187,7 @@ public class AltList1Impl extends MinimalEObjectImpl.Container implements AltLis * * @generated */ + @Override public String getVal3() { return val3; @@ -193,6 +198,7 @@ public class AltList1Impl extends MinimalEObjectImpl.Container implements AltLis * * @generated */ + @Override public void setVal3(String newVal3) { String oldVal3 = val3; @@ -206,6 +212,7 @@ public class AltList1Impl extends MinimalEObjectImpl.Container implements AltLis * * @generated */ + @Override public String getVal4() { return val4; @@ -216,6 +223,7 @@ public class AltList1Impl extends MinimalEObjectImpl.Container implements AltLis * * @generated */ + @Override public void setVal4(String newVal4) { String oldVal4 = val4; @@ -330,7 +338,7 @@ public class AltList1Impl extends MinimalEObjectImpl.Container implements AltLis { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (val1: "); result.append(val1); result.append(", val2: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/AltList2Impl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/AltList2Impl.java index d7fbe425b..14e28fd0a 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/AltList2Impl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/AltList2Impl.java @@ -112,6 +112,7 @@ public class AltList2Impl extends MinimalEObjectImpl.Container implements AltLis * * @generated */ + @Override public EList getVal1() { if (val1 == null) @@ -126,6 +127,7 @@ public class AltList2Impl extends MinimalEObjectImpl.Container implements AltLis * * @generated */ + @Override public String getVal2() { return val2; @@ -136,6 +138,7 @@ public class AltList2Impl extends MinimalEObjectImpl.Container implements AltLis * * @generated */ + @Override public void setVal2(String newVal2) { String oldVal2 = val2; @@ -149,6 +152,7 @@ public class AltList2Impl extends MinimalEObjectImpl.Container implements AltLis * * @generated */ + @Override public String getVal3() { return val3; @@ -159,6 +163,7 @@ public class AltList2Impl extends MinimalEObjectImpl.Container implements AltLis * * @generated */ + @Override public void setVal3(String newVal3) { String oldVal3 = val3; @@ -265,7 +270,7 @@ public class AltList2Impl extends MinimalEObjectImpl.Container implements AltLis { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (val1: "); result.append(val1); result.append(", val2: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/AlternativeMultiplicitiesImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/AlternativeMultiplicitiesImpl.java index d961a2277..1a667d7ee 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/AlternativeMultiplicitiesImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/AlternativeMultiplicitiesImpl.java @@ -145,6 +145,7 @@ public class AlternativeMultiplicitiesImpl extends MinimalEObjectImpl.Container * * @generated */ + @Override public String getVal2() { return val2; @@ -155,6 +156,7 @@ public class AlternativeMultiplicitiesImpl extends MinimalEObjectImpl.Container * * @generated */ + @Override public void setVal2(String newVal2) { String oldVal2 = val2; @@ -168,6 +170,7 @@ public class AlternativeMultiplicitiesImpl extends MinimalEObjectImpl.Container * * @generated */ + @Override public String getVal3() { return val3; @@ -178,6 +181,7 @@ public class AlternativeMultiplicitiesImpl extends MinimalEObjectImpl.Container * * @generated */ + @Override public void setVal3(String newVal3) { String oldVal3 = val3; @@ -191,6 +195,7 @@ public class AlternativeMultiplicitiesImpl extends MinimalEObjectImpl.Container * * @generated */ + @Override public EList getVal4() { if (val4 == null) @@ -205,6 +210,7 @@ public class AlternativeMultiplicitiesImpl extends MinimalEObjectImpl.Container * * @generated */ + @Override public EList getVal5() { if (val5 == null) @@ -219,6 +225,7 @@ public class AlternativeMultiplicitiesImpl extends MinimalEObjectImpl.Container * * @generated */ + @Override public EList getVal6() { if (val6 == null) @@ -233,6 +240,7 @@ public class AlternativeMultiplicitiesImpl extends MinimalEObjectImpl.Container * * @generated */ + @Override public EList getVal7() { if (val7 == null) @@ -373,7 +381,7 @@ public class AlternativeMultiplicitiesImpl extends MinimalEObjectImpl.Container { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (val2: "); result.append(val2); result.append(", val3: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/Complex1Impl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/Complex1Impl.java index cfcaa19d6..aeb8eac56 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/Complex1Impl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/Complex1Impl.java @@ -145,6 +145,7 @@ public class Complex1Impl extends MinimalEObjectImpl.Container implements Comple * * @generated */ + @Override public String getVal1() { return val1; @@ -155,6 +156,7 @@ public class Complex1Impl extends MinimalEObjectImpl.Container implements Comple * * @generated */ + @Override public void setVal1(String newVal1) { String oldVal1 = val1; @@ -168,6 +170,7 @@ public class Complex1Impl extends MinimalEObjectImpl.Container implements Comple * * @generated */ + @Override public String getVal2() { return val2; @@ -178,6 +181,7 @@ public class Complex1Impl extends MinimalEObjectImpl.Container implements Comple * * @generated */ + @Override public void setVal2(String newVal2) { String oldVal2 = val2; @@ -191,6 +195,7 @@ public class Complex1Impl extends MinimalEObjectImpl.Container implements Comple * * @generated */ + @Override public EList getVal3() { if (val3 == null) @@ -205,6 +210,7 @@ public class Complex1Impl extends MinimalEObjectImpl.Container implements Comple * * @generated */ + @Override public EList getVal4() { if (val4 == null) @@ -219,6 +225,7 @@ public class Complex1Impl extends MinimalEObjectImpl.Container implements Comple * * @generated */ + @Override public EList getVal5() { if (val5 == null) @@ -233,6 +240,7 @@ public class Complex1Impl extends MinimalEObjectImpl.Container implements Comple * * @generated */ + @Override public EList getVal6() { if (val6 == null) @@ -373,7 +381,7 @@ public class Complex1Impl extends MinimalEObjectImpl.Container implements Comple { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (val1: "); result.append(val1); result.append(", val2: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/DelegationAImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/DelegationAImpl.java index 9663ae578..4291993fa 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/DelegationAImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/DelegationAImpl.java @@ -77,6 +77,7 @@ public class DelegationAImpl extends DelegationImpl implements DelegationA * * @generated */ + @Override public Delegation getLeft() { return left; @@ -104,6 +105,7 @@ public class DelegationAImpl extends DelegationImpl implements DelegationA * * @generated */ + @Override public void setLeft(Delegation newLeft) { if (newLeft != left) @@ -125,6 +127,7 @@ public class DelegationAImpl extends DelegationImpl implements DelegationA * * @generated */ + @Override public Delegation getRc2() { return rc2; @@ -152,6 +155,7 @@ public class DelegationAImpl extends DelegationImpl implements DelegationA * * @generated */ + @Override public void setRc2(Delegation newRc2) { if (newRc2 != rc2) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/DelegationImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/DelegationImpl.java index 61bf6a34b..a5af5fd32 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/DelegationImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/DelegationImpl.java @@ -95,6 +95,7 @@ public class DelegationImpl extends MinimalEObjectImpl.Container implements Dele * * @generated */ + @Override public String getP() { return p; @@ -105,6 +106,7 @@ public class DelegationImpl extends MinimalEObjectImpl.Container implements Dele * * @generated */ + @Override public void setP(String newP) { String oldP = p; @@ -118,6 +120,7 @@ public class DelegationImpl extends MinimalEObjectImpl.Container implements Dele * * @generated */ + @Override public int getNp() { return np; @@ -128,6 +131,7 @@ public class DelegationImpl extends MinimalEObjectImpl.Container implements Dele * * @generated */ + @Override public void setNp(int newNp) { int oldNp = np; @@ -222,7 +226,7 @@ public class DelegationImpl extends MinimalEObjectImpl.Container implements Dele { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (p: "); result.append(p); result.append(", np: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/DependentAlternative1Impl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/DependentAlternative1Impl.java index d568eb602..dd6495c30 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/DependentAlternative1Impl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/DependentAlternative1Impl.java @@ -95,6 +95,7 @@ public class DependentAlternative1Impl extends MinimalEObjectImpl.Container impl * * @generated */ + @Override public String getVal() { return val; @@ -105,6 +106,7 @@ public class DependentAlternative1Impl extends MinimalEObjectImpl.Container impl * * @generated */ + @Override public void setVal(String newVal) { String oldVal = val; @@ -118,6 +120,7 @@ public class DependentAlternative1Impl extends MinimalEObjectImpl.Container impl * * @generated */ + @Override public boolean isFlag() { return flag; @@ -128,6 +131,7 @@ public class DependentAlternative1Impl extends MinimalEObjectImpl.Container impl * * @generated */ + @Override public void setFlag(boolean newFlag) { boolean oldFlag = flag; @@ -222,7 +226,7 @@ public class DependentAlternative1Impl extends MinimalEObjectImpl.Container impl { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (val: "); result.append(val); result.append(", flag: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/DependentAlternative2Impl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/DependentAlternative2Impl.java index 5b6f6f5e3..056f7122a 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/DependentAlternative2Impl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/DependentAlternative2Impl.java @@ -91,6 +91,7 @@ public class DependentAlternative2Impl extends MinimalEObjectImpl.Container impl * * @generated */ + @Override public EList getVal() { if (val == null) @@ -105,6 +106,7 @@ public class DependentAlternative2Impl extends MinimalEObjectImpl.Container impl * * @generated */ + @Override public boolean isFlag() { return flag; @@ -115,6 +117,7 @@ public class DependentAlternative2Impl extends MinimalEObjectImpl.Container impl * * @generated */ + @Override public void setFlag(boolean newFlag) { boolean oldFlag = flag; @@ -211,7 +214,7 @@ public class DependentAlternative2Impl extends MinimalEObjectImpl.Container impl { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (val: "); result.append(val); result.append(", flag: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/FragmentCallerTypeImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/FragmentCallerTypeImpl.java index f83c0281f..66097daca 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/FragmentCallerTypeImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/FragmentCallerTypeImpl.java @@ -116,6 +116,7 @@ public class FragmentCallerTypeImpl extends MinimalEObjectImpl.Container impleme * * @generated */ + @Override public String getVal1() { return val1; @@ -126,6 +127,7 @@ public class FragmentCallerTypeImpl extends MinimalEObjectImpl.Container impleme * * @generated */ + @Override public void setVal1(String newVal1) { String oldVal1 = val1; @@ -139,6 +141,7 @@ public class FragmentCallerTypeImpl extends MinimalEObjectImpl.Container impleme * * @generated */ + @Override public String getVal() { return val; @@ -149,6 +152,7 @@ public class FragmentCallerTypeImpl extends MinimalEObjectImpl.Container impleme * * @generated */ + @Override public void setVal(String newVal) { String oldVal = val; @@ -162,6 +166,7 @@ public class FragmentCallerTypeImpl extends MinimalEObjectImpl.Container impleme * * @generated */ + @Override public String getFragVal() { return fragVal; @@ -172,6 +177,7 @@ public class FragmentCallerTypeImpl extends MinimalEObjectImpl.Container impleme * * @generated */ + @Override public void setFragVal(String newFragVal) { String oldFragVal = fragVal; @@ -276,7 +282,7 @@ public class FragmentCallerTypeImpl extends MinimalEObjectImpl.Container impleme { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (val1: "); result.append(val1); result.append(", val: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/GroupMultiplicitiesImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/GroupMultiplicitiesImpl.java index 469b07b49..6dfd6c8a2 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/GroupMultiplicitiesImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/GroupMultiplicitiesImpl.java @@ -166,6 +166,7 @@ public class GroupMultiplicitiesImpl extends MinimalEObjectImpl.Container implem * * @generated */ + @Override public String getVal1() { return val1; @@ -176,6 +177,7 @@ public class GroupMultiplicitiesImpl extends MinimalEObjectImpl.Container implem * * @generated */ + @Override public void setVal1(String newVal1) { String oldVal1 = val1; @@ -189,6 +191,7 @@ public class GroupMultiplicitiesImpl extends MinimalEObjectImpl.Container implem * * @generated */ + @Override public String getVal2() { return val2; @@ -199,6 +202,7 @@ public class GroupMultiplicitiesImpl extends MinimalEObjectImpl.Container implem * * @generated */ + @Override public void setVal2(String newVal2) { String oldVal2 = val2; @@ -212,6 +216,7 @@ public class GroupMultiplicitiesImpl extends MinimalEObjectImpl.Container implem * * @generated */ + @Override public String getVal3() { return val3; @@ -222,6 +227,7 @@ public class GroupMultiplicitiesImpl extends MinimalEObjectImpl.Container implem * * @generated */ + @Override public void setVal3(String newVal3) { String oldVal3 = val3; @@ -235,6 +241,7 @@ public class GroupMultiplicitiesImpl extends MinimalEObjectImpl.Container implem * * @generated */ + @Override public EList getVal4() { if (val4 == null) @@ -249,6 +256,7 @@ public class GroupMultiplicitiesImpl extends MinimalEObjectImpl.Container implem * * @generated */ + @Override public EList getVal5() { if (val5 == null) @@ -263,6 +271,7 @@ public class GroupMultiplicitiesImpl extends MinimalEObjectImpl.Container implem * * @generated */ + @Override public EList getVal6() { if (val6 == null) @@ -277,6 +286,7 @@ public class GroupMultiplicitiesImpl extends MinimalEObjectImpl.Container implem * * @generated */ + @Override public EList getVal7() { if (val7 == null) @@ -427,7 +437,7 @@ public class GroupMultiplicitiesImpl extends MinimalEObjectImpl.Container implem { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (val1: "); result.append(val1); result.append(", val2: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/List1Impl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/List1Impl.java index 37370a745..ad7f08fb6 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/List1Impl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/List1Impl.java @@ -67,6 +67,7 @@ public class List1Impl extends MinimalEObjectImpl.Container implements List1 * * @generated */ + @Override public EList getVal1() { if (val1 == null) @@ -154,7 +155,7 @@ public class List1Impl extends MinimalEObjectImpl.Container implements List1 { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (val1: "); result.append(val1); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/List2Impl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/List2Impl.java index 6d0bb20f5..1edc617d6 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/List2Impl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/List2Impl.java @@ -67,6 +67,7 @@ public class List2Impl extends MinimalEObjectImpl.Container implements List2 * * @generated */ + @Override public EList getVal1() { if (val1 == null) @@ -154,7 +155,7 @@ public class List2Impl extends MinimalEObjectImpl.Container implements List2 { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (val1: "); result.append(val1); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/ModelImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/ModelImpl.java index fbed1be00..07b290573 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/ModelImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/ModelImpl.java @@ -434,6 +434,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public SimpleGroup getX1() { return x1; @@ -461,6 +462,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setX1(SimpleGroup newX1) { if (newX1 != x1) @@ -482,6 +484,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public SimpleAlternative getX2() { return x2; @@ -509,6 +512,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setX2(SimpleAlternative newX2) { if (newX2 != x2) @@ -530,6 +534,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public SimpleMultiplicities getX3() { return x3; @@ -557,6 +562,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setX3(SimpleMultiplicities newX3) { if (newX3 != x3) @@ -578,6 +584,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public GroupMultiplicities getX4() { return x4; @@ -605,6 +612,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setX4(GroupMultiplicities newX4) { if (newX4 != x4) @@ -626,6 +634,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public AlternativeMultiplicities getX5() { return x5; @@ -653,6 +662,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setX5(AlternativeMultiplicities newX5) { if (newX5 != x5) @@ -674,6 +684,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public List1 getX6() { return x6; @@ -701,6 +712,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setX6(List1 newX6) { if (newX6 != x6) @@ -722,6 +734,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public List2 getX7() { return x7; @@ -749,6 +762,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setX7(List2 newX7) { if (newX7 != x7) @@ -770,6 +784,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public AltList1 getX8() { return x8; @@ -797,6 +812,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setX8(AltList1 newX8) { if (newX8 != x8) @@ -818,6 +834,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public AltList2 getX9() { return x9; @@ -845,6 +862,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setX9(AltList2 newX9) { if (newX9 != x9) @@ -866,6 +884,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public EObject getX10() { return x10; @@ -893,6 +912,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setX10(EObject newX10) { if (newX10 != x10) @@ -914,6 +934,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public EObject getX11() { return x11; @@ -941,6 +962,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setX11(EObject newX11) { if (newX11 != x11) @@ -962,6 +984,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public EObject getX12() { return x12; @@ -989,6 +1012,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setX12(EObject newX12) { if (newX12 != x12) @@ -1010,6 +1034,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public SingleEnum getX13() { return x13; @@ -1037,6 +1062,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setX13(SingleEnum newX13) { if (newX13 != x13) @@ -1058,6 +1084,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public SingleCrossReference getX14() { return x14; @@ -1085,6 +1112,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setX14(SingleCrossReference newX14) { if (newX14 != x14) @@ -1106,6 +1134,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public SingleContainmentReference getX15() { return x15; @@ -1133,6 +1162,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setX15(SingleContainmentReference newX15) { if (newX15 != x15) @@ -1154,6 +1184,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public DependentAlternative1 getX19() { return x19; @@ -1181,6 +1212,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setX19(DependentAlternative1 newX19) { if (newX19 != x19) @@ -1202,6 +1234,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public DependentAlternative2 getX20() { return x20; @@ -1229,6 +1262,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setX20(DependentAlternative2 newX20) { if (newX20 != x20) @@ -1250,6 +1284,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public Optional getX21() { return x21; @@ -1277,6 +1312,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setX21(Optional newX21) { if (newX21 != x21) @@ -1298,6 +1334,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public org.eclipse.xtext.serializer.sequencertest.Float getX22() { return x22; @@ -1325,6 +1362,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setX22(org.eclipse.xtext.serializer.sequencertest.Float newX22) { if (newX22 != x22) @@ -1346,6 +1384,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public UnorderedAlternative getX23() { return x23; @@ -1373,6 +1412,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setX23(UnorderedAlternative newX23) { if (newX23 != x23) @@ -1394,6 +1434,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public UnorderedGroup getX24() { return x24; @@ -1421,6 +1462,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setX24(UnorderedGroup newX24) { if (newX24 != x24) @@ -1442,6 +1484,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public UnorderedGroupOptional getX25() { return x25; @@ -1469,6 +1512,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setX25(UnorderedGroupOptional newX25) { if (newX25 != x25) @@ -1490,6 +1534,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public UnorderedGroupBoolean getX26() { return x26; @@ -1517,6 +1562,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setX26(UnorderedGroupBoolean newX26) { if (newX26 != x26) @@ -1538,6 +1584,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public Complex1 getX27() { return x27; @@ -1565,6 +1612,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setX27(Complex1 newX27) { if (newX27 != x27) @@ -1586,6 +1634,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public OptionalDouble getX28() { return x28; @@ -1613,6 +1662,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setX28(OptionalDouble newX28) { if (newX28 != x28) @@ -1634,6 +1684,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public NullValue getX29() { return x29; @@ -1661,6 +1712,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setX29(NullValue newX29) { if (newX29 != x29) @@ -1682,6 +1734,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public NullValue getX30() { return x30; @@ -1709,6 +1762,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setX30(NullValue newX30) { if (newX30 != x30) @@ -1730,6 +1784,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public NullCrossRef getX31() { return x31; @@ -1757,6 +1812,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setX31(NullCrossRef newX31) { if (newX31 != x31) @@ -1778,6 +1834,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public NullCrossRef getX32() { return x32; @@ -1805,6 +1862,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setX32(NullCrossRef newX32) { if (newX32 != x32) @@ -1826,6 +1884,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public FragmentCallerType getX33() { return x33; @@ -1853,6 +1912,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setX33(FragmentCallerType newX33) { if (newX33 != x33) @@ -1874,6 +1934,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public ParameterCaller getX34() { return x34; @@ -1901,6 +1962,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setX34(ParameterCaller newX34) { if (newX34 != x34) @@ -1922,6 +1984,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public ParameterDelegation getX35() { return x35; @@ -1949,6 +2012,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setX35(ParameterDelegation newX35) { if (newX35 != x35) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/MultiKeywordsImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/MultiKeywordsImpl.java index 02a045bed..63bf4646b 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/MultiKeywordsImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/MultiKeywordsImpl.java @@ -67,6 +67,7 @@ public class MultiKeywordsImpl extends MinimalEObjectImpl.Container implements M * * @generated */ + @Override public EList getVal() { if (val == null) @@ -154,7 +155,7 @@ public class MultiKeywordsImpl extends MinimalEObjectImpl.Container implements M { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (val: "); result.append(val); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/MultiKeywordsOrIDImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/MultiKeywordsOrIDImpl.java index 86c3a8dcb..f3adbf025 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/MultiKeywordsOrIDImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/MultiKeywordsOrIDImpl.java @@ -67,6 +67,7 @@ public class MultiKeywordsOrIDImpl extends MinimalEObjectImpl.Container implemen * * @generated */ + @Override public EList getVal() { if (val == null) @@ -154,7 +155,7 @@ public class MultiKeywordsOrIDImpl extends MinimalEObjectImpl.Container implemen { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (val: "); result.append(val); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/MultiTerminalsImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/MultiTerminalsImpl.java index cbe4c76ea..76aff524b 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/MultiTerminalsImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/MultiTerminalsImpl.java @@ -67,6 +67,7 @@ public class MultiTerminalsImpl extends MinimalEObjectImpl.Container implements * * @generated */ + @Override public EList getVal() { if (val == null) @@ -154,7 +155,7 @@ public class MultiTerminalsImpl extends MinimalEObjectImpl.Container implements { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (val: "); result.append(val); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/NullCrossRefImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/NullCrossRefImpl.java index f88dddc2b..3db8b1860 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/NullCrossRefImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/NullCrossRefImpl.java @@ -87,6 +87,7 @@ public class NullCrossRefImpl extends MinimalEObjectImpl.Container implements Nu * * @generated */ + @Override public EObject getRef() { if (ref != null && ref.eIsProxy()) @@ -117,6 +118,7 @@ public class NullCrossRefImpl extends MinimalEObjectImpl.Container implements Nu * * @generated */ + @Override public void setRef(EObject newRef) { EObject oldRef = ref; @@ -130,6 +132,7 @@ public class NullCrossRefImpl extends MinimalEObjectImpl.Container implements Nu * * @generated */ + @Override public String getFoo() { return foo; @@ -140,6 +143,7 @@ public class NullCrossRefImpl extends MinimalEObjectImpl.Container implements Nu * * @generated */ + @Override public void setFoo(String newFoo) { String oldFoo = foo; @@ -235,7 +239,7 @@ public class NullCrossRefImpl extends MinimalEObjectImpl.Container implements Nu { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (foo: "); result.append(foo); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/NullValueImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/NullValueImpl.java index 4d7bfae7f..ba9ac8c6b 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/NullValueImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/NullValueImpl.java @@ -95,6 +95,7 @@ public class NullValueImpl extends MinimalEObjectImpl.Container implements NullV * * @generated */ + @Override public String getValue() { return value; @@ -105,6 +106,7 @@ public class NullValueImpl extends MinimalEObjectImpl.Container implements NullV * * @generated */ + @Override public void setValue(String newValue) { String oldValue = value; @@ -118,6 +120,7 @@ public class NullValueImpl extends MinimalEObjectImpl.Container implements NullV * * @generated */ + @Override public String getFoo() { return foo; @@ -128,6 +131,7 @@ public class NullValueImpl extends MinimalEObjectImpl.Container implements NullV * * @generated */ + @Override public void setFoo(String newFoo) { String oldFoo = foo; @@ -222,7 +226,7 @@ public class NullValueImpl extends MinimalEObjectImpl.Container implements NullV { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (value: "); result.append(value); result.append(", foo: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/OptionalDoubleImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/OptionalDoubleImpl.java index d8b546f78..02a9b4da8 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/OptionalDoubleImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/OptionalDoubleImpl.java @@ -116,6 +116,7 @@ public class OptionalDoubleImpl extends MinimalEObjectImpl.Container implements * * @generated */ + @Override public double getDouble0() { return double0; @@ -126,6 +127,7 @@ public class OptionalDoubleImpl extends MinimalEObjectImpl.Container implements * * @generated */ + @Override public void setDouble0(double newDouble0) { double oldDouble0 = double0; @@ -139,6 +141,7 @@ public class OptionalDoubleImpl extends MinimalEObjectImpl.Container implements * * @generated */ + @Override public double getDouble1() { return double1; @@ -149,6 +152,7 @@ public class OptionalDoubleImpl extends MinimalEObjectImpl.Container implements * * @generated */ + @Override public void setDouble1(double newDouble1) { double oldDouble1 = double1; @@ -162,6 +166,7 @@ public class OptionalDoubleImpl extends MinimalEObjectImpl.Container implements * * @generated */ + @Override public double getDouble2() { return double2; @@ -172,6 +177,7 @@ public class OptionalDoubleImpl extends MinimalEObjectImpl.Container implements * * @generated */ + @Override public void setDouble2(double newDouble2) { double oldDouble2 = double2; @@ -276,7 +282,7 @@ public class OptionalDoubleImpl extends MinimalEObjectImpl.Container implements { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (double0: "); result.append(double0); result.append(", double1: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/OptionalImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/OptionalImpl.java index 3c3aea6dd..7ff6fd58a 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/OptionalImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/OptionalImpl.java @@ -116,6 +116,7 @@ public class OptionalImpl extends MinimalEObjectImpl.Container implements Option * * @generated */ + @Override public int getInt0() { return int0; @@ -126,6 +127,7 @@ public class OptionalImpl extends MinimalEObjectImpl.Container implements Option * * @generated */ + @Override public void setInt0(int newInt0) { int oldInt0 = int0; @@ -139,6 +141,7 @@ public class OptionalImpl extends MinimalEObjectImpl.Container implements Option * * @generated */ + @Override public int getInt1() { return int1; @@ -149,6 +152,7 @@ public class OptionalImpl extends MinimalEObjectImpl.Container implements Option * * @generated */ + @Override public void setInt1(int newInt1) { int oldInt1 = int1; @@ -162,6 +166,7 @@ public class OptionalImpl extends MinimalEObjectImpl.Container implements Option * * @generated */ + @Override public int getInt2() { return int2; @@ -172,6 +177,7 @@ public class OptionalImpl extends MinimalEObjectImpl.Container implements Option * * @generated */ + @Override public void setInt2(int newInt2) { int oldInt2 = int2; @@ -276,7 +282,7 @@ public class OptionalImpl extends MinimalEObjectImpl.Container implements Option { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (int0: "); result.append(int0); result.append(", int1: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/ParameterCallerImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/ParameterCallerImpl.java index 998577382..13f282a81 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/ParameterCallerImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/ParameterCallerImpl.java @@ -67,6 +67,7 @@ public class ParameterCallerImpl extends MinimalEObjectImpl.Container implements * * @generated */ + @Override public Parameterized getP() { return p; @@ -94,6 +95,7 @@ public class ParameterCallerImpl extends MinimalEObjectImpl.Container implements * * @generated */ + @Override public void setP(Parameterized newP) { if (newP != p) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/ParameterDelegationImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/ParameterDelegationImpl.java index 15a1cbb33..0b859cde3 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/ParameterDelegationImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/ParameterDelegationImpl.java @@ -67,6 +67,7 @@ public class ParameterDelegationImpl extends MinimalEObjectImpl.Container implem * * @generated */ + @Override public Delegation getP() { return p; @@ -94,6 +95,7 @@ public class ParameterDelegationImpl extends MinimalEObjectImpl.Container implem * * @generated */ + @Override public void setP(Delegation newP) { if (newP != p) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/ParameterizedImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/ParameterizedImpl.java index 6c249b244..67caf6a4e 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/ParameterizedImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/ParameterizedImpl.java @@ -116,6 +116,7 @@ public class ParameterizedImpl extends MinimalEObjectImpl.Container implements P * * @generated */ + @Override public String getV1() { return v1; @@ -126,6 +127,7 @@ public class ParameterizedImpl extends MinimalEObjectImpl.Container implements P * * @generated */ + @Override public void setV1(String newV1) { String oldV1 = v1; @@ -139,6 +141,7 @@ public class ParameterizedImpl extends MinimalEObjectImpl.Container implements P * * @generated */ + @Override public String getV2() { return v2; @@ -149,6 +152,7 @@ public class ParameterizedImpl extends MinimalEObjectImpl.Container implements P * * @generated */ + @Override public void setV2(String newV2) { String oldV2 = v2; @@ -162,6 +166,7 @@ public class ParameterizedImpl extends MinimalEObjectImpl.Container implements P * * @generated */ + @Override public String getV3() { return v3; @@ -172,6 +177,7 @@ public class ParameterizedImpl extends MinimalEObjectImpl.Container implements P * * @generated */ + @Override public void setV3(String newV3) { String oldV3 = v3; @@ -276,7 +282,7 @@ public class ParameterizedImpl extends MinimalEObjectImpl.Container implements P { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (v1: "); result.append(v1); result.append(", v2: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/SequencertestFactoryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/SequencertestFactoryImpl.java index 18b9ee0ec..3ed51fd37 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/SequencertestFactoryImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/SequencertestFactoryImpl.java @@ -203,6 +203,7 @@ public class SequencertestFactoryImpl extends EFactoryImpl implements Sequencert * * @generated */ + @Override public Model createModel() { ModelImpl model = new ModelImpl(); @@ -214,6 +215,7 @@ public class SequencertestFactoryImpl extends EFactoryImpl implements Sequencert * * @generated */ + @Override public SimpleGroup createSimpleGroup() { SimpleGroupImpl simpleGroup = new SimpleGroupImpl(); @@ -225,6 +227,7 @@ public class SequencertestFactoryImpl extends EFactoryImpl implements Sequencert * * @generated */ + @Override public SimpleAlternative createSimpleAlternative() { SimpleAlternativeImpl simpleAlternative = new SimpleAlternativeImpl(); @@ -236,6 +239,7 @@ public class SequencertestFactoryImpl extends EFactoryImpl implements Sequencert * * @generated */ + @Override public SimpleMultiplicities createSimpleMultiplicities() { SimpleMultiplicitiesImpl simpleMultiplicities = new SimpleMultiplicitiesImpl(); @@ -247,6 +251,7 @@ public class SequencertestFactoryImpl extends EFactoryImpl implements Sequencert * * @generated */ + @Override public GroupMultiplicities createGroupMultiplicities() { GroupMultiplicitiesImpl groupMultiplicities = new GroupMultiplicitiesImpl(); @@ -258,6 +263,7 @@ public class SequencertestFactoryImpl extends EFactoryImpl implements Sequencert * * @generated */ + @Override public AlternativeMultiplicities createAlternativeMultiplicities() { AlternativeMultiplicitiesImpl alternativeMultiplicities = new AlternativeMultiplicitiesImpl(); @@ -269,6 +275,7 @@ public class SequencertestFactoryImpl extends EFactoryImpl implements Sequencert * * @generated */ + @Override public List1 createList1() { List1Impl list1 = new List1Impl(); @@ -280,6 +287,7 @@ public class SequencertestFactoryImpl extends EFactoryImpl implements Sequencert * * @generated */ + @Override public List2 createList2() { List2Impl list2 = new List2Impl(); @@ -291,6 +299,7 @@ public class SequencertestFactoryImpl extends EFactoryImpl implements Sequencert * * @generated */ + @Override public AltList1 createAltList1() { AltList1Impl altList1 = new AltList1Impl(); @@ -302,6 +311,7 @@ public class SequencertestFactoryImpl extends EFactoryImpl implements Sequencert * * @generated */ + @Override public AltList2 createAltList2() { AltList2Impl altList2 = new AltList2Impl(); @@ -313,6 +323,7 @@ public class SequencertestFactoryImpl extends EFactoryImpl implements Sequencert * * @generated */ + @Override public SingleKeywords createSingleKeywords() { SingleKeywordsImpl singleKeywords = new SingleKeywordsImpl(); @@ -324,6 +335,7 @@ public class SequencertestFactoryImpl extends EFactoryImpl implements Sequencert * * @generated */ + @Override public SingleKeywordsOrID createSingleKeywordsOrID() { SingleKeywordsOrIDImpl singleKeywordsOrID = new SingleKeywordsOrIDImpl(); @@ -335,6 +347,7 @@ public class SequencertestFactoryImpl extends EFactoryImpl implements Sequencert * * @generated */ + @Override public SingleTerminals createSingleTerminals() { SingleTerminalsImpl singleTerminals = new SingleTerminalsImpl(); @@ -346,6 +359,7 @@ public class SequencertestFactoryImpl extends EFactoryImpl implements Sequencert * * @generated */ + @Override public SingleEnum createSingleEnum() { SingleEnumImpl singleEnum = new SingleEnumImpl(); @@ -357,6 +371,7 @@ public class SequencertestFactoryImpl extends EFactoryImpl implements Sequencert * * @generated */ + @Override public SingleCrossReference createSingleCrossReference() { SingleCrossReferenceImpl singleCrossReference = new SingleCrossReferenceImpl(); @@ -368,6 +383,7 @@ public class SequencertestFactoryImpl extends EFactoryImpl implements Sequencert * * @generated */ + @Override public SingleContainmentReference createSingleContainmentReference() { SingleContainmentReferenceImpl singleContainmentReference = new SingleContainmentReferenceImpl(); @@ -379,6 +395,7 @@ public class SequencertestFactoryImpl extends EFactoryImpl implements Sequencert * * @generated */ + @Override public SingleContainmentReferenceChild1 createSingleContainmentReferenceChild1() { SingleContainmentReferenceChild1Impl singleContainmentReferenceChild1 = new SingleContainmentReferenceChild1Impl(); @@ -390,6 +407,7 @@ public class SequencertestFactoryImpl extends EFactoryImpl implements Sequencert * * @generated */ + @Override public SingleContainmentReferenceChild2 createSingleContainmentReferenceChild2() { SingleContainmentReferenceChild2Impl singleContainmentReferenceChild2 = new SingleContainmentReferenceChild2Impl(); @@ -401,6 +419,7 @@ public class SequencertestFactoryImpl extends EFactoryImpl implements Sequencert * * @generated */ + @Override public SingleContainmentReferenceChild3 createSingleContainmentReferenceChild3() { SingleContainmentReferenceChild3Impl singleContainmentReferenceChild3 = new SingleContainmentReferenceChild3Impl(); @@ -412,6 +431,7 @@ public class SequencertestFactoryImpl extends EFactoryImpl implements Sequencert * * @generated */ + @Override public MultiKeywords createMultiKeywords() { MultiKeywordsImpl multiKeywords = new MultiKeywordsImpl(); @@ -423,6 +443,7 @@ public class SequencertestFactoryImpl extends EFactoryImpl implements Sequencert * * @generated */ + @Override public MultiKeywordsOrID createMultiKeywordsOrID() { MultiKeywordsOrIDImpl multiKeywordsOrID = new MultiKeywordsOrIDImpl(); @@ -434,6 +455,7 @@ public class SequencertestFactoryImpl extends EFactoryImpl implements Sequencert * * @generated */ + @Override public MultiTerminals createMultiTerminals() { MultiTerminalsImpl multiTerminals = new MultiTerminalsImpl(); @@ -445,6 +467,7 @@ public class SequencertestFactoryImpl extends EFactoryImpl implements Sequencert * * @generated */ + @Override public DependentAlternative1 createDependentAlternative1() { DependentAlternative1Impl dependentAlternative1 = new DependentAlternative1Impl(); @@ -456,6 +479,7 @@ public class SequencertestFactoryImpl extends EFactoryImpl implements Sequencert * * @generated */ + @Override public DependentAlternative2 createDependentAlternative2() { DependentAlternative2Impl dependentAlternative2 = new DependentAlternative2Impl(); @@ -467,6 +491,7 @@ public class SequencertestFactoryImpl extends EFactoryImpl implements Sequencert * * @generated */ + @Override public Optional createOptional() { OptionalImpl optional = new OptionalImpl(); @@ -478,6 +503,7 @@ public class SequencertestFactoryImpl extends EFactoryImpl implements Sequencert * * @generated */ + @Override public org.eclipse.xtext.serializer.sequencertest.Float createFloat() { FloatImpl float_ = new FloatImpl(); @@ -489,6 +515,7 @@ public class SequencertestFactoryImpl extends EFactoryImpl implements Sequencert * * @generated */ + @Override public UnorderedAlternative createUnorderedAlternative() { UnorderedAlternativeImpl unorderedAlternative = new UnorderedAlternativeImpl(); @@ -500,6 +527,7 @@ public class SequencertestFactoryImpl extends EFactoryImpl implements Sequencert * * @generated */ + @Override public UnorderedAlternativeVal createUnorderedAlternativeVal() { UnorderedAlternativeValImpl unorderedAlternativeVal = new UnorderedAlternativeValImpl(); @@ -511,6 +539,7 @@ public class SequencertestFactoryImpl extends EFactoryImpl implements Sequencert * * @generated */ + @Override public UnorderedAlternativeValDelegate createUnorderedAlternativeValDelegate() { UnorderedAlternativeValDelegateImpl unorderedAlternativeValDelegate = new UnorderedAlternativeValDelegateImpl(); @@ -522,6 +551,7 @@ public class SequencertestFactoryImpl extends EFactoryImpl implements Sequencert * * @generated */ + @Override public UnorderedAlternativeVal2 createUnorderedAlternativeVal2() { UnorderedAlternativeVal2Impl unorderedAlternativeVal2 = new UnorderedAlternativeVal2Impl(); @@ -533,6 +563,7 @@ public class SequencertestFactoryImpl extends EFactoryImpl implements Sequencert * * @generated */ + @Override public UnorderedGroup createUnorderedGroup() { UnorderedGroupImpl unorderedGroup = new UnorderedGroupImpl(); @@ -544,6 +575,7 @@ public class SequencertestFactoryImpl extends EFactoryImpl implements Sequencert * * @generated */ + @Override public UnorderedGroupVal createUnorderedGroupVal() { UnorderedGroupValImpl unorderedGroupVal = new UnorderedGroupValImpl(); @@ -555,6 +587,7 @@ public class SequencertestFactoryImpl extends EFactoryImpl implements Sequencert * * @generated */ + @Override public UnorderedGroupValDelegate createUnorderedGroupValDelegate() { UnorderedGroupValDelegateImpl unorderedGroupValDelegate = new UnorderedGroupValDelegateImpl(); @@ -566,6 +599,7 @@ public class SequencertestFactoryImpl extends EFactoryImpl implements Sequencert * * @generated */ + @Override public UnorderedGroupVal2 createUnorderedGroupVal2() { UnorderedGroupVal2Impl unorderedGroupVal2 = new UnorderedGroupVal2Impl(); @@ -577,6 +611,7 @@ public class SequencertestFactoryImpl extends EFactoryImpl implements Sequencert * * @generated */ + @Override public UnorderedGroupOptional createUnorderedGroupOptional() { UnorderedGroupOptionalImpl unorderedGroupOptional = new UnorderedGroupOptionalImpl(); @@ -588,6 +623,7 @@ public class SequencertestFactoryImpl extends EFactoryImpl implements Sequencert * * @generated */ + @Override public UnorderedGroupBoolean createUnorderedGroupBoolean() { UnorderedGroupBooleanImpl unorderedGroupBoolean = new UnorderedGroupBooleanImpl(); @@ -599,6 +635,7 @@ public class SequencertestFactoryImpl extends EFactoryImpl implements Sequencert * * @generated */ + @Override public Complex1 createComplex1() { Complex1Impl complex1 = new Complex1Impl(); @@ -610,6 +647,7 @@ public class SequencertestFactoryImpl extends EFactoryImpl implements Sequencert * * @generated */ + @Override public OptionalDouble createOptionalDouble() { OptionalDoubleImpl optionalDouble = new OptionalDoubleImpl(); @@ -621,6 +659,7 @@ public class SequencertestFactoryImpl extends EFactoryImpl implements Sequencert * * @generated */ + @Override public NullValue createNullValue() { NullValueImpl nullValue = new NullValueImpl(); @@ -632,6 +671,7 @@ public class SequencertestFactoryImpl extends EFactoryImpl implements Sequencert * * @generated */ + @Override public NullCrossRef createNullCrossRef() { NullCrossRefImpl nullCrossRef = new NullCrossRefImpl(); @@ -643,6 +683,7 @@ public class SequencertestFactoryImpl extends EFactoryImpl implements Sequencert * * @generated */ + @Override public FragmentCallerType createFragmentCallerType() { FragmentCallerTypeImpl fragmentCallerType = new FragmentCallerTypeImpl(); @@ -654,6 +695,7 @@ public class SequencertestFactoryImpl extends EFactoryImpl implements Sequencert * * @generated */ + @Override public ParameterCaller createParameterCaller() { ParameterCallerImpl parameterCaller = new ParameterCallerImpl(); @@ -665,6 +707,7 @@ public class SequencertestFactoryImpl extends EFactoryImpl implements Sequencert * * @generated */ + @Override public Parameterized createParameterized() { ParameterizedImpl parameterized = new ParameterizedImpl(); @@ -676,6 +719,7 @@ public class SequencertestFactoryImpl extends EFactoryImpl implements Sequencert * * @generated */ + @Override public ParameterDelegation createParameterDelegation() { ParameterDelegationImpl parameterDelegation = new ParameterDelegationImpl(); @@ -687,6 +731,7 @@ public class SequencertestFactoryImpl extends EFactoryImpl implements Sequencert * * @generated */ + @Override public Delegation createDelegation() { DelegationImpl delegation = new DelegationImpl(); @@ -698,6 +743,7 @@ public class SequencertestFactoryImpl extends EFactoryImpl implements Sequencert * * @generated */ + @Override public DelegationA createDelegationA() { DelegationAImpl delegationA = new DelegationAImpl(); @@ -731,6 +777,7 @@ public class SequencertestFactoryImpl extends EFactoryImpl implements Sequencert * * @generated */ + @Override public SequencertestPackage getSequencertestPackage() { return (SequencertestPackage)getEPackage(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/SequencertestPackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/SequencertestPackageImpl.java index bcb63aa1f..626caf469 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/SequencertestPackageImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/SequencertestPackageImpl.java @@ -427,7 +427,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link SequencertestPackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -442,7 +442,8 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert if (isInited) return (SequencertestPackage)EPackage.Registry.INSTANCE.getEPackage(SequencertestPackage.eNS_URI); // Obtain or create and register package - SequencertestPackageImpl theSequencertestPackage = (SequencertestPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof SequencertestPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new SequencertestPackageImpl()); + Object registeredSequencertestPackage = EPackage.Registry.INSTANCE.get(eNS_URI); + SequencertestPackageImpl theSequencertestPackage = registeredSequencertestPackage instanceof SequencertestPackageImpl ? (SequencertestPackageImpl)registeredSequencertestPackage : new SequencertestPackageImpl(); isInited = true; @@ -458,7 +459,6 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert // Mark meta-data to indicate it can't be changed theSequencertestPackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(SequencertestPackage.eNS_URI, theSequencertestPackage); return theSequencertestPackage; @@ -469,6 +469,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EClass getModel() { return modelEClass; @@ -479,6 +480,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EReference getModel_X1() { return (EReference)modelEClass.getEStructuralFeatures().get(0); @@ -489,6 +491,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EReference getModel_X2() { return (EReference)modelEClass.getEStructuralFeatures().get(1); @@ -499,6 +502,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EReference getModel_X3() { return (EReference)modelEClass.getEStructuralFeatures().get(2); @@ -509,6 +513,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EReference getModel_X4() { return (EReference)modelEClass.getEStructuralFeatures().get(3); @@ -519,6 +524,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EReference getModel_X5() { return (EReference)modelEClass.getEStructuralFeatures().get(4); @@ -529,6 +535,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EReference getModel_X6() { return (EReference)modelEClass.getEStructuralFeatures().get(5); @@ -539,6 +546,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EReference getModel_X7() { return (EReference)modelEClass.getEStructuralFeatures().get(6); @@ -549,6 +557,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EReference getModel_X8() { return (EReference)modelEClass.getEStructuralFeatures().get(7); @@ -559,6 +568,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EReference getModel_X9() { return (EReference)modelEClass.getEStructuralFeatures().get(8); @@ -569,6 +579,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EReference getModel_X10() { return (EReference)modelEClass.getEStructuralFeatures().get(9); @@ -579,6 +590,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EReference getModel_X11() { return (EReference)modelEClass.getEStructuralFeatures().get(10); @@ -589,6 +601,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EReference getModel_X12() { return (EReference)modelEClass.getEStructuralFeatures().get(11); @@ -599,6 +612,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EReference getModel_X13() { return (EReference)modelEClass.getEStructuralFeatures().get(12); @@ -609,6 +623,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EReference getModel_X14() { return (EReference)modelEClass.getEStructuralFeatures().get(13); @@ -619,6 +634,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EReference getModel_X15() { return (EReference)modelEClass.getEStructuralFeatures().get(14); @@ -629,6 +645,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EReference getModel_X19() { return (EReference)modelEClass.getEStructuralFeatures().get(15); @@ -639,6 +656,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EReference getModel_X20() { return (EReference)modelEClass.getEStructuralFeatures().get(16); @@ -649,6 +667,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EReference getModel_X21() { return (EReference)modelEClass.getEStructuralFeatures().get(17); @@ -659,6 +678,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EReference getModel_X22() { return (EReference)modelEClass.getEStructuralFeatures().get(18); @@ -669,6 +689,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EReference getModel_X23() { return (EReference)modelEClass.getEStructuralFeatures().get(19); @@ -679,6 +700,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EReference getModel_X24() { return (EReference)modelEClass.getEStructuralFeatures().get(20); @@ -689,6 +711,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EReference getModel_X25() { return (EReference)modelEClass.getEStructuralFeatures().get(21); @@ -699,6 +722,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EReference getModel_X26() { return (EReference)modelEClass.getEStructuralFeatures().get(22); @@ -709,6 +733,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EReference getModel_X27() { return (EReference)modelEClass.getEStructuralFeatures().get(23); @@ -719,6 +744,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EReference getModel_X28() { return (EReference)modelEClass.getEStructuralFeatures().get(24); @@ -729,6 +755,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EReference getModel_X29() { return (EReference)modelEClass.getEStructuralFeatures().get(25); @@ -739,6 +766,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EReference getModel_X30() { return (EReference)modelEClass.getEStructuralFeatures().get(26); @@ -749,6 +777,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EReference getModel_X31() { return (EReference)modelEClass.getEStructuralFeatures().get(27); @@ -759,6 +788,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EReference getModel_X32() { return (EReference)modelEClass.getEStructuralFeatures().get(28); @@ -769,6 +799,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EReference getModel_X33() { return (EReference)modelEClass.getEStructuralFeatures().get(29); @@ -779,6 +810,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EReference getModel_X34() { return (EReference)modelEClass.getEStructuralFeatures().get(30); @@ -789,6 +821,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EReference getModel_X35() { return (EReference)modelEClass.getEStructuralFeatures().get(31); @@ -799,6 +832,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EClass getSimpleGroup() { return simpleGroupEClass; @@ -809,6 +843,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EAttribute getSimpleGroup_Val1() { return (EAttribute)simpleGroupEClass.getEStructuralFeatures().get(0); @@ -819,6 +854,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EAttribute getSimpleGroup_Val2() { return (EAttribute)simpleGroupEClass.getEStructuralFeatures().get(1); @@ -829,6 +865,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EClass getSimpleAlternative() { return simpleAlternativeEClass; @@ -839,6 +876,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EAttribute getSimpleAlternative_Val1() { return (EAttribute)simpleAlternativeEClass.getEStructuralFeatures().get(0); @@ -849,6 +887,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EAttribute getSimpleAlternative_Val2() { return (EAttribute)simpleAlternativeEClass.getEStructuralFeatures().get(1); @@ -859,6 +898,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EClass getSimpleMultiplicities() { return simpleMultiplicitiesEClass; @@ -869,6 +909,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EAttribute getSimpleMultiplicities_Val1() { return (EAttribute)simpleMultiplicitiesEClass.getEStructuralFeatures().get(0); @@ -879,6 +920,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EAttribute getSimpleMultiplicities_Val2() { return (EAttribute)simpleMultiplicitiesEClass.getEStructuralFeatures().get(1); @@ -889,6 +931,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EAttribute getSimpleMultiplicities_Val3() { return (EAttribute)simpleMultiplicitiesEClass.getEStructuralFeatures().get(2); @@ -899,6 +942,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EAttribute getSimpleMultiplicities_Val4() { return (EAttribute)simpleMultiplicitiesEClass.getEStructuralFeatures().get(3); @@ -909,6 +953,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EClass getGroupMultiplicities() { return groupMultiplicitiesEClass; @@ -919,6 +964,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EAttribute getGroupMultiplicities_Val1() { return (EAttribute)groupMultiplicitiesEClass.getEStructuralFeatures().get(0); @@ -929,6 +975,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EAttribute getGroupMultiplicities_Val2() { return (EAttribute)groupMultiplicitiesEClass.getEStructuralFeatures().get(1); @@ -939,6 +986,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EAttribute getGroupMultiplicities_Val3() { return (EAttribute)groupMultiplicitiesEClass.getEStructuralFeatures().get(2); @@ -949,6 +997,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EAttribute getGroupMultiplicities_Val4() { return (EAttribute)groupMultiplicitiesEClass.getEStructuralFeatures().get(3); @@ -959,6 +1008,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EAttribute getGroupMultiplicities_Val5() { return (EAttribute)groupMultiplicitiesEClass.getEStructuralFeatures().get(4); @@ -969,6 +1019,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EAttribute getGroupMultiplicities_Val6() { return (EAttribute)groupMultiplicitiesEClass.getEStructuralFeatures().get(5); @@ -979,6 +1030,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EAttribute getGroupMultiplicities_Val7() { return (EAttribute)groupMultiplicitiesEClass.getEStructuralFeatures().get(6); @@ -989,6 +1041,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EClass getAlternativeMultiplicities() { return alternativeMultiplicitiesEClass; @@ -999,6 +1052,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EAttribute getAlternativeMultiplicities_Val2() { return (EAttribute)alternativeMultiplicitiesEClass.getEStructuralFeatures().get(0); @@ -1009,6 +1063,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EAttribute getAlternativeMultiplicities_Val3() { return (EAttribute)alternativeMultiplicitiesEClass.getEStructuralFeatures().get(1); @@ -1019,6 +1074,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EAttribute getAlternativeMultiplicities_Val4() { return (EAttribute)alternativeMultiplicitiesEClass.getEStructuralFeatures().get(2); @@ -1029,6 +1085,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EAttribute getAlternativeMultiplicities_Val5() { return (EAttribute)alternativeMultiplicitiesEClass.getEStructuralFeatures().get(3); @@ -1039,6 +1096,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EAttribute getAlternativeMultiplicities_Val6() { return (EAttribute)alternativeMultiplicitiesEClass.getEStructuralFeatures().get(4); @@ -1049,6 +1107,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EAttribute getAlternativeMultiplicities_Val7() { return (EAttribute)alternativeMultiplicitiesEClass.getEStructuralFeatures().get(5); @@ -1059,6 +1118,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EClass getList1() { return list1EClass; @@ -1069,6 +1129,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EAttribute getList1_Val1() { return (EAttribute)list1EClass.getEStructuralFeatures().get(0); @@ -1079,6 +1140,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EClass getList2() { return list2EClass; @@ -1089,6 +1151,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EAttribute getList2_Val1() { return (EAttribute)list2EClass.getEStructuralFeatures().get(0); @@ -1099,6 +1162,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EClass getAltList1() { return altList1EClass; @@ -1109,6 +1173,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EAttribute getAltList1_Val1() { return (EAttribute)altList1EClass.getEStructuralFeatures().get(0); @@ -1119,6 +1184,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EAttribute getAltList1_Val2() { return (EAttribute)altList1EClass.getEStructuralFeatures().get(1); @@ -1129,6 +1195,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EAttribute getAltList1_Val3() { return (EAttribute)altList1EClass.getEStructuralFeatures().get(2); @@ -1139,6 +1206,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EAttribute getAltList1_Val4() { return (EAttribute)altList1EClass.getEStructuralFeatures().get(3); @@ -1149,6 +1217,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EClass getAltList2() { return altList2EClass; @@ -1159,6 +1228,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EAttribute getAltList2_Val1() { return (EAttribute)altList2EClass.getEStructuralFeatures().get(0); @@ -1169,6 +1239,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EAttribute getAltList2_Val2() { return (EAttribute)altList2EClass.getEStructuralFeatures().get(1); @@ -1179,6 +1250,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EAttribute getAltList2_Val3() { return (EAttribute)altList2EClass.getEStructuralFeatures().get(2); @@ -1189,6 +1261,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EClass getSingleKeywords() { return singleKeywordsEClass; @@ -1199,6 +1272,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EAttribute getSingleKeywords_Val() { return (EAttribute)singleKeywordsEClass.getEStructuralFeatures().get(0); @@ -1209,6 +1283,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EClass getSingleKeywordsOrID() { return singleKeywordsOrIDEClass; @@ -1219,6 +1294,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EAttribute getSingleKeywordsOrID_Val() { return (EAttribute)singleKeywordsOrIDEClass.getEStructuralFeatures().get(0); @@ -1229,6 +1305,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EClass getSingleTerminals() { return singleTerminalsEClass; @@ -1239,6 +1316,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EAttribute getSingleTerminals_Val() { return (EAttribute)singleTerminalsEClass.getEStructuralFeatures().get(0); @@ -1249,6 +1327,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EClass getSingleEnum() { return singleEnumEClass; @@ -1259,6 +1338,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EAttribute getSingleEnum_Val() { return (EAttribute)singleEnumEClass.getEStructuralFeatures().get(0); @@ -1269,6 +1349,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EClass getSingleCrossReference() { return singleCrossReferenceEClass; @@ -1279,6 +1360,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EAttribute getSingleCrossReference_Name() { return (EAttribute)singleCrossReferenceEClass.getEStructuralFeatures().get(0); @@ -1289,6 +1371,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EReference getSingleCrossReference_Ref() { return (EReference)singleCrossReferenceEClass.getEStructuralFeatures().get(1); @@ -1299,6 +1382,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EClass getSingleContainmentReference() { return singleContainmentReferenceEClass; @@ -1309,6 +1393,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EReference getSingleContainmentReference_Child() { return (EReference)singleContainmentReferenceEClass.getEStructuralFeatures().get(0); @@ -1319,6 +1404,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EClass getSingleContainmentReferenceChild1() { return singleContainmentReferenceChild1EClass; @@ -1329,6 +1415,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EAttribute getSingleContainmentReferenceChild1_Val() { return (EAttribute)singleContainmentReferenceChild1EClass.getEStructuralFeatures().get(0); @@ -1339,6 +1426,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EClass getSingleContainmentReferenceChild2() { return singleContainmentReferenceChild2EClass; @@ -1349,6 +1437,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EAttribute getSingleContainmentReferenceChild2_Val() { return (EAttribute)singleContainmentReferenceChild2EClass.getEStructuralFeatures().get(0); @@ -1359,6 +1448,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EClass getSingleContainmentReferenceChild3() { return singleContainmentReferenceChild3EClass; @@ -1369,6 +1459,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EAttribute getSingleContainmentReferenceChild3_Val() { return (EAttribute)singleContainmentReferenceChild3EClass.getEStructuralFeatures().get(0); @@ -1379,6 +1470,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EClass getMultiKeywords() { return multiKeywordsEClass; @@ -1389,6 +1481,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EAttribute getMultiKeywords_Val() { return (EAttribute)multiKeywordsEClass.getEStructuralFeatures().get(0); @@ -1399,6 +1492,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EClass getMultiKeywordsOrID() { return multiKeywordsOrIDEClass; @@ -1409,6 +1503,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EAttribute getMultiKeywordsOrID_Val() { return (EAttribute)multiKeywordsOrIDEClass.getEStructuralFeatures().get(0); @@ -1419,6 +1514,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EClass getMultiTerminals() { return multiTerminalsEClass; @@ -1429,6 +1525,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EAttribute getMultiTerminals_Val() { return (EAttribute)multiTerminalsEClass.getEStructuralFeatures().get(0); @@ -1439,6 +1536,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EClass getDependentAlternative1() { return dependentAlternative1EClass; @@ -1449,6 +1547,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EAttribute getDependentAlternative1_Val() { return (EAttribute)dependentAlternative1EClass.getEStructuralFeatures().get(0); @@ -1459,6 +1558,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EAttribute getDependentAlternative1_Flag() { return (EAttribute)dependentAlternative1EClass.getEStructuralFeatures().get(1); @@ -1469,6 +1569,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EClass getDependentAlternative2() { return dependentAlternative2EClass; @@ -1479,6 +1580,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EAttribute getDependentAlternative2_Val() { return (EAttribute)dependentAlternative2EClass.getEStructuralFeatures().get(0); @@ -1489,6 +1591,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EAttribute getDependentAlternative2_Flag() { return (EAttribute)dependentAlternative2EClass.getEStructuralFeatures().get(1); @@ -1499,6 +1602,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EClass getOptional() { return optionalEClass; @@ -1509,6 +1613,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EAttribute getOptional_Int0() { return (EAttribute)optionalEClass.getEStructuralFeatures().get(0); @@ -1519,6 +1624,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EAttribute getOptional_Int1() { return (EAttribute)optionalEClass.getEStructuralFeatures().get(1); @@ -1529,6 +1635,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EAttribute getOptional_Int2() { return (EAttribute)optionalEClass.getEStructuralFeatures().get(2); @@ -1539,6 +1646,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EClass getFloat() { return floatEClass; @@ -1549,6 +1657,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EClass getUnorderedAlternative() { return unorderedAlternativeEClass; @@ -1559,6 +1668,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EAttribute getUnorderedAlternative_Val1() { return (EAttribute)unorderedAlternativeEClass.getEStructuralFeatures().get(0); @@ -1569,6 +1679,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EAttribute getUnorderedAlternative_Val2() { return (EAttribute)unorderedAlternativeEClass.getEStructuralFeatures().get(1); @@ -1579,6 +1690,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EReference getUnorderedAlternative_Val3() { return (EReference)unorderedAlternativeEClass.getEStructuralFeatures().get(2); @@ -1589,6 +1701,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EReference getUnorderedAlternative_Val4() { return (EReference)unorderedAlternativeEClass.getEStructuralFeatures().get(3); @@ -1599,6 +1712,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EClass getUnorderedAlternativeVal() { return unorderedAlternativeValEClass; @@ -1609,6 +1723,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EAttribute getUnorderedAlternativeVal_Val() { return (EAttribute)unorderedAlternativeValEClass.getEStructuralFeatures().get(0); @@ -1619,6 +1734,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EClass getUnorderedAlternativeValDelegate() { return unorderedAlternativeValDelegateEClass; @@ -1629,6 +1745,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EClass getUnorderedAlternativeVal2() { return unorderedAlternativeVal2EClass; @@ -1639,6 +1756,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EAttribute getUnorderedAlternativeVal2_Val() { return (EAttribute)unorderedAlternativeVal2EClass.getEStructuralFeatures().get(0); @@ -1649,6 +1767,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EClass getUnorderedGroup() { return unorderedGroupEClass; @@ -1659,6 +1778,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EAttribute getUnorderedGroup_Val1() { return (EAttribute)unorderedGroupEClass.getEStructuralFeatures().get(0); @@ -1669,6 +1789,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EAttribute getUnorderedGroup_Val2() { return (EAttribute)unorderedGroupEClass.getEStructuralFeatures().get(1); @@ -1679,6 +1800,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EReference getUnorderedGroup_Val3() { return (EReference)unorderedGroupEClass.getEStructuralFeatures().get(2); @@ -1689,6 +1811,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EReference getUnorderedGroup_Val4() { return (EReference)unorderedGroupEClass.getEStructuralFeatures().get(3); @@ -1699,6 +1822,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EClass getUnorderedGroupVal() { return unorderedGroupValEClass; @@ -1709,6 +1833,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EAttribute getUnorderedGroupVal_Val() { return (EAttribute)unorderedGroupValEClass.getEStructuralFeatures().get(0); @@ -1719,6 +1844,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EClass getUnorderedGroupValDelegate() { return unorderedGroupValDelegateEClass; @@ -1729,6 +1855,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EClass getUnorderedGroupVal2() { return unorderedGroupVal2EClass; @@ -1739,6 +1866,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EAttribute getUnorderedGroupVal2_Val() { return (EAttribute)unorderedGroupVal2EClass.getEStructuralFeatures().get(0); @@ -1749,6 +1877,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EClass getUnorderedGroupOptional() { return unorderedGroupOptionalEClass; @@ -1759,6 +1888,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EAttribute getUnorderedGroupOptional_Val1() { return (EAttribute)unorderedGroupOptionalEClass.getEStructuralFeatures().get(0); @@ -1769,6 +1899,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EAttribute getUnorderedGroupOptional_Va2() { return (EAttribute)unorderedGroupOptionalEClass.getEStructuralFeatures().get(1); @@ -1779,6 +1910,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EAttribute getUnorderedGroupOptional_Val3() { return (EAttribute)unorderedGroupOptionalEClass.getEStructuralFeatures().get(2); @@ -1789,6 +1921,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EClass getUnorderedGroupBoolean() { return unorderedGroupBooleanEClass; @@ -1799,6 +1932,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EAttribute getUnorderedGroupBoolean_Val1() { return (EAttribute)unorderedGroupBooleanEClass.getEStructuralFeatures().get(0); @@ -1809,6 +1943,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EAttribute getUnorderedGroupBoolean_Val2() { return (EAttribute)unorderedGroupBooleanEClass.getEStructuralFeatures().get(1); @@ -1819,6 +1954,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EAttribute getUnorderedGroupBoolean_Val3() { return (EAttribute)unorderedGroupBooleanEClass.getEStructuralFeatures().get(2); @@ -1829,6 +1965,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EClass getComplex1() { return complex1EClass; @@ -1839,6 +1976,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EAttribute getComplex1_Val1() { return (EAttribute)complex1EClass.getEStructuralFeatures().get(0); @@ -1849,6 +1987,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EAttribute getComplex1_Val2() { return (EAttribute)complex1EClass.getEStructuralFeatures().get(1); @@ -1859,6 +1998,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EAttribute getComplex1_Val3() { return (EAttribute)complex1EClass.getEStructuralFeatures().get(2); @@ -1869,6 +2009,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EAttribute getComplex1_Val4() { return (EAttribute)complex1EClass.getEStructuralFeatures().get(3); @@ -1879,6 +2020,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EAttribute getComplex1_Val5() { return (EAttribute)complex1EClass.getEStructuralFeatures().get(4); @@ -1889,6 +2031,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EAttribute getComplex1_Val6() { return (EAttribute)complex1EClass.getEStructuralFeatures().get(5); @@ -1899,6 +2042,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EClass getOptionalDouble() { return optionalDoubleEClass; @@ -1909,6 +2053,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EAttribute getOptionalDouble_Double0() { return (EAttribute)optionalDoubleEClass.getEStructuralFeatures().get(0); @@ -1919,6 +2064,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EAttribute getOptionalDouble_Double1() { return (EAttribute)optionalDoubleEClass.getEStructuralFeatures().get(1); @@ -1929,6 +2075,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EAttribute getOptionalDouble_Double2() { return (EAttribute)optionalDoubleEClass.getEStructuralFeatures().get(2); @@ -1939,6 +2086,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EClass getNullValue() { return nullValueEClass; @@ -1949,6 +2097,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EAttribute getNullValue_Value() { return (EAttribute)nullValueEClass.getEStructuralFeatures().get(0); @@ -1959,6 +2108,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EAttribute getNullValue_Foo() { return (EAttribute)nullValueEClass.getEStructuralFeatures().get(1); @@ -1969,6 +2119,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EClass getNullCrossRef() { return nullCrossRefEClass; @@ -1979,6 +2130,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EReference getNullCrossRef_Ref() { return (EReference)nullCrossRefEClass.getEStructuralFeatures().get(0); @@ -1989,6 +2141,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EAttribute getNullCrossRef_Foo() { return (EAttribute)nullCrossRefEClass.getEStructuralFeatures().get(1); @@ -1999,6 +2152,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EClass getFragmentCallerType() { return fragmentCallerTypeEClass; @@ -2009,6 +2163,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EAttribute getFragmentCallerType_Val1() { return (EAttribute)fragmentCallerTypeEClass.getEStructuralFeatures().get(0); @@ -2019,6 +2174,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EAttribute getFragmentCallerType_Val() { return (EAttribute)fragmentCallerTypeEClass.getEStructuralFeatures().get(1); @@ -2029,6 +2185,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EAttribute getFragmentCallerType_FragVal() { return (EAttribute)fragmentCallerTypeEClass.getEStructuralFeatures().get(2); @@ -2039,6 +2196,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EClass getParameterCaller() { return parameterCallerEClass; @@ -2049,6 +2207,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EReference getParameterCaller_P() { return (EReference)parameterCallerEClass.getEStructuralFeatures().get(0); @@ -2059,6 +2218,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EClass getParameterized() { return parameterizedEClass; @@ -2069,6 +2229,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EAttribute getParameterized_V1() { return (EAttribute)parameterizedEClass.getEStructuralFeatures().get(0); @@ -2079,6 +2240,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EAttribute getParameterized_V2() { return (EAttribute)parameterizedEClass.getEStructuralFeatures().get(1); @@ -2089,6 +2251,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EAttribute getParameterized_V3() { return (EAttribute)parameterizedEClass.getEStructuralFeatures().get(2); @@ -2099,6 +2262,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EClass getParameterDelegation() { return parameterDelegationEClass; @@ -2109,6 +2273,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EReference getParameterDelegation_P() { return (EReference)parameterDelegationEClass.getEStructuralFeatures().get(0); @@ -2119,6 +2284,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EClass getDelegation() { return delegationEClass; @@ -2129,6 +2295,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EAttribute getDelegation_P() { return (EAttribute)delegationEClass.getEStructuralFeatures().get(0); @@ -2139,6 +2306,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EAttribute getDelegation_Np() { return (EAttribute)delegationEClass.getEStructuralFeatures().get(1); @@ -2149,6 +2317,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EClass getDelegationA() { return delegationAEClass; @@ -2159,6 +2328,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EReference getDelegationA_Left() { return (EReference)delegationAEClass.getEStructuralFeatures().get(0); @@ -2169,6 +2339,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EReference getDelegationA_Rc2() { return (EReference)delegationAEClass.getEStructuralFeatures().get(1); @@ -2179,6 +2350,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public EEnum getDefEnum() { return defEnumEEnum; @@ -2189,6 +2361,7 @@ public class SequencertestPackageImpl extends EPackageImpl implements Sequencert * * @generated */ + @Override public SequencertestFactory getSequencertestFactory() { return (SequencertestFactory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/SimpleAlternativeImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/SimpleAlternativeImpl.java index 06d548b8b..5cdf19317 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/SimpleAlternativeImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/SimpleAlternativeImpl.java @@ -95,6 +95,7 @@ public class SimpleAlternativeImpl extends MinimalEObjectImpl.Container implemen * * @generated */ + @Override public String getVal1() { return val1; @@ -105,6 +106,7 @@ public class SimpleAlternativeImpl extends MinimalEObjectImpl.Container implemen * * @generated */ + @Override public void setVal1(String newVal1) { String oldVal1 = val1; @@ -118,6 +120,7 @@ public class SimpleAlternativeImpl extends MinimalEObjectImpl.Container implemen * * @generated */ + @Override public String getVal2() { return val2; @@ -128,6 +131,7 @@ public class SimpleAlternativeImpl extends MinimalEObjectImpl.Container implemen * * @generated */ + @Override public void setVal2(String newVal2) { String oldVal2 = val2; @@ -222,7 +226,7 @@ public class SimpleAlternativeImpl extends MinimalEObjectImpl.Container implemen { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (val1: "); result.append(val1); result.append(", val2: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/SimpleGroupImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/SimpleGroupImpl.java index 4c567cd5a..7ec74270f 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/SimpleGroupImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/SimpleGroupImpl.java @@ -95,6 +95,7 @@ public class SimpleGroupImpl extends MinimalEObjectImpl.Container implements Sim * * @generated */ + @Override public String getVal1() { return val1; @@ -105,6 +106,7 @@ public class SimpleGroupImpl extends MinimalEObjectImpl.Container implements Sim * * @generated */ + @Override public void setVal1(String newVal1) { String oldVal1 = val1; @@ -118,6 +120,7 @@ public class SimpleGroupImpl extends MinimalEObjectImpl.Container implements Sim * * @generated */ + @Override public String getVal2() { return val2; @@ -128,6 +131,7 @@ public class SimpleGroupImpl extends MinimalEObjectImpl.Container implements Sim * * @generated */ + @Override public void setVal2(String newVal2) { String oldVal2 = val2; @@ -222,7 +226,7 @@ public class SimpleGroupImpl extends MinimalEObjectImpl.Container implements Sim { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (val1: "); result.append(val1); result.append(", val2: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/SimpleMultiplicitiesImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/SimpleMultiplicitiesImpl.java index 15ae6b890..8c54a9a93 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/SimpleMultiplicitiesImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/SimpleMultiplicitiesImpl.java @@ -123,6 +123,7 @@ public class SimpleMultiplicitiesImpl extends MinimalEObjectImpl.Container imple * * @generated */ + @Override public String getVal1() { return val1; @@ -133,6 +134,7 @@ public class SimpleMultiplicitiesImpl extends MinimalEObjectImpl.Container imple * * @generated */ + @Override public void setVal1(String newVal1) { String oldVal1 = val1; @@ -146,6 +148,7 @@ public class SimpleMultiplicitiesImpl extends MinimalEObjectImpl.Container imple * * @generated */ + @Override public String getVal2() { return val2; @@ -156,6 +159,7 @@ public class SimpleMultiplicitiesImpl extends MinimalEObjectImpl.Container imple * * @generated */ + @Override public void setVal2(String newVal2) { String oldVal2 = val2; @@ -169,6 +173,7 @@ public class SimpleMultiplicitiesImpl extends MinimalEObjectImpl.Container imple * * @generated */ + @Override public EList getVal3() { if (val3 == null) @@ -183,6 +188,7 @@ public class SimpleMultiplicitiesImpl extends MinimalEObjectImpl.Container imple * * @generated */ + @Override public EList getVal4() { if (val4 == null) @@ -301,7 +307,7 @@ public class SimpleMultiplicitiesImpl extends MinimalEObjectImpl.Container imple { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (val1: "); result.append(val1); result.append(", val2: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/SingleContainmentReferenceChild1Impl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/SingleContainmentReferenceChild1Impl.java index 688bfae19..c3a2d4c42 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/SingleContainmentReferenceChild1Impl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/SingleContainmentReferenceChild1Impl.java @@ -74,6 +74,7 @@ public class SingleContainmentReferenceChild1Impl extends MinimalEObjectImpl.Con * * @generated */ + @Override public String getVal() { return val; @@ -84,6 +85,7 @@ public class SingleContainmentReferenceChild1Impl extends MinimalEObjectImpl.Con * * @generated */ + @Override public void setVal(String newVal) { String oldVal = val; @@ -168,7 +170,7 @@ public class SingleContainmentReferenceChild1Impl extends MinimalEObjectImpl.Con { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (val: "); result.append(val); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/SingleContainmentReferenceChild2Impl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/SingleContainmentReferenceChild2Impl.java index 34ff71d5a..d6b97f7fb 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/SingleContainmentReferenceChild2Impl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/SingleContainmentReferenceChild2Impl.java @@ -74,6 +74,7 @@ public class SingleContainmentReferenceChild2Impl extends MinimalEObjectImpl.Con * * @generated */ + @Override public String getVal() { return val; @@ -84,6 +85,7 @@ public class SingleContainmentReferenceChild2Impl extends MinimalEObjectImpl.Con * * @generated */ + @Override public void setVal(String newVal) { String oldVal = val; @@ -168,7 +170,7 @@ public class SingleContainmentReferenceChild2Impl extends MinimalEObjectImpl.Con { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (val: "); result.append(val); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/SingleContainmentReferenceChild3Impl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/SingleContainmentReferenceChild3Impl.java index ecd19704e..49beb2baf 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/SingleContainmentReferenceChild3Impl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/SingleContainmentReferenceChild3Impl.java @@ -74,6 +74,7 @@ public class SingleContainmentReferenceChild3Impl extends MinimalEObjectImpl.Con * * @generated */ + @Override public String getVal() { return val; @@ -84,6 +85,7 @@ public class SingleContainmentReferenceChild3Impl extends MinimalEObjectImpl.Con * * @generated */ + @Override public void setVal(String newVal) { String oldVal = val; @@ -168,7 +170,7 @@ public class SingleContainmentReferenceChild3Impl extends MinimalEObjectImpl.Con { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (val: "); result.append(val); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/SingleContainmentReferenceImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/SingleContainmentReferenceImpl.java index 80a0913ba..3bffd51ef 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/SingleContainmentReferenceImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/SingleContainmentReferenceImpl.java @@ -67,6 +67,7 @@ public class SingleContainmentReferenceImpl extends MinimalEObjectImpl.Container * * @generated */ + @Override public EObject getChild() { return child; @@ -94,6 +95,7 @@ public class SingleContainmentReferenceImpl extends MinimalEObjectImpl.Container * * @generated */ + @Override public void setChild(EObject newChild) { if (newChild != child) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/SingleCrossReferenceImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/SingleCrossReferenceImpl.java index 5b00cdad1..4332a6c5d 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/SingleCrossReferenceImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/SingleCrossReferenceImpl.java @@ -86,6 +86,7 @@ public class SingleCrossReferenceImpl extends MinimalEObjectImpl.Container imple * * @generated */ + @Override public String getName() { return name; @@ -96,6 +97,7 @@ public class SingleCrossReferenceImpl extends MinimalEObjectImpl.Container imple * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -109,6 +111,7 @@ public class SingleCrossReferenceImpl extends MinimalEObjectImpl.Container imple * * @generated */ + @Override public SingleCrossReference getRef() { if (ref != null && ref.eIsProxy()) @@ -139,6 +142,7 @@ public class SingleCrossReferenceImpl extends MinimalEObjectImpl.Container imple * * @generated */ + @Override public void setRef(SingleCrossReference newRef) { SingleCrossReference oldRef = ref; @@ -234,7 +238,7 @@ public class SingleCrossReferenceImpl extends MinimalEObjectImpl.Container imple { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/SingleEnumImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/SingleEnumImpl.java index 0c2e45bbd..08e7d3d9a 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/SingleEnumImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/SingleEnumImpl.java @@ -75,6 +75,7 @@ public class SingleEnumImpl extends MinimalEObjectImpl.Container implements Sing * * @generated */ + @Override public DefEnum getVal() { return val; @@ -85,6 +86,7 @@ public class SingleEnumImpl extends MinimalEObjectImpl.Container implements Sing * * @generated */ + @Override public void setVal(DefEnum newVal) { DefEnum oldVal = val; @@ -169,7 +171,7 @@ public class SingleEnumImpl extends MinimalEObjectImpl.Container implements Sing { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (val: "); result.append(val); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/SingleKeywordsImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/SingleKeywordsImpl.java index e7a91cbf9..8b7e9ee36 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/SingleKeywordsImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/SingleKeywordsImpl.java @@ -74,6 +74,7 @@ public class SingleKeywordsImpl extends MinimalEObjectImpl.Container implements * * @generated */ + @Override public String getVal() { return val; @@ -84,6 +85,7 @@ public class SingleKeywordsImpl extends MinimalEObjectImpl.Container implements * * @generated */ + @Override public void setVal(String newVal) { String oldVal = val; @@ -168,7 +170,7 @@ public class SingleKeywordsImpl extends MinimalEObjectImpl.Container implements { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (val: "); result.append(val); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/SingleKeywordsOrIDImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/SingleKeywordsOrIDImpl.java index b8838ddd9..58916814d 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/SingleKeywordsOrIDImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/SingleKeywordsOrIDImpl.java @@ -74,6 +74,7 @@ public class SingleKeywordsOrIDImpl extends MinimalEObjectImpl.Container impleme * * @generated */ + @Override public String getVal() { return val; @@ -84,6 +85,7 @@ public class SingleKeywordsOrIDImpl extends MinimalEObjectImpl.Container impleme * * @generated */ + @Override public void setVal(String newVal) { String oldVal = val; @@ -168,7 +170,7 @@ public class SingleKeywordsOrIDImpl extends MinimalEObjectImpl.Container impleme { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (val: "); result.append(val); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/SingleTerminalsImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/SingleTerminalsImpl.java index d93a6214a..9eb7ec3ac 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/SingleTerminalsImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/SingleTerminalsImpl.java @@ -74,6 +74,7 @@ public class SingleTerminalsImpl extends MinimalEObjectImpl.Container implements * * @generated */ + @Override public String getVal() { return val; @@ -84,6 +85,7 @@ public class SingleTerminalsImpl extends MinimalEObjectImpl.Container implements * * @generated */ + @Override public void setVal(String newVal) { String oldVal = val; @@ -168,7 +170,7 @@ public class SingleTerminalsImpl extends MinimalEObjectImpl.Container implements { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (val: "); result.append(val); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/UnorderedAlternativeImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/UnorderedAlternativeImpl.java index fcd0ec404..3de3f9433 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/UnorderedAlternativeImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/UnorderedAlternativeImpl.java @@ -107,6 +107,7 @@ public class UnorderedAlternativeImpl extends MinimalEObjectImpl.Container imple * * @generated */ + @Override public EList getVal1() { if (val1 == null) @@ -121,6 +122,7 @@ public class UnorderedAlternativeImpl extends MinimalEObjectImpl.Container imple * * @generated */ + @Override public EList getVal2() { if (val2 == null) @@ -135,6 +137,7 @@ public class UnorderedAlternativeImpl extends MinimalEObjectImpl.Container imple * * @generated */ + @Override public EList getVal3() { if (val3 == null) @@ -149,6 +152,7 @@ public class UnorderedAlternativeImpl extends MinimalEObjectImpl.Container imple * * @generated */ + @Override public EList getVal4() { if (val4 == null) @@ -287,7 +291,7 @@ public class UnorderedAlternativeImpl extends MinimalEObjectImpl.Container imple { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (val1: "); result.append(val1); result.append(", val2: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/UnorderedAlternativeVal2Impl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/UnorderedAlternativeVal2Impl.java index bfb59f2eb..533f7f0b7 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/UnorderedAlternativeVal2Impl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/UnorderedAlternativeVal2Impl.java @@ -73,6 +73,7 @@ public class UnorderedAlternativeVal2Impl extends UnorderedAlternativeValDelegat * * @generated */ + @Override public String getVal() { return val; @@ -83,6 +84,7 @@ public class UnorderedAlternativeVal2Impl extends UnorderedAlternativeValDelegat * * @generated */ + @Override public void setVal(String newVal) { String oldVal = val; @@ -167,7 +169,7 @@ public class UnorderedAlternativeVal2Impl extends UnorderedAlternativeValDelegat { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (val: "); result.append(val); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/UnorderedAlternativeValImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/UnorderedAlternativeValImpl.java index 4aea2b5c9..2700f55ab 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/UnorderedAlternativeValImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/UnorderedAlternativeValImpl.java @@ -74,6 +74,7 @@ public class UnorderedAlternativeValImpl extends MinimalEObjectImpl.Container im * * @generated */ + @Override public String getVal() { return val; @@ -84,6 +85,7 @@ public class UnorderedAlternativeValImpl extends MinimalEObjectImpl.Container im * * @generated */ + @Override public void setVal(String newVal) { String oldVal = val; @@ -168,7 +170,7 @@ public class UnorderedAlternativeValImpl extends MinimalEObjectImpl.Container im { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (val: "); result.append(val); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/UnorderedGroupBooleanImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/UnorderedGroupBooleanImpl.java index 6a6320460..e15b38a12 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/UnorderedGroupBooleanImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/UnorderedGroupBooleanImpl.java @@ -116,6 +116,7 @@ public class UnorderedGroupBooleanImpl extends MinimalEObjectImpl.Container impl * * @generated */ + @Override public boolean isVal1() { return val1; @@ -126,6 +127,7 @@ public class UnorderedGroupBooleanImpl extends MinimalEObjectImpl.Container impl * * @generated */ + @Override public void setVal1(boolean newVal1) { boolean oldVal1 = val1; @@ -139,6 +141,7 @@ public class UnorderedGroupBooleanImpl extends MinimalEObjectImpl.Container impl * * @generated */ + @Override public boolean isVal2() { return val2; @@ -149,6 +152,7 @@ public class UnorderedGroupBooleanImpl extends MinimalEObjectImpl.Container impl * * @generated */ + @Override public void setVal2(boolean newVal2) { boolean oldVal2 = val2; @@ -162,6 +166,7 @@ public class UnorderedGroupBooleanImpl extends MinimalEObjectImpl.Container impl * * @generated */ + @Override public boolean isVal3() { return val3; @@ -172,6 +177,7 @@ public class UnorderedGroupBooleanImpl extends MinimalEObjectImpl.Container impl * * @generated */ + @Override public void setVal3(boolean newVal3) { boolean oldVal3 = val3; @@ -276,7 +282,7 @@ public class UnorderedGroupBooleanImpl extends MinimalEObjectImpl.Container impl { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (val1: "); result.append(val1); result.append(", val2: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/UnorderedGroupImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/UnorderedGroupImpl.java index c8b73f652..554df5c0e 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/UnorderedGroupImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/UnorderedGroupImpl.java @@ -121,6 +121,7 @@ public class UnorderedGroupImpl extends MinimalEObjectImpl.Container implements * * @generated */ + @Override public String getVal1() { return val1; @@ -131,6 +132,7 @@ public class UnorderedGroupImpl extends MinimalEObjectImpl.Container implements * * @generated */ + @Override public void setVal1(String newVal1) { String oldVal1 = val1; @@ -144,6 +146,7 @@ public class UnorderedGroupImpl extends MinimalEObjectImpl.Container implements * * @generated */ + @Override public int getVal2() { return val2; @@ -154,6 +157,7 @@ public class UnorderedGroupImpl extends MinimalEObjectImpl.Container implements * * @generated */ + @Override public void setVal2(int newVal2) { int oldVal2 = val2; @@ -167,6 +171,7 @@ public class UnorderedGroupImpl extends MinimalEObjectImpl.Container implements * * @generated */ + @Override public UnorderedGroupVal getVal3() { return val3; @@ -194,6 +199,7 @@ public class UnorderedGroupImpl extends MinimalEObjectImpl.Container implements * * @generated */ + @Override public void setVal3(UnorderedGroupVal newVal3) { if (newVal3 != val3) @@ -215,6 +221,7 @@ public class UnorderedGroupImpl extends MinimalEObjectImpl.Container implements * * @generated */ + @Override public UnorderedGroupValDelegate getVal4() { return val4; @@ -242,6 +249,7 @@ public class UnorderedGroupImpl extends MinimalEObjectImpl.Container implements * * @generated */ + @Override public void setVal4(UnorderedGroupValDelegate newVal4) { if (newVal4 != val4) @@ -382,7 +390,7 @@ public class UnorderedGroupImpl extends MinimalEObjectImpl.Container implements { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (val1: "); result.append(val1); result.append(", val2: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/UnorderedGroupOptionalImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/UnorderedGroupOptionalImpl.java index d11681f5f..af8049c8b 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/UnorderedGroupOptionalImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/UnorderedGroupOptionalImpl.java @@ -116,6 +116,7 @@ public class UnorderedGroupOptionalImpl extends MinimalEObjectImpl.Container imp * * @generated */ + @Override public String getVal1() { return val1; @@ -126,6 +127,7 @@ public class UnorderedGroupOptionalImpl extends MinimalEObjectImpl.Container imp * * @generated */ + @Override public void setVal1(String newVal1) { String oldVal1 = val1; @@ -139,6 +141,7 @@ public class UnorderedGroupOptionalImpl extends MinimalEObjectImpl.Container imp * * @generated */ + @Override public String getVa2() { return va2; @@ -149,6 +152,7 @@ public class UnorderedGroupOptionalImpl extends MinimalEObjectImpl.Container imp * * @generated */ + @Override public void setVa2(String newVa2) { String oldVa2 = va2; @@ -162,6 +166,7 @@ public class UnorderedGroupOptionalImpl extends MinimalEObjectImpl.Container imp * * @generated */ + @Override public String getVal3() { return val3; @@ -172,6 +177,7 @@ public class UnorderedGroupOptionalImpl extends MinimalEObjectImpl.Container imp * * @generated */ + @Override public void setVal3(String newVal3) { String oldVal3 = val3; @@ -276,7 +282,7 @@ public class UnorderedGroupOptionalImpl extends MinimalEObjectImpl.Container imp { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (val1: "); result.append(val1); result.append(", va2: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/UnorderedGroupVal2Impl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/UnorderedGroupVal2Impl.java index 7d3d05a39..dfeb9653f 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/UnorderedGroupVal2Impl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/UnorderedGroupVal2Impl.java @@ -73,6 +73,7 @@ public class UnorderedGroupVal2Impl extends UnorderedGroupValDelegateImpl implem * * @generated */ + @Override public String getVal() { return val; @@ -83,6 +84,7 @@ public class UnorderedGroupVal2Impl extends UnorderedGroupValDelegateImpl implem * * @generated */ + @Override public void setVal(String newVal) { String oldVal = val; @@ -167,7 +169,7 @@ public class UnorderedGroupVal2Impl extends UnorderedGroupValDelegateImpl implem { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (val: "); result.append(val); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/UnorderedGroupValImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/UnorderedGroupValImpl.java index ee603d5fc..a2bf02200 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/UnorderedGroupValImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/sequencertest/impl/UnorderedGroupValImpl.java @@ -74,6 +74,7 @@ public class UnorderedGroupValImpl extends MinimalEObjectImpl.Container implemen * * @generated */ + @Override public String getVal() { return val; @@ -84,6 +85,7 @@ public class UnorderedGroupValImpl extends MinimalEObjectImpl.Container implemen * * @generated */ + @Override public void setVal(String newVal) { String oldVal = val; @@ -168,7 +170,7 @@ public class UnorderedGroupValImpl extends MinimalEObjectImpl.Container implemen { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (val: "); result.append(val); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/Add0.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/Add0.java index 301b9887e..f4e3ebc4f 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/Add0.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/Add0.java @@ -26,10 +26,6 @@ public interface Add0 extends Exp0 /** * Returns the value of the 'Left' containment reference. * - *

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

* * @return the value of the 'Left' containment reference. * @see #setLeft(Exp0) @@ -52,10 +48,6 @@ public interface Add0 extends Exp0 /** * Returns the value of the 'Right' containment reference. * - *

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

* * @return the value of the 'Right' containment reference. * @see #setRight(Exp0) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/Add1.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/Add1.java index 1e532fb05..fcefa838b 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/Add1.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/Add1.java @@ -26,10 +26,6 @@ public interface Add1 extends Exp1 /** * Returns the value of the 'Left' containment reference. * - *

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

* * @return the value of the 'Left' containment reference. * @see #setLeft(Exp1) @@ -52,10 +48,6 @@ public interface Add1 extends Exp1 /** * Returns the value of the 'Right' containment reference. * - *

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

* * @return the value of the 'Right' containment reference. * @see #setRight(Exp1) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/Add2.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/Add2.java index 86023556c..7df26e090 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/Add2.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/Add2.java @@ -26,10 +26,6 @@ public interface Add2 extends Exp2 /** * Returns the value of the 'Left' containment reference. * - *

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

* * @return the value of the 'Left' containment reference. * @see #setLeft(Exp2) @@ -52,10 +48,6 @@ public interface Add2 extends Exp2 /** * Returns the value of the 'Right' containment reference. * - *

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

* * @return the value of the 'Right' containment reference. * @see #setRight(Exp2) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/AlternativeTransition.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/AlternativeTransition.java index b1fcd5a5e..f9491ceb5 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/AlternativeTransition.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/AlternativeTransition.java @@ -26,10 +26,6 @@ public interface AlternativeTransition extends EObject /** * Returns the value of the 'Val' attribute. * - *

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

* * @return the value of the 'Val' attribute. * @see #setVal(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/BooleanAlternative.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/BooleanAlternative.java index 94d6c9f65..e851a3fc6 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/BooleanAlternative.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/BooleanAlternative.java @@ -26,10 +26,6 @@ public interface BooleanAlternative extends EObject /** * Returns the value of the 'Bool' containment reference. * - *

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

* * @return the value of the 'Bool' containment reference. * @see #setBool(BooleanAlternativeLiteral) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/BooleanAlternativeLiteral.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/BooleanAlternativeLiteral.java index 9f0f2fe47..1629f05f5 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/BooleanAlternativeLiteral.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/BooleanAlternativeLiteral.java @@ -26,10 +26,6 @@ public interface BooleanAlternativeLiteral extends EObject /** * Returns the value of the 'Is True' attribute. * - *

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

* * @return the value of the 'Is True' attribute. * @see #setIsTrue(boolean) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/BooleanValues.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/BooleanValues.java index 9ba89a3a5..c24d4d48e 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/BooleanValues.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/BooleanValues.java @@ -28,10 +28,6 @@ public interface BooleanValues extends EObject /** * Returns the value of the 'Val1' attribute. * - *

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

* * @return the value of the 'Val1' attribute. * @see #setVal1(boolean) @@ -54,10 +50,6 @@ public interface BooleanValues extends EObject /** * Returns the value of the 'Val2' attribute. * - *

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

* * @return the value of the 'Val2' attribute. * @see #setVal2(boolean) @@ -80,10 +72,6 @@ public interface BooleanValues extends EObject /** * Returns the value of the 'Val3' attribute. * - *

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

* * @return the value of the 'Val3' attribute. * @see #setVal3(boolean) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/Bug398890.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/Bug398890.java index f06959f84..5ca933385 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/Bug398890.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/Bug398890.java @@ -26,10 +26,6 @@ public interface Bug398890 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) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/FragmentCallerType.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/FragmentCallerType.java index 244700ef4..2f5c18f58 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/FragmentCallerType.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/FragmentCallerType.java @@ -28,10 +28,6 @@ public interface FragmentCallerType extends EObject /** * Returns the value of the 'Val1' attribute. * - *

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

* * @return the value of the 'Val1' attribute. * @see #setVal1(String) @@ -54,10 +50,6 @@ public interface FragmentCallerType extends EObject /** * Returns the value of the 'Val' attribute. * - *

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

* * @return the value of the 'Val' attribute. * @see #setVal(String) @@ -80,10 +72,6 @@ public interface FragmentCallerType extends EObject /** * Returns the value of the 'Frag Val' attribute. * - *

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

* * @return the value of the 'Frag Val' attribute. * @see #setFragVal(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/LongAlternative.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/LongAlternative.java index 97d3b1210..26f4687c5 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/LongAlternative.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/LongAlternative.java @@ -36,10 +36,6 @@ public interface LongAlternative extends EObject /** * Returns the value of the 'Foo' attribute. * - *

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

* * @return the value of the 'Foo' attribute. * @see #setFoo(String) @@ -63,10 +59,6 @@ public interface LongAlternative extends EObject * Returns the value of the 'Val1' attribute list. * The list contents are of type {@link java.lang.String}. * - *

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

* * @return the value of the 'Val1' attribute list. * @see org.eclipse.xtext.serializer.syntacticsequencertest.SyntacticsequencertestPackage#getLongAlternative_Val1() @@ -79,10 +71,6 @@ public interface LongAlternative extends EObject * Returns the value of the 'Val2' attribute list. * The list contents are of type {@link java.lang.String}. * - *

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

* * @return the value of the 'Val2' attribute list. * @see org.eclipse.xtext.serializer.syntacticsequencertest.SyntacticsequencertestPackage#getLongAlternative_Val2() @@ -95,10 +83,6 @@ public interface LongAlternative extends EObject * Returns the value of the 'Val3' attribute list. * The list contents are of type {@link java.lang.String}. * - *

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

* * @return the value of the 'Val3' attribute list. * @see org.eclipse.xtext.serializer.syntacticsequencertest.SyntacticsequencertestPackage#getLongAlternative_Val3() @@ -111,10 +95,6 @@ public interface LongAlternative extends EObject * Returns the value of the 'Val4' attribute list. * The list contents are of type {@link java.lang.String}. * - *

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

* * @return the value of the 'Val4' attribute list. * @see org.eclipse.xtext.serializer.syntacticsequencertest.SyntacticsequencertestPackage#getLongAlternative_Val4() @@ -127,10 +107,6 @@ public interface LongAlternative extends EObject * Returns the value of the 'Val5' attribute list. * The list contents are of type {@link java.lang.String}. * - *

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

* * @return the value of the 'Val5' attribute list. * @see org.eclipse.xtext.serializer.syntacticsequencertest.SyntacticsequencertestPackage#getLongAlternative_Val5() @@ -143,10 +119,6 @@ public interface LongAlternative extends EObject * Returns the value of the 'Val6' attribute list. * The list contents are of type {@link java.lang.String}. * - *

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

* * @return the value of the 'Val6' attribute list. * @see org.eclipse.xtext.serializer.syntacticsequencertest.SyntacticsequencertestPackage#getLongAlternative_Val6() @@ -159,10 +131,6 @@ public interface LongAlternative extends EObject * Returns the value of the 'Val7' attribute list. * The list contents are of type {@link java.lang.String}. * - *

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

* * @return the value of the 'Val7' attribute list. * @see org.eclipse.xtext.serializer.syntacticsequencertest.SyntacticsequencertestPackage#getLongAlternative_Val7() @@ -175,10 +143,6 @@ public interface LongAlternative extends EObject * Returns the value of the 'Val8' attribute list. * The list contents are of type {@link java.lang.String}. * - *

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

* * @return the value of the 'Val8' attribute list. * @see org.eclipse.xtext.serializer.syntacticsequencertest.SyntacticsequencertestPackage#getLongAlternative_Val8() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/MandatoryKeywords.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/MandatoryKeywords.java index 1e806dcda..86feb03c4 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/MandatoryKeywords.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/MandatoryKeywords.java @@ -28,10 +28,6 @@ public interface MandatoryKeywords extends EObject /** * Returns the value of the 'Val1' attribute. * - *

- * If the meaning of the 'Val1' attribute isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Val1' attribute. * @see #setVal1(String) @@ -54,10 +50,6 @@ public interface MandatoryKeywords extends EObject /** * Returns the value of the 'Val2' attribute. * - *

- * If the meaning of the 'Val2' attribute isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Val2' attribute. * @see #setVal2(String) @@ -80,10 +72,6 @@ public interface MandatoryKeywords extends EObject /** * Returns the value of the 'Val3' attribute. * - *

- * If the meaning of the 'Val3' attribute isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Val3' attribute. * @see #setVal3(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/MandatoryManyTransition.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/MandatoryManyTransition.java index e7cd659b5..f69de525b 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/MandatoryManyTransition.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/MandatoryManyTransition.java @@ -26,10 +26,6 @@ public interface MandatoryManyTransition extends EObject /** * Returns the value of the 'Val' attribute. * - *

- * If the meaning of the 'Val' attribute isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Val' attribute. * @see #setVal(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/Model.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/Model.java index 8cb52d02f..90cb94a1d 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/Model.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/Model.java @@ -41,10 +41,6 @@ public interface Model extends EObject /** * Returns the value of the 'X1' containment reference. * - *

- * If the meaning of the 'X1' containment reference isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'X1' containment reference. * @see #setX1(MandatoryKeywords) @@ -67,10 +63,6 @@ public interface Model extends EObject /** * Returns the value of the 'X2' containment reference. * - *

- * If the meaning of the 'X2' containment reference isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'X2' containment reference. * @see #setX2(Exp0) @@ -93,10 +85,6 @@ public interface Model extends EObject /** * Returns the value of the 'X3' containment reference. * - *

- * If the meaning of the 'X3' containment reference isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'X3' containment reference. * @see #setX3(Exp1) @@ -119,10 +107,6 @@ public interface Model extends EObject /** * Returns the value of the 'X4' containment reference. * - *

- * If the meaning of the 'X4' containment reference isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'X4' containment reference. * @see #setX4(Exp2) @@ -145,10 +129,6 @@ public interface Model extends EObject /** * Returns the value of the 'X5' containment reference. * - *

- * If the meaning of the 'X5' containment reference isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'X5' containment reference. * @see #setX5(SingleCrossReference) @@ -171,10 +151,6 @@ public interface Model extends EObject /** * Returns the value of the 'X6' containment reference. * - *

- * If the meaning of the 'X6' containment reference isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'X6' containment reference. * @see #setX6(BooleanAlternative) @@ -197,10 +173,6 @@ public interface Model extends EObject /** * Returns the value of the 'X7' containment reference. * - *

- * If the meaning of the 'X7' containment reference isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'X7' containment reference. * @see #setX7(UnassignedDatatype) @@ -223,10 +195,6 @@ public interface Model extends EObject /** * Returns the value of the 'X8' containment reference. * - *

- * If the meaning of the 'X8' containment reference isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'X8' containment reference. * @see #setX8(OptionalSingleTransition) @@ -249,10 +217,6 @@ public interface Model extends EObject /** * Returns the value of the 'X9' containment reference. * - *

- * If the meaning of the 'X9' containment reference isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'X9' containment reference. * @see #setX9(OptionalManyTransition) @@ -275,10 +239,6 @@ public interface Model extends EObject /** * Returns the value of the 'X10' containment reference. * - *

- * If the meaning of the 'X10' containment reference isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'X10' containment reference. * @see #setX10(MandatoryManyTransition) @@ -301,10 +261,6 @@ public interface Model extends EObject /** * Returns the value of the 'X11' containment reference. * - *

- * If the meaning of the 'X11' containment reference isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'X11' containment reference. * @see #setX11(AlternativeTransition) @@ -327,10 +283,6 @@ public interface Model extends EObject /** * Returns the value of the 'X12' containment reference. * - *

- * If the meaning of the 'X12' containment reference isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'X12' containment reference. * @see #setX12(BooleanValues) @@ -353,10 +305,6 @@ public interface Model extends EObject /** * Returns the value of the 'X13' containment reference. * - *

- * If the meaning of the 'X13' containment reference isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'X13' containment reference. * @see #setX13(LongAlternative) @@ -379,10 +327,6 @@ public interface Model extends EObject /** * Returns the value of the 'X14' containment reference. * - *

- * If the meaning of the 'X14' containment reference isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'X14' containment reference. * @see #setX14(ActionOnly) @@ -405,10 +349,6 @@ public interface Model extends EObject /** * Returns the value of the 'X15' containment reference. * - *

- * If the meaning of the 'X15' containment reference isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'X15' containment reference. * @see #setX15(FragmentCallerType) @@ -431,10 +371,6 @@ public interface Model extends EObject /** * Returns the value of the 'X16' containment reference. * - *

- * If the meaning of the 'X16' containment reference isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'X16' containment reference. * @see #setX16(Bug398890) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/Mult2.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/Mult2.java index ad0654981..977390d3e 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/Mult2.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/Mult2.java @@ -26,10 +26,6 @@ public interface Mult2 extends Exp2 /** * Returns the value of the 'Left' containment reference. * - *

- * If the meaning of the 'Left' containment reference isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Left' containment reference. * @see #setLeft(Exp2) @@ -52,10 +48,6 @@ public interface Mult2 extends Exp2 /** * Returns the value of the 'Right' containment reference. * - *

- * If the meaning of the 'Right' containment reference isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Right' containment reference. * @see #setRight(Exp2) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/OptionalManyTransition.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/OptionalManyTransition.java index 1141e36af..6e50b9121 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/OptionalManyTransition.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/OptionalManyTransition.java @@ -26,10 +26,6 @@ public interface OptionalManyTransition extends EObject /** * Returns the value of the 'Val' attribute. * - *

- * If the meaning of the 'Val' attribute isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Val' attribute. * @see #setVal(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/OptionalSingleTransition.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/OptionalSingleTransition.java index 328ffcbef..243784de0 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/OptionalSingleTransition.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/OptionalSingleTransition.java @@ -26,10 +26,6 @@ public interface OptionalSingleTransition extends EObject /** * Returns the value of the 'Val' attribute. * - *

- * If the meaning of the 'Val' attribute isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Val' attribute. * @see #setVal(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/SingleCrossReference.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/SingleCrossReference.java index 5065d262f..b4eb1fab2 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/SingleCrossReference.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/SingleCrossReference.java @@ -30,10 +30,6 @@ public interface SingleCrossReference 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) @@ -56,10 +52,6 @@ public interface SingleCrossReference extends EObject /** * Returns the value of the 'Ref1' reference. * - *

- * If the meaning of the 'Ref1' reference isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Ref1' reference. * @see #setRef1(SingleCrossReference) @@ -82,10 +74,6 @@ public interface SingleCrossReference extends EObject /** * Returns the value of the 'Ref2' reference. * - *

- * If the meaning of the 'Ref2' reference isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Ref2' reference. * @see #setRef2(SingleCrossReference) @@ -108,10 +96,6 @@ public interface SingleCrossReference extends EObject /** * Returns the value of the 'Ref3' reference. * - *

- * If the meaning of the 'Ref3' reference isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Ref3' reference. * @see #setRef3(SingleCrossReference) @@ -134,10 +118,6 @@ public interface SingleCrossReference extends EObject /** * Returns the value of the 'Ref4' reference. * - *

- * If the meaning of the 'Ref4' reference isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Ref4' reference. * @see #setRef4(SingleCrossReference) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/UnassignedDatatype.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/UnassignedDatatype.java index 4c99a0ec4..ff9c59194 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/UnassignedDatatype.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/UnassignedDatatype.java @@ -26,10 +26,6 @@ public interface UnassignedDatatype extends EObject /** * Returns the value of the 'Val' attribute. * - *

- * If the meaning of the 'Val' attribute isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Val' attribute. * @see #setVal(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/Val0.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/Val0.java index 7d81f9410..3b755f588 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/Val0.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/Val0.java @@ -25,10 +25,6 @@ public interface Val0 extends Exp0 /** * 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) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/Val1.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/Val1.java index a6b45f8f4..fae584c5b 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/Val1.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/Val1.java @@ -25,10 +25,6 @@ public interface Val1 extends Exp1 /** * 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) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/Val2.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/Val2.java index accc55d16..a608bb38c 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/Val2.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/Val2.java @@ -25,10 +25,6 @@ public interface Val2 extends Exp2 /** * 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) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/Add0Impl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/Add0Impl.java index 8d8673053..bb214c3a5 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/Add0Impl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/Add0Impl.java @@ -77,6 +77,7 @@ public class Add0Impl extends Exp0Impl implements Add0 * * @generated */ + @Override public Exp0 getLeft() { return left; @@ -104,6 +105,7 @@ public class Add0Impl extends Exp0Impl implements Add0 * * @generated */ + @Override public void setLeft(Exp0 newLeft) { if (newLeft != left) @@ -125,6 +127,7 @@ public class Add0Impl extends Exp0Impl implements Add0 * * @generated */ + @Override public Exp0 getRight() { return right; @@ -152,6 +155,7 @@ public class Add0Impl extends Exp0Impl implements Add0 * * @generated */ + @Override public void setRight(Exp0 newRight) { if (newRight != right) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/Add1Impl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/Add1Impl.java index f414e64a1..beb8d72af 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/Add1Impl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/Add1Impl.java @@ -77,6 +77,7 @@ public class Add1Impl extends Exp1Impl implements Add1 * * @generated */ + @Override public Exp1 getLeft() { return left; @@ -104,6 +105,7 @@ public class Add1Impl extends Exp1Impl implements Add1 * * @generated */ + @Override public void setLeft(Exp1 newLeft) { if (newLeft != left) @@ -125,6 +127,7 @@ public class Add1Impl extends Exp1Impl implements Add1 * * @generated */ + @Override public Exp1 getRight() { return right; @@ -152,6 +155,7 @@ public class Add1Impl extends Exp1Impl implements Add1 * * @generated */ + @Override public void setRight(Exp1 newRight) { if (newRight != right) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/Add2Impl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/Add2Impl.java index f236d5703..e6af6e7cc 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/Add2Impl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/Add2Impl.java @@ -77,6 +77,7 @@ public class Add2Impl extends Exp2Impl implements Add2 * * @generated */ + @Override public Exp2 getLeft() { return left; @@ -104,6 +105,7 @@ public class Add2Impl extends Exp2Impl implements Add2 * * @generated */ + @Override public void setLeft(Exp2 newLeft) { if (newLeft != left) @@ -125,6 +127,7 @@ public class Add2Impl extends Exp2Impl implements Add2 * * @generated */ + @Override public Exp2 getRight() { return right; @@ -152,6 +155,7 @@ public class Add2Impl extends Exp2Impl implements Add2 * * @generated */ + @Override public void setRight(Exp2 newRight) { if (newRight != right) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/AlternativeTransitionImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/AlternativeTransitionImpl.java index 16e7e9e06..eb96922c0 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/AlternativeTransitionImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/AlternativeTransitionImpl.java @@ -74,6 +74,7 @@ public class AlternativeTransitionImpl extends MinimalEObjectImpl.Container impl * * @generated */ + @Override public String getVal() { return val; @@ -84,6 +85,7 @@ public class AlternativeTransitionImpl extends MinimalEObjectImpl.Container impl * * @generated */ + @Override public void setVal(String newVal) { String oldVal = val; @@ -168,7 +170,7 @@ public class AlternativeTransitionImpl extends MinimalEObjectImpl.Container impl { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (val: "); result.append(val); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/BooleanAlternativeImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/BooleanAlternativeImpl.java index 1d3643b89..3e41369ba 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/BooleanAlternativeImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/BooleanAlternativeImpl.java @@ -67,6 +67,7 @@ public class BooleanAlternativeImpl extends MinimalEObjectImpl.Container impleme * * @generated */ + @Override public BooleanAlternativeLiteral getBool() { return bool; @@ -94,6 +95,7 @@ public class BooleanAlternativeImpl extends MinimalEObjectImpl.Container impleme * * @generated */ + @Override public void setBool(BooleanAlternativeLiteral newBool) { if (newBool != bool) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/BooleanAlternativeLiteralImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/BooleanAlternativeLiteralImpl.java index 92899f09d..c8dabf635 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/BooleanAlternativeLiteralImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/BooleanAlternativeLiteralImpl.java @@ -74,6 +74,7 @@ public class BooleanAlternativeLiteralImpl extends MinimalEObjectImpl.Container * * @generated */ + @Override public boolean isIsTrue() { return isTrue; @@ -84,6 +85,7 @@ public class BooleanAlternativeLiteralImpl extends MinimalEObjectImpl.Container * * @generated */ + @Override public void setIsTrue(boolean newIsTrue) { boolean oldIsTrue = isTrue; @@ -168,7 +170,7 @@ public class BooleanAlternativeLiteralImpl extends MinimalEObjectImpl.Container { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (isTrue: "); result.append(isTrue); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/BooleanValuesImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/BooleanValuesImpl.java index 7db93a783..cf125f9a9 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/BooleanValuesImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/BooleanValuesImpl.java @@ -116,6 +116,7 @@ public class BooleanValuesImpl extends MinimalEObjectImpl.Container implements B * * @generated */ + @Override public boolean isVal1() { return val1; @@ -126,6 +127,7 @@ public class BooleanValuesImpl extends MinimalEObjectImpl.Container implements B * * @generated */ + @Override public void setVal1(boolean newVal1) { boolean oldVal1 = val1; @@ -139,6 +141,7 @@ public class BooleanValuesImpl extends MinimalEObjectImpl.Container implements B * * @generated */ + @Override public boolean isVal2() { return val2; @@ -149,6 +152,7 @@ public class BooleanValuesImpl extends MinimalEObjectImpl.Container implements B * * @generated */ + @Override public void setVal2(boolean newVal2) { boolean oldVal2 = val2; @@ -162,6 +166,7 @@ public class BooleanValuesImpl extends MinimalEObjectImpl.Container implements B * * @generated */ + @Override public boolean isVal3() { return val3; @@ -172,6 +177,7 @@ public class BooleanValuesImpl extends MinimalEObjectImpl.Container implements B * * @generated */ + @Override public void setVal3(boolean newVal3) { boolean oldVal3 = val3; @@ -276,7 +282,7 @@ public class BooleanValuesImpl extends MinimalEObjectImpl.Container implements B { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (val1: "); result.append(val1); result.append(", val2: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/Bug398890Impl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/Bug398890Impl.java index a6ac46d51..5f62942bd 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/Bug398890Impl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/Bug398890Impl.java @@ -74,6 +74,7 @@ public class Bug398890Impl extends MinimalEObjectImpl.Container implements Bug39 * * @generated */ + @Override public String getName() { return name; @@ -84,6 +85,7 @@ public class Bug398890Impl extends MinimalEObjectImpl.Container implements Bug39 * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -168,7 +170,7 @@ public class Bug398890Impl extends MinimalEObjectImpl.Container implements Bug39 { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/FragmentCallerTypeImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/FragmentCallerTypeImpl.java index 819628864..a2202646f 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/FragmentCallerTypeImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/FragmentCallerTypeImpl.java @@ -116,6 +116,7 @@ public class FragmentCallerTypeImpl extends MinimalEObjectImpl.Container impleme * * @generated */ + @Override public String getVal1() { return val1; @@ -126,6 +127,7 @@ public class FragmentCallerTypeImpl extends MinimalEObjectImpl.Container impleme * * @generated */ + @Override public void setVal1(String newVal1) { String oldVal1 = val1; @@ -139,6 +141,7 @@ public class FragmentCallerTypeImpl extends MinimalEObjectImpl.Container impleme * * @generated */ + @Override public String getVal() { return val; @@ -149,6 +152,7 @@ public class FragmentCallerTypeImpl extends MinimalEObjectImpl.Container impleme * * @generated */ + @Override public void setVal(String newVal) { String oldVal = val; @@ -162,6 +166,7 @@ public class FragmentCallerTypeImpl extends MinimalEObjectImpl.Container impleme * * @generated */ + @Override public String getFragVal() { return fragVal; @@ -172,6 +177,7 @@ public class FragmentCallerTypeImpl extends MinimalEObjectImpl.Container impleme * * @generated */ + @Override public void setFragVal(String newFragVal) { String oldFragVal = fragVal; @@ -276,7 +282,7 @@ public class FragmentCallerTypeImpl extends MinimalEObjectImpl.Container impleme { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (val1: "); result.append(val1); result.append(", val: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/LongAlternativeImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/LongAlternativeImpl.java index 0dafa1c4d..82dcc0f6a 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/LongAlternativeImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/LongAlternativeImpl.java @@ -168,6 +168,7 @@ public class LongAlternativeImpl extends MinimalEObjectImpl.Container implements * * @generated */ + @Override public String getFoo() { return foo; @@ -178,6 +179,7 @@ public class LongAlternativeImpl extends MinimalEObjectImpl.Container implements * * @generated */ + @Override public void setFoo(String newFoo) { String oldFoo = foo; @@ -191,6 +193,7 @@ public class LongAlternativeImpl extends MinimalEObjectImpl.Container implements * * @generated */ + @Override public EList getVal1() { if (val1 == null) @@ -205,6 +208,7 @@ public class LongAlternativeImpl extends MinimalEObjectImpl.Container implements * * @generated */ + @Override public EList getVal2() { if (val2 == null) @@ -219,6 +223,7 @@ public class LongAlternativeImpl extends MinimalEObjectImpl.Container implements * * @generated */ + @Override public EList getVal3() { if (val3 == null) @@ -233,6 +238,7 @@ public class LongAlternativeImpl extends MinimalEObjectImpl.Container implements * * @generated */ + @Override public EList getVal4() { if (val4 == null) @@ -247,6 +253,7 @@ public class LongAlternativeImpl extends MinimalEObjectImpl.Container implements * * @generated */ + @Override public EList getVal5() { if (val5 == null) @@ -261,6 +268,7 @@ public class LongAlternativeImpl extends MinimalEObjectImpl.Container implements * * @generated */ + @Override public EList getVal6() { if (val6 == null) @@ -275,6 +283,7 @@ public class LongAlternativeImpl extends MinimalEObjectImpl.Container implements * * @generated */ + @Override public EList getVal7() { if (val7 == null) @@ -289,6 +298,7 @@ public class LongAlternativeImpl extends MinimalEObjectImpl.Container implements * * @generated */ + @Override public EList getVal8() { if (val8 == null) @@ -463,7 +473,7 @@ public class LongAlternativeImpl extends MinimalEObjectImpl.Container implements { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (foo: "); result.append(foo); result.append(", val1: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/MandatoryKeywordsImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/MandatoryKeywordsImpl.java index a8845c6a2..1fdf301ce 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/MandatoryKeywordsImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/MandatoryKeywordsImpl.java @@ -116,6 +116,7 @@ public class MandatoryKeywordsImpl extends MinimalEObjectImpl.Container implemen * * @generated */ + @Override public String getVal1() { return val1; @@ -126,6 +127,7 @@ public class MandatoryKeywordsImpl extends MinimalEObjectImpl.Container implemen * * @generated */ + @Override public void setVal1(String newVal1) { String oldVal1 = val1; @@ -139,6 +141,7 @@ public class MandatoryKeywordsImpl extends MinimalEObjectImpl.Container implemen * * @generated */ + @Override public String getVal2() { return val2; @@ -149,6 +152,7 @@ public class MandatoryKeywordsImpl extends MinimalEObjectImpl.Container implemen * * @generated */ + @Override public void setVal2(String newVal2) { String oldVal2 = val2; @@ -162,6 +166,7 @@ public class MandatoryKeywordsImpl extends MinimalEObjectImpl.Container implemen * * @generated */ + @Override public String getVal3() { return val3; @@ -172,6 +177,7 @@ public class MandatoryKeywordsImpl extends MinimalEObjectImpl.Container implemen * * @generated */ + @Override public void setVal3(String newVal3) { String oldVal3 = val3; @@ -276,7 +282,7 @@ public class MandatoryKeywordsImpl extends MinimalEObjectImpl.Container implemen { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (val1: "); result.append(val1); result.append(", val2: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/MandatoryManyTransitionImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/MandatoryManyTransitionImpl.java index 70fee6d28..210c70f5c 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/MandatoryManyTransitionImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/MandatoryManyTransitionImpl.java @@ -74,6 +74,7 @@ public class MandatoryManyTransitionImpl extends MinimalEObjectImpl.Container im * * @generated */ + @Override public String getVal() { return val; @@ -84,6 +85,7 @@ public class MandatoryManyTransitionImpl extends MinimalEObjectImpl.Container im * * @generated */ + @Override public void setVal(String newVal) { String oldVal = val; @@ -168,7 +170,7 @@ public class MandatoryManyTransitionImpl extends MinimalEObjectImpl.Container im { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (val: "); result.append(val); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/ModelImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/ModelImpl.java index b739eae9f..ba1182f2a 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/ModelImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/ModelImpl.java @@ -247,6 +247,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public MandatoryKeywords getX1() { return x1; @@ -274,6 +275,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setX1(MandatoryKeywords newX1) { if (newX1 != x1) @@ -295,6 +297,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public Exp0 getX2() { return x2; @@ -322,6 +325,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setX2(Exp0 newX2) { if (newX2 != x2) @@ -343,6 +347,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public Exp1 getX3() { return x3; @@ -370,6 +375,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setX3(Exp1 newX3) { if (newX3 != x3) @@ -391,6 +397,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public Exp2 getX4() { return x4; @@ -418,6 +425,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setX4(Exp2 newX4) { if (newX4 != x4) @@ -439,6 +447,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public SingleCrossReference getX5() { return x5; @@ -466,6 +475,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setX5(SingleCrossReference newX5) { if (newX5 != x5) @@ -487,6 +497,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public BooleanAlternative getX6() { return x6; @@ -514,6 +525,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setX6(BooleanAlternative newX6) { if (newX6 != x6) @@ -535,6 +547,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public UnassignedDatatype getX7() { return x7; @@ -562,6 +575,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setX7(UnassignedDatatype newX7) { if (newX7 != x7) @@ -583,6 +597,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public OptionalSingleTransition getX8() { return x8; @@ -610,6 +625,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setX8(OptionalSingleTransition newX8) { if (newX8 != x8) @@ -631,6 +647,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public OptionalManyTransition getX9() { return x9; @@ -658,6 +675,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setX9(OptionalManyTransition newX9) { if (newX9 != x9) @@ -679,6 +697,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public MandatoryManyTransition getX10() { return x10; @@ -706,6 +725,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setX10(MandatoryManyTransition newX10) { if (newX10 != x10) @@ -727,6 +747,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public AlternativeTransition getX11() { return x11; @@ -754,6 +775,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setX11(AlternativeTransition newX11) { if (newX11 != x11) @@ -775,6 +797,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public BooleanValues getX12() { return x12; @@ -802,6 +825,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setX12(BooleanValues newX12) { if (newX12 != x12) @@ -823,6 +847,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public LongAlternative getX13() { return x13; @@ -850,6 +875,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setX13(LongAlternative newX13) { if (newX13 != x13) @@ -871,6 +897,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public ActionOnly getX14() { return x14; @@ -898,6 +925,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setX14(ActionOnly newX14) { if (newX14 != x14) @@ -919,6 +947,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public FragmentCallerType getX15() { return x15; @@ -946,6 +975,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setX15(FragmentCallerType newX15) { if (newX15 != x15) @@ -967,6 +997,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public Bug398890 getX16() { return x16; @@ -994,6 +1025,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setX16(Bug398890 newX16) { if (newX16 != x16) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/Mult2Impl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/Mult2Impl.java index 33f68f594..b95554b47 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/Mult2Impl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/Mult2Impl.java @@ -77,6 +77,7 @@ public class Mult2Impl extends Exp2Impl implements Mult2 * * @generated */ + @Override public Exp2 getLeft() { return left; @@ -104,6 +105,7 @@ public class Mult2Impl extends Exp2Impl implements Mult2 * * @generated */ + @Override public void setLeft(Exp2 newLeft) { if (newLeft != left) @@ -125,6 +127,7 @@ public class Mult2Impl extends Exp2Impl implements Mult2 * * @generated */ + @Override public Exp2 getRight() { return right; @@ -152,6 +155,7 @@ public class Mult2Impl extends Exp2Impl implements Mult2 * * @generated */ + @Override public void setRight(Exp2 newRight) { if (newRight != right) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/OptionalManyTransitionImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/OptionalManyTransitionImpl.java index dd39448a3..98f9eb4cf 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/OptionalManyTransitionImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/OptionalManyTransitionImpl.java @@ -74,6 +74,7 @@ public class OptionalManyTransitionImpl extends MinimalEObjectImpl.Container imp * * @generated */ + @Override public String getVal() { return val; @@ -84,6 +85,7 @@ public class OptionalManyTransitionImpl extends MinimalEObjectImpl.Container imp * * @generated */ + @Override public void setVal(String newVal) { String oldVal = val; @@ -168,7 +170,7 @@ public class OptionalManyTransitionImpl extends MinimalEObjectImpl.Container imp { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (val: "); result.append(val); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/OptionalSingleTransitionImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/OptionalSingleTransitionImpl.java index 2c0b570e7..1727d0f21 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/OptionalSingleTransitionImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/OptionalSingleTransitionImpl.java @@ -74,6 +74,7 @@ public class OptionalSingleTransitionImpl extends MinimalEObjectImpl.Container i * * @generated */ + @Override public String getVal() { return val; @@ -84,6 +85,7 @@ public class OptionalSingleTransitionImpl extends MinimalEObjectImpl.Container i * * @generated */ + @Override public void setVal(String newVal) { String oldVal = val; @@ -168,7 +170,7 @@ public class OptionalSingleTransitionImpl extends MinimalEObjectImpl.Container i { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (val: "); result.append(val); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/SingleCrossReferenceImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/SingleCrossReferenceImpl.java index 6ad2ae0dd..3b2ed69eb 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/SingleCrossReferenceImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/SingleCrossReferenceImpl.java @@ -119,6 +119,7 @@ public class SingleCrossReferenceImpl extends MinimalEObjectImpl.Container imple * * @generated */ + @Override public String getName() { return name; @@ -129,6 +130,7 @@ public class SingleCrossReferenceImpl extends MinimalEObjectImpl.Container imple * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -142,6 +144,7 @@ public class SingleCrossReferenceImpl extends MinimalEObjectImpl.Container imple * * @generated */ + @Override public SingleCrossReference getRef1() { if (ref1 != null && ref1.eIsProxy()) @@ -172,6 +175,7 @@ public class SingleCrossReferenceImpl extends MinimalEObjectImpl.Container imple * * @generated */ + @Override public void setRef1(SingleCrossReference newRef1) { SingleCrossReference oldRef1 = ref1; @@ -185,6 +189,7 @@ public class SingleCrossReferenceImpl extends MinimalEObjectImpl.Container imple * * @generated */ + @Override public SingleCrossReference getRef2() { if (ref2 != null && ref2.eIsProxy()) @@ -215,6 +220,7 @@ public class SingleCrossReferenceImpl extends MinimalEObjectImpl.Container imple * * @generated */ + @Override public void setRef2(SingleCrossReference newRef2) { SingleCrossReference oldRef2 = ref2; @@ -228,6 +234,7 @@ public class SingleCrossReferenceImpl extends MinimalEObjectImpl.Container imple * * @generated */ + @Override public SingleCrossReference getRef3() { if (ref3 != null && ref3.eIsProxy()) @@ -258,6 +265,7 @@ public class SingleCrossReferenceImpl extends MinimalEObjectImpl.Container imple * * @generated */ + @Override public void setRef3(SingleCrossReference newRef3) { SingleCrossReference oldRef3 = ref3; @@ -271,6 +279,7 @@ public class SingleCrossReferenceImpl extends MinimalEObjectImpl.Container imple * * @generated */ + @Override public SingleCrossReference getRef4() { if (ref4 != null && ref4.eIsProxy()) @@ -301,6 +310,7 @@ public class SingleCrossReferenceImpl extends MinimalEObjectImpl.Container imple * * @generated */ + @Override public void setRef4(SingleCrossReference newRef4) { SingleCrossReference oldRef4 = ref4; @@ -429,7 +439,7 @@ public class SingleCrossReferenceImpl extends MinimalEObjectImpl.Container imple { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/SyntacticsequencertestFactoryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/SyntacticsequencertestFactoryImpl.java index 459858ea5..e7ce705ea 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/SyntacticsequencertestFactoryImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/SyntacticsequencertestFactoryImpl.java @@ -100,6 +100,7 @@ public class SyntacticsequencertestFactoryImpl extends EFactoryImpl implements S * * @generated */ + @Override public Model createModel() { ModelImpl model = new ModelImpl(); @@ -111,6 +112,7 @@ public class SyntacticsequencertestFactoryImpl extends EFactoryImpl implements S * * @generated */ + @Override public MandatoryKeywords createMandatoryKeywords() { MandatoryKeywordsImpl mandatoryKeywords = new MandatoryKeywordsImpl(); @@ -122,6 +124,7 @@ public class SyntacticsequencertestFactoryImpl extends EFactoryImpl implements S * * @generated */ + @Override public Exp0 createExp0() { Exp0Impl exp0 = new Exp0Impl(); @@ -133,6 +136,7 @@ public class SyntacticsequencertestFactoryImpl extends EFactoryImpl implements S * * @generated */ + @Override public Exp1 createExp1() { Exp1Impl exp1 = new Exp1Impl(); @@ -144,6 +148,7 @@ public class SyntacticsequencertestFactoryImpl extends EFactoryImpl implements S * * @generated */ + @Override public Exp2 createExp2() { Exp2Impl exp2 = new Exp2Impl(); @@ -155,6 +160,7 @@ public class SyntacticsequencertestFactoryImpl extends EFactoryImpl implements S * * @generated */ + @Override public SingleCrossReference createSingleCrossReference() { SingleCrossReferenceImpl singleCrossReference = new SingleCrossReferenceImpl(); @@ -166,6 +172,7 @@ public class SyntacticsequencertestFactoryImpl extends EFactoryImpl implements S * * @generated */ + @Override public BooleanAlternative createBooleanAlternative() { BooleanAlternativeImpl booleanAlternative = new BooleanAlternativeImpl(); @@ -177,6 +184,7 @@ public class SyntacticsequencertestFactoryImpl extends EFactoryImpl implements S * * @generated */ + @Override public BooleanAlternativeLiteral createBooleanAlternativeLiteral() { BooleanAlternativeLiteralImpl booleanAlternativeLiteral = new BooleanAlternativeLiteralImpl(); @@ -188,6 +196,7 @@ public class SyntacticsequencertestFactoryImpl extends EFactoryImpl implements S * * @generated */ + @Override public UnassignedDatatype createUnassignedDatatype() { UnassignedDatatypeImpl unassignedDatatype = new UnassignedDatatypeImpl(); @@ -199,6 +208,7 @@ public class SyntacticsequencertestFactoryImpl extends EFactoryImpl implements S * * @generated */ + @Override public OptionalSingleTransition createOptionalSingleTransition() { OptionalSingleTransitionImpl optionalSingleTransition = new OptionalSingleTransitionImpl(); @@ -210,6 +220,7 @@ public class SyntacticsequencertestFactoryImpl extends EFactoryImpl implements S * * @generated */ + @Override public OptionalManyTransition createOptionalManyTransition() { OptionalManyTransitionImpl optionalManyTransition = new OptionalManyTransitionImpl(); @@ -221,6 +232,7 @@ public class SyntacticsequencertestFactoryImpl extends EFactoryImpl implements S * * @generated */ + @Override public MandatoryManyTransition createMandatoryManyTransition() { MandatoryManyTransitionImpl mandatoryManyTransition = new MandatoryManyTransitionImpl(); @@ -232,6 +244,7 @@ public class SyntacticsequencertestFactoryImpl extends EFactoryImpl implements S * * @generated */ + @Override public AlternativeTransition createAlternativeTransition() { AlternativeTransitionImpl alternativeTransition = new AlternativeTransitionImpl(); @@ -243,6 +256,7 @@ public class SyntacticsequencertestFactoryImpl extends EFactoryImpl implements S * * @generated */ + @Override public BooleanValues createBooleanValues() { BooleanValuesImpl booleanValues = new BooleanValuesImpl(); @@ -254,6 +268,7 @@ public class SyntacticsequencertestFactoryImpl extends EFactoryImpl implements S * * @generated */ + @Override public LongAlternative createLongAlternative() { LongAlternativeImpl longAlternative = new LongAlternativeImpl(); @@ -265,6 +280,7 @@ public class SyntacticsequencertestFactoryImpl extends EFactoryImpl implements S * * @generated */ + @Override public ActionOnly createActionOnly() { ActionOnlyImpl actionOnly = new ActionOnlyImpl(); @@ -276,6 +292,7 @@ public class SyntacticsequencertestFactoryImpl extends EFactoryImpl implements S * * @generated */ + @Override public FragmentCallerType createFragmentCallerType() { FragmentCallerTypeImpl fragmentCallerType = new FragmentCallerTypeImpl(); @@ -287,6 +304,7 @@ public class SyntacticsequencertestFactoryImpl extends EFactoryImpl implements S * * @generated */ + @Override public Bug398890 createBug398890() { Bug398890Impl bug398890 = new Bug398890Impl(); @@ -298,6 +316,7 @@ public class SyntacticsequencertestFactoryImpl extends EFactoryImpl implements S * * @generated */ + @Override public Add0 createAdd0() { Add0Impl add0 = new Add0Impl(); @@ -309,6 +328,7 @@ public class SyntacticsequencertestFactoryImpl extends EFactoryImpl implements S * * @generated */ + @Override public Val0 createVal0() { Val0Impl val0 = new Val0Impl(); @@ -320,6 +340,7 @@ public class SyntacticsequencertestFactoryImpl extends EFactoryImpl implements S * * @generated */ + @Override public Add1 createAdd1() { Add1Impl add1 = new Add1Impl(); @@ -331,6 +352,7 @@ public class SyntacticsequencertestFactoryImpl extends EFactoryImpl implements S * * @generated */ + @Override public Val1 createVal1() { Val1Impl val1 = new Val1Impl(); @@ -342,6 +364,7 @@ public class SyntacticsequencertestFactoryImpl extends EFactoryImpl implements S * * @generated */ + @Override public Add2 createAdd2() { Add2Impl add2 = new Add2Impl(); @@ -353,6 +376,7 @@ public class SyntacticsequencertestFactoryImpl extends EFactoryImpl implements S * * @generated */ + @Override public Mult2 createMult2() { Mult2Impl mult2 = new Mult2Impl(); @@ -364,6 +388,7 @@ public class SyntacticsequencertestFactoryImpl extends EFactoryImpl implements S * * @generated */ + @Override public Val2 createVal2() { Val2Impl val2 = new Val2Impl(); @@ -375,6 +400,7 @@ public class SyntacticsequencertestFactoryImpl extends EFactoryImpl implements S * * @generated */ + @Override public SyntacticsequencertestPackage getSyntacticsequencertestPackage() { return (SyntacticsequencertestPackage)getEPackage(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/SyntacticsequencertestPackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/SyntacticsequencertestPackageImpl.java index c4d93c144..e4e9319ca 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/SyntacticsequencertestPackageImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/SyntacticsequencertestPackageImpl.java @@ -251,7 +251,7 @@ public class SyntacticsequencertestPackageImpl extends EPackageImpl implements S /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link SyntacticsequencertestPackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -266,7 +266,8 @@ public class SyntacticsequencertestPackageImpl extends EPackageImpl implements S if (isInited) return (SyntacticsequencertestPackage)EPackage.Registry.INSTANCE.getEPackage(SyntacticsequencertestPackage.eNS_URI); // Obtain or create and register package - SyntacticsequencertestPackageImpl theSyntacticsequencertestPackage = (SyntacticsequencertestPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof SyntacticsequencertestPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new SyntacticsequencertestPackageImpl()); + Object registeredSyntacticsequencertestPackage = EPackage.Registry.INSTANCE.get(eNS_URI); + SyntacticsequencertestPackageImpl theSyntacticsequencertestPackage = registeredSyntacticsequencertestPackage instanceof SyntacticsequencertestPackageImpl ? (SyntacticsequencertestPackageImpl)registeredSyntacticsequencertestPackage : new SyntacticsequencertestPackageImpl(); isInited = true; @@ -282,7 +283,6 @@ public class SyntacticsequencertestPackageImpl extends EPackageImpl implements S // Mark meta-data to indicate it can't be changed theSyntacticsequencertestPackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(SyntacticsequencertestPackage.eNS_URI, theSyntacticsequencertestPackage); return theSyntacticsequencertestPackage; @@ -293,6 +293,7 @@ public class SyntacticsequencertestPackageImpl extends EPackageImpl implements S * * @generated */ + @Override public EClass getModel() { return modelEClass; @@ -303,6 +304,7 @@ public class SyntacticsequencertestPackageImpl extends EPackageImpl implements S * * @generated */ + @Override public EReference getModel_X1() { return (EReference)modelEClass.getEStructuralFeatures().get(0); @@ -313,6 +315,7 @@ public class SyntacticsequencertestPackageImpl extends EPackageImpl implements S * * @generated */ + @Override public EReference getModel_X2() { return (EReference)modelEClass.getEStructuralFeatures().get(1); @@ -323,6 +326,7 @@ public class SyntacticsequencertestPackageImpl extends EPackageImpl implements S * * @generated */ + @Override public EReference getModel_X3() { return (EReference)modelEClass.getEStructuralFeatures().get(2); @@ -333,6 +337,7 @@ public class SyntacticsequencertestPackageImpl extends EPackageImpl implements S * * @generated */ + @Override public EReference getModel_X4() { return (EReference)modelEClass.getEStructuralFeatures().get(3); @@ -343,6 +348,7 @@ public class SyntacticsequencertestPackageImpl extends EPackageImpl implements S * * @generated */ + @Override public EReference getModel_X5() { return (EReference)modelEClass.getEStructuralFeatures().get(4); @@ -353,6 +359,7 @@ public class SyntacticsequencertestPackageImpl extends EPackageImpl implements S * * @generated */ + @Override public EReference getModel_X6() { return (EReference)modelEClass.getEStructuralFeatures().get(5); @@ -363,6 +370,7 @@ public class SyntacticsequencertestPackageImpl extends EPackageImpl implements S * * @generated */ + @Override public EReference getModel_X7() { return (EReference)modelEClass.getEStructuralFeatures().get(6); @@ -373,6 +381,7 @@ public class SyntacticsequencertestPackageImpl extends EPackageImpl implements S * * @generated */ + @Override public EReference getModel_X8() { return (EReference)modelEClass.getEStructuralFeatures().get(7); @@ -383,6 +392,7 @@ public class SyntacticsequencertestPackageImpl extends EPackageImpl implements S * * @generated */ + @Override public EReference getModel_X9() { return (EReference)modelEClass.getEStructuralFeatures().get(8); @@ -393,6 +403,7 @@ public class SyntacticsequencertestPackageImpl extends EPackageImpl implements S * * @generated */ + @Override public EReference getModel_X10() { return (EReference)modelEClass.getEStructuralFeatures().get(9); @@ -403,6 +414,7 @@ public class SyntacticsequencertestPackageImpl extends EPackageImpl implements S * * @generated */ + @Override public EReference getModel_X11() { return (EReference)modelEClass.getEStructuralFeatures().get(10); @@ -413,6 +425,7 @@ public class SyntacticsequencertestPackageImpl extends EPackageImpl implements S * * @generated */ + @Override public EReference getModel_X12() { return (EReference)modelEClass.getEStructuralFeatures().get(11); @@ -423,6 +436,7 @@ public class SyntacticsequencertestPackageImpl extends EPackageImpl implements S * * @generated */ + @Override public EReference getModel_X13() { return (EReference)modelEClass.getEStructuralFeatures().get(12); @@ -433,6 +447,7 @@ public class SyntacticsequencertestPackageImpl extends EPackageImpl implements S * * @generated */ + @Override public EReference getModel_X14() { return (EReference)modelEClass.getEStructuralFeatures().get(13); @@ -443,6 +458,7 @@ public class SyntacticsequencertestPackageImpl extends EPackageImpl implements S * * @generated */ + @Override public EReference getModel_X15() { return (EReference)modelEClass.getEStructuralFeatures().get(14); @@ -453,6 +469,7 @@ public class SyntacticsequencertestPackageImpl extends EPackageImpl implements S * * @generated */ + @Override public EReference getModel_X16() { return (EReference)modelEClass.getEStructuralFeatures().get(15); @@ -463,6 +480,7 @@ public class SyntacticsequencertestPackageImpl extends EPackageImpl implements S * * @generated */ + @Override public EClass getMandatoryKeywords() { return mandatoryKeywordsEClass; @@ -473,6 +491,7 @@ public class SyntacticsequencertestPackageImpl extends EPackageImpl implements S * * @generated */ + @Override public EAttribute getMandatoryKeywords_Val1() { return (EAttribute)mandatoryKeywordsEClass.getEStructuralFeatures().get(0); @@ -483,6 +502,7 @@ public class SyntacticsequencertestPackageImpl extends EPackageImpl implements S * * @generated */ + @Override public EAttribute getMandatoryKeywords_Val2() { return (EAttribute)mandatoryKeywordsEClass.getEStructuralFeatures().get(1); @@ -493,6 +513,7 @@ public class SyntacticsequencertestPackageImpl extends EPackageImpl implements S * * @generated */ + @Override public EAttribute getMandatoryKeywords_Val3() { return (EAttribute)mandatoryKeywordsEClass.getEStructuralFeatures().get(2); @@ -503,6 +524,7 @@ public class SyntacticsequencertestPackageImpl extends EPackageImpl implements S * * @generated */ + @Override public EClass getExp0() { return exp0EClass; @@ -513,6 +535,7 @@ public class SyntacticsequencertestPackageImpl extends EPackageImpl implements S * * @generated */ + @Override public EClass getExp1() { return exp1EClass; @@ -523,6 +546,7 @@ public class SyntacticsequencertestPackageImpl extends EPackageImpl implements S * * @generated */ + @Override public EClass getExp2() { return exp2EClass; @@ -533,6 +557,7 @@ public class SyntacticsequencertestPackageImpl extends EPackageImpl implements S * * @generated */ + @Override public EClass getSingleCrossReference() { return singleCrossReferenceEClass; @@ -543,6 +568,7 @@ public class SyntacticsequencertestPackageImpl extends EPackageImpl implements S * * @generated */ + @Override public EAttribute getSingleCrossReference_Name() { return (EAttribute)singleCrossReferenceEClass.getEStructuralFeatures().get(0); @@ -553,6 +579,7 @@ public class SyntacticsequencertestPackageImpl extends EPackageImpl implements S * * @generated */ + @Override public EReference getSingleCrossReference_Ref1() { return (EReference)singleCrossReferenceEClass.getEStructuralFeatures().get(1); @@ -563,6 +590,7 @@ public class SyntacticsequencertestPackageImpl extends EPackageImpl implements S * * @generated */ + @Override public EReference getSingleCrossReference_Ref2() { return (EReference)singleCrossReferenceEClass.getEStructuralFeatures().get(2); @@ -573,6 +601,7 @@ public class SyntacticsequencertestPackageImpl extends EPackageImpl implements S * * @generated */ + @Override public EReference getSingleCrossReference_Ref3() { return (EReference)singleCrossReferenceEClass.getEStructuralFeatures().get(3); @@ -583,6 +612,7 @@ public class SyntacticsequencertestPackageImpl extends EPackageImpl implements S * * @generated */ + @Override public EReference getSingleCrossReference_Ref4() { return (EReference)singleCrossReferenceEClass.getEStructuralFeatures().get(4); @@ -593,6 +623,7 @@ public class SyntacticsequencertestPackageImpl extends EPackageImpl implements S * * @generated */ + @Override public EClass getBooleanAlternative() { return booleanAlternativeEClass; @@ -603,6 +634,7 @@ public class SyntacticsequencertestPackageImpl extends EPackageImpl implements S * * @generated */ + @Override public EReference getBooleanAlternative_Bool() { return (EReference)booleanAlternativeEClass.getEStructuralFeatures().get(0); @@ -613,6 +645,7 @@ public class SyntacticsequencertestPackageImpl extends EPackageImpl implements S * * @generated */ + @Override public EClass getBooleanAlternativeLiteral() { return booleanAlternativeLiteralEClass; @@ -623,6 +656,7 @@ public class SyntacticsequencertestPackageImpl extends EPackageImpl implements S * * @generated */ + @Override public EAttribute getBooleanAlternativeLiteral_IsTrue() { return (EAttribute)booleanAlternativeLiteralEClass.getEStructuralFeatures().get(0); @@ -633,6 +667,7 @@ public class SyntacticsequencertestPackageImpl extends EPackageImpl implements S * * @generated */ + @Override public EClass getUnassignedDatatype() { return unassignedDatatypeEClass; @@ -643,6 +678,7 @@ public class SyntacticsequencertestPackageImpl extends EPackageImpl implements S * * @generated */ + @Override public EAttribute getUnassignedDatatype_Val() { return (EAttribute)unassignedDatatypeEClass.getEStructuralFeatures().get(0); @@ -653,6 +689,7 @@ public class SyntacticsequencertestPackageImpl extends EPackageImpl implements S * * @generated */ + @Override public EClass getOptionalSingleTransition() { return optionalSingleTransitionEClass; @@ -663,6 +700,7 @@ public class SyntacticsequencertestPackageImpl extends EPackageImpl implements S * * @generated */ + @Override public EAttribute getOptionalSingleTransition_Val() { return (EAttribute)optionalSingleTransitionEClass.getEStructuralFeatures().get(0); @@ -673,6 +711,7 @@ public class SyntacticsequencertestPackageImpl extends EPackageImpl implements S * * @generated */ + @Override public EClass getOptionalManyTransition() { return optionalManyTransitionEClass; @@ -683,6 +722,7 @@ public class SyntacticsequencertestPackageImpl extends EPackageImpl implements S * * @generated */ + @Override public EAttribute getOptionalManyTransition_Val() { return (EAttribute)optionalManyTransitionEClass.getEStructuralFeatures().get(0); @@ -693,6 +733,7 @@ public class SyntacticsequencertestPackageImpl extends EPackageImpl implements S * * @generated */ + @Override public EClass getMandatoryManyTransition() { return mandatoryManyTransitionEClass; @@ -703,6 +744,7 @@ public class SyntacticsequencertestPackageImpl extends EPackageImpl implements S * * @generated */ + @Override public EAttribute getMandatoryManyTransition_Val() { return (EAttribute)mandatoryManyTransitionEClass.getEStructuralFeatures().get(0); @@ -713,6 +755,7 @@ public class SyntacticsequencertestPackageImpl extends EPackageImpl implements S * * @generated */ + @Override public EClass getAlternativeTransition() { return alternativeTransitionEClass; @@ -723,6 +766,7 @@ public class SyntacticsequencertestPackageImpl extends EPackageImpl implements S * * @generated */ + @Override public EAttribute getAlternativeTransition_Val() { return (EAttribute)alternativeTransitionEClass.getEStructuralFeatures().get(0); @@ -733,6 +777,7 @@ public class SyntacticsequencertestPackageImpl extends EPackageImpl implements S * * @generated */ + @Override public EClass getBooleanValues() { return booleanValuesEClass; @@ -743,6 +788,7 @@ public class SyntacticsequencertestPackageImpl extends EPackageImpl implements S * * @generated */ + @Override public EAttribute getBooleanValues_Val1() { return (EAttribute)booleanValuesEClass.getEStructuralFeatures().get(0); @@ -753,6 +799,7 @@ public class SyntacticsequencertestPackageImpl extends EPackageImpl implements S * * @generated */ + @Override public EAttribute getBooleanValues_Val2() { return (EAttribute)booleanValuesEClass.getEStructuralFeatures().get(1); @@ -763,6 +810,7 @@ public class SyntacticsequencertestPackageImpl extends EPackageImpl implements S * * @generated */ + @Override public EAttribute getBooleanValues_Val3() { return (EAttribute)booleanValuesEClass.getEStructuralFeatures().get(2); @@ -773,6 +821,7 @@ public class SyntacticsequencertestPackageImpl extends EPackageImpl implements S * * @generated */ + @Override public EClass getLongAlternative() { return longAlternativeEClass; @@ -783,6 +832,7 @@ public class SyntacticsequencertestPackageImpl extends EPackageImpl implements S * * @generated */ + @Override public EAttribute getLongAlternative_Foo() { return (EAttribute)longAlternativeEClass.getEStructuralFeatures().get(0); @@ -793,6 +843,7 @@ public class SyntacticsequencertestPackageImpl extends EPackageImpl implements S * * @generated */ + @Override public EAttribute getLongAlternative_Val1() { return (EAttribute)longAlternativeEClass.getEStructuralFeatures().get(1); @@ -803,6 +854,7 @@ public class SyntacticsequencertestPackageImpl extends EPackageImpl implements S * * @generated */ + @Override public EAttribute getLongAlternative_Val2() { return (EAttribute)longAlternativeEClass.getEStructuralFeatures().get(2); @@ -813,6 +865,7 @@ public class SyntacticsequencertestPackageImpl extends EPackageImpl implements S * * @generated */ + @Override public EAttribute getLongAlternative_Val3() { return (EAttribute)longAlternativeEClass.getEStructuralFeatures().get(3); @@ -823,6 +876,7 @@ public class SyntacticsequencertestPackageImpl extends EPackageImpl implements S * * @generated */ + @Override public EAttribute getLongAlternative_Val4() { return (EAttribute)longAlternativeEClass.getEStructuralFeatures().get(4); @@ -833,6 +887,7 @@ public class SyntacticsequencertestPackageImpl extends EPackageImpl implements S * * @generated */ + @Override public EAttribute getLongAlternative_Val5() { return (EAttribute)longAlternativeEClass.getEStructuralFeatures().get(5); @@ -843,6 +898,7 @@ public class SyntacticsequencertestPackageImpl extends EPackageImpl implements S * * @generated */ + @Override public EAttribute getLongAlternative_Val6() { return (EAttribute)longAlternativeEClass.getEStructuralFeatures().get(6); @@ -853,6 +909,7 @@ public class SyntacticsequencertestPackageImpl extends EPackageImpl implements S * * @generated */ + @Override public EAttribute getLongAlternative_Val7() { return (EAttribute)longAlternativeEClass.getEStructuralFeatures().get(7); @@ -863,6 +920,7 @@ public class SyntacticsequencertestPackageImpl extends EPackageImpl implements S * * @generated */ + @Override public EAttribute getLongAlternative_Val8() { return (EAttribute)longAlternativeEClass.getEStructuralFeatures().get(8); @@ -873,6 +931,7 @@ public class SyntacticsequencertestPackageImpl extends EPackageImpl implements S * * @generated */ + @Override public EClass getActionOnly() { return actionOnlyEClass; @@ -883,6 +942,7 @@ public class SyntacticsequencertestPackageImpl extends EPackageImpl implements S * * @generated */ + @Override public EClass getFragmentCallerType() { return fragmentCallerTypeEClass; @@ -893,6 +953,7 @@ public class SyntacticsequencertestPackageImpl extends EPackageImpl implements S * * @generated */ + @Override public EAttribute getFragmentCallerType_Val1() { return (EAttribute)fragmentCallerTypeEClass.getEStructuralFeatures().get(0); @@ -903,6 +964,7 @@ public class SyntacticsequencertestPackageImpl extends EPackageImpl implements S * * @generated */ + @Override public EAttribute getFragmentCallerType_Val() { return (EAttribute)fragmentCallerTypeEClass.getEStructuralFeatures().get(1); @@ -913,6 +975,7 @@ public class SyntacticsequencertestPackageImpl extends EPackageImpl implements S * * @generated */ + @Override public EAttribute getFragmentCallerType_FragVal() { return (EAttribute)fragmentCallerTypeEClass.getEStructuralFeatures().get(2); @@ -923,6 +986,7 @@ public class SyntacticsequencertestPackageImpl extends EPackageImpl implements S * * @generated */ + @Override public EClass getBug398890() { return bug398890EClass; @@ -933,6 +997,7 @@ public class SyntacticsequencertestPackageImpl extends EPackageImpl implements S * * @generated */ + @Override public EAttribute getBug398890_Name() { return (EAttribute)bug398890EClass.getEStructuralFeatures().get(0); @@ -943,6 +1008,7 @@ public class SyntacticsequencertestPackageImpl extends EPackageImpl implements S * * @generated */ + @Override public EClass getAdd0() { return add0EClass; @@ -953,6 +1019,7 @@ public class SyntacticsequencertestPackageImpl extends EPackageImpl implements S * * @generated */ + @Override public EReference getAdd0_Left() { return (EReference)add0EClass.getEStructuralFeatures().get(0); @@ -963,6 +1030,7 @@ public class SyntacticsequencertestPackageImpl extends EPackageImpl implements S * * @generated */ + @Override public EReference getAdd0_Right() { return (EReference)add0EClass.getEStructuralFeatures().get(1); @@ -973,6 +1041,7 @@ public class SyntacticsequencertestPackageImpl extends EPackageImpl implements S * * @generated */ + @Override public EClass getVal0() { return val0EClass; @@ -983,6 +1052,7 @@ public class SyntacticsequencertestPackageImpl extends EPackageImpl implements S * * @generated */ + @Override public EAttribute getVal0_Name() { return (EAttribute)val0EClass.getEStructuralFeatures().get(0); @@ -993,6 +1063,7 @@ public class SyntacticsequencertestPackageImpl extends EPackageImpl implements S * * @generated */ + @Override public EClass getAdd1() { return add1EClass; @@ -1003,6 +1074,7 @@ public class SyntacticsequencertestPackageImpl extends EPackageImpl implements S * * @generated */ + @Override public EReference getAdd1_Left() { return (EReference)add1EClass.getEStructuralFeatures().get(0); @@ -1013,6 +1085,7 @@ public class SyntacticsequencertestPackageImpl extends EPackageImpl implements S * * @generated */ + @Override public EReference getAdd1_Right() { return (EReference)add1EClass.getEStructuralFeatures().get(1); @@ -1023,6 +1096,7 @@ public class SyntacticsequencertestPackageImpl extends EPackageImpl implements S * * @generated */ + @Override public EClass getVal1() { return val1EClass; @@ -1033,6 +1107,7 @@ public class SyntacticsequencertestPackageImpl extends EPackageImpl implements S * * @generated */ + @Override public EAttribute getVal1_Name() { return (EAttribute)val1EClass.getEStructuralFeatures().get(0); @@ -1043,6 +1118,7 @@ public class SyntacticsequencertestPackageImpl extends EPackageImpl implements S * * @generated */ + @Override public EClass getAdd2() { return add2EClass; @@ -1053,6 +1129,7 @@ public class SyntacticsequencertestPackageImpl extends EPackageImpl implements S * * @generated */ + @Override public EReference getAdd2_Left() { return (EReference)add2EClass.getEStructuralFeatures().get(0); @@ -1063,6 +1140,7 @@ public class SyntacticsequencertestPackageImpl extends EPackageImpl implements S * * @generated */ + @Override public EReference getAdd2_Right() { return (EReference)add2EClass.getEStructuralFeatures().get(1); @@ -1073,6 +1151,7 @@ public class SyntacticsequencertestPackageImpl extends EPackageImpl implements S * * @generated */ + @Override public EClass getMult2() { return mult2EClass; @@ -1083,6 +1162,7 @@ public class SyntacticsequencertestPackageImpl extends EPackageImpl implements S * * @generated */ + @Override public EReference getMult2_Left() { return (EReference)mult2EClass.getEStructuralFeatures().get(0); @@ -1093,6 +1173,7 @@ public class SyntacticsequencertestPackageImpl extends EPackageImpl implements S * * @generated */ + @Override public EReference getMult2_Right() { return (EReference)mult2EClass.getEStructuralFeatures().get(1); @@ -1103,6 +1184,7 @@ public class SyntacticsequencertestPackageImpl extends EPackageImpl implements S * * @generated */ + @Override public EClass getVal2() { return val2EClass; @@ -1113,6 +1195,7 @@ public class SyntacticsequencertestPackageImpl extends EPackageImpl implements S * * @generated */ + @Override public EAttribute getVal2_Name() { return (EAttribute)val2EClass.getEStructuralFeatures().get(0); @@ -1123,6 +1206,7 @@ public class SyntacticsequencertestPackageImpl extends EPackageImpl implements S * * @generated */ + @Override public SyntacticsequencertestFactory getSyntacticsequencertestFactory() { return (SyntacticsequencertestFactory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/UnassignedDatatypeImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/UnassignedDatatypeImpl.java index 61741d7a3..db647e9f7 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/UnassignedDatatypeImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/UnassignedDatatypeImpl.java @@ -74,6 +74,7 @@ public class UnassignedDatatypeImpl extends MinimalEObjectImpl.Container impleme * * @generated */ + @Override public String getVal() { return val; @@ -84,6 +85,7 @@ public class UnassignedDatatypeImpl extends MinimalEObjectImpl.Container impleme * * @generated */ + @Override public void setVal(String newVal) { String oldVal = val; @@ -168,7 +170,7 @@ public class UnassignedDatatypeImpl extends MinimalEObjectImpl.Container impleme { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (val: "); result.append(val); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/Val0Impl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/Val0Impl.java index c418c977e..7bf83400f 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/Val0Impl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/Val0Impl.java @@ -73,6 +73,7 @@ public class Val0Impl extends Exp0Impl implements Val0 * * @generated */ + @Override public String getName() { return name; @@ -83,6 +84,7 @@ public class Val0Impl extends Exp0Impl implements Val0 * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -167,7 +169,7 @@ public class Val0Impl extends Exp0Impl implements Val0 { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/Val1Impl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/Val1Impl.java index b0ee5404f..e0fbc287b 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/Val1Impl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/Val1Impl.java @@ -73,6 +73,7 @@ public class Val1Impl extends Exp1Impl implements Val1 * * @generated */ + @Override public String getName() { return name; @@ -83,6 +84,7 @@ public class Val1Impl extends Exp1Impl implements Val1 * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -167,7 +169,7 @@ public class Val1Impl extends Exp1Impl implements Val1 { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/Val2Impl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/Val2Impl.java index 8df5695a8..703ca39f3 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/Val2Impl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/syntacticsequencertest/impl/Val2Impl.java @@ -73,6 +73,7 @@ public class Val2Impl extends Exp2Impl implements Val2 * * @generated */ + @Override public String getName() { return name; @@ -83,6 +84,7 @@ public class Val2Impl extends Exp2Impl implements Val2 * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -167,7 +169,7 @@ public class Val2Impl extends Exp2Impl implements Val2 { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/ActionTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/ActionTestLanguage.genmodel index efd78d34e..9584b1a0c 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/ActionTestLanguage.genmodel +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/ActionTestLanguage.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="ActionTestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> + complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/ActionTestLanguage2.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/ActionTestLanguage2.genmodel index a019d90fb..0a6214d6b 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/ActionTestLanguage2.genmodel +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/ActionTestLanguage2.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="ActionTestLanguage2" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> + complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/FowlerDslTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/FowlerDslTestLanguage.genmodel index a5e4b9c9e..96941d5e7 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/FowlerDslTestLanguage.genmodel +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/FowlerDslTestLanguage.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="FowlerDslTestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> + complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/LookaheadTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/LookaheadTestLanguage.genmodel index 580dd329c..c9280ae43 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/LookaheadTestLanguage.genmodel +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/LookaheadTestLanguage.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="LookaheadTestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> + complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/OptionalEmptyTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/OptionalEmptyTestLanguage.genmodel index 0785af9e4..6cd11178a 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/OptionalEmptyTestLanguage.genmodel +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/OptionalEmptyTestLanguage.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="OptionalEmptyTestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> + complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/PartialParserTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/PartialParserTestLanguage.genmodel index 54205bee6..19641c9a7 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/PartialParserTestLanguage.genmodel +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/PartialParserTestLanguage.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="PartialParserTestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> + complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/ReferenceGrammarTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/ReferenceGrammarTestLanguage.genmodel index 7338808a1..d6f620bc5 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/ReferenceGrammarTestLanguage.genmodel +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/ReferenceGrammarTestLanguage.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="ReferenceGrammarTestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> + complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/SimpleExpressionsTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/SimpleExpressionsTestLanguage.genmodel index 719a66be6..13ec5c57e 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/SimpleExpressionsTestLanguage.genmodel +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/SimpleExpressionsTestLanguage.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="SimpleExpressionsTestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> + complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/TestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/TestLanguage.genmodel index bfb5a3c2d..bbc7d2d65 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/TestLanguage.genmodel +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/TestLanguage.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="TestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> + complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/TreeTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/TreeTestLanguage.genmodel index 28ae32dc4..9994e12d1 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/TreeTestLanguage.genmodel +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/TreeTestLanguage.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="TreeTestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> + complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/actionLang/Child.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/actionLang/Child.java index f97423944..9caa5b4b6 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/actionLang/Child.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/actionLang/Child.java @@ -25,10 +25,6 @@ public interface Child extends Model /** * 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) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/actionLang/Parent.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/actionLang/Parent.java index 6132165cd..4d52fc5a3 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/actionLang/Parent.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/actionLang/Parent.java @@ -26,10 +26,6 @@ public interface Parent extends Model /** * Returns the value of the 'Left' containment reference. * - *

- * If the meaning of the 'Left' containment reference isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Left' containment reference. * @see #setLeft(Child) @@ -52,10 +48,6 @@ public interface Parent extends Model /** * Returns the value of the 'Right' containment reference. * - *

- * If the meaning of the 'Right' containment reference isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Right' containment reference. * @see #setRight(Child) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/actionLang/impl/ActionLangFactoryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/actionLang/impl/ActionLangFactoryImpl.java index d0f7b5ee3..0b5d89b5d 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/actionLang/impl/ActionLangFactoryImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/actionLang/impl/ActionLangFactoryImpl.java @@ -78,6 +78,7 @@ public class ActionLangFactoryImpl extends EFactoryImpl implements ActionLangFac * * @generated */ + @Override public Model createModel() { ModelImpl model = new ModelImpl(); @@ -89,6 +90,7 @@ public class ActionLangFactoryImpl extends EFactoryImpl implements ActionLangFac * * @generated */ + @Override public Child createChild() { ChildImpl child = new ChildImpl(); @@ -100,6 +102,7 @@ public class ActionLangFactoryImpl extends EFactoryImpl implements ActionLangFac * * @generated */ + @Override public Parent createParent() { ParentImpl parent = new ParentImpl(); @@ -111,6 +114,7 @@ public class ActionLangFactoryImpl extends EFactoryImpl implements ActionLangFac * * @generated */ + @Override public ActionLangPackage getActionLangPackage() { return (ActionLangPackage)getEPackage(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/actionLang/impl/ActionLangPackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/actionLang/impl/ActionLangPackageImpl.java index 57e374683..04aea1a2a 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/actionLang/impl/ActionLangPackageImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/actionLang/impl/ActionLangPackageImpl.java @@ -75,7 +75,7 @@ public class ActionLangPackageImpl extends EPackageImpl implements ActionLangPac /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link ActionLangPackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -90,7 +90,8 @@ public class ActionLangPackageImpl extends EPackageImpl implements ActionLangPac if (isInited) return (ActionLangPackage)EPackage.Registry.INSTANCE.getEPackage(ActionLangPackage.eNS_URI); // Obtain or create and register package - ActionLangPackageImpl theActionLangPackage = (ActionLangPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof ActionLangPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new ActionLangPackageImpl()); + Object registeredActionLangPackage = EPackage.Registry.INSTANCE.get(eNS_URI); + ActionLangPackageImpl theActionLangPackage = registeredActionLangPackage instanceof ActionLangPackageImpl ? (ActionLangPackageImpl)registeredActionLangPackage : new ActionLangPackageImpl(); isInited = true; @@ -106,7 +107,6 @@ public class ActionLangPackageImpl extends EPackageImpl implements ActionLangPac // Mark meta-data to indicate it can't be changed theActionLangPackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(ActionLangPackage.eNS_URI, theActionLangPackage); return theActionLangPackage; @@ -117,6 +117,7 @@ public class ActionLangPackageImpl extends EPackageImpl implements ActionLangPac * * @generated */ + @Override public EClass getModel() { return modelEClass; @@ -127,6 +128,7 @@ public class ActionLangPackageImpl extends EPackageImpl implements ActionLangPac * * @generated */ + @Override public EClass getChild() { return childEClass; @@ -137,6 +139,7 @@ public class ActionLangPackageImpl extends EPackageImpl implements ActionLangPac * * @generated */ + @Override public EAttribute getChild_Name() { return (EAttribute)childEClass.getEStructuralFeatures().get(0); @@ -147,6 +150,7 @@ public class ActionLangPackageImpl extends EPackageImpl implements ActionLangPac * * @generated */ + @Override public EClass getParent() { return parentEClass; @@ -157,6 +161,7 @@ public class ActionLangPackageImpl extends EPackageImpl implements ActionLangPac * * @generated */ + @Override public EReference getParent_Left() { return (EReference)parentEClass.getEStructuralFeatures().get(0); @@ -167,6 +172,7 @@ public class ActionLangPackageImpl extends EPackageImpl implements ActionLangPac * * @generated */ + @Override public EReference getParent_Right() { return (EReference)parentEClass.getEStructuralFeatures().get(1); @@ -177,6 +183,7 @@ public class ActionLangPackageImpl extends EPackageImpl implements ActionLangPac * * @generated */ + @Override public ActionLangFactory getActionLangFactory() { return (ActionLangFactory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/actionLang/impl/ChildImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/actionLang/impl/ChildImpl.java index ab0ce0416..908266136 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/actionLang/impl/ChildImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/actionLang/impl/ChildImpl.java @@ -73,6 +73,7 @@ public class ChildImpl extends ModelImpl implements Child * * @generated */ + @Override public String getName() { return name; @@ -83,6 +84,7 @@ public class ChildImpl extends ModelImpl implements Child * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -167,7 +169,7 @@ public class ChildImpl extends ModelImpl implements Child { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/actionLang/impl/ParentImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/actionLang/impl/ParentImpl.java index 487de56aa..c885a69b6 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/actionLang/impl/ParentImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/actionLang/impl/ParentImpl.java @@ -77,6 +77,7 @@ public class ParentImpl extends ModelImpl implements Parent * * @generated */ + @Override public Child getLeft() { return left; @@ -104,6 +105,7 @@ public class ParentImpl extends ModelImpl implements Parent * * @generated */ + @Override public void setLeft(Child newLeft) { if (newLeft != left) @@ -125,6 +127,7 @@ public class ParentImpl extends ModelImpl implements Parent * * @generated */ + @Override public Child getRight() { return right; @@ -152,6 +155,7 @@ public class ParentImpl extends ModelImpl implements Parent * * @generated */ + @Override public void setRight(Child newRight) { if (newRight != right) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/actionLang2/ORing.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/actionLang2/ORing.java index daced790c..4e5c5fc06 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/actionLang2/ORing.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/actionLang2/ORing.java @@ -29,10 +29,6 @@ public interface ORing extends EObject * Returns the value of the 'Disjuncts' containment reference list. * The list contents are of type {@link org.eclipse.xtext.testlanguages.actionLang2.ORing}. * - *

- * If the meaning of the 'Disjuncts' containment reference list isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Disjuncts' containment reference list. * @see org.eclipse.xtext.testlanguages.actionLang2.ActionLang2Package#getORing_Disjuncts() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/actionLang2/Value.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/actionLang2/Value.java index 61b429111..a6a0769f3 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/actionLang2/Value.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/actionLang2/Value.java @@ -25,10 +25,6 @@ public interface Value extends ORing /** * Returns the value of the 'Value' attribute. * - *

- * If the meaning of the 'Value' attribute isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Value' attribute. * @see #setValue(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/actionLang2/impl/ActionLang2FactoryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/actionLang2/impl/ActionLang2FactoryImpl.java index a7b91c475..8516063cf 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/actionLang2/impl/ActionLang2FactoryImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/actionLang2/impl/ActionLang2FactoryImpl.java @@ -77,6 +77,7 @@ public class ActionLang2FactoryImpl extends EFactoryImpl implements ActionLang2F * * @generated */ + @Override public ORing createORing() { ORingImpl oRing = new ORingImpl(); @@ -88,6 +89,7 @@ public class ActionLang2FactoryImpl extends EFactoryImpl implements ActionLang2F * * @generated */ + @Override public Value createValue() { ValueImpl value = new ValueImpl(); @@ -99,6 +101,7 @@ public class ActionLang2FactoryImpl extends EFactoryImpl implements ActionLang2F * * @generated */ + @Override public ActionLang2Package getActionLang2Package() { return (ActionLang2Package)getEPackage(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/actionLang2/impl/ActionLang2PackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/actionLang2/impl/ActionLang2PackageImpl.java index d30992a00..b80774e47 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/actionLang2/impl/ActionLang2PackageImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/actionLang2/impl/ActionLang2PackageImpl.java @@ -67,7 +67,7 @@ public class ActionLang2PackageImpl extends EPackageImpl implements ActionLang2P /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link ActionLang2Package#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -82,7 +82,8 @@ public class ActionLang2PackageImpl extends EPackageImpl implements ActionLang2P if (isInited) return (ActionLang2Package)EPackage.Registry.INSTANCE.getEPackage(ActionLang2Package.eNS_URI); // Obtain or create and register package - ActionLang2PackageImpl theActionLang2Package = (ActionLang2PackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof ActionLang2PackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new ActionLang2PackageImpl()); + Object registeredActionLang2Package = EPackage.Registry.INSTANCE.get(eNS_URI); + ActionLang2PackageImpl theActionLang2Package = registeredActionLang2Package instanceof ActionLang2PackageImpl ? (ActionLang2PackageImpl)registeredActionLang2Package : new ActionLang2PackageImpl(); isInited = true; @@ -98,7 +99,6 @@ public class ActionLang2PackageImpl extends EPackageImpl implements ActionLang2P // Mark meta-data to indicate it can't be changed theActionLang2Package.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(ActionLang2Package.eNS_URI, theActionLang2Package); return theActionLang2Package; @@ -109,6 +109,7 @@ public class ActionLang2PackageImpl extends EPackageImpl implements ActionLang2P * * @generated */ + @Override public EClass getORing() { return oRingEClass; @@ -119,6 +120,7 @@ public class ActionLang2PackageImpl extends EPackageImpl implements ActionLang2P * * @generated */ + @Override public EReference getORing_Disjuncts() { return (EReference)oRingEClass.getEStructuralFeatures().get(0); @@ -129,6 +131,7 @@ public class ActionLang2PackageImpl extends EPackageImpl implements ActionLang2P * * @generated */ + @Override public EClass getValue() { return valueEClass; @@ -139,6 +142,7 @@ public class ActionLang2PackageImpl extends EPackageImpl implements ActionLang2P * * @generated */ + @Override public EAttribute getValue_Value() { return (EAttribute)valueEClass.getEStructuralFeatures().get(0); @@ -149,6 +153,7 @@ public class ActionLang2PackageImpl extends EPackageImpl implements ActionLang2P * * @generated */ + @Override public ActionLang2Factory getActionLang2Factory() { return (ActionLang2Factory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/actionLang2/impl/ORingImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/actionLang2/impl/ORingImpl.java index 84dd74186..23de78de9 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/actionLang2/impl/ORingImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/actionLang2/impl/ORingImpl.java @@ -71,6 +71,7 @@ public class ORingImpl extends MinimalEObjectImpl.Container implements ORing * * @generated */ + @Override public EList getDisjuncts() { if (disjuncts == null) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/actionLang2/impl/ValueImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/actionLang2/impl/ValueImpl.java index 0dd3b1c13..ee692ddcd 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/actionLang2/impl/ValueImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/actionLang2/impl/ValueImpl.java @@ -73,6 +73,7 @@ public class ValueImpl extends ORingImpl implements Value * * @generated */ + @Override public String getValue() { return value; @@ -83,6 +84,7 @@ public class ValueImpl extends ORingImpl implements Value * * @generated */ + @Override public void setValue(String newValue) { String oldValue = value; @@ -167,7 +169,7 @@ public class ValueImpl extends ORingImpl implements Value { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (value: "); result.append(value); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/fowlerdsl/Command.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/fowlerdsl/Command.java index 3fc4e49ed..af0057e72 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/fowlerdsl/Command.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/fowlerdsl/Command.java @@ -27,10 +27,6 @@ public interface Command 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) @@ -53,10 +49,6 @@ public interface Command extends EObject /** * Returns the value of the 'Code' attribute. * - *

- * If the meaning of the 'Code' attribute isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Code' attribute. * @see #setCode(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/fowlerdsl/Event.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/fowlerdsl/Event.java index 002d7539b..23cee4105 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/fowlerdsl/Event.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/fowlerdsl/Event.java @@ -28,10 +28,6 @@ public interface Event extends EObject /** * Returns the value of the 'Resetting' attribute. * - *

- * If the meaning of the 'Resetting' attribute isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Resetting' attribute. * @see #setResetting(boolean) @@ -54,10 +50,6 @@ public interface Event 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) @@ -80,10 +72,6 @@ public interface Event extends EObject /** * Returns the value of the 'Code' attribute. * - *

- * If the meaning of the 'Code' attribute isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Code' attribute. * @see #setCode(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/fowlerdsl/State.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/fowlerdsl/State.java index 2993c9ff9..3a7b514ce 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/fowlerdsl/State.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/fowlerdsl/State.java @@ -30,10 +30,6 @@ public interface State 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) @@ -57,10 +53,6 @@ public interface State extends EObject * Returns the value of the 'Actions' reference list. * The list contents are of type {@link org.eclipse.xtext.testlanguages.fowlerdsl.Command}. * - *

- * If the meaning of the 'Actions' reference list isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Actions' reference list. * @see org.eclipse.xtext.testlanguages.fowlerdsl.FowlerdslPackage#getState_Actions() @@ -73,10 +65,6 @@ public interface State extends EObject * Returns the value of the 'Transitions' containment reference list. * The list contents are of type {@link org.eclipse.xtext.testlanguages.fowlerdsl.Transition}. * - *

- * If the meaning of the 'Transitions' containment reference list isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Transitions' containment reference list. * @see org.eclipse.xtext.testlanguages.fowlerdsl.FowlerdslPackage#getState_Transitions() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/fowlerdsl/Statemachine.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/fowlerdsl/Statemachine.java index d6c04e159..ff9b4f5c2 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/fowlerdsl/Statemachine.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/fowlerdsl/Statemachine.java @@ -31,10 +31,6 @@ public interface Statemachine extends EObject * Returns the value of the 'Events' containment reference list. * The list contents are of type {@link org.eclipse.xtext.testlanguages.fowlerdsl.Event}. * - *

- * If the meaning of the 'Events' containment reference list isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Events' containment reference list. * @see org.eclipse.xtext.testlanguages.fowlerdsl.FowlerdslPackage#getStatemachine_Events() @@ -47,10 +43,6 @@ public interface Statemachine extends EObject * Returns the value of the 'Commands' containment reference list. * The list contents are of type {@link org.eclipse.xtext.testlanguages.fowlerdsl.Command}. * - *

- * If the meaning of the 'Commands' containment reference list isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Commands' containment reference list. * @see org.eclipse.xtext.testlanguages.fowlerdsl.FowlerdslPackage#getStatemachine_Commands() @@ -63,10 +55,6 @@ public interface Statemachine extends EObject * Returns the value of the 'States' containment reference list. * The list contents are of type {@link org.eclipse.xtext.testlanguages.fowlerdsl.State}. * - *

- * If the meaning of the 'States' containment reference list isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'States' containment reference list. * @see org.eclipse.xtext.testlanguages.fowlerdsl.FowlerdslPackage#getStatemachine_States() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/fowlerdsl/Transition.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/fowlerdsl/Transition.java index 0a40a576e..c8fb86a10 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/fowlerdsl/Transition.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/fowlerdsl/Transition.java @@ -27,10 +27,6 @@ public interface Transition extends EObject /** * Returns the value of the 'Event' reference. * - *

- * If the meaning of the 'Event' reference isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Event' reference. * @see #setEvent(Event) @@ -53,10 +49,6 @@ public interface Transition extends EObject /** * Returns the value of the 'State' reference. * - *

- * If the meaning of the 'State' reference isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'State' reference. * @see #setState(State) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/fowlerdsl/impl/CommandImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/fowlerdsl/impl/CommandImpl.java index 164d5a3bd..193b1ed68 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/fowlerdsl/impl/CommandImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/fowlerdsl/impl/CommandImpl.java @@ -95,6 +95,7 @@ public class CommandImpl extends MinimalEObjectImpl.Container implements Command * * @generated */ + @Override public String getName() { return name; @@ -105,6 +106,7 @@ public class CommandImpl extends MinimalEObjectImpl.Container implements Command * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -118,6 +120,7 @@ public class CommandImpl extends MinimalEObjectImpl.Container implements Command * * @generated */ + @Override public String getCode() { return code; @@ -128,6 +131,7 @@ public class CommandImpl extends MinimalEObjectImpl.Container implements Command * * @generated */ + @Override public void setCode(String newCode) { String oldCode = code; @@ -222,7 +226,7 @@ public class CommandImpl extends MinimalEObjectImpl.Container implements Command { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(", code: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/fowlerdsl/impl/EventImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/fowlerdsl/impl/EventImpl.java index 4f2b414d4..e01903f9a 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/fowlerdsl/impl/EventImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/fowlerdsl/impl/EventImpl.java @@ -116,6 +116,7 @@ public class EventImpl extends MinimalEObjectImpl.Container implements Event * * @generated */ + @Override public boolean isResetting() { return resetting; @@ -126,6 +127,7 @@ public class EventImpl extends MinimalEObjectImpl.Container implements Event * * @generated */ + @Override public void setResetting(boolean newResetting) { boolean oldResetting = resetting; @@ -139,6 +141,7 @@ public class EventImpl extends MinimalEObjectImpl.Container implements Event * * @generated */ + @Override public String getName() { return name; @@ -149,6 +152,7 @@ public class EventImpl extends MinimalEObjectImpl.Container implements Event * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -162,6 +166,7 @@ public class EventImpl extends MinimalEObjectImpl.Container implements Event * * @generated */ + @Override public String getCode() { return code; @@ -172,6 +177,7 @@ public class EventImpl extends MinimalEObjectImpl.Container implements Event * * @generated */ + @Override public void setCode(String newCode) { String oldCode = code; @@ -276,7 +282,7 @@ public class EventImpl extends MinimalEObjectImpl.Container implements Event { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (resetting: "); result.append(resetting); result.append(", name: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/fowlerdsl/impl/FowlerdslFactoryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/fowlerdsl/impl/FowlerdslFactoryImpl.java index e14eeb591..0cd702391 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/fowlerdsl/impl/FowlerdslFactoryImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/fowlerdsl/impl/FowlerdslFactoryImpl.java @@ -80,6 +80,7 @@ public class FowlerdslFactoryImpl extends EFactoryImpl implements FowlerdslFacto * * @generated */ + @Override public Statemachine createStatemachine() { StatemachineImpl statemachine = new StatemachineImpl(); @@ -91,6 +92,7 @@ public class FowlerdslFactoryImpl extends EFactoryImpl implements FowlerdslFacto * * @generated */ + @Override public Event createEvent() { EventImpl event = new EventImpl(); @@ -102,6 +104,7 @@ public class FowlerdslFactoryImpl extends EFactoryImpl implements FowlerdslFacto * * @generated */ + @Override public Command createCommand() { CommandImpl command = new CommandImpl(); @@ -113,6 +116,7 @@ public class FowlerdslFactoryImpl extends EFactoryImpl implements FowlerdslFacto * * @generated */ + @Override public State createState() { StateImpl state = new StateImpl(); @@ -124,6 +128,7 @@ public class FowlerdslFactoryImpl extends EFactoryImpl implements FowlerdslFacto * * @generated */ + @Override public Transition createTransition() { TransitionImpl transition = new TransitionImpl(); @@ -135,6 +140,7 @@ public class FowlerdslFactoryImpl extends EFactoryImpl implements FowlerdslFacto * * @generated */ + @Override public FowlerdslPackage getFowlerdslPackage() { return (FowlerdslPackage)getEPackage(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/fowlerdsl/impl/FowlerdslPackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/fowlerdsl/impl/FowlerdslPackageImpl.java index 7c2e96a0c..3429586bf 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/fowlerdsl/impl/FowlerdslPackageImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/fowlerdsl/impl/FowlerdslPackageImpl.java @@ -91,7 +91,7 @@ public class FowlerdslPackageImpl extends EPackageImpl implements FowlerdslPacka /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link FowlerdslPackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -106,7 +106,8 @@ public class FowlerdslPackageImpl extends EPackageImpl implements FowlerdslPacka if (isInited) return (FowlerdslPackage)EPackage.Registry.INSTANCE.getEPackage(FowlerdslPackage.eNS_URI); // Obtain or create and register package - FowlerdslPackageImpl theFowlerdslPackage = (FowlerdslPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof FowlerdslPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new FowlerdslPackageImpl()); + Object registeredFowlerdslPackage = EPackage.Registry.INSTANCE.get(eNS_URI); + FowlerdslPackageImpl theFowlerdslPackage = registeredFowlerdslPackage instanceof FowlerdslPackageImpl ? (FowlerdslPackageImpl)registeredFowlerdslPackage : new FowlerdslPackageImpl(); isInited = true; @@ -122,7 +123,6 @@ public class FowlerdslPackageImpl extends EPackageImpl implements FowlerdslPacka // Mark meta-data to indicate it can't be changed theFowlerdslPackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(FowlerdslPackage.eNS_URI, theFowlerdslPackage); return theFowlerdslPackage; @@ -133,6 +133,7 @@ public class FowlerdslPackageImpl extends EPackageImpl implements FowlerdslPacka * * @generated */ + @Override public EClass getStatemachine() { return statemachineEClass; @@ -143,6 +144,7 @@ public class FowlerdslPackageImpl extends EPackageImpl implements FowlerdslPacka * * @generated */ + @Override public EReference getStatemachine_Events() { return (EReference)statemachineEClass.getEStructuralFeatures().get(0); @@ -153,6 +155,7 @@ public class FowlerdslPackageImpl extends EPackageImpl implements FowlerdslPacka * * @generated */ + @Override public EReference getStatemachine_Commands() { return (EReference)statemachineEClass.getEStructuralFeatures().get(1); @@ -163,6 +166,7 @@ public class FowlerdslPackageImpl extends EPackageImpl implements FowlerdslPacka * * @generated */ + @Override public EReference getStatemachine_States() { return (EReference)statemachineEClass.getEStructuralFeatures().get(2); @@ -173,6 +177,7 @@ public class FowlerdslPackageImpl extends EPackageImpl implements FowlerdslPacka * * @generated */ + @Override public EClass getEvent() { return eventEClass; @@ -183,6 +188,7 @@ public class FowlerdslPackageImpl extends EPackageImpl implements FowlerdslPacka * * @generated */ + @Override public EAttribute getEvent_Resetting() { return (EAttribute)eventEClass.getEStructuralFeatures().get(0); @@ -193,6 +199,7 @@ public class FowlerdslPackageImpl extends EPackageImpl implements FowlerdslPacka * * @generated */ + @Override public EAttribute getEvent_Name() { return (EAttribute)eventEClass.getEStructuralFeatures().get(1); @@ -203,6 +210,7 @@ public class FowlerdslPackageImpl extends EPackageImpl implements FowlerdslPacka * * @generated */ + @Override public EAttribute getEvent_Code() { return (EAttribute)eventEClass.getEStructuralFeatures().get(2); @@ -213,6 +221,7 @@ public class FowlerdslPackageImpl extends EPackageImpl implements FowlerdslPacka * * @generated */ + @Override public EClass getCommand() { return commandEClass; @@ -223,6 +232,7 @@ public class FowlerdslPackageImpl extends EPackageImpl implements FowlerdslPacka * * @generated */ + @Override public EAttribute getCommand_Name() { return (EAttribute)commandEClass.getEStructuralFeatures().get(0); @@ -233,6 +243,7 @@ public class FowlerdslPackageImpl extends EPackageImpl implements FowlerdslPacka * * @generated */ + @Override public EAttribute getCommand_Code() { return (EAttribute)commandEClass.getEStructuralFeatures().get(1); @@ -243,6 +254,7 @@ public class FowlerdslPackageImpl extends EPackageImpl implements FowlerdslPacka * * @generated */ + @Override public EClass getState() { return stateEClass; @@ -253,6 +265,7 @@ public class FowlerdslPackageImpl extends EPackageImpl implements FowlerdslPacka * * @generated */ + @Override public EAttribute getState_Name() { return (EAttribute)stateEClass.getEStructuralFeatures().get(0); @@ -263,6 +276,7 @@ public class FowlerdslPackageImpl extends EPackageImpl implements FowlerdslPacka * * @generated */ + @Override public EReference getState_Actions() { return (EReference)stateEClass.getEStructuralFeatures().get(1); @@ -273,6 +287,7 @@ public class FowlerdslPackageImpl extends EPackageImpl implements FowlerdslPacka * * @generated */ + @Override public EReference getState_Transitions() { return (EReference)stateEClass.getEStructuralFeatures().get(2); @@ -283,6 +298,7 @@ public class FowlerdslPackageImpl extends EPackageImpl implements FowlerdslPacka * * @generated */ + @Override public EClass getTransition() { return transitionEClass; @@ -293,6 +309,7 @@ public class FowlerdslPackageImpl extends EPackageImpl implements FowlerdslPacka * * @generated */ + @Override public EReference getTransition_Event() { return (EReference)transitionEClass.getEStructuralFeatures().get(0); @@ -303,6 +320,7 @@ public class FowlerdslPackageImpl extends EPackageImpl implements FowlerdslPacka * * @generated */ + @Override public EReference getTransition_State() { return (EReference)transitionEClass.getEStructuralFeatures().get(1); @@ -313,6 +331,7 @@ public class FowlerdslPackageImpl extends EPackageImpl implements FowlerdslPacka * * @generated */ + @Override public FowlerdslFactory getFowlerdslFactory() { return (FowlerdslFactory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/fowlerdsl/impl/StateImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/fowlerdsl/impl/StateImpl.java index c057943ca..0b508ffcb 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/fowlerdsl/impl/StateImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/fowlerdsl/impl/StateImpl.java @@ -108,6 +108,7 @@ public class StateImpl extends MinimalEObjectImpl.Container implements State * * @generated */ + @Override public String getName() { return name; @@ -118,6 +119,7 @@ public class StateImpl extends MinimalEObjectImpl.Container implements State * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -131,6 +133,7 @@ public class StateImpl extends MinimalEObjectImpl.Container implements State * * @generated */ + @Override public EList getActions() { if (actions == null) @@ -145,6 +148,7 @@ public class StateImpl extends MinimalEObjectImpl.Container implements State * * @generated */ + @Override public EList getTransitions() { if (transitions == null) @@ -269,7 +273,7 @@ public class StateImpl extends MinimalEObjectImpl.Container implements State { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/fowlerdsl/impl/StatemachineImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/fowlerdsl/impl/StatemachineImpl.java index 9dca7c306..f51462d16 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/fowlerdsl/impl/StatemachineImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/fowlerdsl/impl/StatemachineImpl.java @@ -96,6 +96,7 @@ public class StatemachineImpl extends MinimalEObjectImpl.Container implements St * * @generated */ + @Override public EList getEvents() { if (events == null) @@ -110,6 +111,7 @@ public class StatemachineImpl extends MinimalEObjectImpl.Container implements St * * @generated */ + @Override public EList getCommands() { if (commands == null) @@ -124,6 +126,7 @@ public class StatemachineImpl extends MinimalEObjectImpl.Container implements St * * @generated */ + @Override public EList getStates() { if (states == null) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/fowlerdsl/impl/TransitionImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/fowlerdsl/impl/TransitionImpl.java index 798888544..8d2be8bfe 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/fowlerdsl/impl/TransitionImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/fowlerdsl/impl/TransitionImpl.java @@ -78,6 +78,7 @@ public class TransitionImpl extends MinimalEObjectImpl.Container implements Tran * * @generated */ + @Override public Event getEvent() { if (event != null && event.eIsProxy()) @@ -108,6 +109,7 @@ public class TransitionImpl extends MinimalEObjectImpl.Container implements Tran * * @generated */ + @Override public void setEvent(Event newEvent) { Event oldEvent = event; @@ -121,6 +123,7 @@ public class TransitionImpl extends MinimalEObjectImpl.Container implements Tran * * @generated */ + @Override public State getState() { if (state != null && state.eIsProxy()) @@ -151,6 +154,7 @@ public class TransitionImpl extends MinimalEObjectImpl.Container implements Tran * * @generated */ + @Override public void setState(State newState) { State oldState = state; diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/indent/IndentationAwareTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/indent/IndentationAwareTestLanguage.genmodel index 7b909f557..8326b3875 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/indent/IndentationAwareTestLanguage.genmodel +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/indent/IndentationAwareTestLanguage.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="IndentationAwareTestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> + complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/indent/indentLang/Node.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/indent/indentLang/Node.java index 216a97edf..46976d783 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/indent/indentLang/Node.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/indent/indentLang/Node.java @@ -27,10 +27,6 @@ public interface Node 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) @@ -53,10 +49,6 @@ public interface Node extends EObject /** * Returns the value of the 'Children' containment reference. * - *

- * If the meaning of the 'Children' containment reference isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Children' containment reference. * @see #setChildren(NodeList) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/indent/indentLang/NodeList.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/indent/indentLang/NodeList.java index 59d07474a..6a38e2c06 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/indent/indentLang/NodeList.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/indent/indentLang/NodeList.java @@ -29,10 +29,6 @@ public interface NodeList extends EObject * Returns the value of the 'Children' containment reference list. * The list contents are of type {@link org.eclipse.xtext.testlanguages.indent.indentLang.Node}. * - *

- * If the meaning of the 'Children' containment reference list isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Children' containment reference list. * @see org.eclipse.xtext.testlanguages.indent.indentLang.IndentLangPackage#getNodeList_Children() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/indent/indentLang/impl/IndentLangFactoryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/indent/indentLang/impl/IndentLangFactoryImpl.java index ff7df5acf..8b00c1dcf 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/indent/indentLang/impl/IndentLangFactoryImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/indent/indentLang/impl/IndentLangFactoryImpl.java @@ -77,6 +77,7 @@ public class IndentLangFactoryImpl extends EFactoryImpl implements IndentLangFac * * @generated */ + @Override public NodeList createNodeList() { NodeListImpl nodeList = new NodeListImpl(); @@ -88,6 +89,7 @@ public class IndentLangFactoryImpl extends EFactoryImpl implements IndentLangFac * * @generated */ + @Override public Node createNode() { NodeImpl node = new NodeImpl(); @@ -99,6 +101,7 @@ public class IndentLangFactoryImpl extends EFactoryImpl implements IndentLangFac * * @generated */ + @Override public IndentLangPackage getIndentLangPackage() { return (IndentLangPackage)getEPackage(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/indent/indentLang/impl/IndentLangPackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/indent/indentLang/impl/IndentLangPackageImpl.java index aa82e5e55..273b59605 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/indent/indentLang/impl/IndentLangPackageImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/indent/indentLang/impl/IndentLangPackageImpl.java @@ -67,7 +67,7 @@ public class IndentLangPackageImpl extends EPackageImpl implements IndentLangPac /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link IndentLangPackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -82,7 +82,8 @@ public class IndentLangPackageImpl extends EPackageImpl implements IndentLangPac if (isInited) return (IndentLangPackage)EPackage.Registry.INSTANCE.getEPackage(IndentLangPackage.eNS_URI); // Obtain or create and register package - IndentLangPackageImpl theIndentLangPackage = (IndentLangPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof IndentLangPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new IndentLangPackageImpl()); + Object registeredIndentLangPackage = EPackage.Registry.INSTANCE.get(eNS_URI); + IndentLangPackageImpl theIndentLangPackage = registeredIndentLangPackage instanceof IndentLangPackageImpl ? (IndentLangPackageImpl)registeredIndentLangPackage : new IndentLangPackageImpl(); isInited = true; @@ -98,7 +99,6 @@ public class IndentLangPackageImpl extends EPackageImpl implements IndentLangPac // Mark meta-data to indicate it can't be changed theIndentLangPackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(IndentLangPackage.eNS_URI, theIndentLangPackage); return theIndentLangPackage; @@ -109,6 +109,7 @@ public class IndentLangPackageImpl extends EPackageImpl implements IndentLangPac * * @generated */ + @Override public EClass getNodeList() { return nodeListEClass; @@ -119,6 +120,7 @@ public class IndentLangPackageImpl extends EPackageImpl implements IndentLangPac * * @generated */ + @Override public EReference getNodeList_Children() { return (EReference)nodeListEClass.getEStructuralFeatures().get(0); @@ -129,6 +131,7 @@ public class IndentLangPackageImpl extends EPackageImpl implements IndentLangPac * * @generated */ + @Override public EClass getNode() { return nodeEClass; @@ -139,6 +142,7 @@ public class IndentLangPackageImpl extends EPackageImpl implements IndentLangPac * * @generated */ + @Override public EAttribute getNode_Name() { return (EAttribute)nodeEClass.getEStructuralFeatures().get(0); @@ -149,6 +153,7 @@ public class IndentLangPackageImpl extends EPackageImpl implements IndentLangPac * * @generated */ + @Override public EReference getNode_Children() { return (EReference)nodeEClass.getEStructuralFeatures().get(1); @@ -159,6 +164,7 @@ public class IndentLangPackageImpl extends EPackageImpl implements IndentLangPac * * @generated */ + @Override public IndentLangFactory getIndentLangFactory() { return (IndentLangFactory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/indent/indentLang/impl/NodeImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/indent/indentLang/impl/NodeImpl.java index 42413fe2d..04b677c66 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/indent/indentLang/impl/NodeImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/indent/indentLang/impl/NodeImpl.java @@ -88,6 +88,7 @@ public class NodeImpl extends MinimalEObjectImpl.Container implements Node * * @generated */ + @Override public String getName() { return name; @@ -98,6 +99,7 @@ public class NodeImpl extends MinimalEObjectImpl.Container implements Node * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -111,6 +113,7 @@ public class NodeImpl extends MinimalEObjectImpl.Container implements Node * * @generated */ + @Override public NodeList getChildren() { return children; @@ -138,6 +141,7 @@ public class NodeImpl extends MinimalEObjectImpl.Container implements Node * * @generated */ + @Override public void setChildren(NodeList newChildren) { if (newChildren != children) @@ -256,7 +260,7 @@ public class NodeImpl extends MinimalEObjectImpl.Container implements Node { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/indent/indentLang/impl/NodeListImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/indent/indentLang/impl/NodeListImpl.java index 3ac3058d7..53cd86008 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/indent/indentLang/impl/NodeListImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/indent/indentLang/impl/NodeListImpl.java @@ -72,6 +72,7 @@ public class NodeListImpl extends MinimalEObjectImpl.Container implements NodeLi * * @generated */ + @Override public EList getChildren() { if (children == null) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/lookaheadLang/Alts.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/lookaheadLang/Alts.java index 119fb54ae..ff43f4e2c 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/lookaheadLang/Alts.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/lookaheadLang/Alts.java @@ -26,10 +26,6 @@ public interface Alts extends EObject /** * Returns the value of the 'X' attribute. * - *

- * If the meaning of the 'X' attribute isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'X' attribute. * @see #setX(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/lookaheadLang/Entry.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/lookaheadLang/Entry.java index 3691fae74..bf670e6ae 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/lookaheadLang/Entry.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/lookaheadLang/Entry.java @@ -29,10 +29,6 @@ public interface Entry extends EObject * Returns the value of the 'Contents' containment reference list. * The list contents are of type {@link org.eclipse.xtext.testlanguages.lookaheadLang.Alts}. * - *

- * If the meaning of the 'Contents' containment reference list isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Contents' containment reference list. * @see org.eclipse.xtext.testlanguages.lookaheadLang.LookaheadLangPackage#getEntry_Contents() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/lookaheadLang/LookAhead1.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/lookaheadLang/LookAhead1.java index 71e7caf4c..d07b30f2e 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/lookaheadLang/LookAhead1.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/lookaheadLang/LookAhead1.java @@ -26,10 +26,6 @@ public interface LookAhead1 extends Alts /** * Returns the value of the 'Y' containment reference. * - *

- * If the meaning of the 'Y' containment reference isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Y' containment reference. * @see #setY(LookAhead2) @@ -52,10 +48,6 @@ public interface LookAhead1 extends Alts /** * Returns the value of the 'Z' attribute. * - *

- * If the meaning of the 'Z' attribute isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Z' attribute. * @see #setZ(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/lookaheadLang/LookAhead2.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/lookaheadLang/LookAhead2.java index e7bbf2668..fe59eb3ba 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/lookaheadLang/LookAhead2.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/lookaheadLang/LookAhead2.java @@ -26,10 +26,6 @@ public interface LookAhead2 extends EObject /** * Returns the value of the 'Z' attribute. * - *

- * If the meaning of the 'Z' attribute isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Z' attribute. * @see #setZ(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/lookaheadLang/LookAhead3.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/lookaheadLang/LookAhead3.java index fb570e7be..7eb1049b1 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/lookaheadLang/LookAhead3.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/lookaheadLang/LookAhead3.java @@ -25,10 +25,6 @@ public interface LookAhead3 extends Alts /** * Returns the value of the 'Z' containment reference. * - *

- * If the meaning of the 'Z' containment reference isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Z' containment reference. * @see #setZ(LookAhead4) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/lookaheadLang/LookAhead4.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/lookaheadLang/LookAhead4.java index cd02d6166..d66b294e6 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/lookaheadLang/LookAhead4.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/lookaheadLang/LookAhead4.java @@ -26,10 +26,6 @@ public interface LookAhead4 extends EObject /** * Returns the value of the 'X' attribute. * - *

- * If the meaning of the 'X' attribute isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'X' attribute. * @see #setX(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/lookaheadLang/impl/AltsImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/lookaheadLang/impl/AltsImpl.java index 39cb714a0..fe5e85f25 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/lookaheadLang/impl/AltsImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/lookaheadLang/impl/AltsImpl.java @@ -74,6 +74,7 @@ public class AltsImpl extends MinimalEObjectImpl.Container implements Alts * * @generated */ + @Override public String getX() { return x; @@ -84,6 +85,7 @@ public class AltsImpl extends MinimalEObjectImpl.Container implements Alts * * @generated */ + @Override public void setX(String newX) { String oldX = x; @@ -168,7 +170,7 @@ public class AltsImpl extends MinimalEObjectImpl.Container implements Alts { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (x: "); result.append(x); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/lookaheadLang/impl/EntryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/lookaheadLang/impl/EntryImpl.java index 4b06ec5dd..c5caed6d9 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/lookaheadLang/impl/EntryImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/lookaheadLang/impl/EntryImpl.java @@ -72,6 +72,7 @@ public class EntryImpl extends MinimalEObjectImpl.Container implements Entry * * @generated */ + @Override public EList getContents() { if (contents == null) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/lookaheadLang/impl/LookAhead1Impl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/lookaheadLang/impl/LookAhead1Impl.java index 9e9106d56..3d2698a70 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/lookaheadLang/impl/LookAhead1Impl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/lookaheadLang/impl/LookAhead1Impl.java @@ -87,6 +87,7 @@ public class LookAhead1Impl extends AltsImpl implements LookAhead1 * * @generated */ + @Override public LookAhead2 getY() { return y; @@ -114,6 +115,7 @@ public class LookAhead1Impl extends AltsImpl implements LookAhead1 * * @generated */ + @Override public void setY(LookAhead2 newY) { if (newY != y) @@ -135,6 +137,7 @@ public class LookAhead1Impl extends AltsImpl implements LookAhead1 * * @generated */ + @Override public String getZ() { return z; @@ -145,6 +148,7 @@ public class LookAhead1Impl extends AltsImpl implements LookAhead1 * * @generated */ + @Override public void setZ(String newZ) { String oldZ = z; @@ -255,7 +259,7 @@ public class LookAhead1Impl extends AltsImpl implements LookAhead1 { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (z: "); result.append(z); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/lookaheadLang/impl/LookAhead2Impl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/lookaheadLang/impl/LookAhead2Impl.java index 6c2169dcf..a78ada2ef 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/lookaheadLang/impl/LookAhead2Impl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/lookaheadLang/impl/LookAhead2Impl.java @@ -74,6 +74,7 @@ public class LookAhead2Impl extends MinimalEObjectImpl.Container implements Look * * @generated */ + @Override public String getZ() { return z; @@ -84,6 +85,7 @@ public class LookAhead2Impl extends MinimalEObjectImpl.Container implements Look * * @generated */ + @Override public void setZ(String newZ) { String oldZ = z; @@ -168,7 +170,7 @@ public class LookAhead2Impl extends MinimalEObjectImpl.Container implements Look { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (z: "); result.append(z); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/lookaheadLang/impl/LookAhead3Impl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/lookaheadLang/impl/LookAhead3Impl.java index 4c347f8d0..2247c893d 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/lookaheadLang/impl/LookAhead3Impl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/lookaheadLang/impl/LookAhead3Impl.java @@ -66,6 +66,7 @@ public class LookAhead3Impl extends AltsImpl implements LookAhead3 * * @generated */ + @Override public LookAhead4 getZ() { return z; @@ -93,6 +94,7 @@ public class LookAhead3Impl extends AltsImpl implements LookAhead3 * * @generated */ + @Override public void setZ(LookAhead4 newZ) { if (newZ != z) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/lookaheadLang/impl/LookAhead4Impl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/lookaheadLang/impl/LookAhead4Impl.java index f784a2f64..75e69667f 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/lookaheadLang/impl/LookAhead4Impl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/lookaheadLang/impl/LookAhead4Impl.java @@ -74,6 +74,7 @@ public class LookAhead4Impl extends MinimalEObjectImpl.Container implements Look * * @generated */ + @Override public String getX() { return x; @@ -84,6 +85,7 @@ public class LookAhead4Impl extends MinimalEObjectImpl.Container implements Look * * @generated */ + @Override public void setX(String newX) { String oldX = x; @@ -168,7 +170,7 @@ public class LookAhead4Impl extends MinimalEObjectImpl.Container implements Look { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (x: "); result.append(x); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/lookaheadLang/impl/LookaheadLangFactoryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/lookaheadLang/impl/LookaheadLangFactoryImpl.java index 9b8761d24..a955f1e7c 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/lookaheadLang/impl/LookaheadLangFactoryImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/lookaheadLang/impl/LookaheadLangFactoryImpl.java @@ -82,6 +82,7 @@ public class LookaheadLangFactoryImpl extends EFactoryImpl implements LookaheadL * * @generated */ + @Override public Entry createEntry() { EntryImpl entry = new EntryImpl(); @@ -93,6 +94,7 @@ public class LookaheadLangFactoryImpl extends EFactoryImpl implements LookaheadL * * @generated */ + @Override public Alts createAlts() { AltsImpl alts = new AltsImpl(); @@ -104,6 +106,7 @@ public class LookaheadLangFactoryImpl extends EFactoryImpl implements LookaheadL * * @generated */ + @Override public LookAhead0 createLookAhead0() { LookAhead0Impl lookAhead0 = new LookAhead0Impl(); @@ -115,6 +118,7 @@ public class LookaheadLangFactoryImpl extends EFactoryImpl implements LookaheadL * * @generated */ + @Override public LookAhead1 createLookAhead1() { LookAhead1Impl lookAhead1 = new LookAhead1Impl(); @@ -126,6 +130,7 @@ public class LookaheadLangFactoryImpl extends EFactoryImpl implements LookaheadL * * @generated */ + @Override public LookAhead2 createLookAhead2() { LookAhead2Impl lookAhead2 = new LookAhead2Impl(); @@ -137,6 +142,7 @@ public class LookaheadLangFactoryImpl extends EFactoryImpl implements LookaheadL * * @generated */ + @Override public LookAhead3 createLookAhead3() { LookAhead3Impl lookAhead3 = new LookAhead3Impl(); @@ -148,6 +154,7 @@ public class LookaheadLangFactoryImpl extends EFactoryImpl implements LookaheadL * * @generated */ + @Override public LookAhead4 createLookAhead4() { LookAhead4Impl lookAhead4 = new LookAhead4Impl(); @@ -159,6 +166,7 @@ public class LookaheadLangFactoryImpl extends EFactoryImpl implements LookaheadL * * @generated */ + @Override public LookaheadLangPackage getLookaheadLangPackage() { return (LookaheadLangPackage)getEPackage(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/lookaheadLang/impl/LookaheadLangPackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/lookaheadLang/impl/LookaheadLangPackageImpl.java index 14ad96320..60a15cf7e 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/lookaheadLang/impl/LookaheadLangPackageImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/lookaheadLang/impl/LookaheadLangPackageImpl.java @@ -107,7 +107,7 @@ public class LookaheadLangPackageImpl extends EPackageImpl implements LookaheadL /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link LookaheadLangPackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -122,7 +122,8 @@ public class LookaheadLangPackageImpl extends EPackageImpl implements LookaheadL if (isInited) return (LookaheadLangPackage)EPackage.Registry.INSTANCE.getEPackage(LookaheadLangPackage.eNS_URI); // Obtain or create and register package - LookaheadLangPackageImpl theLookaheadLangPackage = (LookaheadLangPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof LookaheadLangPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new LookaheadLangPackageImpl()); + Object registeredLookaheadLangPackage = EPackage.Registry.INSTANCE.get(eNS_URI); + LookaheadLangPackageImpl theLookaheadLangPackage = registeredLookaheadLangPackage instanceof LookaheadLangPackageImpl ? (LookaheadLangPackageImpl)registeredLookaheadLangPackage : new LookaheadLangPackageImpl(); isInited = true; @@ -138,7 +139,6 @@ public class LookaheadLangPackageImpl extends EPackageImpl implements LookaheadL // Mark meta-data to indicate it can't be changed theLookaheadLangPackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(LookaheadLangPackage.eNS_URI, theLookaheadLangPackage); return theLookaheadLangPackage; @@ -149,6 +149,7 @@ public class LookaheadLangPackageImpl extends EPackageImpl implements LookaheadL * * @generated */ + @Override public EClass getEntry() { return entryEClass; @@ -159,6 +160,7 @@ public class LookaheadLangPackageImpl extends EPackageImpl implements LookaheadL * * @generated */ + @Override public EReference getEntry_Contents() { return (EReference)entryEClass.getEStructuralFeatures().get(0); @@ -169,6 +171,7 @@ public class LookaheadLangPackageImpl extends EPackageImpl implements LookaheadL * * @generated */ + @Override public EClass getAlts() { return altsEClass; @@ -179,6 +182,7 @@ public class LookaheadLangPackageImpl extends EPackageImpl implements LookaheadL * * @generated */ + @Override public EAttribute getAlts_X() { return (EAttribute)altsEClass.getEStructuralFeatures().get(0); @@ -189,6 +193,7 @@ public class LookaheadLangPackageImpl extends EPackageImpl implements LookaheadL * * @generated */ + @Override public EClass getLookAhead0() { return lookAhead0EClass; @@ -199,6 +204,7 @@ public class LookaheadLangPackageImpl extends EPackageImpl implements LookaheadL * * @generated */ + @Override public EClass getLookAhead1() { return lookAhead1EClass; @@ -209,6 +215,7 @@ public class LookaheadLangPackageImpl extends EPackageImpl implements LookaheadL * * @generated */ + @Override public EReference getLookAhead1_Y() { return (EReference)lookAhead1EClass.getEStructuralFeatures().get(0); @@ -219,6 +226,7 @@ public class LookaheadLangPackageImpl extends EPackageImpl implements LookaheadL * * @generated */ + @Override public EAttribute getLookAhead1_Z() { return (EAttribute)lookAhead1EClass.getEStructuralFeatures().get(1); @@ -229,6 +237,7 @@ public class LookaheadLangPackageImpl extends EPackageImpl implements LookaheadL * * @generated */ + @Override public EClass getLookAhead2() { return lookAhead2EClass; @@ -239,6 +248,7 @@ public class LookaheadLangPackageImpl extends EPackageImpl implements LookaheadL * * @generated */ + @Override public EAttribute getLookAhead2_Z() { return (EAttribute)lookAhead2EClass.getEStructuralFeatures().get(0); @@ -249,6 +259,7 @@ public class LookaheadLangPackageImpl extends EPackageImpl implements LookaheadL * * @generated */ + @Override public EClass getLookAhead3() { return lookAhead3EClass; @@ -259,6 +270,7 @@ public class LookaheadLangPackageImpl extends EPackageImpl implements LookaheadL * * @generated */ + @Override public EReference getLookAhead3_Z() { return (EReference)lookAhead3EClass.getEStructuralFeatures().get(0); @@ -269,6 +281,7 @@ public class LookaheadLangPackageImpl extends EPackageImpl implements LookaheadL * * @generated */ + @Override public EClass getLookAhead4() { return lookAhead4EClass; @@ -279,6 +292,7 @@ public class LookaheadLangPackageImpl extends EPackageImpl implements LookaheadL * * @generated */ + @Override public EAttribute getLookAhead4_X() { return (EAttribute)lookAhead4EClass.getEStructuralFeatures().get(0); @@ -289,6 +303,7 @@ public class LookaheadLangPackageImpl extends EPackageImpl implements LookaheadL * * @generated */ + @Override public LookaheadLangFactory getLookaheadLangFactory() { return (LookaheadLangFactory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/optionalEmpty/Greeting.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/optionalEmpty/Greeting.java index 6eec53c25..79bfdfd0a 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/optionalEmpty/Greeting.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/optionalEmpty/Greeting.java @@ -26,10 +26,6 @@ public interface Greeting 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) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/optionalEmpty/Model.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/optionalEmpty/Model.java index aae4ececc..d1bc7f60f 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/optionalEmpty/Model.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/optionalEmpty/Model.java @@ -26,10 +26,6 @@ public interface Model extends EObject /** * Returns the value of the 'Child' containment reference. * - *

- * If the meaning of the 'Child' containment reference isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Child' containment reference. * @see #setChild(Greeting) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/optionalEmpty/impl/GreetingImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/optionalEmpty/impl/GreetingImpl.java index b3725a669..5946f19d4 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/optionalEmpty/impl/GreetingImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/optionalEmpty/impl/GreetingImpl.java @@ -74,6 +74,7 @@ public class GreetingImpl extends MinimalEObjectImpl.Container implements Greeti * * @generated */ + @Override public String getName() { return name; @@ -84,6 +85,7 @@ public class GreetingImpl extends MinimalEObjectImpl.Container implements Greeti * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -168,7 +170,7 @@ public class GreetingImpl extends MinimalEObjectImpl.Container implements Greeti { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/optionalEmpty/impl/ModelImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/optionalEmpty/impl/ModelImpl.java index 02895cd50..793fe54ca 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/optionalEmpty/impl/ModelImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/optionalEmpty/impl/ModelImpl.java @@ -67,6 +67,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public Greeting getChild() { return child; @@ -94,6 +95,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setChild(Greeting newChild) { if (newChild != child) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/optionalEmpty/impl/OptionalEmptyFactoryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/optionalEmpty/impl/OptionalEmptyFactoryImpl.java index 7dfd808b0..cab76b6b6 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/optionalEmpty/impl/OptionalEmptyFactoryImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/optionalEmpty/impl/OptionalEmptyFactoryImpl.java @@ -77,6 +77,7 @@ public class OptionalEmptyFactoryImpl extends EFactoryImpl implements OptionalEm * * @generated */ + @Override public Model createModel() { ModelImpl model = new ModelImpl(); @@ -88,6 +89,7 @@ public class OptionalEmptyFactoryImpl extends EFactoryImpl implements OptionalEm * * @generated */ + @Override public Greeting createGreeting() { GreetingImpl greeting = new GreetingImpl(); @@ -99,6 +101,7 @@ public class OptionalEmptyFactoryImpl extends EFactoryImpl implements OptionalEm * * @generated */ + @Override public OptionalEmptyPackage getOptionalEmptyPackage() { return (OptionalEmptyPackage)getEPackage(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/optionalEmpty/impl/OptionalEmptyPackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/optionalEmpty/impl/OptionalEmptyPackageImpl.java index 1e7bb0ce9..7868206df 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/optionalEmpty/impl/OptionalEmptyPackageImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/optionalEmpty/impl/OptionalEmptyPackageImpl.java @@ -67,7 +67,7 @@ public class OptionalEmptyPackageImpl extends EPackageImpl implements OptionalEm /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link OptionalEmptyPackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -82,7 +82,8 @@ public class OptionalEmptyPackageImpl extends EPackageImpl implements OptionalEm if (isInited) return (OptionalEmptyPackage)EPackage.Registry.INSTANCE.getEPackage(OptionalEmptyPackage.eNS_URI); // Obtain or create and register package - OptionalEmptyPackageImpl theOptionalEmptyPackage = (OptionalEmptyPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof OptionalEmptyPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new OptionalEmptyPackageImpl()); + Object registeredOptionalEmptyPackage = EPackage.Registry.INSTANCE.get(eNS_URI); + OptionalEmptyPackageImpl theOptionalEmptyPackage = registeredOptionalEmptyPackage instanceof OptionalEmptyPackageImpl ? (OptionalEmptyPackageImpl)registeredOptionalEmptyPackage : new OptionalEmptyPackageImpl(); isInited = true; @@ -98,7 +99,6 @@ public class OptionalEmptyPackageImpl extends EPackageImpl implements OptionalEm // Mark meta-data to indicate it can't be changed theOptionalEmptyPackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(OptionalEmptyPackage.eNS_URI, theOptionalEmptyPackage); return theOptionalEmptyPackage; @@ -109,6 +109,7 @@ public class OptionalEmptyPackageImpl extends EPackageImpl implements OptionalEm * * @generated */ + @Override public EClass getModel() { return modelEClass; @@ -119,6 +120,7 @@ public class OptionalEmptyPackageImpl extends EPackageImpl implements OptionalEm * * @generated */ + @Override public EReference getModel_Child() { return (EReference)modelEClass.getEStructuralFeatures().get(0); @@ -129,6 +131,7 @@ public class OptionalEmptyPackageImpl extends EPackageImpl implements OptionalEm * * @generated */ + @Override public EClass getGreeting() { return greetingEClass; @@ -139,6 +142,7 @@ public class OptionalEmptyPackageImpl extends EPackageImpl implements OptionalEm * * @generated */ + @Override public EAttribute getGreeting_Name() { return (EAttribute)greetingEClass.getEStructuralFeatures().get(0); @@ -149,6 +153,7 @@ public class OptionalEmptyPackageImpl extends EPackageImpl implements OptionalEm * * @generated */ + @Override public OptionalEmptyFactory getOptionalEmptyFactory() { return (OptionalEmptyFactory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/partialParserTestLanguage/AbstractChild.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/partialParserTestLanguage/AbstractChild.java index 2db91249a..a2ffbaae3 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/partialParserTestLanguage/AbstractChild.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/partialParserTestLanguage/AbstractChild.java @@ -26,10 +26,6 @@ public interface AbstractChild extends EObject /** * Returns the value of the 'Value' containment reference. * - *

- * If the meaning of the 'Value' containment reference isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Value' containment reference. * @see #setValue(Named) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/partialParserTestLanguage/AbstractChildren.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/partialParserTestLanguage/AbstractChildren.java index 7c546edc9..62279b45c 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/partialParserTestLanguage/AbstractChildren.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/partialParserTestLanguage/AbstractChildren.java @@ -27,10 +27,6 @@ public interface AbstractChildren extends Content * Returns the value of the 'Abstract Children' containment reference list. * The list contents are of type {@link org.eclipse.xtext.testlanguages.partialParserTestLanguage.AbstractChild}. * - *

- * If the meaning of the 'Abstract Children' containment reference list isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Abstract Children' containment reference list. * @see org.eclipse.xtext.testlanguages.partialParserTestLanguage.PartialParserTestLanguagePackage#getAbstractChildren_AbstractChildren() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/partialParserTestLanguage/Child.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/partialParserTestLanguage/Child.java index 0a8f29811..eb42843a3 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/partialParserTestLanguage/Child.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/partialParserTestLanguage/Child.java @@ -26,10 +26,6 @@ public interface Child extends EObject /** * Returns the value of the 'Value' containment reference. * - *

- * If the meaning of the 'Value' containment reference isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Value' containment reference. * @see #setValue(Named) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/partialParserTestLanguage/Children.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/partialParserTestLanguage/Children.java index 04479c0b4..9ab1b61de 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/partialParserTestLanguage/Children.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/partialParserTestLanguage/Children.java @@ -27,10 +27,6 @@ public interface Children extends Content * Returns the value of the 'Children' containment reference list. * The list contents are of type {@link org.eclipse.xtext.testlanguages.partialParserTestLanguage.Child}. * - *

- * If the meaning of the 'Children' containment reference list isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Children' containment reference list. * @see org.eclipse.xtext.testlanguages.partialParserTestLanguage.PartialParserTestLanguagePackage#getChildren_Children() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/partialParserTestLanguage/FirstConcrete.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/partialParserTestLanguage/FirstConcrete.java index 7b849c555..89a178edd 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/partialParserTestLanguage/FirstConcrete.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/partialParserTestLanguage/FirstConcrete.java @@ -25,10 +25,6 @@ public interface FirstConcrete extends AbstractChild /** * Returns the value of the 'Referenced Container' reference. * - *

- * If the meaning of the 'Referenced Container' reference isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Referenced Container' reference. * @see #setReferencedContainer(SomeContainer) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/partialParserTestLanguage/Named.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/partialParserTestLanguage/Named.java index 86f0850d2..75171aea6 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/partialParserTestLanguage/Named.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/partialParserTestLanguage/Named.java @@ -26,10 +26,6 @@ public interface Named 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) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/partialParserTestLanguage/Nested.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/partialParserTestLanguage/Nested.java index 8013f240b..bb8ab6242 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/partialParserTestLanguage/Nested.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/partialParserTestLanguage/Nested.java @@ -29,10 +29,6 @@ public interface Nested extends EObject * Returns the value of the 'Nested' containment reference list. * The list contents are of type {@link org.eclipse.xtext.testlanguages.partialParserTestLanguage.SomeContainer}. * - *

- * If the meaning of the 'Nested' containment reference list isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Nested' containment reference list. * @see org.eclipse.xtext.testlanguages.partialParserTestLanguage.PartialParserTestLanguagePackage#getNested_Nested() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/partialParserTestLanguage/SecondConcrete.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/partialParserTestLanguage/SecondConcrete.java index 52a8e473a..4853343ea 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/partialParserTestLanguage/SecondConcrete.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/partialParserTestLanguage/SecondConcrete.java @@ -27,10 +27,6 @@ public interface SecondConcrete extends AbstractChild * Returns the value of the 'Referenced Children' reference list. * The list contents are of type {@link org.eclipse.xtext.testlanguages.partialParserTestLanguage.Child}. * - *

- * If the meaning of the 'Referenced Children' reference list isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Referenced Children' reference list. * @see org.eclipse.xtext.testlanguages.partialParserTestLanguage.PartialParserTestLanguagePackage#getSecondConcrete_ReferencedChildren() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/partialParserTestLanguage/SomeContainer.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/partialParserTestLanguage/SomeContainer.java index 0e2d619b8..710892a56 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/partialParserTestLanguage/SomeContainer.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/partialParserTestLanguage/SomeContainer.java @@ -30,10 +30,6 @@ public interface SomeContainer 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) @@ -57,10 +53,6 @@ public interface SomeContainer extends EObject * Returns the value of the 'Nested' containment reference list. * The list contents are of type {@link org.eclipse.xtext.testlanguages.partialParserTestLanguage.Nested}. * - *

- * If the meaning of the 'Nested' containment reference list isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Nested' containment reference list. * @see org.eclipse.xtext.testlanguages.partialParserTestLanguage.PartialParserTestLanguagePackage#getSomeContainer_Nested() @@ -73,10 +65,6 @@ public interface SomeContainer extends EObject * Returns the value of the 'Content' containment reference list. * The list contents are of type {@link org.eclipse.xtext.testlanguages.partialParserTestLanguage.Content}. * - *

- * If the meaning of the 'Content' containment reference list isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Content' containment reference list. * @see org.eclipse.xtext.testlanguages.partialParserTestLanguage.PartialParserTestLanguagePackage#getSomeContainer_Content() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/partialParserTestLanguage/impl/AbstractChildImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/partialParserTestLanguage/impl/AbstractChildImpl.java index 910d15047..2ee7e3ee4 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/partialParserTestLanguage/impl/AbstractChildImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/partialParserTestLanguage/impl/AbstractChildImpl.java @@ -67,6 +67,7 @@ public class AbstractChildImpl extends MinimalEObjectImpl.Container implements A * * @generated */ + @Override public Named getValue() { return value; @@ -94,6 +95,7 @@ public class AbstractChildImpl extends MinimalEObjectImpl.Container implements A * * @generated */ + @Override public void setValue(Named newValue) { if (newValue != value) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/partialParserTestLanguage/impl/AbstractChildrenImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/partialParserTestLanguage/impl/AbstractChildrenImpl.java index 13c6143b9..d37a7b13a 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/partialParserTestLanguage/impl/AbstractChildrenImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/partialParserTestLanguage/impl/AbstractChildrenImpl.java @@ -70,6 +70,7 @@ public class AbstractChildrenImpl extends ContentImpl implements AbstractChildre * * @generated */ + @Override public EList getAbstractChildren() { if (abstractChildren == null) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/partialParserTestLanguage/impl/ChildImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/partialParserTestLanguage/impl/ChildImpl.java index f7a66c833..25a22a4dd 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/partialParserTestLanguage/impl/ChildImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/partialParserTestLanguage/impl/ChildImpl.java @@ -67,6 +67,7 @@ public class ChildImpl extends MinimalEObjectImpl.Container implements Child * * @generated */ + @Override public Named getValue() { return value; @@ -94,6 +95,7 @@ public class ChildImpl extends MinimalEObjectImpl.Container implements Child * * @generated */ + @Override public void setValue(Named newValue) { if (newValue != value) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/partialParserTestLanguage/impl/ChildrenImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/partialParserTestLanguage/impl/ChildrenImpl.java index 57189c346..627adc88b 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/partialParserTestLanguage/impl/ChildrenImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/partialParserTestLanguage/impl/ChildrenImpl.java @@ -70,6 +70,7 @@ public class ChildrenImpl extends ContentImpl implements Children * * @generated */ + @Override public EList getChildren() { if (children == null) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/partialParserTestLanguage/impl/FirstConcreteImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/partialParserTestLanguage/impl/FirstConcreteImpl.java index 37acff6b9..cdaffe0ee 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/partialParserTestLanguage/impl/FirstConcreteImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/partialParserTestLanguage/impl/FirstConcreteImpl.java @@ -65,6 +65,7 @@ public class FirstConcreteImpl extends AbstractChildImpl implements FirstConcret * * @generated */ + @Override public SomeContainer getReferencedContainer() { if (referencedContainer != null && referencedContainer.eIsProxy()) @@ -95,6 +96,7 @@ public class FirstConcreteImpl extends AbstractChildImpl implements FirstConcret * * @generated */ + @Override public void setReferencedContainer(SomeContainer newReferencedContainer) { SomeContainer oldReferencedContainer = referencedContainer; diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/partialParserTestLanguage/impl/NamedImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/partialParserTestLanguage/impl/NamedImpl.java index 0d4170411..b4798de26 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/partialParserTestLanguage/impl/NamedImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/partialParserTestLanguage/impl/NamedImpl.java @@ -74,6 +74,7 @@ public class NamedImpl extends MinimalEObjectImpl.Container implements Named * * @generated */ + @Override public String getName() { return name; @@ -84,6 +85,7 @@ public class NamedImpl extends MinimalEObjectImpl.Container implements Named * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -168,7 +170,7 @@ public class NamedImpl extends MinimalEObjectImpl.Container implements Named { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/partialParserTestLanguage/impl/NestedImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/partialParserTestLanguage/impl/NestedImpl.java index 376baebdf..f8404b2d4 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/partialParserTestLanguage/impl/NestedImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/partialParserTestLanguage/impl/NestedImpl.java @@ -72,6 +72,7 @@ public class NestedImpl extends MinimalEObjectImpl.Container implements Nested * * @generated */ + @Override public EList getNested() { if (nested == null) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/partialParserTestLanguage/impl/PartialParserTestLanguageFactoryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/partialParserTestLanguage/impl/PartialParserTestLanguageFactoryImpl.java index 7148ac0c3..f7a975b8d 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/partialParserTestLanguage/impl/PartialParserTestLanguageFactoryImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/partialParserTestLanguage/impl/PartialParserTestLanguageFactoryImpl.java @@ -85,6 +85,7 @@ public class PartialParserTestLanguageFactoryImpl extends EFactoryImpl implement * * @generated */ + @Override public SomeContainer createSomeContainer() { SomeContainerImpl someContainer = new SomeContainerImpl(); @@ -96,6 +97,7 @@ public class PartialParserTestLanguageFactoryImpl extends EFactoryImpl implement * * @generated */ + @Override public Nested createNested() { NestedImpl nested = new NestedImpl(); @@ -107,6 +109,7 @@ public class PartialParserTestLanguageFactoryImpl extends EFactoryImpl implement * * @generated */ + @Override public Content createContent() { ContentImpl content = new ContentImpl(); @@ -118,6 +121,7 @@ public class PartialParserTestLanguageFactoryImpl extends EFactoryImpl implement * * @generated */ + @Override public Children createChildren() { ChildrenImpl children = new ChildrenImpl(); @@ -129,6 +133,7 @@ public class PartialParserTestLanguageFactoryImpl extends EFactoryImpl implement * * @generated */ + @Override public Child createChild() { ChildImpl child = new ChildImpl(); @@ -140,6 +145,7 @@ public class PartialParserTestLanguageFactoryImpl extends EFactoryImpl implement * * @generated */ + @Override public AbstractChildren createAbstractChildren() { AbstractChildrenImpl abstractChildren = new AbstractChildrenImpl(); @@ -151,6 +157,7 @@ public class PartialParserTestLanguageFactoryImpl extends EFactoryImpl implement * * @generated */ + @Override public AbstractChild createAbstractChild() { AbstractChildImpl abstractChild = new AbstractChildImpl(); @@ -162,6 +169,7 @@ public class PartialParserTestLanguageFactoryImpl extends EFactoryImpl implement * * @generated */ + @Override public FirstConcrete createFirstConcrete() { FirstConcreteImpl firstConcrete = new FirstConcreteImpl(); @@ -173,6 +181,7 @@ public class PartialParserTestLanguageFactoryImpl extends EFactoryImpl implement * * @generated */ + @Override public SecondConcrete createSecondConcrete() { SecondConcreteImpl secondConcrete = new SecondConcreteImpl(); @@ -184,6 +193,7 @@ public class PartialParserTestLanguageFactoryImpl extends EFactoryImpl implement * * @generated */ + @Override public Named createNamed() { NamedImpl named = new NamedImpl(); @@ -195,6 +205,7 @@ public class PartialParserTestLanguageFactoryImpl extends EFactoryImpl implement * * @generated */ + @Override public PartialParserTestLanguagePackage getPartialParserTestLanguagePackage() { return (PartialParserTestLanguagePackage)getEPackage(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/partialParserTestLanguage/impl/PartialParserTestLanguagePackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/partialParserTestLanguage/impl/PartialParserTestLanguagePackageImpl.java index 8fe5f8022..df9228cdd 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/partialParserTestLanguage/impl/PartialParserTestLanguagePackageImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/partialParserTestLanguage/impl/PartialParserTestLanguagePackageImpl.java @@ -131,7 +131,7 @@ public class PartialParserTestLanguagePackageImpl extends EPackageImpl implement /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link PartialParserTestLanguagePackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -146,7 +146,8 @@ public class PartialParserTestLanguagePackageImpl extends EPackageImpl implement if (isInited) return (PartialParserTestLanguagePackage)EPackage.Registry.INSTANCE.getEPackage(PartialParserTestLanguagePackage.eNS_URI); // Obtain or create and register package - PartialParserTestLanguagePackageImpl thePartialParserTestLanguagePackage = (PartialParserTestLanguagePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof PartialParserTestLanguagePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new PartialParserTestLanguagePackageImpl()); + Object registeredPartialParserTestLanguagePackage = EPackage.Registry.INSTANCE.get(eNS_URI); + PartialParserTestLanguagePackageImpl thePartialParserTestLanguagePackage = registeredPartialParserTestLanguagePackage instanceof PartialParserTestLanguagePackageImpl ? (PartialParserTestLanguagePackageImpl)registeredPartialParserTestLanguagePackage : new PartialParserTestLanguagePackageImpl(); isInited = true; @@ -162,7 +163,6 @@ public class PartialParserTestLanguagePackageImpl extends EPackageImpl implement // Mark meta-data to indicate it can't be changed thePartialParserTestLanguagePackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(PartialParserTestLanguagePackage.eNS_URI, thePartialParserTestLanguagePackage); return thePartialParserTestLanguagePackage; @@ -173,6 +173,7 @@ public class PartialParserTestLanguagePackageImpl extends EPackageImpl implement * * @generated */ + @Override public EClass getSomeContainer() { return someContainerEClass; @@ -183,6 +184,7 @@ public class PartialParserTestLanguagePackageImpl extends EPackageImpl implement * * @generated */ + @Override public EAttribute getSomeContainer_Name() { return (EAttribute)someContainerEClass.getEStructuralFeatures().get(0); @@ -193,6 +195,7 @@ public class PartialParserTestLanguagePackageImpl extends EPackageImpl implement * * @generated */ + @Override public EReference getSomeContainer_Nested() { return (EReference)someContainerEClass.getEStructuralFeatures().get(1); @@ -203,6 +206,7 @@ public class PartialParserTestLanguagePackageImpl extends EPackageImpl implement * * @generated */ + @Override public EReference getSomeContainer_Content() { return (EReference)someContainerEClass.getEStructuralFeatures().get(2); @@ -213,6 +217,7 @@ public class PartialParserTestLanguagePackageImpl extends EPackageImpl implement * * @generated */ + @Override public EClass getNested() { return nestedEClass; @@ -223,6 +228,7 @@ public class PartialParserTestLanguagePackageImpl extends EPackageImpl implement * * @generated */ + @Override public EReference getNested_Nested() { return (EReference)nestedEClass.getEStructuralFeatures().get(0); @@ -233,6 +239,7 @@ public class PartialParserTestLanguagePackageImpl extends EPackageImpl implement * * @generated */ + @Override public EClass getContent() { return contentEClass; @@ -243,6 +250,7 @@ public class PartialParserTestLanguagePackageImpl extends EPackageImpl implement * * @generated */ + @Override public EClass getChildren() { return childrenEClass; @@ -253,6 +261,7 @@ public class PartialParserTestLanguagePackageImpl extends EPackageImpl implement * * @generated */ + @Override public EReference getChildren_Children() { return (EReference)childrenEClass.getEStructuralFeatures().get(0); @@ -263,6 +272,7 @@ public class PartialParserTestLanguagePackageImpl extends EPackageImpl implement * * @generated */ + @Override public EClass getChild() { return childEClass; @@ -273,6 +283,7 @@ public class PartialParserTestLanguagePackageImpl extends EPackageImpl implement * * @generated */ + @Override public EReference getChild_Value() { return (EReference)childEClass.getEStructuralFeatures().get(0); @@ -283,6 +294,7 @@ public class PartialParserTestLanguagePackageImpl extends EPackageImpl implement * * @generated */ + @Override public EClass getAbstractChildren() { return abstractChildrenEClass; @@ -293,6 +305,7 @@ public class PartialParserTestLanguagePackageImpl extends EPackageImpl implement * * @generated */ + @Override public EReference getAbstractChildren_AbstractChildren() { return (EReference)abstractChildrenEClass.getEStructuralFeatures().get(0); @@ -303,6 +316,7 @@ public class PartialParserTestLanguagePackageImpl extends EPackageImpl implement * * @generated */ + @Override public EClass getAbstractChild() { return abstractChildEClass; @@ -313,6 +327,7 @@ public class PartialParserTestLanguagePackageImpl extends EPackageImpl implement * * @generated */ + @Override public EReference getAbstractChild_Value() { return (EReference)abstractChildEClass.getEStructuralFeatures().get(0); @@ -323,6 +338,7 @@ public class PartialParserTestLanguagePackageImpl extends EPackageImpl implement * * @generated */ + @Override public EClass getFirstConcrete() { return firstConcreteEClass; @@ -333,6 +349,7 @@ public class PartialParserTestLanguagePackageImpl extends EPackageImpl implement * * @generated */ + @Override public EReference getFirstConcrete_ReferencedContainer() { return (EReference)firstConcreteEClass.getEStructuralFeatures().get(0); @@ -343,6 +360,7 @@ public class PartialParserTestLanguagePackageImpl extends EPackageImpl implement * * @generated */ + @Override public EClass getSecondConcrete() { return secondConcreteEClass; @@ -353,6 +371,7 @@ public class PartialParserTestLanguagePackageImpl extends EPackageImpl implement * * @generated */ + @Override public EReference getSecondConcrete_ReferencedChildren() { return (EReference)secondConcreteEClass.getEStructuralFeatures().get(0); @@ -363,6 +382,7 @@ public class PartialParserTestLanguagePackageImpl extends EPackageImpl implement * * @generated */ + @Override public EClass getNamed() { return namedEClass; @@ -373,6 +393,7 @@ public class PartialParserTestLanguagePackageImpl extends EPackageImpl implement * * @generated */ + @Override public EAttribute getNamed_Name() { return (EAttribute)namedEClass.getEStructuralFeatures().get(0); @@ -383,6 +404,7 @@ public class PartialParserTestLanguagePackageImpl extends EPackageImpl implement * * @generated */ + @Override public PartialParserTestLanguageFactory getPartialParserTestLanguageFactory() { return (PartialParserTestLanguageFactory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/partialParserTestLanguage/impl/SecondConcreteImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/partialParserTestLanguage/impl/SecondConcreteImpl.java index de5f51f18..bbad01f54 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/partialParserTestLanguage/impl/SecondConcreteImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/partialParserTestLanguage/impl/SecondConcreteImpl.java @@ -66,6 +66,7 @@ public class SecondConcreteImpl extends AbstractChildImpl implements SecondConcr * * @generated */ + @Override public EList getReferencedChildren() { if (referencedChildren == null) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/partialParserTestLanguage/impl/SomeContainerImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/partialParserTestLanguage/impl/SomeContainerImpl.java index eda87442f..dc050ca06 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/partialParserTestLanguage/impl/SomeContainerImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/partialParserTestLanguage/impl/SomeContainerImpl.java @@ -107,6 +107,7 @@ public class SomeContainerImpl extends MinimalEObjectImpl.Container implements S * * @generated */ + @Override public String getName() { return name; @@ -117,6 +118,7 @@ public class SomeContainerImpl extends MinimalEObjectImpl.Container implements S * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -130,6 +132,7 @@ public class SomeContainerImpl extends MinimalEObjectImpl.Container implements S * * @generated */ + @Override public EList getNested() { if (nested == null) @@ -144,6 +147,7 @@ public class SomeContainerImpl extends MinimalEObjectImpl.Container implements S * * @generated */ + @Override public EList getContent() { if (content == null) @@ -270,7 +274,7 @@ public class SomeContainerImpl extends MinimalEObjectImpl.Container implements S { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammar/Familie.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammar/Familie.java index e07b42606..d8d60563c 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammar/Familie.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammar/Familie.java @@ -31,10 +31,6 @@ public interface Familie 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) @@ -57,10 +53,6 @@ public interface Familie extends EObject /** * Returns the value of the 'Mutter' reference. * - *

- * If the meaning of the 'Mutter' reference isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Mutter' reference. * @see #setMutter(Erwachsener) @@ -83,10 +75,6 @@ public interface Familie extends EObject /** * Returns the value of the 'Vater' reference. * - *

- * If the meaning of the 'Vater' reference isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Vater' reference. * @see #setVater(Erwachsener) @@ -110,10 +98,6 @@ public interface Familie extends EObject * Returns the value of the 'Kinder' reference list. * The list contents are of type {@link org.eclipse.xtext.testlanguages.referenceGrammar.Kind}. * - *

- * If the meaning of the 'Kinder' reference list isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Kinder' reference list. * @see org.eclipse.xtext.testlanguages.referenceGrammar.ReferenceGrammarPackage#getFamilie_Kinder() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammar/Farbe.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammar/Farbe.java index bdd978ff9..66db2ddbe 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammar/Farbe.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammar/Farbe.java @@ -26,10 +26,6 @@ public interface Farbe extends EObject /** * Returns the value of the 'Wert' attribute. * - *

- * If the meaning of the 'Wert' attribute isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Wert' attribute. * @see #setWert(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammar/Person.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammar/Person.java index 9899a322b..931539ac3 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammar/Person.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammar/Person.java @@ -27,10 +27,6 @@ public interface Person 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) @@ -53,10 +49,6 @@ public interface Person extends EObject /** * Returns the value of the 'Age' attribute. * - *

- * If the meaning of the 'Age' attribute isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Age' attribute. * @see #setAge(int) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammar/Spielplatz.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammar/Spielplatz.java index 8b9a62944..eeda125e3 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammar/Spielplatz.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammar/Spielplatz.java @@ -33,10 +33,6 @@ public interface Spielplatz extends EObject /** * Returns the value of the 'Groesse' attribute. * - *

- * If the meaning of the 'Groesse' attribute isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Groesse' attribute. * @see #setGroesse(int) @@ -59,10 +55,6 @@ public interface Spielplatz extends EObject /** * Returns the value of the 'Beschreibung' attribute. * - *

- * If the meaning of the 'Beschreibung' attribute isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Beschreibung' attribute. * @see #setBeschreibung(String) @@ -86,10 +78,6 @@ public interface Spielplatz extends EObject * Returns the value of the 'Kinder' containment reference list. * The list contents are of type {@link org.eclipse.xtext.testlanguages.referenceGrammar.Kind}. * - *

- * If the meaning of the 'Kinder' containment reference list isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Kinder' containment reference list. * @see org.eclipse.xtext.testlanguages.referenceGrammar.ReferenceGrammarPackage#getSpielplatz_Kinder() @@ -102,10 +90,6 @@ public interface Spielplatz extends EObject * Returns the value of the 'Erzieher' containment reference list. * The list contents are of type {@link org.eclipse.xtext.testlanguages.referenceGrammar.Erwachsener}. * - *

- * If the meaning of the 'Erzieher' containment reference list isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Erzieher' containment reference list. * @see org.eclipse.xtext.testlanguages.referenceGrammar.ReferenceGrammarPackage#getSpielplatz_Erzieher() @@ -118,10 +102,6 @@ public interface Spielplatz extends EObject * Returns the value of the 'Spielzeuge' containment reference list. * The list contents are of type {@link org.eclipse.xtext.testlanguages.referenceGrammar.Spielzeug}. * - *

- * If the meaning of the 'Spielzeuge' containment reference list isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Spielzeuge' containment reference list. * @see org.eclipse.xtext.testlanguages.referenceGrammar.ReferenceGrammarPackage#getSpielplatz_Spielzeuge() @@ -134,10 +114,6 @@ public interface Spielplatz extends EObject * Returns the value of the 'Familie' containment reference list. * The list contents are of type {@link org.eclipse.xtext.testlanguages.referenceGrammar.Familie}. * - *

- * If the meaning of the 'Familie' containment reference list isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Familie' containment reference list. * @see org.eclipse.xtext.testlanguages.referenceGrammar.ReferenceGrammarPackage#getSpielplatz_Familie() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammar/Spielzeug.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammar/Spielzeug.java index 89344a29a..e53375fee 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammar/Spielzeug.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammar/Spielzeug.java @@ -27,10 +27,6 @@ public interface Spielzeug 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) @@ -53,10 +49,6 @@ public interface Spielzeug extends EObject /** * Returns the value of the 'Farbe' containment reference. * - *

- * If the meaning of the 'Farbe' containment reference isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Farbe' containment reference. * @see #setFarbe(Farbe) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammar/impl/FamilieImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammar/impl/FamilieImpl.java index d649437fe..6a14b8a95 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammar/impl/FamilieImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammar/impl/FamilieImpl.java @@ -116,6 +116,7 @@ public class FamilieImpl extends MinimalEObjectImpl.Container implements Familie * * @generated */ + @Override public String getName() { return name; @@ -126,6 +127,7 @@ public class FamilieImpl extends MinimalEObjectImpl.Container implements Familie * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -139,6 +141,7 @@ public class FamilieImpl extends MinimalEObjectImpl.Container implements Familie * * @generated */ + @Override public Erwachsener getMutter() { if (mutter != null && mutter.eIsProxy()) @@ -169,6 +172,7 @@ public class FamilieImpl extends MinimalEObjectImpl.Container implements Familie * * @generated */ + @Override public void setMutter(Erwachsener newMutter) { Erwachsener oldMutter = mutter; @@ -182,6 +186,7 @@ public class FamilieImpl extends MinimalEObjectImpl.Container implements Familie * * @generated */ + @Override public Erwachsener getVater() { if (vater != null && vater.eIsProxy()) @@ -212,6 +217,7 @@ public class FamilieImpl extends MinimalEObjectImpl.Container implements Familie * * @generated */ + @Override public void setVater(Erwachsener newVater) { Erwachsener oldVater = vater; @@ -225,6 +231,7 @@ public class FamilieImpl extends MinimalEObjectImpl.Container implements Familie * * @generated */ + @Override public EList getKinder() { if (kinder == null) @@ -344,7 +351,7 @@ public class FamilieImpl extends MinimalEObjectImpl.Container implements Familie { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammar/impl/FarbeImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammar/impl/FarbeImpl.java index be3c35fa7..db230be21 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammar/impl/FarbeImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammar/impl/FarbeImpl.java @@ -74,6 +74,7 @@ public class FarbeImpl extends MinimalEObjectImpl.Container implements Farbe * * @generated */ + @Override public String getWert() { return wert; @@ -84,6 +85,7 @@ public class FarbeImpl extends MinimalEObjectImpl.Container implements Farbe * * @generated */ + @Override public void setWert(String newWert) { String oldWert = wert; @@ -168,7 +170,7 @@ public class FarbeImpl extends MinimalEObjectImpl.Container implements Farbe { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (wert: "); result.append(wert); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammar/impl/PersonImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammar/impl/PersonImpl.java index 1237d89b4..164b698c2 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammar/impl/PersonImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammar/impl/PersonImpl.java @@ -95,6 +95,7 @@ public class PersonImpl extends MinimalEObjectImpl.Container implements Person * * @generated */ + @Override public String getName() { return name; @@ -105,6 +106,7 @@ public class PersonImpl extends MinimalEObjectImpl.Container implements Person * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -118,6 +120,7 @@ public class PersonImpl extends MinimalEObjectImpl.Container implements Person * * @generated */ + @Override public int getAge() { return age; @@ -128,6 +131,7 @@ public class PersonImpl extends MinimalEObjectImpl.Container implements Person * * @generated */ + @Override public void setAge(int newAge) { int oldAge = age; @@ -222,7 +226,7 @@ public class PersonImpl extends MinimalEObjectImpl.Container implements Person { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(", age: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammar/impl/ReferenceGrammarFactoryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammar/impl/ReferenceGrammarFactoryImpl.java index ba0aa43c3..f5c99acfb 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammar/impl/ReferenceGrammarFactoryImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammar/impl/ReferenceGrammarFactoryImpl.java @@ -82,6 +82,7 @@ public class ReferenceGrammarFactoryImpl extends EFactoryImpl implements Referen * * @generated */ + @Override public Spielplatz createSpielplatz() { SpielplatzImpl spielplatz = new SpielplatzImpl(); @@ -93,6 +94,7 @@ public class ReferenceGrammarFactoryImpl extends EFactoryImpl implements Referen * * @generated */ + @Override public Person createPerson() { PersonImpl person = new PersonImpl(); @@ -104,6 +106,7 @@ public class ReferenceGrammarFactoryImpl extends EFactoryImpl implements Referen * * @generated */ + @Override public Kind createKind() { KindImpl kind = new KindImpl(); @@ -115,6 +118,7 @@ public class ReferenceGrammarFactoryImpl extends EFactoryImpl implements Referen * * @generated */ + @Override public Erwachsener createErwachsener() { ErwachsenerImpl erwachsener = new ErwachsenerImpl(); @@ -126,6 +130,7 @@ public class ReferenceGrammarFactoryImpl extends EFactoryImpl implements Referen * * @generated */ + @Override public Spielzeug createSpielzeug() { SpielzeugImpl spielzeug = new SpielzeugImpl(); @@ -137,6 +142,7 @@ public class ReferenceGrammarFactoryImpl extends EFactoryImpl implements Referen * * @generated */ + @Override public Farbe createFarbe() { FarbeImpl farbe = new FarbeImpl(); @@ -148,6 +154,7 @@ public class ReferenceGrammarFactoryImpl extends EFactoryImpl implements Referen * * @generated */ + @Override public Familie createFamilie() { FamilieImpl familie = new FamilieImpl(); @@ -159,6 +166,7 @@ public class ReferenceGrammarFactoryImpl extends EFactoryImpl implements Referen * * @generated */ + @Override public ReferenceGrammarPackage getReferenceGrammarPackage() { return (ReferenceGrammarPackage)getEPackage(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammar/impl/ReferenceGrammarPackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammar/impl/ReferenceGrammarPackageImpl.java index bfe632c19..ae3878cc7 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammar/impl/ReferenceGrammarPackageImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammar/impl/ReferenceGrammarPackageImpl.java @@ -107,7 +107,7 @@ public class ReferenceGrammarPackageImpl extends EPackageImpl implements Referen /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link ReferenceGrammarPackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -122,7 +122,8 @@ public class ReferenceGrammarPackageImpl extends EPackageImpl implements Referen if (isInited) return (ReferenceGrammarPackage)EPackage.Registry.INSTANCE.getEPackage(ReferenceGrammarPackage.eNS_URI); // Obtain or create and register package - ReferenceGrammarPackageImpl theReferenceGrammarPackage = (ReferenceGrammarPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof ReferenceGrammarPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new ReferenceGrammarPackageImpl()); + Object registeredReferenceGrammarPackage = EPackage.Registry.INSTANCE.get(eNS_URI); + ReferenceGrammarPackageImpl theReferenceGrammarPackage = registeredReferenceGrammarPackage instanceof ReferenceGrammarPackageImpl ? (ReferenceGrammarPackageImpl)registeredReferenceGrammarPackage : new ReferenceGrammarPackageImpl(); isInited = true; @@ -138,7 +139,6 @@ public class ReferenceGrammarPackageImpl extends EPackageImpl implements Referen // Mark meta-data to indicate it can't be changed theReferenceGrammarPackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(ReferenceGrammarPackage.eNS_URI, theReferenceGrammarPackage); return theReferenceGrammarPackage; @@ -149,6 +149,7 @@ public class ReferenceGrammarPackageImpl extends EPackageImpl implements Referen * * @generated */ + @Override public EClass getSpielplatz() { return spielplatzEClass; @@ -159,6 +160,7 @@ public class ReferenceGrammarPackageImpl extends EPackageImpl implements Referen * * @generated */ + @Override public EAttribute getSpielplatz_Groesse() { return (EAttribute)spielplatzEClass.getEStructuralFeatures().get(0); @@ -169,6 +171,7 @@ public class ReferenceGrammarPackageImpl extends EPackageImpl implements Referen * * @generated */ + @Override public EAttribute getSpielplatz_Beschreibung() { return (EAttribute)spielplatzEClass.getEStructuralFeatures().get(1); @@ -179,6 +182,7 @@ public class ReferenceGrammarPackageImpl extends EPackageImpl implements Referen * * @generated */ + @Override public EReference getSpielplatz_Kinder() { return (EReference)spielplatzEClass.getEStructuralFeatures().get(2); @@ -189,6 +193,7 @@ public class ReferenceGrammarPackageImpl extends EPackageImpl implements Referen * * @generated */ + @Override public EReference getSpielplatz_Erzieher() { return (EReference)spielplatzEClass.getEStructuralFeatures().get(3); @@ -199,6 +204,7 @@ public class ReferenceGrammarPackageImpl extends EPackageImpl implements Referen * * @generated */ + @Override public EReference getSpielplatz_Spielzeuge() { return (EReference)spielplatzEClass.getEStructuralFeatures().get(4); @@ -209,6 +215,7 @@ public class ReferenceGrammarPackageImpl extends EPackageImpl implements Referen * * @generated */ + @Override public EReference getSpielplatz_Familie() { return (EReference)spielplatzEClass.getEStructuralFeatures().get(5); @@ -219,6 +226,7 @@ public class ReferenceGrammarPackageImpl extends EPackageImpl implements Referen * * @generated */ + @Override public EClass getPerson() { return personEClass; @@ -229,6 +237,7 @@ public class ReferenceGrammarPackageImpl extends EPackageImpl implements Referen * * @generated */ + @Override public EAttribute getPerson_Name() { return (EAttribute)personEClass.getEStructuralFeatures().get(0); @@ -239,6 +248,7 @@ public class ReferenceGrammarPackageImpl extends EPackageImpl implements Referen * * @generated */ + @Override public EAttribute getPerson_Age() { return (EAttribute)personEClass.getEStructuralFeatures().get(1); @@ -249,6 +259,7 @@ public class ReferenceGrammarPackageImpl extends EPackageImpl implements Referen * * @generated */ + @Override public EClass getKind() { return kindEClass; @@ -259,6 +270,7 @@ public class ReferenceGrammarPackageImpl extends EPackageImpl implements Referen * * @generated */ + @Override public EClass getErwachsener() { return erwachsenerEClass; @@ -269,6 +281,7 @@ public class ReferenceGrammarPackageImpl extends EPackageImpl implements Referen * * @generated */ + @Override public EClass getSpielzeug() { return spielzeugEClass; @@ -279,6 +292,7 @@ public class ReferenceGrammarPackageImpl extends EPackageImpl implements Referen * * @generated */ + @Override public EAttribute getSpielzeug_Name() { return (EAttribute)spielzeugEClass.getEStructuralFeatures().get(0); @@ -289,6 +303,7 @@ public class ReferenceGrammarPackageImpl extends EPackageImpl implements Referen * * @generated */ + @Override public EReference getSpielzeug_Farbe() { return (EReference)spielzeugEClass.getEStructuralFeatures().get(1); @@ -299,6 +314,7 @@ public class ReferenceGrammarPackageImpl extends EPackageImpl implements Referen * * @generated */ + @Override public EClass getFarbe() { return farbeEClass; @@ -309,6 +325,7 @@ public class ReferenceGrammarPackageImpl extends EPackageImpl implements Referen * * @generated */ + @Override public EAttribute getFarbe_Wert() { return (EAttribute)farbeEClass.getEStructuralFeatures().get(0); @@ -319,6 +336,7 @@ public class ReferenceGrammarPackageImpl extends EPackageImpl implements Referen * * @generated */ + @Override public EClass getFamilie() { return familieEClass; @@ -329,6 +347,7 @@ public class ReferenceGrammarPackageImpl extends EPackageImpl implements Referen * * @generated */ + @Override public EAttribute getFamilie_Name() { return (EAttribute)familieEClass.getEStructuralFeatures().get(0); @@ -339,6 +358,7 @@ public class ReferenceGrammarPackageImpl extends EPackageImpl implements Referen * * @generated */ + @Override public EReference getFamilie_Mutter() { return (EReference)familieEClass.getEStructuralFeatures().get(1); @@ -349,6 +369,7 @@ public class ReferenceGrammarPackageImpl extends EPackageImpl implements Referen * * @generated */ + @Override public EReference getFamilie_Vater() { return (EReference)familieEClass.getEStructuralFeatures().get(2); @@ -359,6 +380,7 @@ public class ReferenceGrammarPackageImpl extends EPackageImpl implements Referen * * @generated */ + @Override public EReference getFamilie_Kinder() { return (EReference)familieEClass.getEStructuralFeatures().get(3); @@ -369,6 +391,7 @@ public class ReferenceGrammarPackageImpl extends EPackageImpl implements Referen * * @generated */ + @Override public ReferenceGrammarFactory getReferenceGrammarFactory() { return (ReferenceGrammarFactory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammar/impl/SpielplatzImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammar/impl/SpielplatzImpl.java index 99b9b8026..32c478b3f 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammar/impl/SpielplatzImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammar/impl/SpielplatzImpl.java @@ -152,6 +152,7 @@ public class SpielplatzImpl extends MinimalEObjectImpl.Container implements Spie * * @generated */ + @Override public int getGroesse() { return groesse; @@ -162,6 +163,7 @@ public class SpielplatzImpl extends MinimalEObjectImpl.Container implements Spie * * @generated */ + @Override public void setGroesse(int newGroesse) { int oldGroesse = groesse; @@ -175,6 +177,7 @@ public class SpielplatzImpl extends MinimalEObjectImpl.Container implements Spie * * @generated */ + @Override public String getBeschreibung() { return beschreibung; @@ -185,6 +188,7 @@ public class SpielplatzImpl extends MinimalEObjectImpl.Container implements Spie * * @generated */ + @Override public void setBeschreibung(String newBeschreibung) { String oldBeschreibung = beschreibung; @@ -198,6 +202,7 @@ public class SpielplatzImpl extends MinimalEObjectImpl.Container implements Spie * * @generated */ + @Override public EList getKinder() { if (kinder == null) @@ -212,6 +217,7 @@ public class SpielplatzImpl extends MinimalEObjectImpl.Container implements Spie * * @generated */ + @Override public EList getErzieher() { if (erzieher == null) @@ -226,6 +232,7 @@ public class SpielplatzImpl extends MinimalEObjectImpl.Container implements Spie * * @generated */ + @Override public EList getSpielzeuge() { if (spielzeuge == null) @@ -240,6 +247,7 @@ public class SpielplatzImpl extends MinimalEObjectImpl.Container implements Spie * * @generated */ + @Override public EList getFamilie() { if (familie == null) @@ -402,7 +410,7 @@ public class SpielplatzImpl extends MinimalEObjectImpl.Container implements Spie { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (groesse: "); result.append(groesse); result.append(", beschreibung: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammar/impl/SpielzeugImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammar/impl/SpielzeugImpl.java index 963fa405c..38c486ae8 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammar/impl/SpielzeugImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/referenceGrammar/impl/SpielzeugImpl.java @@ -88,6 +88,7 @@ public class SpielzeugImpl extends MinimalEObjectImpl.Container implements Spiel * * @generated */ + @Override public String getName() { return name; @@ -98,6 +99,7 @@ public class SpielzeugImpl extends MinimalEObjectImpl.Container implements Spiel * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -111,6 +113,7 @@ public class SpielzeugImpl extends MinimalEObjectImpl.Container implements Spiel * * @generated */ + @Override public Farbe getFarbe() { return farbe; @@ -138,6 +141,7 @@ public class SpielzeugImpl extends MinimalEObjectImpl.Container implements Spiel * * @generated */ + @Override public void setFarbe(Farbe newFarbe) { if (newFarbe != farbe) @@ -256,7 +260,7 @@ public class SpielzeugImpl extends MinimalEObjectImpl.Container implements Spiel { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/simpleExpressions/Atom.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/simpleExpressions/Atom.java index 22e96a6b3..2cb0eef83 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/simpleExpressions/Atom.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/simpleExpressions/Atom.java @@ -25,10 +25,6 @@ public interface Atom extends Expression /** * 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) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/simpleExpressions/Op.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/simpleExpressions/Op.java index 69f4ba809..1703afe2f 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/simpleExpressions/Op.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/simpleExpressions/Op.java @@ -28,10 +28,6 @@ public interface Op extends Expression * Returns the value of the 'Values' containment reference list. * The list contents are of type {@link org.eclipse.xtext.testlanguages.simpleExpressions.Expression}. * - *

- * If the meaning of the 'Values' containment reference list isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Values' containment reference list. * @see org.eclipse.xtext.testlanguages.simpleExpressions.SimpleExpressionsPackage#getOp_Values() @@ -43,10 +39,6 @@ public interface Op extends Expression /** * Returns the value of the 'Operator' attribute. * - *

- * If the meaning of the 'Operator' attribute isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Operator' attribute. * @see #setOperator(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/simpleExpressions/Sequence.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/simpleExpressions/Sequence.java index 32c6e2a2b..6d86c513f 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/simpleExpressions/Sequence.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/simpleExpressions/Sequence.java @@ -29,10 +29,6 @@ public interface Sequence extends EObject * Returns the value of the 'Expressions' containment reference list. * The list contents are of type {@link org.eclipse.xtext.testlanguages.simpleExpressions.Sequence}. * - *

- * If the meaning of the 'Expressions' containment reference list isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Expressions' containment reference list. * @see org.eclipse.xtext.testlanguages.simpleExpressions.SimpleExpressionsPackage#getSequence_Expressions() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/simpleExpressions/impl/AtomImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/simpleExpressions/impl/AtomImpl.java index 27475450f..198771dee 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/simpleExpressions/impl/AtomImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/simpleExpressions/impl/AtomImpl.java @@ -73,6 +73,7 @@ public class AtomImpl extends ExpressionImpl implements Atom * * @generated */ + @Override public String getName() { return name; @@ -83,6 +84,7 @@ public class AtomImpl extends ExpressionImpl implements Atom * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -167,7 +169,7 @@ public class AtomImpl extends ExpressionImpl implements Atom { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/simpleExpressions/impl/OpImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/simpleExpressions/impl/OpImpl.java index 1ddf0f8da..0071ee558 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/simpleExpressions/impl/OpImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/simpleExpressions/impl/OpImpl.java @@ -94,6 +94,7 @@ public class OpImpl extends ExpressionImpl implements Op * * @generated */ + @Override public EList getValues() { if (values == null) @@ -108,6 +109,7 @@ public class OpImpl extends ExpressionImpl implements Op * * @generated */ + @Override public String getOperator() { return operator; @@ -118,6 +120,7 @@ public class OpImpl extends ExpressionImpl implements Op * * @generated */ + @Override public void setOperator(String newOperator) { String oldOperator = operator; @@ -230,7 +233,7 @@ public class OpImpl extends ExpressionImpl implements Op { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (operator: "); result.append(operator); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/simpleExpressions/impl/SequenceImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/simpleExpressions/impl/SequenceImpl.java index 50fdb8a55..06c622cc2 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/simpleExpressions/impl/SequenceImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/simpleExpressions/impl/SequenceImpl.java @@ -71,6 +71,7 @@ public class SequenceImpl extends MinimalEObjectImpl.Container implements Sequen * * @generated */ + @Override public EList getExpressions() { if (expressions == null) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/simpleExpressions/impl/SimpleExpressionsFactoryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/simpleExpressions/impl/SimpleExpressionsFactoryImpl.java index 03f8960a1..51c74d973 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/simpleExpressions/impl/SimpleExpressionsFactoryImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/simpleExpressions/impl/SimpleExpressionsFactoryImpl.java @@ -79,6 +79,7 @@ public class SimpleExpressionsFactoryImpl extends EFactoryImpl implements Simple * * @generated */ + @Override public Sequence createSequence() { SequenceImpl sequence = new SequenceImpl(); @@ -90,6 +91,7 @@ public class SimpleExpressionsFactoryImpl extends EFactoryImpl implements Simple * * @generated */ + @Override public Expression createExpression() { ExpressionImpl expression = new ExpressionImpl(); @@ -101,6 +103,7 @@ public class SimpleExpressionsFactoryImpl extends EFactoryImpl implements Simple * * @generated */ + @Override public Atom createAtom() { AtomImpl atom = new AtomImpl(); @@ -112,6 +115,7 @@ public class SimpleExpressionsFactoryImpl extends EFactoryImpl implements Simple * * @generated */ + @Override public Op createOp() { OpImpl op = new OpImpl(); @@ -123,6 +127,7 @@ public class SimpleExpressionsFactoryImpl extends EFactoryImpl implements Simple * * @generated */ + @Override public SimpleExpressionsPackage getSimpleExpressionsPackage() { return (SimpleExpressionsPackage)getEPackage(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/simpleExpressions/impl/SimpleExpressionsPackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/simpleExpressions/impl/SimpleExpressionsPackageImpl.java index 121e15af2..503c7ef88 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/simpleExpressions/impl/SimpleExpressionsPackageImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/simpleExpressions/impl/SimpleExpressionsPackageImpl.java @@ -83,7 +83,7 @@ public class SimpleExpressionsPackageImpl extends EPackageImpl implements Simple /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link SimpleExpressionsPackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -98,7 +98,8 @@ public class SimpleExpressionsPackageImpl extends EPackageImpl implements Simple if (isInited) return (SimpleExpressionsPackage)EPackage.Registry.INSTANCE.getEPackage(SimpleExpressionsPackage.eNS_URI); // Obtain or create and register package - SimpleExpressionsPackageImpl theSimpleExpressionsPackage = (SimpleExpressionsPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof SimpleExpressionsPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new SimpleExpressionsPackageImpl()); + Object registeredSimpleExpressionsPackage = EPackage.Registry.INSTANCE.get(eNS_URI); + SimpleExpressionsPackageImpl theSimpleExpressionsPackage = registeredSimpleExpressionsPackage instanceof SimpleExpressionsPackageImpl ? (SimpleExpressionsPackageImpl)registeredSimpleExpressionsPackage : new SimpleExpressionsPackageImpl(); isInited = true; @@ -114,7 +115,6 @@ public class SimpleExpressionsPackageImpl extends EPackageImpl implements Simple // Mark meta-data to indicate it can't be changed theSimpleExpressionsPackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(SimpleExpressionsPackage.eNS_URI, theSimpleExpressionsPackage); return theSimpleExpressionsPackage; @@ -125,6 +125,7 @@ public class SimpleExpressionsPackageImpl extends EPackageImpl implements Simple * * @generated */ + @Override public EClass getSequence() { return sequenceEClass; @@ -135,6 +136,7 @@ public class SimpleExpressionsPackageImpl extends EPackageImpl implements Simple * * @generated */ + @Override public EReference getSequence_Expressions() { return (EReference)sequenceEClass.getEStructuralFeatures().get(0); @@ -145,6 +147,7 @@ public class SimpleExpressionsPackageImpl extends EPackageImpl implements Simple * * @generated */ + @Override public EClass getExpression() { return expressionEClass; @@ -155,6 +158,7 @@ public class SimpleExpressionsPackageImpl extends EPackageImpl implements Simple * * @generated */ + @Override public EClass getAtom() { return atomEClass; @@ -165,6 +169,7 @@ public class SimpleExpressionsPackageImpl extends EPackageImpl implements Simple * * @generated */ + @Override public EAttribute getAtom_Name() { return (EAttribute)atomEClass.getEStructuralFeatures().get(0); @@ -175,6 +180,7 @@ public class SimpleExpressionsPackageImpl extends EPackageImpl implements Simple * * @generated */ + @Override public EClass getOp() { return opEClass; @@ -185,6 +191,7 @@ public class SimpleExpressionsPackageImpl extends EPackageImpl implements Simple * * @generated */ + @Override public EReference getOp_Values() { return (EReference)opEClass.getEStructuralFeatures().get(0); @@ -195,6 +202,7 @@ public class SimpleExpressionsPackageImpl extends EPackageImpl implements Simple * * @generated */ + @Override public EAttribute getOp_Operator() { return (EAttribute)opEClass.getEStructuralFeatures().get(1); @@ -205,6 +213,7 @@ public class SimpleExpressionsPackageImpl extends EPackageImpl implements Simple * * @generated */ + @Override public SimpleExpressionsFactory getSimpleExpressionsFactory() { return (SimpleExpressionsFactory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/testLang/ChoiceElement.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/testLang/ChoiceElement.java index f63f1be4b..e41fe1341 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/testLang/ChoiceElement.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/testLang/ChoiceElement.java @@ -26,10 +26,6 @@ public interface ChoiceElement extends AbstractElement /** * Returns the value of the 'Optional Keyword' attribute. * - *

- * If the meaning of the 'Optional Keyword' attribute isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Optional Keyword' attribute. * @see #setOptionalKeyword(boolean) @@ -52,10 +48,6 @@ public interface ChoiceElement extends AbstractElement /** * 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) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/testLang/Model.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/testLang/Model.java index bcc92d16b..ba2f8358f 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/testLang/Model.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/testLang/Model.java @@ -29,10 +29,6 @@ public interface Model extends EObject * Returns the value of the 'Multi Feature' containment reference list. * The list contents are of type {@link org.eclipse.xtext.testlanguages.testLang.AbstractElement}. * - *

- * If the meaning of the 'Multi Feature' containment reference list isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Multi Feature' containment reference list. * @see org.eclipse.xtext.testlanguages.testLang.TestLangPackage#getModel_MultiFeature() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/testLang/ReducibleComposite.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/testLang/ReducibleComposite.java index 1e8e2c942..791170e59 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/testLang/ReducibleComposite.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/testLang/ReducibleComposite.java @@ -27,10 +27,6 @@ public interface ReducibleComposite extends ReducibleElement * Returns the value of the 'Action Feature' containment reference list. * The list contents are of type {@link org.eclipse.xtext.testlanguages.testLang.TerminalElement}. * - *

- * If the meaning of the 'Action Feature' containment reference list isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Action Feature' containment reference list. * @see org.eclipse.xtext.testlanguages.testLang.TestLangPackage#getReducibleComposite_ActionFeature() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/testLang/TerminalElement.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/testLang/TerminalElement.java index 4a2418d87..18ec0841d 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/testLang/TerminalElement.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/testLang/TerminalElement.java @@ -25,10 +25,6 @@ public interface TerminalElement extends ReducibleElement /** * Returns the value of the 'String Feature' attribute. * - *

- * If the meaning of the 'String Feature' attribute isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'String Feature' attribute. * @see #setStringFeature(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/testLang/impl/ChoiceElementImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/testLang/impl/ChoiceElementImpl.java index 45415e915..6cdafc080 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/testLang/impl/ChoiceElementImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/testLang/impl/ChoiceElementImpl.java @@ -94,6 +94,7 @@ public class ChoiceElementImpl extends AbstractElementImpl implements ChoiceElem * * @generated */ + @Override public boolean isOptionalKeyword() { return optionalKeyword; @@ -104,6 +105,7 @@ public class ChoiceElementImpl extends AbstractElementImpl implements ChoiceElem * * @generated */ + @Override public void setOptionalKeyword(boolean newOptionalKeyword) { boolean oldOptionalKeyword = optionalKeyword; @@ -117,6 +119,7 @@ public class ChoiceElementImpl extends AbstractElementImpl implements ChoiceElem * * @generated */ + @Override public String getName() { return name; @@ -127,6 +130,7 @@ public class ChoiceElementImpl extends AbstractElementImpl implements ChoiceElem * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -221,7 +225,7 @@ public class ChoiceElementImpl extends AbstractElementImpl implements ChoiceElem { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (optionalKeyword: "); result.append(optionalKeyword); result.append(", name: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/testLang/impl/ModelImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/testLang/impl/ModelImpl.java index b52a32ef0..fbc7c5e0e 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/testLang/impl/ModelImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/testLang/impl/ModelImpl.java @@ -72,6 +72,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public EList getMultiFeature() { if (multiFeature == null) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/testLang/impl/ReducibleCompositeImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/testLang/impl/ReducibleCompositeImpl.java index c73a2dea5..a7da72d2b 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/testLang/impl/ReducibleCompositeImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/testLang/impl/ReducibleCompositeImpl.java @@ -70,6 +70,7 @@ public class ReducibleCompositeImpl extends ReducibleElementImpl implements Redu * * @generated */ + @Override public EList getActionFeature() { if (actionFeature == null) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/testLang/impl/TerminalElementImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/testLang/impl/TerminalElementImpl.java index d4b87c33a..555025cae 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/testLang/impl/TerminalElementImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/testLang/impl/TerminalElementImpl.java @@ -73,6 +73,7 @@ public class TerminalElementImpl extends ReducibleElementImpl implements Termina * * @generated */ + @Override public String getStringFeature() { return stringFeature; @@ -83,6 +84,7 @@ public class TerminalElementImpl extends ReducibleElementImpl implements Termina * * @generated */ + @Override public void setStringFeature(String newStringFeature) { String oldStringFeature = stringFeature; @@ -167,7 +169,7 @@ public class TerminalElementImpl extends ReducibleElementImpl implements Termina { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (stringFeature: "); result.append(stringFeature); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/testLang/impl/TestLangFactoryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/testLang/impl/TestLangFactoryImpl.java index 9347fd945..e28d68d6e 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/testLang/impl/TestLangFactoryImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/testLang/impl/TestLangFactoryImpl.java @@ -81,6 +81,7 @@ public class TestLangFactoryImpl extends EFactoryImpl implements TestLangFactory * * @generated */ + @Override public Model createModel() { ModelImpl model = new ModelImpl(); @@ -92,6 +93,7 @@ public class TestLangFactoryImpl extends EFactoryImpl implements TestLangFactory * * @generated */ + @Override public AbstractElement createAbstractElement() { AbstractElementImpl abstractElement = new AbstractElementImpl(); @@ -103,6 +105,7 @@ public class TestLangFactoryImpl extends EFactoryImpl implements TestLangFactory * * @generated */ + @Override public ChoiceElement createChoiceElement() { ChoiceElementImpl choiceElement = new ChoiceElementImpl(); @@ -114,6 +117,7 @@ public class TestLangFactoryImpl extends EFactoryImpl implements TestLangFactory * * @generated */ + @Override public ReducibleElement createReducibleElement() { ReducibleElementImpl reducibleElement = new ReducibleElementImpl(); @@ -125,6 +129,7 @@ public class TestLangFactoryImpl extends EFactoryImpl implements TestLangFactory * * @generated */ + @Override public TerminalElement createTerminalElement() { TerminalElementImpl terminalElement = new TerminalElementImpl(); @@ -136,6 +141,7 @@ public class TestLangFactoryImpl extends EFactoryImpl implements TestLangFactory * * @generated */ + @Override public ReducibleComposite createReducibleComposite() { ReducibleCompositeImpl reducibleComposite = new ReducibleCompositeImpl(); @@ -147,6 +153,7 @@ public class TestLangFactoryImpl extends EFactoryImpl implements TestLangFactory * * @generated */ + @Override public TestLangPackage getTestLangPackage() { return (TestLangPackage)getEPackage(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/testLang/impl/TestLangPackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/testLang/impl/TestLangPackageImpl.java index 9a82952f4..1a03094c7 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/testLang/impl/TestLangPackageImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/testLang/impl/TestLangPackageImpl.java @@ -99,7 +99,7 @@ public class TestLangPackageImpl extends EPackageImpl implements TestLangPackage /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link TestLangPackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -114,7 +114,8 @@ public class TestLangPackageImpl extends EPackageImpl implements TestLangPackage if (isInited) return (TestLangPackage)EPackage.Registry.INSTANCE.getEPackage(TestLangPackage.eNS_URI); // Obtain or create and register package - TestLangPackageImpl theTestLangPackage = (TestLangPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof TestLangPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new TestLangPackageImpl()); + Object registeredTestLangPackage = EPackage.Registry.INSTANCE.get(eNS_URI); + TestLangPackageImpl theTestLangPackage = registeredTestLangPackage instanceof TestLangPackageImpl ? (TestLangPackageImpl)registeredTestLangPackage : new TestLangPackageImpl(); isInited = true; @@ -130,7 +131,6 @@ public class TestLangPackageImpl extends EPackageImpl implements TestLangPackage // Mark meta-data to indicate it can't be changed theTestLangPackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(TestLangPackage.eNS_URI, theTestLangPackage); return theTestLangPackage; @@ -141,6 +141,7 @@ public class TestLangPackageImpl extends EPackageImpl implements TestLangPackage * * @generated */ + @Override public EClass getModel() { return modelEClass; @@ -151,6 +152,7 @@ public class TestLangPackageImpl extends EPackageImpl implements TestLangPackage * * @generated */ + @Override public EReference getModel_MultiFeature() { return (EReference)modelEClass.getEStructuralFeatures().get(0); @@ -161,6 +163,7 @@ public class TestLangPackageImpl extends EPackageImpl implements TestLangPackage * * @generated */ + @Override public EClass getAbstractElement() { return abstractElementEClass; @@ -171,6 +174,7 @@ public class TestLangPackageImpl extends EPackageImpl implements TestLangPackage * * @generated */ + @Override public EClass getChoiceElement() { return choiceElementEClass; @@ -181,6 +185,7 @@ public class TestLangPackageImpl extends EPackageImpl implements TestLangPackage * * @generated */ + @Override public EAttribute getChoiceElement_OptionalKeyword() { return (EAttribute)choiceElementEClass.getEStructuralFeatures().get(0); @@ -191,6 +196,7 @@ public class TestLangPackageImpl extends EPackageImpl implements TestLangPackage * * @generated */ + @Override public EAttribute getChoiceElement_Name() { return (EAttribute)choiceElementEClass.getEStructuralFeatures().get(1); @@ -201,6 +207,7 @@ public class TestLangPackageImpl extends EPackageImpl implements TestLangPackage * * @generated */ + @Override public EClass getReducibleElement() { return reducibleElementEClass; @@ -211,6 +218,7 @@ public class TestLangPackageImpl extends EPackageImpl implements TestLangPackage * * @generated */ + @Override public EClass getTerminalElement() { return terminalElementEClass; @@ -221,6 +229,7 @@ public class TestLangPackageImpl extends EPackageImpl implements TestLangPackage * * @generated */ + @Override public EAttribute getTerminalElement_StringFeature() { return (EAttribute)terminalElementEClass.getEStructuralFeatures().get(0); @@ -231,6 +240,7 @@ public class TestLangPackageImpl extends EPackageImpl implements TestLangPackage * * @generated */ + @Override public EClass getReducibleComposite() { return reducibleCompositeEClass; @@ -241,6 +251,7 @@ public class TestLangPackageImpl extends EPackageImpl implements TestLangPackage * * @generated */ + @Override public EReference getReducibleComposite_ActionFeature() { return (EReference)reducibleCompositeEClass.getEStructuralFeatures().get(0); @@ -251,6 +262,7 @@ public class TestLangPackageImpl extends EPackageImpl implements TestLangPackage * * @generated */ + @Override public TestLangFactory getTestLangFactory() { return (TestLangFactory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/treeTestLanguage/Model.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/treeTestLanguage/Model.java index 17b56b4ed..a45a4ffc2 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/treeTestLanguage/Model.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/treeTestLanguage/Model.java @@ -29,10 +29,6 @@ public interface Model extends EObject * Returns the value of the 'Children' containment reference list. * The list contents are of type {@link org.eclipse.xtext.testlanguages.treeTestLanguage.Node}. * - *

- * If the meaning of the 'Children' containment reference list isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Children' containment reference list. * @see org.eclipse.xtext.testlanguages.treeTestLanguage.TreeTestLanguagePackage#getModel_Children() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/treeTestLanguage/Node.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/treeTestLanguage/Node.java index 99e15ea60..d3951317d 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/treeTestLanguage/Node.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/treeTestLanguage/Node.java @@ -30,10 +30,6 @@ public interface Node 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) @@ -56,10 +52,6 @@ public interface Node extends EObject /** * Returns the value of the 'Attrib' attribute. * - *

- * If the meaning of the 'Attrib' attribute isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Attrib' attribute. * @see #setAttrib(String) @@ -83,10 +75,6 @@ public interface Node extends EObject * Returns the value of the 'Children' containment reference list. * The list contents are of type {@link org.eclipse.xtext.testlanguages.treeTestLanguage.Node}. * - *

- * If the meaning of the 'Children' containment reference list isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Children' containment reference list. * @see org.eclipse.xtext.testlanguages.treeTestLanguage.TreeTestLanguagePackage#getNode_Children() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/treeTestLanguage/impl/ModelImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/treeTestLanguage/impl/ModelImpl.java index 582bee56e..0d51193e3 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/treeTestLanguage/impl/ModelImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/treeTestLanguage/impl/ModelImpl.java @@ -72,6 +72,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public EList getChildren() { if (children == null) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/treeTestLanguage/impl/NodeImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/treeTestLanguage/impl/NodeImpl.java index 54f85467b..eaa3b99f3 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/treeTestLanguage/impl/NodeImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/treeTestLanguage/impl/NodeImpl.java @@ -115,6 +115,7 @@ public class NodeImpl extends MinimalEObjectImpl.Container implements Node * * @generated */ + @Override public String getName() { return name; @@ -125,6 +126,7 @@ public class NodeImpl extends MinimalEObjectImpl.Container implements Node * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -138,6 +140,7 @@ public class NodeImpl extends MinimalEObjectImpl.Container implements Node * * @generated */ + @Override public String getAttrib() { return attrib; @@ -148,6 +151,7 @@ public class NodeImpl extends MinimalEObjectImpl.Container implements Node * * @generated */ + @Override public void setAttrib(String newAttrib) { String oldAttrib = attrib; @@ -161,6 +165,7 @@ public class NodeImpl extends MinimalEObjectImpl.Container implements Node * * @generated */ + @Override public EList getChildren() { if (children == null) @@ -284,7 +289,7 @@ public class NodeImpl extends MinimalEObjectImpl.Container implements Node { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(", attrib: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/treeTestLanguage/impl/TreeTestLanguageFactoryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/treeTestLanguage/impl/TreeTestLanguageFactoryImpl.java index b8d8a3eac..91cfd8ec7 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/treeTestLanguage/impl/TreeTestLanguageFactoryImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/treeTestLanguage/impl/TreeTestLanguageFactoryImpl.java @@ -77,6 +77,7 @@ public class TreeTestLanguageFactoryImpl extends EFactoryImpl implements TreeTes * * @generated */ + @Override public Model createModel() { ModelImpl model = new ModelImpl(); @@ -88,6 +89,7 @@ public class TreeTestLanguageFactoryImpl extends EFactoryImpl implements TreeTes * * @generated */ + @Override public Node createNode() { NodeImpl node = new NodeImpl(); @@ -99,6 +101,7 @@ public class TreeTestLanguageFactoryImpl extends EFactoryImpl implements TreeTes * * @generated */ + @Override public TreeTestLanguagePackage getTreeTestLanguagePackage() { return (TreeTestLanguagePackage)getEPackage(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/treeTestLanguage/impl/TreeTestLanguagePackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/treeTestLanguage/impl/TreeTestLanguagePackageImpl.java index 6306c6cea..0c8de6bf1 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/treeTestLanguage/impl/TreeTestLanguagePackageImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/testlanguages/treeTestLanguage/impl/TreeTestLanguagePackageImpl.java @@ -67,7 +67,7 @@ public class TreeTestLanguagePackageImpl extends EPackageImpl implements TreeTes /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link TreeTestLanguagePackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -82,7 +82,8 @@ public class TreeTestLanguagePackageImpl extends EPackageImpl implements TreeTes if (isInited) return (TreeTestLanguagePackage)EPackage.Registry.INSTANCE.getEPackage(TreeTestLanguagePackage.eNS_URI); // Obtain or create and register package - TreeTestLanguagePackageImpl theTreeTestLanguagePackage = (TreeTestLanguagePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof TreeTestLanguagePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new TreeTestLanguagePackageImpl()); + Object registeredTreeTestLanguagePackage = EPackage.Registry.INSTANCE.get(eNS_URI); + TreeTestLanguagePackageImpl theTreeTestLanguagePackage = registeredTreeTestLanguagePackage instanceof TreeTestLanguagePackageImpl ? (TreeTestLanguagePackageImpl)registeredTreeTestLanguagePackage : new TreeTestLanguagePackageImpl(); isInited = true; @@ -98,7 +99,6 @@ public class TreeTestLanguagePackageImpl extends EPackageImpl implements TreeTes // Mark meta-data to indicate it can't be changed theTreeTestLanguagePackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(TreeTestLanguagePackage.eNS_URI, theTreeTestLanguagePackage); return theTreeTestLanguagePackage; @@ -109,6 +109,7 @@ public class TreeTestLanguagePackageImpl extends EPackageImpl implements TreeTes * * @generated */ + @Override public EClass getModel() { return modelEClass; @@ -119,6 +120,7 @@ public class TreeTestLanguagePackageImpl extends EPackageImpl implements TreeTes * * @generated */ + @Override public EReference getModel_Children() { return (EReference)modelEClass.getEStructuralFeatures().get(0); @@ -129,6 +131,7 @@ public class TreeTestLanguagePackageImpl extends EPackageImpl implements TreeTes * * @generated */ + @Override public EClass getNode() { return nodeEClass; @@ -139,6 +142,7 @@ public class TreeTestLanguagePackageImpl extends EPackageImpl implements TreeTes * * @generated */ + @Override public EAttribute getNode_Name() { return (EAttribute)nodeEClass.getEStructuralFeatures().get(0); @@ -149,6 +153,7 @@ public class TreeTestLanguagePackageImpl extends EPackageImpl implements TreeTes * * @generated */ + @Override public EAttribute getNode_Attrib() { return (EAttribute)nodeEClass.getEStructuralFeatures().get(1); @@ -159,6 +164,7 @@ public class TreeTestLanguagePackageImpl extends EPackageImpl implements TreeTes * * @generated */ + @Override public EReference getNode_Children() { return (EReference)nodeEClass.getEStructuralFeatures().get(2); @@ -169,6 +175,7 @@ public class TreeTestLanguagePackageImpl extends EPackageImpl implements TreeTes * * @generated */ + @Override public TreeTestLanguageFactory getTreeTestLanguageFactory() { return (TreeTestLanguageFactory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/ConcreteSyntaxValidationTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/ConcreteSyntaxValidationTestLanguage.genmodel index 825977ccb..4a5c357e8 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/ConcreteSyntaxValidationTestLanguage.genmodel +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/ConcreteSyntaxValidationTestLanguage.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="ConcreteSyntaxValidationTestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> + complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/AltList1.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/AltList1.java index 47e5e0170..532eae68b 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/AltList1.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/AltList1.java @@ -29,10 +29,6 @@ public interface AltList1 extends EObject /** * Returns the value of the 'Val1' attribute. * - *

- * If the meaning of the 'Val1' attribute isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Val1' attribute. * @see #setVal1(String) @@ -55,10 +51,6 @@ public interface AltList1 extends EObject /** * Returns the value of the 'Val2' attribute. * - *

- * If the meaning of the 'Val2' attribute isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Val2' attribute. * @see #setVal2(String) @@ -81,10 +73,6 @@ public interface AltList1 extends EObject /** * Returns the value of the 'Val3' attribute. * - *

- * If the meaning of the 'Val3' attribute isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Val3' attribute. * @see #setVal3(String) @@ -107,10 +95,6 @@ public interface AltList1 extends EObject /** * Returns the value of the 'Val4' attribute. * - *

- * If the meaning of the 'Val4' attribute isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Val4' attribute. * @see #setVal4(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/AltList2.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/AltList2.java index 25fdbae3c..79f59cb3e 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/AltList2.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/AltList2.java @@ -31,10 +31,6 @@ public interface AltList2 extends EObject * Returns the value of the 'Val1' attribute list. * The list contents are of type {@link java.lang.String}. * - *

- * If the meaning of the 'Val1' attribute list isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Val1' attribute list. * @see org.eclipse.xtext.validation.csvalidationtest.CsvalidationtestPackage#getAltList2_Val1() @@ -46,10 +42,6 @@ public interface AltList2 extends EObject /** * Returns the value of the 'Val2' attribute. * - *

- * If the meaning of the 'Val2' attribute isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Val2' attribute. * @see #setVal2(String) @@ -72,10 +64,6 @@ public interface AltList2 extends EObject /** * Returns the value of the 'Val3' attribute. * - *

- * If the meaning of the 'Val3' attribute isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Val3' attribute. * @see #setVal3(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/AlternativeMultiplicities.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/AlternativeMultiplicities.java index 65d86106f..edfe93105 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/AlternativeMultiplicities.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/AlternativeMultiplicities.java @@ -33,10 +33,6 @@ public interface AlternativeMultiplicities extends EObject /** * Returns the value of the 'Val2' attribute. * - *

- * If the meaning of the 'Val2' attribute isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Val2' attribute. * @see #setVal2(String) @@ -59,10 +55,6 @@ public interface AlternativeMultiplicities extends EObject /** * Returns the value of the 'Val3' attribute. * - *

- * If the meaning of the 'Val3' attribute isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Val3' attribute. * @see #setVal3(String) @@ -86,10 +78,6 @@ public interface AlternativeMultiplicities extends EObject * Returns the value of the 'Val4' attribute list. * The list contents are of type {@link java.lang.String}. * - *

- * If the meaning of the 'Val4' attribute list isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Val4' attribute list. * @see org.eclipse.xtext.validation.csvalidationtest.CsvalidationtestPackage#getAlternativeMultiplicities_Val4() @@ -102,10 +90,6 @@ public interface AlternativeMultiplicities extends EObject * Returns the value of the 'Val5' attribute list. * The list contents are of type {@link java.lang.String}. * - *

- * If the meaning of the 'Val5' attribute list isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Val5' attribute list. * @see org.eclipse.xtext.validation.csvalidationtest.CsvalidationtestPackage#getAlternativeMultiplicities_Val5() @@ -118,10 +102,6 @@ public interface AlternativeMultiplicities extends EObject * Returns the value of the 'Val6' attribute list. * The list contents are of type {@link java.lang.String}. * - *

- * If the meaning of the 'Val6' attribute list isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Val6' attribute list. * @see org.eclipse.xtext.validation.csvalidationtest.CsvalidationtestPackage#getAlternativeMultiplicities_Val6() @@ -134,10 +114,6 @@ public interface AlternativeMultiplicities extends EObject * Returns the value of the 'Val7' attribute list. * The list contents are of type {@link java.lang.String}. * - *

- * If the meaning of the 'Val7' attribute list isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Val7' attribute list. * @see org.eclipse.xtext.validation.csvalidationtest.CsvalidationtestPackage#getAlternativeMultiplicities_Val7() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/AssignedAction.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/AssignedAction.java index bd1a001e0..fc470fd5a 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/AssignedAction.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/AssignedAction.java @@ -28,10 +28,6 @@ public interface AssignedAction extends EObject /** * Returns the value of the 'Val1' attribute. * - *

- * If the meaning of the 'Val1' attribute isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Val1' attribute. * @see #setVal1(String) @@ -54,10 +50,6 @@ public interface AssignedAction extends EObject /** * Returns the value of the 'Child' containment reference. * - *

- * If the meaning of the 'Child' containment reference isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Child' containment reference. * @see #setChild(AssignedAction) @@ -80,10 +72,6 @@ public interface AssignedAction extends EObject /** * Returns the value of the 'Val2' attribute. * - *

- * If the meaning of the 'Val2' attribute isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Val2' attribute. * @see #setVal2(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/Combination1.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/Combination1.java index c4deeb312..f779365a8 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/Combination1.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/Combination1.java @@ -29,10 +29,6 @@ public interface Combination1 extends EObject /** * Returns the value of the 'Val1' attribute. * - *

- * If the meaning of the 'Val1' attribute isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Val1' attribute. * @see #setVal1(String) @@ -55,10 +51,6 @@ public interface Combination1 extends EObject /** * Returns the value of the 'Val2' attribute. * - *

- * If the meaning of the 'Val2' attribute isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Val2' attribute. * @see #setVal2(String) @@ -81,10 +73,6 @@ public interface Combination1 extends EObject /** * Returns the value of the 'Val3' attribute. * - *

- * If the meaning of the 'Val3' attribute isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Val3' attribute. * @see #setVal3(String) @@ -107,10 +95,6 @@ public interface Combination1 extends EObject /** * Returns the value of the 'Val4' attribute. * - *

- * If the meaning of the 'Val4' attribute isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Val4' attribute. * @see #setVal4(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/Combination2.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/Combination2.java index 7952a1784..eea6f20dc 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/Combination2.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/Combination2.java @@ -31,10 +31,6 @@ public interface Combination2 extends EObject /** * Returns the value of the 'Val1' attribute. * - *

- * If the meaning of the 'Val1' attribute isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Val1' attribute. * @see #setVal1(String) @@ -57,10 +53,6 @@ public interface Combination2 extends EObject /** * Returns the value of the 'Val2' attribute. * - *

- * If the meaning of the 'Val2' attribute isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Val2' attribute. * @see #setVal2(String) @@ -84,10 +76,6 @@ public interface Combination2 extends EObject * Returns the value of the 'Val3' attribute list. * The list contents are of type {@link java.lang.String}. * - *

- * If the meaning of the 'Val3' attribute list isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Val3' attribute list. * @see org.eclipse.xtext.validation.csvalidationtest.CsvalidationtestPackage#getCombination2_Val3() @@ -100,10 +88,6 @@ public interface Combination2 extends EObject * Returns the value of the 'Val4' attribute list. * The list contents are of type {@link java.lang.String}. * - *

- * If the meaning of the 'Val4' attribute list isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Val4' attribute list. * @see org.eclipse.xtext.validation.csvalidationtest.CsvalidationtestPackage#getCombination2_Val4() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/Combination3.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/Combination3.java index d902b7623..7035c38bf 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/Combination3.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/Combination3.java @@ -28,10 +28,6 @@ public interface Combination3 extends EObject /** * Returns the value of the 'Val1' attribute. * - *

- * If the meaning of the 'Val1' attribute isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Val1' attribute. * @see #setVal1(String) @@ -54,10 +50,6 @@ public interface Combination3 extends EObject /** * Returns the value of the 'Val2' attribute. * - *

- * If the meaning of the 'Val2' attribute isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Val2' attribute. * @see #setVal2(int) @@ -80,10 +72,6 @@ public interface Combination3 extends EObject /** * Returns the value of the 'Val3' attribute. * - *

- * If the meaning of the 'Val3' attribute isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Val3' attribute. * @see #setVal3(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/Combination4.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/Combination4.java index ef51ada4a..e4b73625d 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/Combination4.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/Combination4.java @@ -31,10 +31,6 @@ public interface Combination4 extends EObject * Returns the value of the 'Val1' attribute list. * The list contents are of type {@link java.lang.String}. * - *

- * If the meaning of the 'Val1' attribute list isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Val1' attribute list. * @see org.eclipse.xtext.validation.csvalidationtest.CsvalidationtestPackage#getCombination4_Val1() @@ -47,10 +43,6 @@ public interface Combination4 extends EObject * Returns the value of the 'Val2' attribute list. * The list contents are of type {@link java.lang.String}. * - *

- * If the meaning of the 'Val2' attribute list isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Val2' attribute list. * @see org.eclipse.xtext.validation.csvalidationtest.CsvalidationtestPackage#getCombination4_Val2() @@ -63,10 +55,6 @@ public interface Combination4 extends EObject * Returns the value of the 'Val3' attribute list. * The list contents are of type {@link java.lang.String}. * - *

- * If the meaning of the 'Val3' attribute list isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Val3' attribute list. * @see org.eclipse.xtext.validation.csvalidationtest.CsvalidationtestPackage#getCombination4_Val3() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/GroupMultiplicities.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/GroupMultiplicities.java index 6c3d6f0cd..67983c654 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/GroupMultiplicities.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/GroupMultiplicities.java @@ -34,10 +34,6 @@ public interface GroupMultiplicities extends EObject /** * Returns the value of the 'Val1' attribute. * - *

- * If the meaning of the 'Val1' attribute isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Val1' attribute. * @see #setVal1(String) @@ -60,10 +56,6 @@ public interface GroupMultiplicities extends EObject /** * Returns the value of the 'Val2' attribute. * - *

- * If the meaning of the 'Val2' attribute isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Val2' attribute. * @see #setVal2(String) @@ -86,10 +78,6 @@ public interface GroupMultiplicities extends EObject /** * Returns the value of the 'Val3' attribute. * - *

- * If the meaning of the 'Val3' attribute isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Val3' attribute. * @see #setVal3(String) @@ -113,10 +101,6 @@ public interface GroupMultiplicities extends EObject * Returns the value of the 'Val4' attribute list. * The list contents are of type {@link java.lang.String}. * - *

- * If the meaning of the 'Val4' attribute list isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Val4' attribute list. * @see org.eclipse.xtext.validation.csvalidationtest.CsvalidationtestPackage#getGroupMultiplicities_Val4() @@ -129,10 +113,6 @@ public interface GroupMultiplicities extends EObject * Returns the value of the 'Val5' attribute list. * The list contents are of type {@link java.lang.String}. * - *

- * If the meaning of the 'Val5' attribute list isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Val5' attribute list. * @see org.eclipse.xtext.validation.csvalidationtest.CsvalidationtestPackage#getGroupMultiplicities_Val5() @@ -145,10 +125,6 @@ public interface GroupMultiplicities extends EObject * Returns the value of the 'Val6' attribute list. * The list contents are of type {@link java.lang.String}. * - *

- * If the meaning of the 'Val6' attribute list isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Val6' attribute list. * @see org.eclipse.xtext.validation.csvalidationtest.CsvalidationtestPackage#getGroupMultiplicities_Val6() @@ -161,10 +137,6 @@ public interface GroupMultiplicities extends EObject * Returns the value of the 'Val7' attribute list. * The list contents are of type {@link java.lang.String}. * - *

- * If the meaning of the 'Val7' attribute list isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Val7' attribute list. * @see org.eclipse.xtext.validation.csvalidationtest.CsvalidationtestPackage#getGroupMultiplicities_Val7() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/Heuristic1.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/Heuristic1.java index b9bd79dfd..59b4fb331 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/Heuristic1.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/Heuristic1.java @@ -31,10 +31,6 @@ public interface Heuristic1 extends EObject * Returns the value of the 'A' attribute list. * The list contents are of type {@link java.lang.String}. * - *

- * If the meaning of the 'A' attribute list isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'A' attribute list. * @see org.eclipse.xtext.validation.csvalidationtest.CsvalidationtestPackage#getHeuristic1_A() @@ -47,10 +43,6 @@ public interface Heuristic1 extends EObject * Returns the value of the 'B' attribute list. * The list contents are of type {@link java.lang.String}. * - *

- * If the meaning of the 'B' attribute list isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'B' attribute list. * @see org.eclipse.xtext.validation.csvalidationtest.CsvalidationtestPackage#getHeuristic1_B() @@ -63,10 +55,6 @@ public interface Heuristic1 extends EObject * Returns the value of the 'C' attribute list. * The list contents are of type {@link java.lang.String}. * - *

- * If the meaning of the 'C' attribute list isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'C' attribute list. * @see org.eclipse.xtext.validation.csvalidationtest.CsvalidationtestPackage#getHeuristic1_C() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/List1.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/List1.java index 39ca28f6a..d2cdcef5e 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/List1.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/List1.java @@ -29,10 +29,6 @@ public interface List1 extends EObject * Returns the value of the 'Val1' attribute list. * The list contents are of type {@link java.lang.String}. * - *

- * If the meaning of the 'Val1' attribute list isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Val1' attribute list. * @see org.eclipse.xtext.validation.csvalidationtest.CsvalidationtestPackage#getList1_Val1() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/List2.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/List2.java index 9104813b0..76b8dd290 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/List2.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/List2.java @@ -29,10 +29,6 @@ public interface List2 extends EObject * Returns the value of the 'Val1' attribute list. * The list contents are of type {@link java.lang.String}. * - *

- * If the meaning of the 'Val1' attribute list isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Val1' attribute list. * @see org.eclipse.xtext.validation.csvalidationtest.CsvalidationtestPackage#getList2_Val1() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/List3.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/List3.java index 5e159ec3a..358914c57 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/List3.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/List3.java @@ -30,10 +30,6 @@ public interface List3 extends EObject * Returns the value of the 'Val1' attribute list. * The list contents are of type {@link java.lang.String}. * - *

- * If the meaning of the 'Val1' attribute list isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Val1' attribute list. * @see org.eclipse.xtext.validation.csvalidationtest.CsvalidationtestPackage#getList3_Val1() @@ -45,10 +41,6 @@ public interface List3 extends EObject /** * Returns the value of the 'Val2' attribute. * - *

- * If the meaning of the 'Val2' attribute isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Val2' attribute. * @see #setVal2(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/List4.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/List4.java index d27bb28d7..b8a3a82ed 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/List4.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/List4.java @@ -30,10 +30,6 @@ public interface List4 extends EObject * Returns the value of the 'Val1' attribute list. * The list contents are of type {@link java.lang.String}. * - *

- * If the meaning of the 'Val1' attribute list isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Val1' attribute list. * @see org.eclipse.xtext.validation.csvalidationtest.CsvalidationtestPackage#getList4_Val1() @@ -45,10 +41,6 @@ public interface List4 extends EObject /** * Returns the value of the 'Val2' attribute. * - *

- * If the meaning of the 'Val2' attribute isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Val2' attribute. * @see #setVal2(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/List5.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/List5.java index 789f88eed..db9f6b93f 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/List5.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/List5.java @@ -31,10 +31,6 @@ public interface List5 extends EObject * Returns the value of the 'Val1' attribute list. * The list contents are of type {@link java.lang.String}. * - *

- * If the meaning of the 'Val1' attribute list isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Val1' attribute list. * @see org.eclipse.xtext.validation.csvalidationtest.CsvalidationtestPackage#getList5_Val1() @@ -46,10 +42,6 @@ public interface List5 extends EObject /** * Returns the value of the 'Val2' attribute. * - *

- * If the meaning of the 'Val2' attribute isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Val2' attribute. * @see #setVal2(String) @@ -72,10 +64,6 @@ public interface List5 extends EObject /** * Returns the value of the 'Val3' attribute. * - *

- * If the meaning of the 'Val3' attribute isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Val3' attribute. * @see #setVal3(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/Model.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/Model.java index ef65161fc..cf18be34a 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/Model.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/Model.java @@ -53,10 +53,6 @@ public interface Model extends EObject /** * Returns the value of the 'X1' containment reference. * - *

- * If the meaning of the 'X1' containment reference isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'X1' containment reference. * @see #setX1(SimpleGroup) @@ -79,10 +75,6 @@ public interface Model extends EObject /** * Returns the value of the 'X2' containment reference. * - *

- * If the meaning of the 'X2' containment reference isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'X2' containment reference. * @see #setX2(SimpleAlternative) @@ -105,10 +97,6 @@ public interface Model extends EObject /** * Returns the value of the 'X3' containment reference. * - *

- * If the meaning of the 'X3' containment reference isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'X3' containment reference. * @see #setX3(SimpleMultiplicities) @@ -131,10 +119,6 @@ public interface Model extends EObject /** * Returns the value of the 'X4' containment reference. * - *

- * If the meaning of the 'X4' containment reference isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'X4' containment reference. * @see #setX4(GroupMultiplicities) @@ -157,10 +141,6 @@ public interface Model extends EObject /** * Returns the value of the 'X5' containment reference. * - *

- * If the meaning of the 'X5' containment reference isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'X5' containment reference. * @see #setX5(AlternativeMultiplicities) @@ -183,10 +163,6 @@ public interface Model extends EObject /** * Returns the value of the 'X6' containment reference. * - *

- * If the meaning of the 'X6' containment reference isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'X6' containment reference. * @see #setX6(AssignedAction) @@ -209,10 +185,6 @@ public interface Model extends EObject /** * Returns the value of the 'X7' containment reference. * - *

- * If the meaning of the 'X7' containment reference isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'X7' containment reference. * @see #setX7(AssignedAction) @@ -235,10 +207,6 @@ public interface Model extends EObject /** * Returns the value of the 'X8' containment reference. * - *

- * If the meaning of the 'X8' containment reference isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'X8' containment reference. * @see #setX8(UnassignedAction1) @@ -261,10 +229,6 @@ public interface Model extends EObject /** * Returns the value of the 'X9' containment reference. * - *

- * If the meaning of the 'X9' containment reference isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'X9' containment reference. * @see #setX9(UnassignedAction2) @@ -287,10 +251,6 @@ public interface Model extends EObject /** * Returns the value of the 'X10' containment reference. * - *

- * If the meaning of the 'X10' containment reference isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'X10' containment reference. * @see #setX10(UnassignedAction3) @@ -313,10 +273,6 @@ public interface Model extends EObject /** * Returns the value of the 'X11' containment reference. * - *

- * If the meaning of the 'X11' containment reference isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'X11' containment reference. * @see #setX11(UnassignedRuleCall1) @@ -339,10 +295,6 @@ public interface Model extends EObject /** * Returns the value of the 'X12' containment reference. * - *

- * If the meaning of the 'X12' containment reference isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'X12' containment reference. * @see #setX12(UnassignedRuleCall2) @@ -365,10 +317,6 @@ public interface Model extends EObject /** * Returns the value of the 'X13' containment reference. * - *

- * If the meaning of the 'X13' containment reference isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'X13' containment reference. * @see #setX13(Combination1) @@ -391,10 +339,6 @@ public interface Model extends EObject /** * Returns the value of the 'X14' containment reference. * - *

- * If the meaning of the 'X14' containment reference isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'X14' containment reference. * @see #setX14(Combination2) @@ -417,10 +361,6 @@ public interface Model extends EObject /** * Returns the value of the 'X15' containment reference. * - *

- * If the meaning of the 'X15' containment reference isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'X15' containment reference. * @see #setX15(Combination3) @@ -443,10 +383,6 @@ public interface Model extends EObject /** * Returns the value of the 'X16' containment reference. * - *

- * If the meaning of the 'X16' containment reference isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'X16' containment reference. * @see #setX16(Combination4) @@ -469,10 +405,6 @@ public interface Model extends EObject /** * Returns the value of the 'X17' containment reference. * - *

- * If the meaning of the 'X17' containment reference isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'X17' containment reference. * @see #setX17(List1) @@ -495,10 +427,6 @@ public interface Model extends EObject /** * Returns the value of the 'X18' containment reference. * - *

- * If the meaning of the 'X18' containment reference isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'X18' containment reference. * @see #setX18(List2) @@ -521,10 +449,6 @@ public interface Model extends EObject /** * Returns the value of the 'X19' containment reference. * - *

- * If the meaning of the 'X19' containment reference isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'X19' containment reference. * @see #setX19(List3) @@ -547,10 +471,6 @@ public interface Model extends EObject /** * Returns the value of the 'X20' containment reference. * - *

- * If the meaning of the 'X20' containment reference isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'X20' containment reference. * @see #setX20(List4) @@ -573,10 +493,6 @@ public interface Model extends EObject /** * Returns the value of the 'X21' containment reference. * - *

- * If the meaning of the 'X21' containment reference isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'X21' containment reference. * @see #setX21(List5) @@ -599,10 +515,6 @@ public interface Model extends EObject /** * Returns the value of the 'X22' containment reference. * - *

- * If the meaning of the 'X22' containment reference isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'X22' containment reference. * @see #setX22(AltList1) @@ -625,10 +537,6 @@ public interface Model extends EObject /** * Returns the value of the 'X23' containment reference. * - *

- * If the meaning of the 'X23' containment reference isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'X23' containment reference. * @see #setX23(AltList2) @@ -651,10 +559,6 @@ public interface Model extends EObject /** * Returns the value of the 'X24' containment reference. * - *

- * If the meaning of the 'X24' containment reference isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'X24' containment reference. * @see #setX24(TransientObject) @@ -677,10 +581,6 @@ public interface Model extends EObject /** * Returns the value of the 'X25' containment reference. * - *

- * If the meaning of the 'X25' containment reference isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'X25' containment reference. * @see #setX25(TransientSerializeables1) @@ -703,10 +603,6 @@ public interface Model extends EObject /** * Returns the value of the 'X26' containment reference. * - *

- * If the meaning of the 'X26' containment reference isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'X26' containment reference. * @see #setX26(StaticSimplification) @@ -729,10 +625,6 @@ public interface Model extends EObject /** * Returns the value of the 'X27' containment reference. * - *

- * If the meaning of the 'X27' containment reference isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'X27' containment reference. * @see #setX27(TwoVersion) @@ -755,10 +647,6 @@ public interface Model extends EObject /** * Returns the value of the 'X28' containment reference. * - *

- * If the meaning of the 'X28' containment reference isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'X28' containment reference. * @see #setX28(Heuristic1) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/SimpleAlternative.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/SimpleAlternative.java index 5623fd2b2..eeff4a48d 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/SimpleAlternative.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/SimpleAlternative.java @@ -27,10 +27,6 @@ public interface SimpleAlternative extends EObject /** * Returns the value of the 'Val1' attribute. * - *

- * If the meaning of the 'Val1' attribute isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Val1' attribute. * @see #setVal1(String) @@ -53,10 +49,6 @@ public interface SimpleAlternative extends EObject /** * Returns the value of the 'Val2' attribute. * - *

- * If the meaning of the 'Val2' attribute isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Val2' attribute. * @see #setVal2(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/SimpleGroup.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/SimpleGroup.java index 5c640a9fe..3171f2199 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/SimpleGroup.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/SimpleGroup.java @@ -27,10 +27,6 @@ public interface SimpleGroup extends EObject /** * Returns the value of the 'Val1' attribute. * - *

- * If the meaning of the 'Val1' attribute isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Val1' attribute. * @see #setVal1(String) @@ -53,10 +49,6 @@ public interface SimpleGroup extends EObject /** * Returns the value of the 'Val2' attribute. * - *

- * If the meaning of the 'Val2' attribute isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Val2' attribute. * @see #setVal2(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/SimpleMultiplicities.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/SimpleMultiplicities.java index 304f4a6cd..470315f8c 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/SimpleMultiplicities.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/SimpleMultiplicities.java @@ -31,10 +31,6 @@ public interface SimpleMultiplicities extends EObject /** * Returns the value of the 'Val1' attribute. * - *

- * If the meaning of the 'Val1' attribute isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Val1' attribute. * @see #setVal1(String) @@ -57,10 +53,6 @@ public interface SimpleMultiplicities extends EObject /** * Returns the value of the 'Val2' attribute. * - *

- * If the meaning of the 'Val2' attribute isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Val2' attribute. * @see #setVal2(String) @@ -84,10 +76,6 @@ public interface SimpleMultiplicities extends EObject * Returns the value of the 'Val3' attribute list. * The list contents are of type {@link java.lang.String}. * - *

- * If the meaning of the 'Val3' attribute list isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Val3' attribute list. * @see org.eclipse.xtext.validation.csvalidationtest.CsvalidationtestPackage#getSimpleMultiplicities_Val3() @@ -100,10 +88,6 @@ public interface SimpleMultiplicities extends EObject * Returns the value of the 'Val4' attribute list. * The list contents are of type {@link java.lang.String}. * - *

- * If the meaning of the 'Val4' attribute list isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Val4' attribute list. * @see org.eclipse.xtext.validation.csvalidationtest.CsvalidationtestPackage#getSimpleMultiplicities_Val4() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/StaticSimplification.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/StaticSimplification.java index 244c0f40b..2e75cb494 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/StaticSimplification.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/StaticSimplification.java @@ -28,10 +28,6 @@ public interface StaticSimplification extends EObject /** * Returns the value of the 'Val1' attribute. * - *

- * If the meaning of the 'Val1' attribute isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Val1' attribute. * @see #setVal1(String) @@ -54,10 +50,6 @@ public interface StaticSimplification extends EObject /** * Returns the value of the 'Val2' attribute. * - *

- * If the meaning of the 'Val2' attribute isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Val2' attribute. * @see #setVal2(String) @@ -80,10 +72,6 @@ public interface StaticSimplification extends EObject /** * Returns the value of the 'Val3' attribute. * - *

- * If the meaning of the 'Val3' attribute isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Val3' attribute. * @see #setVal3(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/TransientObject.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/TransientObject.java index 24f9e81af..28c17d527 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/TransientObject.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/TransientObject.java @@ -27,10 +27,6 @@ public interface TransientObject extends EObject /** * Returns the value of the 'Val1' attribute. * - *

- * If the meaning of the 'Val1' attribute isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Val1' attribute. * @see #setVal1(String) @@ -53,10 +49,6 @@ public interface TransientObject extends EObject /** * Returns the value of the 'Nested' containment reference. * - *

- * If the meaning of the 'Nested' containment reference isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Nested' containment reference. * @see #setNested(TransientObjectSub) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/TransientObjectSub.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/TransientObjectSub.java index 1bcd7d1d4..2caa52eb1 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/TransientObjectSub.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/TransientObjectSub.java @@ -27,10 +27,6 @@ public interface TransientObjectSub extends EObject /** * Returns the value of the 'Val2' attribute. * - *

- * If the meaning of the 'Val2' attribute isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Val2' attribute. * @see #setVal2(String) @@ -53,10 +49,6 @@ public interface TransientObjectSub extends EObject /** * Returns the value of the 'Val3' attribute. * - *

- * If the meaning of the 'Val3' attribute isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Val3' attribute. * @see #setVal3(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/TransientSerializeables1.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/TransientSerializeables1.java index c763ca26a..ff4dcd5a3 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/TransientSerializeables1.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/TransientSerializeables1.java @@ -29,10 +29,6 @@ public interface TransientSerializeables1 extends EObject /** * Returns the value of the 'Val1' attribute. * - *

- * If the meaning of the 'Val1' attribute isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Val1' attribute. * @see #setVal1(String) @@ -56,10 +52,6 @@ public interface TransientSerializeables1 extends EObject * Returns the value of the 'Enum1' attribute. * The literals are from the enumeration {@link org.eclipse.xtext.validation.csvalidationtest.TransientSerializeables1Enum}. * - *

- * If the meaning of the 'Enum1' attribute isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Enum1' attribute. * @see org.eclipse.xtext.validation.csvalidationtest.TransientSerializeables1Enum @@ -84,10 +76,6 @@ public interface TransientSerializeables1 extends EObject /** * Returns the value of the 'Val2' attribute. * - *

- * If the meaning of the 'Val2' attribute isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Val2' attribute. * @see #setVal2(String) @@ -110,10 +98,6 @@ public interface TransientSerializeables1 extends EObject /** * Returns the value of the 'Int1' attribute. * - *

- * If the meaning of the 'Int1' attribute isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Int1' attribute. * @see #setInt1(int) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/TransientSerializeables1Enum.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/TransientSerializeables1Enum.java index b881fab82..a446b7bb2 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/TransientSerializeables1Enum.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/TransientSerializeables1Enum.java @@ -43,10 +43,6 @@ public enum TransientSerializeables1Enum implements Enumerator /** * The 'Lit1' literal value. * - *

- * If the meaning of 'Lit1' literal object isn't clear, - * there really should be more of a description here... - *

* * @see #LIT1 * @model name="lit1" @@ -58,10 +54,6 @@ public enum TransientSerializeables1Enum implements Enumerator /** * The 'Lit2' literal value. * - *

- * If the meaning of 'Lit2' literal object isn't clear, - * there really should be more of a description here... - *

* * @see #LIT2 * @model name="lit2" @@ -190,6 +182,7 @@ public enum TransientSerializeables1Enum implements Enumerator * * @generated */ + @Override public int getValue() { return value; @@ -200,6 +193,7 @@ public enum TransientSerializeables1Enum implements Enumerator * * @generated */ + @Override public String getName() { return name; @@ -210,6 +204,7 @@ public enum TransientSerializeables1Enum implements Enumerator * * @generated */ + @Override public String getLiteral() { return literal; diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/TwoVersion.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/TwoVersion.java index 2757e4f1b..6999eca29 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/TwoVersion.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/TwoVersion.java @@ -35,10 +35,6 @@ public interface TwoVersion extends EObject /** * Returns the value of the 'Shared1' attribute. * - *

- * If the meaning of the 'Shared1' attribute isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Shared1' attribute. * @see #setShared1(String) @@ -61,10 +57,6 @@ public interface TwoVersion extends EObject /** * Returns the value of the 'Shared2' attribute. * - *

- * If the meaning of the 'Shared2' attribute isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Shared2' attribute. * @see #setShared2(String) @@ -88,10 +80,6 @@ public interface TwoVersion extends EObject * Returns the value of the 'Shared3' attribute list. * The list contents are of type {@link java.lang.String}. * - *

- * If the meaning of the 'Shared3' attribute list isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Shared3' attribute list. * @see org.eclipse.xtext.validation.csvalidationtest.CsvalidationtestPackage#getTwoVersion_Shared3() @@ -103,10 +91,6 @@ public interface TwoVersion extends EObject /** * Returns the value of the 'Version1' attribute. * - *

- * If the meaning of the 'Version1' attribute isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Version1' attribute. * @see #setVersion1(String) @@ -129,10 +113,6 @@ public interface TwoVersion extends EObject /** * Returns the value of the 'Extra1' attribute. * - *

- * If the meaning of the 'Extra1' attribute isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Extra1' attribute. * @see #setExtra1(String) @@ -155,10 +135,6 @@ public interface TwoVersion extends EObject /** * Returns the value of the 'Extra2' attribute. * - *

- * If the meaning of the 'Extra2' attribute isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Extra2' attribute. * @see #setExtra2(String) @@ -181,10 +157,6 @@ public interface TwoVersion extends EObject /** * Returns the value of the 'Extra3' attribute. * - *

- * If the meaning of the 'Extra3' attribute isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Extra3' attribute. * @see #setExtra3(String) @@ -207,10 +179,6 @@ public interface TwoVersion extends EObject /** * Returns the value of the 'Extra4' attribute. * - *

- * If the meaning of the 'Extra4' attribute isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Extra4' attribute. * @see #setExtra4(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/UnassignedAction1.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/UnassignedAction1.java index abf57b9e9..0e61ac817 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/UnassignedAction1.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/UnassignedAction1.java @@ -27,10 +27,6 @@ public interface UnassignedAction1 extends EObject /** * Returns the value of the 'Val1' attribute. * - *

- * If the meaning of the 'Val1' attribute isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Val1' attribute. * @see #setVal1(String) @@ -53,10 +49,6 @@ public interface UnassignedAction1 extends EObject /** * Returns the value of the 'Val2' attribute. * - *

- * If the meaning of the 'Val2' attribute isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Val2' attribute. * @see #setVal2(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/UnassignedAction2Sub.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/UnassignedAction2Sub.java index 50699b859..b96b8903f 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/UnassignedAction2Sub.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/UnassignedAction2Sub.java @@ -26,10 +26,6 @@ public interface UnassignedAction2Sub extends UnassignedAction2 /** * Returns the value of the 'Val1' attribute. * - *

- * If the meaning of the 'Val1' attribute isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Val1' attribute. * @see #setVal1(String) @@ -52,10 +48,6 @@ public interface UnassignedAction2Sub extends UnassignedAction2 /** * Returns the value of the 'Val2' attribute. * - *

- * If the meaning of the 'Val2' attribute isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Val2' attribute. * @see #setVal2(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/UnassignedAction3.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/UnassignedAction3.java index df4ac7b0a..98c39dd0e 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/UnassignedAction3.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/UnassignedAction3.java @@ -27,10 +27,6 @@ public interface UnassignedAction3 extends EObject /** * Returns the value of the 'Val1' attribute. * - *

- * If the meaning of the 'Val1' attribute isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Val1' attribute. * @see #setVal1(String) @@ -53,10 +49,6 @@ public interface UnassignedAction3 extends EObject /** * Returns the value of the 'Val2' attribute. * - *

- * If the meaning of the 'Val2' attribute isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Val2' attribute. * @see #setVal2(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/UnassignedRuleCall1Sub.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/UnassignedRuleCall1Sub.java index 673902f84..4afeeba8a 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/UnassignedRuleCall1Sub.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/UnassignedRuleCall1Sub.java @@ -26,10 +26,6 @@ public interface UnassignedRuleCall1Sub extends UnassignedRuleCall1 /** * Returns the value of the 'Val2' attribute. * - *

- * If the meaning of the 'Val2' attribute isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Val2' attribute. * @see #setVal2(String) @@ -52,10 +48,6 @@ public interface UnassignedRuleCall1Sub extends UnassignedRuleCall1 /** * Returns the value of the 'Val1' attribute. * - *

- * If the meaning of the 'Val1' attribute isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Val1' attribute. * @see #setVal1(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/UnassignedRuleCall2Sub.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/UnassignedRuleCall2Sub.java index 64444d040..ae37a8816 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/UnassignedRuleCall2Sub.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/UnassignedRuleCall2Sub.java @@ -25,10 +25,6 @@ public interface UnassignedRuleCall2Sub extends UnassignedRuleCall2 /** * Returns the value of the 'Val2' attribute. * - *

- * If the meaning of the 'Val2' attribute isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Val2' attribute. * @see #setVal2(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/AltList1Impl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/AltList1Impl.java index 5205ddaf2..98e826906 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/AltList1Impl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/AltList1Impl.java @@ -137,6 +137,7 @@ public class AltList1Impl extends MinimalEObjectImpl.Container implements AltLis * * @generated */ + @Override public String getVal1() { return val1; @@ -147,6 +148,7 @@ public class AltList1Impl extends MinimalEObjectImpl.Container implements AltLis * * @generated */ + @Override public void setVal1(String newVal1) { String oldVal1 = val1; @@ -160,6 +162,7 @@ public class AltList1Impl extends MinimalEObjectImpl.Container implements AltLis * * @generated */ + @Override public String getVal2() { return val2; @@ -170,6 +173,7 @@ public class AltList1Impl extends MinimalEObjectImpl.Container implements AltLis * * @generated */ + @Override public void setVal2(String newVal2) { String oldVal2 = val2; @@ -183,6 +187,7 @@ public class AltList1Impl extends MinimalEObjectImpl.Container implements AltLis * * @generated */ + @Override public String getVal3() { return val3; @@ -193,6 +198,7 @@ public class AltList1Impl extends MinimalEObjectImpl.Container implements AltLis * * @generated */ + @Override public void setVal3(String newVal3) { String oldVal3 = val3; @@ -206,6 +212,7 @@ public class AltList1Impl extends MinimalEObjectImpl.Container implements AltLis * * @generated */ + @Override public String getVal4() { return val4; @@ -216,6 +223,7 @@ public class AltList1Impl extends MinimalEObjectImpl.Container implements AltLis * * @generated */ + @Override public void setVal4(String newVal4) { String oldVal4 = val4; @@ -330,7 +338,7 @@ public class AltList1Impl extends MinimalEObjectImpl.Container implements AltLis { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (val1: "); result.append(val1); result.append(", val2: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/AltList2Impl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/AltList2Impl.java index 3fc9fe3e1..8e6d74e8b 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/AltList2Impl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/AltList2Impl.java @@ -112,6 +112,7 @@ public class AltList2Impl extends MinimalEObjectImpl.Container implements AltLis * * @generated */ + @Override public EList getVal1() { if (val1 == null) @@ -126,6 +127,7 @@ public class AltList2Impl extends MinimalEObjectImpl.Container implements AltLis * * @generated */ + @Override public String getVal2() { return val2; @@ -136,6 +138,7 @@ public class AltList2Impl extends MinimalEObjectImpl.Container implements AltLis * * @generated */ + @Override public void setVal2(String newVal2) { String oldVal2 = val2; @@ -149,6 +152,7 @@ public class AltList2Impl extends MinimalEObjectImpl.Container implements AltLis * * @generated */ + @Override public String getVal3() { return val3; @@ -159,6 +163,7 @@ public class AltList2Impl extends MinimalEObjectImpl.Container implements AltLis * * @generated */ + @Override public void setVal3(String newVal3) { String oldVal3 = val3; @@ -265,7 +270,7 @@ public class AltList2Impl extends MinimalEObjectImpl.Container implements AltLis { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (val1: "); result.append(val1); result.append(", val2: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/AlternativeMultiplicitiesImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/AlternativeMultiplicitiesImpl.java index 29e185db1..b9e7dcffc 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/AlternativeMultiplicitiesImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/AlternativeMultiplicitiesImpl.java @@ -145,6 +145,7 @@ public class AlternativeMultiplicitiesImpl extends MinimalEObjectImpl.Container * * @generated */ + @Override public String getVal2() { return val2; @@ -155,6 +156,7 @@ public class AlternativeMultiplicitiesImpl extends MinimalEObjectImpl.Container * * @generated */ + @Override public void setVal2(String newVal2) { String oldVal2 = val2; @@ -168,6 +170,7 @@ public class AlternativeMultiplicitiesImpl extends MinimalEObjectImpl.Container * * @generated */ + @Override public String getVal3() { return val3; @@ -178,6 +181,7 @@ public class AlternativeMultiplicitiesImpl extends MinimalEObjectImpl.Container * * @generated */ + @Override public void setVal3(String newVal3) { String oldVal3 = val3; @@ -191,6 +195,7 @@ public class AlternativeMultiplicitiesImpl extends MinimalEObjectImpl.Container * * @generated */ + @Override public EList getVal4() { if (val4 == null) @@ -205,6 +210,7 @@ public class AlternativeMultiplicitiesImpl extends MinimalEObjectImpl.Container * * @generated */ + @Override public EList getVal5() { if (val5 == null) @@ -219,6 +225,7 @@ public class AlternativeMultiplicitiesImpl extends MinimalEObjectImpl.Container * * @generated */ + @Override public EList getVal6() { if (val6 == null) @@ -233,6 +240,7 @@ public class AlternativeMultiplicitiesImpl extends MinimalEObjectImpl.Container * * @generated */ + @Override public EList getVal7() { if (val7 == null) @@ -373,7 +381,7 @@ public class AlternativeMultiplicitiesImpl extends MinimalEObjectImpl.Container { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (val2: "); result.append(val2); result.append(", val3: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/AssignedActionImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/AssignedActionImpl.java index ec62c3860..82fe5d95f 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/AssignedActionImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/AssignedActionImpl.java @@ -108,6 +108,7 @@ public class AssignedActionImpl extends MinimalEObjectImpl.Container implements * * @generated */ + @Override public String getVal1() { return val1; @@ -118,6 +119,7 @@ public class AssignedActionImpl extends MinimalEObjectImpl.Container implements * * @generated */ + @Override public void setVal1(String newVal1) { String oldVal1 = val1; @@ -131,6 +133,7 @@ public class AssignedActionImpl extends MinimalEObjectImpl.Container implements * * @generated */ + @Override public AssignedAction getChild() { return child; @@ -158,6 +161,7 @@ public class AssignedActionImpl extends MinimalEObjectImpl.Container implements * * @generated */ + @Override public void setChild(AssignedAction newChild) { if (newChild != child) @@ -179,6 +183,7 @@ public class AssignedActionImpl extends MinimalEObjectImpl.Container implements * * @generated */ + @Override public String getVal2() { return val2; @@ -189,6 +194,7 @@ public class AssignedActionImpl extends MinimalEObjectImpl.Container implements * * @generated */ + @Override public void setVal2(String newVal2) { String oldVal2 = val2; @@ -309,7 +315,7 @@ public class AssignedActionImpl extends MinimalEObjectImpl.Container implements { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (val1: "); result.append(val1); result.append(", val2: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/Combination1Impl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/Combination1Impl.java index 2cb29097f..afc1a3c74 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/Combination1Impl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/Combination1Impl.java @@ -137,6 +137,7 @@ public class Combination1Impl extends MinimalEObjectImpl.Container implements Co * * @generated */ + @Override public String getVal1() { return val1; @@ -147,6 +148,7 @@ public class Combination1Impl extends MinimalEObjectImpl.Container implements Co * * @generated */ + @Override public void setVal1(String newVal1) { String oldVal1 = val1; @@ -160,6 +162,7 @@ public class Combination1Impl extends MinimalEObjectImpl.Container implements Co * * @generated */ + @Override public String getVal2() { return val2; @@ -170,6 +173,7 @@ public class Combination1Impl extends MinimalEObjectImpl.Container implements Co * * @generated */ + @Override public void setVal2(String newVal2) { String oldVal2 = val2; @@ -183,6 +187,7 @@ public class Combination1Impl extends MinimalEObjectImpl.Container implements Co * * @generated */ + @Override public String getVal3() { return val3; @@ -193,6 +198,7 @@ public class Combination1Impl extends MinimalEObjectImpl.Container implements Co * * @generated */ + @Override public void setVal3(String newVal3) { String oldVal3 = val3; @@ -206,6 +212,7 @@ public class Combination1Impl extends MinimalEObjectImpl.Container implements Co * * @generated */ + @Override public String getVal4() { return val4; @@ -216,6 +223,7 @@ public class Combination1Impl extends MinimalEObjectImpl.Container implements Co * * @generated */ + @Override public void setVal4(String newVal4) { String oldVal4 = val4; @@ -330,7 +338,7 @@ public class Combination1Impl extends MinimalEObjectImpl.Container implements Co { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (val1: "); result.append(val1); result.append(", val2: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/Combination2Impl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/Combination2Impl.java index 389ed11c0..b8df58e13 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/Combination2Impl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/Combination2Impl.java @@ -123,6 +123,7 @@ public class Combination2Impl extends MinimalEObjectImpl.Container implements Co * * @generated */ + @Override public String getVal1() { return val1; @@ -133,6 +134,7 @@ public class Combination2Impl extends MinimalEObjectImpl.Container implements Co * * @generated */ + @Override public void setVal1(String newVal1) { String oldVal1 = val1; @@ -146,6 +148,7 @@ public class Combination2Impl extends MinimalEObjectImpl.Container implements Co * * @generated */ + @Override public String getVal2() { return val2; @@ -156,6 +159,7 @@ public class Combination2Impl extends MinimalEObjectImpl.Container implements Co * * @generated */ + @Override public void setVal2(String newVal2) { String oldVal2 = val2; @@ -169,6 +173,7 @@ public class Combination2Impl extends MinimalEObjectImpl.Container implements Co * * @generated */ + @Override public EList getVal3() { if (val3 == null) @@ -183,6 +188,7 @@ public class Combination2Impl extends MinimalEObjectImpl.Container implements Co * * @generated */ + @Override public EList getVal4() { if (val4 == null) @@ -301,7 +307,7 @@ public class Combination2Impl extends MinimalEObjectImpl.Container implements Co { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (val1: "); result.append(val1); result.append(", val2: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/Combination3Impl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/Combination3Impl.java index 45ab2deed..6c4df01a5 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/Combination3Impl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/Combination3Impl.java @@ -116,6 +116,7 @@ public class Combination3Impl extends MinimalEObjectImpl.Container implements Co * * @generated */ + @Override public String getVal1() { return val1; @@ -126,6 +127,7 @@ public class Combination3Impl extends MinimalEObjectImpl.Container implements Co * * @generated */ + @Override public void setVal1(String newVal1) { String oldVal1 = val1; @@ -139,6 +141,7 @@ public class Combination3Impl extends MinimalEObjectImpl.Container implements Co * * @generated */ + @Override public int getVal2() { return val2; @@ -149,6 +152,7 @@ public class Combination3Impl extends MinimalEObjectImpl.Container implements Co * * @generated */ + @Override public void setVal2(int newVal2) { int oldVal2 = val2; @@ -162,6 +166,7 @@ public class Combination3Impl extends MinimalEObjectImpl.Container implements Co * * @generated */ + @Override public String getVal3() { return val3; @@ -172,6 +177,7 @@ public class Combination3Impl extends MinimalEObjectImpl.Container implements Co * * @generated */ + @Override public void setVal3(String newVal3) { String oldVal3 = val3; @@ -276,7 +282,7 @@ public class Combination3Impl extends MinimalEObjectImpl.Container implements Co { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (val1: "); result.append(val1); result.append(", val2: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/Combination4Impl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/Combination4Impl.java index ba066d116..1992ab88c 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/Combination4Impl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/Combination4Impl.java @@ -89,6 +89,7 @@ public class Combination4Impl extends MinimalEObjectImpl.Container implements Co * * @generated */ + @Override public EList getVal1() { if (val1 == null) @@ -103,6 +104,7 @@ public class Combination4Impl extends MinimalEObjectImpl.Container implements Co * * @generated */ + @Override public EList getVal2() { if (val2 == null) @@ -117,6 +119,7 @@ public class Combination4Impl extends MinimalEObjectImpl.Container implements Co * * @generated */ + @Override public EList getVal3() { if (val3 == null) @@ -226,7 +229,7 @@ public class Combination4Impl extends MinimalEObjectImpl.Container implements Co { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (val1: "); result.append(val1); result.append(", val2: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/CsvalidationtestFactoryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/CsvalidationtestFactoryImpl.java index ac04b7936..6cd159dae 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/CsvalidationtestFactoryImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/CsvalidationtestFactoryImpl.java @@ -146,6 +146,7 @@ public class CsvalidationtestFactoryImpl extends EFactoryImpl implements Csvalid * * @generated */ + @Override public Model createModel() { ModelImpl model = new ModelImpl(); @@ -157,6 +158,7 @@ public class CsvalidationtestFactoryImpl extends EFactoryImpl implements Csvalid * * @generated */ + @Override public SimpleGroup createSimpleGroup() { SimpleGroupImpl simpleGroup = new SimpleGroupImpl(); @@ -168,6 +170,7 @@ public class CsvalidationtestFactoryImpl extends EFactoryImpl implements Csvalid * * @generated */ + @Override public SimpleAlternative createSimpleAlternative() { SimpleAlternativeImpl simpleAlternative = new SimpleAlternativeImpl(); @@ -179,6 +182,7 @@ public class CsvalidationtestFactoryImpl extends EFactoryImpl implements Csvalid * * @generated */ + @Override public SimpleMultiplicities createSimpleMultiplicities() { SimpleMultiplicitiesImpl simpleMultiplicities = new SimpleMultiplicitiesImpl(); @@ -190,6 +194,7 @@ public class CsvalidationtestFactoryImpl extends EFactoryImpl implements Csvalid * * @generated */ + @Override public GroupMultiplicities createGroupMultiplicities() { GroupMultiplicitiesImpl groupMultiplicities = new GroupMultiplicitiesImpl(); @@ -201,6 +206,7 @@ public class CsvalidationtestFactoryImpl extends EFactoryImpl implements Csvalid * * @generated */ + @Override public AlternativeMultiplicities createAlternativeMultiplicities() { AlternativeMultiplicitiesImpl alternativeMultiplicities = new AlternativeMultiplicitiesImpl(); @@ -212,6 +218,7 @@ public class CsvalidationtestFactoryImpl extends EFactoryImpl implements Csvalid * * @generated */ + @Override public AssignedAction createAssignedAction() { AssignedActionImpl assignedAction = new AssignedActionImpl(); @@ -223,6 +230,7 @@ public class CsvalidationtestFactoryImpl extends EFactoryImpl implements Csvalid * * @generated */ + @Override public UnassignedAction1 createUnassignedAction1() { UnassignedAction1Impl unassignedAction1 = new UnassignedAction1Impl(); @@ -234,6 +242,7 @@ public class CsvalidationtestFactoryImpl extends EFactoryImpl implements Csvalid * * @generated */ + @Override public UnassignedAction2 createUnassignedAction2() { UnassignedAction2Impl unassignedAction2 = new UnassignedAction2Impl(); @@ -245,6 +254,7 @@ public class CsvalidationtestFactoryImpl extends EFactoryImpl implements Csvalid * * @generated */ + @Override public UnassignedAction3 createUnassignedAction3() { UnassignedAction3Impl unassignedAction3 = new UnassignedAction3Impl(); @@ -256,6 +266,7 @@ public class CsvalidationtestFactoryImpl extends EFactoryImpl implements Csvalid * * @generated */ + @Override public UnassignedRuleCall1 createUnassignedRuleCall1() { UnassignedRuleCall1Impl unassignedRuleCall1 = new UnassignedRuleCall1Impl(); @@ -267,6 +278,7 @@ public class CsvalidationtestFactoryImpl extends EFactoryImpl implements Csvalid * * @generated */ + @Override public UnassignedRuleCall1Sub createUnassignedRuleCall1Sub() { UnassignedRuleCall1SubImpl unassignedRuleCall1Sub = new UnassignedRuleCall1SubImpl(); @@ -278,6 +290,7 @@ public class CsvalidationtestFactoryImpl extends EFactoryImpl implements Csvalid * * @generated */ + @Override public UnassignedRuleCall2 createUnassignedRuleCall2() { UnassignedRuleCall2Impl unassignedRuleCall2 = new UnassignedRuleCall2Impl(); @@ -289,6 +302,7 @@ public class CsvalidationtestFactoryImpl extends EFactoryImpl implements Csvalid * * @generated */ + @Override public UnassignedRuleCall2Sub createUnassignedRuleCall2Sub() { UnassignedRuleCall2SubImpl unassignedRuleCall2Sub = new UnassignedRuleCall2SubImpl(); @@ -300,6 +314,7 @@ public class CsvalidationtestFactoryImpl extends EFactoryImpl implements Csvalid * * @generated */ + @Override public Combination1 createCombination1() { Combination1Impl combination1 = new Combination1Impl(); @@ -311,6 +326,7 @@ public class CsvalidationtestFactoryImpl extends EFactoryImpl implements Csvalid * * @generated */ + @Override public Combination2 createCombination2() { Combination2Impl combination2 = new Combination2Impl(); @@ -322,6 +338,7 @@ public class CsvalidationtestFactoryImpl extends EFactoryImpl implements Csvalid * * @generated */ + @Override public Combination3 createCombination3() { Combination3Impl combination3 = new Combination3Impl(); @@ -333,6 +350,7 @@ public class CsvalidationtestFactoryImpl extends EFactoryImpl implements Csvalid * * @generated */ + @Override public Combination4 createCombination4() { Combination4Impl combination4 = new Combination4Impl(); @@ -344,6 +362,7 @@ public class CsvalidationtestFactoryImpl extends EFactoryImpl implements Csvalid * * @generated */ + @Override public List1 createList1() { List1Impl list1 = new List1Impl(); @@ -355,6 +374,7 @@ public class CsvalidationtestFactoryImpl extends EFactoryImpl implements Csvalid * * @generated */ + @Override public List2 createList2() { List2Impl list2 = new List2Impl(); @@ -366,6 +386,7 @@ public class CsvalidationtestFactoryImpl extends EFactoryImpl implements Csvalid * * @generated */ + @Override public List3 createList3() { List3Impl list3 = new List3Impl(); @@ -377,6 +398,7 @@ public class CsvalidationtestFactoryImpl extends EFactoryImpl implements Csvalid * * @generated */ + @Override public List4 createList4() { List4Impl list4 = new List4Impl(); @@ -388,6 +410,7 @@ public class CsvalidationtestFactoryImpl extends EFactoryImpl implements Csvalid * * @generated */ + @Override public List5 createList5() { List5Impl list5 = new List5Impl(); @@ -399,6 +422,7 @@ public class CsvalidationtestFactoryImpl extends EFactoryImpl implements Csvalid * * @generated */ + @Override public AltList1 createAltList1() { AltList1Impl altList1 = new AltList1Impl(); @@ -410,6 +434,7 @@ public class CsvalidationtestFactoryImpl extends EFactoryImpl implements Csvalid * * @generated */ + @Override public AltList2 createAltList2() { AltList2Impl altList2 = new AltList2Impl(); @@ -421,6 +446,7 @@ public class CsvalidationtestFactoryImpl extends EFactoryImpl implements Csvalid * * @generated */ + @Override public TransientObject createTransientObject() { TransientObjectImpl transientObject = new TransientObjectImpl(); @@ -432,6 +458,7 @@ public class CsvalidationtestFactoryImpl extends EFactoryImpl implements Csvalid * * @generated */ + @Override public TransientObjectSub createTransientObjectSub() { TransientObjectSubImpl transientObjectSub = new TransientObjectSubImpl(); @@ -443,6 +470,7 @@ public class CsvalidationtestFactoryImpl extends EFactoryImpl implements Csvalid * * @generated */ + @Override public TransientSerializeables1 createTransientSerializeables1() { TransientSerializeables1Impl transientSerializeables1 = new TransientSerializeables1Impl(); @@ -454,6 +482,7 @@ public class CsvalidationtestFactoryImpl extends EFactoryImpl implements Csvalid * * @generated */ + @Override public StaticSimplification createStaticSimplification() { StaticSimplificationImpl staticSimplification = new StaticSimplificationImpl(); @@ -465,6 +494,7 @@ public class CsvalidationtestFactoryImpl extends EFactoryImpl implements Csvalid * * @generated */ + @Override public TwoVersion createTwoVersion() { TwoVersionImpl twoVersion = new TwoVersionImpl(); @@ -476,6 +506,7 @@ public class CsvalidationtestFactoryImpl extends EFactoryImpl implements Csvalid * * @generated */ + @Override public Heuristic1 createHeuristic1() { Heuristic1Impl heuristic1 = new Heuristic1Impl(); @@ -487,6 +518,7 @@ public class CsvalidationtestFactoryImpl extends EFactoryImpl implements Csvalid * * @generated */ + @Override public UnassignedAction2Sub createUnassignedAction2Sub() { UnassignedAction2SubImpl unassignedAction2Sub = new UnassignedAction2SubImpl(); @@ -498,6 +530,7 @@ public class CsvalidationtestFactoryImpl extends EFactoryImpl implements Csvalid * * @generated */ + @Override public UnassignedAction2Sub1 createUnassignedAction2Sub1() { UnassignedAction2Sub1Impl unassignedAction2Sub1 = new UnassignedAction2Sub1Impl(); @@ -509,6 +542,7 @@ public class CsvalidationtestFactoryImpl extends EFactoryImpl implements Csvalid * * @generated */ + @Override public UnassignedAction2Sub2 createUnassignedAction2Sub2() { UnassignedAction2Sub2Impl unassignedAction2Sub2 = new UnassignedAction2Sub2Impl(); @@ -520,6 +554,7 @@ public class CsvalidationtestFactoryImpl extends EFactoryImpl implements Csvalid * * @generated */ + @Override public UnassignedRuleCall2SubAction createUnassignedRuleCall2SubAction() { UnassignedRuleCall2SubActionImpl unassignedRuleCall2SubAction = new UnassignedRuleCall2SubActionImpl(); @@ -531,6 +566,7 @@ public class CsvalidationtestFactoryImpl extends EFactoryImpl implements Csvalid * * @generated */ + @Override public EmptyAlternativeSub createEmptyAlternativeSub() { EmptyAlternativeSubImpl emptyAlternativeSub = new EmptyAlternativeSubImpl(); @@ -564,6 +600,7 @@ public class CsvalidationtestFactoryImpl extends EFactoryImpl implements Csvalid * * @generated */ + @Override public CsvalidationtestPackage getCsvalidationtestPackage() { return (CsvalidationtestPackage)getEPackage(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/CsvalidationtestPackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/CsvalidationtestPackageImpl.java index 1f4161f7c..2b51a7bb8 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/CsvalidationtestPackageImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/CsvalidationtestPackageImpl.java @@ -348,7 +348,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link CsvalidationtestPackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -363,7 +363,8 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid if (isInited) return (CsvalidationtestPackage)EPackage.Registry.INSTANCE.getEPackage(CsvalidationtestPackage.eNS_URI); // Obtain or create and register package - CsvalidationtestPackageImpl theCsvalidationtestPackage = (CsvalidationtestPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof CsvalidationtestPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new CsvalidationtestPackageImpl()); + Object registeredCsvalidationtestPackage = EPackage.Registry.INSTANCE.get(eNS_URI); + CsvalidationtestPackageImpl theCsvalidationtestPackage = registeredCsvalidationtestPackage instanceof CsvalidationtestPackageImpl ? (CsvalidationtestPackageImpl)registeredCsvalidationtestPackage : new CsvalidationtestPackageImpl(); isInited = true; @@ -379,7 +380,6 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid // Mark meta-data to indicate it can't be changed theCsvalidationtestPackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(CsvalidationtestPackage.eNS_URI, theCsvalidationtestPackage); return theCsvalidationtestPackage; @@ -390,6 +390,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EClass getModel() { return modelEClass; @@ -400,6 +401,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EReference getModel_X1() { return (EReference)modelEClass.getEStructuralFeatures().get(0); @@ -410,6 +412,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EReference getModel_X2() { return (EReference)modelEClass.getEStructuralFeatures().get(1); @@ -420,6 +423,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EReference getModel_X3() { return (EReference)modelEClass.getEStructuralFeatures().get(2); @@ -430,6 +434,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EReference getModel_X4() { return (EReference)modelEClass.getEStructuralFeatures().get(3); @@ -440,6 +445,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EReference getModel_X5() { return (EReference)modelEClass.getEStructuralFeatures().get(4); @@ -450,6 +456,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EReference getModel_X6() { return (EReference)modelEClass.getEStructuralFeatures().get(5); @@ -460,6 +467,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EReference getModel_X7() { return (EReference)modelEClass.getEStructuralFeatures().get(6); @@ -470,6 +478,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EReference getModel_X8() { return (EReference)modelEClass.getEStructuralFeatures().get(7); @@ -480,6 +489,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EReference getModel_X9() { return (EReference)modelEClass.getEStructuralFeatures().get(8); @@ -490,6 +500,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EReference getModel_X10() { return (EReference)modelEClass.getEStructuralFeatures().get(9); @@ -500,6 +511,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EReference getModel_X11() { return (EReference)modelEClass.getEStructuralFeatures().get(10); @@ -510,6 +522,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EReference getModel_X12() { return (EReference)modelEClass.getEStructuralFeatures().get(11); @@ -520,6 +533,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EReference getModel_X13() { return (EReference)modelEClass.getEStructuralFeatures().get(12); @@ -530,6 +544,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EReference getModel_X14() { return (EReference)modelEClass.getEStructuralFeatures().get(13); @@ -540,6 +555,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EReference getModel_X15() { return (EReference)modelEClass.getEStructuralFeatures().get(14); @@ -550,6 +566,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EReference getModel_X16() { return (EReference)modelEClass.getEStructuralFeatures().get(15); @@ -560,6 +577,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EReference getModel_X17() { return (EReference)modelEClass.getEStructuralFeatures().get(16); @@ -570,6 +588,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EReference getModel_X18() { return (EReference)modelEClass.getEStructuralFeatures().get(17); @@ -580,6 +599,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EReference getModel_X19() { return (EReference)modelEClass.getEStructuralFeatures().get(18); @@ -590,6 +610,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EReference getModel_X20() { return (EReference)modelEClass.getEStructuralFeatures().get(19); @@ -600,6 +621,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EReference getModel_X21() { return (EReference)modelEClass.getEStructuralFeatures().get(20); @@ -610,6 +632,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EReference getModel_X22() { return (EReference)modelEClass.getEStructuralFeatures().get(21); @@ -620,6 +643,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EReference getModel_X23() { return (EReference)modelEClass.getEStructuralFeatures().get(22); @@ -630,6 +654,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EReference getModel_X24() { return (EReference)modelEClass.getEStructuralFeatures().get(23); @@ -640,6 +665,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EReference getModel_X25() { return (EReference)modelEClass.getEStructuralFeatures().get(24); @@ -650,6 +676,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EReference getModel_X26() { return (EReference)modelEClass.getEStructuralFeatures().get(25); @@ -660,6 +687,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EReference getModel_X27() { return (EReference)modelEClass.getEStructuralFeatures().get(26); @@ -670,6 +698,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EReference getModel_X28() { return (EReference)modelEClass.getEStructuralFeatures().get(27); @@ -680,6 +709,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EClass getSimpleGroup() { return simpleGroupEClass; @@ -690,6 +720,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EAttribute getSimpleGroup_Val1() { return (EAttribute)simpleGroupEClass.getEStructuralFeatures().get(0); @@ -700,6 +731,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EAttribute getSimpleGroup_Val2() { return (EAttribute)simpleGroupEClass.getEStructuralFeatures().get(1); @@ -710,6 +742,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EClass getSimpleAlternative() { return simpleAlternativeEClass; @@ -720,6 +753,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EAttribute getSimpleAlternative_Val1() { return (EAttribute)simpleAlternativeEClass.getEStructuralFeatures().get(0); @@ -730,6 +764,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EAttribute getSimpleAlternative_Val2() { return (EAttribute)simpleAlternativeEClass.getEStructuralFeatures().get(1); @@ -740,6 +775,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EClass getSimpleMultiplicities() { return simpleMultiplicitiesEClass; @@ -750,6 +786,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EAttribute getSimpleMultiplicities_Val1() { return (EAttribute)simpleMultiplicitiesEClass.getEStructuralFeatures().get(0); @@ -760,6 +797,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EAttribute getSimpleMultiplicities_Val2() { return (EAttribute)simpleMultiplicitiesEClass.getEStructuralFeatures().get(1); @@ -770,6 +808,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EAttribute getSimpleMultiplicities_Val3() { return (EAttribute)simpleMultiplicitiesEClass.getEStructuralFeatures().get(2); @@ -780,6 +819,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EAttribute getSimpleMultiplicities_Val4() { return (EAttribute)simpleMultiplicitiesEClass.getEStructuralFeatures().get(3); @@ -790,6 +830,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EClass getGroupMultiplicities() { return groupMultiplicitiesEClass; @@ -800,6 +841,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EAttribute getGroupMultiplicities_Val1() { return (EAttribute)groupMultiplicitiesEClass.getEStructuralFeatures().get(0); @@ -810,6 +852,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EAttribute getGroupMultiplicities_Val2() { return (EAttribute)groupMultiplicitiesEClass.getEStructuralFeatures().get(1); @@ -820,6 +863,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EAttribute getGroupMultiplicities_Val3() { return (EAttribute)groupMultiplicitiesEClass.getEStructuralFeatures().get(2); @@ -830,6 +874,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EAttribute getGroupMultiplicities_Val4() { return (EAttribute)groupMultiplicitiesEClass.getEStructuralFeatures().get(3); @@ -840,6 +885,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EAttribute getGroupMultiplicities_Val5() { return (EAttribute)groupMultiplicitiesEClass.getEStructuralFeatures().get(4); @@ -850,6 +896,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EAttribute getGroupMultiplicities_Val6() { return (EAttribute)groupMultiplicitiesEClass.getEStructuralFeatures().get(5); @@ -860,6 +907,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EAttribute getGroupMultiplicities_Val7() { return (EAttribute)groupMultiplicitiesEClass.getEStructuralFeatures().get(6); @@ -870,6 +918,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EClass getAlternativeMultiplicities() { return alternativeMultiplicitiesEClass; @@ -880,6 +929,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EAttribute getAlternativeMultiplicities_Val2() { return (EAttribute)alternativeMultiplicitiesEClass.getEStructuralFeatures().get(0); @@ -890,6 +940,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EAttribute getAlternativeMultiplicities_Val3() { return (EAttribute)alternativeMultiplicitiesEClass.getEStructuralFeatures().get(1); @@ -900,6 +951,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EAttribute getAlternativeMultiplicities_Val4() { return (EAttribute)alternativeMultiplicitiesEClass.getEStructuralFeatures().get(2); @@ -910,6 +962,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EAttribute getAlternativeMultiplicities_Val5() { return (EAttribute)alternativeMultiplicitiesEClass.getEStructuralFeatures().get(3); @@ -920,6 +973,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EAttribute getAlternativeMultiplicities_Val6() { return (EAttribute)alternativeMultiplicitiesEClass.getEStructuralFeatures().get(4); @@ -930,6 +984,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EAttribute getAlternativeMultiplicities_Val7() { return (EAttribute)alternativeMultiplicitiesEClass.getEStructuralFeatures().get(5); @@ -940,6 +995,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EClass getAssignedAction() { return assignedActionEClass; @@ -950,6 +1006,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EAttribute getAssignedAction_Val1() { return (EAttribute)assignedActionEClass.getEStructuralFeatures().get(0); @@ -960,6 +1017,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EReference getAssignedAction_Child() { return (EReference)assignedActionEClass.getEStructuralFeatures().get(1); @@ -970,6 +1028,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EAttribute getAssignedAction_Val2() { return (EAttribute)assignedActionEClass.getEStructuralFeatures().get(2); @@ -980,6 +1039,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EClass getUnassignedAction1() { return unassignedAction1EClass; @@ -990,6 +1050,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EAttribute getUnassignedAction1_Val1() { return (EAttribute)unassignedAction1EClass.getEStructuralFeatures().get(0); @@ -1000,6 +1061,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EAttribute getUnassignedAction1_Val2() { return (EAttribute)unassignedAction1EClass.getEStructuralFeatures().get(1); @@ -1010,6 +1072,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EClass getUnassignedAction2() { return unassignedAction2EClass; @@ -1020,6 +1083,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EClass getUnassignedAction3() { return unassignedAction3EClass; @@ -1030,6 +1094,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EAttribute getUnassignedAction3_Val1() { return (EAttribute)unassignedAction3EClass.getEStructuralFeatures().get(0); @@ -1040,6 +1105,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EAttribute getUnassignedAction3_Val2() { return (EAttribute)unassignedAction3EClass.getEStructuralFeatures().get(1); @@ -1050,6 +1116,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EClass getUnassignedRuleCall1() { return unassignedRuleCall1EClass; @@ -1060,6 +1127,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EClass getUnassignedRuleCall1Sub() { return unassignedRuleCall1SubEClass; @@ -1070,6 +1138,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EAttribute getUnassignedRuleCall1Sub_Val2() { return (EAttribute)unassignedRuleCall1SubEClass.getEStructuralFeatures().get(0); @@ -1080,6 +1149,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EAttribute getUnassignedRuleCall1Sub_Val1() { return (EAttribute)unassignedRuleCall1SubEClass.getEStructuralFeatures().get(1); @@ -1090,6 +1160,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EClass getUnassignedRuleCall2() { return unassignedRuleCall2EClass; @@ -1100,6 +1171,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EClass getUnassignedRuleCall2Sub() { return unassignedRuleCall2SubEClass; @@ -1110,6 +1182,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EAttribute getUnassignedRuleCall2Sub_Val2() { return (EAttribute)unassignedRuleCall2SubEClass.getEStructuralFeatures().get(0); @@ -1120,6 +1193,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EClass getCombination1() { return combination1EClass; @@ -1130,6 +1204,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EAttribute getCombination1_Val1() { return (EAttribute)combination1EClass.getEStructuralFeatures().get(0); @@ -1140,6 +1215,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EAttribute getCombination1_Val2() { return (EAttribute)combination1EClass.getEStructuralFeatures().get(1); @@ -1150,6 +1226,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EAttribute getCombination1_Val3() { return (EAttribute)combination1EClass.getEStructuralFeatures().get(2); @@ -1160,6 +1237,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EAttribute getCombination1_Val4() { return (EAttribute)combination1EClass.getEStructuralFeatures().get(3); @@ -1170,6 +1248,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EClass getCombination2() { return combination2EClass; @@ -1180,6 +1259,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EAttribute getCombination2_Val1() { return (EAttribute)combination2EClass.getEStructuralFeatures().get(0); @@ -1190,6 +1270,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EAttribute getCombination2_Val2() { return (EAttribute)combination2EClass.getEStructuralFeatures().get(1); @@ -1200,6 +1281,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EAttribute getCombination2_Val3() { return (EAttribute)combination2EClass.getEStructuralFeatures().get(2); @@ -1210,6 +1292,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EAttribute getCombination2_Val4() { return (EAttribute)combination2EClass.getEStructuralFeatures().get(3); @@ -1220,6 +1303,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EClass getCombination3() { return combination3EClass; @@ -1230,6 +1314,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EAttribute getCombination3_Val1() { return (EAttribute)combination3EClass.getEStructuralFeatures().get(0); @@ -1240,6 +1325,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EAttribute getCombination3_Val2() { return (EAttribute)combination3EClass.getEStructuralFeatures().get(1); @@ -1250,6 +1336,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EAttribute getCombination3_Val3() { return (EAttribute)combination3EClass.getEStructuralFeatures().get(2); @@ -1260,6 +1347,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EClass getCombination4() { return combination4EClass; @@ -1270,6 +1358,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EAttribute getCombination4_Val1() { return (EAttribute)combination4EClass.getEStructuralFeatures().get(0); @@ -1280,6 +1369,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EAttribute getCombination4_Val2() { return (EAttribute)combination4EClass.getEStructuralFeatures().get(1); @@ -1290,6 +1380,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EAttribute getCombination4_Val3() { return (EAttribute)combination4EClass.getEStructuralFeatures().get(2); @@ -1300,6 +1391,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EClass getList1() { return list1EClass; @@ -1310,6 +1402,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EAttribute getList1_Val1() { return (EAttribute)list1EClass.getEStructuralFeatures().get(0); @@ -1320,6 +1413,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EClass getList2() { return list2EClass; @@ -1330,6 +1424,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EAttribute getList2_Val1() { return (EAttribute)list2EClass.getEStructuralFeatures().get(0); @@ -1340,6 +1435,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EClass getList3() { return list3EClass; @@ -1350,6 +1446,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EAttribute getList3_Val1() { return (EAttribute)list3EClass.getEStructuralFeatures().get(0); @@ -1360,6 +1457,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EAttribute getList3_Val2() { return (EAttribute)list3EClass.getEStructuralFeatures().get(1); @@ -1370,6 +1468,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EClass getList4() { return list4EClass; @@ -1380,6 +1479,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EAttribute getList4_Val1() { return (EAttribute)list4EClass.getEStructuralFeatures().get(0); @@ -1390,6 +1490,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EAttribute getList4_Val2() { return (EAttribute)list4EClass.getEStructuralFeatures().get(1); @@ -1400,6 +1501,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EClass getList5() { return list5EClass; @@ -1410,6 +1512,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EAttribute getList5_Val1() { return (EAttribute)list5EClass.getEStructuralFeatures().get(0); @@ -1420,6 +1523,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EAttribute getList5_Val2() { return (EAttribute)list5EClass.getEStructuralFeatures().get(1); @@ -1430,6 +1534,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EAttribute getList5_Val3() { return (EAttribute)list5EClass.getEStructuralFeatures().get(2); @@ -1440,6 +1545,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EClass getAltList1() { return altList1EClass; @@ -1450,6 +1556,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EAttribute getAltList1_Val1() { return (EAttribute)altList1EClass.getEStructuralFeatures().get(0); @@ -1460,6 +1567,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EAttribute getAltList1_Val2() { return (EAttribute)altList1EClass.getEStructuralFeatures().get(1); @@ -1470,6 +1578,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EAttribute getAltList1_Val3() { return (EAttribute)altList1EClass.getEStructuralFeatures().get(2); @@ -1480,6 +1589,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EAttribute getAltList1_Val4() { return (EAttribute)altList1EClass.getEStructuralFeatures().get(3); @@ -1490,6 +1600,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EClass getAltList2() { return altList2EClass; @@ -1500,6 +1611,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EAttribute getAltList2_Val1() { return (EAttribute)altList2EClass.getEStructuralFeatures().get(0); @@ -1510,6 +1622,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EAttribute getAltList2_Val2() { return (EAttribute)altList2EClass.getEStructuralFeatures().get(1); @@ -1520,6 +1633,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EAttribute getAltList2_Val3() { return (EAttribute)altList2EClass.getEStructuralFeatures().get(2); @@ -1530,6 +1644,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EClass getTransientObject() { return transientObjectEClass; @@ -1540,6 +1655,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EAttribute getTransientObject_Val1() { return (EAttribute)transientObjectEClass.getEStructuralFeatures().get(0); @@ -1550,6 +1666,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EReference getTransientObject_Nested() { return (EReference)transientObjectEClass.getEStructuralFeatures().get(1); @@ -1560,6 +1677,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EClass getTransientObjectSub() { return transientObjectSubEClass; @@ -1570,6 +1688,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EAttribute getTransientObjectSub_Val2() { return (EAttribute)transientObjectSubEClass.getEStructuralFeatures().get(0); @@ -1580,6 +1699,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EAttribute getTransientObjectSub_Val3() { return (EAttribute)transientObjectSubEClass.getEStructuralFeatures().get(1); @@ -1590,6 +1710,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EClass getTransientSerializeables1() { return transientSerializeables1EClass; @@ -1600,6 +1721,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EAttribute getTransientSerializeables1_Val1() { return (EAttribute)transientSerializeables1EClass.getEStructuralFeatures().get(0); @@ -1610,6 +1732,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EAttribute getTransientSerializeables1_Enum1() { return (EAttribute)transientSerializeables1EClass.getEStructuralFeatures().get(1); @@ -1620,6 +1743,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EAttribute getTransientSerializeables1_Val2() { return (EAttribute)transientSerializeables1EClass.getEStructuralFeatures().get(2); @@ -1630,6 +1754,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EAttribute getTransientSerializeables1_Int1() { return (EAttribute)transientSerializeables1EClass.getEStructuralFeatures().get(3); @@ -1640,6 +1765,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EClass getStaticSimplification() { return staticSimplificationEClass; @@ -1650,6 +1776,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EAttribute getStaticSimplification_Val1() { return (EAttribute)staticSimplificationEClass.getEStructuralFeatures().get(0); @@ -1660,6 +1787,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EAttribute getStaticSimplification_Val2() { return (EAttribute)staticSimplificationEClass.getEStructuralFeatures().get(1); @@ -1670,6 +1798,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EAttribute getStaticSimplification_Val3() { return (EAttribute)staticSimplificationEClass.getEStructuralFeatures().get(2); @@ -1680,6 +1809,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EClass getTwoVersion() { return twoVersionEClass; @@ -1690,6 +1820,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EAttribute getTwoVersion_Shared1() { return (EAttribute)twoVersionEClass.getEStructuralFeatures().get(0); @@ -1700,6 +1831,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EAttribute getTwoVersion_Shared2() { return (EAttribute)twoVersionEClass.getEStructuralFeatures().get(1); @@ -1710,6 +1842,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EAttribute getTwoVersion_Shared3() { return (EAttribute)twoVersionEClass.getEStructuralFeatures().get(2); @@ -1720,6 +1853,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EAttribute getTwoVersion_Version1() { return (EAttribute)twoVersionEClass.getEStructuralFeatures().get(3); @@ -1730,6 +1864,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EAttribute getTwoVersion_Extra1() { return (EAttribute)twoVersionEClass.getEStructuralFeatures().get(4); @@ -1740,6 +1875,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EAttribute getTwoVersion_Extra2() { return (EAttribute)twoVersionEClass.getEStructuralFeatures().get(5); @@ -1750,6 +1886,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EAttribute getTwoVersion_Extra3() { return (EAttribute)twoVersionEClass.getEStructuralFeatures().get(6); @@ -1760,6 +1897,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EAttribute getTwoVersion_Extra4() { return (EAttribute)twoVersionEClass.getEStructuralFeatures().get(7); @@ -1770,6 +1908,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EClass getHeuristic1() { return heuristic1EClass; @@ -1780,6 +1919,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EAttribute getHeuristic1_A() { return (EAttribute)heuristic1EClass.getEStructuralFeatures().get(0); @@ -1790,6 +1930,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EAttribute getHeuristic1_B() { return (EAttribute)heuristic1EClass.getEStructuralFeatures().get(1); @@ -1800,6 +1941,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EAttribute getHeuristic1_C() { return (EAttribute)heuristic1EClass.getEStructuralFeatures().get(2); @@ -1810,6 +1952,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EClass getUnassignedAction2Sub() { return unassignedAction2SubEClass; @@ -1820,6 +1963,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EAttribute getUnassignedAction2Sub_Val1() { return (EAttribute)unassignedAction2SubEClass.getEStructuralFeatures().get(0); @@ -1830,6 +1974,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EAttribute getUnassignedAction2Sub_Val2() { return (EAttribute)unassignedAction2SubEClass.getEStructuralFeatures().get(1); @@ -1840,6 +1985,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EClass getUnassignedAction2Sub1() { return unassignedAction2Sub1EClass; @@ -1850,6 +1996,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EClass getUnassignedAction2Sub2() { return unassignedAction2Sub2EClass; @@ -1860,6 +2007,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EClass getUnassignedRuleCall2SubAction() { return unassignedRuleCall2SubActionEClass; @@ -1870,6 +2018,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EClass getEmptyAlternativeSub() { return emptyAlternativeSubEClass; @@ -1880,6 +2029,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public EEnum getTransientSerializeables1Enum() { return transientSerializeables1EnumEEnum; @@ -1890,6 +2040,7 @@ public class CsvalidationtestPackageImpl extends EPackageImpl implements Csvalid * * @generated */ + @Override public CsvalidationtestFactory getCsvalidationtestFactory() { return (CsvalidationtestFactory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/GroupMultiplicitiesImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/GroupMultiplicitiesImpl.java index 40ae7219d..dc48cc8e8 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/GroupMultiplicitiesImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/GroupMultiplicitiesImpl.java @@ -166,6 +166,7 @@ public class GroupMultiplicitiesImpl extends MinimalEObjectImpl.Container implem * * @generated */ + @Override public String getVal1() { return val1; @@ -176,6 +177,7 @@ public class GroupMultiplicitiesImpl extends MinimalEObjectImpl.Container implem * * @generated */ + @Override public void setVal1(String newVal1) { String oldVal1 = val1; @@ -189,6 +191,7 @@ public class GroupMultiplicitiesImpl extends MinimalEObjectImpl.Container implem * * @generated */ + @Override public String getVal2() { return val2; @@ -199,6 +202,7 @@ public class GroupMultiplicitiesImpl extends MinimalEObjectImpl.Container implem * * @generated */ + @Override public void setVal2(String newVal2) { String oldVal2 = val2; @@ -212,6 +216,7 @@ public class GroupMultiplicitiesImpl extends MinimalEObjectImpl.Container implem * * @generated */ + @Override public String getVal3() { return val3; @@ -222,6 +227,7 @@ public class GroupMultiplicitiesImpl extends MinimalEObjectImpl.Container implem * * @generated */ + @Override public void setVal3(String newVal3) { String oldVal3 = val3; @@ -235,6 +241,7 @@ public class GroupMultiplicitiesImpl extends MinimalEObjectImpl.Container implem * * @generated */ + @Override public EList getVal4() { if (val4 == null) @@ -249,6 +256,7 @@ public class GroupMultiplicitiesImpl extends MinimalEObjectImpl.Container implem * * @generated */ + @Override public EList getVal5() { if (val5 == null) @@ -263,6 +271,7 @@ public class GroupMultiplicitiesImpl extends MinimalEObjectImpl.Container implem * * @generated */ + @Override public EList getVal6() { if (val6 == null) @@ -277,6 +286,7 @@ public class GroupMultiplicitiesImpl extends MinimalEObjectImpl.Container implem * * @generated */ + @Override public EList getVal7() { if (val7 == null) @@ -427,7 +437,7 @@ public class GroupMultiplicitiesImpl extends MinimalEObjectImpl.Container implem { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (val1: "); result.append(val1); result.append(", val2: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/Heuristic1Impl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/Heuristic1Impl.java index 1e460a006..06a8e0638 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/Heuristic1Impl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/Heuristic1Impl.java @@ -89,6 +89,7 @@ public class Heuristic1Impl extends MinimalEObjectImpl.Container implements Heur * * @generated */ + @Override public EList getA() { if (a == null) @@ -103,6 +104,7 @@ public class Heuristic1Impl extends MinimalEObjectImpl.Container implements Heur * * @generated */ + @Override public EList getB() { if (b == null) @@ -117,6 +119,7 @@ public class Heuristic1Impl extends MinimalEObjectImpl.Container implements Heur * * @generated */ + @Override public EList getC() { if (c == null) @@ -226,7 +229,7 @@ public class Heuristic1Impl extends MinimalEObjectImpl.Container implements Heur { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (a: "); result.append(a); result.append(", b: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/List1Impl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/List1Impl.java index 093e1f981..3758e2e82 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/List1Impl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/List1Impl.java @@ -67,6 +67,7 @@ public class List1Impl extends MinimalEObjectImpl.Container implements List1 * * @generated */ + @Override public EList getVal1() { if (val1 == null) @@ -154,7 +155,7 @@ public class List1Impl extends MinimalEObjectImpl.Container implements List1 { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (val1: "); result.append(val1); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/List2Impl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/List2Impl.java index d89ea59a2..bfbe10c1e 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/List2Impl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/List2Impl.java @@ -67,6 +67,7 @@ public class List2Impl extends MinimalEObjectImpl.Container implements List2 * * @generated */ + @Override public EList getVal1() { if (val1 == null) @@ -154,7 +155,7 @@ public class List2Impl extends MinimalEObjectImpl.Container implements List2 { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (val1: "); result.append(val1); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/List3Impl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/List3Impl.java index c586a325e..bc607829b 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/List3Impl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/List3Impl.java @@ -91,6 +91,7 @@ public class List3Impl extends MinimalEObjectImpl.Container implements List3 * * @generated */ + @Override public EList getVal1() { if (val1 == null) @@ -105,6 +106,7 @@ public class List3Impl extends MinimalEObjectImpl.Container implements List3 * * @generated */ + @Override public String getVal2() { return val2; @@ -115,6 +117,7 @@ public class List3Impl extends MinimalEObjectImpl.Container implements List3 * * @generated */ + @Override public void setVal2(String newVal2) { String oldVal2 = val2; @@ -211,7 +214,7 @@ public class List3Impl extends MinimalEObjectImpl.Container implements List3 { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (val1: "); result.append(val1); result.append(", val2: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/List4Impl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/List4Impl.java index 5f62adbef..0b97b053d 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/List4Impl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/List4Impl.java @@ -91,6 +91,7 @@ public class List4Impl extends MinimalEObjectImpl.Container implements List4 * * @generated */ + @Override public EList getVal1() { if (val1 == null) @@ -105,6 +106,7 @@ public class List4Impl extends MinimalEObjectImpl.Container implements List4 * * @generated */ + @Override public String getVal2() { return val2; @@ -115,6 +117,7 @@ public class List4Impl extends MinimalEObjectImpl.Container implements List4 * * @generated */ + @Override public void setVal2(String newVal2) { String oldVal2 = val2; @@ -211,7 +214,7 @@ public class List4Impl extends MinimalEObjectImpl.Container implements List4 { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (val1: "); result.append(val1); result.append(", val2: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/List5Impl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/List5Impl.java index 012d993fa..4333f46c2 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/List5Impl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/List5Impl.java @@ -112,6 +112,7 @@ public class List5Impl extends MinimalEObjectImpl.Container implements List5 * * @generated */ + @Override public EList getVal1() { if (val1 == null) @@ -126,6 +127,7 @@ public class List5Impl extends MinimalEObjectImpl.Container implements List5 * * @generated */ + @Override public String getVal2() { return val2; @@ -136,6 +138,7 @@ public class List5Impl extends MinimalEObjectImpl.Container implements List5 * * @generated */ + @Override public void setVal2(String newVal2) { String oldVal2 = val2; @@ -149,6 +152,7 @@ public class List5Impl extends MinimalEObjectImpl.Container implements List5 * * @generated */ + @Override public String getVal3() { return val3; @@ -159,6 +163,7 @@ public class List5Impl extends MinimalEObjectImpl.Container implements List5 * * @generated */ + @Override public void setVal3(String newVal3) { String oldVal3 = val3; @@ -265,7 +270,7 @@ public class List5Impl extends MinimalEObjectImpl.Container implements List5 { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (val1: "); result.append(val1); result.append(", val2: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/ModelImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/ModelImpl.java index 2a54eab3d..7fa15ba71 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/ModelImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/ModelImpl.java @@ -390,6 +390,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public SimpleGroup getX1() { return x1; @@ -417,6 +418,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setX1(SimpleGroup newX1) { if (newX1 != x1) @@ -438,6 +440,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public SimpleAlternative getX2() { return x2; @@ -465,6 +468,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setX2(SimpleAlternative newX2) { if (newX2 != x2) @@ -486,6 +490,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public SimpleMultiplicities getX3() { return x3; @@ -513,6 +518,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setX3(SimpleMultiplicities newX3) { if (newX3 != x3) @@ -534,6 +540,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public GroupMultiplicities getX4() { return x4; @@ -561,6 +568,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setX4(GroupMultiplicities newX4) { if (newX4 != x4) @@ -582,6 +590,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public AlternativeMultiplicities getX5() { return x5; @@ -609,6 +618,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setX5(AlternativeMultiplicities newX5) { if (newX5 != x5) @@ -630,6 +640,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public AssignedAction getX6() { return x6; @@ -657,6 +668,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setX6(AssignedAction newX6) { if (newX6 != x6) @@ -678,6 +690,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public AssignedAction getX7() { return x7; @@ -705,6 +718,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setX7(AssignedAction newX7) { if (newX7 != x7) @@ -726,6 +740,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public UnassignedAction1 getX8() { return x8; @@ -753,6 +768,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setX8(UnassignedAction1 newX8) { if (newX8 != x8) @@ -774,6 +790,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public UnassignedAction2 getX9() { return x9; @@ -801,6 +818,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setX9(UnassignedAction2 newX9) { if (newX9 != x9) @@ -822,6 +840,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public UnassignedAction3 getX10() { return x10; @@ -849,6 +868,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setX10(UnassignedAction3 newX10) { if (newX10 != x10) @@ -870,6 +890,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public UnassignedRuleCall1 getX11() { return x11; @@ -897,6 +918,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setX11(UnassignedRuleCall1 newX11) { if (newX11 != x11) @@ -918,6 +940,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public UnassignedRuleCall2 getX12() { return x12; @@ -945,6 +968,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setX12(UnassignedRuleCall2 newX12) { if (newX12 != x12) @@ -966,6 +990,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public Combination1 getX13() { return x13; @@ -993,6 +1018,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setX13(Combination1 newX13) { if (newX13 != x13) @@ -1014,6 +1040,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public Combination2 getX14() { return x14; @@ -1041,6 +1068,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setX14(Combination2 newX14) { if (newX14 != x14) @@ -1062,6 +1090,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public Combination3 getX15() { return x15; @@ -1089,6 +1118,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setX15(Combination3 newX15) { if (newX15 != x15) @@ -1110,6 +1140,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public Combination4 getX16() { return x16; @@ -1137,6 +1168,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setX16(Combination4 newX16) { if (newX16 != x16) @@ -1158,6 +1190,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public List1 getX17() { return x17; @@ -1185,6 +1218,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setX17(List1 newX17) { if (newX17 != x17) @@ -1206,6 +1240,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public List2 getX18() { return x18; @@ -1233,6 +1268,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setX18(List2 newX18) { if (newX18 != x18) @@ -1254,6 +1290,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public List3 getX19() { return x19; @@ -1281,6 +1318,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setX19(List3 newX19) { if (newX19 != x19) @@ -1302,6 +1340,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public List4 getX20() { return x20; @@ -1329,6 +1368,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setX20(List4 newX20) { if (newX20 != x20) @@ -1350,6 +1390,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public List5 getX21() { return x21; @@ -1377,6 +1418,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setX21(List5 newX21) { if (newX21 != x21) @@ -1398,6 +1440,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public AltList1 getX22() { return x22; @@ -1425,6 +1468,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setX22(AltList1 newX22) { if (newX22 != x22) @@ -1446,6 +1490,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public AltList2 getX23() { return x23; @@ -1473,6 +1518,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setX23(AltList2 newX23) { if (newX23 != x23) @@ -1494,6 +1540,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public TransientObject getX24() { return x24; @@ -1521,6 +1568,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setX24(TransientObject newX24) { if (newX24 != x24) @@ -1542,6 +1590,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public TransientSerializeables1 getX25() { return x25; @@ -1569,6 +1618,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setX25(TransientSerializeables1 newX25) { if (newX25 != x25) @@ -1590,6 +1640,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public StaticSimplification getX26() { return x26; @@ -1617,6 +1668,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setX26(StaticSimplification newX26) { if (newX26 != x26) @@ -1638,6 +1690,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public TwoVersion getX27() { return x27; @@ -1665,6 +1718,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setX27(TwoVersion newX27) { if (newX27 != x27) @@ -1686,6 +1740,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public Heuristic1 getX28() { return x28; @@ -1713,6 +1768,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setX28(Heuristic1 newX28) { if (newX28 != x28) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/SimpleAlternativeImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/SimpleAlternativeImpl.java index ab2a1252d..b05585446 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/SimpleAlternativeImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/SimpleAlternativeImpl.java @@ -95,6 +95,7 @@ public class SimpleAlternativeImpl extends MinimalEObjectImpl.Container implemen * * @generated */ + @Override public String getVal1() { return val1; @@ -105,6 +106,7 @@ public class SimpleAlternativeImpl extends MinimalEObjectImpl.Container implemen * * @generated */ + @Override public void setVal1(String newVal1) { String oldVal1 = val1; @@ -118,6 +120,7 @@ public class SimpleAlternativeImpl extends MinimalEObjectImpl.Container implemen * * @generated */ + @Override public String getVal2() { return val2; @@ -128,6 +131,7 @@ public class SimpleAlternativeImpl extends MinimalEObjectImpl.Container implemen * * @generated */ + @Override public void setVal2(String newVal2) { String oldVal2 = val2; @@ -222,7 +226,7 @@ public class SimpleAlternativeImpl extends MinimalEObjectImpl.Container implemen { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (val1: "); result.append(val1); result.append(", val2: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/SimpleGroupImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/SimpleGroupImpl.java index ea5bf1ead..e98b20929 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/SimpleGroupImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/SimpleGroupImpl.java @@ -95,6 +95,7 @@ public class SimpleGroupImpl extends MinimalEObjectImpl.Container implements Sim * * @generated */ + @Override public String getVal1() { return val1; @@ -105,6 +106,7 @@ public class SimpleGroupImpl extends MinimalEObjectImpl.Container implements Sim * * @generated */ + @Override public void setVal1(String newVal1) { String oldVal1 = val1; @@ -118,6 +120,7 @@ public class SimpleGroupImpl extends MinimalEObjectImpl.Container implements Sim * * @generated */ + @Override public String getVal2() { return val2; @@ -128,6 +131,7 @@ public class SimpleGroupImpl extends MinimalEObjectImpl.Container implements Sim * * @generated */ + @Override public void setVal2(String newVal2) { String oldVal2 = val2; @@ -222,7 +226,7 @@ public class SimpleGroupImpl extends MinimalEObjectImpl.Container implements Sim { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (val1: "); result.append(val1); result.append(", val2: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/SimpleMultiplicitiesImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/SimpleMultiplicitiesImpl.java index 8d41f6b22..c6cac91b6 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/SimpleMultiplicitiesImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/SimpleMultiplicitiesImpl.java @@ -123,6 +123,7 @@ public class SimpleMultiplicitiesImpl extends MinimalEObjectImpl.Container imple * * @generated */ + @Override public String getVal1() { return val1; @@ -133,6 +134,7 @@ public class SimpleMultiplicitiesImpl extends MinimalEObjectImpl.Container imple * * @generated */ + @Override public void setVal1(String newVal1) { String oldVal1 = val1; @@ -146,6 +148,7 @@ public class SimpleMultiplicitiesImpl extends MinimalEObjectImpl.Container imple * * @generated */ + @Override public String getVal2() { return val2; @@ -156,6 +159,7 @@ public class SimpleMultiplicitiesImpl extends MinimalEObjectImpl.Container imple * * @generated */ + @Override public void setVal2(String newVal2) { String oldVal2 = val2; @@ -169,6 +173,7 @@ public class SimpleMultiplicitiesImpl extends MinimalEObjectImpl.Container imple * * @generated */ + @Override public EList getVal3() { if (val3 == null) @@ -183,6 +188,7 @@ public class SimpleMultiplicitiesImpl extends MinimalEObjectImpl.Container imple * * @generated */ + @Override public EList getVal4() { if (val4 == null) @@ -301,7 +307,7 @@ public class SimpleMultiplicitiesImpl extends MinimalEObjectImpl.Container imple { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (val1: "); result.append(val1); result.append(", val2: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/StaticSimplificationImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/StaticSimplificationImpl.java index d1c36f166..e8a21805f 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/StaticSimplificationImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/StaticSimplificationImpl.java @@ -116,6 +116,7 @@ public class StaticSimplificationImpl extends MinimalEObjectImpl.Container imple * * @generated */ + @Override public String getVal1() { return val1; @@ -126,6 +127,7 @@ public class StaticSimplificationImpl extends MinimalEObjectImpl.Container imple * * @generated */ + @Override public void setVal1(String newVal1) { String oldVal1 = val1; @@ -139,6 +141,7 @@ public class StaticSimplificationImpl extends MinimalEObjectImpl.Container imple * * @generated */ + @Override public String getVal2() { return val2; @@ -149,6 +152,7 @@ public class StaticSimplificationImpl extends MinimalEObjectImpl.Container imple * * @generated */ + @Override public void setVal2(String newVal2) { String oldVal2 = val2; @@ -162,6 +166,7 @@ public class StaticSimplificationImpl extends MinimalEObjectImpl.Container imple * * @generated */ + @Override public String getVal3() { return val3; @@ -172,6 +177,7 @@ public class StaticSimplificationImpl extends MinimalEObjectImpl.Container imple * * @generated */ + @Override public void setVal3(String newVal3) { String oldVal3 = val3; @@ -276,7 +282,7 @@ public class StaticSimplificationImpl extends MinimalEObjectImpl.Container imple { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (val1: "); result.append(val1); result.append(", val2: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/TransientObjectImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/TransientObjectImpl.java index 7f92df6f4..bd69ca01e 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/TransientObjectImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/TransientObjectImpl.java @@ -88,6 +88,7 @@ public class TransientObjectImpl extends MinimalEObjectImpl.Container implements * * @generated */ + @Override public String getVal1() { return val1; @@ -98,6 +99,7 @@ public class TransientObjectImpl extends MinimalEObjectImpl.Container implements * * @generated */ + @Override public void setVal1(String newVal1) { String oldVal1 = val1; @@ -111,6 +113,7 @@ public class TransientObjectImpl extends MinimalEObjectImpl.Container implements * * @generated */ + @Override public TransientObjectSub getNested() { return nested; @@ -138,6 +141,7 @@ public class TransientObjectImpl extends MinimalEObjectImpl.Container implements * * @generated */ + @Override public void setNested(TransientObjectSub newNested) { if (newNested != nested) @@ -256,7 +260,7 @@ public class TransientObjectImpl extends MinimalEObjectImpl.Container implements { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (val1: "); result.append(val1); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/TransientObjectSubImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/TransientObjectSubImpl.java index 8583e0ec4..095a9f2b5 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/TransientObjectSubImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/TransientObjectSubImpl.java @@ -95,6 +95,7 @@ public class TransientObjectSubImpl extends MinimalEObjectImpl.Container impleme * * @generated */ + @Override public String getVal2() { return val2; @@ -105,6 +106,7 @@ public class TransientObjectSubImpl extends MinimalEObjectImpl.Container impleme * * @generated */ + @Override public void setVal2(String newVal2) { String oldVal2 = val2; @@ -118,6 +120,7 @@ public class TransientObjectSubImpl extends MinimalEObjectImpl.Container impleme * * @generated */ + @Override public String getVal3() { return val3; @@ -128,6 +131,7 @@ public class TransientObjectSubImpl extends MinimalEObjectImpl.Container impleme * * @generated */ + @Override public void setVal3(String newVal3) { String oldVal3 = val3; @@ -222,7 +226,7 @@ public class TransientObjectSubImpl extends MinimalEObjectImpl.Container impleme { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (val2: "); result.append(val2); result.append(", val3: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/TransientSerializeables1Impl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/TransientSerializeables1Impl.java index 7c8985bf8..9adf9d417 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/TransientSerializeables1Impl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/TransientSerializeables1Impl.java @@ -138,6 +138,7 @@ public class TransientSerializeables1Impl extends MinimalEObjectImpl.Container i * * @generated */ + @Override public String getVal1() { return val1; @@ -148,6 +149,7 @@ public class TransientSerializeables1Impl extends MinimalEObjectImpl.Container i * * @generated */ + @Override public void setVal1(String newVal1) { String oldVal1 = val1; @@ -161,6 +163,7 @@ public class TransientSerializeables1Impl extends MinimalEObjectImpl.Container i * * @generated */ + @Override public TransientSerializeables1Enum getEnum1() { return enum1; @@ -171,6 +174,7 @@ public class TransientSerializeables1Impl extends MinimalEObjectImpl.Container i * * @generated */ + @Override public void setEnum1(TransientSerializeables1Enum newEnum1) { TransientSerializeables1Enum oldEnum1 = enum1; @@ -184,6 +188,7 @@ public class TransientSerializeables1Impl extends MinimalEObjectImpl.Container i * * @generated */ + @Override public String getVal2() { return val2; @@ -194,6 +199,7 @@ public class TransientSerializeables1Impl extends MinimalEObjectImpl.Container i * * @generated */ + @Override public void setVal2(String newVal2) { String oldVal2 = val2; @@ -207,6 +213,7 @@ public class TransientSerializeables1Impl extends MinimalEObjectImpl.Container i * * @generated */ + @Override public int getInt1() { return int1; @@ -217,6 +224,7 @@ public class TransientSerializeables1Impl extends MinimalEObjectImpl.Container i * * @generated */ + @Override public void setInt1(int newInt1) { int oldInt1 = int1; @@ -331,7 +339,7 @@ public class TransientSerializeables1Impl extends MinimalEObjectImpl.Container i { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (val1: "); result.append(val1); result.append(", enum1: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/TwoVersionImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/TwoVersionImpl.java index e5beddfc9..a63777a90 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/TwoVersionImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/TwoVersionImpl.java @@ -217,6 +217,7 @@ public class TwoVersionImpl extends MinimalEObjectImpl.Container implements TwoV * * @generated */ + @Override public String getShared1() { return shared1; @@ -227,6 +228,7 @@ public class TwoVersionImpl extends MinimalEObjectImpl.Container implements TwoV * * @generated */ + @Override public void setShared1(String newShared1) { String oldShared1 = shared1; @@ -240,6 +242,7 @@ public class TwoVersionImpl extends MinimalEObjectImpl.Container implements TwoV * * @generated */ + @Override public String getShared2() { return shared2; @@ -250,6 +253,7 @@ public class TwoVersionImpl extends MinimalEObjectImpl.Container implements TwoV * * @generated */ + @Override public void setShared2(String newShared2) { String oldShared2 = shared2; @@ -263,6 +267,7 @@ public class TwoVersionImpl extends MinimalEObjectImpl.Container implements TwoV * * @generated */ + @Override public EList getShared3() { if (shared3 == null) @@ -277,6 +282,7 @@ public class TwoVersionImpl extends MinimalEObjectImpl.Container implements TwoV * * @generated */ + @Override public String getVersion1() { return version1; @@ -287,6 +293,7 @@ public class TwoVersionImpl extends MinimalEObjectImpl.Container implements TwoV * * @generated */ + @Override public void setVersion1(String newVersion1) { String oldVersion1 = version1; @@ -300,6 +307,7 @@ public class TwoVersionImpl extends MinimalEObjectImpl.Container implements TwoV * * @generated */ + @Override public String getExtra1() { return extra1; @@ -310,6 +318,7 @@ public class TwoVersionImpl extends MinimalEObjectImpl.Container implements TwoV * * @generated */ + @Override public void setExtra1(String newExtra1) { String oldExtra1 = extra1; @@ -323,6 +332,7 @@ public class TwoVersionImpl extends MinimalEObjectImpl.Container implements TwoV * * @generated */ + @Override public String getExtra2() { return extra2; @@ -333,6 +343,7 @@ public class TwoVersionImpl extends MinimalEObjectImpl.Container implements TwoV * * @generated */ + @Override public void setExtra2(String newExtra2) { String oldExtra2 = extra2; @@ -346,6 +357,7 @@ public class TwoVersionImpl extends MinimalEObjectImpl.Container implements TwoV * * @generated */ + @Override public String getExtra3() { return extra3; @@ -356,6 +368,7 @@ public class TwoVersionImpl extends MinimalEObjectImpl.Container implements TwoV * * @generated */ + @Override public void setExtra3(String newExtra3) { String oldExtra3 = extra3; @@ -369,6 +382,7 @@ public class TwoVersionImpl extends MinimalEObjectImpl.Container implements TwoV * * @generated */ + @Override public String getExtra4() { return extra4; @@ -379,6 +393,7 @@ public class TwoVersionImpl extends MinimalEObjectImpl.Container implements TwoV * * @generated */ + @Override public void setExtra4(String newExtra4) { String oldExtra4 = extra4; @@ -535,7 +550,7 @@ public class TwoVersionImpl extends MinimalEObjectImpl.Container implements TwoV { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (shared1: "); result.append(shared1); result.append(", shared2: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/UnassignedAction1Impl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/UnassignedAction1Impl.java index 691fbd33f..0b0ede972 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/UnassignedAction1Impl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/UnassignedAction1Impl.java @@ -95,6 +95,7 @@ public class UnassignedAction1Impl extends MinimalEObjectImpl.Container implemen * * @generated */ + @Override public String getVal1() { return val1; @@ -105,6 +106,7 @@ public class UnassignedAction1Impl extends MinimalEObjectImpl.Container implemen * * @generated */ + @Override public void setVal1(String newVal1) { String oldVal1 = val1; @@ -118,6 +120,7 @@ public class UnassignedAction1Impl extends MinimalEObjectImpl.Container implemen * * @generated */ + @Override public String getVal2() { return val2; @@ -128,6 +131,7 @@ public class UnassignedAction1Impl extends MinimalEObjectImpl.Container implemen * * @generated */ + @Override public void setVal2(String newVal2) { String oldVal2 = val2; @@ -222,7 +226,7 @@ public class UnassignedAction1Impl extends MinimalEObjectImpl.Container implemen { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (val1: "); result.append(val1); result.append(", val2: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/UnassignedAction2SubImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/UnassignedAction2SubImpl.java index 820929710..b1730f9a0 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/UnassignedAction2SubImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/UnassignedAction2SubImpl.java @@ -94,6 +94,7 @@ public class UnassignedAction2SubImpl extends UnassignedAction2Impl implements U * * @generated */ + @Override public String getVal1() { return val1; @@ -104,6 +105,7 @@ public class UnassignedAction2SubImpl extends UnassignedAction2Impl implements U * * @generated */ + @Override public void setVal1(String newVal1) { String oldVal1 = val1; @@ -117,6 +119,7 @@ public class UnassignedAction2SubImpl extends UnassignedAction2Impl implements U * * @generated */ + @Override public String getVal2() { return val2; @@ -127,6 +130,7 @@ public class UnassignedAction2SubImpl extends UnassignedAction2Impl implements U * * @generated */ + @Override public void setVal2(String newVal2) { String oldVal2 = val2; @@ -221,7 +225,7 @@ public class UnassignedAction2SubImpl extends UnassignedAction2Impl implements U { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (val1: "); result.append(val1); result.append(", val2: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/UnassignedAction3Impl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/UnassignedAction3Impl.java index af2e62671..05443ce1b 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/UnassignedAction3Impl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/UnassignedAction3Impl.java @@ -95,6 +95,7 @@ public class UnassignedAction3Impl extends MinimalEObjectImpl.Container implemen * * @generated */ + @Override public String getVal1() { return val1; @@ -105,6 +106,7 @@ public class UnassignedAction3Impl extends MinimalEObjectImpl.Container implemen * * @generated */ + @Override public void setVal1(String newVal1) { String oldVal1 = val1; @@ -118,6 +120,7 @@ public class UnassignedAction3Impl extends MinimalEObjectImpl.Container implemen * * @generated */ + @Override public String getVal2() { return val2; @@ -128,6 +131,7 @@ public class UnassignedAction3Impl extends MinimalEObjectImpl.Container implemen * * @generated */ + @Override public void setVal2(String newVal2) { String oldVal2 = val2; @@ -222,7 +226,7 @@ public class UnassignedAction3Impl extends MinimalEObjectImpl.Container implemen { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (val1: "); result.append(val1); result.append(", val2: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/UnassignedRuleCall1SubImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/UnassignedRuleCall1SubImpl.java index 1b91ef6ef..1b9ef8033 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/UnassignedRuleCall1SubImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/UnassignedRuleCall1SubImpl.java @@ -94,6 +94,7 @@ public class UnassignedRuleCall1SubImpl extends UnassignedRuleCall1Impl implemen * * @generated */ + @Override public String getVal2() { return val2; @@ -104,6 +105,7 @@ public class UnassignedRuleCall1SubImpl extends UnassignedRuleCall1Impl implemen * * @generated */ + @Override public void setVal2(String newVal2) { String oldVal2 = val2; @@ -117,6 +119,7 @@ public class UnassignedRuleCall1SubImpl extends UnassignedRuleCall1Impl implemen * * @generated */ + @Override public String getVal1() { return val1; @@ -127,6 +130,7 @@ public class UnassignedRuleCall1SubImpl extends UnassignedRuleCall1Impl implemen * * @generated */ + @Override public void setVal1(String newVal1) { String oldVal1 = val1; @@ -221,7 +225,7 @@ public class UnassignedRuleCall1SubImpl extends UnassignedRuleCall1Impl implemen { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (val2: "); result.append(val2); result.append(", val1: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/UnassignedRuleCall2SubImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/UnassignedRuleCall2SubImpl.java index dbdd15e68..afc03460b 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/UnassignedRuleCall2SubImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/validation/csvalidationtest/impl/UnassignedRuleCall2SubImpl.java @@ -73,6 +73,7 @@ public class UnassignedRuleCall2SubImpl extends UnassignedRuleCall2Impl implemen * * @generated */ + @Override public String getVal2() { return val2; @@ -83,6 +84,7 @@ public class UnassignedRuleCall2SubImpl extends UnassignedRuleCall2Impl implemen * * @generated */ + @Override public void setVal2(String newVal2) { String oldVal2 = val2; @@ -167,7 +169,7 @@ public class UnassignedRuleCall2SubImpl extends UnassignedRuleCall2Impl implemen { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (val2: "); result.append(val2); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/Bug250313.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/Bug250313.genmodel index 07d29c02d..84e52cd36 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/Bug250313.genmodel +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/Bug250313.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="Bug250313" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> + complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/QualifiedNameTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/QualifiedNameTestLanguage.genmodel index e664255a1..326632c62 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/QualifiedNameTestLanguage.genmodel +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/QualifiedNameTestLanguage.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="QualifiedNameTestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> + complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/bug250313/Child.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/bug250313/Child.java index b9c1d7c06..b6dad7356 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/bug250313/Child.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/bug250313/Child.java @@ -26,10 +26,6 @@ public interface Child 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) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/bug250313/Model.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/bug250313/Model.java index 0aeeed91a..96d9fcb9b 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/bug250313/Model.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/bug250313/Model.java @@ -30,10 +30,6 @@ public interface Model extends EObject /** * Returns the value of the 'Value' attribute. * - *

- * If the meaning of the 'Value' attribute isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Value' attribute. * @see #setValue(String) @@ -57,10 +53,6 @@ public interface Model extends EObject * Returns the value of the 'Multi Value' attribute list. * The list contents are of type {@link java.lang.String}. * - *

- * If the meaning of the 'Multi Value' attribute list isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Multi Value' attribute list. * @see org.eclipse.xtext.valueconverter.bug250313.Bug250313Package#getModel_MultiValue() @@ -72,10 +64,6 @@ public interface Model extends EObject /** * Returns the value of the 'Children' containment reference. * - *

- * If the meaning of the 'Children' containment reference isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Children' containment reference. * @see #setChildren(Child) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/bug250313/impl/Bug250313FactoryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/bug250313/impl/Bug250313FactoryImpl.java index e14bc38a5..82e778094 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/bug250313/impl/Bug250313FactoryImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/bug250313/impl/Bug250313FactoryImpl.java @@ -79,6 +79,7 @@ public class Bug250313FactoryImpl extends EFactoryImpl implements Bug250313Facto * * @generated */ + @Override public Model createModel() { ModelImpl model = new ModelImpl(); @@ -90,6 +91,7 @@ public class Bug250313FactoryImpl extends EFactoryImpl implements Bug250313Facto * * @generated */ + @Override public Child createChild() { ChildImpl child = new ChildImpl(); @@ -101,6 +103,7 @@ public class Bug250313FactoryImpl extends EFactoryImpl implements Bug250313Facto * * @generated */ + @Override public Child1 createChild1() { Child1Impl child1 = new Child1Impl(); @@ -112,6 +115,7 @@ public class Bug250313FactoryImpl extends EFactoryImpl implements Bug250313Facto * * @generated */ + @Override public Child2 createChild2() { Child2Impl child2 = new Child2Impl(); @@ -123,6 +127,7 @@ public class Bug250313FactoryImpl extends EFactoryImpl implements Bug250313Facto * * @generated */ + @Override public Bug250313Package getBug250313Package() { return (Bug250313Package)getEPackage(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/bug250313/impl/Bug250313PackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/bug250313/impl/Bug250313PackageImpl.java index e62178fa1..9737a4675 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/bug250313/impl/Bug250313PackageImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/bug250313/impl/Bug250313PackageImpl.java @@ -83,7 +83,7 @@ public class Bug250313PackageImpl extends EPackageImpl implements Bug250313Packa /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link Bug250313Package#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -98,7 +98,8 @@ public class Bug250313PackageImpl extends EPackageImpl implements Bug250313Packa if (isInited) return (Bug250313Package)EPackage.Registry.INSTANCE.getEPackage(Bug250313Package.eNS_URI); // Obtain or create and register package - Bug250313PackageImpl theBug250313Package = (Bug250313PackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof Bug250313PackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new Bug250313PackageImpl()); + Object registeredBug250313Package = EPackage.Registry.INSTANCE.get(eNS_URI); + Bug250313PackageImpl theBug250313Package = registeredBug250313Package instanceof Bug250313PackageImpl ? (Bug250313PackageImpl)registeredBug250313Package : new Bug250313PackageImpl(); isInited = true; @@ -114,7 +115,6 @@ public class Bug250313PackageImpl extends EPackageImpl implements Bug250313Packa // Mark meta-data to indicate it can't be changed theBug250313Package.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(Bug250313Package.eNS_URI, theBug250313Package); return theBug250313Package; @@ -125,6 +125,7 @@ public class Bug250313PackageImpl extends EPackageImpl implements Bug250313Packa * * @generated */ + @Override public EClass getModel() { return modelEClass; @@ -135,6 +136,7 @@ public class Bug250313PackageImpl extends EPackageImpl implements Bug250313Packa * * @generated */ + @Override public EAttribute getModel_Value() { return (EAttribute)modelEClass.getEStructuralFeatures().get(0); @@ -145,6 +147,7 @@ public class Bug250313PackageImpl extends EPackageImpl implements Bug250313Packa * * @generated */ + @Override public EAttribute getModel_MultiValue() { return (EAttribute)modelEClass.getEStructuralFeatures().get(1); @@ -155,6 +158,7 @@ public class Bug250313PackageImpl extends EPackageImpl implements Bug250313Packa * * @generated */ + @Override public EReference getModel_Children() { return (EReference)modelEClass.getEStructuralFeatures().get(2); @@ -165,6 +169,7 @@ public class Bug250313PackageImpl extends EPackageImpl implements Bug250313Packa * * @generated */ + @Override public EClass getChild() { return childEClass; @@ -175,6 +180,7 @@ public class Bug250313PackageImpl extends EPackageImpl implements Bug250313Packa * * @generated */ + @Override public EAttribute getChild_Name() { return (EAttribute)childEClass.getEStructuralFeatures().get(0); @@ -185,6 +191,7 @@ public class Bug250313PackageImpl extends EPackageImpl implements Bug250313Packa * * @generated */ + @Override public EClass getChild1() { return child1EClass; @@ -195,6 +202,7 @@ public class Bug250313PackageImpl extends EPackageImpl implements Bug250313Packa * * @generated */ + @Override public EClass getChild2() { return child2EClass; @@ -205,6 +213,7 @@ public class Bug250313PackageImpl extends EPackageImpl implements Bug250313Packa * * @generated */ + @Override public Bug250313Factory getBug250313Factory() { return (Bug250313Factory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/bug250313/impl/ChildImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/bug250313/impl/ChildImpl.java index 2eecbc14c..cb9fcec14 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/bug250313/impl/ChildImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/bug250313/impl/ChildImpl.java @@ -74,6 +74,7 @@ public class ChildImpl extends MinimalEObjectImpl.Container implements Child * * @generated */ + @Override public String getName() { return name; @@ -84,6 +85,7 @@ public class ChildImpl extends MinimalEObjectImpl.Container implements Child * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -168,7 +170,7 @@ public class ChildImpl extends MinimalEObjectImpl.Container implements Child { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/bug250313/impl/ModelImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/bug250313/impl/ModelImpl.java index d6c5334a4..0be4dd7be 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/bug250313/impl/ModelImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/bug250313/impl/ModelImpl.java @@ -105,6 +105,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public String getValue() { return value; @@ -115,6 +116,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setValue(String newValue) { String oldValue = value; @@ -128,6 +130,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public EList getMultiValue() { if (multiValue == null) @@ -142,6 +145,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public Child getChildren() { return children; @@ -169,6 +173,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setChildren(Child newChildren) { if (newChildren != children) @@ -299,7 +304,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (value: "); result.append(value); result.append(", multiValue: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/qualifiedName/Element.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/qualifiedName/Element.java index f0e169d52..957cc3da4 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/qualifiedName/Element.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/qualifiedName/Element.java @@ -26,10 +26,6 @@ public interface Element extends EObject /** * Returns the value of the 'Qualified Name' attribute. * - *

- * If the meaning of the 'Qualified Name' attribute isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Qualified Name' attribute. * @see #setQualifiedName(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/qualifiedName/impl/ElementImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/qualifiedName/impl/ElementImpl.java index a7e368336..1137f2c7e 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/qualifiedName/impl/ElementImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/qualifiedName/impl/ElementImpl.java @@ -74,6 +74,7 @@ public class ElementImpl extends MinimalEObjectImpl.Container implements Element * * @generated */ + @Override public String getQualifiedName() { return qualifiedName; @@ -84,6 +85,7 @@ public class ElementImpl extends MinimalEObjectImpl.Container implements Element * * @generated */ + @Override public void setQualifiedName(String newQualifiedName) { String oldQualifiedName = qualifiedName; @@ -168,7 +170,7 @@ public class ElementImpl extends MinimalEObjectImpl.Container implements Element { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (qualifiedName: "); result.append(qualifiedName); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/qualifiedName/impl/QualifiedNameFactoryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/qualifiedName/impl/QualifiedNameFactoryImpl.java index d3849c387..7da2bc19c 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/qualifiedName/impl/QualifiedNameFactoryImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/qualifiedName/impl/QualifiedNameFactoryImpl.java @@ -76,6 +76,7 @@ public class QualifiedNameFactoryImpl extends EFactoryImpl implements QualifiedN * * @generated */ + @Override public Element createElement() { ElementImpl element = new ElementImpl(); @@ -87,6 +88,7 @@ public class QualifiedNameFactoryImpl extends EFactoryImpl implements QualifiedN * * @generated */ + @Override public QualifiedNamePackage getQualifiedNamePackage() { return (QualifiedNamePackage)getEPackage(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/qualifiedName/impl/QualifiedNamePackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/qualifiedName/impl/QualifiedNamePackageImpl.java index 927c1e0a7..23d2fc763 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/qualifiedName/impl/QualifiedNamePackageImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/valueconverter/qualifiedName/impl/QualifiedNamePackageImpl.java @@ -58,7 +58,7 @@ public class QualifiedNamePackageImpl extends EPackageImpl implements QualifiedN /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link QualifiedNamePackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -73,7 +73,8 @@ public class QualifiedNamePackageImpl extends EPackageImpl implements QualifiedN if (isInited) return (QualifiedNamePackage)EPackage.Registry.INSTANCE.getEPackage(QualifiedNamePackage.eNS_URI); // Obtain or create and register package - QualifiedNamePackageImpl theQualifiedNamePackage = (QualifiedNamePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof QualifiedNamePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new QualifiedNamePackageImpl()); + Object registeredQualifiedNamePackage = EPackage.Registry.INSTANCE.get(eNS_URI); + QualifiedNamePackageImpl theQualifiedNamePackage = registeredQualifiedNamePackage instanceof QualifiedNamePackageImpl ? (QualifiedNamePackageImpl)registeredQualifiedNamePackage : new QualifiedNamePackageImpl(); isInited = true; @@ -89,7 +90,6 @@ public class QualifiedNamePackageImpl extends EPackageImpl implements QualifiedN // Mark meta-data to indicate it can't be changed theQualifiedNamePackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(QualifiedNamePackage.eNS_URI, theQualifiedNamePackage); return theQualifiedNamePackage; @@ -100,6 +100,7 @@ public class QualifiedNamePackageImpl extends EPackageImpl implements QualifiedN * * @generated */ + @Override public EClass getElement() { return elementEClass; @@ -110,6 +111,7 @@ public class QualifiedNamePackageImpl extends EPackageImpl implements QualifiedN * * @generated */ + @Override public EAttribute getElement_QualifiedName() { return (EAttribute)elementEClass.getEStructuralFeatures().get(0); @@ -120,6 +122,7 @@ public class QualifiedNamePackageImpl extends EPackageImpl implements QualifiedN * * @generated */ + @Override public QualifiedNameFactory getQualifiedNameFactory() { return (QualifiedNameFactory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/MultiValueFeatureTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/MultiValueFeatureTestLanguage.genmodel index 8e1d14f9b..73bcf23d2 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/MultiValueFeatureTestLanguage.genmodel +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/MultiValueFeatureTestLanguage.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="MultiValueFeatureTestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> + complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/UnassignedRuleCallTestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/UnassignedRuleCallTestLanguage.genmodel index 50d878485..8b6c2841a 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/UnassignedRuleCallTestLanguage.genmodel +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/UnassignedRuleCallTestLanguage.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="UnassignedRuleCallTestLanguage" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> + complianceLevel="8.0" copyrightFields="false" runtimeVersion="2.20" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"> diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/multiValueFeatureTestLanguage/Start.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/multiValueFeatureTestLanguage/Start.java index 04bca09d7..6668602d1 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/multiValueFeatureTestLanguage/Start.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/multiValueFeatureTestLanguage/Start.java @@ -29,10 +29,6 @@ public interface Start extends EObject * Returns the value of the 'Feature A' attribute list. * The list contents are of type {@link java.lang.String}. * - *

- * If the meaning of the 'Feature A' attribute list isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Feature A' attribute list. * @see org.eclipse.xtext.xtext.ecoreInference.multiValueFeatureTestLanguage.MultiValueFeatureTestLanguagePackage#getStart_FeatureA() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/multiValueFeatureTestLanguage/impl/MultiValueFeatureTestLanguageFactoryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/multiValueFeatureTestLanguage/impl/MultiValueFeatureTestLanguageFactoryImpl.java index e470d6c3f..a758627d3 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/multiValueFeatureTestLanguage/impl/MultiValueFeatureTestLanguageFactoryImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/multiValueFeatureTestLanguage/impl/MultiValueFeatureTestLanguageFactoryImpl.java @@ -76,6 +76,7 @@ public class MultiValueFeatureTestLanguageFactoryImpl extends EFactoryImpl imple * * @generated */ + @Override public Start createStart() { StartImpl start = new StartImpl(); @@ -87,6 +88,7 @@ public class MultiValueFeatureTestLanguageFactoryImpl extends EFactoryImpl imple * * @generated */ + @Override public MultiValueFeatureTestLanguagePackage getMultiValueFeatureTestLanguagePackage() { return (MultiValueFeatureTestLanguagePackage)getEPackage(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/multiValueFeatureTestLanguage/impl/MultiValueFeatureTestLanguagePackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/multiValueFeatureTestLanguage/impl/MultiValueFeatureTestLanguagePackageImpl.java index eceb1395c..215a78024 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/multiValueFeatureTestLanguage/impl/MultiValueFeatureTestLanguagePackageImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/multiValueFeatureTestLanguage/impl/MultiValueFeatureTestLanguagePackageImpl.java @@ -58,7 +58,7 @@ public class MultiValueFeatureTestLanguagePackageImpl extends EPackageImpl imple /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link MultiValueFeatureTestLanguagePackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -73,7 +73,8 @@ public class MultiValueFeatureTestLanguagePackageImpl extends EPackageImpl imple if (isInited) return (MultiValueFeatureTestLanguagePackage)EPackage.Registry.INSTANCE.getEPackage(MultiValueFeatureTestLanguagePackage.eNS_URI); // Obtain or create and register package - MultiValueFeatureTestLanguagePackageImpl theMultiValueFeatureTestLanguagePackage = (MultiValueFeatureTestLanguagePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof MultiValueFeatureTestLanguagePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new MultiValueFeatureTestLanguagePackageImpl()); + Object registeredMultiValueFeatureTestLanguagePackage = EPackage.Registry.INSTANCE.get(eNS_URI); + MultiValueFeatureTestLanguagePackageImpl theMultiValueFeatureTestLanguagePackage = registeredMultiValueFeatureTestLanguagePackage instanceof MultiValueFeatureTestLanguagePackageImpl ? (MultiValueFeatureTestLanguagePackageImpl)registeredMultiValueFeatureTestLanguagePackage : new MultiValueFeatureTestLanguagePackageImpl(); isInited = true; @@ -89,7 +90,6 @@ public class MultiValueFeatureTestLanguagePackageImpl extends EPackageImpl imple // Mark meta-data to indicate it can't be changed theMultiValueFeatureTestLanguagePackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(MultiValueFeatureTestLanguagePackage.eNS_URI, theMultiValueFeatureTestLanguagePackage); return theMultiValueFeatureTestLanguagePackage; @@ -100,6 +100,7 @@ public class MultiValueFeatureTestLanguagePackageImpl extends EPackageImpl imple * * @generated */ + @Override public EClass getStart() { return startEClass; @@ -110,6 +111,7 @@ public class MultiValueFeatureTestLanguagePackageImpl extends EPackageImpl imple * * @generated */ + @Override public EAttribute getStart_FeatureA() { return (EAttribute)startEClass.getEStructuralFeatures().get(0); @@ -120,6 +122,7 @@ public class MultiValueFeatureTestLanguagePackageImpl extends EPackageImpl imple * * @generated */ + @Override public MultiValueFeatureTestLanguageFactory getMultiValueFeatureTestLanguageFactory() { return (MultiValueFeatureTestLanguageFactory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/multiValueFeatureTestLanguage/impl/StartImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/multiValueFeatureTestLanguage/impl/StartImpl.java index e75757c74..8a79cce22 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/multiValueFeatureTestLanguage/impl/StartImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/multiValueFeatureTestLanguage/impl/StartImpl.java @@ -67,6 +67,7 @@ public class StartImpl extends MinimalEObjectImpl.Container implements Start * * @generated */ + @Override public EList getFeatureA() { if (featureA == null) @@ -154,7 +155,7 @@ public class StartImpl extends MinimalEObjectImpl.Container implements Start { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (featureA: "); result.append(featureA); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/unassignedRuleCallTestLanguage/Model.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/unassignedRuleCallTestLanguage/Model.java index 80904361c..d2ac93e69 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/unassignedRuleCallTestLanguage/Model.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/unassignedRuleCallTestLanguage/Model.java @@ -26,10 +26,6 @@ public interface Model extends EObject /** * Returns the value of the 'Model Features' containment reference. * - *

- * If the meaning of the 'Model Features' containment reference isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Model Features' containment reference. * @see #setModelFeatures(ModelFeatures) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/unassignedRuleCallTestLanguage/ModelFeatures.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/unassignedRuleCallTestLanguage/ModelFeatures.java index 21e87652f..993f1e8a3 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/unassignedRuleCallTestLanguage/ModelFeatures.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/unassignedRuleCallTestLanguage/ModelFeatures.java @@ -26,10 +26,6 @@ public interface ModelFeatures 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) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/unassignedRuleCallTestLanguage/impl/ModelFeaturesImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/unassignedRuleCallTestLanguage/impl/ModelFeaturesImpl.java index d450ca168..f7b1e8dc9 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/unassignedRuleCallTestLanguage/impl/ModelFeaturesImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/unassignedRuleCallTestLanguage/impl/ModelFeaturesImpl.java @@ -74,6 +74,7 @@ public class ModelFeaturesImpl extends MinimalEObjectImpl.Container implements M * * @generated */ + @Override public String getName() { return name; @@ -84,6 +85,7 @@ public class ModelFeaturesImpl extends MinimalEObjectImpl.Container implements M * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -168,7 +170,7 @@ public class ModelFeaturesImpl extends MinimalEObjectImpl.Container implements M { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/unassignedRuleCallTestLanguage/impl/ModelImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/unassignedRuleCallTestLanguage/impl/ModelImpl.java index d72b0eb94..9934ffce6 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/unassignedRuleCallTestLanguage/impl/ModelImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/unassignedRuleCallTestLanguage/impl/ModelImpl.java @@ -67,6 +67,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public ModelFeatures getModelFeatures() { return modelFeatures; @@ -94,6 +95,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * * @generated */ + @Override public void setModelFeatures(ModelFeatures newModelFeatures) { if (newModelFeatures != modelFeatures) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/unassignedRuleCallTestLanguage/impl/UnassignedRuleCallTestLanguageFactoryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/unassignedRuleCallTestLanguage/impl/UnassignedRuleCallTestLanguageFactoryImpl.java index 8c92f04e0..ca4b15fa5 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/unassignedRuleCallTestLanguage/impl/UnassignedRuleCallTestLanguageFactoryImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/unassignedRuleCallTestLanguage/impl/UnassignedRuleCallTestLanguageFactoryImpl.java @@ -77,6 +77,7 @@ public class UnassignedRuleCallTestLanguageFactoryImpl extends EFactoryImpl impl * * @generated */ + @Override public Model createModel() { ModelImpl model = new ModelImpl(); @@ -88,6 +89,7 @@ public class UnassignedRuleCallTestLanguageFactoryImpl extends EFactoryImpl impl * * @generated */ + @Override public ModelFeatures createModelFeatures() { ModelFeaturesImpl modelFeatures = new ModelFeaturesImpl(); @@ -99,6 +101,7 @@ public class UnassignedRuleCallTestLanguageFactoryImpl extends EFactoryImpl impl * * @generated */ + @Override public UnassignedRuleCallTestLanguagePackage getUnassignedRuleCallTestLanguagePackage() { return (UnassignedRuleCallTestLanguagePackage)getEPackage(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/unassignedRuleCallTestLanguage/impl/UnassignedRuleCallTestLanguagePackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/unassignedRuleCallTestLanguage/impl/UnassignedRuleCallTestLanguagePackageImpl.java index 1c65e32a8..32ecfbbdd 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/unassignedRuleCallTestLanguage/impl/UnassignedRuleCallTestLanguagePackageImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtext/ecoreInference/unassignedRuleCallTestLanguage/impl/UnassignedRuleCallTestLanguagePackageImpl.java @@ -67,7 +67,7 @@ public class UnassignedRuleCallTestLanguagePackageImpl extends EPackageImpl impl /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link UnassignedRuleCallTestLanguagePackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -82,7 +82,8 @@ public class UnassignedRuleCallTestLanguagePackageImpl extends EPackageImpl impl if (isInited) return (UnassignedRuleCallTestLanguagePackage)EPackage.Registry.INSTANCE.getEPackage(UnassignedRuleCallTestLanguagePackage.eNS_URI); // Obtain or create and register package - UnassignedRuleCallTestLanguagePackageImpl theUnassignedRuleCallTestLanguagePackage = (UnassignedRuleCallTestLanguagePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof UnassignedRuleCallTestLanguagePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new UnassignedRuleCallTestLanguagePackageImpl()); + Object registeredUnassignedRuleCallTestLanguagePackage = EPackage.Registry.INSTANCE.get(eNS_URI); + UnassignedRuleCallTestLanguagePackageImpl theUnassignedRuleCallTestLanguagePackage = registeredUnassignedRuleCallTestLanguagePackage instanceof UnassignedRuleCallTestLanguagePackageImpl ? (UnassignedRuleCallTestLanguagePackageImpl)registeredUnassignedRuleCallTestLanguagePackage : new UnassignedRuleCallTestLanguagePackageImpl(); isInited = true; @@ -98,7 +99,6 @@ public class UnassignedRuleCallTestLanguagePackageImpl extends EPackageImpl impl // Mark meta-data to indicate it can't be changed theUnassignedRuleCallTestLanguagePackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(UnassignedRuleCallTestLanguagePackage.eNS_URI, theUnassignedRuleCallTestLanguagePackage); return theUnassignedRuleCallTestLanguagePackage; @@ -109,6 +109,7 @@ public class UnassignedRuleCallTestLanguagePackageImpl extends EPackageImpl impl * * @generated */ + @Override public EClass getModel() { return modelEClass; @@ -119,6 +120,7 @@ public class UnassignedRuleCallTestLanguagePackageImpl extends EPackageImpl impl * * @generated */ + @Override public EReference getModel_ModelFeatures() { return (EReference)modelEClass.getEStructuralFeatures().get(0); @@ -129,6 +131,7 @@ public class UnassignedRuleCallTestLanguagePackageImpl extends EPackageImpl impl * * @generated */ + @Override public EClass getModelFeatures() { return modelFeaturesEClass; @@ -139,6 +142,7 @@ public class UnassignedRuleCallTestLanguagePackageImpl extends EPackageImpl impl * * @generated */ + @Override public EAttribute getModelFeatures_Name() { return (EAttribute)modelFeaturesEClass.getEStructuralFeatures().get(0); @@ -149,6 +153,7 @@ public class UnassignedRuleCallTestLanguagePackageImpl extends EPackageImpl impl * * @generated */ + @Override public UnassignedRuleCallTestLanguageFactory getUnassignedRuleCallTestLanguageFactory() { return (UnassignedRuleCallTestLanguageFactory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/AbstractElement.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/AbstractElement.java index 13a193075..8a45f54ed 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/AbstractElement.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/AbstractElement.java @@ -28,10 +28,6 @@ public interface AbstractElement extends EObject /** * Returns the value of the 'Cardinality' attribute. * - *

- * If the meaning of the 'Cardinality' attribute isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Cardinality' attribute. * @see #setCardinality(String) @@ -54,10 +50,6 @@ public interface AbstractElement extends EObject /** * Returns the value of the 'Predicated' attribute. * - *

- * If the meaning of the 'Predicated' attribute isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Predicated' attribute. * @see #setPredicated(boolean) @@ -80,10 +72,6 @@ public interface AbstractElement extends EObject /** * Returns the value of the 'First Set Predicated' attribute. * - *

- * If the meaning of the 'First Set Predicated' attribute isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'First Set Predicated' attribute. * @see #setFirstSetPredicated(boolean) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/AbstractMetamodelDeclaration.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/AbstractMetamodelDeclaration.java index 597c4b933..51cecdcf0 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/AbstractMetamodelDeclaration.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/AbstractMetamodelDeclaration.java @@ -28,10 +28,6 @@ public interface AbstractMetamodelDeclaration extends EObject /** * Returns the value of the 'EPackage' reference. * - *

- * If the meaning of the 'EPackage' reference isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'EPackage' reference. * @see #setEPackage(EPackage) @@ -54,10 +50,6 @@ public interface AbstractMetamodelDeclaration extends EObject /** * Returns the value of the 'Alias' attribute. * - *

- * If the meaning of the 'Alias' attribute isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Alias' attribute. * @see #setAlias(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/AbstractNegatedToken.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/AbstractNegatedToken.java index 7cfe6651d..27662efb1 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/AbstractNegatedToken.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/AbstractNegatedToken.java @@ -25,10 +25,6 @@ public interface AbstractNegatedToken extends AbstractElement /** * Returns the value of the 'Terminal' containment reference. * - *

- * If the meaning of the 'Terminal' containment reference isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Terminal' containment reference. * @see #setTerminal(AbstractElement) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/AbstractRule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/AbstractRule.java index da102f2f7..0379897d7 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/AbstractRule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/AbstractRule.java @@ -28,10 +28,6 @@ public interface AbstractRule extends EObject /** * Returns the value of the 'Type' containment reference. * - *

- * If the meaning of the 'Type' containment reference isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Type' containment reference. * @see #setType(TypeRef) @@ -54,10 +50,6 @@ public interface AbstractRule extends EObject /** * Returns the value of the 'Alternatives' containment reference. * - *

- * If the meaning of the 'Alternatives' containment reference isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Alternatives' containment reference. * @see #setAlternatives(AbstractElement) @@ -80,10 +72,6 @@ public interface AbstractRule 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) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/Action.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/Action.java index a849e0654..1850715cb 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/Action.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/Action.java @@ -27,10 +27,6 @@ public interface Action extends AbstractElement /** * Returns the value of the 'Type' containment reference. * - *

- * If the meaning of the 'Type' containment reference isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Type' containment reference. * @see #setType(TypeRef) @@ -53,10 +49,6 @@ public interface Action extends AbstractElement /** * Returns the value of the 'Feature' attribute. * - *

- * If the meaning of the 'Feature' attribute isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Feature' attribute. * @see #setFeature(String) @@ -79,10 +71,6 @@ public interface Action extends AbstractElement /** * Returns the value of the 'Operator' attribute. * - *

- * If the meaning of the 'Operator' attribute isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Operator' attribute. * @see #setOperator(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/Alternatives.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/Alternatives.java index 31c0b0e3a..5a969cd3b 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/Alternatives.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/Alternatives.java @@ -27,10 +27,6 @@ public interface Alternatives extends AbstractElement * Returns the value of the 'Elements' containment reference list. * The list contents are of type {@link org.eclipse.xtext.xtextTest.AbstractElement}. * - *

- * If the meaning of the 'Elements' containment reference list isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Elements' containment reference list. * @see org.eclipse.xtext.xtextTest.XtextTestPackage#getAlternatives_Elements() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/Assignment.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/Assignment.java index efac00393..8911658f1 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/Assignment.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/Assignment.java @@ -27,10 +27,6 @@ public interface Assignment extends AbstractElement /** * Returns the value of the 'Feature' attribute. * - *

- * If the meaning of the 'Feature' attribute isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Feature' attribute. * @see #setFeature(String) @@ -53,10 +49,6 @@ public interface Assignment extends AbstractElement /** * Returns the value of the 'Operator' attribute. * - *

- * If the meaning of the 'Operator' attribute isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Operator' attribute. * @see #setOperator(String) @@ -79,10 +71,6 @@ public interface Assignment extends AbstractElement /** * Returns the value of the 'Terminal' containment reference. * - *

- * If the meaning of the 'Terminal' containment reference isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Terminal' containment reference. * @see #setTerminal(AbstractElement) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/CharacterRange.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/CharacterRange.java index d6b414599..7fe2cd180 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/CharacterRange.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/CharacterRange.java @@ -26,10 +26,6 @@ public interface CharacterRange extends AbstractElement /** * Returns the value of the 'Left' containment reference. * - *

- * If the meaning of the 'Left' containment reference isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Left' containment reference. * @see #setLeft(Keyword) @@ -52,10 +48,6 @@ public interface CharacterRange extends AbstractElement /** * Returns the value of the 'Right' containment reference. * - *

- * If the meaning of the 'Right' containment reference isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Right' containment reference. * @see #setRight(Keyword) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/ConditionalBranch.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/ConditionalBranch.java index 12b62a1e6..9cc158d6a 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/ConditionalBranch.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/ConditionalBranch.java @@ -27,10 +27,6 @@ public interface ConditionalBranch extends AbstractElement /** * Returns the value of the 'Filtered' attribute. * - *

- * If the meaning of the 'Filtered' attribute isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Filtered' attribute. * @see #setFiltered(boolean) @@ -53,10 +49,6 @@ public interface ConditionalBranch extends AbstractElement /** * Returns the value of the 'Parameter' reference. * - *

- * If the meaning of the 'Parameter' reference isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Parameter' reference. * @see #setParameter(Parameter) @@ -79,10 +71,6 @@ public interface ConditionalBranch extends AbstractElement /** * Returns the value of the 'Guarded Element' containment reference. * - *

- * If the meaning of the 'Guarded Element' containment reference isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Guarded Element' containment reference. * @see #setGuardedElement(AbstractElement) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/CrossReference.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/CrossReference.java index e2bbb798d..ffe098a5a 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/CrossReference.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/CrossReference.java @@ -26,10 +26,6 @@ public interface CrossReference extends AbstractElement /** * Returns the value of the 'Type' containment reference. * - *

- * If the meaning of the 'Type' containment reference isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Type' containment reference. * @see #setType(TypeRef) @@ -52,10 +48,6 @@ public interface CrossReference extends AbstractElement /** * Returns the value of the 'Terminal' containment reference. * - *

- * If the meaning of the 'Terminal' containment reference isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Terminal' containment reference. * @see #setTerminal(AbstractElement) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/EnumLiteralDeclaration.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/EnumLiteralDeclaration.java index d947ac3ab..8955a0a58 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/EnumLiteralDeclaration.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/EnumLiteralDeclaration.java @@ -27,10 +27,6 @@ public interface EnumLiteralDeclaration extends AbstractElement /** * Returns the value of the 'Enum Literal' reference. * - *

- * If the meaning of the 'Enum Literal' reference isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Enum Literal' reference. * @see #setEnumLiteral(EEnumLiteral) @@ -53,10 +49,6 @@ public interface EnumLiteralDeclaration extends AbstractElement /** * Returns the value of the 'Literal' containment reference. * - *

- * If the meaning of the 'Literal' containment reference isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Literal' containment reference. * @see #setLiteral(Keyword) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/GeneratedMetamodel.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/GeneratedMetamodel.java index 83711f7e9..344f848d2 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/GeneratedMetamodel.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/GeneratedMetamodel.java @@ -25,10 +25,6 @@ public interface GeneratedMetamodel extends AbstractMetamodelDeclaration /** * 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) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/Grammar.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/Grammar.java index 237e15057..821f2cbd4 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/Grammar.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/Grammar.java @@ -33,10 +33,6 @@ public interface Grammar 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) @@ -60,10 +56,6 @@ public interface Grammar extends EObject * Returns the value of the 'Used Grammars' reference list. * The list contents are of type {@link org.eclipse.xtext.xtextTest.Grammar}. * - *

- * If the meaning of the 'Used Grammars' reference list isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Used Grammars' reference list. * @see org.eclipse.xtext.xtextTest.XtextTestPackage#getGrammar_UsedGrammars() @@ -75,10 +67,6 @@ public interface Grammar extends EObject /** * Returns the value of the 'Defines Hidden Tokens' attribute. * - *

- * If the meaning of the 'Defines Hidden Tokens' attribute isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Defines Hidden Tokens' attribute. * @see #setDefinesHiddenTokens(boolean) @@ -102,10 +90,6 @@ public interface Grammar extends EObject * Returns the value of the 'Hidden Tokens' reference list. * The list contents are of type {@link org.eclipse.xtext.xtextTest.AbstractRule}. * - *

- * If the meaning of the 'Hidden Tokens' reference list isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Hidden Tokens' reference list. * @see org.eclipse.xtext.xtextTest.XtextTestPackage#getGrammar_HiddenTokens() @@ -118,10 +102,6 @@ public interface Grammar extends EObject * Returns the value of the 'Metamodel Declarations' containment reference list. * The list contents are of type {@link org.eclipse.xtext.xtextTest.AbstractMetamodelDeclaration}. * - *

- * If the meaning of the 'Metamodel Declarations' containment reference list isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Metamodel Declarations' containment reference list. * @see org.eclipse.xtext.xtextTest.XtextTestPackage#getGrammar_MetamodelDeclarations() @@ -134,10 +114,6 @@ public interface Grammar extends EObject * Returns the value of the 'Rules' containment reference list. * The list contents are of type {@link org.eclipse.xtext.xtextTest.AbstractRule}. * - *

- * If the meaning of the 'Rules' containment reference list isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Rules' containment reference list. * @see org.eclipse.xtext.xtextTest.XtextTestPackage#getGrammar_Rules() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/Group.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/Group.java index b98afc276..0c87222b7 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/Group.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/Group.java @@ -27,10 +27,6 @@ public interface Group extends AbstractElement * Returns the value of the 'Elements' containment reference list. * The list contents are of type {@link org.eclipse.xtext.xtextTest.AbstractElement}. * - *

- * If the meaning of the 'Elements' containment reference list isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Elements' containment reference list. * @see org.eclipse.xtext.xtextTest.XtextTestPackage#getGroup_Elements() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/Keyword.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/Keyword.java index b99f5e93f..0002bfca8 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/Keyword.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/Keyword.java @@ -25,10 +25,6 @@ public interface Keyword extends AbstractElement /** * Returns the value of the 'Value' attribute. * - *

- * If the meaning of the 'Value' attribute isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Value' attribute. * @see #setValue(String) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/NamedArgument.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/NamedArgument.java index b67f7a386..9862032e5 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/NamedArgument.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/NamedArgument.java @@ -28,10 +28,6 @@ public interface NamedArgument extends EObject /** * Returns the value of the 'Literal Value' attribute. * - *

- * If the meaning of the 'Literal Value' attribute isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Literal Value' attribute. * @see #setLiteralValue(boolean) @@ -54,10 +50,6 @@ public interface NamedArgument extends EObject /** * Returns the value of the 'Parameter' reference. * - *

- * If the meaning of the 'Parameter' reference isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Parameter' reference. * @see #setParameter(Parameter) @@ -80,10 +72,6 @@ public interface NamedArgument extends EObject /** * Returns the value of the 'Value' reference. * - *

- * If the meaning of the 'Value' reference isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Value' reference. * @see #setValue(Parameter) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/Parameter.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/Parameter.java index 397a7f0bd..fe93cb3b4 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/Parameter.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/Parameter.java @@ -26,10 +26,6 @@ public interface Parameter 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) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/ParserRule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/ParserRule.java index 20e13f34f..d9a8c6141 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/ParserRule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/ParserRule.java @@ -30,10 +30,6 @@ public interface ParserRule extends AbstractRule /** * Returns the value of the 'Fragment' attribute. * - *

- * If the meaning of the 'Fragment' attribute isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Fragment' attribute. * @see #setFragment(boolean) @@ -56,10 +52,6 @@ public interface ParserRule extends AbstractRule /** * Returns the value of the 'Wildcard' attribute. * - *

- * If the meaning of the 'Wildcard' attribute isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Wildcard' attribute. * @see #setWildcard(boolean) @@ -82,10 +74,6 @@ public interface ParserRule extends AbstractRule /** * Returns the value of the 'Defines Hidden Tokens' attribute. * - *

- * If the meaning of the 'Defines Hidden Tokens' attribute isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Defines Hidden Tokens' attribute. * @see #setDefinesHiddenTokens(boolean) @@ -109,10 +97,6 @@ public interface ParserRule extends AbstractRule * Returns the value of the 'Hidden Tokens' reference list. * The list contents are of type {@link org.eclipse.xtext.xtextTest.AbstractRule}. * - *

- * If the meaning of the 'Hidden Tokens' reference list isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Hidden Tokens' reference list. * @see org.eclipse.xtext.xtextTest.XtextTestPackage#getParserRule_HiddenTokens() @@ -125,10 +109,6 @@ public interface ParserRule extends AbstractRule * Returns the value of the 'Parameters' containment reference list. * The list contents are of type {@link org.eclipse.xtext.xtextTest.Parameter}. * - *

- * If the meaning of the 'Parameters' containment reference list isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Parameters' containment reference list. * @see org.eclipse.xtext.xtextTest.XtextTestPackage#getParserRule_Parameters() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/RuleCall.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/RuleCall.java index afc4acd2f..41f43534b 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/RuleCall.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/RuleCall.java @@ -27,10 +27,6 @@ public interface RuleCall extends AbstractElement /** * Returns the value of the 'Rule' reference. * - *

- * If the meaning of the 'Rule' reference isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Rule' reference. * @see #setRule(AbstractRule) @@ -54,10 +50,6 @@ public interface RuleCall extends AbstractElement * Returns the value of the 'Arguments' containment reference list. * The list contents are of type {@link org.eclipse.xtext.xtextTest.NamedArgument}. * - *

- * If the meaning of the 'Arguments' containment reference list isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Arguments' containment reference list. * @see org.eclipse.xtext.xtextTest.XtextTestPackage#getRuleCall_Arguments() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/TerminalRule.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/TerminalRule.java index c868cccab..58326be88 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/TerminalRule.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/TerminalRule.java @@ -25,10 +25,6 @@ public interface TerminalRule extends AbstractRule /** * Returns the value of the 'Fragment' attribute. * - *

- * If the meaning of the 'Fragment' attribute isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Fragment' attribute. * @see #setFragment(boolean) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/TypeRef.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/TypeRef.java index d1a9ceacd..6b953e550 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/TypeRef.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/TypeRef.java @@ -28,10 +28,6 @@ public interface TypeRef extends EObject /** * Returns the value of the 'Metamodel' reference. * - *

- * If the meaning of the 'Metamodel' reference isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Metamodel' reference. * @see #setMetamodel(AbstractMetamodelDeclaration) @@ -54,10 +50,6 @@ public interface TypeRef extends EObject /** * Returns the value of the 'Classifier' reference. * - *

- * If the meaning of the 'Classifier' reference isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Classifier' reference. * @see #setClassifier(EClassifier) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/UnorderedGroup.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/UnorderedGroup.java index 24c6c3534..55c8e5be5 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/UnorderedGroup.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/UnorderedGroup.java @@ -27,10 +27,6 @@ public interface UnorderedGroup extends AbstractElement * Returns the value of the 'Elements' containment reference list. * The list contents are of type {@link org.eclipse.xtext.xtextTest.AbstractElement}. * - *

- * If the meaning of the 'Elements' containment reference list isn't clear, - * there really should be more of a description here... - *

* * @return the value of the 'Elements' containment reference list. * @see org.eclipse.xtext.xtextTest.XtextTestPackage#getUnorderedGroup_Elements() diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/impl/AbstractElementImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/impl/AbstractElementImpl.java index 0c8e575b7..cbf5089ed 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/impl/AbstractElementImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/impl/AbstractElementImpl.java @@ -116,6 +116,7 @@ public class AbstractElementImpl extends MinimalEObjectImpl.Container implements * * @generated */ + @Override public String getCardinality() { return cardinality; @@ -126,6 +127,7 @@ public class AbstractElementImpl extends MinimalEObjectImpl.Container implements * * @generated */ + @Override public void setCardinality(String newCardinality) { String oldCardinality = cardinality; @@ -139,6 +141,7 @@ public class AbstractElementImpl extends MinimalEObjectImpl.Container implements * * @generated */ + @Override public boolean isPredicated() { return predicated; @@ -149,6 +152,7 @@ public class AbstractElementImpl extends MinimalEObjectImpl.Container implements * * @generated */ + @Override public void setPredicated(boolean newPredicated) { boolean oldPredicated = predicated; @@ -162,6 +166,7 @@ public class AbstractElementImpl extends MinimalEObjectImpl.Container implements * * @generated */ + @Override public boolean isFirstSetPredicated() { return firstSetPredicated; @@ -172,6 +177,7 @@ public class AbstractElementImpl extends MinimalEObjectImpl.Container implements * * @generated */ + @Override public void setFirstSetPredicated(boolean newFirstSetPredicated) { boolean oldFirstSetPredicated = firstSetPredicated; @@ -276,7 +282,7 @@ public class AbstractElementImpl extends MinimalEObjectImpl.Container implements { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (cardinality: "); result.append(cardinality); result.append(", predicated: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/impl/AbstractMetamodelDeclarationImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/impl/AbstractMetamodelDeclarationImpl.java index 19a78cd69..2dbb7ccaf 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/impl/AbstractMetamodelDeclarationImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/impl/AbstractMetamodelDeclarationImpl.java @@ -87,6 +87,7 @@ public class AbstractMetamodelDeclarationImpl extends MinimalEObjectImpl.Contain * * @generated */ + @Override public EPackage getEPackage() { if (ePackage != null && ePackage.eIsProxy()) @@ -117,6 +118,7 @@ public class AbstractMetamodelDeclarationImpl extends MinimalEObjectImpl.Contain * * @generated */ + @Override public void setEPackage(EPackage newEPackage) { EPackage oldEPackage = ePackage; @@ -130,6 +132,7 @@ public class AbstractMetamodelDeclarationImpl extends MinimalEObjectImpl.Contain * * @generated */ + @Override public String getAlias() { return alias; @@ -140,6 +143,7 @@ public class AbstractMetamodelDeclarationImpl extends MinimalEObjectImpl.Contain * * @generated */ + @Override public void setAlias(String newAlias) { String oldAlias = alias; @@ -235,7 +239,7 @@ public class AbstractMetamodelDeclarationImpl extends MinimalEObjectImpl.Contain { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (alias: "); result.append(alias); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/impl/AbstractNegatedTokenImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/impl/AbstractNegatedTokenImpl.java index d6416baea..6fe110ad8 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/impl/AbstractNegatedTokenImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/impl/AbstractNegatedTokenImpl.java @@ -66,6 +66,7 @@ public class AbstractNegatedTokenImpl extends AbstractElementImpl implements Abs * * @generated */ + @Override public AbstractElement getTerminal() { return terminal; @@ -93,6 +94,7 @@ public class AbstractNegatedTokenImpl extends AbstractElementImpl implements Abs * * @generated */ + @Override public void setTerminal(AbstractElement newTerminal) { if (newTerminal != terminal) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/impl/AbstractRuleImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/impl/AbstractRuleImpl.java index 02af21d0f..7e6c6da62 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/impl/AbstractRuleImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/impl/AbstractRuleImpl.java @@ -100,6 +100,7 @@ public class AbstractRuleImpl extends MinimalEObjectImpl.Container implements Ab * * @generated */ + @Override public TypeRef getType() { return type; @@ -127,6 +128,7 @@ public class AbstractRuleImpl extends MinimalEObjectImpl.Container implements Ab * * @generated */ + @Override public void setType(TypeRef newType) { if (newType != type) @@ -148,6 +150,7 @@ public class AbstractRuleImpl extends MinimalEObjectImpl.Container implements Ab * * @generated */ + @Override public AbstractElement getAlternatives() { return alternatives; @@ -175,6 +178,7 @@ public class AbstractRuleImpl extends MinimalEObjectImpl.Container implements Ab * * @generated */ + @Override public void setAlternatives(AbstractElement newAlternatives) { if (newAlternatives != alternatives) @@ -196,6 +200,7 @@ public class AbstractRuleImpl extends MinimalEObjectImpl.Container implements Ab * * @generated */ + @Override public String getName() { return name; @@ -206,6 +211,7 @@ public class AbstractRuleImpl extends MinimalEObjectImpl.Container implements Ab * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -328,7 +334,7 @@ public class AbstractRuleImpl extends MinimalEObjectImpl.Container implements Ab { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/impl/ActionImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/impl/ActionImpl.java index da1f656a0..766408a85 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/impl/ActionImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/impl/ActionImpl.java @@ -108,6 +108,7 @@ public class ActionImpl extends AbstractElementImpl implements Action * * @generated */ + @Override public TypeRef getType() { return type; @@ -135,6 +136,7 @@ public class ActionImpl extends AbstractElementImpl implements Action * * @generated */ + @Override public void setType(TypeRef newType) { if (newType != type) @@ -156,6 +158,7 @@ public class ActionImpl extends AbstractElementImpl implements Action * * @generated */ + @Override public String getFeature() { return feature; @@ -166,6 +169,7 @@ public class ActionImpl extends AbstractElementImpl implements Action * * @generated */ + @Override public void setFeature(String newFeature) { String oldFeature = feature; @@ -179,6 +183,7 @@ public class ActionImpl extends AbstractElementImpl implements Action * * @generated */ + @Override public String getOperator() { return operator; @@ -189,6 +194,7 @@ public class ActionImpl extends AbstractElementImpl implements Action * * @generated */ + @Override public void setOperator(String newOperator) { String oldOperator = operator; @@ -309,7 +315,7 @@ public class ActionImpl extends AbstractElementImpl implements Action { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (feature: "); result.append(feature); result.append(", operator: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/impl/AlternativesImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/impl/AlternativesImpl.java index 76c5cc49a..6f57d58da 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/impl/AlternativesImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/impl/AlternativesImpl.java @@ -70,6 +70,7 @@ public class AlternativesImpl extends AbstractElementImpl implements Alternative * * @generated */ + @Override public EList getElements() { if (elements == null) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/impl/AssignmentImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/impl/AssignmentImpl.java index 80804af03..7b6ae7096 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/impl/AssignmentImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/impl/AssignmentImpl.java @@ -108,6 +108,7 @@ public class AssignmentImpl extends AbstractElementImpl implements Assignment * * @generated */ + @Override public String getFeature() { return feature; @@ -118,6 +119,7 @@ public class AssignmentImpl extends AbstractElementImpl implements Assignment * * @generated */ + @Override public void setFeature(String newFeature) { String oldFeature = feature; @@ -131,6 +133,7 @@ public class AssignmentImpl extends AbstractElementImpl implements Assignment * * @generated */ + @Override public String getOperator() { return operator; @@ -141,6 +144,7 @@ public class AssignmentImpl extends AbstractElementImpl implements Assignment * * @generated */ + @Override public void setOperator(String newOperator) { String oldOperator = operator; @@ -154,6 +158,7 @@ public class AssignmentImpl extends AbstractElementImpl implements Assignment * * @generated */ + @Override public AbstractElement getTerminal() { return terminal; @@ -181,6 +186,7 @@ public class AssignmentImpl extends AbstractElementImpl implements Assignment * * @generated */ + @Override public void setTerminal(AbstractElement newTerminal) { if (newTerminal != terminal) @@ -309,7 +315,7 @@ public class AssignmentImpl extends AbstractElementImpl implements Assignment { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (feature: "); result.append(feature); result.append(", operator: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/impl/CharacterRangeImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/impl/CharacterRangeImpl.java index d4bf05f42..5656165b7 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/impl/CharacterRangeImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/impl/CharacterRangeImpl.java @@ -77,6 +77,7 @@ public class CharacterRangeImpl extends AbstractElementImpl implements Character * * @generated */ + @Override public Keyword getLeft() { return left; @@ -104,6 +105,7 @@ public class CharacterRangeImpl extends AbstractElementImpl implements Character * * @generated */ + @Override public void setLeft(Keyword newLeft) { if (newLeft != left) @@ -125,6 +127,7 @@ public class CharacterRangeImpl extends AbstractElementImpl implements Character * * @generated */ + @Override public Keyword getRight() { return right; @@ -152,6 +155,7 @@ public class CharacterRangeImpl extends AbstractElementImpl implements Character * * @generated */ + @Override public void setRight(Keyword newRight) { if (newRight != right) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/impl/ConditionalBranchImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/impl/ConditionalBranchImpl.java index 4fcd43e7a..610ea1349 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/impl/ConditionalBranchImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/impl/ConditionalBranchImpl.java @@ -99,6 +99,7 @@ public class ConditionalBranchImpl extends AbstractElementImpl implements Condit * * @generated */ + @Override public boolean isFiltered() { return filtered; @@ -109,6 +110,7 @@ public class ConditionalBranchImpl extends AbstractElementImpl implements Condit * * @generated */ + @Override public void setFiltered(boolean newFiltered) { boolean oldFiltered = filtered; @@ -122,6 +124,7 @@ public class ConditionalBranchImpl extends AbstractElementImpl implements Condit * * @generated */ + @Override public Parameter getParameter() { if (parameter != null && parameter.eIsProxy()) @@ -152,6 +155,7 @@ public class ConditionalBranchImpl extends AbstractElementImpl implements Condit * * @generated */ + @Override public void setParameter(Parameter newParameter) { Parameter oldParameter = parameter; @@ -165,6 +169,7 @@ public class ConditionalBranchImpl extends AbstractElementImpl implements Condit * * @generated */ + @Override public AbstractElement getGuardedElement() { return guardedElement; @@ -192,6 +197,7 @@ public class ConditionalBranchImpl extends AbstractElementImpl implements Condit * * @generated */ + @Override public void setGuardedElement(AbstractElement newGuardedElement) { if (newGuardedElement != guardedElement) @@ -321,7 +327,7 @@ public class ConditionalBranchImpl extends AbstractElementImpl implements Condit { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (filtered: "); result.append(filtered); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/impl/CrossReferenceImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/impl/CrossReferenceImpl.java index f7c228d46..fd9ed1724 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/impl/CrossReferenceImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/impl/CrossReferenceImpl.java @@ -78,6 +78,7 @@ public class CrossReferenceImpl extends AbstractElementImpl implements CrossRefe * * @generated */ + @Override public TypeRef getType() { return type; @@ -105,6 +106,7 @@ public class CrossReferenceImpl extends AbstractElementImpl implements CrossRefe * * @generated */ + @Override public void setType(TypeRef newType) { if (newType != type) @@ -126,6 +128,7 @@ public class CrossReferenceImpl extends AbstractElementImpl implements CrossRefe * * @generated */ + @Override public AbstractElement getTerminal() { return terminal; @@ -153,6 +156,7 @@ public class CrossReferenceImpl extends AbstractElementImpl implements CrossRefe * * @generated */ + @Override public void setTerminal(AbstractElement newTerminal) { if (newTerminal != terminal) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/impl/EnumLiteralDeclarationImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/impl/EnumLiteralDeclarationImpl.java index 05d1362e9..d97d174b7 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/impl/EnumLiteralDeclarationImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/impl/EnumLiteralDeclarationImpl.java @@ -78,6 +78,7 @@ public class EnumLiteralDeclarationImpl extends AbstractElementImpl implements E * * @generated */ + @Override public EEnumLiteral getEnumLiteral() { if (enumLiteral != null && enumLiteral.eIsProxy()) @@ -108,6 +109,7 @@ public class EnumLiteralDeclarationImpl extends AbstractElementImpl implements E * * @generated */ + @Override public void setEnumLiteral(EEnumLiteral newEnumLiteral) { EEnumLiteral oldEnumLiteral = enumLiteral; @@ -121,6 +123,7 @@ public class EnumLiteralDeclarationImpl extends AbstractElementImpl implements E * * @generated */ + @Override public Keyword getLiteral() { return literal; @@ -148,6 +151,7 @@ public class EnumLiteralDeclarationImpl extends AbstractElementImpl implements E * * @generated */ + @Override public void setLiteral(Keyword newLiteral) { if (newLiteral != literal) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/impl/GeneratedMetamodelImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/impl/GeneratedMetamodelImpl.java index a23dc2888..2eb5c8f65 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/impl/GeneratedMetamodelImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/impl/GeneratedMetamodelImpl.java @@ -73,6 +73,7 @@ public class GeneratedMetamodelImpl extends AbstractMetamodelDeclarationImpl imp * * @generated */ + @Override public String getName() { return name; @@ -83,6 +84,7 @@ public class GeneratedMetamodelImpl extends AbstractMetamodelDeclarationImpl imp * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -167,7 +169,7 @@ public class GeneratedMetamodelImpl extends AbstractMetamodelDeclarationImpl imp { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/impl/GrammarImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/impl/GrammarImpl.java index fea6f63fc..184a9490e 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/impl/GrammarImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/impl/GrammarImpl.java @@ -151,6 +151,7 @@ public class GrammarImpl extends MinimalEObjectImpl.Container implements Grammar * * @generated */ + @Override public String getName() { return name; @@ -161,6 +162,7 @@ public class GrammarImpl extends MinimalEObjectImpl.Container implements Grammar * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -174,6 +176,7 @@ public class GrammarImpl extends MinimalEObjectImpl.Container implements Grammar * * @generated */ + @Override public EList getUsedGrammars() { if (usedGrammars == null) @@ -188,6 +191,7 @@ public class GrammarImpl extends MinimalEObjectImpl.Container implements Grammar * * @generated */ + @Override public boolean isDefinesHiddenTokens() { return definesHiddenTokens; @@ -198,6 +202,7 @@ public class GrammarImpl extends MinimalEObjectImpl.Container implements Grammar * * @generated */ + @Override public void setDefinesHiddenTokens(boolean newDefinesHiddenTokens) { boolean oldDefinesHiddenTokens = definesHiddenTokens; @@ -211,6 +216,7 @@ public class GrammarImpl extends MinimalEObjectImpl.Container implements Grammar * * @generated */ + @Override public EList getHiddenTokens() { if (hiddenTokens == null) @@ -225,6 +231,7 @@ public class GrammarImpl extends MinimalEObjectImpl.Container implements Grammar * * @generated */ + @Override public EList getMetamodelDeclarations() { if (metamodelDeclarations == null) @@ -239,6 +246,7 @@ public class GrammarImpl extends MinimalEObjectImpl.Container implements Grammar * * @generated */ + @Override public EList getRules() { if (rules == null) @@ -397,7 +405,7 @@ public class GrammarImpl extends MinimalEObjectImpl.Container implements Grammar { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(", definesHiddenTokens: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/impl/GroupImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/impl/GroupImpl.java index c042f9836..df25e6b24 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/impl/GroupImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/impl/GroupImpl.java @@ -70,6 +70,7 @@ public class GroupImpl extends AbstractElementImpl implements Group * * @generated */ + @Override public EList getElements() { if (elements == null) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/impl/KeywordImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/impl/KeywordImpl.java index 2f7540413..2978ab6fc 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/impl/KeywordImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/impl/KeywordImpl.java @@ -73,6 +73,7 @@ public class KeywordImpl extends AbstractElementImpl implements Keyword * * @generated */ + @Override public String getValue() { return value; @@ -83,6 +84,7 @@ public class KeywordImpl extends AbstractElementImpl implements Keyword * * @generated */ + @Override public void setValue(String newValue) { String oldValue = value; @@ -167,7 +169,7 @@ public class KeywordImpl extends AbstractElementImpl implements Keyword { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (value: "); result.append(value); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/impl/NamedArgumentImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/impl/NamedArgumentImpl.java index 383a2d2e3..8411dd3ce 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/impl/NamedArgumentImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/impl/NamedArgumentImpl.java @@ -98,6 +98,7 @@ public class NamedArgumentImpl extends MinimalEObjectImpl.Container implements N * * @generated */ + @Override public boolean isLiteralValue() { return literalValue; @@ -108,6 +109,7 @@ public class NamedArgumentImpl extends MinimalEObjectImpl.Container implements N * * @generated */ + @Override public void setLiteralValue(boolean newLiteralValue) { boolean oldLiteralValue = literalValue; @@ -121,6 +123,7 @@ public class NamedArgumentImpl extends MinimalEObjectImpl.Container implements N * * @generated */ + @Override public Parameter getParameter() { if (parameter != null && parameter.eIsProxy()) @@ -151,6 +154,7 @@ public class NamedArgumentImpl extends MinimalEObjectImpl.Container implements N * * @generated */ + @Override public void setParameter(Parameter newParameter) { Parameter oldParameter = parameter; @@ -164,6 +168,7 @@ public class NamedArgumentImpl extends MinimalEObjectImpl.Container implements N * * @generated */ + @Override public Parameter getValue() { if (value != null && value.eIsProxy()) @@ -194,6 +199,7 @@ public class NamedArgumentImpl extends MinimalEObjectImpl.Container implements N * * @generated */ + @Override public void setValue(Parameter newValue) { Parameter oldValue = value; @@ -300,7 +306,7 @@ public class NamedArgumentImpl extends MinimalEObjectImpl.Container implements N { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (literalValue: "); result.append(literalValue); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/impl/ParameterImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/impl/ParameterImpl.java index 3385bb45d..f4825428c 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/impl/ParameterImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/impl/ParameterImpl.java @@ -74,6 +74,7 @@ public class ParameterImpl extends MinimalEObjectImpl.Container implements Param * * @generated */ + @Override public String getName() { return name; @@ -84,6 +85,7 @@ public class ParameterImpl extends MinimalEObjectImpl.Container implements Param * * @generated */ + @Override public void setName(String newName) { String oldName = name; @@ -168,7 +170,7 @@ public class ParameterImpl extends MinimalEObjectImpl.Container implements Param { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/impl/ParserRuleImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/impl/ParserRuleImpl.java index 0e05254e3..3c7c078f4 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/impl/ParserRuleImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/impl/ParserRuleImpl.java @@ -149,6 +149,7 @@ public class ParserRuleImpl extends AbstractRuleImpl implements ParserRule * * @generated */ + @Override public boolean isFragment() { return fragment; @@ -159,6 +160,7 @@ public class ParserRuleImpl extends AbstractRuleImpl implements ParserRule * * @generated */ + @Override public void setFragment(boolean newFragment) { boolean oldFragment = fragment; @@ -172,6 +174,7 @@ public class ParserRuleImpl extends AbstractRuleImpl implements ParserRule * * @generated */ + @Override public boolean isWildcard() { return wildcard; @@ -182,6 +185,7 @@ public class ParserRuleImpl extends AbstractRuleImpl implements ParserRule * * @generated */ + @Override public void setWildcard(boolean newWildcard) { boolean oldWildcard = wildcard; @@ -195,6 +199,7 @@ public class ParserRuleImpl extends AbstractRuleImpl implements ParserRule * * @generated */ + @Override public boolean isDefinesHiddenTokens() { return definesHiddenTokens; @@ -205,6 +210,7 @@ public class ParserRuleImpl extends AbstractRuleImpl implements ParserRule * * @generated */ + @Override public void setDefinesHiddenTokens(boolean newDefinesHiddenTokens) { boolean oldDefinesHiddenTokens = definesHiddenTokens; @@ -218,6 +224,7 @@ public class ParserRuleImpl extends AbstractRuleImpl implements ParserRule * * @generated */ + @Override public EList getHiddenTokens() { if (hiddenTokens == null) @@ -232,6 +239,7 @@ public class ParserRuleImpl extends AbstractRuleImpl implements ParserRule * * @generated */ + @Override public EList getParameters() { if (parameters == null) @@ -376,7 +384,7 @@ public class ParserRuleImpl extends AbstractRuleImpl implements ParserRule { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (fragment: "); result.append(fragment); result.append(", wildcard: "); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/impl/RuleCallImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/impl/RuleCallImpl.java index a435bf246..07453670b 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/impl/RuleCallImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/impl/RuleCallImpl.java @@ -85,6 +85,7 @@ public class RuleCallImpl extends AbstractElementImpl implements RuleCall * * @generated */ + @Override public AbstractRule getRule() { if (rule != null && rule.eIsProxy()) @@ -115,6 +116,7 @@ public class RuleCallImpl extends AbstractElementImpl implements RuleCall * * @generated */ + @Override public void setRule(AbstractRule newRule) { AbstractRule oldRule = rule; @@ -128,6 +130,7 @@ public class RuleCallImpl extends AbstractElementImpl implements RuleCall * * @generated */ + @Override public EList getArguments() { if (arguments == null) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/impl/TerminalRuleImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/impl/TerminalRuleImpl.java index 0ee386f95..90d45f664 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/impl/TerminalRuleImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/impl/TerminalRuleImpl.java @@ -73,6 +73,7 @@ public class TerminalRuleImpl extends AbstractRuleImpl implements TerminalRule * * @generated */ + @Override public boolean isFragment() { return fragment; @@ -83,6 +84,7 @@ public class TerminalRuleImpl extends AbstractRuleImpl implements TerminalRule * * @generated */ + @Override public void setFragment(boolean newFragment) { boolean oldFragment = fragment; @@ -167,7 +169,7 @@ public class TerminalRuleImpl extends AbstractRuleImpl implements TerminalRule { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (fragment: "); result.append(fragment); result.append(')'); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/impl/TypeRefImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/impl/TypeRefImpl.java index 29345b0b3..6bb7688d4 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/impl/TypeRefImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/impl/TypeRefImpl.java @@ -78,6 +78,7 @@ public class TypeRefImpl extends MinimalEObjectImpl.Container implements TypeRef * * @generated */ + @Override public AbstractMetamodelDeclaration getMetamodel() { if (metamodel != null && metamodel.eIsProxy()) @@ -108,6 +109,7 @@ public class TypeRefImpl extends MinimalEObjectImpl.Container implements TypeRef * * @generated */ + @Override public void setMetamodel(AbstractMetamodelDeclaration newMetamodel) { AbstractMetamodelDeclaration oldMetamodel = metamodel; @@ -121,6 +123,7 @@ public class TypeRefImpl extends MinimalEObjectImpl.Container implements TypeRef * * @generated */ + @Override public EClassifier getClassifier() { if (classifier != null && classifier.eIsProxy()) @@ -151,6 +154,7 @@ public class TypeRefImpl extends MinimalEObjectImpl.Container implements TypeRef * * @generated */ + @Override public void setClassifier(EClassifier newClassifier) { EClassifier oldClassifier = classifier; diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/impl/UnorderedGroupImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/impl/UnorderedGroupImpl.java index 76827827f..83bf18ec0 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/impl/UnorderedGroupImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/impl/UnorderedGroupImpl.java @@ -70,6 +70,7 @@ public class UnorderedGroupImpl extends AbstractElementImpl implements Unordered * * @generated */ + @Override public EList getElements() { if (elements == null) diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/impl/XtextTestFactoryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/impl/XtextTestFactoryImpl.java index ff01302c0..0e3fc3868 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/impl/XtextTestFactoryImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/impl/XtextTestFactoryImpl.java @@ -103,6 +103,7 @@ public class XtextTestFactoryImpl extends EFactoryImpl implements XtextTestFacto * * @generated */ + @Override public Grammar createGrammar() { GrammarImpl grammar = new GrammarImpl(); @@ -114,6 +115,7 @@ public class XtextTestFactoryImpl extends EFactoryImpl implements XtextTestFacto * * @generated */ + @Override public AbstractRule createAbstractRule() { AbstractRuleImpl abstractRule = new AbstractRuleImpl(); @@ -125,6 +127,7 @@ public class XtextTestFactoryImpl extends EFactoryImpl implements XtextTestFacto * * @generated */ + @Override public AbstractMetamodelDeclaration createAbstractMetamodelDeclaration() { AbstractMetamodelDeclarationImpl abstractMetamodelDeclaration = new AbstractMetamodelDeclarationImpl(); @@ -136,6 +139,7 @@ public class XtextTestFactoryImpl extends EFactoryImpl implements XtextTestFacto * * @generated */ + @Override public GeneratedMetamodel createGeneratedMetamodel() { GeneratedMetamodelImpl generatedMetamodel = new GeneratedMetamodelImpl(); @@ -147,6 +151,7 @@ public class XtextTestFactoryImpl extends EFactoryImpl implements XtextTestFacto * * @generated */ + @Override public ReferencedMetamodel createReferencedMetamodel() { ReferencedMetamodelImpl referencedMetamodel = new ReferencedMetamodelImpl(); @@ -158,6 +163,7 @@ public class XtextTestFactoryImpl extends EFactoryImpl implements XtextTestFacto * * @generated */ + @Override public ParserRule createParserRule() { ParserRuleImpl parserRule = new ParserRuleImpl(); @@ -169,6 +175,7 @@ public class XtextTestFactoryImpl extends EFactoryImpl implements XtextTestFacto * * @generated */ + @Override public Parameter createParameter() { ParameterImpl parameter = new ParameterImpl(); @@ -180,6 +187,7 @@ public class XtextTestFactoryImpl extends EFactoryImpl implements XtextTestFacto * * @generated */ + @Override public TypeRef createTypeRef() { TypeRefImpl typeRef = new TypeRefImpl(); @@ -191,6 +199,7 @@ public class XtextTestFactoryImpl extends EFactoryImpl implements XtextTestFacto * * @generated */ + @Override public AbstractElement createAbstractElement() { AbstractElementImpl abstractElement = new AbstractElementImpl(); @@ -202,6 +211,7 @@ public class XtextTestFactoryImpl extends EFactoryImpl implements XtextTestFacto * * @generated */ + @Override public Action createAction() { ActionImpl action = new ActionImpl(); @@ -213,6 +223,7 @@ public class XtextTestFactoryImpl extends EFactoryImpl implements XtextTestFacto * * @generated */ + @Override public Keyword createKeyword() { KeywordImpl keyword = new KeywordImpl(); @@ -224,6 +235,7 @@ public class XtextTestFactoryImpl extends EFactoryImpl implements XtextTestFacto * * @generated */ + @Override public RuleCall createRuleCall() { RuleCallImpl ruleCall = new RuleCallImpl(); @@ -235,6 +247,7 @@ public class XtextTestFactoryImpl extends EFactoryImpl implements XtextTestFacto * * @generated */ + @Override public NamedArgument createNamedArgument() { NamedArgumentImpl namedArgument = new NamedArgumentImpl(); @@ -246,6 +259,7 @@ public class XtextTestFactoryImpl extends EFactoryImpl implements XtextTestFacto * * @generated */ + @Override public Assignment createAssignment() { AssignmentImpl assignment = new AssignmentImpl(); @@ -257,6 +271,7 @@ public class XtextTestFactoryImpl extends EFactoryImpl implements XtextTestFacto * * @generated */ + @Override public CrossReference createCrossReference() { CrossReferenceImpl crossReference = new CrossReferenceImpl(); @@ -268,6 +283,7 @@ public class XtextTestFactoryImpl extends EFactoryImpl implements XtextTestFacto * * @generated */ + @Override public Group createGroup() { GroupImpl group = new GroupImpl(); @@ -279,6 +295,7 @@ public class XtextTestFactoryImpl extends EFactoryImpl implements XtextTestFacto * * @generated */ + @Override public TerminalRule createTerminalRule() { TerminalRuleImpl terminalRule = new TerminalRuleImpl(); @@ -290,6 +307,7 @@ public class XtextTestFactoryImpl extends EFactoryImpl implements XtextTestFacto * * @generated */ + @Override public AbstractNegatedToken createAbstractNegatedToken() { AbstractNegatedTokenImpl abstractNegatedToken = new AbstractNegatedTokenImpl(); @@ -301,6 +319,7 @@ public class XtextTestFactoryImpl extends EFactoryImpl implements XtextTestFacto * * @generated */ + @Override public NegatedToken createNegatedToken() { NegatedTokenImpl negatedToken = new NegatedTokenImpl(); @@ -312,6 +331,7 @@ public class XtextTestFactoryImpl extends EFactoryImpl implements XtextTestFacto * * @generated */ + @Override public UntilToken createUntilToken() { UntilTokenImpl untilToken = new UntilTokenImpl(); @@ -323,6 +343,7 @@ public class XtextTestFactoryImpl extends EFactoryImpl implements XtextTestFacto * * @generated */ + @Override public Wildcard createWildcard() { WildcardImpl wildcard = new WildcardImpl(); @@ -334,6 +355,7 @@ public class XtextTestFactoryImpl extends EFactoryImpl implements XtextTestFacto * * @generated */ + @Override public EOF createEOF() { EOFImpl eof = new EOFImpl(); @@ -345,6 +367,7 @@ public class XtextTestFactoryImpl extends EFactoryImpl implements XtextTestFacto * * @generated */ + @Override public EnumRule createEnumRule() { EnumRuleImpl enumRule = new EnumRuleImpl(); @@ -356,6 +379,7 @@ public class XtextTestFactoryImpl extends EFactoryImpl implements XtextTestFacto * * @generated */ + @Override public EnumLiteralDeclaration createEnumLiteralDeclaration() { EnumLiteralDeclarationImpl enumLiteralDeclaration = new EnumLiteralDeclarationImpl(); @@ -367,6 +391,7 @@ public class XtextTestFactoryImpl extends EFactoryImpl implements XtextTestFacto * * @generated */ + @Override public Alternatives createAlternatives() { AlternativesImpl alternatives = new AlternativesImpl(); @@ -378,6 +403,7 @@ public class XtextTestFactoryImpl extends EFactoryImpl implements XtextTestFacto * * @generated */ + @Override public ConditionalBranch createConditionalBranch() { ConditionalBranchImpl conditionalBranch = new ConditionalBranchImpl(); @@ -389,6 +415,7 @@ public class XtextTestFactoryImpl extends EFactoryImpl implements XtextTestFacto * * @generated */ + @Override public UnorderedGroup createUnorderedGroup() { UnorderedGroupImpl unorderedGroup = new UnorderedGroupImpl(); @@ -400,6 +427,7 @@ public class XtextTestFactoryImpl extends EFactoryImpl implements XtextTestFacto * * @generated */ + @Override public CharacterRange createCharacterRange() { CharacterRangeImpl characterRange = new CharacterRangeImpl(); @@ -411,6 +439,7 @@ public class XtextTestFactoryImpl extends EFactoryImpl implements XtextTestFacto * * @generated */ + @Override public XtextTestPackage getXtextTestPackage() { return (XtextTestPackage)getEPackage(); diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/impl/XtextTestPackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/impl/XtextTestPackageImpl.java index 21d4efae6..1130330cc 100644 --- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/impl/XtextTestPackageImpl.java +++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/xtextTest/impl/XtextTestPackageImpl.java @@ -274,7 +274,7 @@ public class XtextTestPackageImpl extends EPackageImpl implements XtextTestPacka /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link XtextTestPackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -289,7 +289,8 @@ public class XtextTestPackageImpl extends EPackageImpl implements XtextTestPacka if (isInited) return (XtextTestPackage)EPackage.Registry.INSTANCE.getEPackage(XtextTestPackage.eNS_URI); // Obtain or create and register package - XtextTestPackageImpl theXtextTestPackage = (XtextTestPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof XtextTestPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new XtextTestPackageImpl()); + Object registeredXtextTestPackage = EPackage.Registry.INSTANCE.get(eNS_URI); + XtextTestPackageImpl theXtextTestPackage = registeredXtextTestPackage instanceof XtextTestPackageImpl ? (XtextTestPackageImpl)registeredXtextTestPackage : new XtextTestPackageImpl(); isInited = true; @@ -305,7 +306,6 @@ public class XtextTestPackageImpl extends EPackageImpl implements XtextTestPacka // Mark meta-data to indicate it can't be changed theXtextTestPackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(XtextTestPackage.eNS_URI, theXtextTestPackage); return theXtextTestPackage; @@ -316,6 +316,7 @@ public class XtextTestPackageImpl extends EPackageImpl implements XtextTestPacka * * @generated */ + @Override public EClass getGrammar() { return grammarEClass; @@ -326,6 +327,7 @@ public class XtextTestPackageImpl extends EPackageImpl implements XtextTestPacka * * @generated */ + @Override public EAttribute getGrammar_Name() { return (EAttribute)grammarEClass.getEStructuralFeatures().get(0); @@ -336,6 +338,7 @@ public class XtextTestPackageImpl extends EPackageImpl implements XtextTestPacka * * @generated */ + @Override public EReference getGrammar_UsedGrammars() { return (EReference)grammarEClass.getEStructuralFeatures().get(1); @@ -346,6 +349,7 @@ public class XtextTestPackageImpl extends EPackageImpl implements XtextTestPacka * * @generated */ + @Override public EAttribute getGrammar_DefinesHiddenTokens() { return (EAttribute)grammarEClass.getEStructuralFeatures().get(2); @@ -356,6 +360,7 @@ public class XtextTestPackageImpl extends EPackageImpl implements XtextTestPacka * * @generated */ + @Override public EReference getGrammar_HiddenTokens() { return (EReference)grammarEClass.getEStructuralFeatures().get(3); @@ -366,6 +371,7 @@ public class XtextTestPackageImpl extends EPackageImpl implements XtextTestPacka * * @generated */ + @Override public EReference getGrammar_MetamodelDeclarations() { return (EReference)grammarEClass.getEStructuralFeatures().get(4); @@ -376,6 +382,7 @@ public class XtextTestPackageImpl extends EPackageImpl implements XtextTestPacka * * @generated */ + @Override public EReference getGrammar_Rules() { return (EReference)grammarEClass.getEStructuralFeatures().get(5); @@ -386,6 +393,7 @@ public class XtextTestPackageImpl extends EPackageImpl implements XtextTestPacka * * @generated */ + @Override public EClass getAbstractRule() { return abstractRuleEClass; @@ -396,6 +404,7 @@ public class XtextTestPackageImpl extends EPackageImpl implements XtextTestPacka * * @generated */ + @Override public EReference getAbstractRule_Type() { return (EReference)abstractRuleEClass.getEStructuralFeatures().get(0); @@ -406,6 +415,7 @@ public class XtextTestPackageImpl extends EPackageImpl implements XtextTestPacka * * @generated */ + @Override public EReference getAbstractRule_Alternatives() { return (EReference)abstractRuleEClass.getEStructuralFeatures().get(1); @@ -416,6 +426,7 @@ public class XtextTestPackageImpl extends EPackageImpl implements XtextTestPacka * * @generated */ + @Override public EAttribute getAbstractRule_Name() { return (EAttribute)abstractRuleEClass.getEStructuralFeatures().get(2); @@ -426,6 +437,7 @@ public class XtextTestPackageImpl extends EPackageImpl implements XtextTestPacka * * @generated */ + @Override public EClass getAbstractMetamodelDeclaration() { return abstractMetamodelDeclarationEClass; @@ -436,6 +448,7 @@ public class XtextTestPackageImpl extends EPackageImpl implements XtextTestPacka * * @generated */ + @Override public EReference getAbstractMetamodelDeclaration_EPackage() { return (EReference)abstractMetamodelDeclarationEClass.getEStructuralFeatures().get(0); @@ -446,6 +459,7 @@ public class XtextTestPackageImpl extends EPackageImpl implements XtextTestPacka * * @generated */ + @Override public EAttribute getAbstractMetamodelDeclaration_Alias() { return (EAttribute)abstractMetamodelDeclarationEClass.getEStructuralFeatures().get(1); @@ -456,6 +470,7 @@ public class XtextTestPackageImpl extends EPackageImpl implements XtextTestPacka * * @generated */ + @Override public EClass getGeneratedMetamodel() { return generatedMetamodelEClass; @@ -466,6 +481,7 @@ public class XtextTestPackageImpl extends EPackageImpl implements XtextTestPacka * * @generated */ + @Override public EAttribute getGeneratedMetamodel_Name() { return (EAttribute)generatedMetamodelEClass.getEStructuralFeatures().get(0); @@ -476,6 +492,7 @@ public class XtextTestPackageImpl extends EPackageImpl implements XtextTestPacka * * @generated */ + @Override public EClass getReferencedMetamodel() { return referencedMetamodelEClass; @@ -486,6 +503,7 @@ public class XtextTestPackageImpl extends EPackageImpl implements XtextTestPacka * * @generated */ + @Override public EClass getParserRule() { return parserRuleEClass; @@ -496,6 +514,7 @@ public class XtextTestPackageImpl extends EPackageImpl implements XtextTestPacka * * @generated */ + @Override public EAttribute getParserRule_Fragment() { return (EAttribute)parserRuleEClass.getEStructuralFeatures().get(0); @@ -506,6 +525,7 @@ public class XtextTestPackageImpl extends EPackageImpl implements XtextTestPacka * * @generated */ + @Override public EAttribute getParserRule_Wildcard() { return (EAttribute)parserRuleEClass.getEStructuralFeatures().get(1); @@ -516,6 +536,7 @@ public class XtextTestPackageImpl extends EPackageImpl implements XtextTestPacka * * @generated */ + @Override public EAttribute getParserRule_DefinesHiddenTokens() { return (EAttribute)parserRuleEClass.getEStructuralFeatures().get(2); @@ -526,6 +547,7 @@ public class XtextTestPackageImpl extends EPackageImpl implements XtextTestPacka * * @generated */ + @Override public EReference getParserRule_HiddenTokens() { return (EReference)parserRuleEClass.getEStructuralFeatures().get(3); @@ -536,6 +558,7 @@ public class XtextTestPackageImpl extends EPackageImpl implements XtextTestPacka * * @generated */ + @Override public EReference getParserRule_Parameters() { return (EReference)parserRuleEClass.getEStructuralFeatures().get(4); @@ -546,6 +569,7 @@ public class XtextTestPackageImpl extends EPackageImpl implements XtextTestPacka * * @generated */ + @Override public EClass getParameter() { return parameterEClass; @@ -556,6 +580,7 @@ public class XtextTestPackageImpl extends EPackageImpl implements XtextTestPacka * * @generated */ + @Override public EAttribute getParameter_Name() { return (EAttribute)parameterEClass.getEStructuralFeatures().get(0); @@ -566,6 +591,7 @@ public class XtextTestPackageImpl extends EPackageImpl implements XtextTestPacka * * @generated */ + @Override public EClass getTypeRef() { return typeRefEClass; @@ -576,6 +602,7 @@ public class XtextTestPackageImpl extends EPackageImpl implements XtextTestPacka * * @generated */ + @Override public EReference getTypeRef_Metamodel() { return (EReference)typeRefEClass.getEStructuralFeatures().get(0); @@ -586,6 +613,7 @@ public class XtextTestPackageImpl extends EPackageImpl implements XtextTestPacka * * @generated */ + @Override public EReference getTypeRef_Classifier() { return (EReference)typeRefEClass.getEStructuralFeatures().get(1); @@ -596,6 +624,7 @@ public class XtextTestPackageImpl extends EPackageImpl implements XtextTestPacka * * @generated */ + @Override public EClass getAbstractElement() { return abstractElementEClass; @@ -606,6 +635,7 @@ public class XtextTestPackageImpl extends EPackageImpl implements XtextTestPacka * * @generated */ + @Override public EAttribute getAbstractElement_Cardinality() { return (EAttribute)abstractElementEClass.getEStructuralFeatures().get(0); @@ -616,6 +646,7 @@ public class XtextTestPackageImpl extends EPackageImpl implements XtextTestPacka * * @generated */ + @Override public EAttribute getAbstractElement_Predicated() { return (EAttribute)abstractElementEClass.getEStructuralFeatures().get(1); @@ -626,6 +657,7 @@ public class XtextTestPackageImpl extends EPackageImpl implements XtextTestPacka * * @generated */ + @Override public EAttribute getAbstractElement_FirstSetPredicated() { return (EAttribute)abstractElementEClass.getEStructuralFeatures().get(2); @@ -636,6 +668,7 @@ public class XtextTestPackageImpl extends EPackageImpl implements XtextTestPacka * * @generated */ + @Override public EClass getAction() { return actionEClass; @@ -646,6 +679,7 @@ public class XtextTestPackageImpl extends EPackageImpl implements XtextTestPacka * * @generated */ + @Override public EReference getAction_Type() { return (EReference)actionEClass.getEStructuralFeatures().get(0); @@ -656,6 +690,7 @@ public class XtextTestPackageImpl extends EPackageImpl implements XtextTestPacka * * @generated */ + @Override public EAttribute getAction_Feature() { return (EAttribute)actionEClass.getEStructuralFeatures().get(1); @@ -666,6 +701,7 @@ public class XtextTestPackageImpl extends EPackageImpl implements XtextTestPacka * * @generated */ + @Override public EAttribute getAction_Operator() { return (EAttribute)actionEClass.getEStructuralFeatures().get(2); @@ -676,6 +712,7 @@ public class XtextTestPackageImpl extends EPackageImpl implements XtextTestPacka * * @generated */ + @Override public EClass getKeyword() { return keywordEClass; @@ -686,6 +723,7 @@ public class XtextTestPackageImpl extends EPackageImpl implements XtextTestPacka * * @generated */ + @Override public EAttribute getKeyword_Value() { return (EAttribute)keywordEClass.getEStructuralFeatures().get(0); @@ -696,6 +734,7 @@ public class XtextTestPackageImpl extends EPackageImpl implements XtextTestPacka * * @generated */ + @Override public EClass getRuleCall() { return ruleCallEClass; @@ -706,6 +745,7 @@ public class XtextTestPackageImpl extends EPackageImpl implements XtextTestPacka * * @generated */ + @Override public EReference getRuleCall_Rule() { return (EReference)ruleCallEClass.getEStructuralFeatures().get(0); @@ -716,6 +756,7 @@ public class XtextTestPackageImpl extends EPackageImpl implements XtextTestPacka * * @generated */ + @Override public EReference getRuleCall_Arguments() { return (EReference)ruleCallEClass.getEStructuralFeatures().get(1); @@ -726,6 +767,7 @@ public class XtextTestPackageImpl extends EPackageImpl implements XtextTestPacka * * @generated */ + @Override public EClass getNamedArgument() { return namedArgumentEClass; @@ -736,6 +778,7 @@ public class XtextTestPackageImpl extends EPackageImpl implements XtextTestPacka * * @generated */ + @Override public EAttribute getNamedArgument_LiteralValue() { return (EAttribute)namedArgumentEClass.getEStructuralFeatures().get(0); @@ -746,6 +789,7 @@ public class XtextTestPackageImpl extends EPackageImpl implements XtextTestPacka * * @generated */ + @Override public EReference getNamedArgument_Parameter() { return (EReference)namedArgumentEClass.getEStructuralFeatures().get(1); @@ -756,6 +800,7 @@ public class XtextTestPackageImpl extends EPackageImpl implements XtextTestPacka * * @generated */ + @Override public EReference getNamedArgument_Value() { return (EReference)namedArgumentEClass.getEStructuralFeatures().get(2); @@ -766,6 +811,7 @@ public class XtextTestPackageImpl extends EPackageImpl implements XtextTestPacka * * @generated */ + @Override public EClass getAssignment() { return assignmentEClass; @@ -776,6 +822,7 @@ public class XtextTestPackageImpl extends EPackageImpl implements XtextTestPacka * * @generated */ + @Override public EAttribute getAssignment_Feature() { return (EAttribute)assignmentEClass.getEStructuralFeatures().get(0); @@ -786,6 +833,7 @@ public class XtextTestPackageImpl extends EPackageImpl implements XtextTestPacka * * @generated */ + @Override public EAttribute getAssignment_Operator() { return (EAttribute)assignmentEClass.getEStructuralFeatures().get(1); @@ -796,6 +844,7 @@ public class XtextTestPackageImpl extends EPackageImpl implements XtextTestPacka * * @generated */ + @Override public EReference getAssignment_Terminal() { return (EReference)assignmentEClass.getEStructuralFeatures().get(2); @@ -806,6 +855,7 @@ public class XtextTestPackageImpl extends EPackageImpl implements XtextTestPacka * * @generated */ + @Override public EClass getCrossReference() { return crossReferenceEClass; @@ -816,6 +866,7 @@ public class XtextTestPackageImpl extends EPackageImpl implements XtextTestPacka * * @generated */ + @Override public EReference getCrossReference_Type() { return (EReference)crossReferenceEClass.getEStructuralFeatures().get(0); @@ -826,6 +877,7 @@ public class XtextTestPackageImpl extends EPackageImpl implements XtextTestPacka * * @generated */ + @Override public EReference getCrossReference_Terminal() { return (EReference)crossReferenceEClass.getEStructuralFeatures().get(1); @@ -836,6 +888,7 @@ public class XtextTestPackageImpl extends EPackageImpl implements XtextTestPacka * * @generated */ + @Override public EClass getGroup() { return groupEClass; @@ -846,6 +899,7 @@ public class XtextTestPackageImpl extends EPackageImpl implements XtextTestPacka * * @generated */ + @Override public EReference getGroup_Elements() { return (EReference)groupEClass.getEStructuralFeatures().get(0); @@ -856,6 +910,7 @@ public class XtextTestPackageImpl extends EPackageImpl implements XtextTestPacka * * @generated */ + @Override public EClass getTerminalRule() { return terminalRuleEClass; @@ -866,6 +921,7 @@ public class XtextTestPackageImpl extends EPackageImpl implements XtextTestPacka * * @generated */ + @Override public EAttribute getTerminalRule_Fragment() { return (EAttribute)terminalRuleEClass.getEStructuralFeatures().get(0); @@ -876,6 +932,7 @@ public class XtextTestPackageImpl extends EPackageImpl implements XtextTestPacka * * @generated */ + @Override public EClass getAbstractNegatedToken() { return abstractNegatedTokenEClass; @@ -886,6 +943,7 @@ public class XtextTestPackageImpl extends EPackageImpl implements XtextTestPacka * * @generated */ + @Override public EReference getAbstractNegatedToken_Terminal() { return (EReference)abstractNegatedTokenEClass.getEStructuralFeatures().get(0); @@ -896,6 +954,7 @@ public class XtextTestPackageImpl extends EPackageImpl implements XtextTestPacka * * @generated */ + @Override public EClass getNegatedToken() { return negatedTokenEClass; @@ -906,6 +965,7 @@ public class XtextTestPackageImpl extends EPackageImpl implements XtextTestPacka * * @generated */ + @Override public EClass getUntilToken() { return untilTokenEClass; @@ -916,6 +976,7 @@ public class XtextTestPackageImpl extends EPackageImpl implements XtextTestPacka * * @generated */ + @Override public EClass getWildcard() { return wildcardEClass; @@ -926,6 +987,7 @@ public class XtextTestPackageImpl extends EPackageImpl implements XtextTestPacka * * @generated */ + @Override public EClass getEOF() { return eofEClass; @@ -936,6 +998,7 @@ public class XtextTestPackageImpl extends EPackageImpl implements XtextTestPacka * * @generated */ + @Override public EClass getEnumRule() { return enumRuleEClass; @@ -946,6 +1009,7 @@ public class XtextTestPackageImpl extends EPackageImpl implements XtextTestPacka * * @generated */ + @Override public EClass getEnumLiteralDeclaration() { return enumLiteralDeclarationEClass; @@ -956,6 +1020,7 @@ public class XtextTestPackageImpl extends EPackageImpl implements XtextTestPacka * * @generated */ + @Override public EReference getEnumLiteralDeclaration_EnumLiteral() { return (EReference)enumLiteralDeclarationEClass.getEStructuralFeatures().get(0); @@ -966,6 +1031,7 @@ public class XtextTestPackageImpl extends EPackageImpl implements XtextTestPacka * * @generated */ + @Override public EReference getEnumLiteralDeclaration_Literal() { return (EReference)enumLiteralDeclarationEClass.getEStructuralFeatures().get(1); @@ -976,6 +1042,7 @@ public class XtextTestPackageImpl extends EPackageImpl implements XtextTestPacka * * @generated */ + @Override public EClass getAlternatives() { return alternativesEClass; @@ -986,6 +1053,7 @@ public class XtextTestPackageImpl extends EPackageImpl implements XtextTestPacka * * @generated */ + @Override public EReference getAlternatives_Elements() { return (EReference)alternativesEClass.getEStructuralFeatures().get(0); @@ -996,6 +1064,7 @@ public class XtextTestPackageImpl extends EPackageImpl implements XtextTestPacka * * @generated */ + @Override public EClass getConditionalBranch() { return conditionalBranchEClass; @@ -1006,6 +1075,7 @@ public class XtextTestPackageImpl extends EPackageImpl implements XtextTestPacka * * @generated */ + @Override public EAttribute getConditionalBranch_Filtered() { return (EAttribute)conditionalBranchEClass.getEStructuralFeatures().get(0); @@ -1016,6 +1086,7 @@ public class XtextTestPackageImpl extends EPackageImpl implements XtextTestPacka * * @generated */ + @Override public EReference getConditionalBranch_Parameter() { return (EReference)conditionalBranchEClass.getEStructuralFeatures().get(1); @@ -1026,6 +1097,7 @@ public class XtextTestPackageImpl extends EPackageImpl implements XtextTestPacka * * @generated */ + @Override public EReference getConditionalBranch_GuardedElement() { return (EReference)conditionalBranchEClass.getEStructuralFeatures().get(2); @@ -1036,6 +1108,7 @@ public class XtextTestPackageImpl extends EPackageImpl implements XtextTestPacka * * @generated */ + @Override public EClass getUnorderedGroup() { return unorderedGroupEClass; @@ -1046,6 +1119,7 @@ public class XtextTestPackageImpl extends EPackageImpl implements XtextTestPacka * * @generated */ + @Override public EReference getUnorderedGroup_Elements() { return (EReference)unorderedGroupEClass.getEStructuralFeatures().get(0); @@ -1056,6 +1130,7 @@ public class XtextTestPackageImpl extends EPackageImpl implements XtextTestPacka * * @generated */ + @Override public EClass getCharacterRange() { return characterRangeEClass; @@ -1066,6 +1141,7 @@ public class XtextTestPackageImpl extends EPackageImpl implements XtextTestPacka * * @generated */ + @Override public EReference getCharacterRange_Left() { return (EReference)characterRangeEClass.getEStructuralFeatures().get(0); @@ -1076,6 +1152,7 @@ public class XtextTestPackageImpl extends EPackageImpl implements XtextTestPacka * * @generated */ + @Override public EReference getCharacterRange_Right() { return (EReference)characterRangeEClass.getEStructuralFeatures().get(1); @@ -1086,6 +1163,7 @@ public class XtextTestPackageImpl extends EPackageImpl implements XtextTestPacka * * @generated */ + @Override public XtextTestFactory getXtextTestFactory() { return (XtextTestFactory)getEFactoryInstance(); diff --git a/org.eclipse.xtext.xtext.generator/src-gen/org/eclipse/xtext/xtext/generator/parser/antlr/splitting/SimpleExpressions.genmodel b/org.eclipse.xtext.xtext.generator/src-gen/org/eclipse/xtext/xtext/generator/parser/antlr/splitting/SimpleExpressions.genmodel index 08c323578..aaece2de1 100644 --- a/org.eclipse.xtext.xtext.generator/src-gen/org/eclipse/xtext/xtext/generator/parser/antlr/splitting/SimpleExpressions.genmodel +++ b/org.eclipse.xtext.xtext.generator/src-gen/org/eclipse/xtext/xtext/generator/parser/antlr/splitting/SimpleExpressions.genmodel @@ -4,7 +4,7 @@ editorDirectory="/org.eclipse.xtext.xtext.generator.editor/src" modelPluginID="org.eclipse.xtext.xtext.generator" forceOverwrite="true" modelName="SimpleExpressions" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" complianceLevel="8.0" copyrightFields="false" editPluginID="org.eclipse.xtext.xtext.generator.edit" - editorPluginID="org.eclipse.xtext.xtext.generator.editor" runtimeVersion="2.9"> + editorPluginID="org.eclipse.xtext.xtext.generator.editor" runtimeVersion="2.20">