getType();
+
+ /**
+ * Returns the value of the 'Name' attribute.
+ *
+ *
+ * If the meaning of the 'Name' attribute isn't clear,
+ * there really should be more of a description here...
+ *
+ *
+ * @return the value of the 'Name' attribute.
+ * @see #setName(String)
+ * @see org.eclipse.xtext.linking.lazy.lazyLinking.LazyLinkingPackage#getUnresolvedProxyProperty_Name()
+ * @model
+ * @generated
+ */
+ String getName();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.xtext.linking.lazy.lazyLinking.UnresolvedProxyProperty#getName Name}' attribute.
+ *
+ *
+ * @param value the new value of the 'Name' attribute.
+ * @see #getName()
+ * @generated
+ */
+ void setName(String value);
+
+} // UnresolvedProxyProperty
diff --git a/org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/linking/lazy/lazyLinking/impl/LazyLinkingFactoryImpl.java b/org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/linking/lazy/lazyLinking/impl/LazyLinkingFactoryImpl.java
new file mode 100644
index 000000000..051f541b1
--- /dev/null
+++ b/org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/linking/lazy/lazyLinking/impl/LazyLinkingFactoryImpl.java
@@ -0,0 +1,129 @@
+/**
+ * generated by Xtext
+ */
+package org.eclipse.xtext.linking.lazy.lazyLinking.impl;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+
+import org.eclipse.emf.ecore.impl.EFactoryImpl;
+
+import org.eclipse.emf.ecore.plugin.EcorePlugin;
+
+import org.eclipse.xtext.linking.lazy.lazyLinking.*;
+
+/**
+ *
+ * An implementation of the model Factory.
+ *
+ * @generated
+ */
+public class LazyLinkingFactoryImpl extends EFactoryImpl implements LazyLinkingFactory {
+ /**
+ * Creates the default factory implementation.
+ *
+ *
+ * @generated
+ */
+ public static LazyLinkingFactory init() {
+ try {
+ LazyLinkingFactory theLazyLinkingFactory = (LazyLinkingFactory)EPackage.Registry.INSTANCE.getEFactory(LazyLinkingPackage.eNS_URI);
+ if (theLazyLinkingFactory != null) {
+ return theLazyLinkingFactory;
+ }
+ }
+ catch (Exception exception) {
+ EcorePlugin.INSTANCE.log(exception);
+ }
+ return new LazyLinkingFactoryImpl();
+ }
+
+ /**
+ * Creates an instance of the factory.
+ *
+ *
+ * @generated
+ */
+ public LazyLinkingFactoryImpl() {
+ super();
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ @Override
+ public EObject create(EClass eClass) {
+ switch (eClass.getClassifierID()) {
+ case LazyLinkingPackage.MODEL: return createModel();
+ case LazyLinkingPackage.TYPE: return createType();
+ case LazyLinkingPackage.PROPERTY: return createProperty();
+ case LazyLinkingPackage.UNRESOLVED_PROXY_PROPERTY: return createUnresolvedProxyProperty();
+ default:
+ throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+ }
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public Model createModel() {
+ ModelImpl model = new ModelImpl();
+ return model;
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public Type createType() {
+ TypeImpl type = new TypeImpl();
+ return type;
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public Property createProperty() {
+ PropertyImpl property = new PropertyImpl();
+ return property;
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public UnresolvedProxyProperty createUnresolvedProxyProperty() {
+ UnresolvedProxyPropertyImpl unresolvedProxyProperty = new UnresolvedProxyPropertyImpl();
+ return unresolvedProxyProperty;
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public LazyLinkingPackage getLazyLinkingPackage() {
+ return (LazyLinkingPackage)getEPackage();
+ }
+
+ /**
+ *
+ *
+ * @deprecated
+ * @generated
+ */
+ @Deprecated
+ public static LazyLinkingPackage getPackage() {
+ return LazyLinkingPackage.eINSTANCE;
+ }
+
+} //LazyLinkingFactoryImpl
diff --git a/org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/linking/lazy/lazyLinking/impl/LazyLinkingPackageImpl.java b/org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/linking/lazy/lazyLinking/impl/LazyLinkingPackageImpl.java
new file mode 100644
index 000000000..3d94767e2
--- /dev/null
+++ b/org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/linking/lazy/lazyLinking/impl/LazyLinkingPackageImpl.java
@@ -0,0 +1,359 @@
+/**
+ * generated by Xtext
+ */
+package org.eclipse.xtext.linking.lazy.lazyLinking.impl;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.EcorePackage;
+
+import org.eclipse.emf.ecore.impl.EPackageImpl;
+
+import org.eclipse.xtext.linking.lazy.lazyLinking.LazyLinkingFactory;
+import org.eclipse.xtext.linking.lazy.lazyLinking.LazyLinkingPackage;
+import org.eclipse.xtext.linking.lazy.lazyLinking.Model;
+import org.eclipse.xtext.linking.lazy.lazyLinking.Property;
+import org.eclipse.xtext.linking.lazy.lazyLinking.Type;
+import org.eclipse.xtext.linking.lazy.lazyLinking.UnresolvedProxyProperty;
+
+/**
+ *
+ * An implementation of the model Package.
+ *
+ * @generated
+ */
+public class LazyLinkingPackageImpl extends EPackageImpl implements LazyLinkingPackage {
+ /**
+ *
+ *
+ * @generated
+ */
+ private EClass modelEClass = null;
+
+ /**
+ *
+ *
+ * @generated
+ */
+ private EClass typeEClass = null;
+
+ /**
+ *
+ *
+ * @generated
+ */
+ private EClass propertyEClass = null;
+
+ /**
+ *
+ *
+ * @generated
+ */
+ private EClass unresolvedProxyPropertyEClass = null;
+
+ /**
+ * Creates an instance of the model Package, registered with
+ * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+ * package URI value.
+ * Note: the correct way to create the package is via the static
+ * factory method {@link #init init()}, which also performs
+ * initialization of the package, or returns the registered package,
+ * if one already exists.
+ *
+ *
+ * @see org.eclipse.emf.ecore.EPackage.Registry
+ * @see org.eclipse.xtext.linking.lazy.lazyLinking.LazyLinkingPackage#eNS_URI
+ * @see #init()
+ * @generated
+ */
+ private LazyLinkingPackageImpl() {
+ super(eNS_URI, LazyLinkingFactory.eINSTANCE);
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ private static boolean isInited = false;
+
+ /**
+ * Creates, registers, and initializes the Package for this model, and for any others upon which it depends.
+ *
+ *
This method is used to initialize {@link LazyLinkingPackage#eINSTANCE} when that field is accessed.
+ * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
+ *
+ *
+ * @see #eNS_URI
+ * @see #createPackageContents()
+ * @see #initializePackageContents()
+ * @generated
+ */
+ public static LazyLinkingPackage init() {
+ if (isInited) return (LazyLinkingPackage)EPackage.Registry.INSTANCE.getEPackage(LazyLinkingPackage.eNS_URI);
+
+ // Obtain or create and register package
+ LazyLinkingPackageImpl theLazyLinkingPackage = (LazyLinkingPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof LazyLinkingPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new LazyLinkingPackageImpl());
+
+ isInited = true;
+
+ // Initialize simple dependencies
+ EcorePackage.eINSTANCE.eClass();
+
+ // Create package meta-data objects
+ theLazyLinkingPackage.createPackageContents();
+
+ // Initialize created meta-data
+ theLazyLinkingPackage.initializePackageContents();
+
+ // Mark meta-data to indicate it can't be changed
+ theLazyLinkingPackage.freeze();
+
+
+ // Update the registry and return the package
+ EPackage.Registry.INSTANCE.put(LazyLinkingPackage.eNS_URI, theLazyLinkingPackage);
+ return theLazyLinkingPackage;
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public EClass getModel() {
+ return modelEClass;
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public EReference getModel_Types() {
+ return (EReference)modelEClass.getEStructuralFeatures().get(0);
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public EClass getType() {
+ return typeEClass;
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public EAttribute getType_Name() {
+ return (EAttribute)typeEClass.getEStructuralFeatures().get(0);
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public EReference getType_Extends() {
+ return (EReference)typeEClass.getEStructuralFeatures().get(1);
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public EReference getType_ParentId() {
+ return (EReference)typeEClass.getEStructuralFeatures().get(2);
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public EReference getType_Properties() {
+ return (EReference)typeEClass.getEStructuralFeatures().get(3);
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public EReference getType_UnresolvedProxyProperty() {
+ return (EReference)typeEClass.getEStructuralFeatures().get(4);
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public EReference getType_Subtypes() {
+ return (EReference)typeEClass.getEStructuralFeatures().get(5);
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public EClass getProperty() {
+ return propertyEClass;
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public EReference getProperty_Type() {
+ return (EReference)propertyEClass.getEStructuralFeatures().get(0);
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public EAttribute getProperty_Name() {
+ return (EAttribute)propertyEClass.getEStructuralFeatures().get(1);
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public EClass getUnresolvedProxyProperty() {
+ return unresolvedProxyPropertyEClass;
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public EReference getUnresolvedProxyProperty_Type() {
+ return (EReference)unresolvedProxyPropertyEClass.getEStructuralFeatures().get(0);
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public EAttribute getUnresolvedProxyProperty_Name() {
+ return (EAttribute)unresolvedProxyPropertyEClass.getEStructuralFeatures().get(1);
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public LazyLinkingFactory getLazyLinkingFactory() {
+ return (LazyLinkingFactory)getEFactoryInstance();
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ private boolean isCreated = false;
+
+ /**
+ * Creates the meta-model objects for the package. This method is
+ * guarded to have no affect on any invocation but its first.
+ *
+ *
+ * @generated
+ */
+ public void createPackageContents() {
+ if (isCreated) return;
+ isCreated = true;
+
+ // Create classes and their features
+ modelEClass = createEClass(MODEL);
+ createEReference(modelEClass, MODEL__TYPES);
+
+ typeEClass = createEClass(TYPE);
+ createEAttribute(typeEClass, TYPE__NAME);
+ createEReference(typeEClass, TYPE__EXTENDS);
+ createEReference(typeEClass, TYPE__PARENT_ID);
+ createEReference(typeEClass, TYPE__PROPERTIES);
+ createEReference(typeEClass, TYPE__UNRESOLVED_PROXY_PROPERTY);
+ createEReference(typeEClass, TYPE__SUBTYPES);
+
+ propertyEClass = createEClass(PROPERTY);
+ createEReference(propertyEClass, PROPERTY__TYPE);
+ createEAttribute(propertyEClass, PROPERTY__NAME);
+
+ unresolvedProxyPropertyEClass = createEClass(UNRESOLVED_PROXY_PROPERTY);
+ createEReference(unresolvedProxyPropertyEClass, UNRESOLVED_PROXY_PROPERTY__TYPE);
+ createEAttribute(unresolvedProxyPropertyEClass, UNRESOLVED_PROXY_PROPERTY__NAME);
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ private boolean isInitialized = false;
+
+ /**
+ * Complete the initialization of the package and its meta-model. This
+ * method is guarded to have no affect on any invocation but its first.
+ *
+ *
+ * @generated
+ */
+ public void initializePackageContents() {
+ if (isInitialized) return;
+ isInitialized = true;
+
+ // Initialize package
+ setName(eNAME);
+ setNsPrefix(eNS_PREFIX);
+ setNsURI(eNS_URI);
+
+ // Obtain other dependent packages
+ EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
+
+ // Create type parameters
+
+ // Set bounds for type parameters
+
+ // Add supertypes to classes
+
+ // Initialize classes and features; add operations and parameters
+ initEClass(modelEClass, Model.class, "Model", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEReference(getModel_Types(), this.getType(), null, "types", null, 0, -1, Model.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+ initEClass(typeEClass, Type.class, "Type", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEAttribute(getType_Name(), theEcorePackage.getEString(), "name", null, 0, 1, Type.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getType_Extends(), this.getType(), this.getType_Subtypes(), "extends", null, 0, 1, Type.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getType_ParentId(), this.getProperty(), null, "parentId", null, 0, 1, Type.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getType_Properties(), this.getProperty(), null, "properties", null, 0, -1, Type.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getType_UnresolvedProxyProperty(), this.getUnresolvedProxyProperty(), null, "unresolvedProxyProperty", null, 0, -1, Type.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getType_Subtypes(), this.getType(), this.getType_Extends(), "subtypes", null, 0, -1, Type.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+ initEClass(propertyEClass, Property.class, "Property", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEReference(getProperty_Type(), this.getType(), null, "type", null, 0, -1, Property.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getProperty_Name(), theEcorePackage.getEString(), "name", null, 0, 1, Property.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+ initEClass(unresolvedProxyPropertyEClass, UnresolvedProxyProperty.class, "UnresolvedProxyProperty", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEReference(getUnresolvedProxyProperty_Type(), this.getType(), null, "type", null, 0, -1, UnresolvedProxyProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getUnresolvedProxyProperty_Name(), theEcorePackage.getEString(), "name", null, 0, 1, UnresolvedProxyProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+ // Create resource
+ createResource(eNS_URI);
+ }
+
+} //LazyLinkingPackageImpl
diff --git a/org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/linking/lazy/lazyLinking/impl/ModelImpl.java b/org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/linking/lazy/lazyLinking/impl/ModelImpl.java
new file mode 100644
index 000000000..c01920824
--- /dev/null
+++ b/org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/linking/lazy/lazyLinking/impl/ModelImpl.java
@@ -0,0 +1,153 @@
+/**
+ * generated by Xtext
+ */
+package org.eclipse.xtext.linking.lazy.lazyLinking.impl;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.NotificationChain;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+
+import org.eclipse.xtext.linking.lazy.lazyLinking.LazyLinkingPackage;
+import org.eclipse.xtext.linking.lazy.lazyLinking.Model;
+import org.eclipse.xtext.linking.lazy.lazyLinking.Type;
+
+/**
+ *
+ * An implementation of the model object 'Model'.
+ *
+ *
+ * The following features are implemented:
+ *
+ *
+ * - {@link org.eclipse.xtext.linking.lazy.lazyLinking.impl.ModelImpl#getTypes Types}
+ *
+ *
+ * @generated
+ */
+public class ModelImpl extends MinimalEObjectImpl.Container implements Model {
+ /**
+ * The cached value of the '{@link #getTypes() Types}' containment reference list.
+ *
+ *
+ * @see #getTypes()
+ * @generated
+ * @ordered
+ */
+ protected EList types;
+
+ /**
+ *
+ *
+ * @generated
+ */
+ protected ModelImpl() {
+ super();
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ @Override
+ protected EClass eStaticClass() {
+ return LazyLinkingPackage.Literals.MODEL;
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public EList getTypes() {
+ if (types == null) {
+ types = new EObjectContainmentEList(Type.class, this, LazyLinkingPackage.MODEL__TYPES);
+ }
+ return types;
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ @Override
+ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+ switch (featureID) {
+ case LazyLinkingPackage.MODEL__TYPES:
+ return ((InternalEList)getTypes()).basicRemove(otherEnd, msgs);
+ }
+ return super.eInverseRemove(otherEnd, featureID, msgs);
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ @Override
+ public Object eGet(int featureID, boolean resolve, boolean coreType) {
+ switch (featureID) {
+ case LazyLinkingPackage.MODEL__TYPES:
+ return getTypes();
+ }
+ return super.eGet(featureID, resolve, coreType);
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ @SuppressWarnings("unchecked")
+ @Override
+ public void eSet(int featureID, Object newValue) {
+ switch (featureID) {
+ case LazyLinkingPackage.MODEL__TYPES:
+ getTypes().clear();
+ getTypes().addAll((Collection)newValue);
+ return;
+ }
+ super.eSet(featureID, newValue);
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ @Override
+ public void eUnset(int featureID) {
+ switch (featureID) {
+ case LazyLinkingPackage.MODEL__TYPES:
+ getTypes().clear();
+ return;
+ }
+ super.eUnset(featureID);
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ @Override
+ public boolean eIsSet(int featureID) {
+ switch (featureID) {
+ case LazyLinkingPackage.MODEL__TYPES:
+ return types != null && !types.isEmpty();
+ }
+ return super.eIsSet(featureID);
+ }
+
+} //ModelImpl
diff --git a/org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/linking/lazy/lazyLinking/impl/PropertyImpl.java b/org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/linking/lazy/lazyLinking/impl/PropertyImpl.java
new file mode 100644
index 000000000..bf1ded9a0
--- /dev/null
+++ b/org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/linking/lazy/lazyLinking/impl/PropertyImpl.java
@@ -0,0 +1,206 @@
+/**
+ * generated by Xtext
+ */
+package org.eclipse.xtext.linking.lazy.lazyLinking.impl;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
+import org.eclipse.emf.ecore.util.EObjectResolvingEList;
+
+import org.eclipse.xtext.linking.lazy.lazyLinking.LazyLinkingPackage;
+import org.eclipse.xtext.linking.lazy.lazyLinking.Property;
+import org.eclipse.xtext.linking.lazy.lazyLinking.Type;
+
+/**
+ *
+ * An implementation of the model object 'Property'.
+ *
+ *
+ * The following features are implemented:
+ *
+ *
+ * - {@link org.eclipse.xtext.linking.lazy.lazyLinking.impl.PropertyImpl#getType Type}
+ * - {@link org.eclipse.xtext.linking.lazy.lazyLinking.impl.PropertyImpl#getName Name}
+ *
+ *
+ * @generated
+ */
+public class PropertyImpl extends MinimalEObjectImpl.Container implements Property {
+ /**
+ * The cached value of the '{@link #getType() Type}' reference list.
+ *
+ *
+ * @see #getType()
+ * @generated
+ * @ordered
+ */
+ protected EList type;
+
+ /**
+ * The default value of the '{@link #getName() Name}' attribute.
+ *
+ *
+ * @see #getName()
+ * @generated
+ * @ordered
+ */
+ protected static final String NAME_EDEFAULT = null;
+
+ /**
+ * The cached value of the '{@link #getName() Name}' attribute.
+ *
+ *
+ * @see #getName()
+ * @generated
+ * @ordered
+ */
+ protected String name = NAME_EDEFAULT;
+
+ /**
+ *
+ *
+ * @generated
+ */
+ protected PropertyImpl() {
+ super();
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ @Override
+ protected EClass eStaticClass() {
+ return LazyLinkingPackage.Literals.PROPERTY;
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public EList getType() {
+ if (type == null) {
+ type = new EObjectResolvingEList(Type.class, this, LazyLinkingPackage.PROPERTY__TYPE);
+ }
+ return type;
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public String getName() {
+ return name;
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public void setName(String newName) {
+ String oldName = name;
+ name = newName;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, LazyLinkingPackage.PROPERTY__NAME, oldName, name));
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ @Override
+ public Object eGet(int featureID, boolean resolve, boolean coreType) {
+ switch (featureID) {
+ case LazyLinkingPackage.PROPERTY__TYPE:
+ return getType();
+ case LazyLinkingPackage.PROPERTY__NAME:
+ return getName();
+ }
+ return super.eGet(featureID, resolve, coreType);
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ @SuppressWarnings("unchecked")
+ @Override
+ public void eSet(int featureID, Object newValue) {
+ switch (featureID) {
+ case LazyLinkingPackage.PROPERTY__TYPE:
+ getType().clear();
+ getType().addAll((Collection)newValue);
+ return;
+ case LazyLinkingPackage.PROPERTY__NAME:
+ setName((String)newValue);
+ return;
+ }
+ super.eSet(featureID, newValue);
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ @Override
+ public void eUnset(int featureID) {
+ switch (featureID) {
+ case LazyLinkingPackage.PROPERTY__TYPE:
+ getType().clear();
+ return;
+ case LazyLinkingPackage.PROPERTY__NAME:
+ setName(NAME_EDEFAULT);
+ return;
+ }
+ super.eUnset(featureID);
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ @Override
+ public boolean eIsSet(int featureID) {
+ switch (featureID) {
+ case LazyLinkingPackage.PROPERTY__TYPE:
+ return type != null && !type.isEmpty();
+ case LazyLinkingPackage.PROPERTY__NAME:
+ return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+ }
+ return super.eIsSet(featureID);
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ @Override
+ public String toString() {
+ if (eIsProxy()) return super.toString();
+
+ StringBuffer result = new StringBuffer(super.toString());
+ result.append(" (name: ");
+ result.append(name);
+ result.append(')');
+ return result.toString();
+ }
+
+} //PropertyImpl
diff --git a/org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/linking/lazy/lazyLinking/impl/TypeImpl.java b/org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/linking/lazy/lazyLinking/impl/TypeImpl.java
new file mode 100644
index 000000000..ae3a9e753
--- /dev/null
+++ b/org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/linking/lazy/lazyLinking/impl/TypeImpl.java
@@ -0,0 +1,460 @@
+/**
+ * generated by Xtext
+ */
+package org.eclipse.xtext.linking.lazy.lazyLinking.impl;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+
+import org.eclipse.xtext.linking.lazy.lazyLinking.LazyLinkingPackage;
+import org.eclipse.xtext.linking.lazy.lazyLinking.Property;
+import org.eclipse.xtext.linking.lazy.lazyLinking.Type;
+import org.eclipse.xtext.linking.lazy.lazyLinking.UnresolvedProxyProperty;
+
+/**
+ *
+ * An implementation of the model object 'Type'.
+ *
+ *
+ * The following features are implemented:
+ *
+ *
+ * - {@link org.eclipse.xtext.linking.lazy.lazyLinking.impl.TypeImpl#getName Name}
+ * - {@link org.eclipse.xtext.linking.lazy.lazyLinking.impl.TypeImpl#getExtends Extends}
+ * - {@link org.eclipse.xtext.linking.lazy.lazyLinking.impl.TypeImpl#getParentId Parent Id}
+ * - {@link org.eclipse.xtext.linking.lazy.lazyLinking.impl.TypeImpl#getProperties Properties}
+ * - {@link org.eclipse.xtext.linking.lazy.lazyLinking.impl.TypeImpl#getUnresolvedProxyProperty Unresolved Proxy Property}
+ * - {@link org.eclipse.xtext.linking.lazy.lazyLinking.impl.TypeImpl#getSubtypes Subtypes}
+ *
+ *
+ * @generated
+ */
+public class TypeImpl extends MinimalEObjectImpl.Container implements Type {
+ /**
+ * The default value of the '{@link #getName() Name}' attribute.
+ *
+ *
+ * @see #getName()
+ * @generated
+ * @ordered
+ */
+ protected static final String NAME_EDEFAULT = null;
+
+ /**
+ * The cached value of the '{@link #getName() Name}' attribute.
+ *
+ *
+ * @see #getName()
+ * @generated
+ * @ordered
+ */
+ protected String name = NAME_EDEFAULT;
+
+ /**
+ * The cached value of the '{@link #getExtends() Extends}' reference.
+ *
+ *
+ * @see #getExtends()
+ * @generated
+ * @ordered
+ */
+ protected Type extends_;
+
+ /**
+ * The cached value of the '{@link #getParentId() Parent Id}' reference.
+ *
+ *
+ * @see #getParentId()
+ * @generated
+ * @ordered
+ */
+ protected Property parentId;
+
+ /**
+ * The cached value of the '{@link #getProperties() Properties}' containment reference list.
+ *
+ *
+ * @see #getProperties()
+ * @generated
+ * @ordered
+ */
+ protected EList properties;
+
+ /**
+ * The cached value of the '{@link #getUnresolvedProxyProperty() Unresolved Proxy Property}' containment reference list.
+ *
+ *
+ * @see #getUnresolvedProxyProperty()
+ * @generated
+ * @ordered
+ */
+ protected EList unresolvedProxyProperty;
+
+ /**
+ * The cached value of the '{@link #getSubtypes() Subtypes}' reference list.
+ *
+ *
+ * @see #getSubtypes()
+ * @generated
+ * @ordered
+ */
+ protected EList subtypes;
+
+ /**
+ *
+ *
+ * @generated
+ */
+ protected TypeImpl() {
+ super();
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ @Override
+ protected EClass eStaticClass() {
+ return LazyLinkingPackage.Literals.TYPE;
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public String getName() {
+ return name;
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public void setName(String newName) {
+ String oldName = name;
+ name = newName;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, LazyLinkingPackage.TYPE__NAME, oldName, name));
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public Type getExtends() {
+ if (extends_ != null && extends_.eIsProxy()) {
+ InternalEObject oldExtends = (InternalEObject)extends_;
+ extends_ = (Type)eResolveProxy(oldExtends);
+ if (extends_ != oldExtends) {
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.RESOLVE, LazyLinkingPackage.TYPE__EXTENDS, oldExtends, extends_));
+ }
+ }
+ return extends_;
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public Type basicGetExtends() {
+ return extends_;
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public NotificationChain basicSetExtends(Type newExtends, NotificationChain msgs) {
+ Type oldExtends = extends_;
+ extends_ = newExtends;
+ if (eNotificationRequired()) {
+ ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, LazyLinkingPackage.TYPE__EXTENDS, oldExtends, newExtends);
+ if (msgs == null) msgs = notification; else msgs.add(notification);
+ }
+ return msgs;
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public void setExtends(Type newExtends) {
+ if (newExtends != extends_) {
+ NotificationChain msgs = null;
+ if (extends_ != null)
+ msgs = ((InternalEObject)extends_).eInverseRemove(this, LazyLinkingPackage.TYPE__SUBTYPES, Type.class, msgs);
+ if (newExtends != null)
+ msgs = ((InternalEObject)newExtends).eInverseAdd(this, LazyLinkingPackage.TYPE__SUBTYPES, Type.class, msgs);
+ msgs = basicSetExtends(newExtends, msgs);
+ if (msgs != null) msgs.dispatch();
+ }
+ else if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, LazyLinkingPackage.TYPE__EXTENDS, newExtends, newExtends));
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public Property getParentId() {
+ if (parentId != null && parentId.eIsProxy()) {
+ InternalEObject oldParentId = (InternalEObject)parentId;
+ parentId = (Property)eResolveProxy(oldParentId);
+ if (parentId != oldParentId) {
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.RESOLVE, LazyLinkingPackage.TYPE__PARENT_ID, oldParentId, parentId));
+ }
+ }
+ return parentId;
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public Property basicGetParentId() {
+ return parentId;
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public void setParentId(Property newParentId) {
+ Property oldParentId = parentId;
+ parentId = newParentId;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, LazyLinkingPackage.TYPE__PARENT_ID, oldParentId, parentId));
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public EList getProperties() {
+ if (properties == null) {
+ properties = new EObjectContainmentEList(Property.class, this, LazyLinkingPackage.TYPE__PROPERTIES);
+ }
+ return properties;
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public EList getUnresolvedProxyProperty() {
+ if (unresolvedProxyProperty == null) {
+ unresolvedProxyProperty = new EObjectContainmentEList(UnresolvedProxyProperty.class, this, LazyLinkingPackage.TYPE__UNRESOLVED_PROXY_PROPERTY);
+ }
+ return unresolvedProxyProperty;
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public EList getSubtypes() {
+ if (subtypes == null) {
+ subtypes = new EObjectWithInverseResolvingEList(Type.class, this, LazyLinkingPackage.TYPE__SUBTYPES, LazyLinkingPackage.TYPE__EXTENDS);
+ }
+ return subtypes;
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ @SuppressWarnings("unchecked")
+ @Override
+ public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+ switch (featureID) {
+ case LazyLinkingPackage.TYPE__EXTENDS:
+ if (extends_ != null)
+ msgs = ((InternalEObject)extends_).eInverseRemove(this, LazyLinkingPackage.TYPE__SUBTYPES, Type.class, msgs);
+ return basicSetExtends((Type)otherEnd, msgs);
+ case LazyLinkingPackage.TYPE__SUBTYPES:
+ return ((InternalEList)(InternalEList)getSubtypes()).basicAdd(otherEnd, msgs);
+ }
+ return super.eInverseAdd(otherEnd, featureID, msgs);
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ @Override
+ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+ switch (featureID) {
+ case LazyLinkingPackage.TYPE__EXTENDS:
+ return basicSetExtends(null, msgs);
+ case LazyLinkingPackage.TYPE__PROPERTIES:
+ return ((InternalEList)getProperties()).basicRemove(otherEnd, msgs);
+ case LazyLinkingPackage.TYPE__UNRESOLVED_PROXY_PROPERTY:
+ return ((InternalEList)getUnresolvedProxyProperty()).basicRemove(otherEnd, msgs);
+ case LazyLinkingPackage.TYPE__SUBTYPES:
+ return ((InternalEList)getSubtypes()).basicRemove(otherEnd, msgs);
+ }
+ return super.eInverseRemove(otherEnd, featureID, msgs);
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ @Override
+ public Object eGet(int featureID, boolean resolve, boolean coreType) {
+ switch (featureID) {
+ case LazyLinkingPackage.TYPE__NAME:
+ return getName();
+ case LazyLinkingPackage.TYPE__EXTENDS:
+ if (resolve) return getExtends();
+ return basicGetExtends();
+ case LazyLinkingPackage.TYPE__PARENT_ID:
+ if (resolve) return getParentId();
+ return basicGetParentId();
+ case LazyLinkingPackage.TYPE__PROPERTIES:
+ return getProperties();
+ case LazyLinkingPackage.TYPE__UNRESOLVED_PROXY_PROPERTY:
+ return getUnresolvedProxyProperty();
+ case LazyLinkingPackage.TYPE__SUBTYPES:
+ return getSubtypes();
+ }
+ return super.eGet(featureID, resolve, coreType);
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ @SuppressWarnings("unchecked")
+ @Override
+ public void eSet(int featureID, Object newValue) {
+ switch (featureID) {
+ case LazyLinkingPackage.TYPE__NAME:
+ setName((String)newValue);
+ return;
+ case LazyLinkingPackage.TYPE__EXTENDS:
+ setExtends((Type)newValue);
+ return;
+ case LazyLinkingPackage.TYPE__PARENT_ID:
+ setParentId((Property)newValue);
+ return;
+ case LazyLinkingPackage.TYPE__PROPERTIES:
+ getProperties().clear();
+ getProperties().addAll((Collection)newValue);
+ return;
+ case LazyLinkingPackage.TYPE__UNRESOLVED_PROXY_PROPERTY:
+ getUnresolvedProxyProperty().clear();
+ getUnresolvedProxyProperty().addAll((Collection)newValue);
+ return;
+ case LazyLinkingPackage.TYPE__SUBTYPES:
+ getSubtypes().clear();
+ getSubtypes().addAll((Collection)newValue);
+ return;
+ }
+ super.eSet(featureID, newValue);
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ @Override
+ public void eUnset(int featureID) {
+ switch (featureID) {
+ case LazyLinkingPackage.TYPE__NAME:
+ setName(NAME_EDEFAULT);
+ return;
+ case LazyLinkingPackage.TYPE__EXTENDS:
+ setExtends((Type)null);
+ return;
+ case LazyLinkingPackage.TYPE__PARENT_ID:
+ setParentId((Property)null);
+ return;
+ case LazyLinkingPackage.TYPE__PROPERTIES:
+ getProperties().clear();
+ return;
+ case LazyLinkingPackage.TYPE__UNRESOLVED_PROXY_PROPERTY:
+ getUnresolvedProxyProperty().clear();
+ return;
+ case LazyLinkingPackage.TYPE__SUBTYPES:
+ getSubtypes().clear();
+ return;
+ }
+ super.eUnset(featureID);
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ @Override
+ public boolean eIsSet(int featureID) {
+ switch (featureID) {
+ case LazyLinkingPackage.TYPE__NAME:
+ return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+ case LazyLinkingPackage.TYPE__EXTENDS:
+ return extends_ != null;
+ case LazyLinkingPackage.TYPE__PARENT_ID:
+ return parentId != null;
+ case LazyLinkingPackage.TYPE__PROPERTIES:
+ return properties != null && !properties.isEmpty();
+ case LazyLinkingPackage.TYPE__UNRESOLVED_PROXY_PROPERTY:
+ return unresolvedProxyProperty != null && !unresolvedProxyProperty.isEmpty();
+ case LazyLinkingPackage.TYPE__SUBTYPES:
+ return subtypes != null && !subtypes.isEmpty();
+ }
+ return super.eIsSet(featureID);
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ @Override
+ public String toString() {
+ if (eIsProxy()) return super.toString();
+
+ StringBuffer result = new StringBuffer(super.toString());
+ result.append(" (name: ");
+ result.append(name);
+ result.append(')');
+ return result.toString();
+ }
+
+} //TypeImpl
diff --git a/org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/linking/lazy/lazyLinking/impl/UnresolvedProxyPropertyImpl.java b/org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/linking/lazy/lazyLinking/impl/UnresolvedProxyPropertyImpl.java
new file mode 100644
index 000000000..df82fbe44
--- /dev/null
+++ b/org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/linking/lazy/lazyLinking/impl/UnresolvedProxyPropertyImpl.java
@@ -0,0 +1,206 @@
+/**
+ * generated by Xtext
+ */
+package org.eclipse.xtext.linking.lazy.lazyLinking.impl;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
+import org.eclipse.emf.ecore.util.EObjectEList;
+
+import org.eclipse.xtext.linking.lazy.lazyLinking.LazyLinkingPackage;
+import org.eclipse.xtext.linking.lazy.lazyLinking.Type;
+import org.eclipse.xtext.linking.lazy.lazyLinking.UnresolvedProxyProperty;
+
+/**
+ *
+ * An implementation of the model object 'Unresolved Proxy Property'.
+ *
+ *
+ * The following features are implemented:
+ *
+ *
+ * - {@link org.eclipse.xtext.linking.lazy.lazyLinking.impl.UnresolvedProxyPropertyImpl#getType Type}
+ * - {@link org.eclipse.xtext.linking.lazy.lazyLinking.impl.UnresolvedProxyPropertyImpl#getName Name}
+ *
+ *
+ * @generated
+ */
+public class UnresolvedProxyPropertyImpl extends MinimalEObjectImpl.Container implements UnresolvedProxyProperty {
+ /**
+ * The cached value of the '{@link #getType() Type}' reference list.
+ *
+ *
+ * @see #getType()
+ * @generated
+ * @ordered
+ */
+ protected EList type;
+
+ /**
+ * The default value of the '{@link #getName() Name}' attribute.
+ *
+ *
+ * @see #getName()
+ * @generated
+ * @ordered
+ */
+ protected static final String NAME_EDEFAULT = null;
+
+ /**
+ * The cached value of the '{@link #getName() Name}' attribute.
+ *
+ *
+ * @see #getName()
+ * @generated
+ * @ordered
+ */
+ protected String name = NAME_EDEFAULT;
+
+ /**
+ *
+ *
+ * @generated
+ */
+ protected UnresolvedProxyPropertyImpl() {
+ super();
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ @Override
+ protected EClass eStaticClass() {
+ return LazyLinkingPackage.Literals.UNRESOLVED_PROXY_PROPERTY;
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public EList getType() {
+ if (type == null) {
+ type = new EObjectEList(Type.class, this, LazyLinkingPackage.UNRESOLVED_PROXY_PROPERTY__TYPE);
+ }
+ return type;
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public String getName() {
+ return name;
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ public void setName(String newName) {
+ String oldName = name;
+ name = newName;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, LazyLinkingPackage.UNRESOLVED_PROXY_PROPERTY__NAME, oldName, name));
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ @Override
+ public Object eGet(int featureID, boolean resolve, boolean coreType) {
+ switch (featureID) {
+ case LazyLinkingPackage.UNRESOLVED_PROXY_PROPERTY__TYPE:
+ return getType();
+ case LazyLinkingPackage.UNRESOLVED_PROXY_PROPERTY__NAME:
+ return getName();
+ }
+ return super.eGet(featureID, resolve, coreType);
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ @SuppressWarnings("unchecked")
+ @Override
+ public void eSet(int featureID, Object newValue) {
+ switch (featureID) {
+ case LazyLinkingPackage.UNRESOLVED_PROXY_PROPERTY__TYPE:
+ getType().clear();
+ getType().addAll((Collection)newValue);
+ return;
+ case LazyLinkingPackage.UNRESOLVED_PROXY_PROPERTY__NAME:
+ setName((String)newValue);
+ return;
+ }
+ super.eSet(featureID, newValue);
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ @Override
+ public void eUnset(int featureID) {
+ switch (featureID) {
+ case LazyLinkingPackage.UNRESOLVED_PROXY_PROPERTY__TYPE:
+ getType().clear();
+ return;
+ case LazyLinkingPackage.UNRESOLVED_PROXY_PROPERTY__NAME:
+ setName(NAME_EDEFAULT);
+ return;
+ }
+ super.eUnset(featureID);
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ @Override
+ public boolean eIsSet(int featureID) {
+ switch (featureID) {
+ case LazyLinkingPackage.UNRESOLVED_PROXY_PROPERTY__TYPE:
+ return type != null && !type.isEmpty();
+ case LazyLinkingPackage.UNRESOLVED_PROXY_PROPERTY__NAME:
+ return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+ }
+ return super.eIsSet(featureID);
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ @Override
+ public String toString() {
+ if (eIsProxy()) return super.toString();
+
+ StringBuffer result = new StringBuffer(super.toString());
+ result.append(" (name: ");
+ result.append(name);
+ result.append(')');
+ return result.toString();
+ }
+
+} //UnresolvedProxyPropertyImpl
diff --git a/org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/linking/lazy/lazyLinking/util/LazyLinkingAdapterFactory.java b/org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/linking/lazy/lazyLinking/util/LazyLinkingAdapterFactory.java
new file mode 100644
index 000000000..a38409a82
--- /dev/null
+++ b/org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/linking/lazy/lazyLinking/util/LazyLinkingAdapterFactory.java
@@ -0,0 +1,175 @@
+/**
+ * generated by Xtext
+ */
+package org.eclipse.xtext.linking.lazy.lazyLinking.util;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notifier;
+
+import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
+
+import org.eclipse.emf.ecore.EObject;
+
+import org.eclipse.xtext.linking.lazy.lazyLinking.*;
+
+/**
+ *
+ * The Adapter Factory for the model.
+ * It provides an adapter createXXX method for each class of the model.
+ *
+ * @see org.eclipse.xtext.linking.lazy.lazyLinking.LazyLinkingPackage
+ * @generated
+ */
+public class LazyLinkingAdapterFactory extends AdapterFactoryImpl {
+ /**
+ * The cached model package.
+ *
+ *
+ * @generated
+ */
+ protected static LazyLinkingPackage modelPackage;
+
+ /**
+ * Creates an instance of the adapter factory.
+ *
+ *
+ * @generated
+ */
+ public LazyLinkingAdapterFactory() {
+ if (modelPackage == null) {
+ modelPackage = LazyLinkingPackage.eINSTANCE;
+ }
+ }
+
+ /**
+ * Returns whether this factory is applicable for the type of the object.
+ *
+ * This implementation returns true if the object is either the model's package or is an instance object of the model.
+ *
+ * @return whether this factory is applicable for the type of the object.
+ * @generated
+ */
+ @Override
+ public boolean isFactoryForType(Object object) {
+ if (object == modelPackage) {
+ return true;
+ }
+ if (object instanceof EObject) {
+ return ((EObject)object).eClass().getEPackage() == modelPackage;
+ }
+ return false;
+ }
+
+ /**
+ * The switch that delegates to the createXXX methods.
+ *
+ *
+ * @generated
+ */
+ protected LazyLinkingSwitch modelSwitch =
+ new LazyLinkingSwitch() {
+ @Override
+ public Adapter caseModel(Model object) {
+ return createModelAdapter();
+ }
+ @Override
+ public Adapter caseType(Type object) {
+ return createTypeAdapter();
+ }
+ @Override
+ public Adapter caseProperty(Property object) {
+ return createPropertyAdapter();
+ }
+ @Override
+ public Adapter caseUnresolvedProxyProperty(UnresolvedProxyProperty object) {
+ return createUnresolvedProxyPropertyAdapter();
+ }
+ @Override
+ public Adapter defaultCase(EObject object) {
+ return createEObjectAdapter();
+ }
+ };
+
+ /**
+ * Creates an adapter for the target.
+ *
+ *
+ * @param target the object to adapt.
+ * @return the adapter for the target.
+ * @generated
+ */
+ @Override
+ public Adapter createAdapter(Notifier target) {
+ return modelSwitch.doSwitch((EObject)target);
+ }
+
+
+ /**
+ * Creates a new adapter for an object of class '{@link org.eclipse.xtext.linking.lazy.lazyLinking.Model Model}'.
+ *
+ * This default implementation returns null so that we can easily ignore cases;
+ * it's useful to ignore a case when inheritance will catch all the cases anyway.
+ *
+ * @return the new adapter.
+ * @see org.eclipse.xtext.linking.lazy.lazyLinking.Model
+ * @generated
+ */
+ public Adapter createModelAdapter() {
+ return null;
+ }
+
+ /**
+ * Creates a new adapter for an object of class '{@link org.eclipse.xtext.linking.lazy.lazyLinking.Type Type}'.
+ *
+ * This default implementation returns null so that we can easily ignore cases;
+ * it's useful to ignore a case when inheritance will catch all the cases anyway.
+ *
+ * @return the new adapter.
+ * @see org.eclipse.xtext.linking.lazy.lazyLinking.Type
+ * @generated
+ */
+ public Adapter createTypeAdapter() {
+ return null;
+ }
+
+ /**
+ * Creates a new adapter for an object of class '{@link org.eclipse.xtext.linking.lazy.lazyLinking.Property Property}'.
+ *
+ * This default implementation returns null so that we can easily ignore cases;
+ * it's useful to ignore a case when inheritance will catch all the cases anyway.
+ *
+ * @return the new adapter.
+ * @see org.eclipse.xtext.linking.lazy.lazyLinking.Property
+ * @generated
+ */
+ public Adapter createPropertyAdapter() {
+ return null;
+ }
+
+ /**
+ * Creates a new adapter for an object of class '{@link org.eclipse.xtext.linking.lazy.lazyLinking.UnresolvedProxyProperty Unresolved Proxy Property}'.
+ *
+ * This default implementation returns null so that we can easily ignore cases;
+ * it's useful to ignore a case when inheritance will catch all the cases anyway.
+ *
+ * @return the new adapter.
+ * @see org.eclipse.xtext.linking.lazy.lazyLinking.UnresolvedProxyProperty
+ * @generated
+ */
+ public Adapter createUnresolvedProxyPropertyAdapter() {
+ return null;
+ }
+
+ /**
+ * Creates a new adapter for the default case.
+ *
+ * This default implementation returns null.
+ *
+ * @return the new adapter.
+ * @generated
+ */
+ public Adapter createEObjectAdapter() {
+ return null;
+ }
+
+} //LazyLinkingAdapterFactory
diff --git a/org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/linking/lazy/lazyLinking/util/LazyLinkingSwitch.java b/org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/linking/lazy/lazyLinking/util/LazyLinkingSwitch.java
new file mode 100644
index 000000000..2d2f425eb
--- /dev/null
+++ b/org.eclipse.xtext.tests/emf-gen/org/eclipse/xtext/linking/lazy/lazyLinking/util/LazyLinkingSwitch.java
@@ -0,0 +1,174 @@
+/**
+ * generated by Xtext
+ */
+package org.eclipse.xtext.linking.lazy.lazyLinking.util;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+
+import org.eclipse.emf.ecore.util.Switch;
+
+import org.eclipse.xtext.linking.lazy.lazyLinking.*;
+
+/**
+ *
+ * The Switch for the model's inheritance hierarchy.
+ * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
+ * to invoke the caseXXX method for each class of the model,
+ * starting with the actual class of the object
+ * and proceeding up the inheritance hierarchy
+ * until a non-null result is returned,
+ * which is the result of the switch.
+ *
+ * @see org.eclipse.xtext.linking.lazy.lazyLinking.LazyLinkingPackage
+ * @generated
+ */
+public class LazyLinkingSwitch extends Switch {
+ /**
+ * The cached model package
+ *
+ *
+ * @generated
+ */
+ protected static LazyLinkingPackage modelPackage;
+
+ /**
+ * Creates an instance of the switch.
+ *
+ *
+ * @generated
+ */
+ public LazyLinkingSwitch() {
+ if (modelPackage == null) {
+ modelPackage = LazyLinkingPackage.eINSTANCE;
+ }
+ }
+
+ /**
+ * Checks whether this is a switch for the given package.
+ *
+ *
+ * @param ePackage the package in question.
+ * @return whether this is a switch for the given package.
+ * @generated
+ */
+ @Override
+ protected boolean isSwitchFor(EPackage ePackage) {
+ return ePackage == modelPackage;
+ }
+
+ /**
+ * Calls caseXXX for each class of the model until one returns a non null result; it yields that result.
+ *
+ *
+ * @return the first non-null result returned by a caseXXX call.
+ * @generated
+ */
+ @Override
+ protected T doSwitch(int classifierID, EObject theEObject) {
+ switch (classifierID) {
+ case LazyLinkingPackage.MODEL: {
+ Model model = (Model)theEObject;
+ T result = caseModel(model);
+ if (result == null) result = defaultCase(theEObject);
+ return result;
+ }
+ case LazyLinkingPackage.TYPE: {
+ Type type = (Type)theEObject;
+ T result = caseType(type);
+ if (result == null) result = defaultCase(theEObject);
+ return result;
+ }
+ case LazyLinkingPackage.PROPERTY: {
+ Property property = (Property)theEObject;
+ T result = caseProperty(property);
+ if (result == null) result = defaultCase(theEObject);
+ return result;
+ }
+ case LazyLinkingPackage.UNRESOLVED_PROXY_PROPERTY: {
+ UnresolvedProxyProperty unresolvedProxyProperty = (UnresolvedProxyProperty)theEObject;
+ T result = caseUnresolvedProxyProperty(unresolvedProxyProperty);
+ if (result == null) result = defaultCase(theEObject);
+ return result;
+ }
+ default: return defaultCase(theEObject);
+ }
+ }
+
+ /**
+ * Returns the result of interpreting the object as an instance of 'Model'.
+ *
+ * This implementation returns null;
+ * returning a non-null result will terminate the switch.
+ *
+ * @param object the target of the switch.
+ * @return the result of interpreting the object as an instance of 'Model'.
+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+ * @generated
+ */
+ public T caseModel(Model object) {
+ return null;
+ }
+
+ /**
+ * Returns the result of interpreting the object as an instance of 'Type'.
+ *
+ * This implementation returns null;
+ * returning a non-null result will terminate the switch.
+ *
+ * @param object the target of the switch.
+ * @return the result of interpreting the object as an instance of 'Type'.
+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+ * @generated
+ */
+ public T caseType(Type object) {
+ return null;
+ }
+
+ /**
+ * Returns the result of interpreting the object as an instance of 'Property'.
+ *
+ * This implementation returns null;
+ * returning a non-null result will terminate the switch.
+ *
+ * @param object the target of the switch.
+ * @return the result of interpreting the object as an instance of 'Property'.
+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+ * @generated
+ */
+ public T caseProperty(Property object) {
+ return null;
+ }
+
+ /**
+ * Returns the result of interpreting the object as an instance of 'Unresolved Proxy Property'.
+ *
+ * This implementation returns null;
+ * returning a non-null result will terminate the switch.
+ *
+ * @param object the target of the switch.
+ * @return the result of interpreting the object as an instance of 'Unresolved Proxy Property'.
+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+ * @generated
+ */
+ public T caseUnresolvedProxyProperty(UnresolvedProxyProperty object) {
+ return null;
+ }
+
+ /**
+ * Returns the result of interpreting the object as an instance of 'EObject'.
+ *
+ * This implementation returns null;
+ * returning a non-null result will terminate the switch, but this is the last case anyway.
+ *
+ * @param object the target of the switch.
+ * @return the result of interpreting the object as an instance of 'EObject'.
+ * @see #doSwitch(org.eclipse.emf.ecore.EObject)
+ * @generated
+ */
+ @Override
+ public T defaultCase(EObject object) {
+ return null;
+ }
+
+} //LazyLinkingSwitch
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguage.xtextbin b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguage.xtextbin
index 9999d2471..401724702 100644
Binary files a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguage.xtextbin and b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/XtextGrammarTestLanguage.xtextbin differ
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/RegionAccessTestLanguage.xtextbin b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/RegionAccessTestLanguage.xtextbin
index 96b8cb4de..594a1f804 100644
Binary files a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/RegionAccessTestLanguage.xtextbin and b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/RegionAccessTestLanguage.xtextbin differ
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/serializer/RegionAccessTestLanguageSyntacticSequencer.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/serializer/RegionAccessTestLanguageSyntacticSequencer.java
index e4f1a0d90..769dc5101 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/serializer/RegionAccessTestLanguageSyntacticSequencer.java
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/formatting2/regionaccess/internal/serializer/RegionAccessTestLanguageSyntacticSequencer.java
@@ -91,8 +91,8 @@ public class RegionAccessTestLanguageSyntacticSequencer extends AbstractSyntacti
* 'recursion'*
*
* This ambiguous syntax occurs at:
- * (rule start) '6' ('(' ('unassigned' (Datatype | ID))?)+ 'fragment' (ambiguity) 'child' mixed=Mixed
- * (rule start) '6' ('(' ('unassigned' (Datatype | ID))?)+ 'fragment' (ambiguity) fragName=ID
+ * (rule start) '6' ('(' ('unassigned' (ID | Datatype))?)+ 'fragment' (ambiguity) 'child' mixed=Mixed
+ * (rule start) '6' ('(' ('unassigned' (ID | Datatype))?)+ 'fragment' (ambiguity) fragName=ID
* (rule start) ('(' ('unassigned' (ID | Datatype))?)+ 'fragment' (ambiguity) 'child' mixed=Mixed
* (rule start) ('(' ('unassigned' (ID | Datatype))?)+ 'fragment' (ambiguity) fragName=ID
*/
@@ -102,7 +102,7 @@ public class RegionAccessTestLanguageSyntacticSequencer extends AbstractSyntacti
/**
* Ambiguous syntax:
- * ('(' ('unassigned' (Datatype | ID))?)*
+ * ('(' ('unassigned' (ID | Datatype))?)*
*
* This ambiguous syntax occurs at:
* (rule start) '6' (ambiguity) {AssignedAction.child=}
@@ -114,7 +114,7 @@ public class RegionAccessTestLanguageSyntacticSequencer extends AbstractSyntacti
/**
* Ambiguous syntax:
- * ('(' ('unassigned' (Datatype | ID))?)+
+ * ('(' ('unassigned' (ID | Datatype))?)+
*
* This ambiguous syntax occurs at:
* (rule start) '6' (ambiguity) ')' (rule start)
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/SubTestLanguage.xtextbin b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/SubTestLanguage.xtextbin
index 386b721a9..8b1781b26 100644
Binary files a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/SubTestLanguage.xtextbin and b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/SubTestLanguage.xtextbin differ
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/services/SubTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/services/SubTestLanguageGrammarAccess.java
index 803b98cdb..ac9e2bfc4 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/services/SubTestLanguageGrammarAccess.java
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/generator/ecore/services/SubTestLanguageGrammarAccess.java
@@ -63,7 +63,7 @@ public class SubTestLanguageGrammarAccess extends AbstractGrammarElementFinder {
private final Assignment cNameAssignment_1 = (Assignment)cGroup.eContents().get(1);
private final RuleCall cNameIDTerminalRuleCall_1_0 = (RuleCall)cNameAssignment_1.eContents().get(0);
- //AnotherSuperMain:
+ //@ Override AnotherSuperMain:
// "ups" name=ID;
@Override public ParserRule getRule() { return rule; }
@@ -142,7 +142,7 @@ public class SubTestLanguageGrammarAccess extends AbstractGrammarElementFinder {
return getSubMainAccess().getRule();
}
- //AnotherSuperMain:
+ //@ Override AnotherSuperMain:
// "ups" name=ID;
public AnotherSuperMainElements getAnotherSuperMainAccess() {
return pAnotherSuperMain;
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/AbstractTestLanguage.xtextbin b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/AbstractTestLanguage.xtextbin
index 1ecae9192..7e70f5e2c 100644
Binary files a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/AbstractTestLanguage.xtextbin and b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/AbstractTestLanguage.xtextbin differ
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/ConcreteTestLanguage.xtextbin b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/ConcreteTestLanguage.xtextbin
index b9dd4b1b7..9780836ae 100644
Binary files a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/ConcreteTestLanguage.xtextbin and b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/ConcreteTestLanguage.xtextbin differ
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/InheritanceTest2Language.xtextbin b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/InheritanceTest2Language.xtextbin
index ca1696303..0b28b9b05 100644
Binary files a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/InheritanceTest2Language.xtextbin and b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/InheritanceTest2Language.xtextbin differ
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/InheritanceTest3Language.xtextbin b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/InheritanceTest3Language.xtextbin
index 881b989ec..92293dc32 100644
Binary files a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/InheritanceTest3Language.xtextbin and b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/InheritanceTest3Language.xtextbin differ
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/InheritanceTestLanguage.xtextbin b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/InheritanceTestLanguage.xtextbin
index dbd818203..9a3299866 100644
Binary files a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/InheritanceTestLanguage.xtextbin and b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/InheritanceTestLanguage.xtextbin differ
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/AbstractTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/AbstractTestLanguageGrammarAccess.java
index 29fb7ff15..4201a3929 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/AbstractTestLanguageGrammarAccess.java
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/AbstractTestLanguageGrammarAccess.java
@@ -282,7 +282,7 @@ public class AbstractTestLanguageGrammarAccess extends AbstractGrammarElementFin
return tREAL;
}
- //terminal ID:
+ //@ Override terminal ID:
// '^'? ('a'..'z' | 'A'..'Z' | 'ö' | 'ä' | 'ü' | '_') ('a'..'z' | 'A'..'Z' | '_' | '0'..'9')*;
public TerminalRule getIDRule() {
return tID;
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/ConcreteTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/ConcreteTestLanguageGrammarAccess.java
index 2a5308b20..13d25ee69 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/ConcreteTestLanguageGrammarAccess.java
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/ConcreteTestLanguageGrammarAccess.java
@@ -92,8 +92,7 @@ public class ConcreteTestLanguageGrammarAccess extends AbstractGrammarElementFin
private final Assignment cNameAssignment_1 = (Assignment)cGroup.eContents().get(1);
private final RuleCall cNameIDTerminalRuleCall_1_0 = (RuleCall)cNameAssignment_1.eContents().get(0);
- //// override OverridableParserRule and call it
- //OverridableParserRule mm::AType:
+ //@ Override OverridableParserRule mm::AType:
// 'overriddenelement' name=ID;
@Override public ParserRule getRule() { return rule; }
@@ -134,8 +133,7 @@ public class ConcreteTestLanguageGrammarAccess extends AbstractGrammarElementFin
private final Assignment cAgeAssignment_3 = (Assignment)cGroup.eContents().get(3);
private final RuleCall cAgeINTTerminalRuleCall_3_0 = (RuleCall)cAgeAssignment_3.eContents().get(0);
- //// override parser rule and change return type
- //OverridableParserRule2 AType2:
+ //@ Override OverridableParserRule2 AType2:
// 'overridden other element' name=ID '-' age=INT;
@Override public ParserRule getRule() { return rule; }
@@ -167,8 +165,7 @@ public class ConcreteTestLanguageGrammarAccess extends AbstractGrammarElementFin
private final RuleCall cSubrule2ParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
private final RuleCall cSubrule3ParserRuleCall_2 = (RuleCall)cAlternatives.eContents().get(2);
- //// override and extend ExtendableParserRule and call it
- //ExtendableParserRule mm::AType:
+ //@ Override ExtendableParserRule mm::AType:
// Subrule1 | Subrule2 | Subrule3;
@Override public ParserRule getRule() { return rule; }
@@ -384,8 +381,7 @@ public class ConcreteTestLanguageGrammarAccess extends AbstractGrammarElementFin
return getConcreteParserRuleAccess().getRule();
}
- //// override OverridableParserRule and call it
- //OverridableParserRule mm::AType:
+ //@ Override OverridableParserRule mm::AType:
// 'overriddenelement' name=ID;
public OverridableParserRuleElements getOverridableParserRuleAccess() {
return pOverridableParserRule;
@@ -405,8 +401,7 @@ public class ConcreteTestLanguageGrammarAccess extends AbstractGrammarElementFin
return getCallOverridenParserRuleAccess().getRule();
}
- //// override parser rule and change return type
- //OverridableParserRule2 AType2:
+ //@ Override OverridableParserRule2 AType2:
// 'overridden other element' name=ID '-' age=INT;
public OverridableParserRule2Elements getOverridableParserRule2Access() {
return pOverridableParserRule2;
@@ -416,8 +411,7 @@ public class ConcreteTestLanguageGrammarAccess extends AbstractGrammarElementFin
return getOverridableParserRule2Access().getRule();
}
- //// override and extend ExtendableParserRule and call it
- //ExtendableParserRule mm::AType:
+ //@ Override ExtendableParserRule mm::AType:
// Subrule1 | Subrule2 | Subrule3;
public ExtendableParserRuleElements getExtendableParserRuleAccess() {
return pExtendableParserRule;
@@ -467,7 +461,7 @@ public class ConcreteTestLanguageGrammarAccess extends AbstractGrammarElementFin
return getCallExtendedParserRuleAccess().getRule();
}
- //terminal ID:
+ //@ Override terminal ID:
// super;
public TerminalRule getIDRule() {
return tID;
@@ -509,7 +503,7 @@ public class ConcreteTestLanguageGrammarAccess extends AbstractGrammarElementFin
return gaAbstractTestLanguage.getREALRule();
}
- //terminal ID:
+ //@ Override terminal ID:
// '^'? ('a'..'z' | 'A'..'Z' | 'ö' | 'ä' | 'ü' | '_') ('a'..'z' | 'A'..'Z' | '_' | '0'..'9')*;
public TerminalRule getAbstractTestLanguageIDRule() {
return gaAbstractTestLanguage.getIDRule();
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/InheritanceTest2LanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/InheritanceTest2LanguageGrammarAccess.java
index 85352192e..759413837 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/InheritanceTest2LanguageGrammarAccess.java
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/InheritanceTest2LanguageGrammarAccess.java
@@ -34,7 +34,7 @@ public class InheritanceTest2LanguageGrammarAccess extends AbstractGrammarElemen
private final RuleCall cIdsFQNParserRuleCall_4_0 = (RuleCall)cIdsAssignment_4.eContents().get(0);
private final Keyword cRightCurlyBracketKeyword_5 = (Keyword)cGroup.eContents().get(5);
- //Model:
+ //@ Override Model:
// "model" name=ID "{"
// elements+=Element*
// ids+=FQN
@@ -130,7 +130,7 @@ public class InheritanceTest2LanguageGrammarAccess extends AbstractGrammarElemen
}
- //Model:
+ //@ Override Model:
// "model" name=ID "{"
// elements+=Element*
// ids+=FQN
@@ -153,7 +153,7 @@ public class InheritanceTest2LanguageGrammarAccess extends AbstractGrammarElemen
return getElementAccess().getRule();
}
- //terminal ID:
+ //@ Override terminal ID:
// 'a'..'z'+;
public TerminalRule getIDRule() {
return gaInheritanceTestLanguage.getIDRule();
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/InheritanceTest3LanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/InheritanceTest3LanguageGrammarAccess.java
index f5c2f5e67..ec1165bf8 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/InheritanceTest3LanguageGrammarAccess.java
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/InheritanceTest3LanguageGrammarAccess.java
@@ -27,7 +27,7 @@ public class InheritanceTest3LanguageGrammarAccess extends AbstractGrammarElemen
private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.grammarinheritance.InheritanceTest3Language.Model");
private final RuleCall cModelParserRuleCall = (RuleCall)rule.eContents().get(1);
- //Model:
+ //@ Override Model:
// super::Model;
@Override public ParserRule getRule() { return rule; }
@@ -54,7 +54,7 @@ public class InheritanceTest3LanguageGrammarAccess extends AbstractGrammarElemen
private final Assignment cNameAssignment_3_2 = (Assignment)cGroup_3.eContents().get(2);
private final RuleCall cNameSTRINGTerminalRuleCall_3_2_0 = (RuleCall)cNameAssignment_3_2.eContents().get(0);
- //Element:
+ //@ Override Element:
// super::Element
// | {Element} "element" name=super::ID
// | {Element} "element" name=Terminals::ID
@@ -176,7 +176,7 @@ public class InheritanceTest3LanguageGrammarAccess extends AbstractGrammarElemen
}
- //Model:
+ //@ Override Model:
// super::Model;
public ModelElements getModelAccess() {
return pModel;
@@ -186,7 +186,7 @@ public class InheritanceTest3LanguageGrammarAccess extends AbstractGrammarElemen
return getModelAccess().getRule();
}
- //Element:
+ //@ Override Element:
// super::Element
// | {Element} "element" name=super::ID
// | {Element} "element" name=Terminals::ID
@@ -199,13 +199,13 @@ public class InheritanceTest3LanguageGrammarAccess extends AbstractGrammarElemen
return getElementAccess().getRule();
}
- //terminal ID:
+ //@ Override terminal ID:
// 'id';
public TerminalRule getIDRule() {
return tID;
}
- //Model:
+ //@ Override Model:
// "model" name=super::ID "{"
// elements+=super::Element*
// "}";
@@ -227,7 +227,7 @@ public class InheritanceTest3LanguageGrammarAccess extends AbstractGrammarElemen
return getInheritanceTestLanguageElementAccess().getRule();
}
- //terminal ID:
+ //@ Override terminal ID:
// 'a'..'z'+;
public TerminalRule getInheritanceTestLanguageIDRule() {
return gaInheritanceTestLanguage.getIDRule();
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/InheritanceTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/InheritanceTestLanguageGrammarAccess.java
index 7b0ca558b..939d6d39c 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/InheritanceTestLanguageGrammarAccess.java
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/grammarinheritance/services/InheritanceTestLanguageGrammarAccess.java
@@ -32,7 +32,7 @@ public class InheritanceTestLanguageGrammarAccess extends AbstractGrammarElement
private final RuleCall cElementsElementParserRuleCall_3_0 = (RuleCall)cElementsAssignment_3.eContents().get(0);
private final Keyword cRightCurlyBracketKeyword_4 = (Keyword)cGroup.eContents().get(4);
- //Model:
+ //@ Override Model:
// "model" name=ID "{"
// elements+=Element*
// "}";
@@ -140,7 +140,7 @@ public class InheritanceTestLanguageGrammarAccess extends AbstractGrammarElement
}
- //Model:
+ //@ Override Model:
// "model" name=ID "{"
// elements+=Element*
// "}";
@@ -162,7 +162,7 @@ public class InheritanceTestLanguageGrammarAccess extends AbstractGrammarElement
return getElementAccess().getRule();
}
- //terminal ID:
+ //@ Override terminal ID:
// 'a'..'z'+;
public TerminalRule getIDRule() {
return tID;
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/lexer/parser/antlr/lexer/InternalIgnoreCaseLexerTestLanguageLexer.g b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/lexer/parser/antlr/lexer/InternalIgnoreCaseLexerTestLanguageLexer.g
index b9df51b55..e609aca7c 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/lexer/parser/antlr/lexer/InternalIgnoreCaseLexerTestLanguageLexer.g
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/lexer/parser/antlr/lexer/InternalIgnoreCaseLexerTestLanguageLexer.g
@@ -15,8 +15,6 @@ Case : ('C'|'c')('A'|'a')('S'|'s')('E'|'e');
Foo : ('F'|'f')('O'|'o')('O'|'o');
-// Rules duplicated to allow inter-rule references
-
RULE_WS : (' '|'\t'|'\r'|'\n')+;
RULE_SL_COMMENT : '//' ~(('\n'|'\r'))* ('\r'? '\n')?;
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/lexer/parser/antlr/lexer/InternalIgnoreCaseLexerTestLanguageLexer.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/lexer/parser/antlr/lexer/InternalIgnoreCaseLexerTestLanguageLexer.java
index 7d8fbb56d..aa6f2e5a5 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/lexer/parser/antlr/lexer/InternalIgnoreCaseLexerTestLanguageLexer.java
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/lexer/parser/antlr/lexer/InternalIgnoreCaseLexerTestLanguageLexer.java
@@ -137,10 +137,10 @@ public class InternalIgnoreCaseLexerTestLanguageLexer extends Lexer {
try {
int _type = RULE_WS;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // InternalIgnoreCaseLexerTestLanguageLexer.g:20:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
- // InternalIgnoreCaseLexerTestLanguageLexer.g:20:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+ // InternalIgnoreCaseLexerTestLanguageLexer.g:18:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
+ // InternalIgnoreCaseLexerTestLanguageLexer.g:18:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
{
- // InternalIgnoreCaseLexerTestLanguageLexer.g:20:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+ // InternalIgnoreCaseLexerTestLanguageLexer.g:18:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
int cnt1=0;
loop1:
do {
@@ -194,12 +194,12 @@ public class InternalIgnoreCaseLexerTestLanguageLexer extends Lexer {
try {
int _type = RULE_SL_COMMENT;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // InternalIgnoreCaseLexerTestLanguageLexer.g:22:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
- // InternalIgnoreCaseLexerTestLanguageLexer.g:22:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
+ // InternalIgnoreCaseLexerTestLanguageLexer.g:20:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
+ // InternalIgnoreCaseLexerTestLanguageLexer.g:20:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
{
match("//");
- // InternalIgnoreCaseLexerTestLanguageLexer.g:22:24: (~ ( ( '\\n' | '\\r' ) ) )*
+ // InternalIgnoreCaseLexerTestLanguageLexer.g:20:24: (~ ( ( '\\n' | '\\r' ) ) )*
loop2:
do {
int alt2=2;
@@ -212,7 +212,7 @@ public class InternalIgnoreCaseLexerTestLanguageLexer extends Lexer {
switch (alt2) {
case 1 :
- // InternalIgnoreCaseLexerTestLanguageLexer.g:22:24: ~ ( ( '\\n' | '\\r' ) )
+ // InternalIgnoreCaseLexerTestLanguageLexer.g:20:24: ~ ( ( '\\n' | '\\r' ) )
{
if ( (input.LA(1)>='\u0000' && input.LA(1)<='\t')||(input.LA(1)>='\u000B' && input.LA(1)<='\f')||(input.LA(1)>='\u000E' && input.LA(1)<='\uFFFF') ) {
input.consume();
@@ -232,7 +232,7 @@ public class InternalIgnoreCaseLexerTestLanguageLexer extends Lexer {
}
} while (true);
- // InternalIgnoreCaseLexerTestLanguageLexer.g:22:40: ( ( '\\r' )? '\\n' )?
+ // InternalIgnoreCaseLexerTestLanguageLexer.g:20:40: ( ( '\\r' )? '\\n' )?
int alt4=2;
int LA4_0 = input.LA(1);
@@ -241,9 +241,9 @@ public class InternalIgnoreCaseLexerTestLanguageLexer extends Lexer {
}
switch (alt4) {
case 1 :
- // InternalIgnoreCaseLexerTestLanguageLexer.g:22:41: ( '\\r' )? '\\n'
+ // InternalIgnoreCaseLexerTestLanguageLexer.g:20:41: ( '\\r' )? '\\n'
{
- // InternalIgnoreCaseLexerTestLanguageLexer.g:22:41: ( '\\r' )?
+ // InternalIgnoreCaseLexerTestLanguageLexer.g:20:41: ( '\\r' )?
int alt3=2;
int LA3_0 = input.LA(1);
@@ -252,7 +252,7 @@ public class InternalIgnoreCaseLexerTestLanguageLexer extends Lexer {
}
switch (alt3) {
case 1 :
- // InternalIgnoreCaseLexerTestLanguageLexer.g:22:41: '\\r'
+ // InternalIgnoreCaseLexerTestLanguageLexer.g:20:41: '\\r'
{
match('\r');
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/IgnoreCaseImportsTestLanguage.xtextbin b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/IgnoreCaseImportsTestLanguage.xtextbin
index e58daeee8..385057411 100644
Binary files a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/IgnoreCaseImportsTestLanguage.xtextbin and b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/IgnoreCaseImportsTestLanguage.xtextbin differ
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/IgnoreCaseNamespacesTestLanguage.xtextbin b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/IgnoreCaseNamespacesTestLanguage.xtextbin
index 121e3d39c..ccdd32ef4 100644
Binary files a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/IgnoreCaseNamespacesTestLanguage.xtextbin and b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/IgnoreCaseNamespacesTestLanguage.xtextbin differ
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/LazyLinkingTestLanguage.xtextbin b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/LazyLinkingTestLanguage.xtextbin
index 69966939a..922e45f78 100644
Binary files a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/LazyLinkingTestLanguage.xtextbin and b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/LazyLinkingTestLanguage.xtextbin differ
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/LazyLinkingTestLanguageStandaloneSetupGenerated.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/LazyLinkingTestLanguageStandaloneSetupGenerated.java
index 260c463bc..7eb8cd1ef 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/LazyLinkingTestLanguageStandaloneSetupGenerated.java
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/LazyLinkingTestLanguageStandaloneSetupGenerated.java
@@ -5,11 +5,9 @@ package org.eclipse.xtext.linking.lazy;
import com.google.inject.Guice;
import com.google.inject.Injector;
-import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.xtext.ISetup;
import org.eclipse.xtext.common.TerminalsStandaloneSetup;
-import org.eclipse.xtext.linking.lazy.lazyLinking.LazyLinkingPackage;
import org.eclipse.xtext.resource.IResourceFactory;
import org.eclipse.xtext.resource.IResourceServiceProvider;
@@ -35,8 +33,5 @@ public class LazyLinkingTestLanguageStandaloneSetupGenerated implements ISetup {
Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("lazylinkingtestlanguage", resourceFactory);
IResourceServiceProvider.Registry.INSTANCE.getExtensionToFactoryMap().put("lazylinkingtestlanguage", serviceProvider);
- if (!EPackage.Registry.INSTANCE.containsKey("http://eclipse.org/xtext/lazyLinkingTestLanguage")) {
- EPackage.Registry.INSTANCE.put("http://eclipse.org/xtext/lazyLinkingTestLanguage", LazyLinkingPackage.eINSTANCE);
- }
}
}
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/lazyLinking/LazyLinkingFactory.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/lazyLinking/LazyLinkingFactory.java
deleted file mode 100644
index b754dae41..000000000
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/lazyLinking/LazyLinkingFactory.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/**
- * generated by Xtext
- */
-package org.eclipse.xtext.linking.lazy.lazyLinking;
-
-import org.eclipse.emf.ecore.EFactory;
-
-/**
- *
- * The Factory for the model.
- * It provides a create method for each non-abstract class of the model.
- *
- * @see org.eclipse.xtext.linking.lazy.lazyLinking.LazyLinkingPackage
- * @generated
- */
-public interface LazyLinkingFactory extends EFactory
-{
- /**
- * The singleton instance of the factory.
- *
- *
- * @generated
- */
- LazyLinkingFactory eINSTANCE = org.eclipse.xtext.linking.lazy.lazyLinking.impl.LazyLinkingFactoryImpl.init();
-
- /**
- * Returns a new object of class 'Model'.
- *
- *
- * @return a new object of class 'Model'.
- * @generated
- */
- Model createModel();
-
- /**
- * Returns a new object of class 'Type'.
- *
- *
- * @return a new object of class 'Type'.
- * @generated
- */
- Type createType();
-
- /**
- * Returns a new object of class 'Property'.
- *
- *
- * @return a new object of class 'Property'.
- * @generated
- */
- Property createProperty();
-
- /**
- * Returns a new object of class 'Unresolved Proxy Property'.
- *
- *
- * @return a new object of class 'Unresolved Proxy Property'.
- * @generated
- */
- UnresolvedProxyProperty createUnresolvedProxyProperty();
-
- /**
- * Returns the package supported by this factory.
- *
- *
- * @return the package supported by this factory.
- * @generated
- */
- LazyLinkingPackage getLazyLinkingPackage();
-
-} //LazyLinkingFactory
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/lazyLinking/LazyLinkingPackage.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/lazyLinking/LazyLinkingPackage.java
deleted file mode 100644
index ad992cc4d..000000000
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/lazyLinking/LazyLinkingPackage.java
+++ /dev/null
@@ -1,550 +0,0 @@
-/**
- * generated by Xtext
- */
-package org.eclipse.xtext.linking.lazy.lazyLinking;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-
-/**
- *
- * The Package for the model.
- * It contains accessors for the meta objects to represent
- *
- * - each class,
- * - each feature of each class,
- * - each enum,
- * - and each data type
- *
- *
- * @see org.eclipse.xtext.linking.lazy.lazyLinking.LazyLinkingFactory
- * @model kind="package"
- * @generated
- */
-public interface LazyLinkingPackage extends EPackage
-{
- /**
- * The package name.
- *
- *
- * @generated
- */
- String eNAME = "lazyLinking";
-
- /**
- * The package namespace URI.
- *
- *
- * @generated
- */
- String eNS_URI = "http://eclipse.org/xtext/lazyLinkingTestLanguage";
-
- /**
- * The package namespace name.
- *
- *
- * @generated
- */
- String eNS_PREFIX = "lazyLinking";
-
- /**
- * The singleton instance of the package.
- *
- *
- * @generated
- */
- LazyLinkingPackage eINSTANCE = org.eclipse.xtext.linking.lazy.lazyLinking.impl.LazyLinkingPackageImpl.init();
-
- /**
- * The meta object id for the '{@link org.eclipse.xtext.linking.lazy.lazyLinking.impl.ModelImpl Model}' class.
- *
- *
- * @see org.eclipse.xtext.linking.lazy.lazyLinking.impl.ModelImpl
- * @see org.eclipse.xtext.linking.lazy.lazyLinking.impl.LazyLinkingPackageImpl#getModel()
- * @generated
- */
- int MODEL = 0;
-
- /**
- * The feature id for the 'Types' containment reference list.
- *
- *
- * @generated
- * @ordered
- */
- int MODEL__TYPES = 0;
-
- /**
- * The number of structural features of the 'Model' class.
- *
- *
- * @generated
- * @ordered
- */
- int MODEL_FEATURE_COUNT = 1;
-
- /**
- * The meta object id for the '{@link org.eclipse.xtext.linking.lazy.lazyLinking.impl.TypeImpl Type}' class.
- *
- *
- * @see org.eclipse.xtext.linking.lazy.lazyLinking.impl.TypeImpl
- * @see org.eclipse.xtext.linking.lazy.lazyLinking.impl.LazyLinkingPackageImpl#getType()
- * @generated
- */
- int TYPE = 1;
-
- /**
- * The feature id for the 'Name' attribute.
- *
- *
- * @generated
- * @ordered
- */
- int TYPE__NAME = 0;
-
- /**
- * The feature id for the 'Extends' reference.
- *
- *
- * @generated
- * @ordered
- */
- int TYPE__EXTENDS = 1;
-
- /**
- * The feature id for the 'Parent Id' reference.
- *
- *
- * @generated
- * @ordered
- */
- int TYPE__PARENT_ID = 2;
-
- /**
- * The feature id for the 'Properties' containment reference list.
- *
- *
- * @generated
- * @ordered
- */
- int TYPE__PROPERTIES = 3;
-
- /**
- * The feature id for the 'Unresolved Proxy Property' containment reference list.
- *
- *
- * @generated
- * @ordered
- */
- int TYPE__UNRESOLVED_PROXY_PROPERTY = 4;
-
- /**
- * The feature id for the 'Subtypes' reference list.
- *
- *
- * @generated
- * @ordered
- */
- int TYPE__SUBTYPES = 5;
-
- /**
- * The number of structural features of the 'Type' class.
- *
- *
- * @generated
- * @ordered
- */
- int TYPE_FEATURE_COUNT = 6;
-
- /**
- * The meta object id for the '{@link org.eclipse.xtext.linking.lazy.lazyLinking.impl.PropertyImpl Property}' class.
- *
- *
- * @see org.eclipse.xtext.linking.lazy.lazyLinking.impl.PropertyImpl
- * @see org.eclipse.xtext.linking.lazy.lazyLinking.impl.LazyLinkingPackageImpl#getProperty()
- * @generated
- */
- int PROPERTY = 2;
-
- /**
- * The feature id for the 'Type' reference list.
- *
- *
- * @generated
- * @ordered
- */
- int PROPERTY__TYPE = 0;
-
- /**
- * The feature id for the 'Name' attribute.
- *
- *
- * @generated
- * @ordered
- */
- int PROPERTY__NAME = 1;
-
- /**
- * The number of structural features of the 'Property' class.
- *
- *
- * @generated
- * @ordered
- */
- int PROPERTY_FEATURE_COUNT = 2;
-
- /**
- * The meta object id for the '{@link org.eclipse.xtext.linking.lazy.lazyLinking.impl.UnresolvedProxyPropertyImpl Unresolved Proxy Property}' class.
- *
- *
- * @see org.eclipse.xtext.linking.lazy.lazyLinking.impl.UnresolvedProxyPropertyImpl
- * @see org.eclipse.xtext.linking.lazy.lazyLinking.impl.LazyLinkingPackageImpl#getUnresolvedProxyProperty()
- * @generated
- */
- int UNRESOLVED_PROXY_PROPERTY = 3;
-
- /**
- * The feature id for the 'Type' reference list.
- *
- *
- * @generated
- * @ordered
- */
- int UNRESOLVED_PROXY_PROPERTY__TYPE = 0;
-
- /**
- * The feature id for the 'Name' attribute.
- *
- *
- * @generated
- * @ordered
- */
- int UNRESOLVED_PROXY_PROPERTY__NAME = 1;
-
- /**
- * The number of structural features of the 'Unresolved Proxy Property' class.
- *
- *
- * @generated
- * @ordered
- */
- int UNRESOLVED_PROXY_PROPERTY_FEATURE_COUNT = 2;
-
-
- /**
- * Returns the meta object for class '{@link org.eclipse.xtext.linking.lazy.lazyLinking.Model Model}'.
- *
- *
- * @return the meta object for class 'Model'.
- * @see org.eclipse.xtext.linking.lazy.lazyLinking.Model
- * @generated
- */
- EClass getModel();
-
- /**
- * Returns the meta object for the containment reference list '{@link org.eclipse.xtext.linking.lazy.lazyLinking.Model#getTypes Types}'.
- *
- *
- * @return the meta object for the containment reference list 'Types'.
- * @see org.eclipse.xtext.linking.lazy.lazyLinking.Model#getTypes()
- * @see #getModel()
- * @generated
- */
- EReference getModel_Types();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.xtext.linking.lazy.lazyLinking.Type Type}'.
- *
- *
- * @return the meta object for class 'Type'.
- * @see org.eclipse.xtext.linking.lazy.lazyLinking.Type
- * @generated
- */
- EClass getType();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.xtext.linking.lazy.lazyLinking.Type#getName Name}'.
- *
- *
- * @return the meta object for the attribute 'Name'.
- * @see org.eclipse.xtext.linking.lazy.lazyLinking.Type#getName()
- * @see #getType()
- * @generated
- */
- EAttribute getType_Name();
-
- /**
- * Returns the meta object for the reference '{@link org.eclipse.xtext.linking.lazy.lazyLinking.Type#getExtends Extends}'.
- *
- *
- * @return the meta object for the reference 'Extends'.
- * @see org.eclipse.xtext.linking.lazy.lazyLinking.Type#getExtends()
- * @see #getType()
- * @generated
- */
- EReference getType_Extends();
-
- /**
- * Returns the meta object for the reference '{@link org.eclipse.xtext.linking.lazy.lazyLinking.Type#getParentId Parent Id}'.
- *
- *
- * @return the meta object for the reference 'Parent Id'.
- * @see org.eclipse.xtext.linking.lazy.lazyLinking.Type#getParentId()
- * @see #getType()
- * @generated
- */
- EReference getType_ParentId();
-
- /**
- * Returns the meta object for the containment reference list '{@link org.eclipse.xtext.linking.lazy.lazyLinking.Type#getProperties Properties}'.
- *
- *
- * @return the meta object for the containment reference list 'Properties'.
- * @see org.eclipse.xtext.linking.lazy.lazyLinking.Type#getProperties()
- * @see #getType()
- * @generated
- */
- EReference getType_Properties();
-
- /**
- * Returns the meta object for the containment reference list '{@link org.eclipse.xtext.linking.lazy.lazyLinking.Type#getUnresolvedProxyProperty Unresolved Proxy Property}'.
- *
- *
- * @return the meta object for the containment reference list 'Unresolved Proxy Property'.
- * @see org.eclipse.xtext.linking.lazy.lazyLinking.Type#getUnresolvedProxyProperty()
- * @see #getType()
- * @generated
- */
- EReference getType_UnresolvedProxyProperty();
-
- /**
- * Returns the meta object for the reference list '{@link org.eclipse.xtext.linking.lazy.lazyLinking.Type#getSubtypes Subtypes}'.
- *
- *
- * @return the meta object for the reference list 'Subtypes'.
- * @see org.eclipse.xtext.linking.lazy.lazyLinking.Type#getSubtypes()
- * @see #getType()
- * @generated
- */
- EReference getType_Subtypes();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.xtext.linking.lazy.lazyLinking.Property Property}'.
- *
- *
- * @return the meta object for class 'Property'.
- * @see org.eclipse.xtext.linking.lazy.lazyLinking.Property
- * @generated
- */
- EClass getProperty();
-
- /**
- * Returns the meta object for the reference list '{@link org.eclipse.xtext.linking.lazy.lazyLinking.Property#getType Type}'.
- *
- *
- * @return the meta object for the reference list 'Type'.
- * @see org.eclipse.xtext.linking.lazy.lazyLinking.Property#getType()
- * @see #getProperty()
- * @generated
- */
- EReference getProperty_Type();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.xtext.linking.lazy.lazyLinking.Property#getName Name}'.
- *
- *
- * @return the meta object for the attribute 'Name'.
- * @see org.eclipse.xtext.linking.lazy.lazyLinking.Property#getName()
- * @see #getProperty()
- * @generated
- */
- EAttribute getProperty_Name();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.xtext.linking.lazy.lazyLinking.UnresolvedProxyProperty Unresolved Proxy Property}'.
- *
- *
- * @return the meta object for class 'Unresolved Proxy Property'.
- * @see org.eclipse.xtext.linking.lazy.lazyLinking.UnresolvedProxyProperty
- * @generated
- */
- EClass getUnresolvedProxyProperty();
-
- /**
- * Returns the meta object for the reference list '{@link org.eclipse.xtext.linking.lazy.lazyLinking.UnresolvedProxyProperty#getType Type}'.
- *
- *
- * @return the meta object for the reference list 'Type'.
- * @see org.eclipse.xtext.linking.lazy.lazyLinking.UnresolvedProxyProperty#getType()
- * @see #getUnresolvedProxyProperty()
- * @generated
- */
- EReference getUnresolvedProxyProperty_Type();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.xtext.linking.lazy.lazyLinking.UnresolvedProxyProperty#getName Name}'.
- *
- *
- * @return the meta object for the attribute 'Name'.
- * @see org.eclipse.xtext.linking.lazy.lazyLinking.UnresolvedProxyProperty#getName()
- * @see #getUnresolvedProxyProperty()
- * @generated
- */
- EAttribute getUnresolvedProxyProperty_Name();
-
- /**
- * Returns the factory that creates the instances of the model.
- *
- *
- * @return the factory that creates the instances of the model.
- * @generated
- */
- LazyLinkingFactory getLazyLinkingFactory();
-
- /**
- *
- * Defines literals for the meta objects that represent
- *
- * - each class,
- * - each feature of each class,
- * - each enum,
- * - and each data type
- *
- *
- * @generated
- */
- interface Literals
- {
- /**
- * The meta object literal for the '{@link org.eclipse.xtext.linking.lazy.lazyLinking.impl.ModelImpl Model}' class.
- *
- *
- * @see org.eclipse.xtext.linking.lazy.lazyLinking.impl.ModelImpl
- * @see org.eclipse.xtext.linking.lazy.lazyLinking.impl.LazyLinkingPackageImpl#getModel()
- * @generated
- */
- EClass MODEL = eINSTANCE.getModel();
-
- /**
- * The meta object literal for the 'Types' containment reference list feature.
- *
- *
- * @generated
- */
- EReference MODEL__TYPES = eINSTANCE.getModel_Types();
-
- /**
- * The meta object literal for the '{@link org.eclipse.xtext.linking.lazy.lazyLinking.impl.TypeImpl Type}' class.
- *
- *
- * @see org.eclipse.xtext.linking.lazy.lazyLinking.impl.TypeImpl
- * @see org.eclipse.xtext.linking.lazy.lazyLinking.impl.LazyLinkingPackageImpl#getType()
- * @generated
- */
- EClass TYPE = eINSTANCE.getType();
-
- /**
- * The meta object literal for the 'Name' attribute feature.
- *
- *
- * @generated
- */
- EAttribute TYPE__NAME = eINSTANCE.getType_Name();
-
- /**
- * The meta object literal for the 'Extends' reference feature.
- *
- *
- * @generated
- */
- EReference TYPE__EXTENDS = eINSTANCE.getType_Extends();
-
- /**
- * The meta object literal for the 'Parent Id' reference feature.
- *
- *
- * @generated
- */
- EReference TYPE__PARENT_ID = eINSTANCE.getType_ParentId();
-
- /**
- * The meta object literal for the 'Properties' containment reference list feature.
- *
- *
- * @generated
- */
- EReference TYPE__PROPERTIES = eINSTANCE.getType_Properties();
-
- /**
- * The meta object literal for the 'Unresolved Proxy Property' containment reference list feature.
- *
- *
- * @generated
- */
- EReference TYPE__UNRESOLVED_PROXY_PROPERTY = eINSTANCE.getType_UnresolvedProxyProperty();
-
- /**
- * The meta object literal for the 'Subtypes' reference list feature.
- *
- *
- * @generated
- */
- EReference TYPE__SUBTYPES = eINSTANCE.getType_Subtypes();
-
- /**
- * The meta object literal for the '{@link org.eclipse.xtext.linking.lazy.lazyLinking.impl.PropertyImpl Property}' class.
- *
- *
- * @see org.eclipse.xtext.linking.lazy.lazyLinking.impl.PropertyImpl
- * @see org.eclipse.xtext.linking.lazy.lazyLinking.impl.LazyLinkingPackageImpl#getProperty()
- * @generated
- */
- EClass PROPERTY = eINSTANCE.getProperty();
-
- /**
- * The meta object literal for the 'Type' reference list feature.
- *
- *
- * @generated
- */
- EReference PROPERTY__TYPE = eINSTANCE.getProperty_Type();
-
- /**
- * The meta object literal for the 'Name' attribute feature.
- *
- *
- * @generated
- */
- EAttribute PROPERTY__NAME = eINSTANCE.getProperty_Name();
-
- /**
- * The meta object literal for the '{@link org.eclipse.xtext.linking.lazy.lazyLinking.impl.UnresolvedProxyPropertyImpl Unresolved Proxy Property}' class.
- *
- *
- * @see org.eclipse.xtext.linking.lazy.lazyLinking.impl.UnresolvedProxyPropertyImpl
- * @see org.eclipse.xtext.linking.lazy.lazyLinking.impl.LazyLinkingPackageImpl#getUnresolvedProxyProperty()
- * @generated
- */
- EClass UNRESOLVED_PROXY_PROPERTY = eINSTANCE.getUnresolvedProxyProperty();
-
- /**
- * The meta object literal for the 'Type' reference list feature.
- *
- *
- * @generated
- */
- EReference UNRESOLVED_PROXY_PROPERTY__TYPE = eINSTANCE.getUnresolvedProxyProperty_Type();
-
- /**
- * The meta object literal for the 'Name' attribute feature.
- *
- *
- * @generated
- */
- EAttribute UNRESOLVED_PROXY_PROPERTY__NAME = eINSTANCE.getUnresolvedProxyProperty_Name();
-
- }
-
-} //LazyLinkingPackage
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/lazyLinking/Model.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/lazyLinking/Model.java
deleted file mode 100644
index 74144eb79..000000000
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/lazyLinking/Model.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * generated by Xtext
- */
-package org.eclipse.xtext.linking.lazy.lazyLinking;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- *
- * A representation of the model object 'Model'.
- *
- *
- *
- * The following features are supported:
- *
- *
- * - {@link org.eclipse.xtext.linking.lazy.lazyLinking.Model#getTypes Types}
- *
- *
- * @see org.eclipse.xtext.linking.lazy.lazyLinking.LazyLinkingPackage#getModel()
- * @model
- * @generated
- */
-public interface Model extends EObject
-{
- /**
- * Returns the value of the 'Types' containment reference list.
- * The list contents are of type {@link org.eclipse.xtext.linking.lazy.lazyLinking.Type}.
- *
- *
- * If the meaning of the 'Types' containment reference list isn't clear,
- * there really should be more of a description here...
- *
- *
- * @return the value of the 'Types' containment reference list.
- * @see org.eclipse.xtext.linking.lazy.lazyLinking.LazyLinkingPackage#getModel_Types()
- * @model containment="true"
- * @generated
- */
- EList getTypes();
-
-} // Model
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/lazyLinking/Property.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/lazyLinking/Property.java
deleted file mode 100644
index e0482ade5..000000000
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/lazyLinking/Property.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/**
- * generated by Xtext
- */
-package org.eclipse.xtext.linking.lazy.lazyLinking;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- *
- * A representation of the model object 'Property'.
- *
- *
- *
- * The following features are supported:
- *
- *
- * - {@link org.eclipse.xtext.linking.lazy.lazyLinking.Property#getType Type}
- * - {@link org.eclipse.xtext.linking.lazy.lazyLinking.Property#getName Name}
- *
- *
- * @see org.eclipse.xtext.linking.lazy.lazyLinking.LazyLinkingPackage#getProperty()
- * @model
- * @generated
- */
-public interface Property extends EObject
-{
- /**
- * Returns the value of the 'Type' reference list.
- * The list contents are of type {@link org.eclipse.xtext.linking.lazy.lazyLinking.Type}.
- *
- *
- * If the meaning of the 'Type' reference list isn't clear,
- * there really should be more of a description here...
- *
- *
- * @return the value of the 'Type' reference list.
- * @see org.eclipse.xtext.linking.lazy.lazyLinking.LazyLinkingPackage#getProperty_Type()
- * @model
- * @generated
- */
- EList getType();
-
- /**
- * Returns the value of the 'Name' attribute.
- *
- *
- * If the meaning of the 'Name' attribute isn't clear,
- * there really should be more of a description here...
- *
- *
- * @return the value of the 'Name' attribute.
- * @see #setName(String)
- * @see org.eclipse.xtext.linking.lazy.lazyLinking.LazyLinkingPackage#getProperty_Name()
- * @model
- * @generated
- */
- String getName();
-
- /**
- * Sets the value of the '{@link org.eclipse.xtext.linking.lazy.lazyLinking.Property#getName Name}' attribute.
- *
- *
- * @param value the new value of the 'Name' attribute.
- * @see #getName()
- * @generated
- */
- void setName(String value);
-
-} // Property
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/lazyLinking/Type.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/lazyLinking/Type.java
deleted file mode 100644
index 107aea6d0..000000000
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/lazyLinking/Type.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/**
- * generated by Xtext
- */
-package org.eclipse.xtext.linking.lazy.lazyLinking;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- *
- * A representation of the model object 'Type'.
- *
- *
- *
- * The following features are supported:
- *
- *
- * - {@link org.eclipse.xtext.linking.lazy.lazyLinking.Type#getName Name}
- * - {@link org.eclipse.xtext.linking.lazy.lazyLinking.Type#getExtends Extends}
- * - {@link org.eclipse.xtext.linking.lazy.lazyLinking.Type#getParentId Parent Id}
- * - {@link org.eclipse.xtext.linking.lazy.lazyLinking.Type#getProperties Properties}
- * - {@link org.eclipse.xtext.linking.lazy.lazyLinking.Type#getUnresolvedProxyProperty Unresolved Proxy Property}
- * - {@link org.eclipse.xtext.linking.lazy.lazyLinking.Type#getSubtypes Subtypes}
- *
- *
- * @see org.eclipse.xtext.linking.lazy.lazyLinking.LazyLinkingPackage#getType()
- * @model
- * @generated
- */
-public interface Type extends EObject
-{
- /**
- * Returns the value of the 'Name' attribute.
- *
- *
- * If the meaning of the 'Name' attribute isn't clear,
- * there really should be more of a description here...
- *
- *
- * @return the value of the 'Name' attribute.
- * @see #setName(String)
- * @see org.eclipse.xtext.linking.lazy.lazyLinking.LazyLinkingPackage#getType_Name()
- * @model
- * @generated
- */
- String getName();
-
- /**
- * Sets the value of the '{@link org.eclipse.xtext.linking.lazy.lazyLinking.Type#getName Name}' attribute.
- *
- *
- * @param value the new value of the 'Name' attribute.
- * @see #getName()
- * @generated
- */
- void setName(String value);
-
- /**
- * Returns the value of the 'Extends' reference.
- * It is bidirectional and its opposite is '{@link org.eclipse.xtext.linking.lazy.lazyLinking.Type#getSubtypes Subtypes}'.
- *
- *
- * If the meaning of the 'Extends' reference isn't clear,
- * there really should be more of a description here...
- *
- *
- * @return the value of the 'Extends' reference.
- * @see #setExtends(Type)
- * @see org.eclipse.xtext.linking.lazy.lazyLinking.LazyLinkingPackage#getType_Extends()
- * @see org.eclipse.xtext.linking.lazy.lazyLinking.Type#getSubtypes
- * @model opposite="subtypes"
- * @generated
- */
- Type getExtends();
-
- /**
- * Sets the value of the '{@link org.eclipse.xtext.linking.lazy.lazyLinking.Type#getExtends Extends}' reference.
- *
- *
- * @param value the new value of the 'Extends' reference.
- * @see #getExtends()
- * @generated
- */
- void setExtends(Type value);
-
- /**
- * Returns the value of the 'Parent Id' reference.
- *
- *
- * If the meaning of the 'Parent Id' reference isn't clear,
- * there really should be more of a description here...
- *
- *
- * @return the value of the 'Parent Id' reference.
- * @see #setParentId(Property)
- * @see org.eclipse.xtext.linking.lazy.lazyLinking.LazyLinkingPackage#getType_ParentId()
- * @model
- * @generated
- */
- Property getParentId();
-
- /**
- * Sets the value of the '{@link org.eclipse.xtext.linking.lazy.lazyLinking.Type#getParentId Parent Id}' reference.
- *
- *
- * @param value the new value of the 'Parent Id' reference.
- * @see #getParentId()
- * @generated
- */
- void setParentId(Property value);
-
- /**
- * Returns the value of the 'Properties' containment reference list.
- * The list contents are of type {@link org.eclipse.xtext.linking.lazy.lazyLinking.Property}.
- *
- *
- * If the meaning of the 'Properties' containment reference list isn't clear,
- * there really should be more of a description here...
- *
- *
- * @return the value of the 'Properties' containment reference list.
- * @see org.eclipse.xtext.linking.lazy.lazyLinking.LazyLinkingPackage#getType_Properties()
- * @model containment="true"
- * @generated
- */
- EList getProperties();
-
- /**
- * Returns the value of the 'Unresolved Proxy Property' containment reference list.
- * The list contents are of type {@link org.eclipse.xtext.linking.lazy.lazyLinking.UnresolvedProxyProperty}.
- *
- *
- * If the meaning of the 'Unresolved Proxy Property' containment reference list isn't clear,
- * there really should be more of a description here...
- *
- *
- * @return the value of the 'Unresolved Proxy Property' containment reference list.
- * @see org.eclipse.xtext.linking.lazy.lazyLinking.LazyLinkingPackage#getType_UnresolvedProxyProperty()
- * @model containment="true"
- * @generated
- */
- EList getUnresolvedProxyProperty();
-
- /**
- * Returns the value of the 'Subtypes' reference list.
- * The list contents are of type {@link org.eclipse.xtext.linking.lazy.lazyLinking.Type}.
- * It is bidirectional and its opposite is '{@link org.eclipse.xtext.linking.lazy.lazyLinking.Type#getExtends Extends}'.
- *
- *
- * If the meaning of the 'Subtypes' reference list isn't clear,
- * there really should be more of a description here...
- *
- *
- * @return the value of the 'Subtypes' reference list.
- * @see org.eclipse.xtext.linking.lazy.lazyLinking.LazyLinkingPackage#getType_Subtypes()
- * @see org.eclipse.xtext.linking.lazy.lazyLinking.Type#getExtends
- * @model opposite="extends"
- * @generated
- */
- EList getSubtypes();
-
-} // Type
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/lazyLinking/UnresolvedProxyProperty.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/lazyLinking/UnresolvedProxyProperty.java
deleted file mode 100644
index 71edb368c..000000000
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/lazyLinking/UnresolvedProxyProperty.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/**
- * generated by Xtext
- */
-package org.eclipse.xtext.linking.lazy.lazyLinking;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- *
- * A representation of the model object 'Unresolved Proxy Property'.
- *
- *
- *
- * The following features are supported:
- *
- *
- * - {@link org.eclipse.xtext.linking.lazy.lazyLinking.UnresolvedProxyProperty#getType Type}
- * - {@link org.eclipse.xtext.linking.lazy.lazyLinking.UnresolvedProxyProperty#getName Name}
- *
- *
- * @see org.eclipse.xtext.linking.lazy.lazyLinking.LazyLinkingPackage#getUnresolvedProxyProperty()
- * @model
- * @generated
- */
-public interface UnresolvedProxyProperty extends EObject
-{
- /**
- * Returns the value of the 'Type' reference list.
- * The list contents are of type {@link org.eclipse.xtext.linking.lazy.lazyLinking.Type}.
- *
- *
- * If the meaning of the 'Type' reference list isn't clear,
- * there really should be more of a description here...
- *
- *
- * @return the value of the 'Type' reference list.
- * @see org.eclipse.xtext.linking.lazy.lazyLinking.LazyLinkingPackage#getUnresolvedProxyProperty_Type()
- * @model resolveProxies="false"
- * @generated
- */
- EList getType();
-
- /**
- * Returns the value of the 'Name' attribute.
- *
- *
- * If the meaning of the 'Name' attribute isn't clear,
- * there really should be more of a description here...
- *
- *
- * @return the value of the 'Name' attribute.
- * @see #setName(String)
- * @see org.eclipse.xtext.linking.lazy.lazyLinking.LazyLinkingPackage#getUnresolvedProxyProperty_Name()
- * @model
- * @generated
- */
- String getName();
-
- /**
- * Sets the value of the '{@link org.eclipse.xtext.linking.lazy.lazyLinking.UnresolvedProxyProperty#getName Name}' attribute.
- *
- *
- * @param value the new value of the 'Name' attribute.
- * @see #getName()
- * @generated
- */
- void setName(String value);
-
-} // UnresolvedProxyProperty
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/lazyLinking/impl/LazyLinkingFactoryImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/lazyLinking/impl/LazyLinkingFactoryImpl.java
deleted file mode 100644
index 800991012..000000000
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/lazyLinking/impl/LazyLinkingFactoryImpl.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/**
- * generated by Xtext
- */
-package org.eclipse.xtext.linking.lazy.lazyLinking.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-import org.eclipse.xtext.linking.lazy.lazyLinking.*;
-
-/**
- *
- * An implementation of the model Factory.
- *
- * @generated
- */
-public class LazyLinkingFactoryImpl extends EFactoryImpl implements LazyLinkingFactory
-{
- /**
- * Creates the default factory implementation.
- *
- *
- * @generated
- */
- public static LazyLinkingFactory init()
- {
- try
- {
- LazyLinkingFactory theLazyLinkingFactory = (LazyLinkingFactory)EPackage.Registry.INSTANCE.getEFactory(LazyLinkingPackage.eNS_URI);
- if (theLazyLinkingFactory != null)
- {
- return theLazyLinkingFactory;
- }
- }
- catch (Exception exception)
- {
- EcorePlugin.INSTANCE.log(exception);
- }
- return new LazyLinkingFactoryImpl();
- }
-
- /**
- * Creates an instance of the factory.
- *
- *
- * @generated
- */
- public LazyLinkingFactoryImpl()
- {
- super();
- }
-
- /**
- *
- *
- * @generated
- */
- @Override
- public EObject create(EClass eClass)
- {
- switch (eClass.getClassifierID())
- {
- case LazyLinkingPackage.MODEL: return createModel();
- case LazyLinkingPackage.TYPE: return createType();
- case LazyLinkingPackage.PROPERTY: return createProperty();
- case LazyLinkingPackage.UNRESOLVED_PROXY_PROPERTY: return createUnresolvedProxyProperty();
- default:
- throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
- }
- }
-
- /**
- *
- *
- * @generated
- */
- public Model createModel()
- {
- ModelImpl model = new ModelImpl();
- return model;
- }
-
- /**
- *
- *
- * @generated
- */
- public Type createType()
- {
- TypeImpl type = new TypeImpl();
- return type;
- }
-
- /**
- *
- *
- * @generated
- */
- public Property createProperty()
- {
- PropertyImpl property = new PropertyImpl();
- return property;
- }
-
- /**
- *
- *
- * @generated
- */
- public UnresolvedProxyProperty createUnresolvedProxyProperty()
- {
- UnresolvedProxyPropertyImpl unresolvedProxyProperty = new UnresolvedProxyPropertyImpl();
- return unresolvedProxyProperty;
- }
-
- /**
- *
- *
- * @generated
- */
- public LazyLinkingPackage getLazyLinkingPackage()
- {
- return (LazyLinkingPackage)getEPackage();
- }
-
- /**
- *
- *
- * @deprecated
- * @generated
- */
- @Deprecated
- public static LazyLinkingPackage getPackage()
- {
- return LazyLinkingPackage.eINSTANCE;
- }
-
-} //LazyLinkingFactoryImpl
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/lazyLinking/impl/LazyLinkingPackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/lazyLinking/impl/LazyLinkingPackageImpl.java
deleted file mode 100644
index 716651003..000000000
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/lazyLinking/impl/LazyLinkingPackageImpl.java
+++ /dev/null
@@ -1,380 +0,0 @@
-/**
- * generated by Xtext
- */
-package org.eclipse.xtext.linking.lazy.lazyLinking.impl;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EcorePackage;
-
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-
-import org.eclipse.xtext.linking.lazy.lazyLinking.LazyLinkingFactory;
-import org.eclipse.xtext.linking.lazy.lazyLinking.LazyLinkingPackage;
-import org.eclipse.xtext.linking.lazy.lazyLinking.Model;
-import org.eclipse.xtext.linking.lazy.lazyLinking.Property;
-import org.eclipse.xtext.linking.lazy.lazyLinking.Type;
-import org.eclipse.xtext.linking.lazy.lazyLinking.UnresolvedProxyProperty;
-
-/**
- *
- * An implementation of the model Package.
- *
- * @generated
- */
-public class LazyLinkingPackageImpl extends EPackageImpl implements LazyLinkingPackage
-{
- /**
- *
- *
- * @generated
- */
- private EClass modelEClass = null;
-
- /**
- *
- *
- * @generated
- */
- private EClass typeEClass = null;
-
- /**
- *
- *
- * @generated
- */
- private EClass propertyEClass = null;
-
- /**
- *
- *
- * @generated
- */
- private EClass unresolvedProxyPropertyEClass = null;
-
- /**
- * Creates an instance of the model Package, registered with
- * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
- * package URI value.
- * Note: the correct way to create the package is via the static
- * factory method {@link #init init()}, which also performs
- * initialization of the package, or returns the registered package,
- * if one already exists.
- *
- *
- * @see org.eclipse.emf.ecore.EPackage.Registry
- * @see org.eclipse.xtext.linking.lazy.lazyLinking.LazyLinkingPackage#eNS_URI
- * @see #init()
- * @generated
- */
- private LazyLinkingPackageImpl()
- {
- super(eNS_URI, LazyLinkingFactory.eINSTANCE);
- }
-
- /**
- *
- *
- * @generated
- */
- private static boolean isInited = false;
-
- /**
- * Creates, registers, and initializes the Package for this model, and for any others upon which it depends.
- *
- *
This method is used to initialize {@link LazyLinkingPackage#eINSTANCE} when that field is accessed.
- * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
- *
- *
- * @see #eNS_URI
- * @see #createPackageContents()
- * @see #initializePackageContents()
- * @generated
- */
- public static LazyLinkingPackage init()
- {
- if (isInited) return (LazyLinkingPackage)EPackage.Registry.INSTANCE.getEPackage(LazyLinkingPackage.eNS_URI);
-
- // Obtain or create and register package
- LazyLinkingPackageImpl theLazyLinkingPackage = (LazyLinkingPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof LazyLinkingPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new LazyLinkingPackageImpl());
-
- isInited = true;
-
- // Initialize simple dependencies
- EcorePackage.eINSTANCE.eClass();
-
- // Create package meta-data objects
- theLazyLinkingPackage.createPackageContents();
-
- // Initialize created meta-data
- theLazyLinkingPackage.initializePackageContents();
-
- // Mark meta-data to indicate it can't be changed
- theLazyLinkingPackage.freeze();
-
-
- // Update the registry and return the package
- EPackage.Registry.INSTANCE.put(LazyLinkingPackage.eNS_URI, theLazyLinkingPackage);
- return theLazyLinkingPackage;
- }
-
- /**
- *
- *
- * @generated
- */
- public EClass getModel()
- {
- return modelEClass;
- }
-
- /**
- *
- *
- * @generated
- */
- public EReference getModel_Types()
- {
- return (EReference)modelEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- *
- *
- * @generated
- */
- public EClass getType()
- {
- return typeEClass;
- }
-
- /**
- *
- *
- * @generated
- */
- public EAttribute getType_Name()
- {
- return (EAttribute)typeEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- *
- *
- * @generated
- */
- public EReference getType_Extends()
- {
- return (EReference)typeEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- *
- *
- * @generated
- */
- public EReference getType_ParentId()
- {
- return (EReference)typeEClass.getEStructuralFeatures().get(2);
- }
-
- /**
- *
- *
- * @generated
- */
- public EReference getType_Properties()
- {
- return (EReference)typeEClass.getEStructuralFeatures().get(3);
- }
-
- /**
- *
- *
- * @generated
- */
- public EReference getType_UnresolvedProxyProperty()
- {
- return (EReference)typeEClass.getEStructuralFeatures().get(4);
- }
-
- /**
- *
- *
- * @generated
- */
- public EReference getType_Subtypes()
- {
- return (EReference)typeEClass.getEStructuralFeatures().get(5);
- }
-
- /**
- *
- *
- * @generated
- */
- public EClass getProperty()
- {
- return propertyEClass;
- }
-
- /**
- *
- *
- * @generated
- */
- public EReference getProperty_Type()
- {
- return (EReference)propertyEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- *
- *
- * @generated
- */
- public EAttribute getProperty_Name()
- {
- return (EAttribute)propertyEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- *
- *
- * @generated
- */
- public EClass getUnresolvedProxyProperty()
- {
- return unresolvedProxyPropertyEClass;
- }
-
- /**
- *
- *
- * @generated
- */
- public EReference getUnresolvedProxyProperty_Type()
- {
- return (EReference)unresolvedProxyPropertyEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- *
- *
- * @generated
- */
- public EAttribute getUnresolvedProxyProperty_Name()
- {
- return (EAttribute)unresolvedProxyPropertyEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- *
- *
- * @generated
- */
- public LazyLinkingFactory getLazyLinkingFactory()
- {
- return (LazyLinkingFactory)getEFactoryInstance();
- }
-
- /**
- *
- *
- * @generated
- */
- private boolean isCreated = false;
-
- /**
- * Creates the meta-model objects for the package. This method is
- * guarded to have no affect on any invocation but its first.
- *
- *
- * @generated
- */
- public void createPackageContents()
- {
- if (isCreated) return;
- isCreated = true;
-
- // Create classes and their features
- modelEClass = createEClass(MODEL);
- createEReference(modelEClass, MODEL__TYPES);
-
- typeEClass = createEClass(TYPE);
- createEAttribute(typeEClass, TYPE__NAME);
- createEReference(typeEClass, TYPE__EXTENDS);
- createEReference(typeEClass, TYPE__PARENT_ID);
- createEReference(typeEClass, TYPE__PROPERTIES);
- createEReference(typeEClass, TYPE__UNRESOLVED_PROXY_PROPERTY);
- createEReference(typeEClass, TYPE__SUBTYPES);
-
- propertyEClass = createEClass(PROPERTY);
- createEReference(propertyEClass, PROPERTY__TYPE);
- createEAttribute(propertyEClass, PROPERTY__NAME);
-
- unresolvedProxyPropertyEClass = createEClass(UNRESOLVED_PROXY_PROPERTY);
- createEReference(unresolvedProxyPropertyEClass, UNRESOLVED_PROXY_PROPERTY__TYPE);
- createEAttribute(unresolvedProxyPropertyEClass, UNRESOLVED_PROXY_PROPERTY__NAME);
- }
-
- /**
- *
- *
- * @generated
- */
- private boolean isInitialized = false;
-
- /**
- * Complete the initialization of the package and its meta-model. This
- * method is guarded to have no affect on any invocation but its first.
- *
- *
- * @generated
- */
- public void initializePackageContents()
- {
- if (isInitialized) return;
- isInitialized = true;
-
- // Initialize package
- setName(eNAME);
- setNsPrefix(eNS_PREFIX);
- setNsURI(eNS_URI);
-
- // Obtain other dependent packages
- EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
-
- // Create type parameters
-
- // Set bounds for type parameters
-
- // Add supertypes to classes
-
- // Initialize classes and features; add operations and parameters
- initEClass(modelEClass, Model.class, "Model", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getModel_Types(), this.getType(), null, "types", null, 0, -1, Model.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(typeEClass, Type.class, "Type", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getType_Name(), theEcorePackage.getEString(), "name", null, 0, 1, Type.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getType_Extends(), this.getType(), this.getType_Subtypes(), "extends", null, 0, 1, Type.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getType_ParentId(), this.getProperty(), null, "parentId", null, 0, 1, Type.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getType_Properties(), this.getProperty(), null, "properties", null, 0, -1, Type.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getType_UnresolvedProxyProperty(), this.getUnresolvedProxyProperty(), null, "unresolvedProxyProperty", null, 0, -1, Type.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getType_Subtypes(), this.getType(), this.getType_Extends(), "subtypes", null, 0, -1, Type.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(propertyEClass, Property.class, "Property", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getProperty_Type(), this.getType(), null, "type", null, 0, -1, Property.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getProperty_Name(), theEcorePackage.getEString(), "name", null, 0, 1, Property.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(unresolvedProxyPropertyEClass, UnresolvedProxyProperty.class, "UnresolvedProxyProperty", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getUnresolvedProxyProperty_Type(), this.getType(), null, "type", null, 0, -1, UnresolvedProxyProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getUnresolvedProxyProperty_Name(), theEcorePackage.getEString(), "name", null, 0, 1, UnresolvedProxyProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- // Create resource
- createResource(eNS_URI);
- }
-
-} //LazyLinkingPackageImpl
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/lazyLinking/impl/ModelImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/lazyLinking/impl/ModelImpl.java
deleted file mode 100644
index 362fa47e9..000000000
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/lazyLinking/impl/ModelImpl.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/**
- * generated by Xtext
- */
-package org.eclipse.xtext.linking.lazy.lazyLinking.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
-
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.xtext.linking.lazy.lazyLinking.LazyLinkingPackage;
-import org.eclipse.xtext.linking.lazy.lazyLinking.Model;
-import org.eclipse.xtext.linking.lazy.lazyLinking.Type;
-
-/**
- *
- * An implementation of the model object 'Model'.
- *
- *
- * The following features are implemented:
- *
- *
- * - {@link org.eclipse.xtext.linking.lazy.lazyLinking.impl.ModelImpl#getTypes Types}
- *
- *
- * @generated
- */
-public class ModelImpl extends MinimalEObjectImpl.Container implements Model
-{
- /**
- * The cached value of the '{@link #getTypes() Types}' containment reference list.
- *
- *
- * @see #getTypes()
- * @generated
- * @ordered
- */
- protected EList types;
-
- /**
- *
- *
- * @generated
- */
- protected ModelImpl()
- {
- super();
- }
-
- /**
- *
- *
- * @generated
- */
- @Override
- protected EClass eStaticClass()
- {
- return LazyLinkingPackage.Literals.MODEL;
- }
-
- /**
- *
- *
- * @generated
- */
- public EList getTypes()
- {
- if (types == null)
- {
- types = new EObjectContainmentEList(Type.class, this, LazyLinkingPackage.MODEL__TYPES);
- }
- return types;
- }
-
- /**
- *
- *
- * @generated
- */
- @Override
- public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
- {
- switch (featureID)
- {
- case LazyLinkingPackage.MODEL__TYPES:
- return ((InternalEList)getTypes()).basicRemove(otherEnd, msgs);
- }
- return super.eInverseRemove(otherEnd, featureID, msgs);
- }
-
- /**
- *
- *
- * @generated
- */
- @Override
- public Object eGet(int featureID, boolean resolve, boolean coreType)
- {
- switch (featureID)
- {
- case LazyLinkingPackage.MODEL__TYPES:
- return getTypes();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- *
- *
- * @generated
- */
- @SuppressWarnings("unchecked")
- @Override
- public void eSet(int featureID, Object newValue)
- {
- switch (featureID)
- {
- case LazyLinkingPackage.MODEL__TYPES:
- getTypes().clear();
- getTypes().addAll((Collection)newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- *
- *
- * @generated
- */
- @Override
- public void eUnset(int featureID)
- {
- switch (featureID)
- {
- case LazyLinkingPackage.MODEL__TYPES:
- getTypes().clear();
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- *
- *
- * @generated
- */
- @Override
- public boolean eIsSet(int featureID)
- {
- switch (featureID)
- {
- case LazyLinkingPackage.MODEL__TYPES:
- return types != null && !types.isEmpty();
- }
- return super.eIsSet(featureID);
- }
-
-} //ModelImpl
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/lazyLinking/impl/PropertyImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/lazyLinking/impl/PropertyImpl.java
deleted file mode 100644
index 262171961..000000000
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/lazyLinking/impl/PropertyImpl.java
+++ /dev/null
@@ -1,222 +0,0 @@
-/**
- * generated by Xtext
- */
-package org.eclipse.xtext.linking.lazy.lazyLinking.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
-
-import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-
-import org.eclipse.xtext.linking.lazy.lazyLinking.LazyLinkingPackage;
-import org.eclipse.xtext.linking.lazy.lazyLinking.Property;
-import org.eclipse.xtext.linking.lazy.lazyLinking.Type;
-
-/**
- *
- * An implementation of the model object 'Property'.
- *
- *
- * The following features are implemented:
- *
- *
- * - {@link org.eclipse.xtext.linking.lazy.lazyLinking.impl.PropertyImpl#getType Type}
- * - {@link org.eclipse.xtext.linking.lazy.lazyLinking.impl.PropertyImpl#getName Name}
- *
- *
- * @generated
- */
-public class PropertyImpl extends MinimalEObjectImpl.Container implements Property
-{
- /**
- * The cached value of the '{@link #getType() Type}' reference list.
- *
- *
- * @see #getType()
- * @generated
- * @ordered
- */
- protected EList type;
-
- /**
- * The default value of the '{@link #getName() Name}' attribute.
- *
- *
- * @see #getName()
- * @generated
- * @ordered
- */
- protected static final String NAME_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getName() Name}' attribute.
- *
- *
- * @see #getName()
- * @generated
- * @ordered
- */
- protected String name = NAME_EDEFAULT;
-
- /**
- *
- *
- * @generated
- */
- protected PropertyImpl()
- {
- super();
- }
-
- /**
- *
- *
- * @generated
- */
- @Override
- protected EClass eStaticClass()
- {
- return LazyLinkingPackage.Literals.PROPERTY;
- }
-
- /**
- *
- *
- * @generated
- */
- public EList getType()
- {
- if (type == null)
- {
- type = new EObjectResolvingEList(Type.class, this, LazyLinkingPackage.PROPERTY__TYPE);
- }
- return type;
- }
-
- /**
- *
- *
- * @generated
- */
- public String getName()
- {
- return name;
- }
-
- /**
- *
- *
- * @generated
- */
- public void setName(String newName)
- {
- String oldName = name;
- name = newName;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, LazyLinkingPackage.PROPERTY__NAME, oldName, name));
- }
-
- /**
- *
- *
- * @generated
- */
- @Override
- public Object eGet(int featureID, boolean resolve, boolean coreType)
- {
- switch (featureID)
- {
- case LazyLinkingPackage.PROPERTY__TYPE:
- return getType();
- case LazyLinkingPackage.PROPERTY__NAME:
- return getName();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- *
- *
- * @generated
- */
- @SuppressWarnings("unchecked")
- @Override
- public void eSet(int featureID, Object newValue)
- {
- switch (featureID)
- {
- case LazyLinkingPackage.PROPERTY__TYPE:
- getType().clear();
- getType().addAll((Collection)newValue);
- return;
- case LazyLinkingPackage.PROPERTY__NAME:
- setName((String)newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- *
- *
- * @generated
- */
- @Override
- public void eUnset(int featureID)
- {
- switch (featureID)
- {
- case LazyLinkingPackage.PROPERTY__TYPE:
- getType().clear();
- return;
- case LazyLinkingPackage.PROPERTY__NAME:
- setName(NAME_EDEFAULT);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- *
- *
- * @generated
- */
- @Override
- public boolean eIsSet(int featureID)
- {
- switch (featureID)
- {
- case LazyLinkingPackage.PROPERTY__TYPE:
- return type != null && !type.isEmpty();
- case LazyLinkingPackage.PROPERTY__NAME:
- return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
- }
- return super.eIsSet(featureID);
- }
-
- /**
- *
- *
- * @generated
- */
- @Override
- public String toString()
- {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (name: ");
- result.append(name);
- result.append(')');
- return result.toString();
- }
-
-} //PropertyImpl
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/lazyLinking/impl/TypeImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/lazyLinking/impl/TypeImpl.java
deleted file mode 100644
index 65446e4c5..000000000
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/lazyLinking/impl/TypeImpl.java
+++ /dev/null
@@ -1,497 +0,0 @@
-/**
- * generated by Xtext
- */
-package org.eclipse.xtext.linking.lazy.lazyLinking.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
-
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.xtext.linking.lazy.lazyLinking.LazyLinkingPackage;
-import org.eclipse.xtext.linking.lazy.lazyLinking.Property;
-import org.eclipse.xtext.linking.lazy.lazyLinking.Type;
-import org.eclipse.xtext.linking.lazy.lazyLinking.UnresolvedProxyProperty;
-
-/**
- *
- * An implementation of the model object 'Type'.
- *
- *
- * The following features are implemented:
- *
- *
- * - {@link org.eclipse.xtext.linking.lazy.lazyLinking.impl.TypeImpl#getName Name}
- * - {@link org.eclipse.xtext.linking.lazy.lazyLinking.impl.TypeImpl#getExtends Extends}
- * - {@link org.eclipse.xtext.linking.lazy.lazyLinking.impl.TypeImpl#getParentId Parent Id}
- * - {@link org.eclipse.xtext.linking.lazy.lazyLinking.impl.TypeImpl#getProperties Properties}
- * - {@link org.eclipse.xtext.linking.lazy.lazyLinking.impl.TypeImpl#getUnresolvedProxyProperty Unresolved Proxy Property}
- * - {@link org.eclipse.xtext.linking.lazy.lazyLinking.impl.TypeImpl#getSubtypes Subtypes}
- *
- *
- * @generated
- */
-public class TypeImpl extends MinimalEObjectImpl.Container implements Type
-{
- /**
- * The default value of the '{@link #getName() Name}' attribute.
- *
- *
- * @see #getName()
- * @generated
- * @ordered
- */
- protected static final String NAME_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getName() Name}' attribute.
- *
- *
- * @see #getName()
- * @generated
- * @ordered
- */
- protected String name = NAME_EDEFAULT;
-
- /**
- * The cached value of the '{@link #getExtends() Extends}' reference.
- *
- *
- * @see #getExtends()
- * @generated
- * @ordered
- */
- protected Type extends_;
-
- /**
- * The cached value of the '{@link #getParentId() Parent Id}' reference.
- *
- *
- * @see #getParentId()
- * @generated
- * @ordered
- */
- protected Property parentId;
-
- /**
- * The cached value of the '{@link #getProperties() Properties}' containment reference list.
- *
- *
- * @see #getProperties()
- * @generated
- * @ordered
- */
- protected EList properties;
-
- /**
- * The cached value of the '{@link #getUnresolvedProxyProperty() Unresolved Proxy Property}' containment reference list.
- *
- *
- * @see #getUnresolvedProxyProperty()
- * @generated
- * @ordered
- */
- protected EList unresolvedProxyProperty;
-
- /**
- * The cached value of the '{@link #getSubtypes() Subtypes}' reference list.
- *
- *
- * @see #getSubtypes()
- * @generated
- * @ordered
- */
- protected EList subtypes;
-
- /**
- *
- *
- * @generated
- */
- protected TypeImpl()
- {
- super();
- }
-
- /**
- *
- *
- * @generated
- */
- @Override
- protected EClass eStaticClass()
- {
- return LazyLinkingPackage.Literals.TYPE;
- }
-
- /**
- *
- *
- * @generated
- */
- public String getName()
- {
- return name;
- }
-
- /**
- *
- *
- * @generated
- */
- public void setName(String newName)
- {
- String oldName = name;
- name = newName;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, LazyLinkingPackage.TYPE__NAME, oldName, name));
- }
-
- /**
- *
- *
- * @generated
- */
- public Type getExtends()
- {
- if (extends_ != null && extends_.eIsProxy())
- {
- InternalEObject oldExtends = (InternalEObject)extends_;
- extends_ = (Type)eResolveProxy(oldExtends);
- if (extends_ != oldExtends)
- {
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.RESOLVE, LazyLinkingPackage.TYPE__EXTENDS, oldExtends, extends_));
- }
- }
- return extends_;
- }
-
- /**
- *
- *
- * @generated
- */
- public Type basicGetExtends()
- {
- return extends_;
- }
-
- /**
- *
- *
- * @generated
- */
- public NotificationChain basicSetExtends(Type newExtends, NotificationChain msgs)
- {
- Type oldExtends = extends_;
- extends_ = newExtends;
- if (eNotificationRequired())
- {
- ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, LazyLinkingPackage.TYPE__EXTENDS, oldExtends, newExtends);
- if (msgs == null) msgs = notification; else msgs.add(notification);
- }
- return msgs;
- }
-
- /**
- *
- *
- * @generated
- */
- public void setExtends(Type newExtends)
- {
- if (newExtends != extends_)
- {
- NotificationChain msgs = null;
- if (extends_ != null)
- msgs = ((InternalEObject)extends_).eInverseRemove(this, LazyLinkingPackage.TYPE__SUBTYPES, Type.class, msgs);
- if (newExtends != null)
- msgs = ((InternalEObject)newExtends).eInverseAdd(this, LazyLinkingPackage.TYPE__SUBTYPES, Type.class, msgs);
- msgs = basicSetExtends(newExtends, msgs);
- if (msgs != null) msgs.dispatch();
- }
- else if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, LazyLinkingPackage.TYPE__EXTENDS, newExtends, newExtends));
- }
-
- /**
- *
- *
- * @generated
- */
- public Property getParentId()
- {
- if (parentId != null && parentId.eIsProxy())
- {
- InternalEObject oldParentId = (InternalEObject)parentId;
- parentId = (Property)eResolveProxy(oldParentId);
- if (parentId != oldParentId)
- {
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.RESOLVE, LazyLinkingPackage.TYPE__PARENT_ID, oldParentId, parentId));
- }
- }
- return parentId;
- }
-
- /**
- *
- *
- * @generated
- */
- public Property basicGetParentId()
- {
- return parentId;
- }
-
- /**
- *
- *
- * @generated
- */
- public void setParentId(Property newParentId)
- {
- Property oldParentId = parentId;
- parentId = newParentId;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, LazyLinkingPackage.TYPE__PARENT_ID, oldParentId, parentId));
- }
-
- /**
- *
- *
- * @generated
- */
- public EList getProperties()
- {
- if (properties == null)
- {
- properties = new EObjectContainmentEList(Property.class, this, LazyLinkingPackage.TYPE__PROPERTIES);
- }
- return properties;
- }
-
- /**
- *
- *
- * @generated
- */
- public EList getUnresolvedProxyProperty()
- {
- if (unresolvedProxyProperty == null)
- {
- unresolvedProxyProperty = new EObjectContainmentEList(UnresolvedProxyProperty.class, this, LazyLinkingPackage.TYPE__UNRESOLVED_PROXY_PROPERTY);
- }
- return unresolvedProxyProperty;
- }
-
- /**
- *
- *
- * @generated
- */
- public EList getSubtypes()
- {
- if (subtypes == null)
- {
- subtypes = new EObjectWithInverseResolvingEList(Type.class, this, LazyLinkingPackage.TYPE__SUBTYPES, LazyLinkingPackage.TYPE__EXTENDS);
- }
- return subtypes;
- }
-
- /**
- *
- *
- * @generated
- */
- @SuppressWarnings("unchecked")
- @Override
- public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs)
- {
- switch (featureID)
- {
- case LazyLinkingPackage.TYPE__EXTENDS:
- if (extends_ != null)
- msgs = ((InternalEObject)extends_).eInverseRemove(this, LazyLinkingPackage.TYPE__SUBTYPES, Type.class, msgs);
- return basicSetExtends((Type)otherEnd, msgs);
- case LazyLinkingPackage.TYPE__SUBTYPES:
- return ((InternalEList)(InternalEList)getSubtypes()).basicAdd(otherEnd, msgs);
- }
- return super.eInverseAdd(otherEnd, featureID, msgs);
- }
-
- /**
- *
- *
- * @generated
- */
- @Override
- public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
- {
- switch (featureID)
- {
- case LazyLinkingPackage.TYPE__EXTENDS:
- return basicSetExtends(null, msgs);
- case LazyLinkingPackage.TYPE__PROPERTIES:
- return ((InternalEList)getProperties()).basicRemove(otherEnd, msgs);
- case LazyLinkingPackage.TYPE__UNRESOLVED_PROXY_PROPERTY:
- return ((InternalEList)getUnresolvedProxyProperty()).basicRemove(otherEnd, msgs);
- case LazyLinkingPackage.TYPE__SUBTYPES:
- return ((InternalEList)getSubtypes()).basicRemove(otherEnd, msgs);
- }
- return super.eInverseRemove(otherEnd, featureID, msgs);
- }
-
- /**
- *
- *
- * @generated
- */
- @Override
- public Object eGet(int featureID, boolean resolve, boolean coreType)
- {
- switch (featureID)
- {
- case LazyLinkingPackage.TYPE__NAME:
- return getName();
- case LazyLinkingPackage.TYPE__EXTENDS:
- if (resolve) return getExtends();
- return basicGetExtends();
- case LazyLinkingPackage.TYPE__PARENT_ID:
- if (resolve) return getParentId();
- return basicGetParentId();
- case LazyLinkingPackage.TYPE__PROPERTIES:
- return getProperties();
- case LazyLinkingPackage.TYPE__UNRESOLVED_PROXY_PROPERTY:
- return getUnresolvedProxyProperty();
- case LazyLinkingPackage.TYPE__SUBTYPES:
- return getSubtypes();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- *
- *
- * @generated
- */
- @SuppressWarnings("unchecked")
- @Override
- public void eSet(int featureID, Object newValue)
- {
- switch (featureID)
- {
- case LazyLinkingPackage.TYPE__NAME:
- setName((String)newValue);
- return;
- case LazyLinkingPackage.TYPE__EXTENDS:
- setExtends((Type)newValue);
- return;
- case LazyLinkingPackage.TYPE__PARENT_ID:
- setParentId((Property)newValue);
- return;
- case LazyLinkingPackage.TYPE__PROPERTIES:
- getProperties().clear();
- getProperties().addAll((Collection)newValue);
- return;
- case LazyLinkingPackage.TYPE__UNRESOLVED_PROXY_PROPERTY:
- getUnresolvedProxyProperty().clear();
- getUnresolvedProxyProperty().addAll((Collection)newValue);
- return;
- case LazyLinkingPackage.TYPE__SUBTYPES:
- getSubtypes().clear();
- getSubtypes().addAll((Collection)newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- *
- *
- * @generated
- */
- @Override
- public void eUnset(int featureID)
- {
- switch (featureID)
- {
- case LazyLinkingPackage.TYPE__NAME:
- setName(NAME_EDEFAULT);
- return;
- case LazyLinkingPackage.TYPE__EXTENDS:
- setExtends((Type)null);
- return;
- case LazyLinkingPackage.TYPE__PARENT_ID:
- setParentId((Property)null);
- return;
- case LazyLinkingPackage.TYPE__PROPERTIES:
- getProperties().clear();
- return;
- case LazyLinkingPackage.TYPE__UNRESOLVED_PROXY_PROPERTY:
- getUnresolvedProxyProperty().clear();
- return;
- case LazyLinkingPackage.TYPE__SUBTYPES:
- getSubtypes().clear();
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- *
- *
- * @generated
- */
- @Override
- public boolean eIsSet(int featureID)
- {
- switch (featureID)
- {
- case LazyLinkingPackage.TYPE__NAME:
- return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
- case LazyLinkingPackage.TYPE__EXTENDS:
- return extends_ != null;
- case LazyLinkingPackage.TYPE__PARENT_ID:
- return parentId != null;
- case LazyLinkingPackage.TYPE__PROPERTIES:
- return properties != null && !properties.isEmpty();
- case LazyLinkingPackage.TYPE__UNRESOLVED_PROXY_PROPERTY:
- return unresolvedProxyProperty != null && !unresolvedProxyProperty.isEmpty();
- case LazyLinkingPackage.TYPE__SUBTYPES:
- return subtypes != null && !subtypes.isEmpty();
- }
- return super.eIsSet(featureID);
- }
-
- /**
- *
- *
- * @generated
- */
- @Override
- public String toString()
- {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (name: ");
- result.append(name);
- result.append(')');
- return result.toString();
- }
-
-} //TypeImpl
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/lazyLinking/impl/UnresolvedProxyPropertyImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/lazyLinking/impl/UnresolvedProxyPropertyImpl.java
deleted file mode 100644
index 0bdb251fd..000000000
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/lazyLinking/impl/UnresolvedProxyPropertyImpl.java
+++ /dev/null
@@ -1,222 +0,0 @@
-/**
- * generated by Xtext
- */
-package org.eclipse.xtext.linking.lazy.lazyLinking.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
-
-import org.eclipse.emf.ecore.util.EObjectEList;
-
-import org.eclipse.xtext.linking.lazy.lazyLinking.LazyLinkingPackage;
-import org.eclipse.xtext.linking.lazy.lazyLinking.Type;
-import org.eclipse.xtext.linking.lazy.lazyLinking.UnresolvedProxyProperty;
-
-/**
- *
- * An implementation of the model object 'Unresolved Proxy Property'.
- *
- *
- * The following features are implemented:
- *
- *
- * - {@link org.eclipse.xtext.linking.lazy.lazyLinking.impl.UnresolvedProxyPropertyImpl#getType Type}
- * - {@link org.eclipse.xtext.linking.lazy.lazyLinking.impl.UnresolvedProxyPropertyImpl#getName Name}
- *
- *
- * @generated
- */
-public class UnresolvedProxyPropertyImpl extends MinimalEObjectImpl.Container implements UnresolvedProxyProperty
-{
- /**
- * The cached value of the '{@link #getType() Type}' reference list.
- *
- *
- * @see #getType()
- * @generated
- * @ordered
- */
- protected EList type;
-
- /**
- * The default value of the '{@link #getName() Name}' attribute.
- *
- *
- * @see #getName()
- * @generated
- * @ordered
- */
- protected static final String NAME_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getName() Name}' attribute.
- *
- *
- * @see #getName()
- * @generated
- * @ordered
- */
- protected String name = NAME_EDEFAULT;
-
- /**
- *
- *
- * @generated
- */
- protected UnresolvedProxyPropertyImpl()
- {
- super();
- }
-
- /**
- *
- *
- * @generated
- */
- @Override
- protected EClass eStaticClass()
- {
- return LazyLinkingPackage.Literals.UNRESOLVED_PROXY_PROPERTY;
- }
-
- /**
- *
- *
- * @generated
- */
- public EList getType()
- {
- if (type == null)
- {
- type = new EObjectEList(Type.class, this, LazyLinkingPackage.UNRESOLVED_PROXY_PROPERTY__TYPE);
- }
- return type;
- }
-
- /**
- *
- *
- * @generated
- */
- public String getName()
- {
- return name;
- }
-
- /**
- *
- *
- * @generated
- */
- public void setName(String newName)
- {
- String oldName = name;
- name = newName;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, LazyLinkingPackage.UNRESOLVED_PROXY_PROPERTY__NAME, oldName, name));
- }
-
- /**
- *
- *
- * @generated
- */
- @Override
- public Object eGet(int featureID, boolean resolve, boolean coreType)
- {
- switch (featureID)
- {
- case LazyLinkingPackage.UNRESOLVED_PROXY_PROPERTY__TYPE:
- return getType();
- case LazyLinkingPackage.UNRESOLVED_PROXY_PROPERTY__NAME:
- return getName();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- *
- *
- * @generated
- */
- @SuppressWarnings("unchecked")
- @Override
- public void eSet(int featureID, Object newValue)
- {
- switch (featureID)
- {
- case LazyLinkingPackage.UNRESOLVED_PROXY_PROPERTY__TYPE:
- getType().clear();
- getType().addAll((Collection)newValue);
- return;
- case LazyLinkingPackage.UNRESOLVED_PROXY_PROPERTY__NAME:
- setName((String)newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- *
- *
- * @generated
- */
- @Override
- public void eUnset(int featureID)
- {
- switch (featureID)
- {
- case LazyLinkingPackage.UNRESOLVED_PROXY_PROPERTY__TYPE:
- getType().clear();
- return;
- case LazyLinkingPackage.UNRESOLVED_PROXY_PROPERTY__NAME:
- setName(NAME_EDEFAULT);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- *
- *
- * @generated
- */
- @Override
- public boolean eIsSet(int featureID)
- {
- switch (featureID)
- {
- case LazyLinkingPackage.UNRESOLVED_PROXY_PROPERTY__TYPE:
- return type != null && !type.isEmpty();
- case LazyLinkingPackage.UNRESOLVED_PROXY_PROPERTY__NAME:
- return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
- }
- return super.eIsSet(featureID);
- }
-
- /**
- *
- *
- * @generated
- */
- @Override
- public String toString()
- {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (name: ");
- result.append(name);
- result.append(')');
- return result.toString();
- }
-
-} //UnresolvedProxyPropertyImpl
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/lazyLinking/util/LazyLinkingAdapterFactory.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/lazyLinking/util/LazyLinkingAdapterFactory.java
deleted file mode 100644
index 7344d2c49..000000000
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/lazyLinking/util/LazyLinkingAdapterFactory.java
+++ /dev/null
@@ -1,193 +0,0 @@
-/**
- * generated by Xtext
- */
-package org.eclipse.xtext.linking.lazy.lazyLinking.util;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-
-import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.xtext.linking.lazy.lazyLinking.*;
-
-/**
- *
- * The Adapter Factory for the model.
- * It provides an adapter createXXX method for each class of the model.
- *
- * @see org.eclipse.xtext.linking.lazy.lazyLinking.LazyLinkingPackage
- * @generated
- */
-public class LazyLinkingAdapterFactory extends AdapterFactoryImpl
-{
- /**
- * The cached model package.
- *
- *
- * @generated
- */
- protected static LazyLinkingPackage modelPackage;
-
- /**
- * Creates an instance of the adapter factory.
- *
- *
- * @generated
- */
- public LazyLinkingAdapterFactory()
- {
- if (modelPackage == null)
- {
- modelPackage = LazyLinkingPackage.eINSTANCE;
- }
- }
-
- /**
- * Returns whether this factory is applicable for the type of the object.
- *
- * This implementation returns true if the object is either the model's package or is an instance object of the model.
- *
- * @return whether this factory is applicable for the type of the object.
- * @generated
- */
- @Override
- public boolean isFactoryForType(Object object)
- {
- if (object == modelPackage)
- {
- return true;
- }
- if (object instanceof EObject)
- {
- return ((EObject)object).eClass().getEPackage() == modelPackage;
- }
- return false;
- }
-
- /**
- * The switch that delegates to the createXXX methods.
- *
- *
- * @generated
- */
- protected LazyLinkingSwitch modelSwitch =
- new LazyLinkingSwitch()
- {
- @Override
- public Adapter caseModel(Model object)
- {
- return createModelAdapter();
- }
- @Override
- public Adapter caseType(Type object)
- {
- return createTypeAdapter();
- }
- @Override
- public Adapter caseProperty(Property object)
- {
- return createPropertyAdapter();
- }
- @Override
- public Adapter caseUnresolvedProxyProperty(UnresolvedProxyProperty object)
- {
- return createUnresolvedProxyPropertyAdapter();
- }
- @Override
- public Adapter defaultCase(EObject object)
- {
- return createEObjectAdapter();
- }
- };
-
- /**
- * Creates an adapter for the target.
- *
- *
- * @param target the object to adapt.
- * @return the adapter for the target.
- * @generated
- */
- @Override
- public Adapter createAdapter(Notifier target)
- {
- return modelSwitch.doSwitch((EObject)target);
- }
-
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.xtext.linking.lazy.lazyLinking.Model Model}'.
- *
- * This default implementation returns null so that we can easily ignore cases;
- * it's useful to ignore a case when inheritance will catch all the cases anyway.
- *
- * @return the new adapter.
- * @see org.eclipse.xtext.linking.lazy.lazyLinking.Model
- * @generated
- */
- public Adapter createModelAdapter()
- {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.xtext.linking.lazy.lazyLinking.Type Type}'.
- *
- * This default implementation returns null so that we can easily ignore cases;
- * it's useful to ignore a case when inheritance will catch all the cases anyway.
- *
- * @return the new adapter.
- * @see org.eclipse.xtext.linking.lazy.lazyLinking.Type
- * @generated
- */
- public Adapter createTypeAdapter()
- {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.xtext.linking.lazy.lazyLinking.Property Property}'.
- *
- * This default implementation returns null so that we can easily ignore cases;
- * it's useful to ignore a case when inheritance will catch all the cases anyway.
- *
- * @return the new adapter.
- * @see org.eclipse.xtext.linking.lazy.lazyLinking.Property
- * @generated
- */
- public Adapter createPropertyAdapter()
- {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.xtext.linking.lazy.lazyLinking.UnresolvedProxyProperty Unresolved Proxy Property}'.
- *
- * This default implementation returns null so that we can easily ignore cases;
- * it's useful to ignore a case when inheritance will catch all the cases anyway.
- *
- * @return the new adapter.
- * @see org.eclipse.xtext.linking.lazy.lazyLinking.UnresolvedProxyProperty
- * @generated
- */
- public Adapter createUnresolvedProxyPropertyAdapter()
- {
- return null;
- }
-
- /**
- * Creates a new adapter for the default case.
- *
- * This default implementation returns null.
- *
- * @return the new adapter.
- * @generated
- */
- public Adapter createEObjectAdapter()
- {
- return null;
- }
-
-} //LazyLinkingAdapterFactory
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/lazyLinking/util/LazyLinkingSwitch.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/lazyLinking/util/LazyLinkingSwitch.java
deleted file mode 100644
index 3a62e0dfc..000000000
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/lazyLinking/util/LazyLinkingSwitch.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/**
- * generated by Xtext
- */
-package org.eclipse.xtext.linking.lazy.lazyLinking.util;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.util.Switch;
-
-import org.eclipse.xtext.linking.lazy.lazyLinking.*;
-
-/**
- *
- * The Switch for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
- * to invoke the caseXXX method for each class of the model,
- * starting with the actual class of the object
- * and proceeding up the inheritance hierarchy
- * until a non-null result is returned,
- * which is the result of the switch.
- *
- * @see org.eclipse.xtext.linking.lazy.lazyLinking.LazyLinkingPackage
- * @generated
- */
-public class LazyLinkingSwitch extends Switch
-{
- /**
- * The cached model package
- *
- *
- * @generated
- */
- protected static LazyLinkingPackage modelPackage;
-
- /**
- * Creates an instance of the switch.
- *
- *
- * @generated
- */
- public LazyLinkingSwitch()
- {
- if (modelPackage == null)
- {
- modelPackage = LazyLinkingPackage.eINSTANCE;
- }
- }
-
- /**
- * Checks whether this is a switch for the given package.
- *
- *
- * @param ePackage the package in question.
- * @return whether this is a switch for the given package.
- * @generated
- */
- @Override
- protected boolean isSwitchFor(EPackage ePackage)
- {
- return ePackage == modelPackage;
- }
-
- /**
- * Calls caseXXX for each class of the model until one returns a non null result; it yields that result.
- *
- *
- * @return the first non-null result returned by a caseXXX call.
- * @generated
- */
- @Override
- protected T doSwitch(int classifierID, EObject theEObject)
- {
- switch (classifierID)
- {
- case LazyLinkingPackage.MODEL:
- {
- Model model = (Model)theEObject;
- T result = caseModel(model);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case LazyLinkingPackage.TYPE:
- {
- Type type = (Type)theEObject;
- T result = caseType(type);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case LazyLinkingPackage.PROPERTY:
- {
- Property property = (Property)theEObject;
- T result = caseProperty(property);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case LazyLinkingPackage.UNRESOLVED_PROXY_PROPERTY:
- {
- UnresolvedProxyProperty unresolvedProxyProperty = (UnresolvedProxyProperty)theEObject;
- T result = caseUnresolvedProxyProperty(unresolvedProxyProperty);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- default: return defaultCase(theEObject);
- }
- }
-
- /**
- * Returns the result of interpreting the object as an instance of 'Model'.
- *
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- *
- * @param object the target of the switch.
- * @return the result of interpreting the object as an instance of 'Model'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public T caseModel(Model object)
- {
- return null;
- }
-
- /**
- * Returns the result of interpreting the object as an instance of 'Type'.
- *
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- *
- * @param object the target of the switch.
- * @return the result of interpreting the object as an instance of 'Type'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public T caseType(Type object)
- {
- return null;
- }
-
- /**
- * Returns the result of interpreting the object as an instance of 'Property'.
- *
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- *
- * @param object the target of the switch.
- * @return the result of interpreting the object as an instance of 'Property'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public T caseProperty(Property object)
- {
- return null;
- }
-
- /**
- * Returns the result of interpreting the object as an instance of 'Unresolved Proxy Property'.
- *
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- *
- * @param object the target of the switch.
- * @return the result of interpreting the object as an instance of 'Unresolved Proxy Property'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public T caseUnresolvedProxyProperty(UnresolvedProxyProperty object)
- {
- return null;
- }
-
- /**
- * Returns the result of interpreting the object as an instance of 'EObject'.
- *
- * This implementation returns null;
- * returning a non-null result will terminate the switch, but this is the last case anyway.
- *
- * @param object the target of the switch.
- * @return the result of interpreting the object as an instance of 'EObject'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject)
- * @generated
- */
- @Override
- public T defaultCase(EObject object)
- {
- return null;
- }
-
-} //LazyLinkingSwitch
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/services/IgnoreCaseImportsTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/services/IgnoreCaseImportsTestLanguageGrammarAccess.java
index 8974a2ca7..55508a9d9 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/services/IgnoreCaseImportsTestLanguageGrammarAccess.java
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/services/IgnoreCaseImportsTestLanguageGrammarAccess.java
@@ -28,7 +28,7 @@ public class IgnoreCaseImportsTestLanguageGrammarAccess extends AbstractGrammarE
private final Assignment cElementsAssignment_1 = (Assignment)cGroup.eContents().get(1);
private final RuleCall cElementsElementParserRuleCall_1_0 = (RuleCall)cElementsAssignment_1.eContents().get(0);
- //Model:
+ //@ Override Model:
// imports+=Import*
// elements+=Element+;
@Override public ParserRule getRule() { return rule; }
@@ -116,7 +116,7 @@ public class IgnoreCaseImportsTestLanguageGrammarAccess extends AbstractGrammarE
}
- //Model:
+ //@ Override Model:
// imports+=Import*
// elements+=Element+;
public ModelElements getModelAccess() {
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/services/IgnoreCaseNamespacesTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/services/IgnoreCaseNamespacesTestLanguageGrammarAccess.java
index 64d62cdb1..d3bb921de 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/services/IgnoreCaseNamespacesTestLanguageGrammarAccess.java
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/services/IgnoreCaseNamespacesTestLanguageGrammarAccess.java
@@ -28,7 +28,7 @@ public class IgnoreCaseNamespacesTestLanguageGrammarAccess extends AbstractGramm
private final Assignment cElementsAssignment_1 = (Assignment)cGroup.eContents().get(1);
private final RuleCall cElementsElementParserRuleCall_1_0 = (RuleCall)cElementsAssignment_1.eContents().get(0);
- //Model:
+ //@ Override Model:
// imports+=Import*
// elements+=Element+;
@Override public ParserRule getRule() { return rule; }
@@ -116,7 +116,7 @@ public class IgnoreCaseNamespacesTestLanguageGrammarAccess extends AbstractGramm
}
- //Model:
+ //@ Override Model:
// imports+=Import*
// elements+=Element+;
public ModelElements getModelAccess() {
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/Bug301935TestLanguage.ecore b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/Bug301935TestLanguage.ecore
index 0a3df5edf..7c8bf0ac1 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/Bug301935TestLanguage.ecore
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/Bug301935TestLanguage.ecore
@@ -3,8 +3,8 @@
xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="bug301935Test" nsURI="http://eclipse.org/xtext/Bug301935TestLanguage"
nsPrefix="bug301935Test">
-
-
-
+
+
+
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/Bug301935TestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/Bug301935TestLanguage.genmodel
index d9b265cd6..16f8c8127 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/Bug301935TestLanguage.genmodel
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/Bug301935TestLanguage.genmodel
@@ -3,7 +3,7 @@
xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.tests/src-gen"
modelPluginID="org.eclipse.xtext.tests" forceOverwrite="true" modelName="Bug301935TestLanguage"
updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
- complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9">
+ complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/Bug406914TestLanguage.ecore b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/Bug406914TestLanguage.ecore
index e10d7bc00..26c73d74a 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/Bug406914TestLanguage.ecore
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/Bug406914TestLanguage.ecore
@@ -3,6 +3,6 @@
xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="bug406914Test" nsURI="http://eclipse.org/xtext/Bug406914TestLanguage"
nsPrefix="bug406914Test">
-
+
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/Bug406914TestLanguage.genmodel b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/Bug406914TestLanguage.genmodel
index d29f6c765..a7b05d973 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/Bug406914TestLanguage.genmodel
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/Bug406914TestLanguage.genmodel
@@ -3,7 +3,7 @@
xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext" modelDirectory="/org.eclipse.xtext.tests/src-gen"
modelPluginID="org.eclipse.xtext.tests" forceOverwrite="true" modelName="Bug406914TestLanguage"
updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
- complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9">
+ complianceLevel="6.0" copyrightFields="false" runtimeVersion="2.9" usedGenPackages="platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug301935Test/impl/Bug301935TestPackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug301935Test/impl/Bug301935TestPackageImpl.java
index b4f962069..fa8149ffe 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug301935Test/impl/Bug301935TestPackageImpl.java
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug301935Test/impl/Bug301935TestPackageImpl.java
@@ -6,6 +6,7 @@ package org.eclipse.xtext.parser.antlr.bug301935Test.impl;
import org.eclipse.emf.ecore.EAttribute;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EcorePackage;
import org.eclipse.emf.ecore.impl.EPackageImpl;
@@ -76,6 +77,9 @@ public class Bug301935TestPackageImpl extends EPackageImpl implements Bug301935T
isInited = true;
+ // Initialize simple dependencies
+ EcorePackage.eINSTANCE.eClass();
+
// Create package meta-data objects
theBug301935TestPackage.createPackageContents();
@@ -191,6 +195,9 @@ public class Bug301935TestPackageImpl extends EPackageImpl implements Bug301935T
setNsPrefix(eNS_PREFIX);
setNsURI(eNS_URI);
+ // Obtain other dependent packages
+ EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
+
// Create type parameters
// Set bounds for type parameters
@@ -199,9 +206,9 @@ public class Bug301935TestPackageImpl extends EPackageImpl implements Bug301935T
// Initialize classes and features; add operations and parameters
initEClass(modelEClass, Model.class, "Model", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getModel_Name(), ecorePackage.getEString(), "name", null, 0, 1, Model.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getModel_Value(), ecorePackage.getEString(), "value", null, 0, 1, Model.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getModel_Value2(), ecorePackage.getEString(), "value2", null, 0, 1, Model.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getModel_Name(), theEcorePackage.getEString(), "name", null, 0, 1, Model.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getModel_Value(), theEcorePackage.getEString(), "value", null, 0, 1, Model.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getModel_Value2(), theEcorePackage.getEString(), "value2", null, 0, 1, Model.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
// Create resource
createResource(eNS_URI);
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug406914Test/impl/Bug406914TestPackageImpl.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug406914Test/impl/Bug406914TestPackageImpl.java
index de87b4a4d..4f2ed1dfe 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug406914Test/impl/Bug406914TestPackageImpl.java
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/bug406914Test/impl/Bug406914TestPackageImpl.java
@@ -6,6 +6,7 @@ package org.eclipse.xtext.parser.antlr.bug406914Test.impl;
import org.eclipse.emf.ecore.EAttribute;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EcorePackage;
import org.eclipse.emf.ecore.impl.EPackageImpl;
@@ -76,6 +77,9 @@ public class Bug406914TestPackageImpl extends EPackageImpl implements Bug406914T
isInited = true;
+ // Initialize simple dependencies
+ EcorePackage.eINSTANCE.eClass();
+
// Create package meta-data objects
theBug406914TestPackage.createPackageContents();
@@ -169,6 +173,9 @@ public class Bug406914TestPackageImpl extends EPackageImpl implements Bug406914T
setNsPrefix(eNS_PREFIX);
setNsURI(eNS_URI);
+ // Obtain other dependent packages
+ EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
+
// Create type parameters
// Set bounds for type parameters
@@ -177,7 +184,7 @@ public class Bug406914TestPackageImpl extends EPackageImpl implements Bug406914T
// Initialize classes and features; add operations and parameters
initEClass(modelEClass, Model.class, "Model", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getModel_Name(), ecorePackage.getEString(), "name", null, 0, 1, Model.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getModel_Name(), theEcorePackage.getEString(), "name", null, 0, 1, Model.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
// Create resource
createResource(eNS_URI);
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/parser/antlr/lexer/InternalBug299237TestLanguageLexer.g b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/parser/antlr/lexer/InternalBug299237TestLanguageLexer.g
index 681ce9840..1706cb046 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/parser/antlr/lexer/InternalBug299237TestLanguageLexer.g
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/parser/antlr/lexer/InternalBug299237TestLanguageLexer.g
@@ -15,8 +15,6 @@ Model : ('M'|'m')('O'|'o')('D'|'d')('E'|'e')('L'|'l');
Semicolon : ';';
-// Rules duplicated to allow inter-rule references
-
RULE_ID : '^'? ('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*;
RULE_INT : ('0'..'9')+;
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/parser/antlr/lexer/InternalBug299237TestLanguageLexer.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/parser/antlr/lexer/InternalBug299237TestLanguageLexer.java
index d746bc81f..e706c9288 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/parser/antlr/lexer/InternalBug299237TestLanguageLexer.java
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/parser/antlr/lexer/InternalBug299237TestLanguageLexer.java
@@ -125,10 +125,10 @@ public class InternalBug299237TestLanguageLexer extends Lexer {
try {
int _type = RULE_ID;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // InternalBug299237TestLanguageLexer.g:20:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
- // InternalBug299237TestLanguageLexer.g:20:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+ // InternalBug299237TestLanguageLexer.g:18:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
+ // InternalBug299237TestLanguageLexer.g:18:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
{
- // InternalBug299237TestLanguageLexer.g:20:11: ( '^' )?
+ // InternalBug299237TestLanguageLexer.g:18:11: ( '^' )?
int alt1=2;
int LA1_0 = input.LA(1);
@@ -137,7 +137,7 @@ public class InternalBug299237TestLanguageLexer extends Lexer {
}
switch (alt1) {
case 1 :
- // InternalBug299237TestLanguageLexer.g:20:11: '^'
+ // InternalBug299237TestLanguageLexer.g:18:11: '^'
{
match('^');
@@ -155,7 +155,7 @@ public class InternalBug299237TestLanguageLexer extends Lexer {
recover(mse);
throw mse;}
- // InternalBug299237TestLanguageLexer.g:20:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+ // InternalBug299237TestLanguageLexer.g:18:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
loop2:
do {
int alt2=2;
@@ -204,10 +204,10 @@ public class InternalBug299237TestLanguageLexer extends Lexer {
try {
int _type = RULE_INT;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // InternalBug299237TestLanguageLexer.g:22:10: ( ( '0' .. '9' )+ )
- // InternalBug299237TestLanguageLexer.g:22:12: ( '0' .. '9' )+
+ // InternalBug299237TestLanguageLexer.g:20:10: ( ( '0' .. '9' )+ )
+ // InternalBug299237TestLanguageLexer.g:20:12: ( '0' .. '9' )+
{
- // InternalBug299237TestLanguageLexer.g:22:12: ( '0' .. '9' )+
+ // InternalBug299237TestLanguageLexer.g:20:12: ( '0' .. '9' )+
int cnt3=0;
loop3:
do {
@@ -221,7 +221,7 @@ public class InternalBug299237TestLanguageLexer extends Lexer {
switch (alt3) {
case 1 :
- // InternalBug299237TestLanguageLexer.g:22:13: '0' .. '9'
+ // InternalBug299237TestLanguageLexer.g:20:13: '0' .. '9'
{
matchRange('0','9');
@@ -253,10 +253,10 @@ public class InternalBug299237TestLanguageLexer extends Lexer {
try {
int _type = RULE_STRING;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // InternalBug299237TestLanguageLexer.g:24:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
- // InternalBug299237TestLanguageLexer.g:24:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+ // InternalBug299237TestLanguageLexer.g:22:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
+ // InternalBug299237TestLanguageLexer.g:22:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
{
- // InternalBug299237TestLanguageLexer.g:24:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+ // InternalBug299237TestLanguageLexer.g:22:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
int alt6=2;
int LA6_0 = input.LA(1);
@@ -274,10 +274,10 @@ public class InternalBug299237TestLanguageLexer extends Lexer {
}
switch (alt6) {
case 1 :
- // InternalBug299237TestLanguageLexer.g:24:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
+ // InternalBug299237TestLanguageLexer.g:22:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
{
match('\"');
- // InternalBug299237TestLanguageLexer.g:24:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
+ // InternalBug299237TestLanguageLexer.g:22:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
loop4:
do {
int alt4=3;
@@ -293,7 +293,7 @@ public class InternalBug299237TestLanguageLexer extends Lexer {
switch (alt4) {
case 1 :
- // InternalBug299237TestLanguageLexer.g:24:21: '\\\\' .
+ // InternalBug299237TestLanguageLexer.g:22:21: '\\\\' .
{
match('\\');
matchAny();
@@ -301,7 +301,7 @@ public class InternalBug299237TestLanguageLexer extends Lexer {
}
break;
case 2 :
- // InternalBug299237TestLanguageLexer.g:24:28: ~ ( ( '\\\\' | '\"' ) )
+ // InternalBug299237TestLanguageLexer.g:22:28: ~ ( ( '\\\\' | '\"' ) )
{
if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
input.consume();
@@ -326,10 +326,10 @@ public class InternalBug299237TestLanguageLexer extends Lexer {
}
break;
case 2 :
- // InternalBug299237TestLanguageLexer.g:24:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
+ // InternalBug299237TestLanguageLexer.g:22:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
{
match('\'');
- // InternalBug299237TestLanguageLexer.g:24:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
+ // InternalBug299237TestLanguageLexer.g:22:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
loop5:
do {
int alt5=3;
@@ -345,7 +345,7 @@ public class InternalBug299237TestLanguageLexer extends Lexer {
switch (alt5) {
case 1 :
- // InternalBug299237TestLanguageLexer.g:24:54: '\\\\' .
+ // InternalBug299237TestLanguageLexer.g:22:54: '\\\\' .
{
match('\\');
matchAny();
@@ -353,7 +353,7 @@ public class InternalBug299237TestLanguageLexer extends Lexer {
}
break;
case 2 :
- // InternalBug299237TestLanguageLexer.g:24:61: ~ ( ( '\\\\' | '\\'' ) )
+ // InternalBug299237TestLanguageLexer.g:22:61: ~ ( ( '\\\\' | '\\'' ) )
{
if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
input.consume();
@@ -396,12 +396,12 @@ public class InternalBug299237TestLanguageLexer extends Lexer {
try {
int _type = RULE_ML_COMMENT;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // InternalBug299237TestLanguageLexer.g:26:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
- // InternalBug299237TestLanguageLexer.g:26:19: '/*' ( options {greedy=false; } : . )* '*/'
+ // InternalBug299237TestLanguageLexer.g:24:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
+ // InternalBug299237TestLanguageLexer.g:24:19: '/*' ( options {greedy=false; } : . )* '*/'
{
match("/*");
- // InternalBug299237TestLanguageLexer.g:26:24: ( options {greedy=false; } : . )*
+ // InternalBug299237TestLanguageLexer.g:24:24: ( options {greedy=false; } : . )*
loop7:
do {
int alt7=2;
@@ -426,7 +426,7 @@ public class InternalBug299237TestLanguageLexer extends Lexer {
switch (alt7) {
case 1 :
- // InternalBug299237TestLanguageLexer.g:26:52: .
+ // InternalBug299237TestLanguageLexer.g:24:52: .
{
matchAny();
@@ -456,12 +456,12 @@ public class InternalBug299237TestLanguageLexer extends Lexer {
try {
int _type = RULE_SL_COMMENT;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // InternalBug299237TestLanguageLexer.g:28:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
- // InternalBug299237TestLanguageLexer.g:28:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
+ // InternalBug299237TestLanguageLexer.g:26:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
+ // InternalBug299237TestLanguageLexer.g:26:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
{
match("//");
- // InternalBug299237TestLanguageLexer.g:28:24: (~ ( ( '\\n' | '\\r' ) ) )*
+ // InternalBug299237TestLanguageLexer.g:26:24: (~ ( ( '\\n' | '\\r' ) ) )*
loop8:
do {
int alt8=2;
@@ -474,7 +474,7 @@ public class InternalBug299237TestLanguageLexer extends Lexer {
switch (alt8) {
case 1 :
- // InternalBug299237TestLanguageLexer.g:28:24: ~ ( ( '\\n' | '\\r' ) )
+ // InternalBug299237TestLanguageLexer.g:26:24: ~ ( ( '\\n' | '\\r' ) )
{
if ( (input.LA(1)>='\u0000' && input.LA(1)<='\t')||(input.LA(1)>='\u000B' && input.LA(1)<='\f')||(input.LA(1)>='\u000E' && input.LA(1)<='\uFFFF') ) {
input.consume();
@@ -494,7 +494,7 @@ public class InternalBug299237TestLanguageLexer extends Lexer {
}
} while (true);
- // InternalBug299237TestLanguageLexer.g:28:40: ( ( '\\r' )? '\\n' )?
+ // InternalBug299237TestLanguageLexer.g:26:40: ( ( '\\r' )? '\\n' )?
int alt10=2;
int LA10_0 = input.LA(1);
@@ -503,9 +503,9 @@ public class InternalBug299237TestLanguageLexer extends Lexer {
}
switch (alt10) {
case 1 :
- // InternalBug299237TestLanguageLexer.g:28:41: ( '\\r' )? '\\n'
+ // InternalBug299237TestLanguageLexer.g:26:41: ( '\\r' )? '\\n'
{
- // InternalBug299237TestLanguageLexer.g:28:41: ( '\\r' )?
+ // InternalBug299237TestLanguageLexer.g:26:41: ( '\\r' )?
int alt9=2;
int LA9_0 = input.LA(1);
@@ -514,7 +514,7 @@ public class InternalBug299237TestLanguageLexer extends Lexer {
}
switch (alt9) {
case 1 :
- // InternalBug299237TestLanguageLexer.g:28:41: '\\r'
+ // InternalBug299237TestLanguageLexer.g:26:41: '\\r'
{
match('\r');
@@ -546,10 +546,10 @@ public class InternalBug299237TestLanguageLexer extends Lexer {
try {
int _type = RULE_WS;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // InternalBug299237TestLanguageLexer.g:30:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
- // InternalBug299237TestLanguageLexer.g:30:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+ // InternalBug299237TestLanguageLexer.g:28:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
+ // InternalBug299237TestLanguageLexer.g:28:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
{
- // InternalBug299237TestLanguageLexer.g:30:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+ // InternalBug299237TestLanguageLexer.g:28:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
int cnt11=0;
loop11:
do {
@@ -603,8 +603,8 @@ public class InternalBug299237TestLanguageLexer extends Lexer {
try {
int _type = RULE_ANY_OTHER;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // InternalBug299237TestLanguageLexer.g:32:16: ( . )
- // InternalBug299237TestLanguageLexer.g:32:18: .
+ // InternalBug299237TestLanguageLexer.g:30:16: ( . )
+ // InternalBug299237TestLanguageLexer.g:30:18: .
{
matchAny();
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/parser/antlr/lexer/InternalBug301935ExTestLanguageLexer.g b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/parser/antlr/lexer/InternalBug301935ExTestLanguageLexer.g
index 77779aa45..53918e4d2 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/parser/antlr/lexer/InternalBug301935ExTestLanguageLexer.g
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/parser/antlr/lexer/InternalBug301935ExTestLanguageLexer.g
@@ -15,8 +15,6 @@ LineFeed : '\n';
CarriageReturn : '\r';
-// Rules duplicated to allow inter-rule references
-
RULE_ID : '^'? ('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*;
RULE_WS : (' '|'\t')+;
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/parser/antlr/lexer/InternalBug301935ExTestLanguageLexer.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/parser/antlr/lexer/InternalBug301935ExTestLanguageLexer.java
index 6ddd72454..23786670a 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/parser/antlr/lexer/InternalBug301935ExTestLanguageLexer.java
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/parser/antlr/lexer/InternalBug301935ExTestLanguageLexer.java
@@ -77,10 +77,10 @@ public class InternalBug301935ExTestLanguageLexer extends Lexer {
try {
int _type = RULE_ID;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // InternalBug301935ExTestLanguageLexer.g:20:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
- // InternalBug301935ExTestLanguageLexer.g:20:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+ // InternalBug301935ExTestLanguageLexer.g:18:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
+ // InternalBug301935ExTestLanguageLexer.g:18:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
{
- // InternalBug301935ExTestLanguageLexer.g:20:11: ( '^' )?
+ // InternalBug301935ExTestLanguageLexer.g:18:11: ( '^' )?
int alt1=2;
int LA1_0 = input.LA(1);
@@ -89,7 +89,7 @@ public class InternalBug301935ExTestLanguageLexer extends Lexer {
}
switch (alt1) {
case 1 :
- // InternalBug301935ExTestLanguageLexer.g:20:11: '^'
+ // InternalBug301935ExTestLanguageLexer.g:18:11: '^'
{
match('^');
@@ -107,7 +107,7 @@ public class InternalBug301935ExTestLanguageLexer extends Lexer {
recover(mse);
throw mse;}
- // InternalBug301935ExTestLanguageLexer.g:20:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+ // InternalBug301935ExTestLanguageLexer.g:18:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
loop2:
do {
int alt2=2;
@@ -156,10 +156,10 @@ public class InternalBug301935ExTestLanguageLexer extends Lexer {
try {
int _type = RULE_WS;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // InternalBug301935ExTestLanguageLexer.g:22:9: ( ( ' ' | '\\t' )+ )
- // InternalBug301935ExTestLanguageLexer.g:22:11: ( ' ' | '\\t' )+
+ // InternalBug301935ExTestLanguageLexer.g:20:9: ( ( ' ' | '\\t' )+ )
+ // InternalBug301935ExTestLanguageLexer.g:20:11: ( ' ' | '\\t' )+
{
- // InternalBug301935ExTestLanguageLexer.g:22:11: ( ' ' | '\\t' )+
+ // InternalBug301935ExTestLanguageLexer.g:20:11: ( ' ' | '\\t' )+
int cnt3=0;
loop3:
do {
@@ -213,8 +213,8 @@ public class InternalBug301935ExTestLanguageLexer extends Lexer {
try {
int _type = RULE_ANY_OTHER;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // InternalBug301935ExTestLanguageLexer.g:24:16: ( . )
- // InternalBug301935ExTestLanguageLexer.g:24:18: .
+ // InternalBug301935ExTestLanguageLexer.g:22:16: ( . )
+ // InternalBug301935ExTestLanguageLexer.g:22:18: .
{
matchAny();
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/serializer/Bug301935TestLanguageSemanticSequencer.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/serializer/AbstractBug301935TestLanguageSemanticSequencer.java
similarity index 96%
rename from org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/serializer/Bug301935TestLanguageSemanticSequencer.java
rename to org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/serializer/AbstractBug301935TestLanguageSemanticSequencer.java
index 63f8feb28..3d887bf8e 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/serializer/Bug301935TestLanguageSemanticSequencer.java
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/serializer/AbstractBug301935TestLanguageSemanticSequencer.java
@@ -19,7 +19,7 @@ import org.eclipse.xtext.serializer.sequencer.AbstractDelegatingSemanticSequence
import org.eclipse.xtext.serializer.sequencer.ITransientValueService.ValueTransient;
@SuppressWarnings("all")
-public class Bug301935TestLanguageSemanticSequencer extends AbstractDelegatingSemanticSequencer {
+public abstract class AbstractBug301935TestLanguageSemanticSequencer extends AbstractDelegatingSemanticSequencer {
@Inject
private Bug301935TestLanguageGrammarAccess grammarAccess;
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/serializer/Bug301935TestLanguageSyntacticSequencer.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/serializer/AbstractBug301935TestLanguageSyntacticSequencer.java
similarity index 95%
rename from org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/serializer/Bug301935TestLanguageSyntacticSequencer.java
rename to org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/serializer/AbstractBug301935TestLanguageSyntacticSequencer.java
index 0a8b5ff90..05a644813 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/serializer/Bug301935TestLanguageSyntacticSequencer.java
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/antlr/serializer/AbstractBug301935TestLanguageSyntacticSequencer.java
@@ -15,7 +15,7 @@ import org.eclipse.xtext.serializer.analysis.ISyntacticSequencerPDAProvider.ISyn
import org.eclipse.xtext.serializer.sequencer.AbstractSyntacticSequencer;
@SuppressWarnings("all")
-public class Bug301935TestLanguageSyntacticSequencer extends AbstractSyntacticSequencer {
+public abstract class AbstractBug301935TestLanguageSyntacticSequencer extends AbstractSyntacticSequencer {
protected Bug301935TestLanguageGrammarAccess grammarAccess;
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/fragments/FragmentTestLanguage.xtextbin b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/fragments/FragmentTestLanguage.xtextbin
index a1d146b49..32066217e 100644
Binary files a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/fragments/FragmentTestLanguage.xtextbin and b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/fragments/FragmentTestLanguage.xtextbin differ
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/fragments/FragmentTestLanguageEx.xtextbin b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/fragments/FragmentTestLanguageEx.xtextbin
index 6a3a42c46..14b3887ca 100644
Binary files a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/fragments/FragmentTestLanguageEx.xtextbin and b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/fragments/FragmentTestLanguageEx.xtextbin differ
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/indentation/IndentationAwareTestLanguage.xtextbin b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/indentation/IndentationAwareTestLanguage.xtextbin
index 52a44fe5a..a8850c56c 100644
Binary files a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/indentation/IndentationAwareTestLanguage.xtextbin and b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/indentation/IndentationAwareTestLanguage.xtextbin differ
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/indentation/parser/antlr/lexer/InternalIndentationAwareTestLanguageLexer.g b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/indentation/parser/antlr/lexer/InternalIndentationAwareTestLanguageLexer.g
index aad7245d4..b5345a63c 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/indentation/parser/antlr/lexer/InternalIndentationAwareTestLanguageLexer.g
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/indentation/parser/antlr/lexer/InternalIndentationAwareTestLanguageLexer.g
@@ -11,8 +11,6 @@ package org.eclipse.xtext.parser.indentation.parser.antlr.lexer;
import org.eclipse.xtext.parser.antlr.Lexer;
}
-// Rules duplicated to allow inter-rule references
-
RULE_SL_COMMENT : '//' ~(('\n'|'\r'))*;
fragment RULE_INDENT : ;
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/indentation/parser/antlr/lexer/InternalIndentationAwareTestLanguageLexer.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/indentation/parser/antlr/lexer/InternalIndentationAwareTestLanguageLexer.java
index 1d0d85821..cb793940b 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/indentation/parser/antlr/lexer/InternalIndentationAwareTestLanguageLexer.java
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/indentation/parser/antlr/lexer/InternalIndentationAwareTestLanguageLexer.java
@@ -41,12 +41,12 @@ public class InternalIndentationAwareTestLanguageLexer extends Lexer {
try {
int _type = RULE_SL_COMMENT;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // InternalIndentationAwareTestLanguageLexer.g:16:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* )
- // InternalIndentationAwareTestLanguageLexer.g:16:19: '//' (~ ( ( '\\n' | '\\r' ) ) )*
+ // InternalIndentationAwareTestLanguageLexer.g:14:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* )
+ // InternalIndentationAwareTestLanguageLexer.g:14:19: '//' (~ ( ( '\\n' | '\\r' ) ) )*
{
match("//");
- // InternalIndentationAwareTestLanguageLexer.g:16:24: (~ ( ( '\\n' | '\\r' ) ) )*
+ // InternalIndentationAwareTestLanguageLexer.g:14:24: (~ ( ( '\\n' | '\\r' ) ) )*
loop1:
do {
int alt1=2;
@@ -59,7 +59,7 @@ public class InternalIndentationAwareTestLanguageLexer extends Lexer {
switch (alt1) {
case 1 :
- // InternalIndentationAwareTestLanguageLexer.g:16:24: ~ ( ( '\\n' | '\\r' ) )
+ // InternalIndentationAwareTestLanguageLexer.g:14:24: ~ ( ( '\\n' | '\\r' ) )
{
if ( (input.LA(1)>='\u0000' && input.LA(1)<='\t')||(input.LA(1)>='\u000B' && input.LA(1)<='\f')||(input.LA(1)>='\u000E' && input.LA(1)<='\uFFFF') ) {
input.consume();
@@ -93,8 +93,8 @@ public class InternalIndentationAwareTestLanguageLexer extends Lexer {
// $ANTLR start "RULE_INDENT"
public final void mRULE_INDENT() throws RecognitionException {
try {
- // InternalIndentationAwareTestLanguageLexer.g:18:22: ()
- // InternalIndentationAwareTestLanguageLexer.g:18:24:
+ // InternalIndentationAwareTestLanguageLexer.g:16:22: ()
+ // InternalIndentationAwareTestLanguageLexer.g:16:24:
{
}
@@ -107,8 +107,8 @@ public class InternalIndentationAwareTestLanguageLexer extends Lexer {
// $ANTLR start "RULE_DEDENT"
public final void mRULE_DEDENT() throws RecognitionException {
try {
- // InternalIndentationAwareTestLanguageLexer.g:20:22: ()
- // InternalIndentationAwareTestLanguageLexer.g:20:24:
+ // InternalIndentationAwareTestLanguageLexer.g:18:22: ()
+ // InternalIndentationAwareTestLanguageLexer.g:18:24:
{
}
@@ -123,10 +123,10 @@ public class InternalIndentationAwareTestLanguageLexer extends Lexer {
try {
int _type = RULE_ID;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // InternalIndentationAwareTestLanguageLexer.g:22:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
- // InternalIndentationAwareTestLanguageLexer.g:22:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+ // InternalIndentationAwareTestLanguageLexer.g:20:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
+ // InternalIndentationAwareTestLanguageLexer.g:20:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
{
- // InternalIndentationAwareTestLanguageLexer.g:22:11: ( '^' )?
+ // InternalIndentationAwareTestLanguageLexer.g:20:11: ( '^' )?
int alt2=2;
int LA2_0 = input.LA(1);
@@ -135,7 +135,7 @@ public class InternalIndentationAwareTestLanguageLexer extends Lexer {
}
switch (alt2) {
case 1 :
- // InternalIndentationAwareTestLanguageLexer.g:22:11: '^'
+ // InternalIndentationAwareTestLanguageLexer.g:20:11: '^'
{
match('^');
@@ -153,7 +153,7 @@ public class InternalIndentationAwareTestLanguageLexer extends Lexer {
recover(mse);
throw mse;}
- // InternalIndentationAwareTestLanguageLexer.g:22:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+ // InternalIndentationAwareTestLanguageLexer.g:20:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
loop3:
do {
int alt3=2;
@@ -202,10 +202,10 @@ public class InternalIndentationAwareTestLanguageLexer extends Lexer {
try {
int _type = RULE_INT;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // InternalIndentationAwareTestLanguageLexer.g:24:10: ( ( '0' .. '9' )+ )
- // InternalIndentationAwareTestLanguageLexer.g:24:12: ( '0' .. '9' )+
+ // InternalIndentationAwareTestLanguageLexer.g:22:10: ( ( '0' .. '9' )+ )
+ // InternalIndentationAwareTestLanguageLexer.g:22:12: ( '0' .. '9' )+
{
- // InternalIndentationAwareTestLanguageLexer.g:24:12: ( '0' .. '9' )+
+ // InternalIndentationAwareTestLanguageLexer.g:22:12: ( '0' .. '9' )+
int cnt4=0;
loop4:
do {
@@ -219,7 +219,7 @@ public class InternalIndentationAwareTestLanguageLexer extends Lexer {
switch (alt4) {
case 1 :
- // InternalIndentationAwareTestLanguageLexer.g:24:13: '0' .. '9'
+ // InternalIndentationAwareTestLanguageLexer.g:22:13: '0' .. '9'
{
matchRange('0','9');
@@ -251,10 +251,10 @@ public class InternalIndentationAwareTestLanguageLexer extends Lexer {
try {
int _type = RULE_STRING;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // InternalIndentationAwareTestLanguageLexer.g:26:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
- // InternalIndentationAwareTestLanguageLexer.g:26:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+ // InternalIndentationAwareTestLanguageLexer.g:24:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
+ // InternalIndentationAwareTestLanguageLexer.g:24:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
{
- // InternalIndentationAwareTestLanguageLexer.g:26:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+ // InternalIndentationAwareTestLanguageLexer.g:24:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
int alt7=2;
int LA7_0 = input.LA(1);
@@ -272,10 +272,10 @@ public class InternalIndentationAwareTestLanguageLexer extends Lexer {
}
switch (alt7) {
case 1 :
- // InternalIndentationAwareTestLanguageLexer.g:26:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
+ // InternalIndentationAwareTestLanguageLexer.g:24:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
{
match('\"');
- // InternalIndentationAwareTestLanguageLexer.g:26:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
+ // InternalIndentationAwareTestLanguageLexer.g:24:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
loop5:
do {
int alt5=3;
@@ -291,7 +291,7 @@ public class InternalIndentationAwareTestLanguageLexer extends Lexer {
switch (alt5) {
case 1 :
- // InternalIndentationAwareTestLanguageLexer.g:26:21: '\\\\' .
+ // InternalIndentationAwareTestLanguageLexer.g:24:21: '\\\\' .
{
match('\\');
matchAny();
@@ -299,7 +299,7 @@ public class InternalIndentationAwareTestLanguageLexer extends Lexer {
}
break;
case 2 :
- // InternalIndentationAwareTestLanguageLexer.g:26:28: ~ ( ( '\\\\' | '\"' ) )
+ // InternalIndentationAwareTestLanguageLexer.g:24:28: ~ ( ( '\\\\' | '\"' ) )
{
if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
input.consume();
@@ -324,10 +324,10 @@ public class InternalIndentationAwareTestLanguageLexer extends Lexer {
}
break;
case 2 :
- // InternalIndentationAwareTestLanguageLexer.g:26:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
+ // InternalIndentationAwareTestLanguageLexer.g:24:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
{
match('\'');
- // InternalIndentationAwareTestLanguageLexer.g:26:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
+ // InternalIndentationAwareTestLanguageLexer.g:24:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
loop6:
do {
int alt6=3;
@@ -343,7 +343,7 @@ public class InternalIndentationAwareTestLanguageLexer extends Lexer {
switch (alt6) {
case 1 :
- // InternalIndentationAwareTestLanguageLexer.g:26:54: '\\\\' .
+ // InternalIndentationAwareTestLanguageLexer.g:24:54: '\\\\' .
{
match('\\');
matchAny();
@@ -351,7 +351,7 @@ public class InternalIndentationAwareTestLanguageLexer extends Lexer {
}
break;
case 2 :
- // InternalIndentationAwareTestLanguageLexer.g:26:61: ~ ( ( '\\\\' | '\\'' ) )
+ // InternalIndentationAwareTestLanguageLexer.g:24:61: ~ ( ( '\\\\' | '\\'' ) )
{
if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
input.consume();
@@ -394,12 +394,12 @@ public class InternalIndentationAwareTestLanguageLexer extends Lexer {
try {
int _type = RULE_ML_COMMENT;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // InternalIndentationAwareTestLanguageLexer.g:28:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
- // InternalIndentationAwareTestLanguageLexer.g:28:19: '/*' ( options {greedy=false; } : . )* '*/'
+ // InternalIndentationAwareTestLanguageLexer.g:26:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
+ // InternalIndentationAwareTestLanguageLexer.g:26:19: '/*' ( options {greedy=false; } : . )* '*/'
{
match("/*");
- // InternalIndentationAwareTestLanguageLexer.g:28:24: ( options {greedy=false; } : . )*
+ // InternalIndentationAwareTestLanguageLexer.g:26:24: ( options {greedy=false; } : . )*
loop8:
do {
int alt8=2;
@@ -424,7 +424,7 @@ public class InternalIndentationAwareTestLanguageLexer extends Lexer {
switch (alt8) {
case 1 :
- // InternalIndentationAwareTestLanguageLexer.g:28:52: .
+ // InternalIndentationAwareTestLanguageLexer.g:26:52: .
{
matchAny();
@@ -454,10 +454,10 @@ public class InternalIndentationAwareTestLanguageLexer extends Lexer {
try {
int _type = RULE_WS;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // InternalIndentationAwareTestLanguageLexer.g:30:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
- // InternalIndentationAwareTestLanguageLexer.g:30:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+ // InternalIndentationAwareTestLanguageLexer.g:28:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
+ // InternalIndentationAwareTestLanguageLexer.g:28:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
{
- // InternalIndentationAwareTestLanguageLexer.g:30:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+ // InternalIndentationAwareTestLanguageLexer.g:28:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
int cnt9=0;
loop9:
do {
@@ -511,8 +511,8 @@ public class InternalIndentationAwareTestLanguageLexer extends Lexer {
try {
int _type = RULE_ANY_OTHER;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // InternalIndentationAwareTestLanguageLexer.g:32:16: ( . )
- // InternalIndentationAwareTestLanguageLexer.g:32:18: .
+ // InternalIndentationAwareTestLanguageLexer.g:30:16: ( . )
+ // InternalIndentationAwareTestLanguageLexer.g:30:18: .
{
matchAny();
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/indentation/services/IndentationAwareTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/indentation/services/IndentationAwareTestLanguageGrammarAccess.java
index 12581b432..b521331d8 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/indentation/services/IndentationAwareTestLanguageGrammarAccess.java
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/indentation/services/IndentationAwareTestLanguageGrammarAccess.java
@@ -158,7 +158,7 @@ public class IndentationAwareTestLanguageGrammarAccess extends AbstractGrammarEl
return getTreeNodeAccess().getRule();
}
- //terminal SL_COMMENT:
+ //@ Override terminal SL_COMMENT:
// '//' !('\n' | '\r')*;
public TerminalRule getSL_COMMENTRule() {
return tSL_COMMENT;
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/keywords/parser/antlr/internal/InternalKeywordsTestLanguage.g b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/keywords/parser/antlr/internal/InternalKeywordsTestLanguage.g
index 912e2e76d..b27d34bce 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/keywords/parser/antlr/internal/InternalKeywordsTestLanguage.g
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/keywords/parser/antlr/internal/InternalKeywordsTestLanguage.g
@@ -125,7 +125,7 @@ ruleModel returns [EObject current=null]
(
lv_forth_3_0='\\'
{
- newLeafNode(lv_forth_3_0, grammarAccess.getModelAccess().getForthReverseSolidusKeyword_3_0());
+ newLeafNode(lv_forth_3_0, grammarAccess.getModelAccess().getForthBackslashKeyword_3_0());
}
{
if ($current==null) {
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/keywords/parser/antlr/internal/InternalKeywordsTestLanguageParser.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/keywords/parser/antlr/internal/InternalKeywordsTestLanguageParser.java
index de816535d..d38b353f7 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/keywords/parser/antlr/internal/InternalKeywordsTestLanguageParser.java
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/keywords/parser/antlr/internal/InternalKeywordsTestLanguageParser.java
@@ -282,7 +282,7 @@ public class InternalKeywordsTestLanguageParser extends AbstractInternalAntlrPar
{
lv_forth_3_0=(Token)match(input,14,FollowSets000.FOLLOW_2);
- newLeafNode(lv_forth_3_0, grammarAccess.getModelAccess().getForthReverseSolidusKeyword_3_0());
+ newLeafNode(lv_forth_3_0, grammarAccess.getModelAccess().getForthBackslashKeyword_3_0());
if (current==null) {
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/keywords/services/KeywordsTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/keywords/services/KeywordsTestLanguageGrammarAccess.java
index 72eefcd22..5bd4224b7 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/keywords/services/KeywordsTestLanguageGrammarAccess.java
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/keywords/services/KeywordsTestLanguageGrammarAccess.java
@@ -30,7 +30,7 @@ public class KeywordsTestLanguageGrammarAccess extends AbstractGrammarElementFin
private final Assignment cThirdAssignment_2 = (Assignment)cAlternatives.eContents().get(2);
private final Keyword cThirdBarKeyword_2_0 = (Keyword)cThirdAssignment_2.eContents().get(0);
private final Assignment cForthAssignment_3 = (Assignment)cAlternatives.eContents().get(3);
- private final Keyword cForthReverseSolidusKeyword_3_0 = (Keyword)cForthAssignment_3.eContents().get(0);
+ private final Keyword cForthBackslashKeyword_3_0 = (Keyword)cForthAssignment_3.eContents().get(0);
private final Assignment cFifthAssignment_4 = (Assignment)cAlternatives.eContents().get(4);
private final Keyword cFifthAKeyword_4_0 = (Keyword)cFifthAssignment_4.eContents().get(0);
private final Assignment cSixthAssignment_5 = (Assignment)cAlternatives.eContents().get(5);
@@ -71,7 +71,7 @@ public class KeywordsTestLanguageGrammarAccess extends AbstractGrammarElementFin
public Assignment getForthAssignment_3() { return cForthAssignment_3; }
//"\\"
- public Keyword getForthReverseSolidusKeyword_3_0() { return cForthReverseSolidusKeyword_3_0; }
+ public Keyword getForthBackslashKeyword_3_0() { return cForthBackslashKeyword_3_0; }
//fifth?="\"a\""
public Assignment getFifthAssignment_4() { return cFifthAssignment_4; }
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/NoParametersTestLanguage.xtextbin b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/NoParametersTestLanguage.xtextbin
index 45f027ae7..49e0b5b77 100644
Binary files a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/NoParametersTestLanguage.xtextbin and b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/NoParametersTestLanguage.xtextbin differ
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/ParametersTestLanguage.xtextbin b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/ParametersTestLanguage.xtextbin
index 53527338e..8e8e945e1 100644
Binary files a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/ParametersTestLanguage.xtextbin and b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/ParametersTestLanguage.xtextbin differ
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/ParametersTestLanguageEx.xtextbin b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/ParametersTestLanguageEx.xtextbin
index e803423bb..80736e3c2 100644
Binary files a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/ParametersTestLanguageEx.xtextbin and b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/ParametersTestLanguageEx.xtextbin differ
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/TwoParametersTestLanguage.xtextbin b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/TwoParametersTestLanguage.xtextbin
index e5aa5bd72..4c65fcf96 100644
Binary files a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/TwoParametersTestLanguage.xtextbin and b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/TwoParametersTestLanguage.xtextbin differ
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/services/NoParametersTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/services/NoParametersTestLanguageGrammarAccess.java
index 9bebc5d32..8901fc6be 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/services/NoParametersTestLanguageGrammarAccess.java
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/services/NoParametersTestLanguageGrammarAccess.java
@@ -99,7 +99,7 @@ public class NoParametersTestLanguageGrammarAccess extends AbstractGrammarElemen
private final RuleCall cScenarioScenario2_FalseParserRuleCall_1_11_1_1_0_0 = (RuleCall)cScenarioAssignment_1_11_1_1_0.eContents().get(0);
private final Keyword cKeywordKeyword_1_11_1_1_1 = (Keyword)cGroup_1_11_1_1.eContents().get(1);
- //ParserRuleParameters:
+ //@ Override ParserRuleParameters:
// {ParserRuleParameters} ('#1' scenario=Scenario1_True
// | '#2' scenario=Scenario1_False
// | '#3' scenario=Scenario2_True
@@ -602,7 +602,7 @@ public class NoParametersTestLanguageGrammarAccess extends AbstractGrammarElemen
}
- //ParserRuleParameters:
+ //@ Override ParserRuleParameters:
// {ParserRuleParameters} ('#1' scenario=Scenario1_True
// | '#2' scenario=Scenario1_False
// | '#3' scenario=Scenario2_True
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/services/ParametersTestLanguageExGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/services/ParametersTestLanguageExGrammarAccess.java
index c0f68bd92..e3aa455ad 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/services/ParametersTestLanguageExGrammarAccess.java
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/services/ParametersTestLanguageExGrammarAccess.java
@@ -22,7 +22,7 @@ public class ParametersTestLanguageExGrammarAccess extends AbstractGrammarElemen
private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.parser.parameters.ParametersTestLanguageEx.ParserRuleParameters");
private final RuleCall cParserRuleParametersParserRuleCall = (RuleCall)rule.eContents().get(1);
- //ParserRuleParameters:
+ //@ Override ParserRuleParameters:
// super::ParserRuleParameters;
@Override public ParserRule getRule() { return rule; }
@@ -33,7 +33,7 @@ public class ParametersTestLanguageExGrammarAccess extends AbstractGrammarElemen
private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.xtext.parser.parameters.ParametersTestLanguageEx.Scenario1");
private final RuleCall cScenario1ParserRuleCall = (RuleCall)rule.eContents().get(1);
- //Scenario1 ;
@Override public ParserRule getRule() { return rule; }
@@ -93,7 +93,7 @@ public class ParametersTestLanguageExGrammarAccess extends AbstractGrammarElemen
}
- //ParserRuleParameters:
+ //@ Override ParserRuleParameters:
// super::ParserRuleParameters;
public ParserRuleParametersElements getParserRuleParametersAccess() {
return pParserRuleParameters;
@@ -103,7 +103,7 @@ public class ParametersTestLanguageExGrammarAccess extends AbstractGrammarElemen
return getParserRuleParametersAccess().getRule();
}
- //Scenario1 ;
public Scenario1Elements getScenario1Access() {
return pScenario1;
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/services/TwoParametersTestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/services/TwoParametersTestLanguageGrammarAccess.java
index 106c6355e..ec8f4906c 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/services/TwoParametersTestLanguageGrammarAccess.java
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/parameters/services/TwoParametersTestLanguageGrammarAccess.java
@@ -99,7 +99,7 @@ public class TwoParametersTestLanguageGrammarAccess extends AbstractGrammarEleme
private final RuleCall cScenarioScenario6ParserRuleCall_1_11_1_1_0_0 = (RuleCall)cScenarioAssignment_1_11_1_1_0.eContents().get(0);
private final Keyword cKeywordKeyword_1_11_1_1_1 = (Keyword)cGroup_1_11_1_1.eContents().get(1);
- //ParserRuleParameters:
+ //@ Override ParserRuleParameters:
// {ParserRuleParameters} ('#1' scenario=Scenario5 | '#2' scenario=Scenario5 | '#3'
// scenario=Scenario6 | '#4' scenario=Scenario6 | => ('#5' scenario=Scenario6) | =>
// ('#6' scenario=Scenario6) | '#7' scenario=Scenario7 | '#8' scenario=Scenario7 |
@@ -523,7 +523,7 @@ public class TwoParametersTestLanguageGrammarAccess extends AbstractGrammarEleme
}
- //ParserRuleParameters:
+ //@ Override ParserRuleParameters:
// {ParserRuleParameters} ('#1' scenario=Scenario5 | '#2' scenario=Scenario5 | '#3'
// scenario=Scenario6 | '#4' scenario=Scenario6 | => ('#5' scenario=Scenario6) | =>
// ('#6' scenario=Scenario6) | '#7' scenario=Scenario7 | '#8' scenario=Scenario7 |
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/Bug292245TestLanguage.xtextbin b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/Bug292245TestLanguage.xtextbin
index 620c4c698..31d2c1782 100644
Binary files a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/Bug292245TestLanguage.xtextbin and b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/Bug292245TestLanguage.xtextbin differ
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/Bug297105TestLanguage.xtextbin b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/Bug297105TestLanguage.xtextbin
index 7a4225e3d..3059b207f 100644
Binary files a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/Bug297105TestLanguage.xtextbin and b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/Bug297105TestLanguage.xtextbin differ
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/Bug317840TestLanguage.xtextbin b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/Bug317840TestLanguage.xtextbin
index c0cece036..02141e517 100644
Binary files a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/Bug317840TestLanguage.xtextbin and b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/Bug317840TestLanguage.xtextbin differ
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xtextbin b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xtextbin
index e2d2794c9..cc34b656e 100644
Binary files a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xtextbin and b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/HiddenTerminalsTestLanguage.xtextbin differ
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/TerminalRulesTestLanguage.xtextbin b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/TerminalRulesTestLanguage.xtextbin
index 516cb4205..004a19a68 100644
Binary files a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/TerminalRulesTestLanguage.xtextbin and b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/terminalrules/TerminalRulesTestLanguage.xtextbin differ
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/serializer/ExUnorderedGroupsTestLanguageSyntacticSequencer.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/serializer/ExUnorderedGroupsTestLanguageSyntacticSequencer.java
index 5ec959dac..314f9f85a 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/serializer/ExUnorderedGroupsTestLanguageSyntacticSequencer.java
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/serializer/ExUnorderedGroupsTestLanguageSyntacticSequencer.java
@@ -62,14 +62,14 @@ public class ExUnorderedGroupsTestLanguageSyntacticSequencer extends AbstractSyn
/**
* Ambiguous syntax:
* (
- * '10' |
- * '11' |
- * '3' |
- * '7' |
- * 'bug302585' |
+ * '5' |
* '6' |
+ * '3' |
+ * '11' |
+ * '7' |
* '4' |
- * '5'
+ * '10' |
+ * 'bug302585'
* )
*
* This ambiguous syntax occurs at:
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/serializer/SimpleUnorderedGroupsTestLanguageSyntacticSequencer.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/serializer/SimpleUnorderedGroupsTestLanguageSyntacticSequencer.java
index bcc6faf95..54a266491 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/serializer/SimpleUnorderedGroupsTestLanguageSyntacticSequencer.java
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parser/unorderedGroups/serializer/SimpleUnorderedGroupsTestLanguageSyntacticSequencer.java
@@ -63,13 +63,13 @@ public class SimpleUnorderedGroupsTestLanguageSyntacticSequencer extends Abstrac
* Ambiguous syntax:
* (
* '3' |
- * '7' |
- * 'bug302585' |
- * '4' |
* '5' |
- * '10' |
* '11' |
- * '6'
+ * '4' |
+ * '10' |
+ * 'bug302585' |
+ * '6' |
+ * '7'
* )
*
* This ambiguous syntax occurs at:
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguage.xtextbin b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguage.xtextbin
index d19f94f96..8fa867f3b 100644
Binary files a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguage.xtextbin and b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/formatter/FormatterTestLanguage.xtextbin differ
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/Bug302128TestLanguage.xtextbin b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/Bug302128TestLanguage.xtextbin
index ec9a9cc10..b22dacb77 100644
Binary files a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/Bug302128TestLanguage.xtextbin and b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/Bug302128TestLanguage.xtextbin differ
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/services/Bug302128TestLanguageGrammarAccess.java b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/services/Bug302128TestLanguageGrammarAccess.java
index 5c10ab170..3f68cb295 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/services/Bug302128TestLanguageGrammarAccess.java
+++ b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/parsetree/reconstr/services/Bug302128TestLanguageGrammarAccess.java
@@ -186,7 +186,7 @@ public class Bug302128TestLanguageGrammarAccess extends AbstractGrammarElementFi
return tValue;
}
- //terminal SL_COMMENT:
+ //@ Override terminal SL_COMMENT:
// '#' !('\n' | '\r')* ('\r'? '\n')?;
public TerminalRule getSL_COMMENTRule() {
return tSL_COMMENT;
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/SequencerTestLanguage.xtextbin b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/SequencerTestLanguage.xtextbin
index a8f5773b7..fcd5c08b6 100644
Binary files a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/SequencerTestLanguage.xtextbin and b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/SequencerTestLanguage.xtextbin differ
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/SyntacticSequencerTestLanguage.xtextbin b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/SyntacticSequencerTestLanguage.xtextbin
index 0181d4461..febc228c4 100644
Binary files a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/SyntacticSequencerTestLanguage.xtextbin and b/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/serializer/SyntacticSequencerTestLanguage.xtextbin differ
diff --git a/org.eclipse.xtext.tests/src/org/eclipse/xtext/GenerateAllTestLanguages.mwe2 b/org.eclipse.xtext.tests/src/org/eclipse/xtext/GenerateAllTestLanguages.mwe2
index bdf8d24bb..d58baa1d5 100644
--- a/org.eclipse.xtext.tests/src/org/eclipse/xtext/GenerateAllTestLanguages.mwe2
+++ b/org.eclipse.xtext.tests/src/org/eclipse/xtext/GenerateAllTestLanguages.mwe2
@@ -34,10 +34,12 @@ Workflow {
registerGenModelFile = "platform:/resource/${projectName}/src/org/eclipse/xtext/generator/grammarAccess/ametamodel.genmodel"
registerGenModelFile = "platform:/resource/${projectName}/src/org/eclipse/xtext/enumrules/enums.genmodel"
registerGenModelFile = "platform:/resource/${projectName}/src/org/eclipse/xtext/metamodelreferencing/tests/EcoreReferences.genmodel"
+ registerGenModelFile = "platform:/resource/${projectName}/src/org/eclipse/xtext/linking/lazy/LazyLinkingTestLanguage.genmodel"
registerGenModelFile = "platform:/resource/org.eclipse.xtext/org/eclipse/xtext/Xtext.genmodel"
registerGenModelFile = "platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel"
registerGeneratedEPackage = "org.eclipse.xtext.grammarinheritance.ametamodel.AmetamodelPackage"
+ registerGeneratedEPackage = "org.eclipse.xtext.linking.lazy.lazyLinking.LazyLinkingPackage"
registerGeneratedEPackage = "org.eclipse.xtext.XtextPackage"
registerGeneratedEPackage = "org.eclipse.emf.ecore.EcorePackage"
}
diff --git a/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/GenerateLinkingTestLanguages.mwe2 b/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/GenerateLinkingTestLanguages.mwe2
index b83617d8f..139b7b892 100644
--- a/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/GenerateLinkingTestLanguages.mwe2
+++ b/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/GenerateLinkingTestLanguages.mwe2
@@ -103,6 +103,7 @@ Workflow {
}
language = {
grammarUri = "classpath:/org/eclipse/xtext/linking/lazy/LazyLinkingTestLanguage.xtext"
+ referencedResource = "platform:/resource/${projectName}/src/org/eclipse/xtext/linking/lazy/LazyLinkingTestLanguage.genmodel"
fragment = junit.Junit4Fragment2 {
generateStub = false
}
diff --git a/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/Bug443705Test.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/Bug443705Test.java
index 7fc1341c9..5948ac671 100644
--- a/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/Bug443705Test.java
+++ b/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/Bug443705Test.java
@@ -46,7 +46,7 @@ public class Bug443705Test {
}
}
- public static class Bug443705StandaloneSetup extends LazyLinkingTestLanguageStandaloneSetupGenerated {
+ public static class Bug443705StandaloneSetup extends LazyLinkingTestLanguageStandaloneSetup {
@Override
public Injector createInjector() {
return Guice.createInjector(new Bug443705RuntimeModule());
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/LazyLinkingTestLanguage.ecore b/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/LazyLinkingTestLanguage.ecore
similarity index 100%
rename from org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/LazyLinkingTestLanguage.ecore
rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/LazyLinkingTestLanguage.ecore
diff --git a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/LazyLinkingTestLanguage.genmodel b/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/LazyLinkingTestLanguage.genmodel
similarity index 99%
rename from org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/LazyLinkingTestLanguage.genmodel
rename to org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/LazyLinkingTestLanguage.genmodel
index 469481333..9382cb610 100644
--- a/org.eclipse.xtext.tests/src-gen/org/eclipse/xtext/linking/lazy/LazyLinkingTestLanguage.genmodel
+++ b/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/LazyLinkingTestLanguage.genmodel
@@ -1,6 +1,6 @@
diff --git a/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/LazyLinkingTestLanguage.xtext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/LazyLinkingTestLanguage.xtext
index 4983620a8..315e8e281 100755
--- a/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/LazyLinkingTestLanguage.xtext
+++ b/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/LazyLinkingTestLanguage.xtext
@@ -7,7 +7,7 @@
*******************************************************************************/
grammar org.eclipse.xtext.linking.lazy.LazyLinkingTestLanguage with org.eclipse.xtext.common.Terminals
-generate lazyLinking "http://eclipse.org/xtext/lazyLinkingTestLanguage"
+import "http://eclipse.org/xtext/lazyLinkingTestLanguage"
Model :
types+=Type*;
diff --git a/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/LazyLinkingTestLanguagePostProcessor.ext b/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/LazyLinkingTestLanguagePostProcessor.ext
deleted file mode 100644
index 20c68c437..000000000
--- a/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/LazyLinkingTestLanguagePostProcessor.ext
+++ /dev/null
@@ -1,27 +0,0 @@
-process(xtext::GeneratedMetamodel this) :
- process(ePackage)
-;
-
-process(ecore::EPackage this) :
- eClassifiers.process()
-;
-
-process(ecore::EClassifier this) :
- null
-;
-
-process(ecore::EClass this) :
- if (this.name == 'UnresolvedProxyProperty') then (
- ((ecore::EReference) this.getEStructuralFeature('type')).setResolveProxies(false)
- ) else if (this.name == 'Type') then (
- ((ecore::EReference) this.getEStructuralFeature('extends')).defineOpposite('subtypes', -1)
- )
-;
-
-defineOpposite(ecore::EReference this, String name, Integer upperBound) :
- let opp = new ecore::EReference :
- opp.setName(name) -> opp.setEType(eContainingClass) ->
- setEOpposite(opp) -> opp.setEOpposite(this) ->
- eReferenceType.eStructuralFeatures.add(opp) ->
- opp.setUpperBound(upperBound)
-;
diff --git a/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/LazyLinkingTestLanguageStandaloneSetup.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/LazyLinkingTestLanguageStandaloneSetup.java
index 572c0ab7d..44cb4c473 100644
--- a/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/LazyLinkingTestLanguageStandaloneSetup.java
+++ b/org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/lazy/LazyLinkingTestLanguageStandaloneSetup.java
@@ -1,14 +1,26 @@
-
package org.eclipse.xtext.linking.lazy;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.xtext.linking.lazy.lazyLinking.LazyLinkingPackage;
+
+import com.google.inject.Injector;
+
/**
* Initialization support for running Xtext languages
* without equinox extension registry
*/
-public class LazyLinkingTestLanguageStandaloneSetup extends LazyLinkingTestLanguageStandaloneSetupGenerated{
+public class LazyLinkingTestLanguageStandaloneSetup extends LazyLinkingTestLanguageStandaloneSetupGenerated {
public static void doSetup() {
new LazyLinkingTestLanguageStandaloneSetup().createInjectorAndDoEMFRegistration();
}
+
+ @Override
+ public void register(Injector injector) {
+ super.register(injector);
+ if (!EPackage.Registry.INSTANCE.containsKey("http://eclipse.org/xtext/lazyLinkingTestLanguage")) {
+ EPackage.Registry.INSTANCE.put("http://eclipse.org/xtext/lazyLinkingTestLanguage", LazyLinkingPackage.eINSTANCE);
+ }
+ }
+
}
-
diff --git a/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/serializer/Bug301935TestLanguageSemanticSequencer.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/serializer/Bug301935TestLanguageSemanticSequencer.java
new file mode 100644
index 000000000..ae137e1ea
--- /dev/null
+++ b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/serializer/Bug301935TestLanguageSemanticSequencer.java
@@ -0,0 +1,8 @@
+/*
+ * generated by Xtext
+ */
+package org.eclipse.xtext.parser.antlr.serializer;
+
+
+public class Bug301935TestLanguageSemanticSequencer extends AbstractBug301935TestLanguageSemanticSequencer {
+}
diff --git a/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/serializer/Bug301935TestLanguageSyntacticSequencer.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/serializer/Bug301935TestLanguageSyntacticSequencer.java
new file mode 100644
index 000000000..415ec7e9b
--- /dev/null
+++ b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/antlr/serializer/Bug301935TestLanguageSyntacticSequencer.java
@@ -0,0 +1,8 @@
+/*
+ * generated by Xtext
+ */
+package org.eclipse.xtext.parser.antlr.serializer;
+
+
+public class Bug301935TestLanguageSyntacticSequencer extends AbstractBug301935TestLanguageSyntacticSequencer {
+}
diff --git a/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/keywords/GrammarAccessTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/keywords/GrammarAccessTest.java
index 1236658e6..06005b43b 100755
--- a/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/keywords/GrammarAccessTest.java
+++ b/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/keywords/GrammarAccessTest.java
@@ -32,7 +32,7 @@ public class GrammarAccessTest extends AbstractXtextTests {
assertEquals("foo\\bar", modelElements.getFirstFooBarKeyword_0_0().getValue());
assertEquals("foo\\", modelElements.getSecondFooKeyword_1_0().getValue());
assertEquals("\\bar", modelElements.getThirdBarKeyword_2_0().getValue());
- assertEquals("\\", modelElements.getForthReverseSolidusKeyword_3_0().getValue());
+ assertEquals("\\", modelElements.getForthBackslashKeyword_3_0().getValue());
assertEquals("\"a\"", modelElements.getFifthAKeyword_4_0().getValue());
assertEquals("'b'", modelElements.getSixthBKeyword_5_0().getValue());
assertEquals("'c'", modelElements.getSeventhCKeyword_6_0().getValue());