[eclipse/xtext#1282] Update to EMF 2.20: regenerated languages

Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>

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">
   <genPackages prefix="IndentationAwareUiTestLanguage" basePackage="org.eclipse.xtext.ide.tests.testlanguage"
       disposableProviderFactory="true" fileExtensions="indentationAwareUiTestLang"
       ecorePackage="IndentationAwareUiTestLanguage.ecore#/">

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">
   <genPackages prefix="PartialContentAssistTestLanguage" basePackage="org.eclipse.xtext.ide.tests.testlanguage"
       disposableProviderFactory="true" fileExtensions="partialcontentassisttestlang"
       ecorePackage="PartialContentAssistTestLanguage.ecore#/">

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">
   <genPackages prefix="PartialSerializationTestLanguage" basePackage="org.eclipse.xtext.ide.tests.testlanguage"
       disposableProviderFactory="true" fileExtensions="pstl" ecorePackage="PartialSerializationTestLanguage.ecore#/">
     <genClasses ecoreClass="PartialSerializationTestLanguage.ecore#//Model">

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">
   <genPackages prefix="RenameTestLanguage" basePackage="org.eclipse.xtext.ide.tests.testlanguage"
       disposableProviderFactory="true" fileExtensions="renametl" ecorePackage="RenameTestLanguage.ecore#/">
     <genClasses ecoreClass="RenameTestLanguage.ecore#//Model">

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">
   <genPackages prefix="TestLanguage" basePackage="org.eclipse.xtext.ide.tests.testlanguage"
       disposableProviderFactory="true" fileExtensions="testlang,testlangext" ecorePackage="TestLanguage.ecore#/">
     <genClasses ecoreClass="TestLanguage.ecore#//Model">

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 '<em><b>Children</b></em>' containment reference list.
    * The list contents are of type {@link org.eclipse.xtext.ide.tests.testlanguage.indentationAwareUiTestLanguage.OtherTreeNode}.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Children</em>' containment reference list isn't clear,
-   * there really should be more of a description here...
-   * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Children</em>' containment reference list.
    * @see org.eclipse.xtext.ide.tests.testlanguage.indentationAwareUiTestLanguage.IndentationAwareUiTestLanguagePackage#getChildList_Children()

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 '<em><b>Name</b></em>' attribute.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Name</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Name</em>' attribute.
    * @see #setName(String)
@@ -57,10 +53,6 @@ public interface OtherTreeNode extends EObject
   /**
    * Returns the value of the '<em><b>Child List</b></em>' containment reference.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Child List</em>' containment reference isn't clear,
-   * there really should be more of a description here...
-   * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Child List</em>' containment reference.
    * @see #setChildList(ChildList)

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 '<em><b>Nodes</b></em>' containment reference list.
    * The list contents are of type {@link org.eclipse.xtext.ide.tests.testlanguage.indentationAwareUiTestLanguage.TreeNode}.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Nodes</em>' containment reference list isn't clear,
-   * there really should be more of a description here...
-   * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Nodes</em>' 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 '<em><b>More Nodes</b></em>' containment reference list.
    * The list contents are of type {@link org.eclipse.xtext.ide.tests.testlanguage.indentationAwareUiTestLanguage.OtherTreeNode}.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>More Nodes</em>' containment reference list isn't clear,
-   * there really should be more of a description here...
-   * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>More Nodes</em>' containment reference list.
    * @see org.eclipse.xtext.ide.tests.testlanguage.indentationAwareUiTestLanguage.IndentationAwareUiTestLanguagePackage#getTree_MoreNodes()

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 '<em><b>Name</b></em>' attribute.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Name</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Name</em>' attribute.
    * @see #setName(String)
@@ -60,10 +56,6 @@ public interface TreeNode extends EObject
    * Returns the value of the '<em><b>Children</b></em>' containment reference list.
    * The list contents are of type {@link org.eclipse.xtext.ide.tests.testlanguage.indentationAwareUiTestLanguage.TreeNode}.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Children</em>' containment reference list isn't clear,
-   * there really should be more of a description here...
-   * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Children</em>' containment reference list.
    * @see org.eclipse.xtext.ide.tests.testlanguage.indentationAwareUiTestLanguage.IndentationAwareUiTestLanguagePackage#getTreeNode_Children()

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
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EList<OtherTreeNode> getChildren()
   {
     if (children == null)

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
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public Tree createTree()
   {
     TreeImpl tree = new TreeImpl();
@@ -94,6 +95,7 @@ public class IndentationAwareUiTestLanguageFactoryImpl extends EFactoryImpl impl
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public TreeNode createTreeNode()
   {
     TreeNodeImpl treeNode = new TreeNodeImpl();
@@ -105,6 +107,7 @@ public class IndentationAwareUiTestLanguageFactoryImpl extends EFactoryImpl impl
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public OtherTreeNode createOtherTreeNode()
   {
     OtherTreeNodeImpl otherTreeNode = new OtherTreeNodeImpl();
@@ -116,6 +119,7 @@ public class IndentationAwareUiTestLanguageFactoryImpl extends EFactoryImpl impl
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public ChildList createChildList()
   {
     ChildListImpl childList = new ChildListImpl();
@@ -127,6 +131,7 @@ public class IndentationAwareUiTestLanguageFactoryImpl extends EFactoryImpl impl
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public IndentationAwareUiTestLanguagePackage getIndentationAwareUiTestLanguagePackage()
   {
     return (IndentationAwareUiTestLanguagePackage)getEPackage();

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 <b>Package</b> for this model, and for any others upon which it depends.
-   * 
+   *
    * <p>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.
    * <!-- begin-user-doc -->
@@ -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
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getTree()
   {
     return treeEClass;
@@ -139,6 +140,7 @@ public class IndentationAwareUiTestLanguagePackageImpl extends EPackageImpl impl
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EReference getTree_Nodes()
   {
     return (EReference)treeEClass.getEStructuralFeatures().get(0);
@@ -149,6 +151,7 @@ public class IndentationAwareUiTestLanguagePackageImpl extends EPackageImpl impl
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EReference getTree_MoreNodes()
   {
     return (EReference)treeEClass.getEStructuralFeatures().get(1);
@@ -159,6 +162,7 @@ public class IndentationAwareUiTestLanguagePackageImpl extends EPackageImpl impl
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getTreeNode()
   {
     return treeNodeEClass;
@@ -169,6 +173,7 @@ public class IndentationAwareUiTestLanguagePackageImpl extends EPackageImpl impl
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EAttribute getTreeNode_Name()
   {
     return (EAttribute)treeNodeEClass.getEStructuralFeatures().get(0);
@@ -179,6 +184,7 @@ public class IndentationAwareUiTestLanguagePackageImpl extends EPackageImpl impl
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EReference getTreeNode_Children()
   {
     return (EReference)treeNodeEClass.getEStructuralFeatures().get(1);
@@ -189,6 +195,7 @@ public class IndentationAwareUiTestLanguagePackageImpl extends EPackageImpl impl
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getOtherTreeNode()
   {
     return otherTreeNodeEClass;
@@ -199,6 +206,7 @@ public class IndentationAwareUiTestLanguagePackageImpl extends EPackageImpl impl
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EAttribute getOtherTreeNode_Name()
   {
     return (EAttribute)otherTreeNodeEClass.getEStructuralFeatures().get(0);
@@ -209,6 +217,7 @@ public class IndentationAwareUiTestLanguagePackageImpl extends EPackageImpl impl
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EReference getOtherTreeNode_ChildList()
   {
     return (EReference)otherTreeNodeEClass.getEStructuralFeatures().get(1);
@@ -219,6 +228,7 @@ public class IndentationAwareUiTestLanguagePackageImpl extends EPackageImpl impl
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getChildList()
   {
     return childListEClass;
@@ -229,6 +239,7 @@ public class IndentationAwareUiTestLanguagePackageImpl extends EPackageImpl impl
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EReference getChildList_Children()
   {
     return (EReference)childListEClass.getEStructuralFeatures().get(0);
@@ -239,6 +250,7 @@ public class IndentationAwareUiTestLanguagePackageImpl extends EPackageImpl impl
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public IndentationAwareUiTestLanguageFactory getIndentationAwareUiTestLanguageFactory()
   {
     return (IndentationAwareUiTestLanguageFactory)getEFactoryInstance();

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
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public String getName()
   {
     return name;
@@ -102,6 +103,7 @@ public class OtherTreeNodeImpl extends MinimalEObjectImpl.Container implements O
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public void setName(String newName)
   {
     String oldName = name;
@@ -115,6 +117,7 @@ public class OtherTreeNodeImpl extends MinimalEObjectImpl.Container implements O
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public ChildList getChildList()
   {
     return childList;
@@ -142,6 +145,7 @@ public class OtherTreeNodeImpl extends MinimalEObjectImpl.Container implements O
    * <!-- end-user-doc -->
    * @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(')');

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
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EList<TreeNode> getNodes()
   {
     if (nodes == null)
@@ -102,6 +103,7 @@ public class TreeImpl extends MinimalEObjectImpl.Container implements Tree
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EList<OtherTreeNode> getMoreNodes()
   {
     if (moreNodes == null)

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
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public String getName()
   {
     return name;
@@ -108,6 +109,7 @@ public class TreeNodeImpl extends MinimalEObjectImpl.Container implements TreeNo
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public void setName(String newName)
   {
     String oldName = name;
@@ -121,6 +123,7 @@ public class TreeNodeImpl extends MinimalEObjectImpl.Container implements TreeNo
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EList<TreeNode> 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(')');

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 '<em><b>Type</b></em>' attribute.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Type</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Type</em>' attribute.
    * @see #setType(String)
@@ -57,10 +53,6 @@ public interface Property extends EObject
   /**
    * Returns the value of the '<em><b>Name</b></em>' attribute.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Name</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Name</em>' attribute.
    * @see #setName(String)

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 '<em><b>Name</b></em>' attribute.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Name</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Name</em>' attribute.
    * @see #setName(String)
@@ -60,10 +56,6 @@ public interface TypeDeclaration extends EObject
   /**
    * Returns the value of the '<em><b>Super Type</b></em>' reference.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Super Type</em>' reference isn't clear,
-   * there really should be more of a description here...
-   * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Super Type</em>' reference.
    * @see #setSuperType(TypeDeclaration)
@@ -87,10 +79,6 @@ public interface TypeDeclaration extends EObject
    * Returns the value of the '<em><b>Properties</b></em>' containment reference list.
    * The list contents are of type {@link org.eclipse.xtext.ide.tests.testlanguage.partialContentAssistTestLanguage.Property}.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Properties</em>' containment reference list isn't clear,
-   * there really should be more of a description here...
-   * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Properties</em>' containment reference list.
    * @see org.eclipse.xtext.ide.tests.testlanguage.partialContentAssistTestLanguage.PartialContentAssistTestLanguagePackage#getTypeDeclaration_Properties()

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
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public TypeDeclaration createTypeDeclaration()
   {
     TypeDeclarationImpl typeDeclaration = new TypeDeclarationImpl();
@@ -92,6 +93,7 @@ public class PartialContentAssistTestLanguageFactoryImpl extends EFactoryImpl im
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public Property createProperty()
   {
     PropertyImpl property = new PropertyImpl();
@@ -103,6 +105,7 @@ public class PartialContentAssistTestLanguageFactoryImpl extends EFactoryImpl im
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public PartialContentAssistTestLanguagePackage getPartialContentAssistTestLanguagePackage()
   {
     return (PartialContentAssistTestLanguagePackage)getEPackage();

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 <b>Package</b> for this model, and for any others upon which it depends.
-   * 
+   *
    * <p>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.
    * <!-- begin-user-doc -->
@@ -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
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getTypeDeclaration()
   {
     return typeDeclarationEClass;
@@ -123,6 +124,7 @@ public class PartialContentAssistTestLanguagePackageImpl extends EPackageImpl im
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EAttribute getTypeDeclaration_Name()
   {
     return (EAttribute)typeDeclarationEClass.getEStructuralFeatures().get(0);
@@ -133,6 +135,7 @@ public class PartialContentAssistTestLanguagePackageImpl extends EPackageImpl im
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EReference getTypeDeclaration_SuperType()
   {
     return (EReference)typeDeclarationEClass.getEStructuralFeatures().get(1);
@@ -143,6 +146,7 @@ public class PartialContentAssistTestLanguagePackageImpl extends EPackageImpl im
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EReference getTypeDeclaration_Properties()
   {
     return (EReference)typeDeclarationEClass.getEStructuralFeatures().get(2);
@@ -153,6 +157,7 @@ public class PartialContentAssistTestLanguagePackageImpl extends EPackageImpl im
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getProperty()
   {
     return propertyEClass;
@@ -163,6 +168,7 @@ public class PartialContentAssistTestLanguagePackageImpl extends EPackageImpl im
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EAttribute getProperty_Type()
   {
     return (EAttribute)propertyEClass.getEStructuralFeatures().get(0);
@@ -173,6 +179,7 @@ public class PartialContentAssistTestLanguagePackageImpl extends EPackageImpl im
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EAttribute getProperty_Name()
   {
     return (EAttribute)propertyEClass.getEStructuralFeatures().get(1);
@@ -183,6 +190,7 @@ public class PartialContentAssistTestLanguagePackageImpl extends EPackageImpl im
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public PartialContentAssistTestLanguageFactory getPartialContentAssistTestLanguageFactory()
   {
     return (PartialContentAssistTestLanguageFactory)getEFactoryInstance();

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
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public String getType()
   {
     return type;
@@ -109,6 +110,7 @@ public class PropertyImpl extends MinimalEObjectImpl.Container implements Proper
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public void setType(String newType)
   {
     String oldType = type;
@@ -122,6 +124,7 @@ public class PropertyImpl extends MinimalEObjectImpl.Container implements Proper
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public String getName()
   {
     return name;
@@ -132,6 +135,7 @@ public class PropertyImpl extends MinimalEObjectImpl.Container implements Proper
    * <!-- end-user-doc -->
    * @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: ");

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
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public String getName()
   {
     return name;
@@ -120,6 +121,7 @@ public class TypeDeclarationImpl extends MinimalEObjectImpl.Container implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public void setName(String newName)
   {
     String oldName = name;
@@ -133,6 +135,7 @@ public class TypeDeclarationImpl extends MinimalEObjectImpl.Container implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public TypeDeclaration getSuperType()
   {
     if (superType != null && superType.eIsProxy())
@@ -163,6 +166,7 @@ public class TypeDeclarationImpl extends MinimalEObjectImpl.Container implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public void setSuperType(TypeDeclaration newSuperType)
   {
     TypeDeclaration oldSuperType = superType;
@@ -176,6 +180,7 @@ public class TypeDeclarationImpl extends MinimalEObjectImpl.Container implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EList<Property> 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(')');

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 '<em><b>Sub Childs</b></em>' containment reference list.
    * The list contents are of type {@link org.eclipse.xtext.ide.tests.testlanguage.partialSerializationTestLanguage.SubChild}.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Sub Childs</em>' containment reference list isn't clear,
-   * there really should be more of a description here...
-   * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Sub Childs</em>' containment reference list.
    * @see org.eclipse.xtext.ide.tests.testlanguage.partialSerializationTestLanguage.PartialSerializationTestLanguagePackage#getChildWithSubChild_SubChilds()

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 '<em><b>Children</b></em>' containment reference list.
    * The list contents are of type {@link org.eclipse.xtext.ide.tests.testlanguage.partialSerializationTestLanguage.ChildWithSubChild}.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Children</em>' containment reference list isn't clear,
-   * there really should be more of a description here...
-   * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Children</em>' containment reference list.
    * @see org.eclipse.xtext.ide.tests.testlanguage.partialSerializationTestLanguage.PartialSerializationTestLanguagePackage#getChildWithSubChilds_Children()

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 '<em><b>Ref</b></em>' reference.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Ref</em>' reference isn't clear,
-   * there really should be more of a description here...
-   * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Ref</em>' reference.
    * @see #setRef(EClass)

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 '<em><b>Imported Namespace</b></em>' attribute.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Imported Namespace</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Imported Namespace</em>' attribute.
    * @see #setImportedNamespace(String)

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 '<em><b>Child</b></em>' containment reference.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Child</em>' containment reference isn't clear,
-   * there really should be more of a description here...
-   * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Child</em>' containment reference.
    * @see #setChild(MandatoryValue)

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 '<em><b>Children</b></em>' containment reference list.
    * The list contents are of type {@link org.eclipse.xtext.ide.tests.testlanguage.partialSerializationTestLanguage.MandatoryValue}.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Children</em>' containment reference list isn't clear,
-   * there really should be more of a description here...
-   * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Children</em>' containment reference list.
    * @see org.eclipse.xtext.ide.tests.testlanguage.partialSerializationTestLanguage.PartialSerializationTestLanguagePackage#getMandatoryChildList_Children()

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 '<em><b>Name</b></em>' attribute.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Name</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Name</em>' attribute.
    * @see #setName(String)

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 '<em><b>Name</b></em>' attribute list.
    * The list contents are of type {@link java.lang.String}.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Name</em>' attribute list isn't clear,
-   * there really should be more of a description here...
-   * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Name</em>' attribute list.
    * @see org.eclipse.xtext.ide.tests.testlanguage.partialSerializationTestLanguage.PartialSerializationTestLanguagePackage#getManyMandatoryValues_Name()

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 '<em><b>Name</b></em>' attribute list.
    * The list contents are of type {@link java.lang.String}.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Name</em>' attribute list isn't clear,
-   * there really should be more of a description here...
-   * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Name</em>' attribute list.
    * @see org.eclipse.xtext.ide.tests.testlanguage.partialSerializationTestLanguage.PartialSerializationTestLanguagePackage#getManyValues_Name()

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 '<em><b>Clazz</b></em>' containment reference list.
    * The list contents are of type {@link org.eclipse.emf.ecore.EClass}.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Clazz</em>' containment reference list isn't clear,
-   * there really should be more of a description here...
-   * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Clazz</em>' containment reference list.
    * @see org.eclipse.xtext.ide.tests.testlanguage.partialSerializationTestLanguage.PartialSerializationTestLanguagePackage#getModel_Clazz()

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 '<em><b>Imports</b></em>' containment reference list.
    * The list contents are of type {@link org.eclipse.xtext.ide.tests.testlanguage.partialSerializationTestLanguage.Import}.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Imports</em>' containment reference list isn't clear,
-   * there really should be more of a description here...
-   * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Imports</em>' 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 '<em><b>Name</b></em>' attribute.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Name</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Name</em>' attribute.
    * @see #setName(String)
@@ -77,10 +69,6 @@ public interface Node extends Model
    * Returns the value of the '<em><b>Refs</b></em>' reference list.
    * The list contents are of type {@link org.eclipse.xtext.ide.tests.testlanguage.partialSerializationTestLanguage.Node}.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Refs</em>' reference list isn't clear,
-   * there really should be more of a description here...
-   * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Refs</em>' 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 '<em><b>Children</b></em>' containment reference list.
    * The list contents are of type {@link org.eclipse.xtext.ide.tests.testlanguage.partialSerializationTestLanguage.Node}.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Children</em>' containment reference list isn't clear,
-   * there really should be more of a description here...
-   * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Children</em>' 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 '<em><b>Ref</b></em>' reference.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Ref</em>' reference isn't clear,
-   * there really should be more of a description here...
-   * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Ref</em>' reference.
    * @see #setRef(Node)

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 '<em><b>Child</b></em>' containment reference.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Child</em>' containment reference isn't clear,
-   * there really should be more of a description here...
-   * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Child</em>' containment reference.
    * @see #setChild(MandatoryValue)

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 '<em><b>Children</b></em>' containment reference list.
    * The list contents are of type {@link org.eclipse.xtext.ide.tests.testlanguage.partialSerializationTestLanguage.MandatoryValue}.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Children</em>' containment reference list isn't clear,
-   * there really should be more of a description here...
-   * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Children</em>' containment reference list.
    * @see org.eclipse.xtext.ide.tests.testlanguage.partialSerializationTestLanguage.PartialSerializationTestLanguagePackage#getOptionalChildList_Children()

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 '<em><b>Name</b></em>' attribute.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Name</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Name</em>' attribute.
    * @see #setName(String)

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 '<em><b>Name</b></em>' attribute.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Name</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Name</em>' attribute.
    * @see #setName(String)

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 '<em><b>Direct Children</b></em>' containment reference list.
    * The list contents are of type {@link org.eclipse.xtext.ide.tests.testlanguage.partialSerializationTestLanguage.MandatoryValue}.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Direct Children</em>' containment reference list isn't clear,
-   * there really should be more of a description here...
-   * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Direct Children</em>' 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 '<em><b>Childs List</b></em>' containment reference.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Childs List</em>' containment reference isn't clear,
-   * there really should be more of a description here...
-   * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Childs List</em>' containment reference.
    * @see #setChildsList(MandatoryChildList)

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 '<em><b>Direct Child</b></em>' containment reference.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Direct Child</em>' containment reference isn't clear,
-   * there really should be more of a description here...
-   * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Direct Child</em>' containment reference.
    * @see #setDirectChild(MandatoryValue)
@@ -56,10 +52,6 @@ public interface TwoChilds extends Model
   /**
    * Returns the value of the '<em><b>Opt Child</b></em>' containment reference.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Opt Child</em>' containment reference isn't clear,
-   * there really should be more of a description here...
-   * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Opt Child</em>' containment reference.
    * @see #setOptChild(OptionalChild)

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 '<em><b>Child</b></em>' containment reference.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Child</em>' containment reference isn't clear,
-   * there really should be more of a description here...
-   * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Child</em>' containment reference.
    * @see #setChild(WithTransient)

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
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EList<SubChild> getSubChilds()
   {
     if (subChilds == null)

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
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EList<ChildWithSubChild> getChildren()
   {
     if (children == null)

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
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getRef()
   {
     if (ref != null && ref.eIsProxy())
@@ -98,6 +99,7 @@ public class EClassRefImpl extends ModelImpl implements EClassRef
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public void setRef(EClass newRef)
   {
     EClass oldRef = ref;

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
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public String getImportedNamespace()
   {
     return importedNamespace;
@@ -88,6 +89,7 @@ public class ImportImpl extends MinimalEObjectImpl.Container implements Import
    * <!-- end-user-doc -->
    * @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(')');

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
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public MandatoryValue getChild()
   {
     return child;
@@ -97,6 +98,7 @@ public class MandatoryChildImpl extends ModelImpl implements MandatoryChild
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public void setChild(MandatoryValue newChild)
   {
     if (newChild != child)

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
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EList<MandatoryValue> getChildren()
   {
     if (children == null)

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
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public String getName()
   {
     return name;
@@ -87,6 +88,7 @@ public class MandatoryValueImpl extends ModelImpl implements MandatoryValue
    * <!-- end-user-doc -->
    * @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(')');

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
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EList<String> 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(')');

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
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EList<String> 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(')');

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
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EList<EClass> getClazz()
   {
     if (clazz == null)

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
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EList<Import> getImports()
   {
     if (imports == null)
@@ -146,6 +147,7 @@ public class NodeImpl extends ModelImpl implements Node
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public String getName()
   {
     return name;
@@ -156,6 +158,7 @@ public class NodeImpl extends ModelImpl implements Node
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public void setName(String newName)
   {
     String oldName = name;
@@ -169,6 +172,7 @@ public class NodeImpl extends ModelImpl implements Node
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EList<Node> getRefs()
   {
     if (refs == null)
@@ -183,6 +187,7 @@ public class NodeImpl extends ModelImpl implements Node
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EList<Node> getChildren()
   {
     if (children == null)
@@ -197,6 +202,7 @@ public class NodeImpl extends ModelImpl implements Node
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public Node getRef()
   {
     if (ref != null && ref.eIsProxy())
@@ -227,6 +233,7 @@ public class NodeImpl extends ModelImpl implements Node
    * <!-- end-user-doc -->
    * @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(')');

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
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public MandatoryValue getChild()
   {
     return child;
@@ -97,6 +98,7 @@ public class OptionalChildImpl extends ModelImpl implements OptionalChild
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public void setChild(MandatoryValue newChild)
   {
     if (newChild != child)

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
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EList<MandatoryValue> getChildren()
   {
     if (children == null)

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
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public String getName()
   {
     return name;
@@ -87,6 +88,7 @@ public class OptionalValueImpl extends ModelImpl implements OptionalValue
    * <!-- end-user-doc -->
    * @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(')');

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
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public Model createModel()
   {
     ModelImpl model = new ModelImpl();
@@ -109,6 +110,7 @@ public class PartialSerializationTestLanguageFactoryImpl extends EFactoryImpl im
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public MandatoryValue createMandatoryValue()
   {
     MandatoryValueImpl mandatoryValue = new MandatoryValueImpl();
@@ -120,6 +122,7 @@ public class PartialSerializationTestLanguageFactoryImpl extends EFactoryImpl im
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public OptionalValue createOptionalValue()
   {
     OptionalValueImpl optionalValue = new OptionalValueImpl();
@@ -131,6 +134,7 @@ public class PartialSerializationTestLanguageFactoryImpl extends EFactoryImpl im
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public ManyOptionalValues createManyOptionalValues()
   {
     ManyOptionalValuesImpl manyOptionalValues = new ManyOptionalValuesImpl();
@@ -142,6 +146,7 @@ public class PartialSerializationTestLanguageFactoryImpl extends EFactoryImpl im
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public ManyMandatoryValues createManyMandatoryValues()
   {
     ManyMandatoryValuesImpl manyMandatoryValues = new ManyMandatoryValuesImpl();
@@ -153,6 +158,7 @@ public class PartialSerializationTestLanguageFactoryImpl extends EFactoryImpl im
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public MandatoryChild createMandatoryChild()
   {
     MandatoryChildImpl mandatoryChild = new MandatoryChildImpl();
@@ -164,6 +170,7 @@ public class PartialSerializationTestLanguageFactoryImpl extends EFactoryImpl im
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public OptionalChild createOptionalChild()
   {
     OptionalChildImpl optionalChild = new OptionalChildImpl();
@@ -175,6 +182,7 @@ public class PartialSerializationTestLanguageFactoryImpl extends EFactoryImpl im
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public TwoChildLists createTwoChildLists()
   {
     TwoChildListsImpl twoChildLists = new TwoChildListsImpl();
@@ -186,6 +194,7 @@ public class PartialSerializationTestLanguageFactoryImpl extends EFactoryImpl im
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public TwoChilds createTwoChilds()
   {
     TwoChildsImpl twoChilds = new TwoChildsImpl();
@@ -197,6 +206,7 @@ public class PartialSerializationTestLanguageFactoryImpl extends EFactoryImpl im
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public ChildWithSubChilds createChildWithSubChilds()
   {
     ChildWithSubChildsImpl childWithSubChilds = new ChildWithSubChildsImpl();
@@ -208,6 +218,7 @@ public class PartialSerializationTestLanguageFactoryImpl extends EFactoryImpl im
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public ChildWithSubChild createChildWithSubChild()
   {
     ChildWithSubChildImpl childWithSubChild = new ChildWithSubChildImpl();
@@ -219,6 +230,7 @@ public class PartialSerializationTestLanguageFactoryImpl extends EFactoryImpl im
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public SubChild createSubChild()
   {
     SubChildImpl subChild = new SubChildImpl();
@@ -230,6 +242,7 @@ public class PartialSerializationTestLanguageFactoryImpl extends EFactoryImpl im
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public MandatoryChildList createMandatoryChildList()
   {
     MandatoryChildListImpl mandatoryChildList = new MandatoryChildListImpl();
@@ -241,6 +254,7 @@ public class PartialSerializationTestLanguageFactoryImpl extends EFactoryImpl im
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public OptionalChildList createOptionalChildList()
   {
     OptionalChildListImpl optionalChildList = new OptionalChildListImpl();
@@ -252,6 +266,7 @@ public class PartialSerializationTestLanguageFactoryImpl extends EFactoryImpl im
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public Import createImport()
   {
     ImportImpl import_ = new ImportImpl();
@@ -263,6 +278,7 @@ public class PartialSerializationTestLanguageFactoryImpl extends EFactoryImpl im
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public Node createNode()
   {
     NodeImpl node = new NodeImpl();
@@ -274,6 +290,7 @@ public class PartialSerializationTestLanguageFactoryImpl extends EFactoryImpl im
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClassRef createEClassRef()
   {
     EClassRefImpl eClassRef = new EClassRefImpl();
@@ -285,6 +302,7 @@ public class PartialSerializationTestLanguageFactoryImpl extends EFactoryImpl im
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public WithTransientContainer createWithTransientContainer()
   {
     WithTransientContainerImpl withTransientContainer = new WithTransientContainerImpl();
@@ -296,6 +314,7 @@ public class PartialSerializationTestLanguageFactoryImpl extends EFactoryImpl im
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public ManyValues createManyValues()
   {
     ManyValuesImpl manyValues = new ManyValuesImpl();
@@ -307,6 +326,7 @@ public class PartialSerializationTestLanguageFactoryImpl extends EFactoryImpl im
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public PartialSerializationTestLanguagePackage getPartialSerializationTestLanguagePackage()
   {
     return (PartialSerializationTestLanguagePackage)getEPackage();

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 <b>Package</b> for this model, and for any others upon which it depends.
-   * 
+   *
    * <p>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.
    * <!-- begin-user-doc -->
@@ -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
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getModel()
   {
     return modelEClass;
@@ -262,6 +263,7 @@ public class PartialSerializationTestLanguagePackageImpl extends EPackageImpl im
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EReference getModel_Clazz()
   {
     return (EReference)modelEClass.getEStructuralFeatures().get(0);
@@ -272,6 +274,7 @@ public class PartialSerializationTestLanguagePackageImpl extends EPackageImpl im
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getMandatoryValue()
   {
     return mandatoryValueEClass;
@@ -282,6 +285,7 @@ public class PartialSerializationTestLanguagePackageImpl extends EPackageImpl im
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EAttribute getMandatoryValue_Name()
   {
     return (EAttribute)mandatoryValueEClass.getEStructuralFeatures().get(0);
@@ -292,6 +296,7 @@ public class PartialSerializationTestLanguagePackageImpl extends EPackageImpl im
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getOptionalValue()
   {
     return optionalValueEClass;
@@ -302,6 +307,7 @@ public class PartialSerializationTestLanguagePackageImpl extends EPackageImpl im
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EAttribute getOptionalValue_Name()
   {
     return (EAttribute)optionalValueEClass.getEStructuralFeatures().get(0);
@@ -312,6 +318,7 @@ public class PartialSerializationTestLanguagePackageImpl extends EPackageImpl im
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getManyOptionalValues()
   {
     return manyOptionalValuesEClass;
@@ -322,6 +329,7 @@ public class PartialSerializationTestLanguagePackageImpl extends EPackageImpl im
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getManyMandatoryValues()
   {
     return manyMandatoryValuesEClass;
@@ -332,6 +340,7 @@ public class PartialSerializationTestLanguagePackageImpl extends EPackageImpl im
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EAttribute getManyMandatoryValues_Name()
   {
     return (EAttribute)manyMandatoryValuesEClass.getEStructuralFeatures().get(0);
@@ -342,6 +351,7 @@ public class PartialSerializationTestLanguagePackageImpl extends EPackageImpl im
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getMandatoryChild()
   {
     return mandatoryChildEClass;
@@ -352,6 +362,7 @@ public class PartialSerializationTestLanguagePackageImpl extends EPackageImpl im
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EReference getMandatoryChild_Child()
   {
     return (EReference)mandatoryChildEClass.getEStructuralFeatures().get(0);
@@ -362,6 +373,7 @@ public class PartialSerializationTestLanguagePackageImpl extends EPackageImpl im
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getOptionalChild()
   {
     return optionalChildEClass;
@@ -372,6 +384,7 @@ public class PartialSerializationTestLanguagePackageImpl extends EPackageImpl im
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EReference getOptionalChild_Child()
   {
     return (EReference)optionalChildEClass.getEStructuralFeatures().get(0);
@@ -382,6 +395,7 @@ public class PartialSerializationTestLanguagePackageImpl extends EPackageImpl im
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getTwoChildLists()
   {
     return twoChildListsEClass;
@@ -392,6 +406,7 @@ public class PartialSerializationTestLanguagePackageImpl extends EPackageImpl im
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EReference getTwoChildLists_DirectChildren()
   {
     return (EReference)twoChildListsEClass.getEStructuralFeatures().get(0);
@@ -402,6 +417,7 @@ public class PartialSerializationTestLanguagePackageImpl extends EPackageImpl im
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EReference getTwoChildLists_ChildsList()
   {
     return (EReference)twoChildListsEClass.getEStructuralFeatures().get(1);
@@ -412,6 +428,7 @@ public class PartialSerializationTestLanguagePackageImpl extends EPackageImpl im
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getTwoChilds()
   {
     return twoChildsEClass;
@@ -422,6 +439,7 @@ public class PartialSerializationTestLanguagePackageImpl extends EPackageImpl im
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EReference getTwoChilds_DirectChild()
   {
     return (EReference)twoChildsEClass.getEStructuralFeatures().get(0);
@@ -432,6 +450,7 @@ public class PartialSerializationTestLanguagePackageImpl extends EPackageImpl im
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EReference getTwoChilds_OptChild()
   {
     return (EReference)twoChildsEClass.getEStructuralFeatures().get(1);
@@ -442,6 +461,7 @@ public class PartialSerializationTestLanguagePackageImpl extends EPackageImpl im
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getChildWithSubChilds()
   {
     return childWithSubChildsEClass;
@@ -452,6 +472,7 @@ public class PartialSerializationTestLanguagePackageImpl extends EPackageImpl im
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EReference getChildWithSubChilds_Children()
   {
     return (EReference)childWithSubChildsEClass.getEStructuralFeatures().get(0);
@@ -462,6 +483,7 @@ public class PartialSerializationTestLanguagePackageImpl extends EPackageImpl im
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getChildWithSubChild()
   {
     return childWithSubChildEClass;
@@ -472,6 +494,7 @@ public class PartialSerializationTestLanguagePackageImpl extends EPackageImpl im
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EReference getChildWithSubChild_SubChilds()
   {
     return (EReference)childWithSubChildEClass.getEStructuralFeatures().get(0);
@@ -482,6 +505,7 @@ public class PartialSerializationTestLanguagePackageImpl extends EPackageImpl im
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getSubChild()
   {
     return subChildEClass;
@@ -492,6 +516,7 @@ public class PartialSerializationTestLanguagePackageImpl extends EPackageImpl im
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EAttribute getSubChild_Name()
   {
     return (EAttribute)subChildEClass.getEStructuralFeatures().get(0);
@@ -502,6 +527,7 @@ public class PartialSerializationTestLanguagePackageImpl extends EPackageImpl im
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getMandatoryChildList()
   {
     return mandatoryChildListEClass;
@@ -512,6 +538,7 @@ public class PartialSerializationTestLanguagePackageImpl extends EPackageImpl im
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EReference getMandatoryChildList_Children()
   {
     return (EReference)mandatoryChildListEClass.getEStructuralFeatures().get(0);
@@ -522,6 +549,7 @@ public class PartialSerializationTestLanguagePackageImpl extends EPackageImpl im
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getOptionalChildList()
   {
     return optionalChildListEClass;
@@ -532,6 +560,7 @@ public class PartialSerializationTestLanguagePackageImpl extends EPackageImpl im
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EReference getOptionalChildList_Children()
   {
     return (EReference)optionalChildListEClass.getEStructuralFeatures().get(0);
@@ -542,6 +571,7 @@ public class PartialSerializationTestLanguagePackageImpl extends EPackageImpl im
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getImport()
   {
     return importEClass;
@@ -552,6 +582,7 @@ public class PartialSerializationTestLanguagePackageImpl extends EPackageImpl im
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EAttribute getImport_ImportedNamespace()
   {
     return (EAttribute)importEClass.getEStructuralFeatures().get(0);
@@ -562,6 +593,7 @@ public class PartialSerializationTestLanguagePackageImpl extends EPackageImpl im
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getNode()
   {
     return nodeEClass;
@@ -572,6 +604,7 @@ public class PartialSerializationTestLanguagePackageImpl extends EPackageImpl im
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EReference getNode_Imports()
   {
     return (EReference)nodeEClass.getEStructuralFeatures().get(0);
@@ -582,6 +615,7 @@ public class PartialSerializationTestLanguagePackageImpl extends EPackageImpl im
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EAttribute getNode_Name()
   {
     return (EAttribute)nodeEClass.getEStructuralFeatures().get(1);
@@ -592,6 +626,7 @@ public class PartialSerializationTestLanguagePackageImpl extends EPackageImpl im
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EReference getNode_Refs()
   {
     return (EReference)nodeEClass.getEStructuralFeatures().get(2);
@@ -602,6 +637,7 @@ public class PartialSerializationTestLanguagePackageImpl extends EPackageImpl im
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EReference getNode_Children()
   {
     return (EReference)nodeEClass.getEStructuralFeatures().get(3);
@@ -612,6 +648,7 @@ public class PartialSerializationTestLanguagePackageImpl extends EPackageImpl im
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EReference getNode_Ref()
   {
     return (EReference)nodeEClass.getEStructuralFeatures().get(4);
@@ -622,6 +659,7 @@ public class PartialSerializationTestLanguagePackageImpl extends EPackageImpl im
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getEClassRef()
   {
     return eClassRefEClass;
@@ -632,6 +670,7 @@ public class PartialSerializationTestLanguagePackageImpl extends EPackageImpl im
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EReference getEClassRef_Ref()
   {
     return (EReference)eClassRefEClass.getEStructuralFeatures().get(0);
@@ -642,6 +681,7 @@ public class PartialSerializationTestLanguagePackageImpl extends EPackageImpl im
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getWithTransientContainer()
   {
     return withTransientContainerEClass;
@@ -652,6 +692,7 @@ public class PartialSerializationTestLanguagePackageImpl extends EPackageImpl im
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EReference getWithTransientContainer_Child()
   {
     return (EReference)withTransientContainerEClass.getEStructuralFeatures().get(0);
@@ -662,6 +703,7 @@ public class PartialSerializationTestLanguagePackageImpl extends EPackageImpl im
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getManyValues()
   {
     return manyValuesEClass;
@@ -672,6 +714,7 @@ public class PartialSerializationTestLanguagePackageImpl extends EPackageImpl im
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EAttribute getManyValues_Name()
   {
     return (EAttribute)manyValuesEClass.getEStructuralFeatures().get(0);
@@ -682,6 +725,7 @@ public class PartialSerializationTestLanguagePackageImpl extends EPackageImpl im
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public PartialSerializationTestLanguageFactory getPartialSerializationTestLanguageFactory()
   {
     return (PartialSerializationTestLanguageFactory)getEFactoryInstance();

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
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public String getName()
   {
     return name;
@@ -88,6 +89,7 @@ public class SubChildImpl extends MinimalEObjectImpl.Container implements SubChi
    * <!-- end-user-doc -->
    * @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(')');

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
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EList<MandatoryValue> getDirectChildren()
   {
     if (directChildren == null)
@@ -103,6 +104,7 @@ public class TwoChildListsImpl extends ModelImpl implements TwoChildLists
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public MandatoryChildList getChildsList()
   {
     return childsList;
@@ -130,6 +132,7 @@ public class TwoChildListsImpl extends ModelImpl implements TwoChildLists
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public void setChildsList(MandatoryChildList newChildsList)
   {
     if (newChildsList != childsList)

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
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public MandatoryValue getDirectChild()
   {
     return directChild;
@@ -109,6 +110,7 @@ public class TwoChildsImpl extends ModelImpl implements TwoChilds
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public void setDirectChild(MandatoryValue newDirectChild)
   {
     if (newDirectChild != directChild)
@@ -130,6 +132,7 @@ public class TwoChildsImpl extends ModelImpl implements TwoChilds
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public OptionalChild getOptChild()
   {
     return optChild;
@@ -157,6 +160,7 @@ public class TwoChildsImpl extends ModelImpl implements TwoChilds
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public void setOptChild(OptionalChild newOptChild)
   {
     if (newOptChild != optChild)

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
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public WithTransient getChild()
   {
     return child;
@@ -98,6 +99,7 @@ public class WithTransientContainerImpl extends ModelImpl implements WithTransie
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public void setChild(WithTransient newChild)
   {
     if (newChild != child)

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 '<em><b>Types</b></em>' containment reference list.
    * The list contents are of type {@link org.eclipse.xtext.ide.tests.testlanguage.renameTestLanguage.TypeDeclaration}.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Types</em>' containment reference list isn't clear,
-   * there really should be more of a description here...
-   * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Types</em>' containment reference list.
    * @see org.eclipse.xtext.ide.tests.testlanguage.renameTestLanguage.RenameTestLanguagePackage#getModel_Types()

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 '<em><b>Name</b></em>' attribute.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Name</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Name</em>' attribute.
    * @see #setName(String)
@@ -57,10 +53,6 @@ public interface TypeDeclaration extends EObject
   /**
    * Returns the value of the '<em><b>Super Type</b></em>' reference.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Super Type</em>' reference isn't clear,
-   * there really should be more of a description here...
-   * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Super Type</em>' reference.
    * @see #setSuperType(TypeDeclaration)

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
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EList<TypeDeclaration> getTypes()
   {
     if (types == null)

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
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public Model createModel()
   {
     ModelImpl model = new ModelImpl();
@@ -92,6 +93,7 @@ public class RenameTestLanguageFactoryImpl extends EFactoryImpl implements Renam
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public TypeDeclaration createTypeDeclaration()
   {
     TypeDeclarationImpl typeDeclaration = new TypeDeclarationImpl();
@@ -103,6 +105,7 @@ public class RenameTestLanguageFactoryImpl extends EFactoryImpl implements Renam
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public RenameTestLanguagePackage getRenameTestLanguagePackage()
   {
     return (RenameTestLanguagePackage)getEPackage();

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 <b>Package</b> for this model, and for any others upon which it depends.
-   * 
+   *
    * <p>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.
    * <!-- begin-user-doc -->
@@ -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
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getModel()
   {
     return modelEClass;
@@ -123,6 +124,7 @@ public class RenameTestLanguagePackageImpl extends EPackageImpl implements Renam
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EReference getModel_Types()
   {
     return (EReference)modelEClass.getEStructuralFeatures().get(0);
@@ -133,6 +135,7 @@ public class RenameTestLanguagePackageImpl extends EPackageImpl implements Renam
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getTypeDeclaration()
   {
     return typeDeclarationEClass;
@@ -143,6 +146,7 @@ public class RenameTestLanguagePackageImpl extends EPackageImpl implements Renam
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EAttribute getTypeDeclaration_Name()
   {
     return (EAttribute)typeDeclarationEClass.getEStructuralFeatures().get(0);
@@ -153,6 +157,7 @@ public class RenameTestLanguagePackageImpl extends EPackageImpl implements Renam
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EReference getTypeDeclaration_SuperType()
   {
     return (EReference)typeDeclarationEClass.getEStructuralFeatures().get(1);
@@ -163,6 +168,7 @@ public class RenameTestLanguagePackageImpl extends EPackageImpl implements Renam
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public RenameTestLanguageFactory getRenameTestLanguageFactory()
   {
     return (RenameTestLanguageFactory)getEFactoryInstance();

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
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public String getName()
   {
     return name;
@@ -100,6 +101,7 @@ public class TypeDeclarationImpl extends MinimalEObjectImpl.Container implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public void setName(String newName)
   {
     String oldName = name;
@@ -113,6 +115,7 @@ public class TypeDeclarationImpl extends MinimalEObjectImpl.Container implements
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public TypeDeclaration getSuperType()
   {
     if (superType != null && superType.eIsProxy())
@@ -143,6 +146,7 @@ public class TypeDeclarationImpl extends MinimalEObjectImpl.Container implements
    * <!-- end-user-doc -->
    * @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(')');

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 '<em><b>Name</b></em>' attribute.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Name</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Name</em>' attribute.
    * @see #setName(String)

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 '<em><b>Name</b></em>' attribute.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Name</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Name</em>' attribute.
    * @see #setName(String)

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 '<em><b>Elements</b></em>' containment reference list.
    * The list contents are of type {@link org.eclipse.xtext.ide.tests.testlanguage.testLanguage.AbstractElement}.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Elements</em>' containment reference list isn't clear,
-   * there really should be more of a description here...
-   * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Elements</em>' containment reference list.
    * @see org.eclipse.xtext.ide.tests.testlanguage.testLanguage.TestLanguagePackage#getModel_Elements()

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 '<em><b>Params</b></em>' containment reference list.
    * The list contents are of type {@link org.eclipse.xtext.ide.tests.testlanguage.testLanguage.Parameter}.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Params</em>' containment reference list isn't clear,
-   * there really should be more of a description here...
-   * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Params</em>' 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 '<em><b>Return Type</b></em>' containment reference.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Return Type</em>' containment reference isn't clear,
-   * there really should be more of a description here...
-   * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Return Type</em>' containment reference.
    * @see #setReturnType(Type)
@@ -74,10 +66,6 @@ public interface Operation extends Member
   /**
    * Returns the value of the '<em><b>Operation Call</b></em>' containment reference.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Operation Call</em>' containment reference isn't clear,
-   * there really should be more of a description here...
-   * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Operation Call</em>' containment reference.
    * @see #setOperationCall(OperationCall)

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 '<em><b>Operation</b></em>' reference.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Operation</em>' reference isn't clear,
-   * there really should be more of a description here...
-   * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Operation</em>' reference.
    * @see #setOperation(Operation)
@@ -60,10 +56,6 @@ public interface OperationCall extends EObject
    * Returns the value of the '<em><b>Params</b></em>' attribute list.
    * The list contents are of type {@link java.lang.Integer}.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Params</em>' attribute list isn't clear,
-   * there really should be more of a description here...
-   * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Params</em>' attribute list.
    * @see org.eclipse.xtext.ide.tests.testlanguage.testLanguage.TestLanguagePackage#getOperationCall_Params()

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 '<em><b>Elements</b></em>' containment reference list.
    * The list contents are of type {@link org.eclipse.xtext.ide.tests.testlanguage.testLanguage.AbstractElement}.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Elements</em>' containment reference list isn't clear,
-   * there really should be more of a description here...
-   * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Elements</em>' containment reference list.
    * @see org.eclipse.xtext.ide.tests.testlanguage.testLanguage.TestLanguagePackage#getPackageDeclaration_Elements()

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 '<em><b>Name</b></em>' attribute.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Name</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Name</em>' attribute.
    * @see #setName(String)
@@ -57,10 +53,6 @@ public interface Parameter extends EObject
   /**
    * Returns the value of the '<em><b>Type</b></em>' containment reference.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Type</em>' containment reference isn't clear,
-   * there really should be more of a description here...
-   * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Type</em>' containment reference.
    * @see #setType(Type)

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 '<em><b>Name</b></em>' attribute.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Name</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Name</em>' attribute.
    * @see #setName(String)

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 '<em><b>Type</b></em>' containment reference.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Type</em>' containment reference isn't clear,
-   * there really should be more of a description here...
-   * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Type</em>' containment reference.
    * @see #setType(Type)

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 '<em><b>Array Diemensions</b></em>' attribute list.
    * The list contents are of type {@link java.lang.String}.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Array Diemensions</em>' attribute list isn't clear,
-   * there really should be more of a description here...
-   * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Array Diemensions</em>' attribute list.
    * @see org.eclipse.xtext.ide.tests.testlanguage.testLanguage.TestLanguagePackage#getType_ArrayDiemensions()

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 '<em><b>Super Type</b></em>' reference.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Super Type</em>' reference isn't clear,
-   * there really should be more of a description here...
-   * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Super Type</em>' reference.
    * @see #setSuperType(TypeDeclaration)
@@ -58,10 +54,6 @@ public interface TypeDeclaration extends AbstractElement
    * Returns the value of the '<em><b>Members</b></em>' containment reference list.
    * The list contents are of type {@link org.eclipse.xtext.ide.tests.testlanguage.testLanguage.Member}.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Members</em>' containment reference list isn't clear,
-   * there really should be more of a description here...
-   * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Members</em>' containment reference list.
    * @see org.eclipse.xtext.ide.tests.testlanguage.testLanguage.TestLanguagePackage#getTypeDeclaration_Members()

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 '<em><b>Type Ref</b></em>' reference.
    * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Type Ref</em>' reference isn't clear,
-   * there really should be more of a description here...
-   * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Type Ref</em>' reference.
    * @see #setTypeRef(TypeDeclaration)

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
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public String getName()
   {
     return name;
@@ -88,6 +89,7 @@ public class AbstractElementImpl extends MinimalEObjectImpl.Container implements
    * <!-- end-user-doc -->
    * @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(')');

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
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public String getName()
   {
     return name;
@@ -88,6 +89,7 @@ public class MemberImpl extends MinimalEObjectImpl.Container implements Member
    * <!-- end-user-doc -->
    * @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(')');

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
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EList<AbstractElement> getElements()
   {
     if (elements == null)

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
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public Operation getOperation()
   {
     if (operation != null && operation.eIsProxy())
@@ -117,6 +118,7 @@ public class OperationCallImpl extends MinimalEObjectImpl.Container implements O
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public void setOperation(Operation newOperation)
   {
     Operation oldOperation = operation;
@@ -130,6 +132,7 @@ public class OperationCallImpl extends MinimalEObjectImpl.Container implements O
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EList<Integer> 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(')');

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
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EList<Parameter> getParams()
   {
     if (params == null)
@@ -115,6 +116,7 @@ public class OperationImpl extends MemberImpl implements Operation
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public Type getReturnType()
   {
     return returnType;
@@ -142,6 +144,7 @@ public class OperationImpl extends MemberImpl implements Operation
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public void setReturnType(Type newReturnType)
   {
     if (newReturnType != returnType)
@@ -163,6 +166,7 @@ public class OperationImpl extends MemberImpl implements Operation
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public OperationCall getOperationCall()
   {
     return operationCall;
@@ -190,6 +194,7 @@ public class OperationImpl extends MemberImpl implements Operation
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public void setOperationCall(OperationCall newOperationCall)
   {
     if (newOperationCall != operationCall)

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
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EList<AbstractElement> getElements()
   {
     if (elements == null)

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
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public String getName()
   {
     return name;
@@ -102,6 +103,7 @@ public class ParameterImpl extends MinimalEObjectImpl.Container implements Param
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public void setName(String newName)
   {
     String oldName = name;
@@ -115,6 +117,7 @@ public class ParameterImpl extends MinimalEObjectImpl.Container implements Param
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public Type getType()
   {
     return type;
@@ -142,6 +145,7 @@ public class ParameterImpl extends MinimalEObjectImpl.Container implements Param
    * <!-- end-user-doc -->
    * @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(')');

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
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public String getName()
   {
     return name;
@@ -87,6 +88,7 @@ public class PrimitiveTypeImpl extends TypeImpl implements PrimitiveType
    * <!-- end-user-doc -->
    * @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(')');

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
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public Type getType()
   {
     return type;
@@ -97,6 +98,7 @@ public class PropertyImpl extends MemberImpl implements Property
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public void setType(Type newType)
   {
     if (newType != type)

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
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public Model createModel()
   {
     ModelImpl model = new ModelImpl();
@@ -102,6 +103,7 @@ public class TestLanguageFactoryImpl extends EFactoryImpl implements TestLanguag
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public PackageDeclaration createPackageDeclaration()
   {
     PackageDeclarationImpl packageDeclaration = new PackageDeclarationImpl();
@@ -113,6 +115,7 @@ public class TestLanguageFactoryImpl extends EFactoryImpl implements TestLanguag
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public AbstractElement createAbstractElement()
   {
     AbstractElementImpl abstractElement = new AbstractElementImpl();
@@ -124,6 +127,7 @@ public class TestLanguageFactoryImpl extends EFactoryImpl implements TestLanguag
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public TypeDeclaration createTypeDeclaration()
   {
     TypeDeclarationImpl typeDeclaration = new TypeDeclarationImpl();
@@ -135,6 +139,7 @@ public class TestLanguageFactoryImpl extends EFactoryImpl implements TestLanguag
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public Member createMember()
   {
     MemberImpl member = new MemberImpl();
@@ -146,6 +151,7 @@ public class TestLanguageFactoryImpl extends EFactoryImpl implements TestLanguag
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public Property createProperty()
   {
     PropertyImpl property = new PropertyImpl();
@@ -157,6 +163,7 @@ public class TestLanguageFactoryImpl extends EFactoryImpl implements TestLanguag
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public Type createType()
   {
     TypeImpl type = new TypeImpl();
@@ -168,6 +175,7 @@ public class TestLanguageFactoryImpl extends EFactoryImpl implements TestLanguag
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public Operation createOperation()
   {
     OperationImpl operation = new OperationImpl();
@@ -179,6 +187,7 @@ public class TestLanguageFactoryImpl extends EFactoryImpl implements TestLanguag
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public OperationCall createOperationCall()
   {
     OperationCallImpl operationCall = new OperationCallImpl();
@@ -190,6 +199,7 @@ public class TestLanguageFactoryImpl extends EFactoryImpl implements TestLanguag
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public Parameter createParameter()
   {
     ParameterImpl parameter = new ParameterImpl();
@@ -201,6 +211,7 @@ public class TestLanguageFactoryImpl extends EFactoryImpl implements TestLanguag
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public TypeReference createTypeReference()
   {
     TypeReferenceImpl typeReference = new TypeReferenceImpl();
@@ -212,6 +223,7 @@ public class TestLanguageFactoryImpl extends EFactoryImpl implements TestLanguag
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public PrimitiveType createPrimitiveType()
   {
     PrimitiveTypeImpl primitiveType = new PrimitiveTypeImpl();
@@ -223,6 +235,7 @@ public class TestLanguageFactoryImpl extends EFactoryImpl implements TestLanguag
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public TestLanguagePackage getTestLanguagePackage()
   {
     return (TestLanguagePackage)getEPackage();

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 <b>Package</b> for this model, and for any others upon which it depends.
-   * 
+   *
    * <p>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.
    * <!-- begin-user-doc -->
@@ -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
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getModel()
   {
     return modelEClass;
@@ -203,6 +204,7 @@ public class TestLanguagePackageImpl extends EPackageImpl implements TestLanguag
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EReference getModel_Elements()
   {
     return (EReference)modelEClass.getEStructuralFeatures().get(0);
@@ -213,6 +215,7 @@ public class TestLanguagePackageImpl extends EPackageImpl implements TestLanguag
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getPackageDeclaration()
   {
     return packageDeclarationEClass;
@@ -223,6 +226,7 @@ public class TestLanguagePackageImpl extends EPackageImpl implements TestLanguag
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EReference getPackageDeclaration_Elements()
   {
     return (EReference)packageDeclarationEClass.getEStructuralFeatures().get(0);
@@ -233,6 +237,7 @@ public class TestLanguagePackageImpl extends EPackageImpl implements TestLanguag
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getAbstractElement()
   {
     return abstractElementEClass;
@@ -243,6 +248,7 @@ public class TestLanguagePackageImpl extends EPackageImpl implements TestLanguag
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EAttribute getAbstractElement_Name()
   {
     return (EAttribute)abstractElementEClass.getEStructuralFeatures().get(0);
@@ -253,6 +259,7 @@ public class TestLanguagePackageImpl extends EPackageImpl implements TestLanguag
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getTypeDeclaration()
   {
     return typeDeclarationEClass;
@@ -263,6 +270,7 @@ public class TestLanguagePackageImpl extends EPackageImpl implements TestLanguag
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EReference getTypeDeclaration_SuperType()
   {
     return (EReference)typeDeclarationEClass.getEStructuralFeatures().get(0);
@@ -273,6 +281,7 @@ public class TestLanguagePackageImpl extends EPackageImpl implements TestLanguag
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EReference getTypeDeclaration_Members()
   {
     return (EReference)typeDeclarationEClass.getEStructuralFeatures().get(1);
@@ -283,6 +292,7 @@ public class TestLanguagePackageImpl extends EPackageImpl implements TestLanguag
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getMember()
   {
     return memberEClass;
@@ -293,6 +303,7 @@ public class TestLanguagePackageImpl extends EPackageImpl implements TestLanguag
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EAttribute getMember_Name()
   {
     return (EAttribute)memberEClass.getEStructuralFeatures().get(0);
@@ -303,6 +314,7 @@ public class TestLanguagePackageImpl extends EPackageImpl implements TestLanguag
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getProperty()
   {
     return propertyEClass;
@@ -313,6 +325,7 @@ public class TestLanguagePackageImpl extends EPackageImpl implements TestLanguag
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EReference getProperty_Type()
   {
     return (EReference)propertyEClass.getEStructuralFeatures().get(0);
@@ -323,6 +336,7 @@ public class TestLanguagePackageImpl extends EPackageImpl implements TestLanguag
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getType()
   {
     return typeEClass;
@@ -333,6 +347,7 @@ public class TestLanguagePackageImpl extends EPackageImpl implements TestLanguag
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EAttribute getType_ArrayDiemensions()
   {
     return (EAttribute)typeEClass.getEStructuralFeatures().get(0);
@@ -343,6 +358,7 @@ public class TestLanguagePackageImpl extends EPackageImpl implements TestLanguag
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getOperation()
   {
     return operationEClass;
@@ -353,6 +369,7 @@ public class TestLanguagePackageImpl extends EPackageImpl implements TestLanguag
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EReference getOperation_Params()
   {
     return (EReference)operationEClass.getEStructuralFeatures().get(0);
@@ -363,6 +380,7 @@ public class TestLanguagePackageImpl extends EPackageImpl implements TestLanguag
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EReference getOperation_ReturnType()
   {
     return (EReference)operationEClass.getEStructuralFeatures().get(1);
@@ -373,6 +391,7 @@ public class TestLanguagePackageImpl extends EPackageImpl implements TestLanguag
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EReference getOperation_OperationCall()
   {
     return (EReference)operationEClass.getEStructuralFeatures().get(2);
@@ -383,6 +402,7 @@ public class TestLanguagePackageImpl extends EPackageImpl implements TestLanguag
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getOperationCall()
   {
     return operationCallEClass;
@@ -393,6 +413,7 @@ public class TestLanguagePackageImpl extends EPackageImpl implements TestLanguag
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EReference getOperationCall_Operation()
   {
     return (EReference)operationCallEClass.getEStructuralFeatures().get(0);
@@ -403,6 +424,7 @@ public class TestLanguagePackageImpl extends EPackageImpl implements TestLanguag
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EAttribute getOperationCall_Params()
   {
     return (EAttribute)operationCallEClass.getEStructuralFeatures().get(1);
@@ -413,6 +435,7 @@ public class TestLanguagePackageImpl extends EPackageImpl implements TestLanguag
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getParameter()
   {
     return parameterEClass;
@@ -423,6 +446,7 @@ public class TestLanguagePackageImpl extends EPackageImpl implements TestLanguag
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EAttribute getParameter_Name()
   {
     return (EAttribute)parameterEClass.getEStructuralFeatures().get(0);
@@ -433,6 +457,7 @@ public class TestLanguagePackageImpl extends EPackageImpl implements TestLanguag
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EReference getParameter_Type()
   {
     return (EReference)parameterEClass.getEStructuralFeatures().get(1);
@@ -443,6 +468,7 @@ public class TestLanguagePackageImpl extends EPackageImpl implements TestLanguag
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getTypeReference()
   {
     return typeReferenceEClass;
@@ -453,6 +479,7 @@ public class TestLanguagePackageImpl extends EPackageImpl implements TestLanguag
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EReference getTypeReference_TypeRef()
   {
     return (EReference)typeReferenceEClass.getEStructuralFeatures().get(0);
@@ -463,6 +490,7 @@ public class TestLanguagePackageImpl extends EPackageImpl implements TestLanguag
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EClass getPrimitiveType()
   {
     return primitiveTypeEClass;
@@ -473,6 +501,7 @@ public class TestLanguagePackageImpl extends EPackageImpl implements TestLanguag
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EAttribute getPrimitiveType_Name()
   {
     return (EAttribute)primitiveTypeEClass.getEStructuralFeatures().get(0);
@@ -483,6 +512,7 @@ public class TestLanguagePackageImpl extends EPackageImpl implements TestLanguag
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public TestLanguageFactory getTestLanguageFactory()
   {
     return (TestLanguageFactory)getEFactoryInstance();

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
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public TypeDeclaration getSuperType()
   {
     if (superType != null && superType.eIsProxy())
@@ -118,6 +119,7 @@ public class TypeDeclarationImpl extends AbstractElementImpl implements TypeDecl
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public void setSuperType(TypeDeclaration newSuperType)
   {
     TypeDeclaration oldSuperType = superType;
@@ -131,6 +133,7 @@ public class TypeDeclarationImpl extends AbstractElementImpl implements TypeDecl
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EList<Member> getMembers()
   {
     if (members == null)

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
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public EList<String> 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(')');

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
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public TypeDeclaration getTypeRef()
   {
     if (typeRef != null && typeRef.eIsProxy())
@@ -99,6 +100,7 @@ public class TypeReferenceImpl extends TypeImpl implements TypeReference
    * <!-- end-user-doc -->
    * @generated
    */
+  @Override
   public void setTypeRef(TypeDeclaration newTypeRef)
   {
     TypeDeclaration oldTypeRef = typeRef;

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 '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Name</em>' attribute.
 	 * @see #setName(String)
@@ -57,10 +53,6 @@ public interface WithTransient extends EObject
 	/**
 	 * Returns the value of the '<em><b>Package Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Package Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Package Name</em>' attribute.
 	 * @see #setPackageName(String)

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
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public String getName()
 	{
 		return name;
@@ -109,6 +110,7 @@ public class WithTransientImpl extends MinimalEObjectImpl.Container implements W
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setName(String newName)
 	{
 		String oldName = name;
@@ -122,6 +124,7 @@ public class WithTransientImpl extends MinimalEObjectImpl.Container implements W
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public String getPackageName()
 	{
 		return packageName;
@@ -132,6 +135,7 @@ public class WithTransientImpl extends MinimalEObjectImpl.Container implements W
 	 * <!-- end-user-doc -->
 	 * @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: ");

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
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public WithTransient createWithTransient()
 	{
 		WithTransientImpl withTransient = new WithTransientImpl();
@@ -91,6 +92,7 @@ public class WithtransientFactoryImpl extends EFactoryImpl implements Withtransi
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public WithtransientPackage getWithtransientPackage()
 	{
 		return (WithtransientPackage)getEPackage();

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 <b>Package</b> for this model, and for any others upon which it depends.
-	 * 
+	 *
 	 * <p>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.
 	 * <!-- begin-user-doc -->
@@ -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
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getWithTransient()
 	{
 		return withTransientEClass;
@@ -110,6 +111,7 @@ public class WithtransientPackageImpl extends EPackageImpl implements Withtransi
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getWithTransient_Name()
 	{
 		return (EAttribute)withTransientEClass.getEStructuralFeatures().get(0);
@@ -120,6 +122,7 @@ public class WithtransientPackageImpl extends EPackageImpl implements Withtransi
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EAttribute getWithTransient_PackageName()
 	{
 		return (EAttribute)withTransientEClass.getEStructuralFeatures().get(1);
@@ -130,6 +133,7 @@ public class WithtransientPackageImpl extends EPackageImpl implements Withtransi
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public WithtransientFactory getWithtransientFactory()
 	{
 		return (WithtransientFactory)getEFactoryInstance();

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" >
   <foreignModel>WithTransient.ecore</foreignModel>
   <genPackages prefix="Withtransient" basePackage="org.eclipse.xtext.ide.tests.testlanguage"
       disposableProviderFactory="true" ecorePackage="WithTransient.ecore#/">

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">
   <genPackages prefix="BeeLangTestLanguage" basePackage="org.eclipse.xtext.testlanguages.backtracking"
       disposableProviderFactory="true" fileExtensions="beelangtestlanguage" ecorePackage="BeeLangTestLanguage.ecore#/">
     <genClasses ecoreClass="BeeLangTestLanguage.ecore#//Model">

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">
   <genPackages prefix="FileAware" basePackage="org.eclipse.xtext.testlanguages.fileAware"
       disposableProviderFactory="true" fileExtensions="fileawaretestlanguage" ecorePackage="FileAwareTestLanguage.ecore#/">
     <genClasses ecoreClass="FileAwareTestLanguage.ecore#//PackageDeclaration">

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">
   <genPackages prefix="NestedRefs" basePackage="org.eclipse.xtext.testlanguages.nestedRefs"
       disposableProviderFactory="true" fileExtensions="nestedRefs" ecorePackage="NestedRefsTestLanguage.ecore#/">
     <genClasses ecoreClass="NestedRefsTestLanguage.ecore#//Doc">

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">
   <genPackages prefix="NoJdt" basePackage="org.eclipse.xtext.testlanguages.noJdt"
       disposableProviderFactory="true" fileExtensions="nojdt" ecorePackage="NoJdtTestLanguage.ecore#/">
     <genClasses ecoreClass="NoJdtTestLanguage.ecore#//Model">