From 8a4ddd6e9ad7206180607c0a3f18e9ca2fc0bbdb Mon Sep 17 00:00:00 2001 From: Martin Fluegge Date: Tue, 22 Feb 2011 21:38:54 +0000 Subject: [335669] Remove LITERALS constant from CDO test models https://bugs.eclipse.org/bugs/show_bug.cgi?id=335669 --- .../model/mango.genmodel | 2 +- .../model/mango.legacy-genmodel | 52 +- .../emf/cdo/tests/legacy/mango/MangoFactory.java | 65 ++ .../emf/cdo/tests/legacy/mango/MangoPackage.java | 270 ++++++ .../tests/legacy/mango/impl/MangoFactoryImpl.java | 10 +- .../tests/legacy/mango/impl/MangoPackageImpl.java | 17 +- .../legacy/mango/impl/MangoParameterImpl.java | 10 +- .../tests/legacy/mango/impl/MangoValueImpl.java | 8 +- .../legacy/mango/impl/MangoValueListImpl.java | 6 +- .../eclipse/emf/cdo/tests/mango/MangoPackage.java | 96 --- .../emf/cdo/tests/mango/impl/MangoFactoryImpl.java | 2 - .../emf/cdo/tests/mango/impl/MangoPackageImpl.java | 13 +- .../cdo/tests/mango/impl/MangoParameterImpl.java | 10 +- .../emf/cdo/tests/mango/impl/MangoValueImpl.java | 6 +- .../cdo/tests/mango/impl/MangoValueListImpl.java | 8 +- .../emf/cdo/tests/mango/util/MangoSwitch.java | 6 - .../model/model1.genmodel | 3 +- .../model/model1.legacy-genmodel | 180 ++-- .../emf/cdo/tests/legacy/model1/Model1Factory.java | 50 +- .../emf/cdo/tests/legacy/model1/Model1Package.java | 824 ++++++------------- .../cdo/tests/legacy/model1/impl/AddressImpl.java | 36 +- .../cdo/tests/legacy/model1/impl/CategoryImpl.java | 31 +- .../cdo/tests/legacy/model1/impl/CompanyImpl.java | 27 +- .../cdo/tests/legacy/model1/impl/CustomerImpl.java | 29 +- .../legacy/model1/impl/Model1FactoryImpl.java | 24 +- .../legacy/model1/impl/Model1PackageImpl.java | 178 ++-- .../tests/legacy/model1/impl/OrderAddressImpl.java | 51 +- .../tests/legacy/model1/impl/OrderDetailImpl.java | 34 +- .../cdo/tests/legacy/model1/impl/OrderImpl.java | 16 +- .../cdo/tests/legacy/model1/impl/Product1Impl.java | 53 +- .../legacy/model1/impl/ProductToOrderImpl.java | 27 +- .../legacy/model1/impl/PurchaseOrderImpl.java | 26 +- .../tests/legacy/model1/impl/SalesOrderImpl.java | 36 +- .../cdo/tests/legacy/model1/impl/SupplierImpl.java | 33 +- .../org/eclipse/emf/cdo/tests/model1/Address.java | 22 +- .../org/eclipse/emf/cdo/tests/model1/Category.java | 26 +- .../org/eclipse/emf/cdo/tests/model1/Company.java | 44 +- .../org/eclipse/emf/cdo/tests/model1/Customer.java | 27 +- .../emf/cdo/tests/model1/Model1Factory.java | 50 +- .../emf/cdo/tests/model1/Model1Package.java | 795 ++++++------------ .../org/eclipse/emf/cdo/tests/model1/Order.java | 17 +- .../eclipse/emf/cdo/tests/model1/OrderAddress.java | 21 +- .../eclipse/emf/cdo/tests/model1/OrderDetail.java | 42 +- .../org/eclipse/emf/cdo/tests/model1/Product1.java | 43 +- .../emf/cdo/tests/model1/PurchaseOrder.java | 30 +- .../eclipse/emf/cdo/tests/model1/SalesOrder.java | 26 +- .../org/eclipse/emf/cdo/tests/model1/Supplier.java | 20 +- .../src/org/eclipse/emf/cdo/tests/model1/VAT.java | 60 +- .../emf/cdo/tests/model1/impl/AddressImpl.java | 32 +- .../emf/cdo/tests/model1/impl/CategoryImpl.java | 26 +- .../emf/cdo/tests/model1/impl/CompanyImpl.java | 32 +- .../emf/cdo/tests/model1/impl/CustomerImpl.java | 17 +- .../cdo/tests/model1/impl/Model1FactoryImpl.java | 28 +- .../cdo/tests/model1/impl/Model1PackageImpl.java | 86 +- .../cdo/tests/model1/impl/OrderAddressImpl.java | 46 +- .../emf/cdo/tests/model1/impl/OrderDetailImpl.java | 32 +- .../emf/cdo/tests/model1/impl/OrderImpl.java | 13 +- .../emf/cdo/tests/model1/impl/Product1Impl.java | 37 +- .../cdo/tests/model1/impl/ProductToOrderImpl.java | 26 +- .../cdo/tests/model1/impl/PurchaseOrderImpl.java | 23 +- .../emf/cdo/tests/model1/impl/SalesOrderImpl.java | 23 +- .../emf/cdo/tests/model1/impl/SupplierImpl.java | 20 +- .../tests/model1/util/Model1AdapterFactory.java | 55 +- .../emf/cdo/tests/model1/util/Model1Switch.java | 104 ++- .../model/model2.genmodel | 115 ++- .../model/model2.legacy-genmodel | 331 +++++++- .../emf/cdo/tests/legacy/model2/Model2Package.java | 908 --------------------- .../impl/EObjectToEObjectBothContainedMapImpl.java | 2 +- .../impl/EObjectToEObjectKeyContainedMapImpl.java | 2 +- .../model2/impl/EObjectToEObjectMapImpl.java | 2 +- .../EObjectToEObjectValueContainedMapImpl.java | 2 +- .../legacy/model2/impl/EnumListHolderImpl.java | 2 +- .../legacy/model2/impl/IntegerToStringMapImpl.java | 2 +- .../tests/legacy/model2/impl/MapHolderImpl.java | 24 +- .../legacy/model2/impl/NotUnsettableImpl.java | 2 +- .../model2/impl/NotUnsettableWithDefaultImpl.java | 2 +- .../model2/impl/PersistentContainmentImpl.java | 2 +- .../model2/impl/SpecialPurchaseOrderImpl.java | 2 +- .../impl/StringToAddressContainmentMapImpl.java | 2 +- .../impl/StringToAddressReferenceMapImpl.java | 2 +- .../legacy/model2/impl/StringToStringMapImpl.java | 2 +- .../legacy/model2/impl/StringToVATMapImpl.java | 2 +- .../legacy/model2/impl/TaskContainerImpl.java | 2 +- .../emf/cdo/tests/legacy/model2/impl/TaskImpl.java | 2 +- .../legacy/model2/impl/TransientContainerImpl.java | 2 +- .../tests/legacy/model2/impl/Unsettable1Impl.java | 2 +- .../model2/impl/Unsettable2WithDefaultImpl.java | 2 +- .../emf/cdo/tests/model2/Model2Package.java | 905 -------------------- .../impl/EObjectToEObjectBothContainedMapImpl.java | 10 +- .../impl/EObjectToEObjectKeyContainedMapImpl.java | 10 +- .../tests/model2/impl/EObjectToEObjectMapImpl.java | 10 +- .../EObjectToEObjectValueContainedMapImpl.java | 10 +- .../cdo/tests/model2/impl/EnumListHolderImpl.java | 4 +- .../tests/model2/impl/IntegerToStringMapImpl.java | 10 +- .../emf/cdo/tests/model2/impl/MapHolderImpl.java | 20 +- .../cdo/tests/model2/impl/NotUnsettableImpl.java | 46 +- .../model2/impl/NotUnsettableWithDefaultImpl.java | 46 +- .../model2/impl/PersistentContainmentImpl.java | 12 +- .../model2/impl/SpecialPurchaseOrderImpl.java | 10 +- .../impl/StringToAddressContainmentMapImpl.java | 10 +- .../impl/StringToAddressReferenceMapImpl.java | 10 +- .../tests/model2/impl/StringToStringMapImpl.java | 10 +- .../cdo/tests/model2/impl/StringToVATMapImpl.java | 10 +- .../cdo/tests/model2/impl/TaskContainerImpl.java | 4 +- .../emf/cdo/tests/model2/impl/TaskImpl.java | 14 +- .../tests/model2/impl/TransientContainerImpl.java | 14 +- .../emf/cdo/tests/model2/impl/Unsettable1Impl.java | 90 +- .../model2/impl/Unsettable2WithDefaultImpl.java | 90 +- .../model/model3-legacy.genmodel | 4 +- .../model/model3.genmodel | 10 +- .../emf/cdo/tests/legacy/model3/Model3Package.java | 341 -------- .../cdo/tests/legacy/model3/impl/Class1Impl.java | 2 +- .../emf/cdo/tests/legacy/model3/impl/FileImpl.java | 2 +- .../cdo/tests/legacy/model3/impl/ImageImpl.java | 2 +- .../cdo/tests/legacy/model3/impl/MetaRefImpl.java | 2 +- .../cdo/tests/legacy/model3/impl/NodeAImpl.java | 2 +- .../cdo/tests/legacy/model3/impl/NodeBImpl.java | 2 +- .../cdo/tests/legacy/model3/impl/NodeCImpl.java | 2 +- .../cdo/tests/legacy/model3/impl/NodeDImpl.java | 2 +- .../cdo/tests/legacy/model3/impl/PolygonImpl.java | 2 +- .../model3/impl/PolygonWithDuplicatesImpl.java | 2 +- .../emf/cdo/tests/model3/Model3Package.java | 341 -------- .../emf/cdo/tests/model3/impl/Class1Impl.java | 8 +- .../emf/cdo/tests/model3/impl/FileImpl.java | 10 +- .../emf/cdo/tests/model3/impl/ImageImpl.java | 14 +- .../emf/cdo/tests/model3/impl/MetaRefImpl.java | 14 +- .../emf/cdo/tests/model3/impl/NodeAImpl.java | 10 +- .../emf/cdo/tests/model3/impl/NodeBImpl.java | 12 +- .../emf/cdo/tests/model3/impl/NodeCImpl.java | 16 +- .../emf/cdo/tests/model3/impl/NodeDImpl.java | 18 +- .../emf/cdo/tests/model3/impl/PolygonImpl.java | 4 +- .../model3/impl/PolygonWithDuplicatesImpl.java | 4 +- .../model/model4.genmodel | 9 +- .../model/model4.legacy-genmodel | 299 ++++--- .../impl/ContainedElementNoOppositeImpl.java | 6 +- .../model4/impl/GenRefMapNonContainedImpl.java | 10 +- .../model4/impl/GenRefMultiContainedImpl.java | 2 +- .../model4/impl/GenRefMultiNUNonContainedImpl.java | 2 +- .../model4/impl/GenRefMultiNonContainedImpl.java | 2 +- .../model4/impl/GenRefSingleContainedImpl.java | 14 +- .../model4/impl/GenRefSingleNonContainedImpl.java | 8 +- .../model4/impl/ImplContainedElementNPLImpl.java | 6 +- .../impl/ImplMultiRefContainedElementImpl.java | 22 +- .../model4/impl/ImplMultiRefContainerImpl.java | 2 +- .../model4/impl/ImplMultiRefContainerNPLImpl.java | 2 +- .../impl/ImplMultiRefNonContainedElementImpl.java | 24 +- .../model4/impl/ImplMultiRefNonContainerImpl.java | 2 +- .../impl/ImplMultiRefNonContainerNPLImpl.java | 2 +- .../impl/ImplSingleRefContainedElementImpl.java | 22 +- .../model4/impl/ImplSingleRefContainerImpl.java | 16 +- .../model4/impl/ImplSingleRefContainerNPLImpl.java | 14 +- .../impl/ImplSingleRefNonContainedElementImpl.java | 24 +- .../model4/impl/ImplSingleRefNonContainerImpl.java | 20 +- .../impl/ImplSingleRefNonContainerNPLImpl.java | 8 +- .../model4/impl/MultiContainedElementImpl.java | 24 +- .../model4/impl/MultiNonContainedElementImpl.java | 24 +- .../MultiNonContainedUnsettableElementImpl.java | 32 +- .../legacy/model4/impl/RefMultiContainedImpl.java | 2 +- .../model4/impl/RefMultiContainedNPLImpl.java | 2 +- .../model4/impl/RefMultiNonContainedImpl.java | 2 +- .../model4/impl/RefMultiNonContainedNPLImpl.java | 2 +- .../impl/RefMultiNonContainedUnsettableImpl.java | 4 +- .../legacy/model4/impl/RefSingleContainedImpl.java | 16 +- .../model4/impl/RefSingleContainedNPLImpl.java | 14 +- .../model4/impl/RefSingleNonContainedImpl.java | 20 +- .../model4/impl/RefSingleNonContainedNPLImpl.java | 8 +- .../model4/impl/SingleContainedElementImpl.java | 24 +- .../model4/impl/SingleNonContainedElementImpl.java | 24 +- .../legacy/model4/impl/StringToEObjectImpl.java | 10 +- .../legacy/model4/impl/model4PackageImpl.java | 89 +- .../emf/cdo/tests/legacy/model4/model4Package.java | 641 --------------- .../cdo/tests/legacy/model4/util/model4Switch.java | 98 --- .../impl/ContainedElementNoOppositeImpl.java | 6 +- .../model4/impl/GenRefMapNonContainedImpl.java | 4 +- .../model4/impl/GenRefMultiContainedImpl.java | 4 +- .../model4/impl/GenRefMultiNUNonContainedImpl.java | 4 +- .../model4/impl/GenRefMultiNonContainedImpl.java | 4 +- .../model4/impl/GenRefSingleContainedImpl.java | 6 +- .../model4/impl/GenRefSingleNonContainedImpl.java | 6 +- .../model4/impl/ImplContainedElementNPLImpl.java | 6 +- .../impl/ImplMultiRefContainedElementImpl.java | 10 +- .../model4/impl/ImplMultiRefContainerImpl.java | 5 +- .../model4/impl/ImplMultiRefContainerNPLImpl.java | 4 +- .../impl/ImplMultiRefNonContainedElementImpl.java | 10 +- .../model4/impl/ImplMultiRefNonContainerImpl.java | 4 +- .../impl/ImplMultiRefNonContainerNPLImpl.java | 4 +- .../impl/ImplSingleRefContainedElementImpl.java | 10 +- .../model4/impl/ImplSingleRefContainerImpl.java | 6 +- .../model4/impl/ImplSingleRefContainerNPLImpl.java | 6 +- .../impl/ImplSingleRefNonContainedElementImpl.java | 10 +- .../model4/impl/ImplSingleRefNonContainerImpl.java | 6 +- .../impl/ImplSingleRefNonContainerNPLImpl.java | 8 +- .../model4/impl/MultiContainedElementImpl.java | 10 +- .../model4/impl/MultiNonContainedElementImpl.java | 10 +- .../MultiNonContainedUnsettableElementImpl.java | 14 +- .../tests/model4/impl/RefMultiContainedImpl.java | 4 +- .../model4/impl/RefMultiContainedNPLImpl.java | 4 +- .../model4/impl/RefMultiNonContainedImpl.java | 4 +- .../model4/impl/RefMultiNonContainedNPLImpl.java | 4 +- .../impl/RefMultiNonContainedUnsettableImpl.java | 8 +- .../tests/model4/impl/RefSingleContainedImpl.java | 6 +- .../model4/impl/RefSingleContainedNPLImpl.java | 6 +- .../model4/impl/RefSingleNonContainedImpl.java | 6 +- .../model4/impl/RefSingleNonContainedNPLImpl.java | 6 +- .../model4/impl/SingleContainedElementImpl.java | 10 +- .../model4/impl/SingleNonContainedElementImpl.java | 10 +- .../cdo/tests/model4/impl/StringToEObjectImpl.java | 12 +- .../cdo/tests/model4/impl/model4PackageImpl.java | 89 +- .../emf/cdo/tests/model4/model4Package.java | 626 -------------- .../emf/cdo/tests/model4/util/model4Switch.java | 98 --- .../model/interfaces.genmodel | 2 +- .../model/interfaces.legacy-genmodel | 108 ++- .../impl/model4interfacesPackageImpl.java | 80 +- .../model4interfaces/model4interfacesPackage.java | 267 ------ .../util/model4interfacesSwitch.java | 28 - .../impl/model4interfacesPackageImpl.java | 80 +- .../model4interfaces/model4interfacesPackage.java | 260 ------ .../util/model4interfacesSwitch.java | 28 - .../model/model5.genmodel | 7 +- .../model/model5.legacy-genmodel | 11 +- .../emf/cdo/tests/legacy/model5/Model5Package.java | 276 ------- .../cdo/tests/legacy/model5/impl/DoctorImpl.java | 2 +- .../legacy/model5/impl/GenListOfBooleanImpl.java | 2 +- .../legacy/model5/impl/GenListOfCharImpl.java | 2 +- .../legacy/model5/impl/GenListOfDateImpl.java | 2 +- .../legacy/model5/impl/GenListOfDoubleImpl.java | 2 +- .../legacy/model5/impl/GenListOfFloatImpl.java | 2 +- .../legacy/model5/impl/GenListOfIntArrayImpl.java | 2 +- .../tests/legacy/model5/impl/GenListOfIntImpl.java | 2 +- .../legacy/model5/impl/GenListOfIntegerImpl.java | 2 +- .../legacy/model5/impl/GenListOfLongImpl.java | 2 +- .../legacy/model5/impl/GenListOfShortImpl.java | 2 +- .../legacy/model5/impl/GenListOfStringImpl.java | 2 +- .../cdo/tests/legacy/model5/impl/ManagerImpl.java | 2 +- .../legacy/model5/impl/TestFeatureMapImpl.java | 2 +- .../emf/cdo/tests/model5/Model5Package.java | 276 ------- .../emf/cdo/tests/model5/impl/DoctorImpl.java | 2 +- .../tests/model5/impl/GenListOfBooleanImpl.java | 4 +- .../cdo/tests/model5/impl/GenListOfCharImpl.java | 4 +- .../cdo/tests/model5/impl/GenListOfDateImpl.java | 4 +- .../cdo/tests/model5/impl/GenListOfDoubleImpl.java | 4 +- .../cdo/tests/model5/impl/GenListOfFloatImpl.java | 4 +- .../tests/model5/impl/GenListOfIntArrayImpl.java | 4 +- .../cdo/tests/model5/impl/GenListOfIntImpl.java | 4 +- .../tests/model5/impl/GenListOfIntegerImpl.java | 4 +- .../cdo/tests/model5/impl/GenListOfLongImpl.java | 4 +- .../cdo/tests/model5/impl/GenListOfShortImpl.java | 4 +- .../cdo/tests/model5/impl/GenListOfStringImpl.java | 4 +- .../emf/cdo/tests/model5/impl/ManagerImpl.java | 2 +- .../cdo/tests/model5/impl/TestFeatureMapImpl.java | 8 +- .../cdo/tests/bugzilla/Bugzilla_305527_Test.java | 1 + .../cdo/tests/bugzilla/Bugzilla_335772_Test.java | 20 +- 252 files changed, 3554 insertions(+), 8225 deletions(-) create mode 100644 plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/legacy/mango/MangoFactory.java create mode 100644 plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/legacy/mango/MangoPackage.java diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/model/mango.genmodel b/plugins/org.eclipse.emf.cdo.tests.mango/model/mango.genmodel index e16bbb032f..4da5e67c35 100644 --- a/plugins/org.eclipse.emf.cdo.tests.mango/model/mango.genmodel +++ b/plugins/org.eclipse.emf.cdo.tests.mango/model/mango.genmodel @@ -10,7 +10,7 @@ mango.ecore CDO=org.eclipse.emf.cdo + literalsInterface="false" ecorePackage="mango.ecore#/"> diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/model/mango.legacy-genmodel b/plugins/org.eclipse.emf.cdo.tests.mango/model/mango.legacy-genmodel index e31b513bd9..5ff722d4a4 100644 --- a/plugins/org.eclipse.emf.cdo.tests.mango/model/mango.legacy-genmodel +++ b/plugins/org.eclipse.emf.cdo.tests.mango/model/mango.legacy-genmodel @@ -1,29 +1,41 @@ - + mango.ecore CDO=org.eclipse.emf.cdo - - - - + + + + + + + + + + - - - + + + + + + + + - - + + + + + - - - + + + + + + + + diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/legacy/mango/MangoFactory.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/legacy/mango/MangoFactory.java new file mode 100644 index 0000000000..30679d77e7 --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/legacy/mango/MangoFactory.java @@ -0,0 +1,65 @@ +/** + * Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Eike Stepper - initial API and implementation + */ +package org.eclipse.emf.cdo.tests.legacy.mango; + +import org.eclipse.emf.cdo.tests.mango.MangoParameter; +import org.eclipse.emf.cdo.tests.mango.MangoValue; +import org.eclipse.emf.cdo.tests.mango.MangoValueList; + +/** + * The Factory for the model. It provides a create method for each non-abstract class of + * the model. + * + * @see org.eclipse.emf.cdo.tests.legacy.mango.MangoPackage + * @generated + */ +public interface MangoFactory extends org.eclipse.emf.cdo.tests.mango.MangoFactory +{ + /** + * The singleton instance of the factory. + * + * @generated + */ + MangoFactory eINSTANCE = org.eclipse.emf.cdo.tests.legacy.mango.impl.MangoFactoryImpl.init(); + + /** + * Returns a new object of class 'Value List'. + * + * @return a new object of class 'Value List'. + * @generated + */ + MangoValueList createMangoValueList(); + + /** + * Returns a new object of class 'Value'. + * + * @return a new object of class 'Value'. + * @generated + */ + MangoValue createMangoValue(); + + /** + * Returns a new object of class 'Parameter'. + * + * @return a new object of class 'Parameter'. + * @generated + */ + MangoParameter createMangoParameter(); + + /** + * Returns the package supported by this factory. + * + * @return the package supported by this factory. + * @generated + */ + MangoPackage getMangoPackage(); + +} // MangoFactory diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/legacy/mango/MangoPackage.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/legacy/mango/MangoPackage.java new file mode 100644 index 0000000000..95625504ef --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/legacy/mango/MangoPackage.java @@ -0,0 +1,270 @@ +/** + * Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Eike Stepper - initial API and implementation + */ +package org.eclipse.emf.cdo.tests.legacy.mango; + +import org.eclipse.emf.ecore.EAttribute; +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.EEnum; +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.emf.cdo.tests.legacy.mango.MangoFactory + * @model kind="package" + * @generated + */ +public interface MangoPackage extends org.eclipse.emf.cdo.tests.mango.MangoPackage +{ + /** + * The package name. + * + * @generated + */ + String eNAME = "mango"; + + /** + * The package namespace URI. + * + * @generated + */ + String eNS_URI = "http://www.eclipse.org/emf/CDO/tests/legacy/mango"; + + /** + * The package namespace name. + * + * @generated + */ + String eNS_PREFIX = "mango"; + + /** + * The singleton instance of the package. + * + * @generated + */ + MangoPackage eINSTANCE = org.eclipse.emf.cdo.tests.legacy.mango.impl.MangoPackageImpl.init(); + + /** + * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.mango.impl.MangoValueListImpl + * Value List}' class. + * + * @see org.eclipse.emf.cdo.tests.legacy.mango.impl.MangoValueListImpl + * @see org.eclipse.emf.cdo.tests.legacy.mango.impl.MangoPackageImpl#getMangoValueList() + * @generated + */ + int MANGO_VALUE_LIST = 0; + + /** + * The feature id for the 'Name' attribute. + * + * @generated + * @ordered + */ + int MANGO_VALUE_LIST__NAME = 0; + + /** + * The feature id for the 'Values' reference list. + * + * @generated + * @ordered + */ + int MANGO_VALUE_LIST__VALUES = 1; + + /** + * The number of structural features of the 'Value List' class. + * + * @generated + * @ordered + */ + int MANGO_VALUE_LIST_FEATURE_COUNT = 2; + + /** + * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.mango.impl.MangoValueImpl Value}' + * class. + * + * @see org.eclipse.emf.cdo.tests.legacy.mango.impl.MangoValueImpl + * @see org.eclipse.emf.cdo.tests.legacy.mango.impl.MangoPackageImpl#getMangoValue() + * @generated + */ + int MANGO_VALUE = 1; + + /** + * The feature id for the 'Name' attribute. + * + * @generated + * @ordered + */ + int MANGO_VALUE__NAME = 0; + + /** + * The number of structural features of the 'Value' class. + * + * @generated + * @ordered + */ + int MANGO_VALUE_FEATURE_COUNT = 1; + + /** + * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.mango.impl.MangoParameterImpl + * Parameter}' class. + * + * @see org.eclipse.emf.cdo.tests.legacy.mango.impl.MangoParameterImpl + * @see org.eclipse.emf.cdo.tests.legacy.mango.impl.MangoPackageImpl#getMangoParameter() + * @generated + */ + int MANGO_PARAMETER = 2; + + /** + * The feature id for the 'Name' attribute. + * + * @generated + * @ordered + */ + int MANGO_PARAMETER__NAME = 0; + + /** + * The feature id for the 'Passing' attribute. + * + * @generated + * @ordered + */ + int MANGO_PARAMETER__PASSING = 1; + + /** + * The number of structural features of the 'Parameter' class. + * + * @generated + * @ordered + */ + int MANGO_PARAMETER_FEATURE_COUNT = 2; + + /** + * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.mango.ParameterPassing + * Parameter Passing}' enum. + * + * @see org.eclipse.emf.cdo.tests.legacy.mango.ParameterPassing + * @see org.eclipse.emf.cdo.tests.legacy.mango.impl.MangoPackageImpl#getParameterPassing() + * @generated + */ + int PARAMETER_PASSING = 3; + + /** + * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.mango.MangoValueList + * Value List}'. + * + * @return the meta object for class 'Value List'. + * @see org.eclipse.emf.cdo.tests.legacy.mango.MangoValueList + * @generated + */ + EClass getMangoValueList(); + + /** + * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.mango.MangoValueList#getName + * Name}'. + * + * @return the meta object for the attribute 'Name'. + * @see org.eclipse.emf.cdo.tests.legacy.mango.MangoValueList#getName() + * @see #getMangoValueList() + * @generated + */ + EAttribute getMangoValueList_Name(); + + /** + * Returns the meta object for the reference list ' + * {@link org.eclipse.emf.cdo.tests.legacy.mango.MangoValueList#getValues Values}'. + * + * + * @return the meta object for the reference list 'Values'. + * @see org.eclipse.emf.cdo.tests.legacy.mango.MangoValueList#getValues() + * @see #getMangoValueList() + * @generated + */ + EReference getMangoValueList_Values(); + + /** + * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.mango.MangoValue Value}'. + * + * @return the meta object for class 'Value'. + * @see org.eclipse.emf.cdo.tests.legacy.mango.MangoValue + * @generated + */ + EClass getMangoValue(); + + /** + * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.mango.MangoValue#getName + * Name}'. + * + * @return the meta object for the attribute 'Name'. + * @see org.eclipse.emf.cdo.tests.legacy.mango.MangoValue#getName() + * @see #getMangoValue() + * @generated + */ + EAttribute getMangoValue_Name(); + + /** + * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.mango.MangoParameter Parameter} + * '. + * + * @return the meta object for class 'Parameter'. + * @see org.eclipse.emf.cdo.tests.legacy.mango.MangoParameter + * @generated + */ + EClass getMangoParameter(); + + /** + * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.mango.MangoParameter#getName + * Name}'. + * + * @return the meta object for the attribute 'Name'. + * @see org.eclipse.emf.cdo.tests.legacy.mango.MangoParameter#getName() + * @see #getMangoParameter() + * @generated + */ + EAttribute getMangoParameter_Name(); + + /** + * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.mango.MangoParameter#getPassing + * Passing}'. + * + * @return the meta object for the attribute 'Passing'. + * @see org.eclipse.emf.cdo.tests.legacy.mango.MangoParameter#getPassing() + * @see #getMangoParameter() + * @generated + */ + EAttribute getMangoParameter_Passing(); + + /** + * Returns the meta object for enum '{@link org.eclipse.emf.cdo.tests.legacy.mango.ParameterPassing + * Parameter Passing}'. + * + * @return the meta object for enum 'Parameter Passing'. + * @see org.eclipse.emf.cdo.tests.legacy.mango.ParameterPassing + * @generated + */ + EEnum getParameterPassing(); + + /** + * Returns the factory that creates the instances of the model. + * + * @return the factory that creates the instances of the model. + * @generated + */ + MangoFactory getMangoFactory(); + +} // MangoPackage diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/legacy/mango/impl/MangoFactoryImpl.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/legacy/mango/impl/MangoFactoryImpl.java index d63d794288..8f8846d0ec 100644 --- a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/legacy/mango/impl/MangoFactoryImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/legacy/mango/impl/MangoFactoryImpl.java @@ -10,8 +10,8 @@ */ package org.eclipse.emf.cdo.tests.legacy.mango.impl; -import org.eclipse.emf.cdo.tests.mango.MangoFactory; -import org.eclipse.emf.cdo.tests.mango.MangoPackage; +import org.eclipse.emf.cdo.tests.legacy.mango.MangoFactory; +import org.eclipse.emf.cdo.tests.legacy.mango.MangoPackage; import org.eclipse.emf.cdo.tests.mango.MangoParameter; import org.eclipse.emf.cdo.tests.mango.MangoValue; import org.eclipse.emf.cdo.tests.mango.MangoValueList; @@ -41,12 +41,12 @@ public class MangoFactoryImpl extends EFactoryImpl implements MangoFactory * * @generated NOT */ - public static org.eclipse.emf.cdo.tests.mango.MangoFactory init() + public static MangoFactory init() { try { MangoFactory theMangoFactory = (MangoFactory)EPackage.Registry.INSTANCE - .getEFactory("http://www.eclipse.org/emf/CDO/tests/mango"); + .getEFactory("http://www.eclipse.org/emf/CDO/tests/legacy/mango"); if (theMangoFactory instanceof MangoFactoryImpl) { return theMangoFactory; @@ -170,10 +170,8 @@ public class MangoFactoryImpl extends EFactoryImpl implements MangoFactory { ParameterPassing result = ParameterPassing.get(initialValue); if (result == null) - { throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); - } return result; } diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/legacy/mango/impl/MangoPackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/legacy/mango/impl/MangoPackageImpl.java index c38d2d4808..6de27e0e50 100644 --- a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/legacy/mango/impl/MangoPackageImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/legacy/mango/impl/MangoPackageImpl.java @@ -10,8 +10,8 @@ */ package org.eclipse.emf.cdo.tests.legacy.mango.impl; -import org.eclipse.emf.cdo.tests.mango.MangoFactory; -import org.eclipse.emf.cdo.tests.mango.MangoPackage; +import org.eclipse.emf.cdo.tests.legacy.mango.MangoFactory; +import org.eclipse.emf.cdo.tests.legacy.mango.MangoPackage; import org.eclipse.emf.cdo.tests.mango.MangoParameter; import org.eclipse.emf.cdo.tests.mango.MangoValue; import org.eclipse.emf.cdo.tests.mango.MangoValueList; @@ -104,9 +104,7 @@ public class MangoPackageImpl extends EPackageImpl implements MangoPackage public static MangoPackage init() { if (isInited) - { return (MangoPackage)EPackage.Registry.INSTANCE.getEPackage(MangoPackage.eNS_URI); - } // Obtain or create and register package MangoPackageImpl theMangoPackage = (MangoPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof MangoPackageImpl ? EPackage.Registry.INSTANCE @@ -244,9 +242,7 @@ public class MangoPackageImpl extends EPackageImpl implements MangoPackage public void createPackageContents() { if (isCreated) - { return; - } isCreated = true; // Create classes and their features @@ -281,9 +277,7 @@ public class MangoPackageImpl extends EPackageImpl implements MangoPackage public void initializePackageContents() { if (isInitialized) - { return; - } isInitialized = true; // Initialize package @@ -302,7 +296,7 @@ public class MangoPackageImpl extends EPackageImpl implements MangoPackage IS_GENERATED_INSTANCE_CLASS); initEAttribute(getMangoValueList_Name(), ecorePackage.getEString(), "name", null, 0, 1, MangoValueList.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getMangoValueList_Values(), getMangoValue(), null, "values", null, 0, -1, MangoValueList.class, + initEReference(getMangoValueList_Values(), this.getMangoValue(), null, "values", null, 0, -1, MangoValueList.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); @@ -315,8 +309,9 @@ public class MangoPackageImpl extends EPackageImpl implements MangoPackage IS_GENERATED_INSTANCE_CLASS); initEAttribute(getMangoParameter_Name(), ecorePackage.getEString(), "name", null, 0, 1, MangoParameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getMangoParameter_Passing(), getParameterPassing(), "passing", null, 0, 1, MangoParameter.class, - !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getMangoParameter_Passing(), this.getParameterPassing(), "passing", null, 0, 1, + MangoParameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, + !IS_DERIVED, IS_ORDERED); // Initialize enums and add enum literals initEEnum(parameterPassingEEnum, ParameterPassing.class, "ParameterPassing"); diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/legacy/mango/impl/MangoParameterImpl.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/legacy/mango/impl/MangoParameterImpl.java index 8e55275b82..a47c97d614 100644 --- a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/legacy/mango/impl/MangoParameterImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/legacy/mango/impl/MangoParameterImpl.java @@ -10,7 +10,7 @@ */ package org.eclipse.emf.cdo.tests.legacy.mango.impl; -import org.eclipse.emf.cdo.tests.mango.MangoPackage; +import org.eclipse.emf.cdo.tests.legacy.mango.MangoPackage; import org.eclipse.emf.cdo.tests.mango.MangoParameter; import org.eclipse.emf.cdo.tests.mango.ParameterPassing; @@ -90,7 +90,7 @@ public class MangoParameterImpl extends EObjectImpl implements MangoParameter @Override protected EClass eStaticClass() { - return MangoPackage.Literals.MANGO_PARAMETER; + return MangoPackage.eINSTANCE.getMangoParameter(); } /** @@ -113,9 +113,7 @@ public class MangoParameterImpl extends EObjectImpl implements MangoParameter String oldName = name; name = newName; if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.SET, MangoPackage.MANGO_PARAMETER__NAME, oldName, name)); - } } /** @@ -138,9 +136,7 @@ public class MangoParameterImpl extends EObjectImpl implements MangoParameter ParameterPassing oldPassing = passing; passing = newPassing == null ? PASSING_EDEFAULT : newPassing; if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.SET, MangoPackage.MANGO_PARAMETER__PASSING, oldPassing, passing)); - } } /** @@ -228,9 +224,7 @@ public class MangoParameterImpl extends EObjectImpl implements MangoParameter public String toString() { if (eIsProxy()) - { return super.toString(); - } StringBuffer result = new StringBuffer(super.toString()); result.append(" (name: "); diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/legacy/mango/impl/MangoValueImpl.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/legacy/mango/impl/MangoValueImpl.java index c0fa29f924..4d47f73959 100644 --- a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/legacy/mango/impl/MangoValueImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/legacy/mango/impl/MangoValueImpl.java @@ -10,7 +10,7 @@ */ package org.eclipse.emf.cdo.tests.legacy.mango.impl; -import org.eclipse.emf.cdo.tests.mango.MangoPackage; +import org.eclipse.emf.cdo.tests.legacy.mango.MangoPackage; import org.eclipse.emf.cdo.tests.mango.MangoValue; import org.eclipse.emf.common.notify.Notification; @@ -68,7 +68,7 @@ public class MangoValueImpl extends EObjectImpl implements MangoValue @Override protected EClass eStaticClass() { - return MangoPackage.Literals.MANGO_VALUE; + return MangoPackage.eINSTANCE.getMangoValue(); } /** @@ -91,9 +91,7 @@ public class MangoValueImpl extends EObjectImpl implements MangoValue String oldName = name; name = newName; if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.SET, MangoPackage.MANGO_VALUE__NAME, oldName, name)); - } } /** @@ -171,9 +169,7 @@ public class MangoValueImpl extends EObjectImpl implements MangoValue public String toString() { if (eIsProxy()) - { return super.toString(); - } StringBuffer result = new StringBuffer(super.toString()); result.append(" (name: "); diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/legacy/mango/impl/MangoValueListImpl.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/legacy/mango/impl/MangoValueListImpl.java index 4feff1e556..9b5f514b69 100644 --- a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/legacy/mango/impl/MangoValueListImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/legacy/mango/impl/MangoValueListImpl.java @@ -84,7 +84,7 @@ public class MangoValueListImpl extends EObjectImpl implements MangoValueList @Override protected EClass eStaticClass() { - return MangoPackage.Literals.MANGO_VALUE_LIST; + return MangoPackage.eINSTANCE.getMangoValueList(); } /** @@ -107,9 +107,7 @@ public class MangoValueListImpl extends EObjectImpl implements MangoValueList String oldName = name; name = newName; if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.SET, MangoPackage.MANGO_VALUE_LIST__NAME, oldName, name)); - } } /** @@ -213,9 +211,7 @@ public class MangoValueListImpl extends EObjectImpl implements MangoValueList public String toString() { if (eIsProxy()) - { return super.toString(); - } StringBuffer result = new StringBuffer(super.toString()); result.append(" (name: "); diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/MangoPackage.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/MangoPackage.java index 1535f7c357..cf4ea2578e 100644 --- a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/MangoPackage.java +++ b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/MangoPackage.java @@ -267,100 +267,4 @@ public interface MangoPackage extends EPackage */ MangoFactory getMangoFactory(); - /** - * 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.emf.cdo.tests.mango.impl.MangoValueListImpl - * Value List}' class. - * - * @see org.eclipse.emf.cdo.tests.mango.impl.MangoValueListImpl - * @see org.eclipse.emf.cdo.tests.mango.impl.MangoPackageImpl#getMangoValueList() - * @generated - */ - EClass MANGO_VALUE_LIST = eINSTANCE.getMangoValueList(); - - /** - * The meta object literal for the 'Name' attribute feature. - * - * @generated - */ - EAttribute MANGO_VALUE_LIST__NAME = eINSTANCE.getMangoValueList_Name(); - - /** - * The meta object literal for the 'Values' reference list feature. - * - * @generated - */ - EReference MANGO_VALUE_LIST__VALUES = eINSTANCE.getMangoValueList_Values(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.mango.impl.MangoValueImpl Value}' - * class. - * - * @see org.eclipse.emf.cdo.tests.mango.impl.MangoValueImpl - * @see org.eclipse.emf.cdo.tests.mango.impl.MangoPackageImpl#getMangoValue() - * @generated - */ - EClass MANGO_VALUE = eINSTANCE.getMangoValue(); - - /** - * The meta object literal for the 'Name' attribute feature. - * - * @generated - */ - EAttribute MANGO_VALUE__NAME = eINSTANCE.getMangoValue_Name(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.mango.impl.MangoParameterImpl - * Parameter}' class. - * - * @see org.eclipse.emf.cdo.tests.mango.impl.MangoParameterImpl - * @see org.eclipse.emf.cdo.tests.mango.impl.MangoPackageImpl#getMangoParameter() - * @generated - */ - EClass MANGO_PARAMETER = eINSTANCE.getMangoParameter(); - - /** - * The meta object literal for the 'Name' attribute feature. - * - * @generated - */ - EAttribute MANGO_PARAMETER__NAME = eINSTANCE.getMangoParameter_Name(); - - /** - * The meta object literal for the 'Passing' attribute feature. - * - * @generated - */ - EAttribute MANGO_PARAMETER__PASSING = eINSTANCE.getMangoParameter_Passing(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.mango.ParameterPassing - * Parameter Passing}' enum. - * - * @see org.eclipse.emf.cdo.tests.mango.ParameterPassing - * @see org.eclipse.emf.cdo.tests.mango.impl.MangoPackageImpl#getParameterPassing() - * @generated - */ - EEnum PARAMETER_PASSING = eINSTANCE.getParameterPassing(); - - } - } // MangoPackage diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/MangoFactoryImpl.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/MangoFactoryImpl.java index 1985deff5c..a4703c07ad 100644 --- a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/MangoFactoryImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/MangoFactoryImpl.java @@ -161,10 +161,8 @@ public class MangoFactoryImpl extends EFactoryImpl implements MangoFactory { ParameterPassing result = ParameterPassing.get(initialValue); if (result == null) - { throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); - } return result; } diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/MangoPackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/MangoPackageImpl.java index 7912c3230d..eef11d513d 100644 --- a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/MangoPackageImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/MangoPackageImpl.java @@ -99,9 +99,7 @@ public class MangoPackageImpl extends EPackageImpl implements MangoPackage public static MangoPackage init() { if (isInited) - { return (MangoPackage)EPackage.Registry.INSTANCE.getEPackage(MangoPackage.eNS_URI); - } // Obtain or create and register package MangoPackageImpl theMangoPackage = (MangoPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof MangoPackageImpl ? EPackage.Registry.INSTANCE @@ -239,9 +237,7 @@ public class MangoPackageImpl extends EPackageImpl implements MangoPackage public void createPackageContents() { if (isCreated) - { return; - } isCreated = true; // Create classes and their features @@ -276,9 +272,7 @@ public class MangoPackageImpl extends EPackageImpl implements MangoPackage public void initializePackageContents() { if (isInitialized) - { return; - } isInitialized = true; // Initialize package @@ -297,7 +291,7 @@ public class MangoPackageImpl extends EPackageImpl implements MangoPackage IS_GENERATED_INSTANCE_CLASS); initEAttribute(getMangoValueList_Name(), ecorePackage.getEString(), "name", null, 0, 1, MangoValueList.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getMangoValueList_Values(), getMangoValue(), null, "values", null, 0, -1, MangoValueList.class, + initEReference(getMangoValueList_Values(), this.getMangoValue(), null, "values", null, 0, -1, MangoValueList.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); @@ -310,8 +304,9 @@ public class MangoPackageImpl extends EPackageImpl implements MangoPackage IS_GENERATED_INSTANCE_CLASS); initEAttribute(getMangoParameter_Name(), ecorePackage.getEString(), "name", null, 0, 1, MangoParameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getMangoParameter_Passing(), getParameterPassing(), "passing", null, 0, 1, MangoParameter.class, - !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getMangoParameter_Passing(), this.getParameterPassing(), "passing", null, 0, 1, + MangoParameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, + !IS_DERIVED, IS_ORDERED); // Initialize enums and add enum literals initEEnum(parameterPassingEEnum, ParameterPassing.class, "ParameterPassing"); diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/MangoParameterImpl.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/MangoParameterImpl.java index 54912918b5..b1127936b2 100644 --- a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/MangoParameterImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/MangoParameterImpl.java @@ -50,7 +50,7 @@ public class MangoParameterImpl extends CDOObjectImpl implements MangoParameter @Override protected EClass eStaticClass() { - return MangoPackage.Literals.MANGO_PARAMETER; + return MangoPackage.eINSTANCE.getMangoParameter(); } /** @@ -71,7 +71,7 @@ public class MangoParameterImpl extends CDOObjectImpl implements MangoParameter */ public String getName() { - return (String)eGet(MangoPackage.Literals.MANGO_PARAMETER__NAME, true); + return (String)eGet(MangoPackage.eINSTANCE.getMangoParameter_Name(), true); } /** @@ -81,7 +81,7 @@ public class MangoParameterImpl extends CDOObjectImpl implements MangoParameter */ public void setName(String newName) { - eSet(MangoPackage.Literals.MANGO_PARAMETER__NAME, newName); + eSet(MangoPackage.eINSTANCE.getMangoParameter_Name(), newName); } /** @@ -91,7 +91,7 @@ public class MangoParameterImpl extends CDOObjectImpl implements MangoParameter */ public ParameterPassing getPassing() { - return (ParameterPassing)eGet(MangoPackage.Literals.MANGO_PARAMETER__PASSING, true); + return (ParameterPassing)eGet(MangoPackage.eINSTANCE.getMangoParameter_Passing(), true); } /** @@ -101,7 +101,7 @@ public class MangoParameterImpl extends CDOObjectImpl implements MangoParameter */ public void setPassing(ParameterPassing newPassing) { - eSet(MangoPackage.Literals.MANGO_PARAMETER__PASSING, newPassing); + eSet(MangoPackage.eINSTANCE.getMangoParameter_Passing(), newPassing); } } // ParameterImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/MangoValueImpl.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/MangoValueImpl.java index c6a9c7d3c5..d93d2c80ef 100644 --- a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/MangoValueImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/MangoValueImpl.java @@ -48,7 +48,7 @@ public class MangoValueImpl extends CDOObjectImpl implements MangoValue @Override protected EClass eStaticClass() { - return MangoPackage.Literals.MANGO_VALUE; + return MangoPackage.eINSTANCE.getMangoValue(); } /** @@ -69,7 +69,7 @@ public class MangoValueImpl extends CDOObjectImpl implements MangoValue */ public String getName() { - return (String)eGet(MangoPackage.Literals.MANGO_VALUE__NAME, true); + return (String)eGet(MangoPackage.eINSTANCE.getMangoValue_Name(), true); } /** @@ -79,7 +79,7 @@ public class MangoValueImpl extends CDOObjectImpl implements MangoValue */ public void setName(String newName) { - eSet(MangoPackage.Literals.MANGO_VALUE__NAME, newName); + eSet(MangoPackage.eINSTANCE.getMangoValue_Name(), newName); } } // ValueImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/MangoValueListImpl.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/MangoValueListImpl.java index fbaa4f82ef..745d37a836 100644 --- a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/MangoValueListImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/MangoValueListImpl.java @@ -51,7 +51,7 @@ public class MangoValueListImpl extends CDOObjectImpl implements MangoValueList @Override protected EClass eStaticClass() { - return MangoPackage.Literals.MANGO_VALUE_LIST; + return MangoPackage.eINSTANCE.getMangoValueList(); } /** @@ -72,7 +72,7 @@ public class MangoValueListImpl extends CDOObjectImpl implements MangoValueList */ public String getName() { - return (String)eGet(MangoPackage.Literals.MANGO_VALUE_LIST__NAME, true); + return (String)eGet(MangoPackage.eINSTANCE.getMangoValueList_Name(), true); } /** @@ -82,7 +82,7 @@ public class MangoValueListImpl extends CDOObjectImpl implements MangoValueList */ public void setName(String newName) { - eSet(MangoPackage.Literals.MANGO_VALUE_LIST__NAME, newName); + eSet(MangoPackage.eINSTANCE.getMangoValueList_Name(), newName); } /** @@ -93,7 +93,7 @@ public class MangoValueListImpl extends CDOObjectImpl implements MangoValueList @SuppressWarnings("unchecked") public EList getValues() { - return (EList)eGet(MangoPackage.Literals.MANGO_VALUE_LIST__VALUES, true); + return (EList)eGet(MangoPackage.eINSTANCE.getMangoValueList_Values(), true); } } // ValueListImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/util/MangoSwitch.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/util/MangoSwitch.java index 40961959a9..dfe2bcd5b5 100644 --- a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/util/MangoSwitch.java +++ b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/util/MangoSwitch.java @@ -99,9 +99,7 @@ public class MangoSwitch MangoValueList mangoValueList = (MangoValueList)theEObject; T result = caseMangoValueList(mangoValueList); if (result == null) - { result = defaultCase(theEObject); - } return result; } case MangoPackage.MANGO_VALUE: @@ -109,9 +107,7 @@ public class MangoSwitch MangoValue mangoValue = (MangoValue)theEObject; T result = caseMangoValue(mangoValue); if (result == null) - { result = defaultCase(theEObject); - } return result; } case MangoPackage.MANGO_PARAMETER: @@ -119,9 +115,7 @@ public class MangoSwitch MangoParameter mangoParameter = (MangoParameter)theEObject; T result = caseMangoParameter(mangoParameter); if (result == null) - { result = defaultCase(theEObject); - } return result; } default: diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/model/model1.genmodel b/plugins/org.eclipse.emf.cdo.tests.model1/model/model1.genmodel index 003ddae8c4..7d3837d237 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/model/model1.genmodel +++ b/plugins/org.eclipse.emf.cdo.tests.model1/model/model1.genmodel @@ -11,7 +11,8 @@ model1.ecore CDO=org.eclipse.emf.cdo + literalsInterface="false" extensibleProviderFactory="true" childCreationExtenders="true" + ecorePackage="model1.ecore#/"> diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/model/model1.legacy-genmodel b/plugins/org.eclipse.emf.cdo.tests.model1/model/model1.legacy-genmodel index d329e251e8..c146e0e7a3 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/model/model1.legacy-genmodel +++ b/plugins/org.eclipse.emf.cdo.tests.model1/model/model1.legacy-genmodel @@ -1,68 +1,146 @@ - + model1.ecore CDO=org.eclipse.emf.cdo - - - - - + + + + + + + + + + + + + - - - - + + + + + + + + + + + - - - - - - + + + + + + + + + + + + + + + + + - - - + + + + + + + + - - + + + + + + + + - - + + + + + - - - - + + + + + + + + + + + - - - + + + + + + + + - - - + + + + + + + + - - - - + + + + + + + + + + + - - - - - + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/Model1Factory.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/Model1Factory.java index 467b04cdf7..83f5db59b4 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/Model1Factory.java +++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/Model1Factory.java @@ -24,6 +24,7 @@ import org.eclipse.emf.cdo.tests.model1.Supplier; /** * The Factory for the model. It provides a create method for each non-abstract class of * the model. + * * @see org.eclipse.emf.cdo.tests.legacy.model1.Model1Package * @generated */ @@ -31,100 +32,101 @@ public interface Model1Factory extends org.eclipse.emf.cdo.tests.model1.Model1Fa { /** * + * * @generated */ String copyright = "Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n Eike Stepper - initial API and implementation"; /** - * The singleton instance of the factory. - * + * The singleton instance of the factory. + * * @generated */ Model1Factory eINSTANCE = org.eclipse.emf.cdo.tests.legacy.model1.impl.Model1FactoryImpl.init(); /** - * Returns a new object of class 'Address'. - * + * Returns a new object of class 'Address'. + * * @return a new object of class 'Address'. * @generated */ Address createAddress(); /** - * Returns a new object of class 'Company'. - * + * Returns a new object of class 'Company'. + * * @return a new object of class 'Company'. * @generated */ Company createCompany(); /** - * Returns a new object of class 'Supplier'. - * + * Returns a new object of class 'Supplier'. + * * @return a new object of class 'Supplier'. * @generated */ Supplier createSupplier(); /** - * Returns a new object of class 'Customer'. - * + * Returns a new object of class 'Customer'. + * * @return a new object of class 'Customer'. * @generated */ Customer createCustomer(); /** - * Returns a new object of class 'Order Detail'. - * + * Returns a new object of class 'Order Detail'. + * * @return a new object of class 'Order Detail'. * @generated */ OrderDetail createOrderDetail(); /** - * Returns a new object of class 'Purchase Order'. - * + * Returns a new object of class 'Purchase Order'. + * * @return a new object of class 'Purchase Order'. * @generated */ PurchaseOrder createPurchaseOrder(); /** - * Returns a new object of class 'Sales Order'. - * + * Returns a new object of class 'Sales Order'. + * * @return a new object of class 'Sales Order'. * @generated */ SalesOrder createSalesOrder(); /** - * Returns a new object of class 'Category'. - * + * Returns a new object of class 'Category'. + * * @return a new object of class 'Category'. * @generated */ Category createCategory(); /** - * Returns a new object of class 'Product1'. - * + * Returns a new object of class 'Product1'. + * * @return a new object of class 'Product1'. * @generated */ Product1 createProduct1(); /** - * Returns a new object of class 'Order Address'. - * + * Returns a new object of class 'Order Address'. + * * @return a new object of class 'Order Address'. * @generated */ OrderAddress createOrderAddress(); /** - * Returns the package supported by this factory. - * + * Returns the package supported by this factory. + * * @return the package supported by this factory. * @generated */ diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/Model1Package.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/Model1Package.java index 1901ec0362..dfb5ec5836 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/Model1Package.java +++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/Model1Package.java @@ -24,22 +24,25 @@ import org.eclipse.emf.ecore.EReference; *
  • and each data type
  • * * + * * @see org.eclipse.emf.cdo.tests.legacy.model1.Model1Factory - * @model kind="package" - * annotation="teneo.jpa value='@hbGenericGenerators({@GenericGenerator(name=\"system-uuid\", strategy = \"org.eclipse.emf.cdo.server.internal.hibernate.tuplizer.CDOUUIDHexGenerator\")})'" + * @model kind="package" annotation="teneo.jpa value='@hbGenericGenerators( {@GenericGenerator(name=\"system-uuid\", + * strategy = + * \"org.eclipse.emf.cdo.server.internal.hibernate.tuplizer.CDOUUIDHexGenerator\")})'" * @generated */ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Package { /** * + * * @generated */ String copyright = "Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n Eike Stepper - initial API and implementation"; /** - * The package name. - * + * The package name. + * * @generated */ String eNAME = "model1"; @@ -52,22 +55,23 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa String eNS_URI = "http://www.eclipse.org/emf/CDO/tests/legacy/model1/1.0.0"; /** - * The package namespace name. - * + * The package namespace name. + * * @generated */ String eNS_PREFIX = "model1"; /** - * The singleton instance of the package. - * + * The singleton instance of the package. + * * @generated */ Model1Package eINSTANCE = org.eclipse.emf.cdo.tests.legacy.model1.impl.Model1PackageImpl.init(); /** - * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.AddressImpl Address}' class. - * + * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.AddressImpl Address}' + * class. + * * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.AddressImpl * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.Model1PackageImpl#getAddress() * @generated @@ -75,40 +79,41 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa int ADDRESS = 0; /** - * The feature id for the 'Name' attribute. - * + * The feature id for the 'Name' attribute. + * * @generated * @ordered */ int ADDRESS__NAME = 0; /** - * The feature id for the 'Street' attribute. - * + * The feature id for the 'Street' attribute. + * * @generated * @ordered */ int ADDRESS__STREET = 1; /** - * The feature id for the 'City' attribute. - * + * The feature id for the 'City' attribute. + * * @generated * @ordered */ int ADDRESS__CITY = 2; /** - * The number of structural features of the 'Address' class. - * + * The number of structural features of the 'Address' class. + * * @generated * @ordered */ int ADDRESS_FEATURE_COUNT = 3; /** - * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.CompanyImpl Company}' class. - * + * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.CompanyImpl Company}' + * class. + * * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.CompanyImpl * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.Model1PackageImpl#getCompany() * @generated @@ -116,85 +121,86 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa int COMPANY = 1; /** - * The feature id for the 'Name' attribute. - * + * The feature id for the 'Name' attribute. + * * @generated * @ordered */ int COMPANY__NAME = ADDRESS__NAME; /** - * The feature id for the 'Street' attribute. - * + * The feature id for the 'Street' attribute. + * * @generated * @ordered */ int COMPANY__STREET = ADDRESS__STREET; /** - * The feature id for the 'City' attribute. - * + * The feature id for the 'City' attribute. + * * @generated * @ordered */ int COMPANY__CITY = ADDRESS__CITY; /** - * The feature id for the 'Categories' containment reference list. - * + * * @generated * @ordered */ int COMPANY__CATEGORIES = ADDRESS_FEATURE_COUNT + 0; /** - * The feature id for the 'Suppliers' containment reference list. - * + * * @generated * @ordered */ int COMPANY__SUPPLIERS = ADDRESS_FEATURE_COUNT + 1; /** - * The feature id for the 'Customers' containment reference list. - * + * * @generated * @ordered */ int COMPANY__CUSTOMERS = ADDRESS_FEATURE_COUNT + 2; /** - * The feature id for the 'Purchase Orders' containment reference list. - * + * * @generated * @ordered */ int COMPANY__PURCHASE_ORDERS = ADDRESS_FEATURE_COUNT + 3; /** - * The feature id for the 'Sales Orders' containment reference list. - * + * * @generated * @ordered */ int COMPANY__SALES_ORDERS = ADDRESS_FEATURE_COUNT + 4; /** - * The number of structural features of the 'Company' class. - * + * The number of structural features of the 'Company' class. + * * @generated * @ordered */ int COMPANY_FEATURE_COUNT = ADDRESS_FEATURE_COUNT + 5; /** - * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.SupplierImpl Supplier}' class. - * + * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.SupplierImpl Supplier}' + * class. + * * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.SupplierImpl * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.Model1PackageImpl#getSupplier() * @generated @@ -202,24 +208,24 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa int SUPPLIER = 2; /** - * The feature id for the 'Name' attribute. - * + * The feature id for the 'Name' attribute. + * * @generated * @ordered */ int SUPPLIER__NAME = ADDRESS__NAME; /** - * The feature id for the 'Street' attribute. - * + * The feature id for the 'Street' attribute. + * * @generated * @ordered */ int SUPPLIER__STREET = ADDRESS__STREET; /** - * The feature id for the 'City' attribute. - * + * The feature id for the 'City' attribute. + * * @generated * @ordered */ @@ -235,24 +241,25 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa int SUPPLIER__PURCHASE_ORDERS = ADDRESS_FEATURE_COUNT + 0; /** - * The feature id for the 'Preferred' attribute. - * + * The feature id for the 'Preferred' attribute. + * * @generated * @ordered */ int SUPPLIER__PREFERRED = ADDRESS_FEATURE_COUNT + 1; /** - * The number of structural features of the 'Supplier' class. - * + * The number of structural features of the 'Supplier' class. + * * @generated * @ordered */ int SUPPLIER_FEATURE_COUNT = ADDRESS_FEATURE_COUNT + 2; /** - * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.CustomerImpl Customer}' class. - * + * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.CustomerImpl Customer}' + * class. + * * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.CustomerImpl * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.Model1PackageImpl#getCustomer() * @generated @@ -260,48 +267,48 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa int CUSTOMER = 3; /** - * The feature id for the 'Name' attribute. - * + * The feature id for the 'Name' attribute. + * * @generated * @ordered */ int CUSTOMER__NAME = ADDRESS__NAME; /** - * The feature id for the 'Street' attribute. - * + * The feature id for the 'Street' attribute. + * * @generated * @ordered */ int CUSTOMER__STREET = ADDRESS__STREET; /** - * The feature id for the 'City' attribute. - * + * The feature id for the 'City' attribute. + * * @generated * @ordered */ int CUSTOMER__CITY = ADDRESS__CITY; /** - * The feature id for the 'Sales Orders' reference list. - * + * The feature id for the 'Sales Orders' reference list. + * * @generated * @ordered */ int CUSTOMER__SALES_ORDERS = ADDRESS_FEATURE_COUNT + 0; /** - * The feature id for the 'Order By Product' map. - * + * The feature id for the 'Order By Product' map. + * * @generated * @ordered */ int CUSTOMER__ORDER_BY_PRODUCT = ADDRESS_FEATURE_COUNT + 1; /** - * The number of structural features of the 'Customer' class. - * + * The number of structural features of the 'Customer' class. + * * @generated * @ordered */ @@ -310,6 +317,7 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa /** * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.OrderImpl Order}' class. * + * * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.OrderImpl * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.Model1PackageImpl#getOrder() * @generated @@ -317,25 +325,26 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa int ORDER = 4; /** - * The feature id for the 'Order Details' containment reference list. - * + * * @generated * @ordered */ int ORDER__ORDER_DETAILS = 0; /** - * The number of structural features of the 'Order' class. - * + * The number of structural features of the 'Order' class. + * * @generated * @ordered */ int ORDER_FEATURE_COUNT = 1; /** - * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.OrderDetailImpl Order Detail}' class. - * + * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.OrderDetailImpl + * Order Detail}' class. + * * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.OrderDetailImpl * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.Model1PackageImpl#getOrderDetail() * @generated @@ -343,24 +352,24 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa int ORDER_DETAIL = 5; /** - * The feature id for the 'Order' container reference. - * + * The feature id for the 'Order' container reference. + * * @generated * @ordered */ int ORDER_DETAIL__ORDER = 0; /** - * The feature id for the 'Product' reference. - * + * The feature id for the 'Product' reference. + * * @generated * @ordered */ int ORDER_DETAIL__PRODUCT = 1; /** - * The feature id for the 'Price' attribute. - * + * The feature id for the 'Price' attribute. + * * @generated * @ordered */ @@ -376,8 +385,9 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa int ORDER_DETAIL_FEATURE_COUNT = 3; /** - * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.PurchaseOrderImpl Purchase Order}' class. - * + * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.PurchaseOrderImpl + * Purchase Order}' class. + * * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.PurchaseOrderImpl * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.Model1PackageImpl#getPurchaseOrder() * @generated @@ -385,25 +395,25 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa int PURCHASE_ORDER = 6; /** - * The feature id for the 'Order Details' containment reference list. - * + * * @generated * @ordered */ int PURCHASE_ORDER__ORDER_DETAILS = ORDER__ORDER_DETAILS; /** - * The feature id for the 'Date' attribute. - * + * The feature id for the 'Date' attribute. + * * @generated * @ordered */ int PURCHASE_ORDER__DATE = ORDER_FEATURE_COUNT + 0; /** - * The feature id for the 'Supplier' reference. - * + * The feature id for the 'Supplier' reference. + * * @generated * @ordered */ @@ -419,8 +429,9 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa int PURCHASE_ORDER_FEATURE_COUNT = ORDER_FEATURE_COUNT + 2; /** - * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.SalesOrderImpl Sales Order}' class. - * + * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.SalesOrderImpl + * Sales Order}' class. + * * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.SalesOrderImpl * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.Model1PackageImpl#getSalesOrder() * @generated @@ -428,25 +439,25 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa int SALES_ORDER = 7; /** - * The feature id for the 'Order Details' containment reference list. - * + * * @generated * @ordered */ int SALES_ORDER__ORDER_DETAILS = ORDER__ORDER_DETAILS; /** - * The feature id for the 'Id' attribute. - * + * The feature id for the 'Id' attribute. + * * @generated * @ordered */ int SALES_ORDER__ID = ORDER_FEATURE_COUNT + 0; /** - * The feature id for the 'Customer' reference. - * + * The feature id for the 'Customer' reference. + * * @generated * @ordered */ @@ -462,8 +473,9 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa int SALES_ORDER_FEATURE_COUNT = ORDER_FEATURE_COUNT + 2; /** - * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.CategoryImpl Category}' class. - * + * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.CategoryImpl Category}' + * class. + * * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.CategoryImpl * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.Model1PackageImpl#getCategory() * @generated @@ -471,42 +483,43 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa int CATEGORY = 8; /** - * The feature id for the 'Name' attribute. - * + * The feature id for the 'Name' attribute. + * * @generated * @ordered */ int CATEGORY__NAME = 0; /** - * The feature id for the 'Categories' containment reference list. - * + * * @generated * @ordered */ int CATEGORY__CATEGORIES = 1; /** - * The feature id for the 'Products' containment reference list. - * + * * @generated * @ordered */ int CATEGORY__PRODUCTS = 2; /** - * The number of structural features of the 'Category' class. - * + * The number of structural features of the 'Category' class. + * * @generated * @ordered */ int CATEGORY_FEATURE_COUNT = 3; /** - * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.Product1Impl Product1}' class. - * + * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.Product1Impl Product1}' + * class. + * * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.Product1Impl * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.Model1PackageImpl#getProduct1() * @generated @@ -514,8 +527,8 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa int PRODUCT1 = 9; /** - * The feature id for the 'Name' attribute. - * + * The feature id for the 'Name' attribute. + * * @generated * @ordered */ @@ -531,32 +544,33 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa int PRODUCT1__ORDER_DETAILS = 1; /** - * The feature id for the 'Vat' attribute. - * + * The feature id for the 'Vat' attribute. + * * @generated * @ordered */ int PRODUCT1__VAT = 2; /** - * The feature id for the 'Description' attribute. - * + * The feature id for the 'Description' attribute. + * * @generated * @ordered */ int PRODUCT1__DESCRIPTION = 3; /** - * The number of structural features of the 'Product1' class. - * + * The number of structural features of the 'Product1' class. + * * @generated * @ordered */ int PRODUCT1_FEATURE_COUNT = 4; /** - * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.OrderAddressImpl Order Address}' class. - * + * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.OrderAddressImpl + * Order Address}' class. + * * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.OrderAddressImpl * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.Model1PackageImpl#getOrderAddress() * @generated @@ -564,65 +578,65 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa int ORDER_ADDRESS = 10; /** - * The feature id for the 'Name' attribute. - * + * The feature id for the 'Name' attribute. + * * @generated * @ordered */ int ORDER_ADDRESS__NAME = ADDRESS__NAME; /** - * The feature id for the 'Street' attribute. - * + * The feature id for the 'Street' attribute. + * * @generated * @ordered */ int ORDER_ADDRESS__STREET = ADDRESS__STREET; /** - * The feature id for the 'City' attribute. - * + * The feature id for the 'City' attribute. + * * @generated * @ordered */ int ORDER_ADDRESS__CITY = ADDRESS__CITY; /** - * The feature id for the 'Order Details' containment reference list. - * + * * @generated * @ordered */ int ORDER_ADDRESS__ORDER_DETAILS = ADDRESS_FEATURE_COUNT + 0; /** - * The feature id for the 'Order' container reference. - * + * The feature id for the 'Order' container reference. + * * @generated * @ordered */ int ORDER_ADDRESS__ORDER = ADDRESS_FEATURE_COUNT + 1; /** - * The feature id for the 'Product' reference. - * + * The feature id for the 'Product' reference. + * * @generated * @ordered */ int ORDER_ADDRESS__PRODUCT = ADDRESS_FEATURE_COUNT + 2; /** - * The feature id for the 'Price' attribute. - * + * The feature id for the 'Price' attribute. + * * @generated * @ordered */ int ORDER_ADDRESS__PRICE = ADDRESS_FEATURE_COUNT + 3; /** - * The feature id for the 'Test Attribute' attribute. - * + * The feature id for the 'Test Attribute' attribute. + * * @generated * @ordered */ @@ -638,8 +652,9 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa int ORDER_ADDRESS_FEATURE_COUNT = ADDRESS_FEATURE_COUNT + 5; /** - * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.ProductToOrderImpl Product To Order}' class. - * + * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.ProductToOrderImpl + * Product To Order}' class. + * * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.ProductToOrderImpl * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.Model1PackageImpl#getProductToOrder() * @generated @@ -647,25 +662,25 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa int PRODUCT_TO_ORDER = 11; /** - * The feature id for the 'Key' reference. - * + * The feature id for the 'Key' reference. + * * @generated * @ordered */ int PRODUCT_TO_ORDER__KEY = 0; /** - * The feature id for the 'Value' reference. - * + * The feature id for the 'Value' reference. + * * @generated * @ordered */ int PRODUCT_TO_ORDER__VALUE = 1; /** - * The number of structural features of the 'Product To Order' class. - * + * * @generated * @ordered */ @@ -692,8 +707,9 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa EClass getAddress(); /** - * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model1.Address#getName Name}'. - * + * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model1.Address#getName + * Name}'. + * * @return the meta object for the attribute 'Name'. * @see org.eclipse.emf.cdo.tests.legacy.model1.Address#getName() * @see #getAddress() @@ -702,8 +718,9 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa EAttribute getAddress_Name(); /** - * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model1.Address#getStreet Street}'. - * + * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model1.Address#getStreet + * Street}'. + * * @return the meta object for the attribute 'Street'. * @see org.eclipse.emf.cdo.tests.legacy.model1.Address#getStreet() * @see #getAddress() @@ -712,8 +729,9 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa EAttribute getAddress_Street(); /** - * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model1.Address#getCity City}'. - * + * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model1.Address#getCity + * City}'. + * * @return the meta object for the attribute 'City'. * @see org.eclipse.emf.cdo.tests.legacy.model1.Address#getCity() * @see #getAddress() @@ -732,9 +750,10 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa EClass getCompany(); /** - * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.legacy.model1.Company#getCategories Categories}'. - * + * Returns the meta object for the containment reference list ' + * {@link org.eclipse.emf.cdo.tests.legacy.model1.Company#getCategories Categories}'. * + * * @return the meta object for the containment reference list 'Categories'. * @see org.eclipse.emf.cdo.tests.legacy.model1.Company#getCategories() * @see #getCompany() @@ -743,9 +762,10 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa EReference getCompany_Categories(); /** - * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.legacy.model1.Company#getSuppliers Suppliers}'. - * + * Returns the meta object for the containment reference list ' + * {@link org.eclipse.emf.cdo.tests.legacy.model1.Company#getSuppliers Suppliers}'. * + * * @return the meta object for the containment reference list 'Suppliers'. * @see org.eclipse.emf.cdo.tests.legacy.model1.Company#getSuppliers() * @see #getCompany() @@ -754,9 +774,10 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa EReference getCompany_Suppliers(); /** - * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.legacy.model1.Company#getCustomers Customers}'. - * + * Returns the meta object for the containment reference list ' + * {@link org.eclipse.emf.cdo.tests.legacy.model1.Company#getCustomers Customers}'. * + * * @return the meta object for the containment reference list 'Customers'. * @see org.eclipse.emf.cdo.tests.legacy.model1.Company#getCustomers() * @see #getCompany() @@ -777,9 +798,10 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa EReference getCompany_PurchaseOrders(); /** - * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.legacy.model1.Company#getSalesOrders Sales Orders}'. - * + * * @return the meta object for the containment reference list 'Sales Orders'. * @see org.eclipse.emf.cdo.tests.legacy.model1.Company#getSalesOrders() * @see #getCompany() @@ -790,6 +812,7 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa /** * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model1.Supplier Supplier}'. * + * * @return the meta object for class 'Supplier'. * @see org.eclipse.emf.cdo.tests.legacy.model1.Supplier * @generated @@ -809,8 +832,9 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa EReference getSupplier_PurchaseOrders(); /** - * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model1.Supplier#isPreferred Preferred}'. - * + * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model1.Supplier#isPreferred + * Preferred}'. + * * @return the meta object for the attribute 'Preferred'. * @see org.eclipse.emf.cdo.tests.legacy.model1.Supplier#isPreferred() * @see #getSupplier() @@ -821,6 +845,7 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa /** * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model1.Customer Customer}'. * + * * @return the meta object for class 'Customer'. * @see org.eclipse.emf.cdo.tests.legacy.model1.Customer * @generated @@ -828,9 +853,10 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa EClass getCustomer(); /** - * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.tests.legacy.model1.Customer#getSalesOrders Sales Orders}'. - * + * * @return the meta object for the reference list 'Sales Orders'. * @see org.eclipse.emf.cdo.tests.legacy.model1.Customer#getSalesOrders() * @see #getCustomer() @@ -839,8 +865,9 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa EReference getCustomer_SalesOrders(); /** - * Returns the meta object for the map '{@link org.eclipse.emf.cdo.tests.legacy.model1.Customer#getOrderByProduct Order By Product}'. - * + * Returns the meta object for the map '{@link org.eclipse.emf.cdo.tests.legacy.model1.Customer#getOrderByProduct + * Order By Product}'. + * * @return the meta object for the map 'Order By Product'. * @see org.eclipse.emf.cdo.tests.legacy.model1.Customer#getOrderByProduct() * @see #getCustomer() @@ -859,9 +886,10 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa EClass getOrder(); /** - * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.legacy.model1.Order#getOrderDetails Order Details}'. - * + * * @return the meta object for the containment reference list 'Order Details'. * @see org.eclipse.emf.cdo.tests.legacy.model1.Order#getOrderDetails() * @see #getOrder() @@ -870,8 +898,9 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa EReference getOrder_OrderDetails(); /** - * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model1.OrderDetail Order Detail}'. - * + * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model1.OrderDetail + * Order Detail}'. + * * @return the meta object for class 'Order Detail'. * @see org.eclipse.emf.cdo.tests.legacy.model1.OrderDetail * @generated @@ -879,9 +908,10 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa EClass getOrderDetail(); /** - * Returns the meta object for the container reference '{@link org.eclipse.emf.cdo.tests.legacy.model1.OrderDetail#getOrder Order}'. - * + * * @return the meta object for the container reference 'Order'. * @see org.eclipse.emf.cdo.tests.legacy.model1.OrderDetail#getOrder() * @see #getOrderDetail() @@ -890,8 +920,9 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa EReference getOrderDetail_Order(); /** - * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.tests.legacy.model1.OrderDetail#getProduct Product}'. - * + * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.tests.legacy.model1.OrderDetail#getProduct + * Product}'. + * * @return the meta object for the reference 'Product'. * @see org.eclipse.emf.cdo.tests.legacy.model1.OrderDetail#getProduct() * @see #getOrderDetail() @@ -900,8 +931,9 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa EReference getOrderDetail_Product(); /** - * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model1.OrderDetail#getPrice Price}'. - * + * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model1.OrderDetail#getPrice + * Price}'. + * * @return the meta object for the attribute 'Price'. * @see org.eclipse.emf.cdo.tests.legacy.model1.OrderDetail#getPrice() * @see #getOrderDetail() @@ -910,8 +942,9 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa EAttribute getOrderDetail_Price(); /** - * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model1.PurchaseOrder Purchase Order}'. - * + * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model1.PurchaseOrder + * Purchase Order}'. + * * @return the meta object for class 'Purchase Order'. * @see org.eclipse.emf.cdo.tests.legacy.model1.PurchaseOrder * @generated @@ -919,8 +952,9 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa EClass getPurchaseOrder(); /** - * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model1.PurchaseOrder#getDate Date}'. - * + * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model1.PurchaseOrder#getDate + * Date}'. + * * @return the meta object for the attribute 'Date'. * @see org.eclipse.emf.cdo.tests.legacy.model1.PurchaseOrder#getDate() * @see #getPurchaseOrder() @@ -929,9 +963,10 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa EAttribute getPurchaseOrder_Date(); /** - * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.tests.legacy.model1.PurchaseOrder#getSupplier Supplier}'. - * + * * @return the meta object for the reference 'Supplier'. * @see org.eclipse.emf.cdo.tests.legacy.model1.PurchaseOrder#getSupplier() * @see #getPurchaseOrder() @@ -940,8 +975,9 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa EReference getPurchaseOrder_Supplier(); /** - * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model1.SalesOrder Sales Order}'. - * + * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model1.SalesOrder Sales Order} + * '. + * * @return the meta object for class 'Sales Order'. * @see org.eclipse.emf.cdo.tests.legacy.model1.SalesOrder * @generated @@ -949,8 +985,9 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa EClass getSalesOrder(); /** - * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model1.SalesOrder#getId Id}'. - * + * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model1.SalesOrder#getId + * Id}'. + * * @return the meta object for the attribute 'Id'. * @see org.eclipse.emf.cdo.tests.legacy.model1.SalesOrder#getId() * @see #getSalesOrder() @@ -959,8 +996,9 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa EAttribute getSalesOrder_Id(); /** - * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.tests.legacy.model1.SalesOrder#getCustomer Customer}'. - * + * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.tests.legacy.model1.SalesOrder#getCustomer + * Customer}'. + * * @return the meta object for the reference 'Customer'. * @see org.eclipse.emf.cdo.tests.legacy.model1.SalesOrder#getCustomer() * @see #getSalesOrder() @@ -971,6 +1009,7 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa /** * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model1.Category Category}'. * + * * @return the meta object for class 'Category'. * @see org.eclipse.emf.cdo.tests.legacy.model1.Category * @generated @@ -978,8 +1017,9 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa EClass getCategory(); /** - * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model1.Category#getName Name}'. - * + * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model1.Category#getName + * Name}'. + * * @return the meta object for the attribute 'Name'. * @see org.eclipse.emf.cdo.tests.legacy.model1.Category#getName() * @see #getCategory() @@ -988,9 +1028,10 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa EAttribute getCategory_Name(); /** - * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.legacy.model1.Category#getCategories Categories}'. - * + * * @return the meta object for the containment reference list 'Categories'. * @see org.eclipse.emf.cdo.tests.legacy.model1.Category#getCategories() * @see #getCategory() @@ -999,9 +1040,10 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa EReference getCategory_Categories(); /** - * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.legacy.model1.Category#getProducts Products}'. - * + * Returns the meta object for the containment reference list ' + * {@link org.eclipse.emf.cdo.tests.legacy.model1.Category#getProducts Products}'. * + * * @return the meta object for the containment reference list 'Products'. * @see org.eclipse.emf.cdo.tests.legacy.model1.Category#getProducts() * @see #getCategory() @@ -1012,6 +1054,7 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa /** * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model1.Product1 Product1}'. * + * * @return the meta object for class 'Product1'. * @see org.eclipse.emf.cdo.tests.legacy.model1.Product1 * @generated @@ -1019,8 +1062,9 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa EClass getProduct1(); /** - * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model1.Product1#getName Name}'. - * + * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model1.Product1#getName + * Name}'. + * * @return the meta object for the attribute 'Name'. * @see org.eclipse.emf.cdo.tests.legacy.model1.Product1#getName() * @see #getProduct1() @@ -1041,8 +1085,9 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa EReference getProduct1_OrderDetails(); /** - * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model1.Product1#getVat Vat}'. - * + * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model1.Product1#getVat + * Vat}'. + * * @return the meta object for the attribute 'Vat'. * @see org.eclipse.emf.cdo.tests.legacy.model1.Product1#getVat() * @see #getProduct1() @@ -1051,8 +1096,9 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa EAttribute getProduct1_Vat(); /** - * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model1.Product1#getDescription Description}'. - * + * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model1.Product1#getDescription + * Description}'. + * * @return the meta object for the attribute 'Description'. * @see org.eclipse.emf.cdo.tests.legacy.model1.Product1#getDescription() * @see #getProduct1() @@ -1061,8 +1107,9 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa EAttribute getProduct1_Description(); /** - * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model1.OrderAddress Order Address}'. - * + * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model1.OrderAddress + * Order Address}'. + * * @return the meta object for class 'Order Address'. * @see org.eclipse.emf.cdo.tests.legacy.model1.OrderAddress * @generated @@ -1082,9 +1129,9 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa EAttribute getOrderAddress_TestAttribute(); /** - * Returns the meta object for class '{@link java.util.Map.Entry Product To Order}'. - * + * Returns the meta object for class '{@link java.util.Map.Entry Product To Order}'. * + * * @return the meta object for class 'Product To Order'. * @see java.util.Map.Entry * @model keyType="org.eclipse.emf.cdo.tests.legacy.model1.Product1" @@ -1094,9 +1141,9 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa EClass getProductToOrder(); /** - * Returns the meta object for the reference '{@link java.util.Map.Entry Key}'. - * + * * @return the meta object for the reference 'Key'. * @see java.util.Map.Entry * @see #getProductToOrder() @@ -1105,9 +1152,9 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa EReference getProductToOrder_Key(); /** - * Returns the meta object for the reference '{@link java.util.Map.Entry Value}'. - * + * Returns the meta object for the reference '{@link java.util.Map.Entry Value}'. * + * * @return the meta object for the reference 'Value'. * @see java.util.Map.Entry * @see #getProductToOrder() @@ -1126,384 +1173,11 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa EEnum getVAT(); /** - * Returns the factory that creates the instances of the model. - * + * Returns the factory that creates the instances of the model. + * * @return the factory that creates the instances of the model. * @generated */ Model1Factory getModel1Factory(); - /** - * 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.emf.cdo.tests.legacy.model1.impl.AddressImpl Address}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.AddressImpl - * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.Model1PackageImpl#getAddress() - * @generated - */ - EClass ADDRESS = eINSTANCE.getAddress(); - - /** - * The meta object literal for the 'Name' attribute feature. - * - * @generated - */ - EAttribute ADDRESS__NAME = eINSTANCE.getAddress_Name(); - - /** - * The meta object literal for the 'Street' attribute feature. - * - * @generated - */ - EAttribute ADDRESS__STREET = eINSTANCE.getAddress_Street(); - - /** - * The meta object literal for the 'City' attribute feature. - * - * @generated - */ - EAttribute ADDRESS__CITY = eINSTANCE.getAddress_City(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.CompanyImpl Company}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.CompanyImpl - * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.Model1PackageImpl#getCompany() - * @generated - */ - EClass COMPANY = eINSTANCE.getCompany(); - - /** - * The meta object literal for the 'Categories' containment reference list feature. - * - * @generated - */ - EReference COMPANY__CATEGORIES = eINSTANCE.getCompany_Categories(); - - /** - * The meta object literal for the 'Suppliers' containment reference list feature. - * - * @generated - */ - EReference COMPANY__SUPPLIERS = eINSTANCE.getCompany_Suppliers(); - - /** - * The meta object literal for the 'Customers' containment reference list feature. - * - * @generated - */ - EReference COMPANY__CUSTOMERS = eINSTANCE.getCompany_Customers(); - - /** - * The meta object literal for the 'Purchase Orders' containment reference list feature. - * - * @generated - */ - EReference COMPANY__PURCHASE_ORDERS = eINSTANCE.getCompany_PurchaseOrders(); - - /** - * The meta object literal for the 'Sales Orders' containment reference list feature. - * - * @generated - */ - EReference COMPANY__SALES_ORDERS = eINSTANCE.getCompany_SalesOrders(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.SupplierImpl Supplier}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.SupplierImpl - * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.Model1PackageImpl#getSupplier() - * @generated - */ - EClass SUPPLIER = eINSTANCE.getSupplier(); - - /** - * The meta object literal for the 'Purchase Orders' reference list feature. - * - * - * @generated - */ - EReference SUPPLIER__PURCHASE_ORDERS = eINSTANCE.getSupplier_PurchaseOrders(); - - /** - * The meta object literal for the 'Preferred' attribute feature. - * - * @generated - */ - EAttribute SUPPLIER__PREFERRED = eINSTANCE.getSupplier_Preferred(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.CustomerImpl Customer}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.CustomerImpl - * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.Model1PackageImpl#getCustomer() - * @generated - */ - EClass CUSTOMER = eINSTANCE.getCustomer(); - - /** - * The meta object literal for the 'Sales Orders' reference list feature. - * - * - * @generated - */ - EReference CUSTOMER__SALES_ORDERS = eINSTANCE.getCustomer_SalesOrders(); - - /** - * The meta object literal for the 'Order By Product' map feature. - * - * @generated - */ - EReference CUSTOMER__ORDER_BY_PRODUCT = eINSTANCE.getCustomer_OrderByProduct(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.OrderImpl Order}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.OrderImpl - * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.Model1PackageImpl#getOrder() - * @generated - */ - EClass ORDER = eINSTANCE.getOrder(); - - /** - * The meta object literal for the 'Order Details' containment reference list feature. - * - * @generated - */ - EReference ORDER__ORDER_DETAILS = eINSTANCE.getOrder_OrderDetails(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.OrderDetailImpl Order Detail}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.OrderDetailImpl - * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.Model1PackageImpl#getOrderDetail() - * @generated - */ - EClass ORDER_DETAIL = eINSTANCE.getOrderDetail(); - - /** - * The meta object literal for the 'Order' container reference feature. - * - * @generated - */ - EReference ORDER_DETAIL__ORDER = eINSTANCE.getOrderDetail_Order(); - - /** - * The meta object literal for the 'Product' reference feature. - * - * @generated - */ - EReference ORDER_DETAIL__PRODUCT = eINSTANCE.getOrderDetail_Product(); - - /** - * The meta object literal for the 'Price' attribute feature. - * - * @generated - */ - EAttribute ORDER_DETAIL__PRICE = eINSTANCE.getOrderDetail_Price(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.PurchaseOrderImpl Purchase Order}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.PurchaseOrderImpl - * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.Model1PackageImpl#getPurchaseOrder() - * @generated - */ - EClass PURCHASE_ORDER = eINSTANCE.getPurchaseOrder(); - - /** - * The meta object literal for the 'Date' attribute feature. - * - * @generated - */ - EAttribute PURCHASE_ORDER__DATE = eINSTANCE.getPurchaseOrder_Date(); - - /** - * The meta object literal for the 'Supplier' reference feature. - * - * @generated - */ - EReference PURCHASE_ORDER__SUPPLIER = eINSTANCE.getPurchaseOrder_Supplier(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.SalesOrderImpl Sales Order}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.SalesOrderImpl - * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.Model1PackageImpl#getSalesOrder() - * @generated - */ - EClass SALES_ORDER = eINSTANCE.getSalesOrder(); - - /** - * The meta object literal for the 'Id' attribute feature. - * - * @generated - */ - EAttribute SALES_ORDER__ID = eINSTANCE.getSalesOrder_Id(); - - /** - * The meta object literal for the 'Customer' reference feature. - * - * @generated - */ - EReference SALES_ORDER__CUSTOMER = eINSTANCE.getSalesOrder_Customer(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.CategoryImpl Category}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.CategoryImpl - * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.Model1PackageImpl#getCategory() - * @generated - */ - EClass CATEGORY = eINSTANCE.getCategory(); - - /** - * The meta object literal for the 'Name' attribute feature. - * - * @generated - */ - EAttribute CATEGORY__NAME = eINSTANCE.getCategory_Name(); - - /** - * The meta object literal for the 'Categories' containment reference list feature. - * - * @generated - */ - EReference CATEGORY__CATEGORIES = eINSTANCE.getCategory_Categories(); - - /** - * The meta object literal for the 'Products' containment reference list feature. - * - * @generated - */ - EReference CATEGORY__PRODUCTS = eINSTANCE.getCategory_Products(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.Product1Impl Product1}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.Product1Impl - * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.Model1PackageImpl#getProduct1() - * @generated - */ - EClass PRODUCT1 = eINSTANCE.getProduct1(); - - /** - * The meta object literal for the 'Name' attribute feature. - * - * @generated - */ - EAttribute PRODUCT1__NAME = eINSTANCE.getProduct1_Name(); - - /** - * The meta object literal for the 'Order Details' reference list feature. - * - * - * @generated - */ - EReference PRODUCT1__ORDER_DETAILS = eINSTANCE.getProduct1_OrderDetails(); - - /** - * The meta object literal for the 'Vat' attribute feature. - * - * @generated - */ - EAttribute PRODUCT1__VAT = eINSTANCE.getProduct1_Vat(); - - /** - * The meta object literal for the 'Description' attribute feature. - * - * @generated - */ - EAttribute PRODUCT1__DESCRIPTION = eINSTANCE.getProduct1_Description(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.OrderAddressImpl Order Address}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.OrderAddressImpl - * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.Model1PackageImpl#getOrderAddress() - * @generated - */ - EClass ORDER_ADDRESS = eINSTANCE.getOrderAddress(); - - /** - * The meta object literal for the 'Test Attribute' attribute feature. - * - * @generated - */ - EAttribute ORDER_ADDRESS__TEST_ATTRIBUTE = eINSTANCE.getOrderAddress_TestAttribute(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.ProductToOrderImpl Product To Order}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.ProductToOrderImpl - * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.Model1PackageImpl#getProductToOrder() - * @generated - */ - EClass PRODUCT_TO_ORDER = eINSTANCE.getProductToOrder(); - - /** - * The meta object literal for the 'Key' reference feature. - * - * @generated - */ - EReference PRODUCT_TO_ORDER__KEY = eINSTANCE.getProductToOrder_Key(); - - /** - * The meta object literal for the 'Value' reference feature. - * - * @generated - */ - EReference PRODUCT_TO_ORDER__VALUE = eINSTANCE.getProductToOrder_Value(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model1.VAT VAT}' enum. - * - * @see org.eclipse.emf.cdo.tests.legacy.model1.VAT - * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.Model1PackageImpl#getVAT() - * @generated - */ - EEnum VAT = eINSTANCE.getVAT(); - - } - } // Model1Package diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/AddressImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/AddressImpl.java index 02f55151fb..78a30068fd 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/AddressImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/AddressImpl.java @@ -23,18 +23,19 @@ import org.eclipse.emf.ecore.impl.EObjectImpl; *

    * The following features are implemented: *

      - *
    • {@link org.eclipse.emf.cdo.tests.legacy.model1.impl.AddressImpl#getName Name}
    • - *
    • {@link org.eclipse.emf.cdo.tests.legacy.model1.impl.AddressImpl#getStreet Street}
    • - *
    • {@link org.eclipse.emf.cdo.tests.legacy.model1.impl.AddressImpl#getCity City}
    • + *
    • {@link org.eclipse.emf.cdo.tests.legacy.model1.impl.AddressImpl#getName Name}
    • + *
    • {@link org.eclipse.emf.cdo.tests.legacy.model1.impl.AddressImpl#getStreet Street}
    • + *
    • {@link org.eclipse.emf.cdo.tests.legacy.model1.impl.AddressImpl#getCity City}
    • *
    *

    - * + * * @generated */ public class AddressImpl extends EObjectImpl implements Address { /** * + * * @generated */ public static final String copyright = "Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n Eike Stepper - initial API and implementation"; @@ -50,8 +51,8 @@ public class AddressImpl extends EObjectImpl implements Address protected static final String NAME_EDEFAULT = null; /** - * The cached value of the '{@link #getName() Name}' attribute. - * + * The cached value of the '{@link #getName() Name}' attribute. + * * @see #getName() * @generated * @ordered @@ -59,9 +60,9 @@ public class AddressImpl extends EObjectImpl implements Address protected String name = NAME_EDEFAULT; /** - * The default value of the '{@link #getStreet() Street}' attribute. - * + * * @see #getStreet() * @generated * @ordered @@ -89,8 +90,8 @@ public class AddressImpl extends EObjectImpl implements Address protected static final String CITY_EDEFAULT = null; /** - * The cached value of the '{@link #getCity() City}' attribute. - * + * The cached value of the '{@link #getCity() City}' attribute. + * * @see #getCity() * @generated * @ordered @@ -99,6 +100,7 @@ public class AddressImpl extends EObjectImpl implements Address /** * + * * @generated */ protected AddressImpl() @@ -108,16 +110,18 @@ public class AddressImpl extends EObjectImpl implements Address /** * + * * @generated */ @Override protected EClass eStaticClass() { - return Model1Package.Literals.ADDRESS; + return Model1Package.eINSTANCE.getAddress(); } /** * + * * @generated */ public String getName() @@ -127,6 +131,7 @@ public class AddressImpl extends EObjectImpl implements Address /** * + * * @generated */ public void setName(String newName) @@ -139,6 +144,7 @@ public class AddressImpl extends EObjectImpl implements Address /** * + * * @generated */ public String getStreet() @@ -148,6 +154,7 @@ public class AddressImpl extends EObjectImpl implements Address /** * + * * @generated */ public void setStreet(String newStreet) @@ -160,6 +167,7 @@ public class AddressImpl extends EObjectImpl implements Address /** * + * * @generated */ public String getCity() @@ -169,6 +177,7 @@ public class AddressImpl extends EObjectImpl implements Address /** * + * * @generated */ public void setCity(String newCity) @@ -181,6 +190,7 @@ public class AddressImpl extends EObjectImpl implements Address /** * + * * @generated */ @Override @@ -200,6 +210,7 @@ public class AddressImpl extends EObjectImpl implements Address /** * + * * @generated */ @Override @@ -222,6 +233,7 @@ public class AddressImpl extends EObjectImpl implements Address /** * + * * @generated */ @Override @@ -244,6 +256,7 @@ public class AddressImpl extends EObjectImpl implements Address /** * + * * @generated */ @Override @@ -263,6 +276,7 @@ public class AddressImpl extends EObjectImpl implements Address /** * + * * @generated */ @Override diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/CategoryImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/CategoryImpl.java index df081bdb5e..3c58112ddc 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/CategoryImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/CategoryImpl.java @@ -31,18 +31,19 @@ import java.util.Collection; *

    * The following features are implemented: *

      - *
    • {@link org.eclipse.emf.cdo.tests.legacy.model1.impl.CategoryImpl#getName Name}
    • - *
    • {@link org.eclipse.emf.cdo.tests.legacy.model1.impl.CategoryImpl#getCategories Categories}
    • - *
    • {@link org.eclipse.emf.cdo.tests.legacy.model1.impl.CategoryImpl#getProducts Products}
    • + *
    • {@link org.eclipse.emf.cdo.tests.legacy.model1.impl.CategoryImpl#getName Name}
    • + *
    • {@link org.eclipse.emf.cdo.tests.legacy.model1.impl.CategoryImpl#getCategories Categories}
    • + *
    • {@link org.eclipse.emf.cdo.tests.legacy.model1.impl.CategoryImpl#getProducts Products}
    • *
    *

    - * + * * @generated */ public class CategoryImpl extends EObjectImpl implements Category { /** * + * * @generated */ public static final String copyright = "Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n Eike Stepper - initial API and implementation"; @@ -58,8 +59,8 @@ public class CategoryImpl extends EObjectImpl implements Category protected static final String NAME_EDEFAULT = null; /** - * The cached value of the '{@link #getName() Name}' attribute. - * + * The cached value of the '{@link #getName() Name}' attribute. + * * @see #getName() * @generated * @ordered @@ -77,9 +78,9 @@ public class CategoryImpl extends EObjectImpl implements Category protected EList categories; /** - * The cached value of the '{@link #getProducts() Products}' containment reference list. - * + * * @see #getProducts() * @generated * @ordered @@ -88,6 +89,7 @@ public class CategoryImpl extends EObjectImpl implements Category /** * + * * @generated */ protected CategoryImpl() @@ -97,16 +99,18 @@ public class CategoryImpl extends EObjectImpl implements Category /** * + * * @generated */ @Override protected EClass eStaticClass() { - return Model1Package.Literals.CATEGORY; + return Model1Package.eINSTANCE.getCategory(); } /** * + * * @generated */ public String getName() @@ -116,6 +120,7 @@ public class CategoryImpl extends EObjectImpl implements Category /** * + * * @generated */ public void setName(String newName) @@ -128,6 +133,7 @@ public class CategoryImpl extends EObjectImpl implements Category /** * + * * @generated */ public EList getCategories() @@ -141,6 +147,7 @@ public class CategoryImpl extends EObjectImpl implements Category /** * + * * @generated */ public EList getProducts() @@ -154,6 +161,7 @@ public class CategoryImpl extends EObjectImpl implements Category /** * + * * @generated */ @Override @@ -171,6 +179,7 @@ public class CategoryImpl extends EObjectImpl implements Category /** * + * * @generated */ @Override @@ -190,6 +199,7 @@ public class CategoryImpl extends EObjectImpl implements Category /** * + * * @generated */ @SuppressWarnings("unchecked") @@ -215,6 +225,7 @@ public class CategoryImpl extends EObjectImpl implements Category /** * + * * @generated */ @Override @@ -237,6 +248,7 @@ public class CategoryImpl extends EObjectImpl implements Category /** * + * * @generated */ @Override @@ -256,6 +268,7 @@ public class CategoryImpl extends EObjectImpl implements Category /** * + * * @generated */ @Override diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/CompanyImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/CompanyImpl.java index 4c1733a592..396d02aabe 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/CompanyImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/CompanyImpl.java @@ -32,20 +32,21 @@ import java.util.Collection; *

    * The following features are implemented: *

      - *
    • {@link org.eclipse.emf.cdo.tests.legacy.model1.impl.CompanyImpl#getCategories Categories}
    • - *
    • {@link org.eclipse.emf.cdo.tests.legacy.model1.impl.CompanyImpl#getSuppliers Suppliers}
    • - *
    • {@link org.eclipse.emf.cdo.tests.legacy.model1.impl.CompanyImpl#getCustomers Customers}
    • - *
    • {@link org.eclipse.emf.cdo.tests.legacy.model1.impl.CompanyImpl#getPurchaseOrders Purchase Orders}
    • - *
    • {@link org.eclipse.emf.cdo.tests.legacy.model1.impl.CompanyImpl#getSalesOrders Sales Orders}
    • + *
    • {@link org.eclipse.emf.cdo.tests.legacy.model1.impl.CompanyImpl#getCategories Categories}
    • + *
    • {@link org.eclipse.emf.cdo.tests.legacy.model1.impl.CompanyImpl#getSuppliers Suppliers}
    • + *
    • {@link org.eclipse.emf.cdo.tests.legacy.model1.impl.CompanyImpl#getCustomers Customers}
    • + *
    • {@link org.eclipse.emf.cdo.tests.legacy.model1.impl.CompanyImpl#getPurchaseOrders Purchase Orders}
    • + *
    • {@link org.eclipse.emf.cdo.tests.legacy.model1.impl.CompanyImpl#getSalesOrders Sales Orders}
    • *
    *

    - * + * * @generated */ public class CompanyImpl extends AddressImpl implements Company { /** * + * * @generated */ public static final String copyright = "Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n Eike Stepper - initial API and implementation"; @@ -102,6 +103,7 @@ public class CompanyImpl extends AddressImpl implements Company /** * + * * @generated */ protected CompanyImpl() @@ -111,16 +113,18 @@ public class CompanyImpl extends AddressImpl implements Company /** * + * * @generated */ @Override protected EClass eStaticClass() { - return Model1Package.Literals.COMPANY; + return Model1Package.eINSTANCE.getCompany(); } /** * + * * @generated */ public EList getCategories() @@ -134,6 +138,7 @@ public class CompanyImpl extends AddressImpl implements Company /** * + * * @generated */ public EList getSuppliers() @@ -147,6 +152,7 @@ public class CompanyImpl extends AddressImpl implements Company /** * + * * @generated */ public EList getCustomers() @@ -160,6 +166,7 @@ public class CompanyImpl extends AddressImpl implements Company /** * + * * @generated */ public EList getPurchaseOrders() @@ -174,6 +181,7 @@ public class CompanyImpl extends AddressImpl implements Company /** * + * * @generated */ public EList getSalesOrders() @@ -187,6 +195,7 @@ public class CompanyImpl extends AddressImpl implements Company /** * + * * @generated */ @Override @@ -210,6 +219,7 @@ public class CompanyImpl extends AddressImpl implements Company /** * + * * @generated */ @Override @@ -233,6 +243,7 @@ public class CompanyImpl extends AddressImpl implements Company /** * + * * @generated */ @SuppressWarnings("unchecked") @@ -267,6 +278,7 @@ public class CompanyImpl extends AddressImpl implements Company /** * + * * @generated */ @Override @@ -295,6 +307,7 @@ public class CompanyImpl extends AddressImpl implements Company /** * + * * @generated */ @Override diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/CustomerImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/CustomerImpl.java index f5645eb4b6..be8e32f678 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/CustomerImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/CustomerImpl.java @@ -32,25 +32,26 @@ import java.util.Collection; *

    * The following features are implemented: *

      - *
    • {@link org.eclipse.emf.cdo.tests.legacy.model1.impl.CustomerImpl#getSalesOrders Sales Orders}
    • - *
    • {@link org.eclipse.emf.cdo.tests.legacy.model1.impl.CustomerImpl#getOrderByProduct Order By Product}
    • + *
    • {@link org.eclipse.emf.cdo.tests.legacy.model1.impl.CustomerImpl#getSalesOrders Sales Orders}
    • + *
    • {@link org.eclipse.emf.cdo.tests.legacy.model1.impl.CustomerImpl#getOrderByProduct Order By Product}
    • *
    *

    - * + * * @generated */ public class CustomerImpl extends AddressImpl implements Customer { /** * + * * @generated */ public static final String copyright = "Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n Eike Stepper - initial API and implementation"; /** - * The cached value of the '{@link #getSalesOrders() Sales Orders}' reference list. - * + * The cached value of the '{@link #getSalesOrders() Sales Orders}' reference list. * + * * @see #getSalesOrders() * @generated * @ordered @@ -58,9 +59,9 @@ public class CustomerImpl extends AddressImpl implements Customer protected EList salesOrders; /** - * The cached value of the '{@link #getOrderByProduct() Order By Product}' map. - * + * * @see #getOrderByProduct() * @generated * @ordered @@ -69,6 +70,7 @@ public class CustomerImpl extends AddressImpl implements Customer /** * + * * @generated */ protected CustomerImpl() @@ -78,16 +80,18 @@ public class CustomerImpl extends AddressImpl implements Customer /** * + * * @generated */ @Override protected EClass eStaticClass() { - return Model1Package.Literals.CUSTOMER; + return Model1Package.eINSTANCE.getCustomer(); } /** * + * * @generated */ public EList getSalesOrders() @@ -102,13 +106,14 @@ public class CustomerImpl extends AddressImpl implements Customer /** * + * * @generated */ public EMap getOrderByProduct() { if (orderByProduct == null) { - orderByProduct = new EcoreEMap(Model1Package.Literals.PRODUCT_TO_ORDER, + orderByProduct = new EcoreEMap(Model1Package.eINSTANCE.getProductToOrder(), ProductToOrderImpl.class, this, Model1Package.CUSTOMER__ORDER_BY_PRODUCT); } return orderByProduct; @@ -116,6 +121,7 @@ public class CustomerImpl extends AddressImpl implements Customer /** * + * * @generated */ @SuppressWarnings("unchecked") @@ -132,6 +138,7 @@ public class CustomerImpl extends AddressImpl implements Customer /** * + * * @generated */ @Override @@ -149,6 +156,7 @@ public class CustomerImpl extends AddressImpl implements Customer /** * + * * @generated */ @Override @@ -169,6 +177,7 @@ public class CustomerImpl extends AddressImpl implements Customer /** * + * * @generated */ @SuppressWarnings("unchecked") @@ -190,6 +199,7 @@ public class CustomerImpl extends AddressImpl implements Customer /** * + * * @generated */ @Override @@ -209,6 +219,7 @@ public class CustomerImpl extends AddressImpl implements Customer /** * + * * @generated */ @Override diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/Model1FactoryImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/Model1FactoryImpl.java index 354ae8b56b..91756b7533 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/Model1FactoryImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/Model1FactoryImpl.java @@ -35,12 +35,14 @@ import java.util.Map; /** * An implementation of the model Factory. + * * @generated */ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory { /** * + * * @generated */ public static final String copyright = "Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n Eike Stepper - initial API and implementation"; @@ -69,8 +71,8 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory } /** - * Creates an instance of the factory. - * + * Creates an instance of the factory. + * * @generated */ public Model1FactoryImpl() @@ -80,6 +82,7 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory /** * + * * @generated */ @Override @@ -116,6 +119,7 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory /** * + * * @generated */ @Override @@ -132,6 +136,7 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory /** * + * * @generated */ @Override @@ -148,6 +153,7 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory /** * + * * @generated */ public Address createAddress() @@ -158,6 +164,7 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory /** * + * * @generated */ public Company createCompany() @@ -168,6 +175,7 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory /** * + * * @generated */ public Supplier createSupplier() @@ -178,6 +186,7 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory /** * + * * @generated */ public Customer createCustomer() @@ -188,6 +197,7 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory /** * + * * @generated */ public OrderDetail createOrderDetail() @@ -198,6 +208,7 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory /** * + * * @generated */ public PurchaseOrder createPurchaseOrder() @@ -208,6 +219,7 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory /** * + * * @generated */ public SalesOrder createSalesOrder() @@ -218,6 +230,7 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory /** * + * * @generated */ public Category createCategory() @@ -228,6 +241,7 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory /** * + * * @generated */ public Product1 createProduct1() @@ -238,6 +252,7 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory /** * + * * @generated */ public OrderAddress createOrderAddress() @@ -248,6 +263,7 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory /** * + * * @generated */ public Map.Entry createProductToOrder() @@ -258,6 +274,7 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory /** * + * * @generated */ public VAT createVATFromString(EDataType eDataType, String initialValue) @@ -271,6 +288,7 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory /** * + * * @generated */ public String convertVATToString(EDataType eDataType, Object instanceValue) @@ -280,6 +298,7 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory /** * + * * @generated */ public Model1Package getModel1Package() @@ -289,6 +308,7 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory /** * + * * @deprecated * @generated */ diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/Model1PackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/Model1PackageImpl.java index 61663387d7..21b93909b9 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/Model1PackageImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/Model1PackageImpl.java @@ -35,90 +35,105 @@ import java.util.Map; /** * An implementation of the model Package. + * * @generated */ public class Model1PackageImpl extends EPackageImpl implements Model1Package { /** * + * * @generated */ public static final String copyright = "Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n Eike Stepper - initial API and implementation"; /** * + * * @generated */ private EClass addressEClass = null; /** * + * * @generated */ private EClass companyEClass = null; /** * + * * @generated */ private EClass supplierEClass = null; /** * + * * @generated */ private EClass customerEClass = null; /** * + * * @generated */ private EClass orderEClass = null; /** * + * * @generated */ private EClass orderDetailEClass = null; /** * + * * @generated */ private EClass purchaseOrderEClass = null; /** * + * * @generated */ private EClass salesOrderEClass = null; /** * + * * @generated */ private EClass categoryEClass = null; /** * + * * @generated */ private EClass product1EClass = null; /** * + * * @generated */ private EClass orderAddressEClass = null; /** * + * * @generated */ private EClass productToOrderEClass = null; /** * + * * @generated */ private EEnum vatEEnum = null; @@ -143,6 +158,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * + * * @generated */ private static boolean isInited = false; @@ -188,6 +204,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * + * * @generated */ public EClass getAddress() @@ -197,6 +214,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * + * * @generated */ public EAttribute getAddress_Name() @@ -206,6 +224,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * + * * @generated */ public EAttribute getAddress_Street() @@ -215,6 +234,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * + * * @generated */ public EAttribute getAddress_City() @@ -224,6 +244,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * + * * @generated */ public EClass getCompany() @@ -233,6 +254,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * + * * @generated */ public EReference getCompany_Categories() @@ -242,6 +264,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * + * * @generated */ public EReference getCompany_Suppliers() @@ -251,6 +274,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * + * * @generated */ public EReference getCompany_Customers() @@ -260,6 +284,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * + * * @generated */ public EReference getCompany_PurchaseOrders() @@ -269,6 +294,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * + * * @generated */ public EReference getCompany_SalesOrders() @@ -278,6 +304,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * + * * @generated */ public EClass getSupplier() @@ -287,6 +314,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * + * * @generated */ public EReference getSupplier_PurchaseOrders() @@ -296,6 +324,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * + * * @generated */ public EAttribute getSupplier_Preferred() @@ -305,6 +334,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * + * * @generated */ public EClass getCustomer() @@ -314,6 +344,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * + * * @generated */ public EReference getCustomer_SalesOrders() @@ -323,6 +354,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * + * * @generated */ public EReference getCustomer_OrderByProduct() @@ -332,6 +364,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * + * * @generated */ public EClass getOrder() @@ -341,6 +374,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * + * * @generated */ public EReference getOrder_OrderDetails() @@ -350,6 +384,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * + * * @generated */ public EClass getOrderDetail() @@ -359,6 +394,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * + * * @generated */ public EReference getOrderDetail_Order() @@ -368,6 +404,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * + * * @generated */ public EReference getOrderDetail_Product() @@ -377,6 +414,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * + * * @generated */ public EAttribute getOrderDetail_Price() @@ -386,6 +424,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * + * * @generated */ public EClass getPurchaseOrder() @@ -395,6 +434,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * + * * @generated */ public EAttribute getPurchaseOrder_Date() @@ -404,6 +444,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * + * * @generated */ public EReference getPurchaseOrder_Supplier() @@ -413,6 +454,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * + * * @generated */ public EClass getSalesOrder() @@ -422,6 +464,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * + * * @generated */ public EAttribute getSalesOrder_Id() @@ -431,6 +474,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * + * * @generated */ public EReference getSalesOrder_Customer() @@ -440,6 +484,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * + * * @generated */ public EClass getCategory() @@ -449,6 +494,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * + * * @generated */ public EAttribute getCategory_Name() @@ -458,6 +504,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * + * * @generated */ public EReference getCategory_Categories() @@ -467,6 +514,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * + * * @generated */ public EReference getCategory_Products() @@ -476,6 +524,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * + * * @generated */ public EClass getProduct1() @@ -485,6 +534,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * + * * @generated */ public EAttribute getProduct1_Name() @@ -494,6 +544,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * + * * @generated */ public EReference getProduct1_OrderDetails() @@ -503,6 +554,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * + * * @generated */ public EAttribute getProduct1_Vat() @@ -512,6 +564,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * + * * @generated */ public EAttribute getProduct1_Description() @@ -521,6 +574,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * + * * @generated */ public EClass getOrderAddress() @@ -530,6 +584,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * + * * @generated */ public EAttribute getOrderAddress_TestAttribute() @@ -539,6 +594,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * + * * @generated */ public EClass getProductToOrder() @@ -548,6 +604,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * + * * @generated */ public EReference getProductToOrder_Key() @@ -557,6 +614,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * + * * @generated */ public EReference getProductToOrder_Value() @@ -566,6 +624,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * + * * @generated */ public EEnum getVAT() @@ -575,6 +634,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * + * * @generated */ public Model1Factory getModel1Factory() @@ -584,20 +644,23 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * + * * @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. - * + * 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 @@ -661,20 +724,23 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * + * * @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. - * + * 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 @@ -687,14 +753,14 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package // Set bounds for type parameters // Add supertypes to classes - companyEClass.getESuperTypes().add(this.getAddress()); - supplierEClass.getESuperTypes().add(this.getAddress()); - customerEClass.getESuperTypes().add(this.getAddress()); - purchaseOrderEClass.getESuperTypes().add(this.getOrder()); - salesOrderEClass.getESuperTypes().add(this.getOrder()); - orderAddressEClass.getESuperTypes().add(this.getAddress()); - orderAddressEClass.getESuperTypes().add(this.getOrder()); - orderAddressEClass.getESuperTypes().add(this.getOrderDetail()); + companyEClass.getESuperTypes().add(getAddress()); + supplierEClass.getESuperTypes().add(getAddress()); + customerEClass.getESuperTypes().add(getAddress()); + purchaseOrderEClass.getESuperTypes().add(getOrder()); + salesOrderEClass.getESuperTypes().add(getOrder()); + orderAddressEClass.getESuperTypes().add(getAddress()); + orderAddressEClass.getESuperTypes().add(getOrder()); + orderAddressEClass.getESuperTypes().add(getOrderDetail()); // Initialize classes and features; add operations and parameters initEClass(addressEClass, Address.class, "Address", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); @@ -706,49 +772,49 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(companyEClass, Company.class, "Company", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getCompany_Categories(), this.getCategory(), null, "categories", null, 0, -1, Company.class, + initEReference(getCompany_Categories(), getCategory(), null, "categories", null, 0, -1, Company.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getCompany_Suppliers(), this.getSupplier(), null, "suppliers", null, 0, -1, Company.class, - !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, - !IS_DERIVED, IS_ORDERED); - initEReference(getCompany_Customers(), this.getCustomer(), null, "customers", null, 0, -1, Company.class, + initEReference(getCompany_Suppliers(), getSupplier(), null, "suppliers", null, 0, -1, Company.class, !IS_TRANSIENT, + !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, + IS_ORDERED); + initEReference(getCompany_Customers(), getCustomer(), null, "customers", null, 0, -1, Company.class, !IS_TRANSIENT, + !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, + IS_ORDERED); + initEReference(getCompany_PurchaseOrders(), getPurchaseOrder(), null, "purchaseOrders", null, 0, -1, Company.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getCompany_PurchaseOrders(), this.getPurchaseOrder(), null, "purchaseOrders", null, 0, -1, - Company.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, - IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getCompany_SalesOrders(), this.getSalesOrder(), null, "salesOrders", null, 0, -1, Company.class, + initEReference(getCompany_SalesOrders(), getSalesOrder(), null, "salesOrders", null, 0, -1, Company.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(supplierEClass, Supplier.class, "Supplier", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getSupplier_PurchaseOrders(), this.getPurchaseOrder(), this.getPurchaseOrder_Supplier(), - "purchaseOrders", null, 0, -1, Supplier.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, - IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getSupplier_PurchaseOrders(), getPurchaseOrder(), getPurchaseOrder_Supplier(), "purchaseOrders", + null, 0, -1, Supplier.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, + !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getSupplier_Preferred(), ecorePackage.getEBoolean(), "preferred", "true", 0, 1, Supplier.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(customerEClass, Customer.class, "Customer", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getCustomer_SalesOrders(), this.getSalesOrder(), this.getSalesOrder_Customer(), "salesOrders", null, - 0, -1, Customer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, - !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getCustomer_OrderByProduct(), this.getProductToOrder(), null, "orderByProduct", null, 0, -1, + initEReference(getCustomer_SalesOrders(), getSalesOrder(), getSalesOrder_Customer(), "salesOrders", null, 0, -1, + Customer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, + IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getCustomer_OrderByProduct(), getProductToOrder(), null, "orderByProduct", null, 0, -1, Customer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(orderEClass, Order.class, "Order", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getOrder_OrderDetails(), this.getOrderDetail(), this.getOrderDetail_Order(), "orderDetails", null, - 0, -1, Order.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, - !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getOrder_OrderDetails(), getOrderDetail(), getOrderDetail_Order(), "orderDetails", null, 0, -1, + Order.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, + IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(orderDetailEClass, OrderDetail.class, "OrderDetail", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getOrderDetail_Order(), this.getOrder(), this.getOrder_OrderDetails(), "order", null, 1, 1, - OrderDetail.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, - !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getOrderDetail_Product(), this.getProduct1(), this.getProduct1_OrderDetails(), "product", null, 0, - 1, OrderDetail.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, + initEReference(getOrderDetail_Order(), getOrder(), getOrder_OrderDetails(), "order", null, 1, 1, OrderDetail.class, + !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, + !IS_DERIVED, IS_ORDERED); + initEReference(getOrderDetail_Product(), getProduct1(), getProduct1_OrderDetails(), "product", null, 0, 1, + OrderDetail.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getOrderDetail_Price(), ecorePackage.getEFloat(), "price", null, 0, 1, OrderDetail.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); @@ -757,35 +823,35 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package IS_GENERATED_INSTANCE_CLASS); initEAttribute(getPurchaseOrder_Date(), ecorePackage.getEDate(), "date", null, 0, 1, PurchaseOrder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getPurchaseOrder_Supplier(), this.getSupplier(), this.getSupplier_PurchaseOrders(), "supplier", - null, 1, 1, PurchaseOrder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, + initEReference(getPurchaseOrder_Supplier(), getSupplier(), getSupplier_PurchaseOrders(), "supplier", null, 1, 1, + PurchaseOrder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(salesOrderEClass, SalesOrder.class, "SalesOrder", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getSalesOrder_Id(), ecorePackage.getEInt(), "id", null, 0, 1, SalesOrder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getSalesOrder_Customer(), this.getCustomer(), this.getCustomer_SalesOrders(), "customer", null, 1, - 1, SalesOrder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, + initEReference(getSalesOrder_Customer(), getCustomer(), getCustomer_SalesOrders(), "customer", null, 1, 1, + SalesOrder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(categoryEClass, Category.class, "Category", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getCategory_Name(), ecorePackage.getEString(), "name", null, 0, 1, Category.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getCategory_Categories(), this.getCategory(), null, "categories", null, 0, -1, Category.class, - !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, - !IS_DERIVED, IS_ORDERED); - initEReference(getCategory_Products(), this.getProduct1(), null, "products", null, 0, -1, Category.class, + initEReference(getCategory_Categories(), getCategory(), null, "categories", null, 0, -1, Category.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getCategory_Products(), getProduct1(), null, "products", null, 0, -1, Category.class, !IS_TRANSIENT, + !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, + IS_ORDERED); initEClass(product1EClass, Product1.class, "Product1", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getProduct1_Name(), ecorePackage.getEString(), "name", null, 0, 1, Product1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getProduct1_OrderDetails(), this.getOrderDetail(), this.getOrderDetail_Product(), "orderDetails", - null, 0, -1, Product1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, - !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getProduct1_Vat(), this.getVAT(), "vat", "vat15", 0, 1, Product1.class, !IS_TRANSIENT, !IS_VOLATILE, + initEReference(getProduct1_OrderDetails(), getOrderDetail(), getOrderDetail_Product(), "orderDetails", null, 0, -1, + Product1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, + IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getProduct1_Vat(), getVAT(), "vat", "vat15", 0, 1, Product1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getProduct1_Description(), ecorePackage.getEString(), "description", null, 0, 1, Product1.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); @@ -798,10 +864,10 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package initEClass(productToOrderEClass, Map.Entry.class, "ProductToOrder", !IS_ABSTRACT, !IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS); - initEReference(getProductToOrder_Key(), this.getProduct1(), null, "key", null, 0, 1, Map.Entry.class, - !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, - !IS_DERIVED, IS_ORDERED); - initEReference(getProductToOrder_Value(), this.getSalesOrder(), null, "value", null, 0, 1, Map.Entry.class, + initEReference(getProductToOrder_Key(), getProduct1(), null, "key", null, 0, 1, Map.Entry.class, !IS_TRANSIENT, + !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, + IS_ORDERED); + initEReference(getProductToOrder_Value(), getSalesOrder(), null, "value", null, 0, 1, Map.Entry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); @@ -820,8 +886,8 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package } /** - * Initializes the annotations for teneo.jpa. - * + * Initializes the annotations for teneo.jpa. + * * @generated */ protected void createTeneoAnnotations() diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/OrderAddressImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/OrderAddressImpl.java index e7d8895e4f..b9596697ef 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/OrderAddressImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/OrderAddressImpl.java @@ -33,20 +33,21 @@ import java.util.Collection; *

    * The following features are implemented: *

      - *
    • {@link org.eclipse.emf.cdo.tests.legacy.model1.impl.OrderAddressImpl#getOrderDetails Order Details}
    • - *
    • {@link org.eclipse.emf.cdo.tests.legacy.model1.impl.OrderAddressImpl#getOrder Order}
    • - *
    • {@link org.eclipse.emf.cdo.tests.legacy.model1.impl.OrderAddressImpl#getProduct Product}
    • - *
    • {@link org.eclipse.emf.cdo.tests.legacy.model1.impl.OrderAddressImpl#getPrice Price}
    • - *
    • {@link org.eclipse.emf.cdo.tests.legacy.model1.impl.OrderAddressImpl#isTestAttribute Test Attribute}
    • + *
    • {@link org.eclipse.emf.cdo.tests.legacy.model1.impl.OrderAddressImpl#getOrderDetails Order Details}
    • + *
    • {@link org.eclipse.emf.cdo.tests.legacy.model1.impl.OrderAddressImpl#getOrder Order}
    • + *
    • {@link org.eclipse.emf.cdo.tests.legacy.model1.impl.OrderAddressImpl#getProduct Product}
    • + *
    • {@link org.eclipse.emf.cdo.tests.legacy.model1.impl.OrderAddressImpl#getPrice Price}
    • + *
    • {@link org.eclipse.emf.cdo.tests.legacy.model1.impl.OrderAddressImpl#isTestAttribute Test Attribute}
    • *
    *

    - * + * * @generated */ public class OrderAddressImpl extends AddressImpl implements OrderAddress { /** * + * * @generated */ public static final String copyright = "Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n Eike Stepper - initial API and implementation"; @@ -62,9 +63,9 @@ public class OrderAddressImpl extends AddressImpl implements OrderAddress protected EList orderDetails; /** - * The cached value of the '{@link #getProduct() Product}' reference. - * + * * @see #getProduct() * @generated * @ordered @@ -92,9 +93,9 @@ public class OrderAddressImpl extends AddressImpl implements OrderAddress protected float price = PRICE_EDEFAULT; /** - * The default value of the '{@link #isTestAttribute() Test Attribute}' attribute. - * + * The default value of the '{@link #isTestAttribute() Test Attribute}' attribute. * + * * @see #isTestAttribute() * @generated * @ordered @@ -102,9 +103,9 @@ public class OrderAddressImpl extends AddressImpl implements OrderAddress protected static final boolean TEST_ATTRIBUTE_EDEFAULT = false; /** - * The cached value of the '{@link #isTestAttribute() Test Attribute}' attribute. - * + * The cached value of the '{@link #isTestAttribute() Test Attribute}' attribute. * + * * @see #isTestAttribute() * @generated * @ordered @@ -113,6 +114,7 @@ public class OrderAddressImpl extends AddressImpl implements OrderAddress /** * + * * @generated */ protected OrderAddressImpl() @@ -122,16 +124,18 @@ public class OrderAddressImpl extends AddressImpl implements OrderAddress /** * + * * @generated */ @Override protected EClass eStaticClass() { - return Model1Package.Literals.ORDER_ADDRESS; + return Model1Package.eINSTANCE.getOrderAddress(); } /** * + * * @generated */ public EList getOrderDetails() @@ -146,6 +150,7 @@ public class OrderAddressImpl extends AddressImpl implements OrderAddress /** * + * * @generated */ public Order getOrder() @@ -157,6 +162,7 @@ public class OrderAddressImpl extends AddressImpl implements OrderAddress /** * + * * @generated */ public NotificationChain basicSetOrder(Order newOrder, NotificationChain msgs) @@ -167,6 +173,7 @@ public class OrderAddressImpl extends AddressImpl implements OrderAddress /** * + * * @generated */ public void setOrder(Order newOrder) @@ -191,6 +198,7 @@ public class OrderAddressImpl extends AddressImpl implements OrderAddress /** * + * * @generated */ public Product1 getProduct() @@ -211,6 +219,7 @@ public class OrderAddressImpl extends AddressImpl implements OrderAddress /** * + * * @generated */ public Product1 basicGetProduct() @@ -220,6 +229,7 @@ public class OrderAddressImpl extends AddressImpl implements OrderAddress /** * + * * @generated */ public NotificationChain basicSetProduct(Product1 newProduct, NotificationChain msgs) @@ -240,6 +250,7 @@ public class OrderAddressImpl extends AddressImpl implements OrderAddress /** * + * * @generated */ public void setProduct(Product1 newProduct) @@ -264,6 +275,7 @@ public class OrderAddressImpl extends AddressImpl implements OrderAddress /** * + * * @generated */ public float getPrice() @@ -273,6 +285,7 @@ public class OrderAddressImpl extends AddressImpl implements OrderAddress /** * + * * @generated */ public void setPrice(float newPrice) @@ -285,6 +298,7 @@ public class OrderAddressImpl extends AddressImpl implements OrderAddress /** * + * * @generated */ public boolean isTestAttribute() @@ -294,6 +308,7 @@ public class OrderAddressImpl extends AddressImpl implements OrderAddress /** * + * * @generated */ public void setTestAttribute(boolean newTestAttribute) @@ -307,6 +322,7 @@ public class OrderAddressImpl extends AddressImpl implements OrderAddress /** * + * * @generated */ @SuppressWarnings("unchecked") @@ -332,6 +348,7 @@ public class OrderAddressImpl extends AddressImpl implements OrderAddress /** * + * * @generated */ @Override @@ -351,6 +368,7 @@ public class OrderAddressImpl extends AddressImpl implements OrderAddress /** * + * * @generated */ @Override @@ -366,6 +384,7 @@ public class OrderAddressImpl extends AddressImpl implements OrderAddress /** * + * * @generated */ @Override @@ -391,6 +410,7 @@ public class OrderAddressImpl extends AddressImpl implements OrderAddress /** * + * * @generated */ @SuppressWarnings("unchecked") @@ -421,6 +441,7 @@ public class OrderAddressImpl extends AddressImpl implements OrderAddress /** * + * * @generated */ @Override @@ -449,6 +470,7 @@ public class OrderAddressImpl extends AddressImpl implements OrderAddress /** * + * * @generated */ @Override @@ -472,6 +494,7 @@ public class OrderAddressImpl extends AddressImpl implements OrderAddress /** * + * * @generated */ @Override @@ -506,6 +529,7 @@ public class OrderAddressImpl extends AddressImpl implements OrderAddress /** * + * * @generated */ @Override @@ -540,6 +564,7 @@ public class OrderAddressImpl extends AddressImpl implements OrderAddress /** * + * * @generated */ @Override diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/OrderDetailImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/OrderDetailImpl.java index 996415d728..d748f742bc 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/OrderDetailImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/OrderDetailImpl.java @@ -28,26 +28,27 @@ import org.eclipse.emf.ecore.util.EcoreUtil; *

    * The following features are implemented: *

      - *
    • {@link org.eclipse.emf.cdo.tests.legacy.model1.impl.OrderDetailImpl#getOrder Order}
    • - *
    • {@link org.eclipse.emf.cdo.tests.legacy.model1.impl.OrderDetailImpl#getProduct Product}
    • - *
    • {@link org.eclipse.emf.cdo.tests.legacy.model1.impl.OrderDetailImpl#getPrice Price}
    • + *
    • {@link org.eclipse.emf.cdo.tests.legacy.model1.impl.OrderDetailImpl#getOrder Order}
    • + *
    • {@link org.eclipse.emf.cdo.tests.legacy.model1.impl.OrderDetailImpl#getProduct Product}
    • + *
    • {@link org.eclipse.emf.cdo.tests.legacy.model1.impl.OrderDetailImpl#getPrice Price}
    • *
    *

    - * + * * @generated */ public class OrderDetailImpl extends EObjectImpl implements OrderDetail { /** * + * * @generated */ public static final String copyright = "Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n Eike Stepper - initial API and implementation"; /** - * The cached value of the '{@link #getProduct() Product}' reference. - * + * * @see #getProduct() * @generated * @ordered @@ -76,6 +77,7 @@ public class OrderDetailImpl extends EObjectImpl implements OrderDetail /** * + * * @generated */ protected OrderDetailImpl() @@ -85,16 +87,18 @@ public class OrderDetailImpl extends EObjectImpl implements OrderDetail /** * + * * @generated */ @Override protected EClass eStaticClass() { - return Model1Package.Literals.ORDER_DETAIL; + return Model1Package.eINSTANCE.getOrderDetail(); } /** * + * * @generated */ public Order getOrder() @@ -106,6 +110,7 @@ public class OrderDetailImpl extends EObjectImpl implements OrderDetail /** * + * * @generated */ public NotificationChain basicSetOrder(Order newOrder, NotificationChain msgs) @@ -116,6 +121,7 @@ public class OrderDetailImpl extends EObjectImpl implements OrderDetail /** * + * * @generated */ public void setOrder(Order newOrder) @@ -140,6 +146,7 @@ public class OrderDetailImpl extends EObjectImpl implements OrderDetail /** * + * * @generated */ public Product1 getProduct() @@ -160,6 +167,7 @@ public class OrderDetailImpl extends EObjectImpl implements OrderDetail /** * + * * @generated */ public Product1 basicGetProduct() @@ -169,6 +177,7 @@ public class OrderDetailImpl extends EObjectImpl implements OrderDetail /** * + * * @generated */ public NotificationChain basicSetProduct(Product1 newProduct, NotificationChain msgs) @@ -189,6 +198,7 @@ public class OrderDetailImpl extends EObjectImpl implements OrderDetail /** * + * * @generated */ public void setProduct(Product1 newProduct) @@ -212,6 +222,7 @@ public class OrderDetailImpl extends EObjectImpl implements OrderDetail /** * + * * @generated */ public float getPrice() @@ -221,6 +232,7 @@ public class OrderDetailImpl extends EObjectImpl implements OrderDetail /** * + * * @generated */ public void setPrice(float newPrice) @@ -233,6 +245,7 @@ public class OrderDetailImpl extends EObjectImpl implements OrderDetail /** * + * * @generated */ @Override @@ -255,6 +268,7 @@ public class OrderDetailImpl extends EObjectImpl implements OrderDetail /** * + * * @generated */ @Override @@ -272,6 +286,7 @@ public class OrderDetailImpl extends EObjectImpl implements OrderDetail /** * + * * @generated */ @Override @@ -287,6 +302,7 @@ public class OrderDetailImpl extends EObjectImpl implements OrderDetail /** * + * * @generated */ @Override @@ -308,6 +324,7 @@ public class OrderDetailImpl extends EObjectImpl implements OrderDetail /** * + * * @generated */ @Override @@ -330,6 +347,7 @@ public class OrderDetailImpl extends EObjectImpl implements OrderDetail /** * + * * @generated */ @Override @@ -352,6 +370,7 @@ public class OrderDetailImpl extends EObjectImpl implements OrderDetail /** * + * * @generated */ @Override @@ -371,6 +390,7 @@ public class OrderDetailImpl extends EObjectImpl implements OrderDetail /** * + * * @generated */ @Override diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/OrderImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/OrderImpl.java index 3ed57bc7f5..b6f6dc7728 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/OrderImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/OrderImpl.java @@ -29,16 +29,17 @@ import java.util.Collection; *

    * The following features are implemented: *

      - *
    • {@link org.eclipse.emf.cdo.tests.legacy.model1.impl.OrderImpl#getOrderDetails Order Details}
    • + *
    • {@link org.eclipse.emf.cdo.tests.legacy.model1.impl.OrderImpl#getOrderDetails Order Details}
    • *
    *

    - * + * * @generated */ public abstract class OrderImpl extends EObjectImpl implements Order { /** * + * * @generated */ public static final String copyright = "Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n Eike Stepper - initial API and implementation"; @@ -55,6 +56,7 @@ public abstract class OrderImpl extends EObjectImpl implements Order /** * + * * @generated */ protected OrderImpl() @@ -64,16 +66,18 @@ public abstract class OrderImpl extends EObjectImpl implements Order /** * + * * @generated */ @Override protected EClass eStaticClass() { - return Model1Package.Literals.ORDER; + return Model1Package.eINSTANCE.getOrder(); } /** * + * * @generated */ public EList getOrderDetails() @@ -88,6 +92,7 @@ public abstract class OrderImpl extends EObjectImpl implements Order /** * + * * @generated */ @SuppressWarnings("unchecked") @@ -104,6 +109,7 @@ public abstract class OrderImpl extends EObjectImpl implements Order /** * + * * @generated */ @Override @@ -119,6 +125,7 @@ public abstract class OrderImpl extends EObjectImpl implements Order /** * + * * @generated */ @Override @@ -134,6 +141,7 @@ public abstract class OrderImpl extends EObjectImpl implements Order /** * + * * @generated */ @SuppressWarnings("unchecked") @@ -152,6 +160,7 @@ public abstract class OrderImpl extends EObjectImpl implements Order /** * + * * @generated */ @Override @@ -168,6 +177,7 @@ public abstract class OrderImpl extends EObjectImpl implements Order /** * + * * @generated */ @Override diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/Product1Impl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/Product1Impl.java index 8408dacf89..5812ba5369 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/Product1Impl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/Product1Impl.java @@ -32,19 +32,20 @@ import java.util.Collection; *

    * The following features are implemented: *

      - *
    • {@link org.eclipse.emf.cdo.tests.legacy.model1.impl.Product1Impl#getName Name}
    • - *
    • {@link org.eclipse.emf.cdo.tests.legacy.model1.impl.Product1Impl#getOrderDetails Order Details}
    • - *
    • {@link org.eclipse.emf.cdo.tests.legacy.model1.impl.Product1Impl#getVat Vat}
    • - *
    • {@link org.eclipse.emf.cdo.tests.legacy.model1.impl.Product1Impl#getDescription Description}
    • + *
    • {@link org.eclipse.emf.cdo.tests.legacy.model1.impl.Product1Impl#getName Name}
    • + *
    • {@link org.eclipse.emf.cdo.tests.legacy.model1.impl.Product1Impl#getOrderDetails Order Details}
    • + *
    • {@link org.eclipse.emf.cdo.tests.legacy.model1.impl.Product1Impl#getVat Vat}
    • + *
    • {@link org.eclipse.emf.cdo.tests.legacy.model1.impl.Product1Impl#getDescription Description}
    • *
    *

    - * + * * @generated */ public class Product1Impl extends EObjectImpl implements Product1 { /** * + * * @generated */ public static final String copyright = "Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n Eike Stepper - initial API and implementation"; @@ -60,8 +61,8 @@ public class Product1Impl extends EObjectImpl implements Product1 protected static final String NAME_EDEFAULT = null; /** - * The cached value of the '{@link #getName() Name}' attribute. - * + * The cached value of the '{@link #getName() Name}' attribute. + * * @see #getName() * @generated * @ordered @@ -69,9 +70,9 @@ public class Product1Impl extends EObjectImpl implements Product1 protected String name = NAME_EDEFAULT; /** - * The cached value of the '{@link #getOrderDetails() Order Details}' reference list. - * + * The cached value of the '{@link #getOrderDetails() Order Details}' reference list. * + * * @see #getOrderDetails() * @generated * @ordered @@ -79,8 +80,8 @@ public class Product1Impl extends EObjectImpl implements Product1 protected EList orderDetails; /** - * The default value of the '{@link #getVat() Vat}' attribute. - * + * The default value of the '{@link #getVat() Vat}' attribute. + * * @see #getVat() * @generated * @ordered @@ -88,8 +89,8 @@ public class Product1Impl extends EObjectImpl implements Product1 protected static final VAT VAT_EDEFAULT = VAT.VAT15; /** - * The cached value of the '{@link #getVat() Vat}' attribute. - * + * The cached value of the '{@link #getVat() Vat}' attribute. + * * @see #getVat() * @generated * @ordered @@ -97,9 +98,9 @@ public class Product1Impl extends EObjectImpl implements Product1 protected VAT vat = VAT_EDEFAULT; /** - * The default value of the '{@link #getDescription() Description}' attribute. - * + * * @see #getDescription() * @generated * @ordered @@ -107,9 +108,9 @@ public class Product1Impl extends EObjectImpl implements Product1 protected static final String DESCRIPTION_EDEFAULT = null; /** - * The cached value of the '{@link #getDescription() Description}' attribute. - * + * * @see #getDescription() * @generated * @ordered @@ -118,6 +119,7 @@ public class Product1Impl extends EObjectImpl implements Product1 /** * + * * @generated */ protected Product1Impl() @@ -127,16 +129,18 @@ public class Product1Impl extends EObjectImpl implements Product1 /** * + * * @generated */ @Override protected EClass eStaticClass() { - return Model1Package.Literals.PRODUCT1; + return Model1Package.eINSTANCE.getProduct1(); } /** * + * * @generated */ public String getName() @@ -146,6 +150,7 @@ public class Product1Impl extends EObjectImpl implements Product1 /** * + * * @generated */ public void setName(String newName) @@ -158,6 +163,7 @@ public class Product1Impl extends EObjectImpl implements Product1 /** * + * * @generated */ public EList getOrderDetails() @@ -172,6 +178,7 @@ public class Product1Impl extends EObjectImpl implements Product1 /** * + * * @generated */ public VAT getVat() @@ -181,6 +188,7 @@ public class Product1Impl extends EObjectImpl implements Product1 /** * + * * @generated */ public void setVat(VAT newVat) @@ -193,6 +201,7 @@ public class Product1Impl extends EObjectImpl implements Product1 /** * + * * @generated */ public String getDescription() @@ -202,6 +211,7 @@ public class Product1Impl extends EObjectImpl implements Product1 /** * + * * @generated */ public void setDescription(String newDescription) @@ -215,6 +225,7 @@ public class Product1Impl extends EObjectImpl implements Product1 /** * + * * @generated */ @SuppressWarnings("unchecked") @@ -231,6 +242,7 @@ public class Product1Impl extends EObjectImpl implements Product1 /** * + * * @generated */ @Override @@ -246,6 +258,7 @@ public class Product1Impl extends EObjectImpl implements Product1 /** * + * * @generated */ @Override @@ -267,6 +280,7 @@ public class Product1Impl extends EObjectImpl implements Product1 /** * + * * @generated */ @SuppressWarnings("unchecked") @@ -294,6 +308,7 @@ public class Product1Impl extends EObjectImpl implements Product1 /** * + * * @generated */ @Override @@ -319,6 +334,7 @@ public class Product1Impl extends EObjectImpl implements Product1 /** * + * * @generated */ @Override @@ -340,6 +356,7 @@ public class Product1Impl extends EObjectImpl implements Product1 /** * + * * @generated */ @Override diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/ProductToOrderImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/ProductToOrderImpl.java index ef0663bce1..857f3b3b81 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/ProductToOrderImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/ProductToOrderImpl.java @@ -40,6 +40,7 @@ public class ProductToOrderImpl extends EObjectImpl implements BasicEMap.Entry

    + * * @generated */ public static final String copyright = "Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n Eike Stepper - initial API and implementation"; @@ -55,9 +56,9 @@ public class ProductToOrderImpl extends EObjectImpl implements BasicEMap.Entry

    Value}' reference. - * + * * @see #getTypedValue() * @generated * @ordered @@ -66,6 +67,7 @@ public class ProductToOrderImpl extends EObjectImpl implements BasicEMap.Entry

    + * * @generated */ protected ProductToOrderImpl() @@ -75,16 +77,18 @@ public class ProductToOrderImpl extends EObjectImpl implements BasicEMap.Entry

    + * * @generated */ @Override protected EClass eStaticClass() { - return Model1Package.Literals.PRODUCT_TO_ORDER; + return Model1Package.eINSTANCE.getProductToOrder(); } /** * + * * @generated */ public Product1 getTypedKey() @@ -104,6 +108,7 @@ public class ProductToOrderImpl extends EObjectImpl implements BasicEMap.Entry

    + * * @generated */ public Product1 basicGetTypedKey() @@ -113,6 +118,7 @@ public class ProductToOrderImpl extends EObjectImpl implements BasicEMap.Entry

    + * * @generated */ public void setTypedKey(Product1 newKey) @@ -125,6 +131,7 @@ public class ProductToOrderImpl extends EObjectImpl implements BasicEMap.Entry

    + * * @generated */ public SalesOrder getTypedValue() @@ -145,6 +152,7 @@ public class ProductToOrderImpl extends EObjectImpl implements BasicEMap.Entry

    + * * @generated */ public SalesOrder basicGetTypedValue() @@ -154,6 +162,7 @@ public class ProductToOrderImpl extends EObjectImpl implements BasicEMap.Entry

    + * * @generated */ public void setTypedValue(SalesOrder newValue) @@ -166,6 +175,7 @@ public class ProductToOrderImpl extends EObjectImpl implements BasicEMap.Entry

    + * * @generated */ @Override @@ -187,6 +197,7 @@ public class ProductToOrderImpl extends EObjectImpl implements BasicEMap.Entry

    + * * @generated */ @Override @@ -206,6 +217,7 @@ public class ProductToOrderImpl extends EObjectImpl implements BasicEMap.Entry

    + * * @generated */ @Override @@ -225,6 +237,7 @@ public class ProductToOrderImpl extends EObjectImpl implements BasicEMap.Entry

    + * * @generated */ @Override @@ -242,12 +255,14 @@ public class ProductToOrderImpl extends EObjectImpl implements BasicEMap.Entry

    + * * @generated */ protected int hash = -1; /** * + * * @generated */ public int getHash() @@ -262,6 +277,7 @@ public class ProductToOrderImpl extends EObjectImpl implements BasicEMap.Entry

    + * * @generated */ public void setHash(int hash) @@ -271,6 +287,7 @@ public class ProductToOrderImpl extends EObjectImpl implements BasicEMap.Entry

    + * * @generated */ public Product1 getKey() @@ -280,6 +297,7 @@ public class ProductToOrderImpl extends EObjectImpl implements BasicEMap.Entry

    + * * @generated */ public void setKey(Product1 key) @@ -289,6 +307,7 @@ public class ProductToOrderImpl extends EObjectImpl implements BasicEMap.Entry

    + * * @generated */ public SalesOrder getValue() @@ -298,6 +317,7 @@ public class ProductToOrderImpl extends EObjectImpl implements BasicEMap.Entry

    + * * @generated */ public SalesOrder setValue(SalesOrder value) @@ -309,6 +329,7 @@ public class ProductToOrderImpl extends EObjectImpl implements BasicEMap.Entry

    + * * @generated */ @SuppressWarnings("unchecked") diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/PurchaseOrderImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/PurchaseOrderImpl.java index 3548b59819..25b625bb4b 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/PurchaseOrderImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/PurchaseOrderImpl.java @@ -22,6 +22,7 @@ public class PurchaseOrderImpl extends OrderImpl implements PurchaseOrder { /** * + * * @generated */ public static final String copyright = "Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n Eike Stepper - initial API and implementation"; @@ -37,8 +38,8 @@ public class PurchaseOrderImpl extends OrderImpl implements PurchaseOrder protected static final Date DATE_EDEFAULT = null; /** - * The cached value of the '{@link #getDate() Date}' attribute. - * + * The cached value of the '{@link #getDate() Date}' attribute. + * * @see #getDate() * @generated * @ordered @@ -46,9 +47,9 @@ public class PurchaseOrderImpl extends OrderImpl implements PurchaseOrder protected Date date = DATE_EDEFAULT; /** - * The cached value of the '{@link #getSupplier() Supplier}' reference. - * + * * @see #getSupplier() * @generated * @ordered @@ -57,6 +58,7 @@ public class PurchaseOrderImpl extends OrderImpl implements PurchaseOrder /** * + * * @generated */ protected PurchaseOrderImpl() @@ -66,16 +68,18 @@ public class PurchaseOrderImpl extends OrderImpl implements PurchaseOrder /** * + * * @generated */ @Override protected EClass eStaticClass() { - return Model1Package.Literals.PURCHASE_ORDER; + return Model1Package.eINSTANCE.getPurchaseOrder(); } /** * + * * @generated */ public Date getDate() @@ -85,6 +89,7 @@ public class PurchaseOrderImpl extends OrderImpl implements PurchaseOrder /** * + * * @generated */ public void setDate(Date newDate) @@ -97,6 +102,7 @@ public class PurchaseOrderImpl extends OrderImpl implements PurchaseOrder /** * + * * @generated */ public Supplier getSupplier() @@ -117,6 +123,7 @@ public class PurchaseOrderImpl extends OrderImpl implements PurchaseOrder /** * + * * @generated */ public Supplier basicGetSupplier() @@ -126,6 +133,7 @@ public class PurchaseOrderImpl extends OrderImpl implements PurchaseOrder /** * + * * @generated */ public NotificationChain basicSetSupplier(Supplier newSupplier, NotificationChain msgs) @@ -146,6 +154,7 @@ public class PurchaseOrderImpl extends OrderImpl implements PurchaseOrder /** * + * * @generated */ public void setSupplier(Supplier newSupplier) @@ -170,6 +179,7 @@ public class PurchaseOrderImpl extends OrderImpl implements PurchaseOrder /** * + * * @generated */ @Override @@ -188,6 +198,7 @@ public class PurchaseOrderImpl extends OrderImpl implements PurchaseOrder /** * + * * @generated */ @Override @@ -203,6 +214,7 @@ public class PurchaseOrderImpl extends OrderImpl implements PurchaseOrder /** * + * * @generated */ @Override @@ -222,6 +234,7 @@ public class PurchaseOrderImpl extends OrderImpl implements PurchaseOrder /** * + * * @generated */ @Override @@ -241,6 +254,7 @@ public class PurchaseOrderImpl extends OrderImpl implements PurchaseOrder /** * + * * @generated */ @Override @@ -260,6 +274,7 @@ public class PurchaseOrderImpl extends OrderImpl implements PurchaseOrder /** * + * * @generated */ @Override @@ -277,6 +292,7 @@ public class PurchaseOrderImpl extends OrderImpl implements PurchaseOrder /** * + * * @generated */ @Override diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/SalesOrderImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/SalesOrderImpl.java index ca9134182b..618e9d869a 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/SalesOrderImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/SalesOrderImpl.java @@ -25,24 +25,25 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl; *

    * The following features are implemented: *

      - *
    • {@link org.eclipse.emf.cdo.tests.legacy.model1.impl.SalesOrderImpl#getId Id}
    • - *
    • {@link org.eclipse.emf.cdo.tests.legacy.model1.impl.SalesOrderImpl#getCustomer Customer}
    • + *
    • {@link org.eclipse.emf.cdo.tests.legacy.model1.impl.SalesOrderImpl#getId Id}
    • + *
    • {@link org.eclipse.emf.cdo.tests.legacy.model1.impl.SalesOrderImpl#getCustomer Customer}
    • *
    *

    - * + * * @generated */ public class SalesOrderImpl extends OrderImpl implements SalesOrder { /** * + * * @generated */ public static final String copyright = "Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n Eike Stepper - initial API and implementation"; /** - * The default value of the '{@link #getId() Id}' attribute. - * + * The default value of the '{@link #getId() Id}' attribute. + * * @see #getId() * @generated * @ordered @@ -50,8 +51,8 @@ public class SalesOrderImpl extends OrderImpl implements SalesOrder protected static final int ID_EDEFAULT = 0; /** - * The cached value of the '{@link #getId() Id}' attribute. - * + * The cached value of the '{@link #getId() Id}' attribute. + * * @see #getId() * @generated * @ordered @@ -59,9 +60,9 @@ public class SalesOrderImpl extends OrderImpl implements SalesOrder protected int id = ID_EDEFAULT; /** - * The cached value of the '{@link #getCustomer() Customer}' reference. - * + * * @see #getCustomer() * @generated * @ordered @@ -70,6 +71,7 @@ public class SalesOrderImpl extends OrderImpl implements SalesOrder /** * + * * @generated */ protected SalesOrderImpl() @@ -79,16 +81,18 @@ public class SalesOrderImpl extends OrderImpl implements SalesOrder /** * + * * @generated */ @Override protected EClass eStaticClass() { - return Model1Package.Literals.SALES_ORDER; + return Model1Package.eINSTANCE.getSalesOrder(); } /** * + * * @generated */ public int getId() @@ -98,6 +102,7 @@ public class SalesOrderImpl extends OrderImpl implements SalesOrder /** * + * * @generated */ public void setId(int newId) @@ -110,6 +115,7 @@ public class SalesOrderImpl extends OrderImpl implements SalesOrder /** * + * * @generated */ public Customer getCustomer() @@ -130,6 +136,7 @@ public class SalesOrderImpl extends OrderImpl implements SalesOrder /** * + * * @generated */ public Customer basicGetCustomer() @@ -139,6 +146,7 @@ public class SalesOrderImpl extends OrderImpl implements SalesOrder /** * + * * @generated */ public NotificationChain basicSetCustomer(Customer newCustomer, NotificationChain msgs) @@ -159,6 +167,7 @@ public class SalesOrderImpl extends OrderImpl implements SalesOrder /** * + * * @generated */ public void setCustomer(Customer newCustomer) @@ -183,6 +192,7 @@ public class SalesOrderImpl extends OrderImpl implements SalesOrder /** * + * * @generated */ @Override @@ -201,6 +211,7 @@ public class SalesOrderImpl extends OrderImpl implements SalesOrder /** * + * * @generated */ @Override @@ -216,6 +227,7 @@ public class SalesOrderImpl extends OrderImpl implements SalesOrder /** * + * * @generated */ @Override @@ -235,6 +247,7 @@ public class SalesOrderImpl extends OrderImpl implements SalesOrder /** * + * * @generated */ @Override @@ -254,6 +267,7 @@ public class SalesOrderImpl extends OrderImpl implements SalesOrder /** * + * * @generated */ @Override @@ -273,6 +287,7 @@ public class SalesOrderImpl extends OrderImpl implements SalesOrder /** * + * * @generated */ @Override @@ -290,6 +305,7 @@ public class SalesOrderImpl extends OrderImpl implements SalesOrder /** * + * * @generated */ @Override diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/SupplierImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/SupplierImpl.java index 8861f17df4..a44e5a29ea 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/SupplierImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/SupplierImpl.java @@ -30,25 +30,26 @@ import java.util.Collection; *

    * The following features are implemented: *

      - *
    • {@link org.eclipse.emf.cdo.tests.legacy.model1.impl.SupplierImpl#getPurchaseOrders Purchase Orders}
    • - *
    • {@link org.eclipse.emf.cdo.tests.legacy.model1.impl.SupplierImpl#isPreferred Preferred}
    • + *
    • {@link org.eclipse.emf.cdo.tests.legacy.model1.impl.SupplierImpl#getPurchaseOrders Purchase Orders}
    • + *
    • {@link org.eclipse.emf.cdo.tests.legacy.model1.impl.SupplierImpl#isPreferred Preferred}
    • *
    *

    - * + * * @generated */ public class SupplierImpl extends AddressImpl implements Supplier { /** * + * * @generated */ public static final String copyright = "Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n Eike Stepper - initial API and implementation"; /** - * The cached value of the '{@link #getPurchaseOrders() Purchase Orders}' reference list. - * + * * @see #getPurchaseOrders() * @generated * @ordered @@ -56,9 +57,9 @@ public class SupplierImpl extends AddressImpl implements Supplier protected EList purchaseOrders; /** - * The default value of the '{@link #isPreferred() Preferred}' attribute. - * + * * @see #isPreferred() * @generated * @ordered @@ -66,9 +67,9 @@ public class SupplierImpl extends AddressImpl implements Supplier protected static final boolean PREFERRED_EDEFAULT = true; /** - * The cached value of the '{@link #isPreferred() Preferred}' attribute. - * + * * @see #isPreferred() * @generated * @ordered @@ -77,6 +78,7 @@ public class SupplierImpl extends AddressImpl implements Supplier /** * + * * @generated */ protected SupplierImpl() @@ -86,16 +88,18 @@ public class SupplierImpl extends AddressImpl implements Supplier /** * + * * @generated */ @Override protected EClass eStaticClass() { - return Model1Package.Literals.SUPPLIER; + return Model1Package.eINSTANCE.getSupplier(); } /** * + * * @generated */ public EList getPurchaseOrders() @@ -110,6 +114,7 @@ public class SupplierImpl extends AddressImpl implements Supplier /** * + * * @generated */ public boolean isPreferred() @@ -119,6 +124,7 @@ public class SupplierImpl extends AddressImpl implements Supplier /** * + * * @generated */ public void setPreferred(boolean newPreferred) @@ -131,6 +137,7 @@ public class SupplierImpl extends AddressImpl implements Supplier /** * + * * @generated */ @SuppressWarnings("unchecked") @@ -147,6 +154,7 @@ public class SupplierImpl extends AddressImpl implements Supplier /** * + * * @generated */ @Override @@ -162,6 +170,7 @@ public class SupplierImpl extends AddressImpl implements Supplier /** * + * * @generated */ @Override @@ -179,6 +188,7 @@ public class SupplierImpl extends AddressImpl implements Supplier /** * + * * @generated */ @SuppressWarnings("unchecked") @@ -200,6 +210,7 @@ public class SupplierImpl extends AddressImpl implements Supplier /** * + * * @generated */ @Override @@ -219,6 +230,7 @@ public class SupplierImpl extends AddressImpl implements Supplier /** * + * * @generated */ @Override @@ -236,6 +248,7 @@ public class SupplierImpl extends AddressImpl implements Supplier /** * + * * @generated */ @Override diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Address.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Address.java index 8197d4787e..9ca6b40596 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Address.java +++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Address.java @@ -14,16 +14,15 @@ import org.eclipse.emf.ecore.EObject; /** * A representation of the model object 'Address'. - * *

    * The following features are supported: *

      - *
    • {@link org.eclipse.emf.cdo.tests.model1.Address#getName Name}
    • - *
    • {@link org.eclipse.emf.cdo.tests.model1.Address#getStreet Street}
    • - *
    • {@link org.eclipse.emf.cdo.tests.model1.Address#getCity City}
    • + *
    • {@link org.eclipse.emf.cdo.tests.model1.Address#getName Name}
    • + *
    • {@link org.eclipse.emf.cdo.tests.model1.Address#getStreet Street}
    • + *
    • {@link org.eclipse.emf.cdo.tests.model1.Address#getCity City}
    • *
    *

    - * + * * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getAddress() * @model * @generated @@ -32,17 +31,18 @@ public interface Address extends EObject { /** * + * * @generated */ String copyright = "Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n Eike Stepper - initial API and implementation"; /** - * Returns the value of the 'Name' attribute. - * + * 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.emf.cdo.tests.model1.Model1Package#getAddress_Name() @@ -63,12 +63,12 @@ public interface Address extends EObject void setName(String value); /** - * Returns the value of the 'Street' attribute. - * + * Returns the value of the 'Street' attribute. *

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

    * + * * @return the value of the 'Street' attribute. * @see #setStreet(String) * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getAddress_Street() @@ -89,12 +89,12 @@ public interface Address extends EObject void setStreet(String value); /** - * Returns the value of the 'City' attribute. - * + * Returns the value of the 'City' attribute. *

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

    * + * * @return the value of the 'City' attribute. * @see #setCity(String) * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getAddress_City() diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Category.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Category.java index a943c6bf8e..faae2e6b39 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Category.java +++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Category.java @@ -15,16 +15,15 @@ import org.eclipse.emf.ecore.EObject; /** * A representation of the model object 'Category'. - * *

    * The following features are supported: *

      - *
    • {@link org.eclipse.emf.cdo.tests.model1.Category#getName Name}
    • - *
    • {@link org.eclipse.emf.cdo.tests.model1.Category#getCategories Categories}
    • - *
    • {@link org.eclipse.emf.cdo.tests.model1.Category#getProducts Products}
    • + *
    • {@link org.eclipse.emf.cdo.tests.model1.Category#getName Name}
    • + *
    • {@link org.eclipse.emf.cdo.tests.model1.Category#getCategories Categories}
    • + *
    • {@link org.eclipse.emf.cdo.tests.model1.Category#getProducts Products}
    • *
    *

    - * + * * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getCategory() * @model * @generated @@ -33,17 +32,18 @@ public interface Category extends EObject { /** * + * * @generated */ String copyright = "Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n Eike Stepper - initial API and implementation"; /** - * Returns the value of the 'Name' attribute. - * + * 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.emf.cdo.tests.model1.Model1Package#getCategory_Name() @@ -64,14 +64,14 @@ public interface Category extends EObject void setName(String value); /** - * Returns the value of the 'Categories' containment reference list. - * The list contents are of type {@link org.eclipse.emf.cdo.tests.model1.Category}. - * + * Returns the value of the 'Categories' containment reference list. The list contents are of type + * {@link org.eclipse.emf.cdo.tests.model1.Category}. *

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

    * + * * @return the value of the 'Categories' containment reference list. * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getCategory_Categories() * @model containment="true" @@ -80,14 +80,14 @@ public interface Category extends EObject EList getCategories(); /** - * Returns the value of the 'Products' containment reference list. - * The list contents are of type {@link org.eclipse.emf.cdo.tests.model1.Product1}. - * + * Returns the value of the 'Products' containment reference list. The list contents are of type + * {@link org.eclipse.emf.cdo.tests.model1.Product1}. *

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

    * + * * @return the value of the 'Products' containment reference list. * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getCategory_Products() * @model containment="true" diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Company.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Company.java index 852283d8c6..3aa2d2944c 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Company.java +++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Company.java @@ -14,18 +14,17 @@ import org.eclipse.emf.common.util.EList; /** * A representation of the model object 'Company'. - * *

    * The following features are supported: *

      - *
    • {@link org.eclipse.emf.cdo.tests.model1.Company#getCategories Categories}
    • - *
    • {@link org.eclipse.emf.cdo.tests.model1.Company#getSuppliers Suppliers}
    • - *
    • {@link org.eclipse.emf.cdo.tests.model1.Company#getCustomers Customers}
    • - *
    • {@link org.eclipse.emf.cdo.tests.model1.Company#getPurchaseOrders Purchase Orders}
    • - *
    • {@link org.eclipse.emf.cdo.tests.model1.Company#getSalesOrders Sales Orders}
    • + *
    • {@link org.eclipse.emf.cdo.tests.model1.Company#getCategories Categories}
    • + *
    • {@link org.eclipse.emf.cdo.tests.model1.Company#getSuppliers Suppliers}
    • + *
    • {@link org.eclipse.emf.cdo.tests.model1.Company#getCustomers Customers}
    • + *
    • {@link org.eclipse.emf.cdo.tests.model1.Company#getPurchaseOrders Purchase Orders}
    • + *
    • {@link org.eclipse.emf.cdo.tests.model1.Company#getSalesOrders Sales Orders}
    • *
    *

    - * + * * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getCompany() * @model * @generated @@ -34,19 +33,20 @@ public interface Company extends Address { /** * + * * @generated */ String copyright = "Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n Eike Stepper - initial API and implementation"; /** - * Returns the value of the 'Categories' containment reference list. - * The list contents are of type {@link org.eclipse.emf.cdo.tests.model1.Category}. - * + * Returns the value of the 'Categories' containment reference list. The list contents are of type + * {@link org.eclipse.emf.cdo.tests.model1.Category}. *

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

    * + * * @return the value of the 'Categories' containment reference list. * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getCompany_Categories() * @model containment="true" @@ -55,14 +55,14 @@ public interface Company extends Address EList getCategories(); /** - * Returns the value of the 'Suppliers' containment reference list. - * The list contents are of type {@link org.eclipse.emf.cdo.tests.model1.Supplier}. - * + * Returns the value of the 'Suppliers' containment reference list. The list contents are of type + * {@link org.eclipse.emf.cdo.tests.model1.Supplier}. *

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

    * + * * @return the value of the 'Suppliers' containment reference list. * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getCompany_Suppliers() * @model containment="true" @@ -71,14 +71,14 @@ public interface Company extends Address EList getSuppliers(); /** - * Returns the value of the 'Purchase Orders' containment reference list. - * The list contents are of type {@link org.eclipse.emf.cdo.tests.model1.PurchaseOrder}. - * + * Returns the value of the 'Purchase Orders' containment reference list. The list contents are of + * type {@link org.eclipse.emf.cdo.tests.model1.PurchaseOrder}. *

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

    * + * * @return the value of the 'Purchase Orders' containment reference list. * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getCompany_PurchaseOrders() * @model containment="true" @@ -87,14 +87,14 @@ public interface Company extends Address EList getPurchaseOrders(); /** - * Returns the value of the 'Customers' containment reference list. - * The list contents are of type {@link org.eclipse.emf.cdo.tests.model1.Customer}. - * + * Returns the value of the 'Customers' containment reference list. The list contents are of type + * {@link org.eclipse.emf.cdo.tests.model1.Customer}. *

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

    * + * * @return the value of the 'Customers' containment reference list. * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getCompany_Customers() * @model containment="true" @@ -103,14 +103,14 @@ public interface Company extends Address EList getCustomers(); /** - * Returns the value of the 'Sales Orders' containment reference list. - * The list contents are of type {@link org.eclipse.emf.cdo.tests.model1.SalesOrder}. - * + * Returns the value of the 'Sales Orders' containment reference list. The list contents are of type + * {@link org.eclipse.emf.cdo.tests.model1.SalesOrder}. *

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

    * + * * @return the value of the 'Sales Orders' containment reference list. * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getCompany_SalesOrders() * @model containment="true" diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Customer.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Customer.java index 0f8e0bfc01..4736bb9c30 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Customer.java +++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Customer.java @@ -15,15 +15,14 @@ import org.eclipse.emf.common.util.EMap; /** * A representation of the model object 'Customer'. - * *

    * The following features are supported: *

      - *
    • {@link org.eclipse.emf.cdo.tests.model1.Customer#getSalesOrders Sales Orders}
    • - *
    • {@link org.eclipse.emf.cdo.tests.model1.Customer#getOrderByProduct Order By Product}
    • + *
    • {@link org.eclipse.emf.cdo.tests.model1.Customer#getSalesOrders Sales Orders}
    • + *
    • {@link org.eclipse.emf.cdo.tests.model1.Customer#getOrderByProduct Order By Product}
    • *
    *

    - * + * * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getCustomer() * @model * @generated @@ -32,20 +31,21 @@ public interface Customer extends Address { /** * + * * @generated */ String copyright = "Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n Eike Stepper - initial API and implementation"; /** - * Returns the value of the 'Sales Orders' reference list. - * The list contents are of type {@link org.eclipse.emf.cdo.tests.model1.SalesOrder}. - * It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.model1.SalesOrder#getCustomer Customer}'. - * + * Returns the value of the 'Sales Orders' reference list. The list contents are of type + * {@link org.eclipse.emf.cdo.tests.model1.SalesOrder}. It is bidirectional and its opposite is ' + * {@link org.eclipse.emf.cdo.tests.model1.SalesOrder#getCustomer Customer}'. *

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

    * + * * @return the value of the 'Sales Orders' reference list. * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getCustomer_SalesOrders() * @see org.eclipse.emf.cdo.tests.model1.SalesOrder#getCustomer @@ -55,18 +55,19 @@ public interface Customer extends Address EList getSalesOrders(); /** - * Returns the value of the 'Order By Product' map. - * The key is of type {@link org.eclipse.emf.cdo.tests.model1.Product1}, - * and the value is of type {@link org.eclipse.emf.cdo.tests.model1.SalesOrder}, - * + * Returns the value of the 'Order By Product' map. The key is of type + * {@link org.eclipse.emf.cdo.tests.model1.Product1}, and the value is of type + * {@link org.eclipse.emf.cdo.tests.model1.SalesOrder}, *

    * If the meaning of the 'Order By Product' map isn't clear, there really should be more of a description * here... *

    * + * * @return the value of the 'Order By Product' map. * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getCustomer_OrderByProduct() - * @model mapType="org.eclipse.emf.cdo.tests.model1.ProductToOrder" + * @model mapType= + * "org.eclipse.emf.cdo.tests.model1.ProductToOrder" * @generated */ EMap getOrderByProduct(); diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Model1Factory.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Model1Factory.java index 1a2799851b..5b8b273940 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Model1Factory.java +++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Model1Factory.java @@ -15,6 +15,7 @@ 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.emf.cdo.tests.model1.Model1Package * @generated */ @@ -22,100 +23,101 @@ public interface Model1Factory extends EFactory { /** * + * * @generated */ String copyright = "Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n Eike Stepper - initial API and implementation"; /** - * The singleton instance of the factory. - * + * The singleton instance of the factory. + * * @generated */ Model1Factory eINSTANCE = org.eclipse.emf.cdo.tests.model1.impl.Model1FactoryImpl.init(); /** - * Returns a new object of class 'Address'. - * + * Returns a new object of class 'Address'. + * * @return a new object of class 'Address'. * @generated */ Address createAddress(); /** - * Returns a new object of class 'Supplier'. - * + * Returns a new object of class 'Supplier'. + * * @return a new object of class 'Supplier'. * @generated */ Supplier createSupplier(); /** - * Returns a new object of class 'Purchase Order'. - * + * Returns a new object of class 'Purchase Order'. + * * @return a new object of class 'Purchase Order'. * @generated */ PurchaseOrder createPurchaseOrder(); /** - * Returns a new object of class 'Order Detail'. - * + * Returns a new object of class 'Order Detail'. + * * @return a new object of class 'Order Detail'. * @generated */ OrderDetail createOrderDetail(); /** - * Returns a new object of class 'Order Address'. - * + * Returns a new object of class 'Order Address'. + * * @return a new object of class 'Order Address'. * @generated */ OrderAddress createOrderAddress(); /** - * Returns a new object of class 'Category'. - * + * Returns a new object of class 'Category'. + * * @return a new object of class 'Category'. * @generated */ Category createCategory(); /** - * Returns a new object of class 'Product1'. - * + * Returns a new object of class 'Product1'. + * * @return a new object of class 'Product1'. * @generated */ Product1 createProduct1(); /** - * Returns a new object of class 'Company'. - * + * Returns a new object of class 'Company'. + * * @return a new object of class 'Company'. * @generated */ Company createCompany(); /** - * Returns a new object of class 'Customer'. - * + * Returns a new object of class 'Customer'. + * * @return a new object of class 'Customer'. * @generated */ Customer createCustomer(); /** - * Returns a new object of class 'Sales Order'. - * + * Returns a new object of class 'Sales Order'. + * * @return a new object of class 'Sales Order'. * @generated */ SalesOrder createSalesOrder(); /** - * Returns the package supported by this factory. - * + * Returns the package supported by this factory. + * * @return the package supported by this factory. * @generated */ diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Model1Package.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Model1Package.java index b2e01a926d..8089270ca6 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Model1Package.java +++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Model1Package.java @@ -25,43 +25,46 @@ import org.eclipse.emf.ecore.EReference; *
  • and each data type
  • * * + * * @see org.eclipse.emf.cdo.tests.model1.Model1Factory - * @model kind="package" - * annotation="teneo.jpa value='@hbGenericGenerators({@GenericGenerator(name=\"system-uuid\", strategy = \"org.eclipse.emf.cdo.server.internal.hibernate.tuplizer.CDOUUIDHexGenerator\")})'" + * @model kind="package" annotation="teneo.jpa value='@hbGenericGenerators( {@GenericGenerator(name=\"system-uuid\", + * strategy = + * \"org.eclipse.emf.cdo.server.internal.hibernate.tuplizer.CDOUUIDHexGenerator\")})'" * @generated */ public interface Model1Package extends EPackage { /** * + * * @generated */ String copyright = "Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n Eike Stepper - initial API and implementation"; /** - * The package name. - * + * The package name. + * * @generated */ String eNAME = "model1"; /** - * The package namespace URI. - * + * The package namespace URI. + * * @generated */ String eNS_URI = "http://www.eclipse.org/emf/CDO/tests/model1/1.0.0"; /** - * The package namespace name. - * + * The package namespace name. + * * @generated */ String eNS_PREFIX = "model1"; /** - * The singleton instance of the package. - * + * The singleton instance of the package. + * * @generated */ Model1Package eINSTANCE = org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl.init(); @@ -77,32 +80,32 @@ public interface Model1Package extends EPackage int ADDRESS = 0; /** - * The feature id for the 'Name' attribute. - * + * The feature id for the 'Name' attribute. + * * @generated * @ordered */ int ADDRESS__NAME = 0; /** - * The feature id for the 'Street' attribute. - * + * The feature id for the 'Street' attribute. + * * @generated * @ordered */ int ADDRESS__STREET = 1; /** - * The feature id for the 'City' attribute. - * + * The feature id for the 'City' attribute. + * * @generated * @ordered */ int ADDRESS__CITY = 2; /** - * The number of structural features of the 'Address' class. - * + * The number of structural features of the 'Address' class. + * * @generated * @ordered */ @@ -111,6 +114,7 @@ public interface Model1Package extends EPackage /** * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model1.impl.SupplierImpl Supplier}' class. * + * * @see org.eclipse.emf.cdo.tests.model1.impl.SupplierImpl * @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getSupplier() * @generated @@ -118,8 +122,9 @@ public interface Model1Package extends EPackage int SUPPLIER = 2; /** - * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model1.impl.PurchaseOrderImpl Purchase Order}' class. - * + * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model1.impl.PurchaseOrderImpl Purchase Order} + * ' class. + * * @see org.eclipse.emf.cdo.tests.model1.impl.PurchaseOrderImpl * @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getPurchaseOrder() * @generated @@ -127,8 +132,9 @@ public interface Model1Package extends EPackage int PURCHASE_ORDER = 6; /** - * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model1.impl.OrderDetailImpl Order Detail}' class. - * + * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model1.impl.OrderDetailImpl Order Detail}' + * class. + * * @see org.eclipse.emf.cdo.tests.model1.impl.OrderDetailImpl * @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getOrderDetail() * @generated @@ -148,6 +154,7 @@ public interface Model1Package extends EPackage /** * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model1.Address#getName Name}'. * + * * @return the meta object for the attribute 'Name'. * @see org.eclipse.emf.cdo.tests.model1.Address#getName() * @see #getAddress() @@ -156,8 +163,9 @@ public interface Model1Package extends EPackage EAttribute getAddress_Name(); /** - * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model1.Address#getStreet Street}'. - * + * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model1.Address#getStreet + * Street}'. + * * @return the meta object for the attribute 'Street'. * @see org.eclipse.emf.cdo.tests.model1.Address#getStreet() * @see #getAddress() @@ -168,6 +176,7 @@ public interface Model1Package extends EPackage /** * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model1.Address#getCity City}'. * + * * @return the meta object for the attribute 'City'. * @see org.eclipse.emf.cdo.tests.model1.Address#getCity() * @see #getAddress() @@ -178,6 +187,7 @@ public interface Model1Package extends EPackage /** * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model1.impl.CategoryImpl Category}' class. * + * * @see org.eclipse.emf.cdo.tests.model1.impl.CategoryImpl * @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getCategory() * @generated @@ -195,101 +205,101 @@ public interface Model1Package extends EPackage int COMPANY = 1; /** - * The feature id for the 'Name' attribute. - * + * The feature id for the 'Name' attribute. + * * @generated * @ordered */ int COMPANY__NAME = ADDRESS__NAME; /** - * The feature id for the 'Street' attribute. - * + * The feature id for the 'Street' attribute. + * * @generated * @ordered */ int COMPANY__STREET = ADDRESS__STREET; /** - * The feature id for the 'City' attribute. - * + * The feature id for the 'City' attribute. + * * @generated * @ordered */ int COMPANY__CITY = ADDRESS__CITY; /** - * The feature id for the 'Categories' containment reference list. - * + * * @generated * @ordered */ int COMPANY__CATEGORIES = ADDRESS_FEATURE_COUNT + 0; /** - * The feature id for the 'Suppliers' containment reference list. - * + * * @generated * @ordered */ int COMPANY__SUPPLIERS = ADDRESS_FEATURE_COUNT + 1; /** - * The feature id for the 'Customers' containment reference list. - * + * * @generated * @ordered */ int COMPANY__CUSTOMERS = ADDRESS_FEATURE_COUNT + 2; /** - * The feature id for the 'Purchase Orders' containment reference list. - * + * * @generated * @ordered */ int COMPANY__PURCHASE_ORDERS = ADDRESS_FEATURE_COUNT + 3; /** - * The feature id for the 'Sales Orders' containment reference list. - * + * * @generated * @ordered */ int COMPANY__SALES_ORDERS = ADDRESS_FEATURE_COUNT + 4; /** - * The number of structural features of the 'Company' class. - * + * The number of structural features of the 'Company' class. + * * @generated * @ordered */ int COMPANY_FEATURE_COUNT = ADDRESS_FEATURE_COUNT + 5; /** - * The feature id for the 'Name' attribute. - * + * The feature id for the 'Name' attribute. + * * @generated * @ordered */ int SUPPLIER__NAME = ADDRESS__NAME; /** - * The feature id for the 'Street' attribute. - * + * The feature id for the 'Street' attribute. + * * @generated * @ordered */ int SUPPLIER__STREET = ADDRESS__STREET; /** - * The feature id for the 'City' attribute. - * + * The feature id for the 'City' attribute. + * * @generated * @ordered */ @@ -305,16 +315,16 @@ public interface Model1Package extends EPackage int SUPPLIER__PURCHASE_ORDERS = ADDRESS_FEATURE_COUNT + 0; /** - * The feature id for the 'Preferred' attribute. - * + * The feature id for the 'Preferred' attribute. + * * @generated * @ordered */ int SUPPLIER__PREFERRED = ADDRESS_FEATURE_COUNT + 1; /** - * The number of structural features of the 'Supplier' class. - * + * The number of structural features of the 'Supplier' class. + * * @generated * @ordered */ @@ -323,6 +333,7 @@ public interface Model1Package extends EPackage /** * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model1.impl.CustomerImpl Customer}' class. * + * * @see org.eclipse.emf.cdo.tests.model1.impl.CustomerImpl * @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getCustomer() * @generated @@ -330,48 +341,48 @@ public interface Model1Package extends EPackage int CUSTOMER = 3; /** - * The feature id for the 'Name' attribute. - * + * The feature id for the 'Name' attribute. + * * @generated * @ordered */ int CUSTOMER__NAME = ADDRESS__NAME; /** - * The feature id for the 'Street' attribute. - * + * The feature id for the 'Street' attribute. + * * @generated * @ordered */ int CUSTOMER__STREET = ADDRESS__STREET; /** - * The feature id for the 'City' attribute. - * + * The feature id for the 'City' attribute. + * * @generated * @ordered */ int CUSTOMER__CITY = ADDRESS__CITY; /** - * The feature id for the 'Sales Orders' reference list. - * + * The feature id for the 'Sales Orders' reference list. + * * @generated * @ordered */ int CUSTOMER__SALES_ORDERS = ADDRESS_FEATURE_COUNT + 0; /** - * The feature id for the 'Order By Product' map. - * + * The feature id for the 'Order By Product' map. + * * @generated * @ordered */ int CUSTOMER__ORDER_BY_PRODUCT = ADDRESS_FEATURE_COUNT + 1; /** - * The number of structural features of the 'Customer' class. - * + * The number of structural features of the 'Customer' class. + * * @generated * @ordered */ @@ -388,41 +399,41 @@ public interface Model1Package extends EPackage int ORDER = 4; /** - * The feature id for the 'Order Details' containment reference list. - * + * * @generated * @ordered */ int ORDER__ORDER_DETAILS = 0; /** - * The number of structural features of the 'Order' class. - * + * The number of structural features of the 'Order' class. + * * @generated * @ordered */ int ORDER_FEATURE_COUNT = 1; /** - * The feature id for the 'Order' container reference. - * + * The feature id for the 'Order' container reference. + * * @generated * @ordered */ int ORDER_DETAIL__ORDER = 0; /** - * The feature id for the 'Product' reference. - * + * The feature id for the 'Product' reference. + * * @generated * @ordered */ int ORDER_DETAIL__PRODUCT = 1; /** - * The feature id for the 'Price' attribute. - * + * The feature id for the 'Price' attribute. + * * @generated * @ordered */ @@ -438,25 +449,25 @@ public interface Model1Package extends EPackage int ORDER_DETAIL_FEATURE_COUNT = 3; /** - * The feature id for the 'Order Details' containment reference list. - * + * * @generated * @ordered */ int PURCHASE_ORDER__ORDER_DETAILS = ORDER__ORDER_DETAILS; /** - * The feature id for the 'Date' attribute. - * + * The feature id for the 'Date' attribute. + * * @generated * @ordered */ int PURCHASE_ORDER__DATE = ORDER_FEATURE_COUNT + 0; /** - * The feature id for the 'Supplier' reference. - * + * The feature id for the 'Supplier' reference. + * * @generated * @ordered */ @@ -472,8 +483,9 @@ public interface Model1Package extends EPackage int PURCHASE_ORDER_FEATURE_COUNT = ORDER_FEATURE_COUNT + 2; /** - * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model1.impl.SalesOrderImpl Sales Order}' class. - * + * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model1.impl.SalesOrderImpl Sales Order}' + * class. + * * @see org.eclipse.emf.cdo.tests.model1.impl.SalesOrderImpl * @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getSalesOrder() * @generated @@ -481,25 +493,25 @@ public interface Model1Package extends EPackage int SALES_ORDER = 7; /** - * The feature id for the 'Order Details' containment reference list. - * + * * @generated * @ordered */ int SALES_ORDER__ORDER_DETAILS = ORDER__ORDER_DETAILS; /** - * The feature id for the 'Id' attribute. - * + * The feature id for the 'Id' attribute. + * * @generated * @ordered */ int SALES_ORDER__ID = ORDER_FEATURE_COUNT + 0; /** - * The feature id for the 'Customer' reference. - * + * The feature id for the 'Customer' reference. + * * @generated * @ordered */ @@ -515,34 +527,34 @@ public interface Model1Package extends EPackage int SALES_ORDER_FEATURE_COUNT = ORDER_FEATURE_COUNT + 2; /** - * The feature id for the 'Name' attribute. - * + * The feature id for the 'Name' attribute. + * * @generated * @ordered */ int CATEGORY__NAME = 0; /** - * The feature id for the 'Categories' containment reference list. - * + * * @generated * @ordered */ int CATEGORY__CATEGORIES = 1; /** - * The feature id for the 'Products' containment reference list. - * + * * @generated * @ordered */ int CATEGORY__PRODUCTS = 2; /** - * The number of structural features of the 'Category' class. - * + * The number of structural features of the 'Category' class. + * * @generated * @ordered */ @@ -551,6 +563,7 @@ public interface Model1Package extends EPackage /** * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model1.impl.Product1Impl Product1}' class. * + * * @see org.eclipse.emf.cdo.tests.model1.impl.Product1Impl * @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getProduct1() * @generated @@ -558,8 +571,8 @@ public interface Model1Package extends EPackage int PRODUCT1 = 9; /** - * The feature id for the 'Name' attribute. - * + * The feature id for the 'Name' attribute. + * * @generated * @ordered */ @@ -575,32 +588,33 @@ public interface Model1Package extends EPackage int PRODUCT1__ORDER_DETAILS = 1; /** - * The feature id for the 'Vat' attribute. - * + * The feature id for the 'Vat' attribute. + * * @generated * @ordered */ int PRODUCT1__VAT = 2; /** - * The feature id for the 'Description' attribute. - * + * The feature id for the 'Description' attribute. + * * @generated * @ordered */ int PRODUCT1__DESCRIPTION = 3; /** - * The number of structural features of the 'Product1' class. - * + * The number of structural features of the 'Product1' class. + * * @generated * @ordered */ int PRODUCT1_FEATURE_COUNT = 4; /** - * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model1.impl.OrderAddressImpl Order Address}' class. - * + * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model1.impl.OrderAddressImpl Order Address}' + * class. + * * @see org.eclipse.emf.cdo.tests.model1.impl.OrderAddressImpl * @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getOrderAddress() * @generated @@ -608,65 +622,65 @@ public interface Model1Package extends EPackage int ORDER_ADDRESS = 10; /** - * The feature id for the 'Name' attribute. - * + * The feature id for the 'Name' attribute. + * * @generated * @ordered */ int ORDER_ADDRESS__NAME = ADDRESS__NAME; /** - * The feature id for the 'Street' attribute. - * + * The feature id for the 'Street' attribute. + * * @generated * @ordered */ int ORDER_ADDRESS__STREET = ADDRESS__STREET; /** - * The feature id for the 'City' attribute. - * + * The feature id for the 'City' attribute. + * * @generated * @ordered */ int ORDER_ADDRESS__CITY = ADDRESS__CITY; /** - * The feature id for the 'Order Details' containment reference list. - * + * * @generated * @ordered */ int ORDER_ADDRESS__ORDER_DETAILS = ADDRESS_FEATURE_COUNT + 0; /** - * The feature id for the 'Order' container reference. - * + * The feature id for the 'Order' container reference. + * * @generated * @ordered */ int ORDER_ADDRESS__ORDER = ADDRESS_FEATURE_COUNT + 1; /** - * The feature id for the 'Product' reference. - * + * The feature id for the 'Product' reference. + * * @generated * @ordered */ int ORDER_ADDRESS__PRODUCT = ADDRESS_FEATURE_COUNT + 2; /** - * The feature id for the 'Price' attribute. - * + * The feature id for the 'Price' attribute. + * * @generated * @ordered */ int ORDER_ADDRESS__PRICE = ADDRESS_FEATURE_COUNT + 3; /** - * The feature id for the 'Test Attribute' attribute. - * + * The feature id for the 'Test Attribute' attribute. + * * @generated * @ordered */ @@ -682,8 +696,9 @@ public interface Model1Package extends EPackage int ORDER_ADDRESS_FEATURE_COUNT = ADDRESS_FEATURE_COUNT + 5; /** - * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model1.impl.ProductToOrderImpl Product To Order}' class. - * + * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model1.impl.ProductToOrderImpl + * Product To Order}' class. + * * @see org.eclipse.emf.cdo.tests.model1.impl.ProductToOrderImpl * @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getProductToOrder() * @generated @@ -691,34 +706,34 @@ public interface Model1Package extends EPackage int PRODUCT_TO_ORDER = 11; /** - * The feature id for the 'Key' reference. - * + * The feature id for the 'Key' reference. + * * @generated * @ordered */ int PRODUCT_TO_ORDER__KEY = 0; /** - * The feature id for the 'Value' reference. - * + * The feature id for the 'Value' reference. + * * @generated * @ordered */ int PRODUCT_TO_ORDER__VALUE = 1; /** - * The number of structural features of the 'Product To Order' class. - * + * * @generated * @ordered */ int PRODUCT_TO_ORDER_FEATURE_COUNT = 2; /** - * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model1.VAT VAT}' enum. - * + * * @see org.eclipse.emf.cdo.tests.model1.VAT * @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getVAT() * @generated @@ -736,8 +751,9 @@ public interface Model1Package extends EPackage EClass getSupplier(); /** - * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.tests.model1.Supplier#getPurchaseOrders Purchase Orders}'. - * + * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.tests.model1.Supplier#getPurchaseOrders + * Purchase Orders}'. + * * @return the meta object for the reference list 'Purchase Orders'. * @see org.eclipse.emf.cdo.tests.model1.Supplier#getPurchaseOrders() * @see #getSupplier() @@ -746,8 +762,9 @@ public interface Model1Package extends EPackage EReference getSupplier_PurchaseOrders(); /** - * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model1.Supplier#isPreferred Preferred}'. - * + * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model1.Supplier#isPreferred + * Preferred}'. + * * @return the meta object for the attribute 'Preferred'. * @see org.eclipse.emf.cdo.tests.model1.Supplier#isPreferred() * @see #getSupplier() @@ -758,6 +775,7 @@ public interface Model1Package extends EPackage /** * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model1.PurchaseOrder Purchase Order}'. * + * * @return the meta object for class 'Purchase Order'. * @see org.eclipse.emf.cdo.tests.model1.PurchaseOrder * @generated @@ -765,8 +783,9 @@ public interface Model1Package extends EPackage EClass getPurchaseOrder(); /** - * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model1.PurchaseOrder#getDate Date}'. - * + * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model1.PurchaseOrder#getDate + * Date}'. + * * @return the meta object for the attribute 'Date'. * @see org.eclipse.emf.cdo.tests.model1.PurchaseOrder#getDate() * @see #getPurchaseOrder() @@ -775,8 +794,9 @@ public interface Model1Package extends EPackage EAttribute getPurchaseOrder_Date(); /** - * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.tests.model1.PurchaseOrder#getSupplier Supplier}'. - * + * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.tests.model1.PurchaseOrder#getSupplier + * Supplier}'. + * * @return the meta object for the reference 'Supplier'. * @see org.eclipse.emf.cdo.tests.model1.PurchaseOrder#getSupplier() * @see #getPurchaseOrder() @@ -787,6 +807,7 @@ public interface Model1Package extends EPackage /** * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model1.OrderDetail Order Detail}'. * + * * @return the meta object for class 'Order Detail'. * @see org.eclipse.emf.cdo.tests.model1.OrderDetail * @generated @@ -794,8 +815,9 @@ public interface Model1Package extends EPackage EClass getOrderDetail(); /** - * Returns the meta object for the container reference '{@link org.eclipse.emf.cdo.tests.model1.OrderDetail#getOrder Order}'. - * + * Returns the meta object for the container reference '{@link org.eclipse.emf.cdo.tests.model1.OrderDetail#getOrder + * Order}'. + * * @return the meta object for the container reference 'Order'. * @see org.eclipse.emf.cdo.tests.model1.OrderDetail#getOrder() * @see #getOrderDetail() @@ -804,8 +826,9 @@ public interface Model1Package extends EPackage EReference getOrderDetail_Order(); /** - * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.tests.model1.OrderDetail#getProduct Product}'. - * + * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.tests.model1.OrderDetail#getProduct + * Product}'. + * * @return the meta object for the reference 'Product'. * @see org.eclipse.emf.cdo.tests.model1.OrderDetail#getProduct() * @see #getOrderDetail() @@ -814,8 +837,9 @@ public interface Model1Package extends EPackage EReference getOrderDetail_Product(); /** - * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model1.OrderDetail#getPrice Price}'. - * + * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model1.OrderDetail#getPrice + * Price}'. + * * @return the meta object for the attribute 'Price'. * @see org.eclipse.emf.cdo.tests.model1.OrderDetail#getPrice() * @see #getOrderDetail() @@ -826,6 +850,7 @@ public interface Model1Package extends EPackage /** * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model1.OrderAddress Order Address}'. * + * * @return the meta object for class 'Order Address'. * @see org.eclipse.emf.cdo.tests.model1.OrderAddress * @generated @@ -833,8 +858,9 @@ public interface Model1Package extends EPackage EClass getOrderAddress(); /** - * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model1.OrderAddress#isTestAttribute Test Attribute}'. - * + * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model1.OrderAddress#isTestAttribute + * Test Attribute}'. + * * @return the meta object for the attribute 'Test Attribute'. * @see org.eclipse.emf.cdo.tests.model1.OrderAddress#isTestAttribute() * @see #getOrderAddress() @@ -843,21 +869,20 @@ public interface Model1Package extends EPackage EAttribute getOrderAddress_TestAttribute(); /** - * Returns the meta object for class '{@link java.util.Map.Entry Product To Order}'. - * + * Returns the meta object for class '{@link java.util.Map.Entry Product To Order}'. * + * * @return the meta object for class 'Product To Order'. * @see java.util.Map.Entry - * @model keyType="org.eclipse.emf.cdo.tests.model1.Product1" - * valueType="org.eclipse.emf.cdo.tests.model1.SalesOrder" + * @model keyType="org.eclipse.emf.cdo.tests.model1.Product1" valueType="org.eclipse.emf.cdo.tests.model1.SalesOrder" * @generated */ EClass getProductToOrder(); /** - * Returns the meta object for the reference '{@link java.util.Map.Entry Key}'. - * + * * @return the meta object for the reference 'Key'. * @see java.util.Map.Entry * @see #getProductToOrder() @@ -866,9 +891,9 @@ public interface Model1Package extends EPackage EReference getProductToOrder_Key(); /** - * Returns the meta object for the reference '{@link java.util.Map.Entry Value}'. - * + * Returns the meta object for the reference '{@link java.util.Map.Entry Value}'. * + * * @return the meta object for the reference 'Value'. * @see java.util.Map.Entry * @see #getProductToOrder() @@ -877,9 +902,9 @@ public interface Model1Package extends EPackage EReference getProductToOrder_Value(); /** - * Returns the meta object for enum '{@link org.eclipse.emf.cdo.tests.model1.VAT VAT}'. - * + * * @return the meta object for enum 'VAT'. * @see org.eclipse.emf.cdo.tests.model1.VAT * @generated @@ -897,8 +922,9 @@ public interface Model1Package extends EPackage EClass getCategory(); /** - * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model1.Category#getName Name}'. - * + * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model1.Category#getName Name} + * '. + * * @return the meta object for the attribute 'Name'. * @see org.eclipse.emf.cdo.tests.model1.Category#getName() * @see #getCategory() @@ -907,9 +933,10 @@ public interface Model1Package extends EPackage EAttribute getCategory_Name(); /** - * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.model1.Category#getCategories Categories}'. - * + * * @return the meta object for the containment reference list 'Categories'. * @see org.eclipse.emf.cdo.tests.model1.Category#getCategories() * @see #getCategory() @@ -918,9 +945,10 @@ public interface Model1Package extends EPackage EReference getCategory_Categories(); /** - * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.model1.Category#getProducts Products}'. - * + * * @return the meta object for the containment reference list 'Products'. * @see org.eclipse.emf.cdo.tests.model1.Category#getProducts() * @see #getCategory() @@ -939,8 +967,9 @@ public interface Model1Package extends EPackage EClass getProduct1(); /** - * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model1.Product1#getName Name}'. - * + * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model1.Product1#getName Name} + * '. + * * @return the meta object for the attribute 'Name'. * @see org.eclipse.emf.cdo.tests.model1.Product1#getName() * @see #getProduct1() @@ -949,8 +978,9 @@ public interface Model1Package extends EPackage EAttribute getProduct1_Name(); /** - * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.tests.model1.Product1#getOrderDetails Order Details}'. - * + * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.tests.model1.Product1#getOrderDetails + * Order Details}'. + * * @return the meta object for the reference list 'Order Details'. * @see org.eclipse.emf.cdo.tests.model1.Product1#getOrderDetails() * @see #getProduct1() @@ -961,6 +991,7 @@ public interface Model1Package extends EPackage /** * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model1.Product1#getVat Vat}'. * + * * @return the meta object for the attribute 'Vat'. * @see org.eclipse.emf.cdo.tests.model1.Product1#getVat() * @see #getProduct1() @@ -969,8 +1000,9 @@ public interface Model1Package extends EPackage EAttribute getProduct1_Vat(); /** - * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model1.Product1#getDescription Description}'. - * + * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model1.Product1#getDescription + * Description}'. + * * @return the meta object for the attribute 'Description'. * @see org.eclipse.emf.cdo.tests.model1.Product1#getDescription() * @see #getProduct1() @@ -989,9 +1021,10 @@ public interface Model1Package extends EPackage EClass getCompany(); /** - * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.model1.Company#getCategories Categories}'. - * + * * @return the meta object for the containment reference list 'Categories'. * @see org.eclipse.emf.cdo.tests.model1.Company#getCategories() * @see #getCompany() @@ -1000,9 +1033,10 @@ public interface Model1Package extends EPackage EReference getCompany_Categories(); /** - * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.model1.Company#getSuppliers Suppliers}'. - * + * * @return the meta object for the containment reference list 'Suppliers'. * @see org.eclipse.emf.cdo.tests.model1.Company#getSuppliers() * @see #getCompany() @@ -1011,9 +1045,10 @@ public interface Model1Package extends EPackage EReference getCompany_Suppliers(); /** - * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.model1.Company#getPurchaseOrders Purchase Orders}'. - * + * * @return the meta object for the containment reference list 'Purchase Orders'. * @see org.eclipse.emf.cdo.tests.model1.Company#getPurchaseOrders() * @see #getCompany() @@ -1022,9 +1057,10 @@ public interface Model1Package extends EPackage EReference getCompany_PurchaseOrders(); /** - * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.model1.Company#getCustomers Customers}'. - * + * * @return the meta object for the containment reference list 'Customers'. * @see org.eclipse.emf.cdo.tests.model1.Company#getCustomers() * @see #getCompany() @@ -1033,9 +1069,10 @@ public interface Model1Package extends EPackage EReference getCompany_Customers(); /** - * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.model1.Company#getSalesOrders Sales Orders}'. - * + * Returns the meta object for the containment reference list ' + * {@link org.eclipse.emf.cdo.tests.model1.Company#getSalesOrders Sales Orders}'. * + * * @return the meta object for the containment reference list 'Sales Orders'. * @see org.eclipse.emf.cdo.tests.model1.Company#getSalesOrders() * @see #getCompany() @@ -1054,8 +1091,9 @@ public interface Model1Package extends EPackage EClass getCustomer(); /** - * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.tests.model1.Customer#getSalesOrders Sales Orders}'. - * + * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.tests.model1.Customer#getSalesOrders + * Sales Orders}'. + * * @return the meta object for the reference list 'Sales Orders'. * @see org.eclipse.emf.cdo.tests.model1.Customer#getSalesOrders() * @see #getCustomer() @@ -1064,8 +1102,9 @@ public interface Model1Package extends EPackage EReference getCustomer_SalesOrders(); /** - * Returns the meta object for the map '{@link org.eclipse.emf.cdo.tests.model1.Customer#getOrderByProduct Order By Product}'. - * + * Returns the meta object for the map '{@link org.eclipse.emf.cdo.tests.model1.Customer#getOrderByProduct + * Order By Product}'. + * * @return the meta object for the map 'Order By Product'. * @see org.eclipse.emf.cdo.tests.model1.Customer#getOrderByProduct() * @see #getCustomer() @@ -1084,9 +1123,10 @@ public interface Model1Package extends EPackage EClass getOrder(); /** - * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.model1.Order#getOrderDetails Order Details}'. - * + * Returns the meta object for the containment reference list ' + * {@link org.eclipse.emf.cdo.tests.model1.Order#getOrderDetails Order Details}'. * + * * @return the meta object for the containment reference list 'Order Details'. * @see org.eclipse.emf.cdo.tests.model1.Order#getOrderDetails() * @see #getOrder() @@ -1107,6 +1147,7 @@ public interface Model1Package extends EPackage /** * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model1.SalesOrder#getId Id}'. * + * * @return the meta object for the attribute 'Id'. * @see org.eclipse.emf.cdo.tests.model1.SalesOrder#getId() * @see #getSalesOrder() @@ -1115,8 +1156,9 @@ public interface Model1Package extends EPackage EAttribute getSalesOrder_Id(); /** - * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.tests.model1.SalesOrder#getCustomer Customer}'. - * + * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.tests.model1.SalesOrder#getCustomer + * Customer}'. + * * @return the meta object for the reference 'Customer'. * @see org.eclipse.emf.cdo.tests.model1.SalesOrder#getCustomer() * @see #getSalesOrder() @@ -1125,384 +1167,11 @@ public interface Model1Package extends EPackage EReference getSalesOrder_Customer(); /** - * Returns the factory that creates the instances of the model. - * + * Returns the factory that creates the instances of the model. + * * @return the factory that creates the instances of the model. * @generated */ Model1Factory getModel1Factory(); - /** - * 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.emf.cdo.tests.model1.impl.AddressImpl Address}' class. - * - * @see org.eclipse.emf.cdo.tests.model1.impl.AddressImpl - * @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getAddress() - * @generated - */ - EClass ADDRESS = eINSTANCE.getAddress(); - - /** - * The meta object literal for the 'Name' attribute feature. - * - * @generated - */ - EAttribute ADDRESS__NAME = eINSTANCE.getAddress_Name(); - - /** - * The meta object literal for the 'Street' attribute feature. - * - * @generated - */ - EAttribute ADDRESS__STREET = eINSTANCE.getAddress_Street(); - - /** - * The meta object literal for the 'City' attribute feature. - * - * @generated - */ - EAttribute ADDRESS__CITY = eINSTANCE.getAddress_City(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model1.impl.SupplierImpl Supplier}' class. - * - * @see org.eclipse.emf.cdo.tests.model1.impl.SupplierImpl - * @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getSupplier() - * @generated - */ - EClass SUPPLIER = eINSTANCE.getSupplier(); - - /** - * The meta object literal for the 'Purchase Orders' reference list feature. - * - * - * @generated - */ - EReference SUPPLIER__PURCHASE_ORDERS = eINSTANCE.getSupplier_PurchaseOrders(); - - /** - * The meta object literal for the 'Preferred' attribute feature. - * - * @generated - */ - EAttribute SUPPLIER__PREFERRED = eINSTANCE.getSupplier_Preferred(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model1.impl.PurchaseOrderImpl Purchase Order}' class. - * - * @see org.eclipse.emf.cdo.tests.model1.impl.PurchaseOrderImpl - * @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getPurchaseOrder() - * @generated - */ - EClass PURCHASE_ORDER = eINSTANCE.getPurchaseOrder(); - - /** - * The meta object literal for the 'Date' attribute feature. - * - * @generated - */ - EAttribute PURCHASE_ORDER__DATE = eINSTANCE.getPurchaseOrder_Date(); - - /** - * The meta object literal for the 'Supplier' reference feature. - * - * @generated - */ - EReference PURCHASE_ORDER__SUPPLIER = eINSTANCE.getPurchaseOrder_Supplier(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model1.impl.OrderDetailImpl Order Detail}' class. - * - * @see org.eclipse.emf.cdo.tests.model1.impl.OrderDetailImpl - * @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getOrderDetail() - * @generated - */ - EClass ORDER_DETAIL = eINSTANCE.getOrderDetail(); - - /** - * The meta object literal for the 'Order' container reference feature. - * - * @generated - */ - EReference ORDER_DETAIL__ORDER = eINSTANCE.getOrderDetail_Order(); - - /** - * The meta object literal for the 'Product' reference feature. - * - * @generated - */ - EReference ORDER_DETAIL__PRODUCT = eINSTANCE.getOrderDetail_Product(); - - /** - * The meta object literal for the 'Price' attribute feature. - * - * @generated - */ - EAttribute ORDER_DETAIL__PRICE = eINSTANCE.getOrderDetail_Price(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model1.impl.OrderAddressImpl Order Address}' class. - * - * @see org.eclipse.emf.cdo.tests.model1.impl.OrderAddressImpl - * @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getOrderAddress() - * @generated - */ - EClass ORDER_ADDRESS = eINSTANCE.getOrderAddress(); - - /** - * The meta object literal for the 'Test Attribute' attribute feature. - * - * @generated - */ - EAttribute ORDER_ADDRESS__TEST_ATTRIBUTE = eINSTANCE.getOrderAddress_TestAttribute(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model1.impl.ProductToOrderImpl Product To Order}' class. - * - * @see org.eclipse.emf.cdo.tests.model1.impl.ProductToOrderImpl - * @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getProductToOrder() - * @generated - */ - EClass PRODUCT_TO_ORDER = eINSTANCE.getProductToOrder(); - - /** - * The meta object literal for the 'Key' reference feature. - * - * @generated - */ - EReference PRODUCT_TO_ORDER__KEY = eINSTANCE.getProductToOrder_Key(); - - /** - * The meta object literal for the 'Value' reference feature. - * - * @generated - */ - EReference PRODUCT_TO_ORDER__VALUE = eINSTANCE.getProductToOrder_Value(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model1.VAT VAT}' enum. - * - * @see org.eclipse.emf.cdo.tests.model1.VAT - * @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getVAT() - * @generated - */ - EEnum VAT = eINSTANCE.getVAT(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model1.impl.CategoryImpl Category}' class. - * - * @see org.eclipse.emf.cdo.tests.model1.impl.CategoryImpl - * @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getCategory() - * @generated - */ - EClass CATEGORY = eINSTANCE.getCategory(); - - /** - * The meta object literal for the 'Name' attribute feature. - * - * @generated - */ - EAttribute CATEGORY__NAME = eINSTANCE.getCategory_Name(); - - /** - * The meta object literal for the 'Categories' containment reference list feature. - * - * @generated - */ - EReference CATEGORY__CATEGORIES = eINSTANCE.getCategory_Categories(); - - /** - * The meta object literal for the 'Products' containment reference list feature. - * - * @generated - */ - EReference CATEGORY__PRODUCTS = eINSTANCE.getCategory_Products(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model1.impl.Product1Impl Product1}' class. - * - * @see org.eclipse.emf.cdo.tests.model1.impl.Product1Impl - * @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getProduct1() - * @generated - */ - EClass PRODUCT1 = eINSTANCE.getProduct1(); - - /** - * The meta object literal for the 'Name' attribute feature. - * - * @generated - */ - EAttribute PRODUCT1__NAME = eINSTANCE.getProduct1_Name(); - - /** - * The meta object literal for the 'Order Details' reference list feature. - * - * - * @generated - */ - EReference PRODUCT1__ORDER_DETAILS = eINSTANCE.getProduct1_OrderDetails(); - - /** - * The meta object literal for the 'Vat' attribute feature. - * - * @generated - */ - EAttribute PRODUCT1__VAT = eINSTANCE.getProduct1_Vat(); - - /** - * The meta object literal for the 'Description' attribute feature. - * - * @generated - */ - EAttribute PRODUCT1__DESCRIPTION = eINSTANCE.getProduct1_Description(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model1.impl.CompanyImpl Company}' class. - * - * @see org.eclipse.emf.cdo.tests.model1.impl.CompanyImpl - * @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getCompany() - * @generated - */ - EClass COMPANY = eINSTANCE.getCompany(); - - /** - * The meta object literal for the 'Categories' containment reference list feature. - * - * @generated - */ - EReference COMPANY__CATEGORIES = eINSTANCE.getCompany_Categories(); - - /** - * The meta object literal for the 'Suppliers' containment reference list feature. - * - * @generated - */ - EReference COMPANY__SUPPLIERS = eINSTANCE.getCompany_Suppliers(); - - /** - * The meta object literal for the 'Purchase Orders' containment reference list feature. - * - * @generated - */ - EReference COMPANY__PURCHASE_ORDERS = eINSTANCE.getCompany_PurchaseOrders(); - - /** - * The meta object literal for the 'Customers' containment reference list feature. - * - * @generated - */ - EReference COMPANY__CUSTOMERS = eINSTANCE.getCompany_Customers(); - - /** - * The meta object literal for the 'Sales Orders' containment reference list feature. - * - * @generated - */ - EReference COMPANY__SALES_ORDERS = eINSTANCE.getCompany_SalesOrders(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model1.impl.CustomerImpl Customer}' class. - * - * @see org.eclipse.emf.cdo.tests.model1.impl.CustomerImpl - * @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getCustomer() - * @generated - */ - EClass CUSTOMER = eINSTANCE.getCustomer(); - - /** - * The meta object literal for the 'Sales Orders' reference list feature. - * - * - * @generated - */ - EReference CUSTOMER__SALES_ORDERS = eINSTANCE.getCustomer_SalesOrders(); - - /** - * The meta object literal for the 'Order By Product' map feature. - * - * @generated - */ - EReference CUSTOMER__ORDER_BY_PRODUCT = eINSTANCE.getCustomer_OrderByProduct(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model1.impl.OrderImpl Order}' class. - * - * @see org.eclipse.emf.cdo.tests.model1.impl.OrderImpl - * @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getOrder() - * @generated - */ - EClass ORDER = eINSTANCE.getOrder(); - - /** - * The meta object literal for the 'Order Details' containment reference list feature. - * - * @generated - */ - EReference ORDER__ORDER_DETAILS = eINSTANCE.getOrder_OrderDetails(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model1.impl.SalesOrderImpl Sales Order}' class. - * - * @see org.eclipse.emf.cdo.tests.model1.impl.SalesOrderImpl - * @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getSalesOrder() - * @generated - */ - EClass SALES_ORDER = eINSTANCE.getSalesOrder(); - - /** - * The meta object literal for the 'Id' attribute feature. - * - * @generated - */ - EAttribute SALES_ORDER__ID = eINSTANCE.getSalesOrder_Id(); - - /** - * The meta object literal for the 'Customer' reference feature. - * - * @generated - */ - EReference SALES_ORDER__CUSTOMER = eINSTANCE.getSalesOrder_Customer(); - - } - } // Model1Package diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Order.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Order.java index ce0156a407..ffa75ab679 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Order.java +++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Order.java @@ -15,37 +15,36 @@ import org.eclipse.emf.ecore.EObject; /** * A representation of the model object 'Order'. - * *

    * The following features are supported: *

      - *
    • {@link org.eclipse.emf.cdo.tests.model1.Order#getOrderDetails Order Details}
    • + *
    • {@link org.eclipse.emf.cdo.tests.model1.Order#getOrderDetails Order Details}
    • *
    *

    - * + * * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getOrder() - * @model abstract="true" - * annotation="teneo.jpa value='@Entity(name=\"BaseOrder\")'" + * @model abstract="true" annotation="teneo.jpa value='@Entity(name=\"BaseOrder\")'" * @generated */ public interface Order extends EObject { /** * + * * @generated */ String copyright = "Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n Eike Stepper - initial API and implementation"; /** - * Returns the value of the 'Order Details' containment reference list. - * The list contents are of type {@link org.eclipse.emf.cdo.tests.model1.OrderDetail}. - * It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.model1.OrderDetail#getOrder Order}'. - * + * Returns the value of the 'Order Details' containment reference list. The list contents are of type + * {@link org.eclipse.emf.cdo.tests.model1.OrderDetail}. It is bidirectional and its opposite is ' + * {@link org.eclipse.emf.cdo.tests.model1.OrderDetail#getOrder Order}'. *

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

    * + * * @return the value of the 'Order Details' containment reference list. * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getOrder_OrderDetails() * @see org.eclipse.emf.cdo.tests.model1.OrderDetail#getOrder diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/OrderAddress.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/OrderAddress.java index cbb37f31a9..63ed3d0087 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/OrderAddress.java +++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/OrderAddress.java @@ -12,34 +12,35 @@ package org.eclipse.emf.cdo.tests.model1; /** * A representation of the model object 'Order Address'. - * *

    * The following features are supported: *

      - *
    • {@link org.eclipse.emf.cdo.tests.model1.OrderAddress#isTestAttribute Test Attribute}
    • + *
    • {@link org.eclipse.emf.cdo.tests.model1.OrderAddress#isTestAttribute Test Attribute}
    • *
    *

    - * + * * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getOrderAddress() - * @model annotation="teneo.jpa value='@AssociationOverride(name=\"orderDetails\", joinColumns=@JoinColumn(name=\"orderdetails_orderaddressid\"))'" + * @model annotation= + * "teneo.jpa value='@AssociationOverride(name=\"orderDetails\", joinColumns=@JoinColumn(name=\"orderdetails_orderaddressid\"))'" * @generated */ public interface OrderAddress extends Address, Order, OrderDetail { /** * + * * @generated */ String copyright = "Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n Eike Stepper - initial API and implementation"; /** - * Returns the value of the 'Test Attribute' attribute. - * + * Returns the value of the 'Test Attribute' attribute. *

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

    * + * * @return the value of the 'Test Attribute' attribute. * @see #setTestAttribute(boolean) * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getOrderAddress_TestAttribute() @@ -49,9 +50,11 @@ public interface OrderAddress extends Address, Order, OrderDetail boolean isTestAttribute(); /** - * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model1.OrderAddress#isTestAttribute Test Attribute}' attribute. - * - * @param value the new value of the 'Test Attribute' attribute. + * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model1.OrderAddress#isTestAttribute + * Test Attribute}' attribute. + * + * @param value + * the new value of the 'Test Attribute' attribute. * @see #isTestAttribute() * @generated */ diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/OrderDetail.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/OrderDetail.java index 8cdf98ec60..8c833a790b 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/OrderDetail.java +++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/OrderDetail.java @@ -14,16 +14,15 @@ import org.eclipse.emf.ecore.EObject; /** * A representation of the model object 'Order Detail'. - * *

    * The following features are supported: *

      - *
    • {@link org.eclipse.emf.cdo.tests.model1.OrderDetail#getOrder Order}
    • - *
    • {@link org.eclipse.emf.cdo.tests.model1.OrderDetail#getProduct Product}
    • - *
    • {@link org.eclipse.emf.cdo.tests.model1.OrderDetail#getPrice Price}
    • + *
    • {@link org.eclipse.emf.cdo.tests.model1.OrderDetail#getOrder Order}
    • + *
    • {@link org.eclipse.emf.cdo.tests.model1.OrderDetail#getProduct Product}
    • + *
    • {@link org.eclipse.emf.cdo.tests.model1.OrderDetail#getPrice Price}
    • *
    *

    - * + * * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getOrderDetail() * @model * @generated @@ -32,19 +31,20 @@ public interface OrderDetail extends EObject { /** * + * * @generated */ String copyright = "Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n Eike Stepper - initial API and implementation"; /** - * Returns the value of the 'Order' container reference. - * It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.model1.Order#getOrderDetails Order Details}'. - * + * Returns the value of the 'Order' container reference. It is bidirectional and its opposite is ' + * {@link org.eclipse.emf.cdo.tests.model1.Order#getOrderDetails Order Details}'. *

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

    * + * * @return the value of the 'Order' container reference. * @see #setOrder(Order) * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getOrderDetail_Order() @@ -55,23 +55,25 @@ public interface OrderDetail extends EObject Order getOrder(); /** - * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model1.OrderDetail#getOrder Order}' container reference. - * - * @param value the new value of the 'Order' container reference. + * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model1.OrderDetail#getOrder Order}' container + * reference. + * + * @param value + * the new value of the 'Order' container reference. * @see #getOrder() * @generated */ void setOrder(Order value); /** - * Returns the value of the 'Product' reference. - * It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.model1.Product1#getOrderDetails Order Details}'. - * + * Returns the value of the 'Product' reference. It is bidirectional and its opposite is ' + * {@link org.eclipse.emf.cdo.tests.model1.Product1#getOrderDetails Order Details}'. *

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

    * + * * @return the value of the 'Product' reference. * @see #setProduct(Product1) * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getOrderDetail_Product() @@ -84,19 +86,21 @@ public interface OrderDetail extends EObject /** * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model1.OrderDetail#getProduct Product}' reference. * - * @param value the new value of the 'Product' reference. + * + * @param value + * the new value of the 'Product' reference. * @see #getProduct() * @generated */ void setProduct(Product1 value); /** - * Returns the value of the 'Price' attribute. - * + * Returns the value of the 'Price' attribute. *

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

    * + * * @return the value of the 'Price' attribute. * @see #setPrice(float) * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getOrderDetail_Price() @@ -108,7 +112,9 @@ public interface OrderDetail extends EObject /** * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model1.OrderDetail#getPrice Price}' attribute. * - * @param value the new value of the 'Price' attribute. + * + * @param value + * the new value of the 'Price' attribute. * @see #getPrice() * @generated */ diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Product1.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Product1.java index 43e931d2f0..ea11e438b9 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Product1.java +++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Product1.java @@ -15,17 +15,16 @@ import org.eclipse.emf.ecore.EObject; /** * A representation of the model object 'Product'. - * *

    * The following features are supported: *

      - *
    • {@link org.eclipse.emf.cdo.tests.model1.Product1#getName Name}
    • - *
    • {@link org.eclipse.emf.cdo.tests.model1.Product1#getOrderDetails Order Details}
    • - *
    • {@link org.eclipse.emf.cdo.tests.model1.Product1#getVat Vat}
    • - *
    • {@link org.eclipse.emf.cdo.tests.model1.Product1#getDescription Description}
    • + *
    • {@link org.eclipse.emf.cdo.tests.model1.Product1#getName Name}
    • + *
    • {@link org.eclipse.emf.cdo.tests.model1.Product1#getOrderDetails Order Details}
    • + *
    • {@link org.eclipse.emf.cdo.tests.model1.Product1#getVat Vat}
    • + *
    • {@link org.eclipse.emf.cdo.tests.model1.Product1#getDescription Description}
    • *
    *

    - * + * * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getProduct1() * @model * @generated @@ -34,17 +33,18 @@ public interface Product1 extends EObject { /** * + * * @generated */ String copyright = "Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n Eike Stepper - initial API and implementation"; /** - * Returns the value of the 'Name' attribute. - * + * 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.emf.cdo.tests.model1.Model1Package#getProduct1_Name() @@ -65,15 +65,15 @@ public interface Product1 extends EObject void setName(String value); /** - * Returns the value of the 'Order Details' reference list. - * The list contents are of type {@link org.eclipse.emf.cdo.tests.model1.OrderDetail}. - * It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.model1.OrderDetail#getProduct Product}'. - * + * Returns the value of the 'Order Details' reference list. The list contents are of type + * {@link org.eclipse.emf.cdo.tests.model1.OrderDetail}. It is bidirectional and its opposite is ' + * {@link org.eclipse.emf.cdo.tests.model1.OrderDetail#getProduct Product}'. *

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

    * + * * @return the value of the 'Order Details' reference list. * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getProduct1_OrderDetails() * @see org.eclipse.emf.cdo.tests.model1.OrderDetail#getProduct @@ -83,14 +83,13 @@ public interface Product1 extends EObject EList getOrderDetails(); /** - * Returns the value of the 'Vat' attribute. - * The default value is "vat15". - * The literals are from the enumeration {@link org.eclipse.emf.cdo.tests.model1.VAT}. - * + * Returns the value of the 'Vat' attribute. The default value is "vat15". The literals + * are from the enumeration {@link org.eclipse.emf.cdo.tests.model1.VAT}. *

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

    * + * * @return the value of the 'Vat' attribute. * @see org.eclipse.emf.cdo.tests.model1.VAT * @see #setVat(VAT) @@ -113,13 +112,13 @@ public interface Product1 extends EObject void setVat(VAT value); /** - * Returns the value of the 'Description' attribute. - * + * Returns the value of the 'Description' attribute. *

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

    * + * * @return the value of the 'Description' attribute. * @see #setDescription(String) * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getProduct1_Description() @@ -129,9 +128,11 @@ public interface Product1 extends EObject String getDescription(); /** - * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model1.Product1#getDescription Description}' attribute. - * - * @param value the new value of the 'Description' attribute. + * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model1.Product1#getDescription Description}' + * attribute. + * + * @param value + * the new value of the 'Description' attribute. * @see #getDescription() * @generated */ diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/PurchaseOrder.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/PurchaseOrder.java index 889a2c6d92..1a5192ac96 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/PurchaseOrder.java +++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/PurchaseOrder.java @@ -14,15 +14,14 @@ import java.util.Date; /** * A representation of the model object 'Purchase Order'. - * *

    * The following features are supported: *

      - *
    • {@link org.eclipse.emf.cdo.tests.model1.PurchaseOrder#getDate Date}
    • - *
    • {@link org.eclipse.emf.cdo.tests.model1.PurchaseOrder#getSupplier Supplier}
    • + *
    • {@link org.eclipse.emf.cdo.tests.model1.PurchaseOrder#getDate Date}
    • + *
    • {@link org.eclipse.emf.cdo.tests.model1.PurchaseOrder#getSupplier Supplier}
    • *
    *

    - * + * * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getPurchaseOrder() * @model * @generated @@ -31,17 +30,18 @@ public interface PurchaseOrder extends Order { /** * + * * @generated */ String copyright = "Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n Eike Stepper - initial API and implementation"; /** - * Returns the value of the 'Date' attribute. - * + * Returns the value of the 'Date' attribute. *

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

    * + * * @return the value of the 'Date' attribute. * @see #setDate(Date) * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getPurchaseOrder_Date() @@ -53,22 +53,24 @@ public interface PurchaseOrder extends Order /** * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model1.PurchaseOrder#getDate Date}' attribute. * - * @param value the new value of the 'Date' attribute. + * + * @param value + * the new value of the 'Date' attribute. * @see #getDate() * @generated */ void setDate(Date value); /** - * Returns the value of the 'Supplier' reference. - * It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.model1.Supplier#getPurchaseOrders Purchase Orders}'. - * *

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

    * + * * @return the value of the 'Supplier' reference. * @see #setSupplier(Supplier) * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getPurchaseOrder_Supplier() @@ -79,9 +81,11 @@ public interface PurchaseOrder extends Order Supplier getSupplier(); /** - * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model1.PurchaseOrder#getSupplier Supplier}' reference. - * - * @param value the new value of the 'Supplier' reference. + * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model1.PurchaseOrder#getSupplier Supplier}' + * reference. + * + * @param value + * the new value of the 'Supplier' reference. * @see #getSupplier() * @generated */ diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/SalesOrder.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/SalesOrder.java index 925e916f8d..7cb33eb6c9 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/SalesOrder.java +++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/SalesOrder.java @@ -12,15 +12,14 @@ package org.eclipse.emf.cdo.tests.model1; /** * A representation of the model object 'Sales Order'. - * *

    * The following features are supported: *

      - *
    • {@link org.eclipse.emf.cdo.tests.model1.SalesOrder#getId Id}
    • - *
    • {@link org.eclipse.emf.cdo.tests.model1.SalesOrder#getCustomer Customer}
    • + *
    • {@link org.eclipse.emf.cdo.tests.model1.SalesOrder#getId Id}
    • + *
    • {@link org.eclipse.emf.cdo.tests.model1.SalesOrder#getCustomer Customer}
    • *
    *

    - * + * * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getSalesOrder() * @model * @generated @@ -29,17 +28,18 @@ public interface SalesOrder extends Order { /** * + * * @generated */ String copyright = "Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n Eike Stepper - initial API and implementation"; /** - * Returns the value of the 'Id' attribute. - * + * Returns the value of the 'Id' attribute. *

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

    * + * * @return the value of the 'Id' attribute. * @see #setId(int) * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getSalesOrder_Id() @@ -60,14 +60,14 @@ public interface SalesOrder extends Order void setId(int value); /** - * Returns the value of the 'Customer' reference. - * It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.model1.Customer#getSalesOrders Sales Orders}'. - * + * Returns the value of the 'Customer' reference. It is bidirectional and its opposite is ' + * {@link org.eclipse.emf.cdo.tests.model1.Customer#getSalesOrders Sales Orders}'. *

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

    * + * * @return the value of the 'Customer' reference. * @see #setCustomer(Customer) * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getSalesOrder_Customer() @@ -78,9 +78,11 @@ public interface SalesOrder extends Order Customer getCustomer(); /** - * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model1.SalesOrder#getCustomer Customer}' reference. - * - * @param value the new value of the 'Customer' reference. + * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model1.SalesOrder#getCustomer Customer}' + * reference. + * + * @param value + * the new value of the 'Customer' reference. * @see #getCustomer() * @generated */ diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Supplier.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Supplier.java index ece821b65d..1bd1f1b942 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Supplier.java +++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Supplier.java @@ -14,15 +14,14 @@ import org.eclipse.emf.common.util.EList; /** * A representation of the model object 'Supplier'. - * *

    * The following features are supported: *

      - *
    • {@link org.eclipse.emf.cdo.tests.model1.Supplier#getPurchaseOrders Purchase Orders}
    • - *
    • {@link org.eclipse.emf.cdo.tests.model1.Supplier#isPreferred Preferred}
    • + *
    • {@link org.eclipse.emf.cdo.tests.model1.Supplier#getPurchaseOrders Purchase Orders}
    • + *
    • {@link org.eclipse.emf.cdo.tests.model1.Supplier#isPreferred Preferred}
    • *
    *

    - * + * * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getSupplier() * @model * @generated @@ -31,20 +30,21 @@ public interface Supplier extends Address { /** * + * * @generated */ String copyright = "Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n Eike Stepper - initial API and implementation"; /** - * Returns the value of the 'Purchase Orders' reference list. - * The list contents are of type {@link org.eclipse.emf.cdo.tests.model1.PurchaseOrder}. - * It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.model1.PurchaseOrder#getSupplier Supplier}'. - * + * Returns the value of the 'Purchase Orders' reference list. The list contents are of type + * {@link org.eclipse.emf.cdo.tests.model1.PurchaseOrder}. It is bidirectional and its opposite is ' + * {@link org.eclipse.emf.cdo.tests.model1.PurchaseOrder#getSupplier Supplier}'. *

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

    * + * * @return the value of the 'Purchase Orders' reference list. * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getSupplier_PurchaseOrders() * @see org.eclipse.emf.cdo.tests.model1.PurchaseOrder#getSupplier @@ -73,7 +73,9 @@ public interface Supplier extends Address /** * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model1.Supplier#isPreferred Preferred}' attribute. * - * @param value the new value of the 'Preferred' attribute. + * + * @param value + * the new value of the 'Preferred' attribute. * @see #isPreferred() * @generated */ diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/VAT.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/VAT.java index 8787593dd2..1ac2cf965d 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/VAT.java +++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/VAT.java @@ -19,6 +19,7 @@ import java.util.List; /** * A representation of the literals of the enumeration 'VAT', and utility * methods for working with them. + * * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getVAT() * @model * @generated @@ -26,8 +27,8 @@ import java.util.List; public enum VAT implements Enumerator { /** - * The 'Vat0' literal object. - * + * The 'Vat0' literal object. + * * @see #VAT0_VALUE * @generated * @ordered @@ -35,8 +36,8 @@ public enum VAT implements Enumerator VAT0(0, "vat0", "vat0"), /** - * The 'Vat7' literal object. - * + * The 'Vat7' literal object. + * * @see #VAT7_VALUE * @generated * @ordered @@ -44,8 +45,8 @@ public enum VAT implements Enumerator VAT7(7, "vat7", "vat7"), /** - * The 'Vat15' literal object. - * + * The 'Vat15' literal object. + * * @see #VAT15_VALUE * @generated * @ordered @@ -54,18 +55,19 @@ public enum VAT implements Enumerator /** * + * * @generated */ public static final String copyright = "Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n Eike Stepper - initial API and implementation"; /** - * The 'Vat0' literal value. - * + * The 'Vat0' literal value. *

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

    * + * * @see #VAT0 * @model name="vat0" * @generated @@ -74,13 +76,13 @@ public enum VAT implements Enumerator public static final int VAT0_VALUE = 0; /** - * The 'Vat7' literal value. - * + * The 'Vat7' literal value. *

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

    * + * * @see #VAT7 * @model name="vat7" * @generated @@ -89,13 +91,13 @@ public enum VAT implements Enumerator public static final int VAT7_VALUE = 7; /** - * The 'Vat15' literal value. - * + * The 'Vat15' literal value. *

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

    * + * * @see #VAT15 * @model name="vat15" * @generated @@ -104,23 +106,23 @@ public enum VAT implements Enumerator public static final int VAT15_VALUE = 15; /** - * An array of all the 'VAT' enumerators. - * + * An array of all the 'VAT' enumerators. + * * @generated */ private static final VAT[] VALUES_ARRAY = new VAT[] { VAT0, VAT7, VAT15, }; /** - * A public read-only list of all the 'VAT' enumerators. - * + * A public read-only list of all the 'VAT' enumerators. + * * @generated */ public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY)); /** - * Returns the 'VAT' literal with the specified literal value. - * + * * @generated */ public static VAT get(String literal) @@ -137,8 +139,8 @@ public enum VAT implements Enumerator } /** - * Returns the 'VAT' literal with the specified name. - * + * Returns the 'VAT' literal with the specified name. + * * @generated */ public static VAT getByName(String name) @@ -155,9 +157,9 @@ public enum VAT implements Enumerator } /** - * Returns the 'VAT' literal with the specified integer value. - * + * * @generated */ public static VAT get(int value) @@ -176,25 +178,28 @@ public enum VAT implements Enumerator /** * + * * @generated */ private final int value; /** * + * * @generated */ private final String name; /** * + * * @generated */ private final String literal; /** - * Only this class can construct instances. - * + * Only this class can construct instances. + * * @generated */ private VAT(int value, String name, String literal) @@ -206,6 +211,7 @@ public enum VAT implements Enumerator /** * + * * @generated */ public int getValue() @@ -215,6 +221,7 @@ public enum VAT implements Enumerator /** * + * * @generated */ public String getName() @@ -224,6 +231,7 @@ public enum VAT implements Enumerator /** * + * * @generated */ public String getLiteral() @@ -232,9 +240,9 @@ public enum VAT implements Enumerator } /** - * Returns the literal value of the enumerator, which is its string representation. - * + * * @generated */ @Override diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/AddressImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/AddressImpl.java index f9719e9f93..f346375894 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/AddressImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/AddressImpl.java @@ -22,24 +22,26 @@ import org.eclipse.emf.ecore.EClass; *

    * The following features are implemented: *

      - *
    • {@link org.eclipse.emf.cdo.tests.model1.impl.AddressImpl#getName Name}
    • - *
    • {@link org.eclipse.emf.cdo.tests.model1.impl.AddressImpl#getStreet Street}
    • - *
    • {@link org.eclipse.emf.cdo.tests.model1.impl.AddressImpl#getCity City}
    • + *
    • {@link org.eclipse.emf.cdo.tests.model1.impl.AddressImpl#getName Name}
    • + *
    • {@link org.eclipse.emf.cdo.tests.model1.impl.AddressImpl#getStreet Street}
    • + *
    • {@link org.eclipse.emf.cdo.tests.model1.impl.AddressImpl#getCity City}
    • *
    *

    - * + * * @generated */ public class AddressImpl extends CDOObjectImpl implements Address { /** * + * * @generated */ public static final String copyright = "Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n Eike Stepper - initial API and implementation"; /** * + * * @generated */ protected AddressImpl() @@ -49,16 +51,18 @@ public class AddressImpl extends CDOObjectImpl implements Address /** * + * * @generated */ @Override protected EClass eStaticClass() { - return Model1Package.Literals.ADDRESS; + return Model1Package.eINSTANCE.getAddress(); } /** * + * * @generated */ @Override @@ -69,56 +73,62 @@ public class AddressImpl extends CDOObjectImpl implements Address /** * + * * @generated */ public String getName() { - return (String)eGet(Model1Package.Literals.ADDRESS__NAME, true); + return (String)eGet(Model1Package.eINSTANCE.getAddress_Name(), true); } /** * + * * @generated */ public void setName(String newName) { - eSet(Model1Package.Literals.ADDRESS__NAME, newName); + eSet(Model1Package.eINSTANCE.getAddress_Name(), newName); } /** * + * * @generated */ public String getStreet() { - return (String)eGet(Model1Package.Literals.ADDRESS__STREET, true); + return (String)eGet(Model1Package.eINSTANCE.getAddress_Street(), true); } /** * + * * @generated */ public void setStreet(String newStreet) { - eSet(Model1Package.Literals.ADDRESS__STREET, newStreet); + eSet(Model1Package.eINSTANCE.getAddress_Street(), newStreet); } /** * + * * @generated */ public String getCity() { - return (String)eGet(Model1Package.Literals.ADDRESS__CITY, true); + return (String)eGet(Model1Package.eINSTANCE.getAddress_City(), true); } /** * + * * @generated */ public void setCity(String newCity) { - eSet(Model1Package.Literals.ADDRESS__CITY, newCity); + eSet(Model1Package.eINSTANCE.getAddress_City(), newCity); } } // AddressImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/CategoryImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/CategoryImpl.java index 169592089a..a0321ce558 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/CategoryImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/CategoryImpl.java @@ -24,24 +24,26 @@ import org.eclipse.emf.ecore.EClass; *

    * The following features are implemented: *

      - *
    • {@link org.eclipse.emf.cdo.tests.model1.impl.CategoryImpl#getName Name}
    • - *
    • {@link org.eclipse.emf.cdo.tests.model1.impl.CategoryImpl#getCategories Categories}
    • - *
    • {@link org.eclipse.emf.cdo.tests.model1.impl.CategoryImpl#getProducts Products}
    • + *
    • {@link org.eclipse.emf.cdo.tests.model1.impl.CategoryImpl#getName Name}
    • + *
    • {@link org.eclipse.emf.cdo.tests.model1.impl.CategoryImpl#getCategories Categories}
    • + *
    • {@link org.eclipse.emf.cdo.tests.model1.impl.CategoryImpl#getProducts Products}
    • *
    *

    - * + * * @generated */ public class CategoryImpl extends CDOObjectImpl implements Category { /** * + * * @generated */ public static final String copyright = "Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n Eike Stepper - initial API and implementation"; /** * + * * @generated */ protected CategoryImpl() @@ -51,16 +53,18 @@ public class CategoryImpl extends CDOObjectImpl implements Category /** * + * * @generated */ @Override protected EClass eStaticClass() { - return Model1Package.Literals.CATEGORY; + return Model1Package.eINSTANCE.getCategory(); } /** * + * * @generated */ @Override @@ -71,40 +75,44 @@ public class CategoryImpl extends CDOObjectImpl implements Category /** * + * * @generated */ public String getName() { - return (String)eGet(Model1Package.Literals.CATEGORY__NAME, true); + return (String)eGet(Model1Package.eINSTANCE.getCategory_Name(), true); } /** * + * * @generated */ public void setName(String newName) { - eSet(Model1Package.Literals.CATEGORY__NAME, newName); + eSet(Model1Package.eINSTANCE.getCategory_Name(), newName); } /** * + * * @generated */ @SuppressWarnings("unchecked") public EList getCategories() { - return (EList)eGet(Model1Package.Literals.CATEGORY__CATEGORIES, true); + return (EList)eGet(Model1Package.eINSTANCE.getCategory_Categories(), true); } /** * + * * @generated */ @SuppressWarnings("unchecked") public EList getProducts() { - return (EList)eGet(Model1Package.Literals.CATEGORY__PRODUCTS, true); + return (EList)eGet(Model1Package.eINSTANCE.getCategory_Products(), true); } } // CategoryImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/CompanyImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/CompanyImpl.java index 5f9690ad7d..2a537ba4d2 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/CompanyImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/CompanyImpl.java @@ -26,26 +26,28 @@ import org.eclipse.emf.ecore.EClass; *

    * The following features are implemented: *

      - *
    • {@link org.eclipse.emf.cdo.tests.model1.impl.CompanyImpl#getCategories Categories}
    • - *
    • {@link org.eclipse.emf.cdo.tests.model1.impl.CompanyImpl#getSuppliers Suppliers}
    • - *
    • {@link org.eclipse.emf.cdo.tests.model1.impl.CompanyImpl#getCustomers Customers}
    • - *
    • {@link org.eclipse.emf.cdo.tests.model1.impl.CompanyImpl#getPurchaseOrders Purchase Orders}
    • - *
    • {@link org.eclipse.emf.cdo.tests.model1.impl.CompanyImpl#getSalesOrders Sales Orders}
    • + *
    • {@link org.eclipse.emf.cdo.tests.model1.impl.CompanyImpl#getCategories Categories}
    • + *
    • {@link org.eclipse.emf.cdo.tests.model1.impl.CompanyImpl#getSuppliers Suppliers}
    • + *
    • {@link org.eclipse.emf.cdo.tests.model1.impl.CompanyImpl#getCustomers Customers}
    • + *
    • {@link org.eclipse.emf.cdo.tests.model1.impl.CompanyImpl#getPurchaseOrders Purchase Orders}
    • + *
    • {@link org.eclipse.emf.cdo.tests.model1.impl.CompanyImpl#getSalesOrders Sales Orders}
    • *
    *

    - * + * * @generated */ public class CompanyImpl extends AddressImpl implements Company { /** * + * * @generated */ public static final String copyright = "Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n Eike Stepper - initial API and implementation"; /** * + * * @generated */ protected CompanyImpl() @@ -55,62 +57,68 @@ public class CompanyImpl extends AddressImpl implements Company /** * + * * @generated */ @Override protected EClass eStaticClass() { - return Model1Package.Literals.COMPANY; + return Model1Package.eINSTANCE.getCompany(); } /** * + * * @generated */ @SuppressWarnings("unchecked") public EList getCategories() { - return (EList)eGet(Model1Package.Literals.COMPANY__CATEGORIES, true); + return (EList)eGet(Model1Package.eINSTANCE.getCompany_Categories(), true); } /** * + * * @generated */ @SuppressWarnings("unchecked") public EList getSuppliers() { - return (EList)eGet(Model1Package.Literals.COMPANY__SUPPLIERS, true); + return (EList)eGet(Model1Package.eINSTANCE.getCompany_Suppliers(), true); } /** * + * * @generated */ @SuppressWarnings("unchecked") public EList getPurchaseOrders() { - return (EList)eGet(Model1Package.Literals.COMPANY__PURCHASE_ORDERS, true); + return (EList)eGet(Model1Package.eINSTANCE.getCompany_PurchaseOrders(), true); } /** * + * * @generated */ @SuppressWarnings("unchecked") public EList getCustomers() { - return (EList)eGet(Model1Package.Literals.COMPANY__CUSTOMERS, true); + return (EList)eGet(Model1Package.eINSTANCE.getCompany_Customers(), true); } /** * + * * @generated */ @SuppressWarnings("unchecked") public EList getSalesOrders() { - return (EList)eGet(Model1Package.Literals.COMPANY__SALES_ORDERS, true); + return (EList)eGet(Model1Package.eINSTANCE.getCompany_SalesOrders(), true); } } // CompanyImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/CustomerImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/CustomerImpl.java index 3cb95d638b..d18a5f366b 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/CustomerImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/CustomerImpl.java @@ -24,23 +24,25 @@ import org.eclipse.emf.ecore.EClass; *

    * The following features are implemented: *

      - *
    • {@link org.eclipse.emf.cdo.tests.model1.impl.CustomerImpl#getSalesOrders Sales Orders}
    • - *
    • {@link org.eclipse.emf.cdo.tests.model1.impl.CustomerImpl#getOrderByProduct Order By Product}
    • + *
    • {@link org.eclipse.emf.cdo.tests.model1.impl.CustomerImpl#getSalesOrders Sales Orders}
    • + *
    • {@link org.eclipse.emf.cdo.tests.model1.impl.CustomerImpl#getOrderByProduct Order By Product}
    • *
    *

    - * + * * @generated */ public class CustomerImpl extends AddressImpl implements Customer { /** * + * * @generated */ public static final String copyright = "Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n Eike Stepper - initial API and implementation"; /** * + * * @generated */ protected CustomerImpl() @@ -50,32 +52,35 @@ public class CustomerImpl extends AddressImpl implements Customer /** * + * * @generated */ @Override protected EClass eStaticClass() { - return Model1Package.Literals.CUSTOMER; + return Model1Package.eINSTANCE.getCustomer(); } /** * + * * @generated */ @SuppressWarnings("unchecked") public EList getSalesOrders() { - return (EList)eGet(Model1Package.Literals.CUSTOMER__SALES_ORDERS, true); + return (EList)eGet(Model1Package.eINSTANCE.getCustomer_SalesOrders(), true); } /** * + * * @generated */ @SuppressWarnings("unchecked") public EMap getOrderByProduct() { - return (EMap)eGet(Model1Package.Literals.CUSTOMER__ORDER_BY_PRODUCT, true); + return (EMap)eGet(Model1Package.eINSTANCE.getCustomer_OrderByProduct(), true); } } // CustomerImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/Model1FactoryImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/Model1FactoryImpl.java index 3889087c52..5a26cbeaca 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/Model1FactoryImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/Model1FactoryImpl.java @@ -35,19 +35,21 @@ import java.util.Map; /** * An implementation of the model Factory. + * * @generated */ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory { /** * + * * @generated */ public static final String copyright = "Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n Eike Stepper - initial API and implementation"; /** - * Creates the default factory implementation. - * + * Creates the default factory implementation. + * * @generated */ public static Model1Factory init() @@ -69,8 +71,8 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory } /** - * Creates an instance of the factory. - * + * Creates an instance of the factory. + * * @generated */ public Model1FactoryImpl() @@ -80,6 +82,7 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory /** * + * * @generated */ @Override @@ -116,6 +119,7 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory /** * + * * @generated */ @Override @@ -132,6 +136,7 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory /** * + * * @generated */ @Override @@ -148,6 +153,7 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory /** * + * * @generated */ public Address createAddress() @@ -158,6 +164,7 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory /** * + * * @generated */ public Supplier createSupplier() @@ -168,6 +175,7 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory /** * + * * @generated */ public PurchaseOrder createPurchaseOrder() @@ -178,6 +186,7 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory /** * + * * @generated */ public OrderDetail createOrderDetail() @@ -188,6 +197,7 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory /** * + * * @generated */ public OrderAddress createOrderAddress() @@ -198,6 +208,7 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory /** * + * * @generated */ public Map.Entry createProductToOrder() @@ -208,6 +219,7 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory /** * + * * @generated */ public VAT createVATFromString(EDataType eDataType, String initialValue) @@ -221,6 +233,7 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory /** * + * * @generated */ public String convertVATToString(EDataType eDataType, Object instanceValue) @@ -230,6 +243,7 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory /** * + * * @generated */ public Category createCategory() @@ -240,6 +254,7 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory /** * + * * @generated */ public Product1 createProduct1() @@ -250,6 +265,7 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory /** * + * * @generated */ public Company createCompany() @@ -260,6 +276,7 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory /** * + * * @generated */ public Customer createCustomer() @@ -270,6 +287,7 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory /** * + * * @generated */ public SalesOrder createSalesOrder() @@ -280,6 +298,7 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory /** * + * * @generated */ public Model1Package getModel1Package() @@ -289,6 +308,7 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory /** * + * * @deprecated * @generated */ diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/Model1PackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/Model1PackageImpl.java index 87ad346d1c..2c08864d39 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/Model1PackageImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/Model1PackageImpl.java @@ -35,90 +35,105 @@ import java.util.Map; /** * An implementation of the model Package. + * * @generated */ public class Model1PackageImpl extends EPackageImpl implements Model1Package { /** * + * * @generated */ public static final String copyright = "Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n Eike Stepper - initial API and implementation"; /** * + * * @generated */ private EClass addressEClass = null; /** * + * * @generated */ private EClass supplierEClass = null; /** * + * * @generated */ private EClass purchaseOrderEClass = null; /** * + * * @generated */ private EClass orderDetailEClass = null; /** * + * * @generated */ private EClass orderAddressEClass = null; /** * + * * @generated */ private EClass productToOrderEClass = null; /** * + * * @generated */ private EEnum vatEEnum = null; /** * + * * @generated */ private EClass categoryEClass = null; /** * + * * @generated */ private EClass product1EClass = null; /** * + * * @generated */ private EClass companyEClass = null; /** * + * * @generated */ private EClass customerEClass = null; /** * + * * @generated */ private EClass orderEClass = null; /** * + * * @generated */ private EClass salesOrderEClass = null; @@ -143,17 +158,18 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * + * * @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 Model1Package#eINSTANCE} when that field is accessed. - * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. - * + *

    + * This method is used to initialize {@link Model1Package#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() @@ -186,6 +202,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * + * * @generated */ public EClass getAddress() @@ -195,6 +212,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * + * * @generated */ public EAttribute getAddress_Name() @@ -204,6 +222,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * + * * @generated */ public EAttribute getAddress_Street() @@ -213,6 +232,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * + * * @generated */ public EAttribute getAddress_City() @@ -222,6 +242,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * + * * @generated */ public EClass getSupplier() @@ -231,6 +252,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * + * * @generated */ public EReference getSupplier_PurchaseOrders() @@ -240,6 +262,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * + * * @generated */ public EAttribute getSupplier_Preferred() @@ -249,6 +272,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * + * * @generated */ public EClass getPurchaseOrder() @@ -258,6 +282,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * + * * @generated */ public EAttribute getPurchaseOrder_Date() @@ -267,6 +292,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * + * * @generated */ public EReference getPurchaseOrder_Supplier() @@ -276,6 +302,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * + * * @generated */ public EClass getOrderDetail() @@ -285,6 +312,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * + * * @generated */ public EReference getOrderDetail_Order() @@ -294,6 +322,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * + * * @generated */ public EReference getOrderDetail_Product() @@ -303,6 +332,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * + * * @generated */ public EAttribute getOrderDetail_Price() @@ -312,6 +342,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * + * * @generated */ public EClass getOrderAddress() @@ -321,6 +352,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * + * * @generated */ public EAttribute getOrderAddress_TestAttribute() @@ -330,6 +362,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * + * * @generated */ public EClass getProductToOrder() @@ -339,6 +372,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * + * * @generated */ public EReference getProductToOrder_Key() @@ -348,6 +382,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * + * * @generated */ public EReference getProductToOrder_Value() @@ -357,6 +392,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * + * * @generated */ public EEnum getVAT() @@ -366,6 +402,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * + * * @generated */ public EClass getCategory() @@ -375,6 +412,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * + * * @generated */ public EAttribute getCategory_Name() @@ -384,6 +422,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * + * * @generated */ public EReference getCategory_Categories() @@ -393,6 +432,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * + * * @generated */ public EReference getCategory_Products() @@ -402,6 +442,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * + * * @generated */ public EClass getProduct1() @@ -411,6 +452,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * + * * @generated */ public EAttribute getProduct1_Name() @@ -420,6 +462,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * + * * @generated */ public EReference getProduct1_OrderDetails() @@ -429,6 +472,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * + * * @generated */ public EAttribute getProduct1_Vat() @@ -438,6 +482,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * + * * @generated */ public EAttribute getProduct1_Description() @@ -447,6 +492,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * + * * @generated */ public EClass getCompany() @@ -456,6 +502,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * + * * @generated */ public EReference getCompany_Categories() @@ -465,6 +512,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * + * * @generated */ public EReference getCompany_Suppliers() @@ -474,6 +522,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * + * * @generated */ public EReference getCompany_PurchaseOrders() @@ -483,6 +532,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * + * * @generated */ public EReference getCompany_Customers() @@ -492,6 +542,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * + * * @generated */ public EReference getCompany_SalesOrders() @@ -501,6 +552,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * + * * @generated */ public EClass getCustomer() @@ -510,6 +562,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * + * * @generated */ public EReference getCustomer_SalesOrders() @@ -519,6 +572,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * + * * @generated */ public EReference getCustomer_OrderByProduct() @@ -528,6 +582,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * + * * @generated */ public EClass getOrder() @@ -537,6 +592,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * + * * @generated */ public EReference getOrder_OrderDetails() @@ -546,6 +602,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * + * * @generated */ public EClass getSalesOrder() @@ -555,6 +612,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * + * * @generated */ public EAttribute getSalesOrder_Id() @@ -564,6 +622,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * + * * @generated */ public EReference getSalesOrder_Customer() @@ -573,6 +632,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * + * * @generated */ public Model1Factory getModel1Factory() @@ -582,14 +642,15 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * + * * @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. - * + * 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() @@ -659,14 +720,15 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * + * * @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. - * + * 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() @@ -818,8 +880,8 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package } /** - * Initializes the annotations for teneo.jpa. - * + * Initializes the annotations for teneo.jpa. + * * @generated */ protected void createTeneoAnnotations() diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/OrderAddressImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/OrderAddressImpl.java index f9973c9cac..a9faa062f7 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/OrderAddressImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/OrderAddressImpl.java @@ -24,26 +24,28 @@ import org.eclipse.emf.ecore.EClass; *

    * The following features are implemented: *

      - *
    • {@link org.eclipse.emf.cdo.tests.model1.impl.OrderAddressImpl#getOrderDetails Order Details}
    • - *
    • {@link org.eclipse.emf.cdo.tests.model1.impl.OrderAddressImpl#getOrder Order}
    • - *
    • {@link org.eclipse.emf.cdo.tests.model1.impl.OrderAddressImpl#getProduct Product}
    • - *
    • {@link org.eclipse.emf.cdo.tests.model1.impl.OrderAddressImpl#getPrice Price}
    • - *
    • {@link org.eclipse.emf.cdo.tests.model1.impl.OrderAddressImpl#isTestAttribute Test Attribute}
    • + *
    • {@link org.eclipse.emf.cdo.tests.model1.impl.OrderAddressImpl#getOrderDetails Order Details}
    • + *
    • {@link org.eclipse.emf.cdo.tests.model1.impl.OrderAddressImpl#getOrder Order}
    • + *
    • {@link org.eclipse.emf.cdo.tests.model1.impl.OrderAddressImpl#getProduct Product}
    • + *
    • {@link org.eclipse.emf.cdo.tests.model1.impl.OrderAddressImpl#getPrice Price}
    • + *
    • {@link org.eclipse.emf.cdo.tests.model1.impl.OrderAddressImpl#isTestAttribute Test Attribute}
    • *
    *

    - * + * * @generated */ public class OrderAddressImpl extends AddressImpl implements OrderAddress { /** * + * * @generated */ public static final String copyright = "Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n Eike Stepper - initial API and implementation"; /** * + * * @generated */ protected OrderAddressImpl() @@ -53,98 +55,109 @@ public class OrderAddressImpl extends AddressImpl implements OrderAddress /** * + * * @generated */ @Override protected EClass eStaticClass() { - return Model1Package.Literals.ORDER_ADDRESS; + return Model1Package.eINSTANCE.getOrderAddress(); } /** * + * * @generated */ @SuppressWarnings("unchecked") public EList getOrderDetails() { - return (EList)eGet(Model1Package.Literals.ORDER__ORDER_DETAILS, true); + return (EList)eGet(Model1Package.eINSTANCE.getOrder_OrderDetails(), true); } /** * + * * @generated */ public Order getOrder() { - return (Order)eGet(Model1Package.Literals.ORDER_DETAIL__ORDER, true); + return (Order)eGet(Model1Package.eINSTANCE.getOrderDetail_Order(), true); } /** * + * * @generated */ public void setOrder(Order newOrder) { - eSet(Model1Package.Literals.ORDER_DETAIL__ORDER, newOrder); + eSet(Model1Package.eINSTANCE.getOrderDetail_Order(), newOrder); } /** * + * * @generated */ public Product1 getProduct() { - return (Product1)eGet(Model1Package.Literals.ORDER_DETAIL__PRODUCT, true); + return (Product1)eGet(Model1Package.eINSTANCE.getOrderDetail_Product(), true); } /** * + * * @generated */ public void setProduct(Product1 newProduct) { - eSet(Model1Package.Literals.ORDER_DETAIL__PRODUCT, newProduct); + eSet(Model1Package.eINSTANCE.getOrderDetail_Product(), newProduct); } /** * + * * @generated */ public float getPrice() { - return (Float)eGet(Model1Package.Literals.ORDER_DETAIL__PRICE, true); + return (Float)eGet(Model1Package.eINSTANCE.getOrderDetail_Price(), true); } /** * + * * @generated */ public void setPrice(float newPrice) { - eSet(Model1Package.Literals.ORDER_DETAIL__PRICE, newPrice); + eSet(Model1Package.eINSTANCE.getOrderDetail_Price(), newPrice); } /** * + * * @generated */ public boolean isTestAttribute() { - return (Boolean)eGet(Model1Package.Literals.ORDER_ADDRESS__TEST_ATTRIBUTE, true); + return (Boolean)eGet(Model1Package.eINSTANCE.getOrderAddress_TestAttribute(), true); } /** * + * * @generated */ public void setTestAttribute(boolean newTestAttribute) { - eSet(Model1Package.Literals.ORDER_ADDRESS__TEST_ATTRIBUTE, newTestAttribute); + eSet(Model1Package.eINSTANCE.getOrderAddress_TestAttribute(), newTestAttribute); } /** * + * * @generated */ @Override @@ -179,6 +192,7 @@ public class OrderAddressImpl extends AddressImpl implements OrderAddress /** * + * * @generated */ @Override diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/OrderDetailImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/OrderDetailImpl.java index edf56175b0..584d6aa346 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/OrderDetailImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/OrderDetailImpl.java @@ -24,24 +24,26 @@ import org.eclipse.emf.ecore.EClass; *

    * The following features are implemented: *

      - *
    • {@link org.eclipse.emf.cdo.tests.model1.impl.OrderDetailImpl#getOrder Order}
    • - *
    • {@link org.eclipse.emf.cdo.tests.model1.impl.OrderDetailImpl#getProduct Product}
    • - *
    • {@link org.eclipse.emf.cdo.tests.model1.impl.OrderDetailImpl#getPrice Price}
    • + *
    • {@link org.eclipse.emf.cdo.tests.model1.impl.OrderDetailImpl#getOrder Order}
    • + *
    • {@link org.eclipse.emf.cdo.tests.model1.impl.OrderDetailImpl#getProduct Product}
    • + *
    • {@link org.eclipse.emf.cdo.tests.model1.impl.OrderDetailImpl#getPrice Price}
    • *
    *

    - * + * * @generated */ public class OrderDetailImpl extends CDOObjectImpl implements OrderDetail { /** * + * * @generated */ public static final String copyright = "Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n Eike Stepper - initial API and implementation"; /** * + * * @generated */ protected OrderDetailImpl() @@ -51,16 +53,18 @@ public class OrderDetailImpl extends CDOObjectImpl implements OrderDetail /** * + * * @generated */ @Override protected EClass eStaticClass() { - return Model1Package.Literals.ORDER_DETAIL; + return Model1Package.eINSTANCE.getOrderDetail(); } /** * + * * @generated */ @Override @@ -71,56 +75,62 @@ public class OrderDetailImpl extends CDOObjectImpl implements OrderDetail /** * + * * @generated */ public Order getOrder() { - return (Order)eGet(Model1Package.Literals.ORDER_DETAIL__ORDER, true); + return (Order)eGet(Model1Package.eINSTANCE.getOrderDetail_Order(), true); } /** * + * * @generated */ public void setOrder(Order newOrder) { - eSet(Model1Package.Literals.ORDER_DETAIL__ORDER, newOrder); + eSet(Model1Package.eINSTANCE.getOrderDetail_Order(), newOrder); } /** * + * * @generated */ public Product1 getProduct() { - return (Product1)eGet(Model1Package.Literals.ORDER_DETAIL__PRODUCT, true); + return (Product1)eGet(Model1Package.eINSTANCE.getOrderDetail_Product(), true); } /** * + * * @generated */ public void setProduct(Product1 newProduct) { - eSet(Model1Package.Literals.ORDER_DETAIL__PRODUCT, newProduct); + eSet(Model1Package.eINSTANCE.getOrderDetail_Product(), newProduct); } /** * + * * @generated */ public float getPrice() { - return (Float)eGet(Model1Package.Literals.ORDER_DETAIL__PRICE, true); + return (Float)eGet(Model1Package.eINSTANCE.getOrderDetail_Price(), true); } /** * + * * @generated */ public void setPrice(float newPrice) { - eSet(Model1Package.Literals.ORDER_DETAIL__PRICE, newPrice); + eSet(Model1Package.eINSTANCE.getOrderDetail_Price(), newPrice); } } // OrderDetailImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/OrderImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/OrderImpl.java index d7998be8b4..990ca3364f 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/OrderImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/OrderImpl.java @@ -24,22 +24,24 @@ import org.eclipse.emf.ecore.EClass; *

    * The following features are implemented: *

      - *
    • {@link org.eclipse.emf.cdo.tests.model1.impl.OrderImpl#getOrderDetails Order Details}
    • + *
    • {@link org.eclipse.emf.cdo.tests.model1.impl.OrderImpl#getOrderDetails Order Details}
    • *
    *

    - * + * * @generated */ public abstract class OrderImpl extends CDOObjectImpl implements Order { /** * + * * @generated */ public static final String copyright = "Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n Eike Stepper - initial API and implementation"; /** * + * * @generated */ protected OrderImpl() @@ -49,16 +51,18 @@ public abstract class OrderImpl extends CDOObjectImpl implements Order /** * + * * @generated */ @Override protected EClass eStaticClass() { - return Model1Package.Literals.ORDER; + return Model1Package.eINSTANCE.getOrder(); } /** * + * * @generated */ @Override @@ -69,12 +73,13 @@ public abstract class OrderImpl extends CDOObjectImpl implements Order /** * + * * @generated */ @SuppressWarnings("unchecked") public EList getOrderDetails() { - return (EList)eGet(Model1Package.Literals.ORDER__ORDER_DETAILS, true); + return (EList)eGet(Model1Package.eINSTANCE.getOrder_OrderDetails(), true); } } // OrderImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/Product1Impl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/Product1Impl.java index 609c64ac4b..59c0af1c08 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/Product1Impl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/Product1Impl.java @@ -25,25 +25,27 @@ import org.eclipse.emf.ecore.EClass; *

    * The following features are implemented: *

      - *
    • {@link org.eclipse.emf.cdo.tests.model1.impl.Product1Impl#getName Name}
    • - *
    • {@link org.eclipse.emf.cdo.tests.model1.impl.Product1Impl#getOrderDetails Order Details}
    • - *
    • {@link org.eclipse.emf.cdo.tests.model1.impl.Product1Impl#getVat Vat}
    • - *
    • {@link org.eclipse.emf.cdo.tests.model1.impl.Product1Impl#getDescription Description}
    • + *
    • {@link org.eclipse.emf.cdo.tests.model1.impl.Product1Impl#getName Name}
    • + *
    • {@link org.eclipse.emf.cdo.tests.model1.impl.Product1Impl#getOrderDetails Order Details}
    • + *
    • {@link org.eclipse.emf.cdo.tests.model1.impl.Product1Impl#getVat Vat}
    • + *
    • {@link org.eclipse.emf.cdo.tests.model1.impl.Product1Impl#getDescription Description}
    • *
    *

    - * + * * @generated */ public class Product1Impl extends CDOObjectImpl implements Product1 { /** * + * * @generated */ public static final String copyright = "Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n Eike Stepper - initial API and implementation"; /** * + * * @generated */ protected Product1Impl() @@ -53,16 +55,18 @@ public class Product1Impl extends CDOObjectImpl implements Product1 /** * + * * @generated */ @Override protected EClass eStaticClass() { - return Model1Package.Literals.PRODUCT1; + return Model1Package.eINSTANCE.getProduct1(); } /** * + * * @generated */ @Override @@ -73,66 +77,73 @@ public class Product1Impl extends CDOObjectImpl implements Product1 /** * + * * @generated */ public String getName() { - return (String)eGet(Model1Package.Literals.PRODUCT1__NAME, true); + return (String)eGet(Model1Package.eINSTANCE.getProduct1_Name(), true); } /** * + * * @generated */ public void setName(String newName) { - eSet(Model1Package.Literals.PRODUCT1__NAME, newName); + eSet(Model1Package.eINSTANCE.getProduct1_Name(), newName); } /** * + * * @generated */ @SuppressWarnings("unchecked") public EList getOrderDetails() { - return (EList)eGet(Model1Package.Literals.PRODUCT1__ORDER_DETAILS, true); + return (EList)eGet(Model1Package.eINSTANCE.getProduct1_OrderDetails(), true); } /** * + * * @generated */ public VAT getVat() { - return (VAT)eGet(Model1Package.Literals.PRODUCT1__VAT, true); + return (VAT)eGet(Model1Package.eINSTANCE.getProduct1_Vat(), true); } /** * + * * @generated */ public void setVat(VAT newVat) { - eSet(Model1Package.Literals.PRODUCT1__VAT, newVat); + eSet(Model1Package.eINSTANCE.getProduct1_Vat(), newVat); } /** * + * * @generated */ public String getDescription() { - return (String)eGet(Model1Package.Literals.PRODUCT1__DESCRIPTION, true); + return (String)eGet(Model1Package.eINSTANCE.getProduct1_Description(), true); } /** * + * * @generated */ public void setDescription(String newDescription) { - eSet(Model1Package.Literals.PRODUCT1__DESCRIPTION, newDescription); + eSet(Model1Package.eINSTANCE.getProduct1_Description(), newDescription); } } // ProductImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/ProductToOrderImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/ProductToOrderImpl.java index 269ada1e9b..9a207a572e 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/ProductToOrderImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/ProductToOrderImpl.java @@ -38,12 +38,14 @@ public class ProductToOrderImpl extends CDOObjectImpl implements BasicEMap.Entry { /** * + * * @generated */ public static final String copyright = "Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n Eike Stepper - initial API and implementation"; /** * + * * @generated */ protected ProductToOrderImpl() @@ -53,16 +55,18 @@ public class ProductToOrderImpl extends CDOObjectImpl implements BasicEMap.Entry /** * + * * @generated */ @Override protected EClass eStaticClass() { - return Model1Package.Literals.PRODUCT_TO_ORDER; + return Model1Package.eINSTANCE.getProductToOrder(); } /** * + * * @generated */ @Override @@ -73,48 +77,54 @@ public class ProductToOrderImpl extends CDOObjectImpl implements BasicEMap.Entry /** * + * * @generated */ public Product1 getTypedKey() { - return (Product1)eGet(Model1Package.Literals.PRODUCT_TO_ORDER__KEY, true); + return (Product1)eGet(Model1Package.eINSTANCE.getProductToOrder_Key(), true); } /** * + * * @generated */ public void setTypedKey(Product1 newKey) { - eSet(Model1Package.Literals.PRODUCT_TO_ORDER__KEY, newKey); + eSet(Model1Package.eINSTANCE.getProductToOrder_Key(), newKey); } /** * + * * @generated */ public SalesOrder getTypedValue() { - return (SalesOrder)eGet(Model1Package.Literals.PRODUCT_TO_ORDER__VALUE, true); + return (SalesOrder)eGet(Model1Package.eINSTANCE.getProductToOrder_Value(), true); } /** * + * * @generated */ public void setTypedValue(SalesOrder newValue) { - eSet(Model1Package.Literals.PRODUCT_TO_ORDER__VALUE, newValue); + eSet(Model1Package.eINSTANCE.getProductToOrder_Value(), newValue); } /** * + * * @generated */ protected int hash = -1; /** * + * * @generated */ public int getHash() @@ -129,6 +139,7 @@ public class ProductToOrderImpl extends CDOObjectImpl implements BasicEMap.Entry /** * + * * @generated */ public void setHash(int hash) @@ -138,6 +149,7 @@ public class ProductToOrderImpl extends CDOObjectImpl implements BasicEMap.Entry /** * + * * @generated */ public Product1 getKey() @@ -147,6 +159,7 @@ public class ProductToOrderImpl extends CDOObjectImpl implements BasicEMap.Entry /** * + * * @generated */ public void setKey(Product1 key) @@ -156,6 +169,7 @@ public class ProductToOrderImpl extends CDOObjectImpl implements BasicEMap.Entry /** * + * * @generated */ public SalesOrder getValue() @@ -165,6 +179,7 @@ public class ProductToOrderImpl extends CDOObjectImpl implements BasicEMap.Entry /** * + * * @generated */ public SalesOrder setValue(SalesOrder value) @@ -176,6 +191,7 @@ public class ProductToOrderImpl extends CDOObjectImpl implements BasicEMap.Entry /** * + * * @generated */ @SuppressWarnings("unchecked") diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/PurchaseOrderImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/PurchaseOrderImpl.java index 830acf4f78..01a367531d 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/PurchaseOrderImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/PurchaseOrderImpl.java @@ -23,23 +23,25 @@ import java.util.Date; *

    * The following features are implemented: *

      - *
    • {@link org.eclipse.emf.cdo.tests.model1.impl.PurchaseOrderImpl#getDate Date}
    • - *
    • {@link org.eclipse.emf.cdo.tests.model1.impl.PurchaseOrderImpl#getSupplier Supplier}
    • + *
    • {@link org.eclipse.emf.cdo.tests.model1.impl.PurchaseOrderImpl#getDate Date}
    • + *
    • {@link org.eclipse.emf.cdo.tests.model1.impl.PurchaseOrderImpl#getSupplier Supplier}
    • *
    *

    - * + * * @generated */ public class PurchaseOrderImpl extends OrderImpl implements PurchaseOrder { /** * + * * @generated */ public static final String copyright = "Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n Eike Stepper - initial API and implementation"; /** * + * * @generated */ protected PurchaseOrderImpl() @@ -49,48 +51,53 @@ public class PurchaseOrderImpl extends OrderImpl implements PurchaseOrder /** * + * * @generated */ @Override protected EClass eStaticClass() { - return Model1Package.Literals.PURCHASE_ORDER; + return Model1Package.eINSTANCE.getPurchaseOrder(); } /** * + * * @generated */ public Date getDate() { - return (Date)eGet(Model1Package.Literals.PURCHASE_ORDER__DATE, true); + return (Date)eGet(Model1Package.eINSTANCE.getPurchaseOrder_Date(), true); } /** * + * * @generated */ public void setDate(Date newDate) { - eSet(Model1Package.Literals.PURCHASE_ORDER__DATE, newDate); + eSet(Model1Package.eINSTANCE.getPurchaseOrder_Date(), newDate); } /** * + * * @generated */ public Supplier getSupplier() { - return (Supplier)eGet(Model1Package.Literals.PURCHASE_ORDER__SUPPLIER, true); + return (Supplier)eGet(Model1Package.eINSTANCE.getPurchaseOrder_Supplier(), true); } /** * + * * @generated */ public void setSupplier(Supplier newSupplier) { - eSet(Model1Package.Literals.PURCHASE_ORDER__SUPPLIER, newSupplier); + eSet(Model1Package.eINSTANCE.getPurchaseOrder_Supplier(), newSupplier); } } // PurchaseOrderImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/SalesOrderImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/SalesOrderImpl.java index 4bf7517f4c..a24dc0f5e6 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/SalesOrderImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/SalesOrderImpl.java @@ -21,23 +21,25 @@ import org.eclipse.emf.ecore.EClass; *

    * The following features are implemented: *

      - *
    • {@link org.eclipse.emf.cdo.tests.model1.impl.SalesOrderImpl#getId Id}
    • - *
    • {@link org.eclipse.emf.cdo.tests.model1.impl.SalesOrderImpl#getCustomer Customer}
    • + *
    • {@link org.eclipse.emf.cdo.tests.model1.impl.SalesOrderImpl#getId Id}
    • + *
    • {@link org.eclipse.emf.cdo.tests.model1.impl.SalesOrderImpl#getCustomer Customer}
    • *
    *

    - * + * * @generated */ public class SalesOrderImpl extends OrderImpl implements SalesOrder { /** * + * * @generated */ public static final String copyright = "Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n Eike Stepper - initial API and implementation"; /** * + * * @generated */ protected SalesOrderImpl() @@ -47,48 +49,53 @@ public class SalesOrderImpl extends OrderImpl implements SalesOrder /** * + * * @generated */ @Override protected EClass eStaticClass() { - return Model1Package.Literals.SALES_ORDER; + return Model1Package.eINSTANCE.getSalesOrder(); } /** * + * * @generated */ public int getId() { - return (Integer)eGet(Model1Package.Literals.SALES_ORDER__ID, true); + return (Integer)eGet(Model1Package.eINSTANCE.getSalesOrder_Id(), true); } /** * + * * @generated */ public void setId(int newId) { - eSet(Model1Package.Literals.SALES_ORDER__ID, newId); + eSet(Model1Package.eINSTANCE.getSalesOrder_Id(), newId); } /** * + * * @generated */ public Customer getCustomer() { - return (Customer)eGet(Model1Package.Literals.SALES_ORDER__CUSTOMER, true); + return (Customer)eGet(Model1Package.eINSTANCE.getSalesOrder_Customer(), true); } /** * + * * @generated */ public void setCustomer(Customer newCustomer) { - eSet(Model1Package.Literals.SALES_ORDER__CUSTOMER, newCustomer); + eSet(Model1Package.eINSTANCE.getSalesOrder_Customer(), newCustomer); } } // SalesOrderImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/SupplierImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/SupplierImpl.java index 3ad24ed748..857fb35a9e 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/SupplierImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/SupplierImpl.java @@ -22,23 +22,25 @@ import org.eclipse.emf.ecore.EClass; *

    * The following features are implemented: *

      - *
    • {@link org.eclipse.emf.cdo.tests.model1.impl.SupplierImpl#getPurchaseOrders Purchase Orders}
    • - *
    • {@link org.eclipse.emf.cdo.tests.model1.impl.SupplierImpl#isPreferred Preferred}
    • + *
    • {@link org.eclipse.emf.cdo.tests.model1.impl.SupplierImpl#getPurchaseOrders Purchase Orders}
    • + *
    • {@link org.eclipse.emf.cdo.tests.model1.impl.SupplierImpl#isPreferred Preferred}
    • *
    *

    - * + * * @generated */ public class SupplierImpl extends AddressImpl implements Supplier { /** * + * * @generated */ public static final String copyright = "Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n Eike Stepper - initial API and implementation"; /** * + * * @generated */ protected SupplierImpl() @@ -48,40 +50,44 @@ public class SupplierImpl extends AddressImpl implements Supplier /** * + * * @generated */ @Override protected EClass eStaticClass() { - return Model1Package.Literals.SUPPLIER; + return Model1Package.eINSTANCE.getSupplier(); } /** * + * * @generated */ @SuppressWarnings("unchecked") public EList getPurchaseOrders() { - return (EList)eGet(Model1Package.Literals.SUPPLIER__PURCHASE_ORDERS, true); + return (EList)eGet(Model1Package.eINSTANCE.getSupplier_PurchaseOrders(), true); } /** * + * * @generated */ public boolean isPreferred() { - return (Boolean)eGet(Model1Package.Literals.SUPPLIER__PREFERRED, true); + return (Boolean)eGet(Model1Package.eINSTANCE.getSupplier_Preferred(), true); } /** * + * * @generated */ public void setPreferred(boolean newPreferred) { - eSet(Model1Package.Literals.SUPPLIER__PREFERRED, newPreferred); + eSet(Model1Package.eINSTANCE.getSupplier_Preferred(), newPreferred); } } // SupplierImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/util/Model1AdapterFactory.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/util/Model1AdapterFactory.java index 596247135e..cb5354602f 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/util/Model1AdapterFactory.java +++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/util/Model1AdapterFactory.java @@ -33,6 +33,7 @@ import java.util.Map; /** * The Adapter Factory for the model. It provides an adapter createXXX * method for each class of the model. + * * @see org.eclipse.emf.cdo.tests.model1.Model1Package * @generated */ @@ -40,20 +41,21 @@ public class Model1AdapterFactory extends AdapterFactoryImpl { /** * + * * @generated */ public static final String copyright = "Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n Eike Stepper - initial API and implementation"; /** - * The cached model package. - * + * The cached model package. + * * @generated */ protected static Model1Package modelPackage; /** - * Creates an instance of the adapter factory. - * + * Creates an instance of the adapter factory. + * * @generated */ public Model1AdapterFactory() @@ -65,10 +67,10 @@ public class Model1AdapterFactory extends AdapterFactoryImpl } /** - * Returns whether this factory is applicable for the type of the object. - * This implementation + * 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 */ @@ -87,8 +89,8 @@ public class Model1AdapterFactory extends AdapterFactoryImpl } /** - * The switch that delegates to the createXXX methods. - * + * The switch that delegates to the createXXX methods. + * * @generated */ protected Model1Switch modelSwitch = new Model1Switch() @@ -173,9 +175,10 @@ public class Model1AdapterFactory extends AdapterFactoryImpl }; /** - * Creates an adapter for the target. - * - * @param target the object to adapt. + * Creates an adapter for the target. + * + * @param target + * the object to adapt. * @return the adapter for the target. * @generated */ @@ -189,6 +192,7 @@ public class Model1AdapterFactory extends AdapterFactoryImpl * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model1.Address Address}'. * 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.emf.cdo.tests.model1.Address * @generated @@ -202,6 +206,7 @@ public class Model1AdapterFactory extends AdapterFactoryImpl * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model1.Supplier Supplier}'. * 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.emf.cdo.tests.model1.Supplier * @generated @@ -212,9 +217,10 @@ public class Model1AdapterFactory extends AdapterFactoryImpl } /** - * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model1.PurchaseOrder Purchase Order}'. - * This default implementation returns null so that we can easily + * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model1.PurchaseOrder + * Purchase Order}'. 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.emf.cdo.tests.model1.PurchaseOrder * @generated @@ -225,9 +231,10 @@ public class Model1AdapterFactory extends AdapterFactoryImpl } /** - * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model1.OrderDetail Order Detail}'. - * This default implementation returns null so that we can easily + * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model1.OrderDetail + * Order Detail}'. 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.emf.cdo.tests.model1.OrderDetail * @generated @@ -238,9 +245,10 @@ public class Model1AdapterFactory extends AdapterFactoryImpl } /** - * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model1.OrderAddress Order Address}'. - * This default implementation returns null so that we can easily + * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model1.OrderAddress + * Order Address}'. 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.emf.cdo.tests.model1.OrderAddress * @generated @@ -268,6 +276,7 @@ public class Model1AdapterFactory extends AdapterFactoryImpl * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model1.Category Category}'. * 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.emf.cdo.tests.model1.Category * @generated @@ -281,6 +290,7 @@ public class Model1AdapterFactory extends AdapterFactoryImpl * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model1.Product1 Product1}'. * 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.emf.cdo.tests.model1.Product1 * @generated @@ -294,6 +304,7 @@ public class Model1AdapterFactory extends AdapterFactoryImpl * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model1.Company Company}'. * 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.emf.cdo.tests.model1.Company * @generated @@ -307,6 +318,7 @@ public class Model1AdapterFactory extends AdapterFactoryImpl * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model1.Customer Customer}'. * 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.emf.cdo.tests.model1.Customer * @generated @@ -331,9 +343,10 @@ public class Model1AdapterFactory extends AdapterFactoryImpl } /** - * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model1.SalesOrder Sales Order}'. - * This default implementation returns null so that we can easily + * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model1.SalesOrder + * Sales Order}'. 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.emf.cdo.tests.model1.SalesOrder * @generated @@ -344,9 +357,9 @@ public class Model1AdapterFactory extends AdapterFactoryImpl } /** - * Creates a new adapter for the default case. - * This default implementation returns null. This default implementation returns null. + * * @return the new adapter. * @generated */ diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/util/Model1Switch.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/util/Model1Switch.java index 20a9f6d480..713be21dc6 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/util/Model1Switch.java +++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/util/Model1Switch.java @@ -34,6 +34,7 @@ import java.util.Map; * {@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.emf.cdo.tests.model1.Model1Package * @generated */ @@ -41,20 +42,21 @@ public class Model1Switch { /** * + * * @generated */ public static final String copyright = "Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n Eike Stepper - initial API and implementation"; /** - * The cached model package - * + * The cached model package + * * @generated */ protected static Model1Package modelPackage; /** - * Creates an instance of the switch. - * + * Creates an instance of the switch. + * * @generated */ public Model1Switch() @@ -68,6 +70,7 @@ public class Model1Switch /** * 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 */ @@ -79,6 +82,7 @@ public class Model1Switch /** * 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 */ @@ -98,6 +102,7 @@ public class Model1Switch /** * 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 */ @@ -224,10 +229,11 @@ public class Model1Switch } /** - * Returns the result of interpreting the object as an instance of 'Address'. - * This + * Returns the result of interpreting the object as an instance of 'Address'. This * implementation returns null; returning a non-null result will terminate the switch. - * @param object the target of the switch. + * + * @param object + * the target of the switch. * @return the result of interpreting the object as an instance of 'Address'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated @@ -238,10 +244,11 @@ public class Model1Switch } /** - * Returns the result of interpreting the object as an instance of 'Supplier'. - * This + * Returns the result of interpreting the object as an instance of 'Supplier'. This * implementation returns null; returning a non-null result will terminate the switch. - * @param object the target of the switch. + * + * @param object + * the target of the switch. * @return the result of interpreting the object as an instance of 'Supplier'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated @@ -252,10 +259,11 @@ public class Model1Switch } /** - * Returns the result of interpreting the object as an instance of 'Purchase Order'. - * + * Returns the result of interpreting the object as an instance of 'Purchase Order'. * This implementation returns null; returning a non-null result will terminate the switch. - * @param object the target of the switch. + * + * @param object + * the target of the switch. * @return the result of interpreting the object as an instance of 'Purchase Order'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated @@ -266,10 +274,11 @@ public class Model1Switch } /** - * Returns the result of interpreting the object as an instance of 'Order Detail'. - * + * Returns the result of interpreting the object as an instance of 'Order Detail'. * This implementation returns null; returning a non-null result will terminate the switch. - * @param object the target of the switch. + * + * @param object + * the target of the switch. * @return the result of interpreting the object as an instance of 'Order Detail'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated @@ -280,10 +289,11 @@ public class Model1Switch } /** - * Returns the result of interpreting the object as an instance of 'Order Address'. - * + * Returns the result of interpreting the object as an instance of 'Order Address'. * This implementation returns null; returning a non-null result will terminate the switch. - * @param object the target of the switch. + * + * @param object + * the target of the switch. * @return the result of interpreting the object as an instance of 'Order Address'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated @@ -294,10 +304,11 @@ public class Model1Switch } /** - * Returns the result of interpreting the object as an instance of 'Product To Order'. - * This implementation returns null; returning a non-null result will terminate the switch. - * @param object the target of the switch. + * + * @param object + * the target of the switch. * @return the result of interpreting the object as an instance of 'Product To Order'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated @@ -308,10 +319,11 @@ public class Model1Switch } /** - * Returns the result of interpreting the object as an instance of 'Category'. - * This + * Returns the result of interpreting the object as an instance of 'Category'. This * implementation returns null; returning a non-null result will terminate the switch. - * @param object the target of the switch. + * + * @param object + * the target of the switch. * @return the result of interpreting the object as an instance of 'Category'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated @@ -322,10 +334,11 @@ public class Model1Switch } /** - * Returns the result of interpreting the object as an instance of 'Product1'. - * This + * Returns the result of interpreting the object as an instance of 'Product1'. This * implementation returns null; returning a non-null result will terminate the switch. - * @param object the target of the switch. + * + * @param object + * the target of the switch. * @return the result of interpreting the object as an instance of 'Product1'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated @@ -336,10 +349,11 @@ public class Model1Switch } /** - * Returns the result of interpreting the object as an instance of 'Company'. - * This + * Returns the result of interpreting the object as an instance of 'Company'. This * implementation returns null; returning a non-null result will terminate the switch. - * @param object the target of the switch. + * + * @param object + * the target of the switch. * @return the result of interpreting the object as an instance of 'Company'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated @@ -350,10 +364,11 @@ public class Model1Switch } /** - * Returns the result of interpreting the object as an instance of 'Customer'. - * This + * Returns the result of interpreting the object as an instance of 'Customer'. This * implementation returns null; returning a non-null result will terminate the switch. - * @param object the target of the switch. + * + * @param object + * the target of the switch. * @return the result of interpreting the object as an instance of 'Customer'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated @@ -364,10 +379,11 @@ public class Model1Switch } /** - * Returns the result of interpreting the object as an instance of 'Order'. - * This + * Returns the result of interpreting the object as an instance of 'Order'. This * implementation returns null; returning a non-null result will terminate the switch. - * @param object the target of the switch. + * + * @param object + * the target of the switch. * @return the result of interpreting the object as an instance of 'Order'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated @@ -378,10 +394,11 @@ public class Model1Switch } /** - * Returns the result of interpreting the object as an instance of 'Sales Order'. - * + * Returns the result of interpreting the object as an instance of 'Sales Order'. * This implementation returns null; returning a non-null result will terminate the switch. - * @param object the target of the switch. + * + * @param object + * the target of the switch. * @return the result of interpreting the object as an instance of 'Sales Order'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated @@ -392,11 +409,12 @@ public class Model1Switch } /** - * Returns the result of interpreting the object as an instance of 'EObject'. - * This + * 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. + * + * @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 diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/model/model2.genmodel b/plugins/org.eclipse.emf.cdo.tests.model2/model/model2.genmodel index de73ed90c3..04357ac8c0 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/model/model2.genmodel +++ b/plugins/org.eclipse.emf.cdo.tests.model2/model/model2.genmodel @@ -12,7 +12,8 @@ model2.ecore CDO=org.eclipse.emf.cdo + literalsInterface="false" extensibleProviderFactory="true" childCreationExtenders="true" + ecorePackage="model2.ecore#/"> @@ -25,5 +26,117 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/model/model2.legacy-genmodel b/plugins/org.eclipse.emf.cdo.tests.model2/model/model2.legacy-genmodel index 7d8812b1c6..17f691f774 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/model/model2.legacy-genmodel +++ b/plugins/org.eclipse.emf.cdo.tests.model2/model/model2.legacy-genmodel @@ -1,26 +1,321 @@ - + model2.ecore CDO=org.eclipse.emf.cdo - - - - + + + + + + + + + + - - + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/Model2Package.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/Model2Package.java index cd4a55a31a..db76b996df 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/Model2Package.java +++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/Model2Package.java @@ -2376,912 +2376,4 @@ public interface Model2Package extends org.eclipse.emf.cdo.tests.model2.Model2Pa */ Model2Factory getModel2Factory(); - /** - * 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.emf.cdo.tests.legacy.model2.impl.SpecialPurchaseOrderImpl - * Special Purchase Order}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.SpecialPurchaseOrderImpl - * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.Model2PackageImpl#getSpecialPurchaseOrder() - * @generated - */ - EClass SPECIAL_PURCHASE_ORDER = eINSTANCE.getSpecialPurchaseOrder(); - - /** - * The meta object literal for the 'Discount Code' attribute feature. - * - * @generated - */ - EAttribute SPECIAL_PURCHASE_ORDER__DISCOUNT_CODE = eINSTANCE.getSpecialPurchaseOrder_DiscountCode(); - - /** - * The meta object literal for the 'Shipping Address' containment reference feature. - * - * @generated - */ - EReference SPECIAL_PURCHASE_ORDER__SHIPPING_ADDRESS = eINSTANCE.getSpecialPurchaseOrder_ShippingAddress(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.TaskContainerImpl - * Task Container}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.TaskContainerImpl - * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.Model2PackageImpl#getTaskContainer() - * @generated - */ - EClass TASK_CONTAINER = eINSTANCE.getTaskContainer(); - - /** - * The meta object literal for the 'Tasks' containment reference list feature. - * - * @generated - */ - EReference TASK_CONTAINER__TASKS = eINSTANCE.getTaskContainer_Tasks(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.TaskImpl Task}' - * class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.TaskImpl - * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.Model2PackageImpl#getTask() - * @generated - */ - EClass TASK = eINSTANCE.getTask(); - - /** - * The meta object literal for the 'Task Container' container reference feature. - * - * @generated - */ - EReference TASK__TASK_CONTAINER = eINSTANCE.getTask_TaskContainer(); - - /** - * The meta object literal for the 'Description' attribute feature. - * - * @generated - */ - EAttribute TASK__DESCRIPTION = eINSTANCE.getTask_Description(); - - /** - * The meta object literal for the 'Done' attribute feature. - * - * @generated - */ - EAttribute TASK__DONE = eINSTANCE.getTask_Done(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.Unsettable1Impl - * Unsettable1}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.Unsettable1Impl - * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.Model2PackageImpl#getUnsettable1() - * @generated - */ - EClass UNSETTABLE1 = eINSTANCE.getUnsettable1(); - - /** - * The meta object literal for the 'Unsettable Boolean' attribute feature. - * - * - * @generated - */ - EAttribute UNSETTABLE1__UNSETTABLE_BOOLEAN = eINSTANCE.getUnsettable1_UnsettableBoolean(); - - /** - * The meta object literal for the 'Unsettable Byte' attribute feature. - * - * @generated - */ - EAttribute UNSETTABLE1__UNSETTABLE_BYTE = eINSTANCE.getUnsettable1_UnsettableByte(); - - /** - * The meta object literal for the 'Unsettable Char' attribute feature. - * - * @generated - */ - EAttribute UNSETTABLE1__UNSETTABLE_CHAR = eINSTANCE.getUnsettable1_UnsettableChar(); - - /** - * The meta object literal for the 'Unsettable Date' attribute feature. - * - * @generated - */ - EAttribute UNSETTABLE1__UNSETTABLE_DATE = eINSTANCE.getUnsettable1_UnsettableDate(); - - /** - * The meta object literal for the 'Unsettable Double' attribute feature. - * - * - * @generated - */ - EAttribute UNSETTABLE1__UNSETTABLE_DOUBLE = eINSTANCE.getUnsettable1_UnsettableDouble(); - - /** - * The meta object literal for the 'Unsettable Float' attribute feature. - * - * - * @generated - */ - EAttribute UNSETTABLE1__UNSETTABLE_FLOAT = eINSTANCE.getUnsettable1_UnsettableFloat(); - - /** - * The meta object literal for the 'Unsettable Int' attribute feature. - * - * @generated - */ - EAttribute UNSETTABLE1__UNSETTABLE_INT = eINSTANCE.getUnsettable1_UnsettableInt(); - - /** - * The meta object literal for the 'Unsettable Long' attribute feature. - * - * @generated - */ - EAttribute UNSETTABLE1__UNSETTABLE_LONG = eINSTANCE.getUnsettable1_UnsettableLong(); - - /** - * The meta object literal for the 'Unsettable Short' attribute feature. - * - * - * @generated - */ - EAttribute UNSETTABLE1__UNSETTABLE_SHORT = eINSTANCE.getUnsettable1_UnsettableShort(); - - /** - * The meta object literal for the 'Unsettable String' attribute feature. - * - * - * @generated - */ - EAttribute UNSETTABLE1__UNSETTABLE_STRING = eINSTANCE.getUnsettable1_UnsettableString(); - - /** - * The meta object literal for the 'Unsettable VAT' attribute feature. - * - * @generated - */ - EAttribute UNSETTABLE1__UNSETTABLE_VAT = eINSTANCE.getUnsettable1_UnsettableVAT(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.Unsettable2WithDefaultImpl - * Unsettable2 With Default}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.Unsettable2WithDefaultImpl - * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.Model2PackageImpl#getUnsettable2WithDefault() - * @generated - */ - EClass UNSETTABLE2_WITH_DEFAULT = eINSTANCE.getUnsettable2WithDefault(); - - /** - * The meta object literal for the 'Unsettable Boolean' attribute feature. - * - * - * @generated - */ - EAttribute UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_BOOLEAN = eINSTANCE.getUnsettable2WithDefault_UnsettableBoolean(); - - /** - * The meta object literal for the 'Unsettable Byte' attribute feature. - * - * @generated - */ - EAttribute UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_BYTE = eINSTANCE.getUnsettable2WithDefault_UnsettableByte(); - - /** - * The meta object literal for the 'Unsettable Char' attribute feature. - * - * @generated - */ - EAttribute UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_CHAR = eINSTANCE.getUnsettable2WithDefault_UnsettableChar(); - - /** - * The meta object literal for the 'Unsettable Date' attribute feature. - * - * @generated - */ - EAttribute UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_DATE = eINSTANCE.getUnsettable2WithDefault_UnsettableDate(); - - /** - * The meta object literal for the 'Unsettable Double' attribute feature. - * - * - * @generated - */ - EAttribute UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_DOUBLE = eINSTANCE.getUnsettable2WithDefault_UnsettableDouble(); - - /** - * The meta object literal for the 'Unsettable Float' attribute feature. - * - * - * @generated - */ - EAttribute UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_FLOAT = eINSTANCE.getUnsettable2WithDefault_UnsettableFloat(); - - /** - * The meta object literal for the 'Unsettable Int' attribute feature. - * - * @generated - */ - EAttribute UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_INT = eINSTANCE.getUnsettable2WithDefault_UnsettableInt(); - - /** - * The meta object literal for the 'Unsettable Long' attribute feature. - * - * @generated - */ - EAttribute UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_LONG = eINSTANCE.getUnsettable2WithDefault_UnsettableLong(); - - /** - * The meta object literal for the 'Unsettable Short' attribute feature. - * - * - * @generated - */ - EAttribute UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_SHORT = eINSTANCE.getUnsettable2WithDefault_UnsettableShort(); - - /** - * The meta object literal for the 'Unsettable String' attribute feature. - * - * - * @generated - */ - EAttribute UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_STRING = eINSTANCE.getUnsettable2WithDefault_UnsettableString(); - - /** - * The meta object literal for the 'Unsettable VAT' attribute feature. - * - * @generated - */ - EAttribute UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_VAT = eINSTANCE.getUnsettable2WithDefault_UnsettableVAT(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.PersistentContainmentImpl - * Persistent Containment}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.PersistentContainmentImpl - * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.Model2PackageImpl#getPersistentContainment() - * @generated - */ - EClass PERSISTENT_CONTAINMENT = eINSTANCE.getPersistentContainment(); - - /** - * The meta object literal for the 'Attr Before' attribute feature. - * - * @generated - */ - EAttribute PERSISTENT_CONTAINMENT__ATTR_BEFORE = eINSTANCE.getPersistentContainment_AttrBefore(); - - /** - * The meta object literal for the 'Children' containment reference list feature. - * - * @generated - */ - EReference PERSISTENT_CONTAINMENT__CHILDREN = eINSTANCE.getPersistentContainment_Children(); - - /** - * The meta object literal for the 'Attr After' attribute feature. - * - * @generated - */ - EAttribute PERSISTENT_CONTAINMENT__ATTR_AFTER = eINSTANCE.getPersistentContainment_AttrAfter(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.TransientContainerImpl - * Transient Container}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.TransientContainerImpl - * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.Model2PackageImpl#getTransientContainer() - * @generated - */ - EClass TRANSIENT_CONTAINER = eINSTANCE.getTransientContainer(); - - /** - * The meta object literal for the 'Attr Before' attribute feature. - * - * @generated - */ - EAttribute TRANSIENT_CONTAINER__ATTR_BEFORE = eINSTANCE.getTransientContainer_AttrBefore(); - - /** - * The meta object literal for the 'Parent' container reference feature. - * - * - * @generated - */ - EReference TRANSIENT_CONTAINER__PARENT = eINSTANCE.getTransientContainer_Parent(); - - /** - * The meta object literal for the 'Attr After' attribute feature. - * - * @generated - */ - EAttribute TRANSIENT_CONTAINER__ATTR_AFTER = eINSTANCE.getTransientContainer_AttrAfter(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.NotUnsettableImpl - * Not Unsettable}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.NotUnsettableImpl - * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.Model2PackageImpl#getNotUnsettable() - * @generated - */ - EClass NOT_UNSETTABLE = eINSTANCE.getNotUnsettable(); - - /** - * The meta object literal for the 'Not Unsettable Boolean' attribute feature. - * - * @generated - */ - EAttribute NOT_UNSETTABLE__NOT_UNSETTABLE_BOOLEAN = eINSTANCE.getNotUnsettable_NotUnsettableBoolean(); - - /** - * The meta object literal for the 'Not Unsettable Byte' attribute feature. - * - * - * @generated - */ - EAttribute NOT_UNSETTABLE__NOT_UNSETTABLE_BYTE = eINSTANCE.getNotUnsettable_NotUnsettableByte(); - - /** - * The meta object literal for the 'Not Unsettable Char' attribute feature. - * - * - * @generated - */ - EAttribute NOT_UNSETTABLE__NOT_UNSETTABLE_CHAR = eINSTANCE.getNotUnsettable_NotUnsettableChar(); - - /** - * The meta object literal for the 'Not Unsettable Date' attribute feature. - * - * - * @generated - */ - EAttribute NOT_UNSETTABLE__NOT_UNSETTABLE_DATE = eINSTANCE.getNotUnsettable_NotUnsettableDate(); - - /** - * The meta object literal for the 'Not Unsettable Double' attribute feature. - * - * @generated - */ - EAttribute NOT_UNSETTABLE__NOT_UNSETTABLE_DOUBLE = eINSTANCE.getNotUnsettable_NotUnsettableDouble(); - - /** - * The meta object literal for the 'Not Unsettable Float' attribute feature. - * - * - * @generated - */ - EAttribute NOT_UNSETTABLE__NOT_UNSETTABLE_FLOAT = eINSTANCE.getNotUnsettable_NotUnsettableFloat(); - - /** - * The meta object literal for the 'Not Unsettable Int' attribute feature. - * - * - * @generated - */ - EAttribute NOT_UNSETTABLE__NOT_UNSETTABLE_INT = eINSTANCE.getNotUnsettable_NotUnsettableInt(); - - /** - * The meta object literal for the 'Not Unsettable Long' attribute feature. - * - * - * @generated - */ - EAttribute NOT_UNSETTABLE__NOT_UNSETTABLE_LONG = eINSTANCE.getNotUnsettable_NotUnsettableLong(); - - /** - * The meta object literal for the 'Not Unsettable Short' attribute feature. - * - * - * @generated - */ - EAttribute NOT_UNSETTABLE__NOT_UNSETTABLE_SHORT = eINSTANCE.getNotUnsettable_NotUnsettableShort(); - - /** - * The meta object literal for the 'Not Unsettable String' attribute feature. - * - * @generated - */ - EAttribute NOT_UNSETTABLE__NOT_UNSETTABLE_STRING = eINSTANCE.getNotUnsettable_NotUnsettableString(); - - /** - * The meta object literal for the 'Not Unsettable VAT' attribute feature. - * - * - * @generated - */ - EAttribute NOT_UNSETTABLE__NOT_UNSETTABLE_VAT = eINSTANCE.getNotUnsettable_NotUnsettableVAT(); - - /** - * The meta object literal for the ' - * {@link org.eclipse.emf.cdo.tests.legacy.model2.impl.NotUnsettableWithDefaultImpl - * Not Unsettable With Default}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.NotUnsettableWithDefaultImpl - * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.Model2PackageImpl#getNotUnsettableWithDefault() - * @generated - */ - EClass NOT_UNSETTABLE_WITH_DEFAULT = eINSTANCE.getNotUnsettableWithDefault(); - - /** - * The meta object literal for the 'Not Unsettable Boolean' attribute feature. - * - * @generated - */ - EAttribute NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_BOOLEAN = eINSTANCE - .getNotUnsettableWithDefault_NotUnsettableBoolean(); - - /** - * The meta object literal for the 'Not Unsettable Byte' attribute feature. - * - * - * @generated - */ - EAttribute NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_BYTE = eINSTANCE - .getNotUnsettableWithDefault_NotUnsettableByte(); - - /** - * The meta object literal for the 'Not Unsettable Char' attribute feature. - * - * - * @generated - */ - EAttribute NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_CHAR = eINSTANCE - .getNotUnsettableWithDefault_NotUnsettableChar(); - - /** - * The meta object literal for the 'Not Unsettable Date' attribute feature. - * - * - * @generated - */ - EAttribute NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_DATE = eINSTANCE - .getNotUnsettableWithDefault_NotUnsettableDate(); - - /** - * The meta object literal for the 'Not Unsettable Double' attribute feature. - * - * @generated - */ - EAttribute NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_DOUBLE = eINSTANCE - .getNotUnsettableWithDefault_NotUnsettableDouble(); - - /** - * The meta object literal for the 'Not Unsettable Float' attribute feature. - * - * - * @generated - */ - EAttribute NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_FLOAT = eINSTANCE - .getNotUnsettableWithDefault_NotUnsettableFloat(); - - /** - * The meta object literal for the 'Not Unsettable Int' attribute feature. - * - * - * @generated - */ - EAttribute NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_INT = eINSTANCE - .getNotUnsettableWithDefault_NotUnsettableInt(); - - /** - * The meta object literal for the 'Not Unsettable Long' attribute feature. - * - * - * @generated - */ - EAttribute NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_LONG = eINSTANCE - .getNotUnsettableWithDefault_NotUnsettableLong(); - - /** - * The meta object literal for the 'Not Unsettable Short' attribute feature. - * - * - * @generated - */ - EAttribute NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_SHORT = eINSTANCE - .getNotUnsettableWithDefault_NotUnsettableShort(); - - /** - * The meta object literal for the 'Not Unsettable String' attribute feature. - * - * @generated - */ - EAttribute NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_STRING = eINSTANCE - .getNotUnsettableWithDefault_NotUnsettableString(); - - /** - * The meta object literal for the 'Not Unsettable VAT' attribute feature. - * - * - * @generated - */ - EAttribute NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_VAT = eINSTANCE - .getNotUnsettableWithDefault_NotUnsettableVAT(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.MapHolderImpl - * Map Holder}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.MapHolderImpl - * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.Model2PackageImpl#getMapHolder() - * @generated - */ - EClass MAP_HOLDER = eINSTANCE.getMapHolder(); - - /** - * The meta object literal for the 'Integer To String Map' map feature. - * - * @generated - */ - EReference MAP_HOLDER__INTEGER_TO_STRING_MAP = eINSTANCE.getMapHolder_IntegerToStringMap(); - - /** - * The meta object literal for the 'String To String Map' map feature. - * - * @generated - */ - EReference MAP_HOLDER__STRING_TO_STRING_MAP = eINSTANCE.getMapHolder_StringToStringMap(); - - /** - * The meta object literal for the 'String To VAT Map' map feature. - * - * @generated - */ - EReference MAP_HOLDER__STRING_TO_VAT_MAP = eINSTANCE.getMapHolder_StringToVATMap(); - - /** - * The meta object literal for the 'String To Address Containment Map' map feature. - * - * @generated - */ - EReference MAP_HOLDER__STRING_TO_ADDRESS_CONTAINMENT_MAP = eINSTANCE.getMapHolder_StringToAddressContainmentMap(); - - /** - * The meta object literal for the 'String To Address Reference Map' map feature. - * - * @generated - */ - EReference MAP_HOLDER__STRING_TO_ADDRESS_REFERENCE_MAP = eINSTANCE.getMapHolder_StringToAddressReferenceMap(); - - /** - * The meta object literal for the 'EObject To EObject Map' map feature. - * - * - * @generated - */ - EReference MAP_HOLDER__EOBJECT_TO_EOBJECT_MAP = eINSTANCE.getMapHolder_EObjectToEObjectMap(); - - /** - * The meta object literal for the 'EObject To EObject Key Contained Map' map feature. - * - * @generated - */ - EReference MAP_HOLDER__EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP = eINSTANCE - .getMapHolder_EObjectToEObjectKeyContainedMap(); - - /** - * The meta object literal for the 'EObject To EObject Both Contained Map' map feature. - * - * @generated - */ - EReference MAP_HOLDER__EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP = eINSTANCE - .getMapHolder_EObjectToEObjectBothContainedMap(); - - /** - * The meta object literal for the 'EObject To EObject Value Contained Map' map feature. - * - * @generated - */ - EReference MAP_HOLDER__EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP = eINSTANCE - .getMapHolder_EObjectToEObjectValueContainedMap(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.StringToStringMapImpl - * String To String Map}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.StringToStringMapImpl - * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.Model2PackageImpl#getStringToStringMap() - * @generated - */ - EClass STRING_TO_STRING_MAP = eINSTANCE.getStringToStringMap(); - - /** - * The meta object literal for the 'Key' attribute feature. - * - * @generated - */ - EAttribute STRING_TO_STRING_MAP__KEY = eINSTANCE.getStringToStringMap_Key(); - - /** - * The meta object literal for the 'Value' attribute feature. - * - * @generated - */ - EAttribute STRING_TO_STRING_MAP__VALUE = eINSTANCE.getStringToStringMap_Value(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.IntegerToStringMapImpl - * Integer To String Map}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.IntegerToStringMapImpl - * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.Model2PackageImpl#getIntegerToStringMap() - * @generated - */ - EClass INTEGER_TO_STRING_MAP = eINSTANCE.getIntegerToStringMap(); - - /** - * The meta object literal for the 'Key' attribute feature. - * - * @generated - */ - EAttribute INTEGER_TO_STRING_MAP__KEY = eINSTANCE.getIntegerToStringMap_Key(); - - /** - * The meta object literal for the 'Value' attribute feature. - * - * @generated - */ - EAttribute INTEGER_TO_STRING_MAP__VALUE = eINSTANCE.getIntegerToStringMap_Value(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.StringToVATMapImpl - * String To VAT Map}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.StringToVATMapImpl - * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.Model2PackageImpl#getStringToVATMap() - * @generated - */ - EClass STRING_TO_VAT_MAP = eINSTANCE.getStringToVATMap(); - - /** - * The meta object literal for the 'Key' attribute feature. - * - * @generated - */ - EAttribute STRING_TO_VAT_MAP__KEY = eINSTANCE.getStringToVATMap_Key(); - - /** - * The meta object literal for the 'Value' attribute feature. - * - * @generated - */ - EAttribute STRING_TO_VAT_MAP__VALUE = eINSTANCE.getStringToVATMap_Value(); - - /** - * The meta object literal for the ' - * {@link org.eclipse.emf.cdo.tests.legacy.model2.impl.StringToAddressContainmentMapImpl - * String To Address Containment Map}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.StringToAddressContainmentMapImpl - * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.Model2PackageImpl#getStringToAddressContainmentMap() - * @generated - */ - EClass STRING_TO_ADDRESS_CONTAINMENT_MAP = eINSTANCE.getStringToAddressContainmentMap(); - - /** - * The meta object literal for the 'Key' attribute feature. - * - * @generated - */ - EAttribute STRING_TO_ADDRESS_CONTAINMENT_MAP__KEY = eINSTANCE.getStringToAddressContainmentMap_Key(); - - /** - * The meta object literal for the 'Value' containment reference feature. - * - * - * @generated - */ - EReference STRING_TO_ADDRESS_CONTAINMENT_MAP__VALUE = eINSTANCE.getStringToAddressContainmentMap_Value(); - - /** - * The meta object literal for the ' - * {@link org.eclipse.emf.cdo.tests.legacy.model2.impl.StringToAddressReferenceMapImpl - * String To Address Reference Map}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.StringToAddressReferenceMapImpl - * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.Model2PackageImpl#getStringToAddressReferenceMap() - * @generated - */ - EClass STRING_TO_ADDRESS_REFERENCE_MAP = eINSTANCE.getStringToAddressReferenceMap(); - - /** - * The meta object literal for the 'Key' attribute feature. - * - * @generated - */ - EAttribute STRING_TO_ADDRESS_REFERENCE_MAP__KEY = eINSTANCE.getStringToAddressReferenceMap_Key(); - - /** - * The meta object literal for the 'Value' reference feature. - * - * @generated - */ - EReference STRING_TO_ADDRESS_REFERENCE_MAP__VALUE = eINSTANCE.getStringToAddressReferenceMap_Value(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.EObjectToEObjectMapImpl - * EObject To EObject Map}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.EObjectToEObjectMapImpl - * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.Model2PackageImpl#getEObjectToEObjectMap() - * @generated - */ - EClass EOBJECT_TO_EOBJECT_MAP = eINSTANCE.getEObjectToEObjectMap(); - - /** - * The meta object literal for the 'Key' reference feature. - * - * @generated - */ - EReference EOBJECT_TO_EOBJECT_MAP__KEY = eINSTANCE.getEObjectToEObjectMap_Key(); - - /** - * The meta object literal for the 'Value' reference feature. - * - * @generated - */ - EReference EOBJECT_TO_EOBJECT_MAP__VALUE = eINSTANCE.getEObjectToEObjectMap_Value(); - - /** - * The meta object literal for the ' - * {@link org.eclipse.emf.cdo.tests.legacy.model2.impl.EObjectToEObjectKeyContainedMapImpl - * EObject To EObject Key Contained Map}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.EObjectToEObjectKeyContainedMapImpl - * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.Model2PackageImpl#getEObjectToEObjectKeyContainedMap() - * @generated - */ - EClass EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP = eINSTANCE.getEObjectToEObjectKeyContainedMap(); - - /** - * The meta object literal for the 'Key' containment reference feature. - * - * @generated - */ - EReference EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP__KEY = eINSTANCE.getEObjectToEObjectKeyContainedMap_Key(); - - /** - * The meta object literal for the 'Value' reference feature. - * - * @generated - */ - EReference EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP__VALUE = eINSTANCE.getEObjectToEObjectKeyContainedMap_Value(); - - /** - * The meta object literal for the ' - * {@link org.eclipse.emf.cdo.tests.legacy.model2.impl.EObjectToEObjectBothContainedMapImpl - * EObject To EObject Both Contained Map}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.EObjectToEObjectBothContainedMapImpl - * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.Model2PackageImpl#getEObjectToEObjectBothContainedMap() - * @generated - */ - EClass EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP = eINSTANCE.getEObjectToEObjectBothContainedMap(); - - /** - * The meta object literal for the 'Key' containment reference feature. - * - * @generated - */ - EReference EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP__KEY = eINSTANCE.getEObjectToEObjectBothContainedMap_Key(); - - /** - * The meta object literal for the 'Value' containment reference feature. - * - * - * @generated - */ - EReference EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP__VALUE = eINSTANCE.getEObjectToEObjectBothContainedMap_Value(); - - /** - * The meta object literal for the ' - * {@link org.eclipse.emf.cdo.tests.legacy.model2.impl.EObjectToEObjectValueContainedMapImpl - * EObject To EObject Value Contained Map}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.EObjectToEObjectValueContainedMapImpl - * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.Model2PackageImpl#getEObjectToEObjectValueContainedMap() - * @generated - */ - EClass EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP = eINSTANCE.getEObjectToEObjectValueContainedMap(); - - /** - * The meta object literal for the 'Key' reference feature. - * - * @generated - */ - EReference EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP__KEY = eINSTANCE.getEObjectToEObjectValueContainedMap_Key(); - - /** - * The meta object literal for the 'Value' containment reference feature. - * - * - * @generated - */ - EReference EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP__VALUE = eINSTANCE.getEObjectToEObjectValueContainedMap_Value(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model2.impl.EnumListHolderImpl - * Enum List Holder}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.EnumListHolderImpl - * @see org.eclipse.emf.cdo.tests.legacy.model2.impl.Model2PackageImpl#getEnumListHolder() - * @generated - */ - EClass ENUM_LIST_HOLDER = eINSTANCE.getEnumListHolder(); - - /** - * The meta object literal for the 'Enum List' attribute list feature. - * - * @generated - */ - EAttribute ENUM_LIST_HOLDER__ENUM_LIST = eINSTANCE.getEnumListHolder_EnumList(); - - } - } // Model2Package diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/EObjectToEObjectBothContainedMapImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/EObjectToEObjectBothContainedMapImpl.java index 959cb475a0..c45de29c1e 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/EObjectToEObjectBothContainedMapImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/EObjectToEObjectBothContainedMapImpl.java @@ -79,7 +79,7 @@ public class EObjectToEObjectBothContainedMapImpl extends EObjectImpl implements @Override protected EClass eStaticClass() { - return Model2Package.Literals.EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP; + return Model2Package.eINSTANCE.getEObjectToEObjectBothContainedMap(); } /** diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/EObjectToEObjectKeyContainedMapImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/EObjectToEObjectKeyContainedMapImpl.java index 3af29965fc..912750a01d 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/EObjectToEObjectKeyContainedMapImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/EObjectToEObjectKeyContainedMapImpl.java @@ -79,7 +79,7 @@ public class EObjectToEObjectKeyContainedMapImpl extends EObjectImpl implements @Override protected EClass eStaticClass() { - return Model2Package.Literals.EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP; + return Model2Package.eINSTANCE.getEObjectToEObjectKeyContainedMap(); } /** diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/EObjectToEObjectMapImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/EObjectToEObjectMapImpl.java index 7bffc2fa8f..06737b3634 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/EObjectToEObjectMapImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/EObjectToEObjectMapImpl.java @@ -76,7 +76,7 @@ public class EObjectToEObjectMapImpl extends EObjectImpl implements BasicEMap.En @Override protected EClass eStaticClass() { - return Model2Package.Literals.EOBJECT_TO_EOBJECT_MAP; + return Model2Package.eINSTANCE.getEObjectToEObjectMap(); } /** diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/EObjectToEObjectValueContainedMapImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/EObjectToEObjectValueContainedMapImpl.java index 0370f5162d..920ba06a84 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/EObjectToEObjectValueContainedMapImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/EObjectToEObjectValueContainedMapImpl.java @@ -79,7 +79,7 @@ public class EObjectToEObjectValueContainedMapImpl extends EObjectImpl implement @Override protected EClass eStaticClass() { - return Model2Package.Literals.EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP; + return Model2Package.eINSTANCE.getEObjectToEObjectValueContainedMap(); } /** diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/EnumListHolderImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/EnumListHolderImpl.java index 52a1d59144..fbae9bfa3c 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/EnumListHolderImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/EnumListHolderImpl.java @@ -63,7 +63,7 @@ public class EnumListHolderImpl extends EObjectImpl implements EnumListHolder @Override protected EClass eStaticClass() { - return Model2Package.Literals.ENUM_LIST_HOLDER; + return Model2Package.eINSTANCE.getEnumListHolder(); } /** diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/IntegerToStringMapImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/IntegerToStringMapImpl.java index 235876e5bd..935f32d820 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/IntegerToStringMapImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/IntegerToStringMapImpl.java @@ -95,7 +95,7 @@ public class IntegerToStringMapImpl extends EObjectImpl implements BasicEMap.Ent @Override protected EClass eStaticClass() { - return Model2Package.Literals.INTEGER_TO_STRING_MAP; + return Model2Package.eINSTANCE.getIntegerToStringMap(); } /** diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/MapHolderImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/MapHolderImpl.java index 210375ce6d..4f148205f6 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/MapHolderImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/MapHolderImpl.java @@ -164,7 +164,7 @@ public class MapHolderImpl extends EObjectImpl implements MapHolder @Override protected EClass eStaticClass() { - return Model2Package.Literals.MAP_HOLDER; + return Model2Package.eINSTANCE.getMapHolder(); } /** @@ -176,7 +176,7 @@ public class MapHolderImpl extends EObjectImpl implements MapHolder { if (integerToStringMap == null) { - integerToStringMap = new EcoreEMap(Model2Package.Literals.INTEGER_TO_STRING_MAP, + integerToStringMap = new EcoreEMap(Model2Package.eINSTANCE.getIntegerToStringMap(), IntegerToStringMapImpl.class, this, Model2Package.MAP_HOLDER__INTEGER_TO_STRING_MAP); } return integerToStringMap; @@ -191,7 +191,7 @@ public class MapHolderImpl extends EObjectImpl implements MapHolder { if (stringToStringMap == null) { - stringToStringMap = new EcoreEMap(Model2Package.Literals.STRING_TO_STRING_MAP, + stringToStringMap = new EcoreEMap(Model2Package.eINSTANCE.getStringToStringMap(), StringToStringMapImpl.class, this, Model2Package.MAP_HOLDER__STRING_TO_STRING_MAP); } return stringToStringMap; @@ -206,8 +206,8 @@ public class MapHolderImpl extends EObjectImpl implements MapHolder { if (stringToVATMap == null) { - stringToVATMap = new EcoreEMap(Model2Package.Literals.STRING_TO_VAT_MAP, StringToVATMapImpl.class, - this, Model2Package.MAP_HOLDER__STRING_TO_VAT_MAP); + stringToVATMap = new EcoreEMap(Model2Package.eINSTANCE.getStringToVATMap(), + StringToVATMapImpl.class, this, Model2Package.MAP_HOLDER__STRING_TO_VAT_MAP); } return stringToVATMap; } @@ -222,7 +222,7 @@ public class MapHolderImpl extends EObjectImpl implements MapHolder if (stringToAddressContainmentMap == null) { stringToAddressContainmentMap = new EcoreEMap( - Model2Package.Literals.STRING_TO_ADDRESS_CONTAINMENT_MAP, StringToAddressContainmentMapImpl.class, this, + Model2Package.eINSTANCE.getStringToAddressContainmentMap(), StringToAddressContainmentMapImpl.class, this, Model2Package.MAP_HOLDER__STRING_TO_ADDRESS_CONTAINMENT_MAP); } return stringToAddressContainmentMap; @@ -238,7 +238,7 @@ public class MapHolderImpl extends EObjectImpl implements MapHolder if (stringToAddressReferenceMap == null) { stringToAddressReferenceMap = new EcoreEMap( - Model2Package.Literals.STRING_TO_ADDRESS_REFERENCE_MAP, StringToAddressReferenceMapImpl.class, this, + Model2Package.eINSTANCE.getStringToAddressReferenceMap(), StringToAddressReferenceMapImpl.class, this, Model2Package.MAP_HOLDER__STRING_TO_ADDRESS_REFERENCE_MAP); } return stringToAddressReferenceMap; @@ -253,7 +253,7 @@ public class MapHolderImpl extends EObjectImpl implements MapHolder { if (eObjectToEObjectMap == null) { - eObjectToEObjectMap = new EcoreEMap(Model2Package.Literals.EOBJECT_TO_EOBJECT_MAP, + eObjectToEObjectMap = new EcoreEMap(Model2Package.eINSTANCE.getEObjectToEObjectMap(), EObjectToEObjectMapImpl.class, this, Model2Package.MAP_HOLDER__EOBJECT_TO_EOBJECT_MAP); } return eObjectToEObjectMap; @@ -269,8 +269,8 @@ public class MapHolderImpl extends EObjectImpl implements MapHolder if (eObjectToEObjectKeyContainedMap == null) { eObjectToEObjectKeyContainedMap = new EcoreEMap( - Model2Package.Literals.EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP, EObjectToEObjectKeyContainedMapImpl.class, this, - Model2Package.MAP_HOLDER__EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP); + Model2Package.eINSTANCE.getEObjectToEObjectKeyContainedMap(), EObjectToEObjectKeyContainedMapImpl.class, + this, Model2Package.MAP_HOLDER__EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP); } return eObjectToEObjectKeyContainedMap; } @@ -285,7 +285,7 @@ public class MapHolderImpl extends EObjectImpl implements MapHolder if (eObjectToEObjectBothContainedMap == null) { eObjectToEObjectBothContainedMap = new EcoreEMap( - Model2Package.Literals.EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP, EObjectToEObjectBothContainedMapImpl.class, + Model2Package.eINSTANCE.getEObjectToEObjectBothContainedMap(), EObjectToEObjectBothContainedMapImpl.class, this, Model2Package.MAP_HOLDER__EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP); } return eObjectToEObjectBothContainedMap; @@ -301,7 +301,7 @@ public class MapHolderImpl extends EObjectImpl implements MapHolder if (eObjectToEObjectValueContainedMap == null) { eObjectToEObjectValueContainedMap = new EcoreEMap( - Model2Package.Literals.EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP, EObjectToEObjectValueContainedMapImpl.class, + Model2Package.eINSTANCE.getEObjectToEObjectValueContainedMap(), EObjectToEObjectValueContainedMapImpl.class, this, Model2Package.MAP_HOLDER__EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP); } return eObjectToEObjectValueContainedMap; diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/NotUnsettableImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/NotUnsettableImpl.java index 2abe7a3a98..26616e1aac 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/NotUnsettableImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/NotUnsettableImpl.java @@ -295,7 +295,7 @@ public class NotUnsettableImpl extends EObjectImpl implements NotUnsettable @Override protected EClass eStaticClass() { - return Model2Package.Literals.NOT_UNSETTABLE; + return Model2Package.eINSTANCE.getNotUnsettable(); } /** diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/NotUnsettableWithDefaultImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/NotUnsettableWithDefaultImpl.java index 62457f78be..f1abba5c05 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/NotUnsettableWithDefaultImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/NotUnsettableWithDefaultImpl.java @@ -299,7 +299,7 @@ public class NotUnsettableWithDefaultImpl extends EObjectImpl implements NotUnse @Override protected EClass eStaticClass() { - return Model2Package.Literals.NOT_UNSETTABLE_WITH_DEFAULT; + return Model2Package.eINSTANCE.getNotUnsettableWithDefault(); } /** diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/PersistentContainmentImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/PersistentContainmentImpl.java index b04b403870..3b9e36fc78 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/PersistentContainmentImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/PersistentContainmentImpl.java @@ -111,7 +111,7 @@ public class PersistentContainmentImpl extends EObjectImpl implements Persistent @Override protected EClass eStaticClass() { - return Model2Package.Literals.PERSISTENT_CONTAINMENT; + return Model2Package.eINSTANCE.getPersistentContainment(); } /** diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/SpecialPurchaseOrderImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/SpecialPurchaseOrderImpl.java index 12e4c005d2..b1a626a99d 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/SpecialPurchaseOrderImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/SpecialPurchaseOrderImpl.java @@ -86,7 +86,7 @@ public class SpecialPurchaseOrderImpl extends PurchaseOrderImpl implements Speci @Override protected EClass eStaticClass() { - return Model2Package.Literals.SPECIAL_PURCHASE_ORDER; + return Model2Package.eINSTANCE.getSpecialPurchaseOrder(); } /** diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/StringToAddressContainmentMapImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/StringToAddressContainmentMapImpl.java index 4b5b323fcd..88c0e1ae04 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/StringToAddressContainmentMapImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/StringToAddressContainmentMapImpl.java @@ -89,7 +89,7 @@ public class StringToAddressContainmentMapImpl extends EObjectImpl implements Ba @Override protected EClass eStaticClass() { - return Model2Package.Literals.STRING_TO_ADDRESS_CONTAINMENT_MAP; + return Model2Package.eINSTANCE.getStringToAddressContainmentMap(); } /** diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/StringToAddressReferenceMapImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/StringToAddressReferenceMapImpl.java index 9d2e8371b3..747c2d2c67 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/StringToAddressReferenceMapImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/StringToAddressReferenceMapImpl.java @@ -88,7 +88,7 @@ public class StringToAddressReferenceMapImpl extends EObjectImpl implements Basi @Override protected EClass eStaticClass() { - return Model2Package.Literals.STRING_TO_ADDRESS_REFERENCE_MAP; + return Model2Package.eINSTANCE.getStringToAddressReferenceMap(); } /** diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/StringToStringMapImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/StringToStringMapImpl.java index a08a407e05..d58b23b0d1 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/StringToStringMapImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/StringToStringMapImpl.java @@ -95,7 +95,7 @@ public class StringToStringMapImpl extends EObjectImpl implements BasicEMap.Entr @Override protected EClass eStaticClass() { - return Model2Package.Literals.STRING_TO_STRING_MAP; + return Model2Package.eINSTANCE.getStringToStringMap(); } /** diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/StringToVATMapImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/StringToVATMapImpl.java index 18b46d50eb..6ea05ae13a 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/StringToVATMapImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/impl/StringToVATMapImpl.java @@ -96,7 +96,7 @@ public class StringToVATMapImpl extends EObjectImpl implements BasicEMap.Entry 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.emf.cdo.tests.model2.impl.SpecialPurchaseOrderImpl - * Special Purchase Order}' class. - * - * @see org.eclipse.emf.cdo.tests.model2.impl.SpecialPurchaseOrderImpl - * @see org.eclipse.emf.cdo.tests.model2.impl.Model2PackageImpl#getSpecialPurchaseOrder() - * @generated - */ - EClass SPECIAL_PURCHASE_ORDER = eINSTANCE.getSpecialPurchaseOrder(); - - /** - * The meta object literal for the 'Discount Code' attribute feature. - * - * @generated - */ - EAttribute SPECIAL_PURCHASE_ORDER__DISCOUNT_CODE = eINSTANCE.getSpecialPurchaseOrder_DiscountCode(); - - /** - * The meta object literal for the 'Shipping Address' containment reference feature. - * - * @generated - */ - EReference SPECIAL_PURCHASE_ORDER__SHIPPING_ADDRESS = eINSTANCE.getSpecialPurchaseOrder_ShippingAddress(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model2.impl.TaskContainerImpl - * Task Container}' class. - * - * @see org.eclipse.emf.cdo.tests.model2.impl.TaskContainerImpl - * @see org.eclipse.emf.cdo.tests.model2.impl.Model2PackageImpl#getTaskContainer() - * @generated - */ - EClass TASK_CONTAINER = eINSTANCE.getTaskContainer(); - - /** - * The meta object literal for the 'Tasks' containment reference list feature. - * - * @generated - */ - EReference TASK_CONTAINER__TASKS = eINSTANCE.getTaskContainer_Tasks(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model2.impl.TaskImpl Task}' class. - * - * - * @see org.eclipse.emf.cdo.tests.model2.impl.TaskImpl - * @see org.eclipse.emf.cdo.tests.model2.impl.Model2PackageImpl#getTask() - * @generated - */ - EClass TASK = eINSTANCE.getTask(); - - /** - * The meta object literal for the 'Task Container' container reference feature. - * - * @generated - */ - EReference TASK__TASK_CONTAINER = eINSTANCE.getTask_TaskContainer(); - - /** - * The meta object literal for the 'Description' attribute feature. - * - * @generated - */ - EAttribute TASK__DESCRIPTION = eINSTANCE.getTask_Description(); - - /** - * The meta object literal for the 'Done' attribute feature. - * - * @generated - */ - EAttribute TASK__DONE = eINSTANCE.getTask_Done(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model2.impl.Unsettable1Impl - * Unsettable1}' class. - * - * @see org.eclipse.emf.cdo.tests.model2.impl.Unsettable1Impl - * @see org.eclipse.emf.cdo.tests.model2.impl.Model2PackageImpl#getUnsettable1() - * @generated - */ - EClass UNSETTABLE1 = eINSTANCE.getUnsettable1(); - - /** - * The meta object literal for the 'Unsettable Boolean' attribute feature. - * - * - * @generated - */ - EAttribute UNSETTABLE1__UNSETTABLE_BOOLEAN = eINSTANCE.getUnsettable1_UnsettableBoolean(); - - /** - * The meta object literal for the 'Unsettable Byte' attribute feature. - * - * @generated - */ - EAttribute UNSETTABLE1__UNSETTABLE_BYTE = eINSTANCE.getUnsettable1_UnsettableByte(); - - /** - * The meta object literal for the 'Unsettable Char' attribute feature. - * - * @generated - */ - EAttribute UNSETTABLE1__UNSETTABLE_CHAR = eINSTANCE.getUnsettable1_UnsettableChar(); - - /** - * The meta object literal for the 'Unsettable Date' attribute feature. - * - * @generated - */ - EAttribute UNSETTABLE1__UNSETTABLE_DATE = eINSTANCE.getUnsettable1_UnsettableDate(); - - /** - * The meta object literal for the 'Unsettable Double' attribute feature. - * - * - * @generated - */ - EAttribute UNSETTABLE1__UNSETTABLE_DOUBLE = eINSTANCE.getUnsettable1_UnsettableDouble(); - - /** - * The meta object literal for the 'Unsettable Float' attribute feature. - * - * - * @generated - */ - EAttribute UNSETTABLE1__UNSETTABLE_FLOAT = eINSTANCE.getUnsettable1_UnsettableFloat(); - - /** - * The meta object literal for the 'Unsettable Int' attribute feature. - * - * @generated - */ - EAttribute UNSETTABLE1__UNSETTABLE_INT = eINSTANCE.getUnsettable1_UnsettableInt(); - - /** - * The meta object literal for the 'Unsettable Long' attribute feature. - * - * @generated - */ - EAttribute UNSETTABLE1__UNSETTABLE_LONG = eINSTANCE.getUnsettable1_UnsettableLong(); - - /** - * The meta object literal for the 'Unsettable Short' attribute feature. - * - * - * @generated - */ - EAttribute UNSETTABLE1__UNSETTABLE_SHORT = eINSTANCE.getUnsettable1_UnsettableShort(); - - /** - * The meta object literal for the 'Unsettable String' attribute feature. - * - * - * @generated - */ - EAttribute UNSETTABLE1__UNSETTABLE_STRING = eINSTANCE.getUnsettable1_UnsettableString(); - - /** - * The meta object literal for the 'Unsettable VAT' attribute feature. - * - * @generated - */ - EAttribute UNSETTABLE1__UNSETTABLE_VAT = eINSTANCE.getUnsettable1_UnsettableVAT(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model2.impl.Unsettable2WithDefaultImpl - * Unsettable2 With Default}' class. - * - * @see org.eclipse.emf.cdo.tests.model2.impl.Unsettable2WithDefaultImpl - * @see org.eclipse.emf.cdo.tests.model2.impl.Model2PackageImpl#getUnsettable2WithDefault() - * @generated - */ - EClass UNSETTABLE2_WITH_DEFAULT = eINSTANCE.getUnsettable2WithDefault(); - - /** - * The meta object literal for the 'Unsettable Boolean' attribute feature. - * - * - * @generated - */ - EAttribute UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_BOOLEAN = eINSTANCE.getUnsettable2WithDefault_UnsettableBoolean(); - - /** - * The meta object literal for the 'Unsettable Byte' attribute feature. - * - * @generated - */ - EAttribute UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_BYTE = eINSTANCE.getUnsettable2WithDefault_UnsettableByte(); - - /** - * The meta object literal for the 'Unsettable Char' attribute feature. - * - * @generated - */ - EAttribute UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_CHAR = eINSTANCE.getUnsettable2WithDefault_UnsettableChar(); - - /** - * The meta object literal for the 'Unsettable Date' attribute feature. - * - * @generated - */ - EAttribute UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_DATE = eINSTANCE.getUnsettable2WithDefault_UnsettableDate(); - - /** - * The meta object literal for the 'Unsettable Double' attribute feature. - * - * - * @generated - */ - EAttribute UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_DOUBLE = eINSTANCE.getUnsettable2WithDefault_UnsettableDouble(); - - /** - * The meta object literal for the 'Unsettable Float' attribute feature. - * - * - * @generated - */ - EAttribute UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_FLOAT = eINSTANCE.getUnsettable2WithDefault_UnsettableFloat(); - - /** - * The meta object literal for the 'Unsettable Int' attribute feature. - * - * @generated - */ - EAttribute UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_INT = eINSTANCE.getUnsettable2WithDefault_UnsettableInt(); - - /** - * The meta object literal for the 'Unsettable Long' attribute feature. - * - * @generated - */ - EAttribute UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_LONG = eINSTANCE.getUnsettable2WithDefault_UnsettableLong(); - - /** - * The meta object literal for the 'Unsettable Short' attribute feature. - * - * - * @generated - */ - EAttribute UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_SHORT = eINSTANCE.getUnsettable2WithDefault_UnsettableShort(); - - /** - * The meta object literal for the 'Unsettable String' attribute feature. - * - * - * @generated - */ - EAttribute UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_STRING = eINSTANCE.getUnsettable2WithDefault_UnsettableString(); - - /** - * The meta object literal for the 'Unsettable VAT' attribute feature. - * - * @generated - */ - EAttribute UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_VAT = eINSTANCE.getUnsettable2WithDefault_UnsettableVAT(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model2.impl.PersistentContainmentImpl - * Persistent Containment}' class. - * - * @see org.eclipse.emf.cdo.tests.model2.impl.PersistentContainmentImpl - * @see org.eclipse.emf.cdo.tests.model2.impl.Model2PackageImpl#getPersistentContainment() - * @generated - */ - EClass PERSISTENT_CONTAINMENT = eINSTANCE.getPersistentContainment(); - - /** - * The meta object literal for the 'Attr Before' attribute feature. - * - * @generated - */ - EAttribute PERSISTENT_CONTAINMENT__ATTR_BEFORE = eINSTANCE.getPersistentContainment_AttrBefore(); - - /** - * The meta object literal for the 'Children' containment reference list feature. - * - * @generated - */ - EReference PERSISTENT_CONTAINMENT__CHILDREN = eINSTANCE.getPersistentContainment_Children(); - - /** - * The meta object literal for the 'Attr After' attribute feature. - * - * @generated - */ - EAttribute PERSISTENT_CONTAINMENT__ATTR_AFTER = eINSTANCE.getPersistentContainment_AttrAfter(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model2.impl.TransientContainerImpl - * Transient Container}' class. - * - * @see org.eclipse.emf.cdo.tests.model2.impl.TransientContainerImpl - * @see org.eclipse.emf.cdo.tests.model2.impl.Model2PackageImpl#getTransientContainer() - * @generated - */ - EClass TRANSIENT_CONTAINER = eINSTANCE.getTransientContainer(); - - /** - * The meta object literal for the 'Attr Before' attribute feature. - * - * @generated - */ - EAttribute TRANSIENT_CONTAINER__ATTR_BEFORE = eINSTANCE.getTransientContainer_AttrBefore(); - - /** - * The meta object literal for the 'Parent' container reference feature. - * - * - * @generated - */ - EReference TRANSIENT_CONTAINER__PARENT = eINSTANCE.getTransientContainer_Parent(); - - /** - * The meta object literal for the 'Attr After' attribute feature. - * - * @generated - */ - EAttribute TRANSIENT_CONTAINER__ATTR_AFTER = eINSTANCE.getTransientContainer_AttrAfter(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model2.impl.NotUnsettableImpl - * Not Unsettable}' class. - * - * @see org.eclipse.emf.cdo.tests.model2.impl.NotUnsettableImpl - * @see org.eclipse.emf.cdo.tests.model2.impl.Model2PackageImpl#getNotUnsettable() - * @generated - */ - EClass NOT_UNSETTABLE = eINSTANCE.getNotUnsettable(); - - /** - * The meta object literal for the 'Not Unsettable Boolean' attribute feature. - * - * @generated - */ - EAttribute NOT_UNSETTABLE__NOT_UNSETTABLE_BOOLEAN = eINSTANCE.getNotUnsettable_NotUnsettableBoolean(); - - /** - * The meta object literal for the 'Not Unsettable Byte' attribute feature. - * - * - * @generated - */ - EAttribute NOT_UNSETTABLE__NOT_UNSETTABLE_BYTE = eINSTANCE.getNotUnsettable_NotUnsettableByte(); - - /** - * The meta object literal for the 'Not Unsettable Char' attribute feature. - * - * - * @generated - */ - EAttribute NOT_UNSETTABLE__NOT_UNSETTABLE_CHAR = eINSTANCE.getNotUnsettable_NotUnsettableChar(); - - /** - * The meta object literal for the 'Not Unsettable Date' attribute feature. - * - * - * @generated - */ - EAttribute NOT_UNSETTABLE__NOT_UNSETTABLE_DATE = eINSTANCE.getNotUnsettable_NotUnsettableDate(); - - /** - * The meta object literal for the 'Not Unsettable Double' attribute feature. - * - * @generated - */ - EAttribute NOT_UNSETTABLE__NOT_UNSETTABLE_DOUBLE = eINSTANCE.getNotUnsettable_NotUnsettableDouble(); - - /** - * The meta object literal for the 'Not Unsettable Float' attribute feature. - * - * - * @generated - */ - EAttribute NOT_UNSETTABLE__NOT_UNSETTABLE_FLOAT = eINSTANCE.getNotUnsettable_NotUnsettableFloat(); - - /** - * The meta object literal for the 'Not Unsettable Int' attribute feature. - * - * - * @generated - */ - EAttribute NOT_UNSETTABLE__NOT_UNSETTABLE_INT = eINSTANCE.getNotUnsettable_NotUnsettableInt(); - - /** - * The meta object literal for the 'Not Unsettable Long' attribute feature. - * - * - * @generated - */ - EAttribute NOT_UNSETTABLE__NOT_UNSETTABLE_LONG = eINSTANCE.getNotUnsettable_NotUnsettableLong(); - - /** - * The meta object literal for the 'Not Unsettable Short' attribute feature. - * - * - * @generated - */ - EAttribute NOT_UNSETTABLE__NOT_UNSETTABLE_SHORT = eINSTANCE.getNotUnsettable_NotUnsettableShort(); - - /** - * The meta object literal for the 'Not Unsettable String' attribute feature. - * - * @generated - */ - EAttribute NOT_UNSETTABLE__NOT_UNSETTABLE_STRING = eINSTANCE.getNotUnsettable_NotUnsettableString(); - - /** - * The meta object literal for the 'Not Unsettable VAT' attribute feature. - * - * - * @generated - */ - EAttribute NOT_UNSETTABLE__NOT_UNSETTABLE_VAT = eINSTANCE.getNotUnsettable_NotUnsettableVAT(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model2.impl.NotUnsettableWithDefaultImpl - * Not Unsettable With Default}' class. - * - * @see org.eclipse.emf.cdo.tests.model2.impl.NotUnsettableWithDefaultImpl - * @see org.eclipse.emf.cdo.tests.model2.impl.Model2PackageImpl#getNotUnsettableWithDefault() - * @generated - */ - EClass NOT_UNSETTABLE_WITH_DEFAULT = eINSTANCE.getNotUnsettableWithDefault(); - - /** - * The meta object literal for the 'Not Unsettable Boolean' attribute feature. - * - * @generated - */ - EAttribute NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_BOOLEAN = eINSTANCE - .getNotUnsettableWithDefault_NotUnsettableBoolean(); - - /** - * The meta object literal for the 'Not Unsettable Byte' attribute feature. - * - * - * @generated - */ - EAttribute NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_BYTE = eINSTANCE - .getNotUnsettableWithDefault_NotUnsettableByte(); - - /** - * The meta object literal for the 'Not Unsettable Char' attribute feature. - * - * - * @generated - */ - EAttribute NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_CHAR = eINSTANCE - .getNotUnsettableWithDefault_NotUnsettableChar(); - - /** - * The meta object literal for the 'Not Unsettable Date' attribute feature. - * - * - * @generated - */ - EAttribute NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_DATE = eINSTANCE - .getNotUnsettableWithDefault_NotUnsettableDate(); - - /** - * The meta object literal for the 'Not Unsettable Double' attribute feature. - * - * @generated - */ - EAttribute NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_DOUBLE = eINSTANCE - .getNotUnsettableWithDefault_NotUnsettableDouble(); - - /** - * The meta object literal for the 'Not Unsettable Float' attribute feature. - * - * - * @generated - */ - EAttribute NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_FLOAT = eINSTANCE - .getNotUnsettableWithDefault_NotUnsettableFloat(); - - /** - * The meta object literal for the 'Not Unsettable Int' attribute feature. - * - * - * @generated - */ - EAttribute NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_INT = eINSTANCE - .getNotUnsettableWithDefault_NotUnsettableInt(); - - /** - * The meta object literal for the 'Not Unsettable Long' attribute feature. - * - * - * @generated - */ - EAttribute NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_LONG = eINSTANCE - .getNotUnsettableWithDefault_NotUnsettableLong(); - - /** - * The meta object literal for the 'Not Unsettable Short' attribute feature. - * - * - * @generated - */ - EAttribute NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_SHORT = eINSTANCE - .getNotUnsettableWithDefault_NotUnsettableShort(); - - /** - * The meta object literal for the 'Not Unsettable String' attribute feature. - * - * @generated - */ - EAttribute NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_STRING = eINSTANCE - .getNotUnsettableWithDefault_NotUnsettableString(); - - /** - * The meta object literal for the 'Not Unsettable VAT' attribute feature. - * - * - * @generated - */ - EAttribute NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_VAT = eINSTANCE - .getNotUnsettableWithDefault_NotUnsettableVAT(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model2.impl.MapHolderImpl Map Holder}' - * class. - * - * @see org.eclipse.emf.cdo.tests.model2.impl.MapHolderImpl - * @see org.eclipse.emf.cdo.tests.model2.impl.Model2PackageImpl#getMapHolder() - * @generated - */ - EClass MAP_HOLDER = eINSTANCE.getMapHolder(); - - /** - * The meta object literal for the 'Integer To String Map' map feature. - * - * @generated - */ - EReference MAP_HOLDER__INTEGER_TO_STRING_MAP = eINSTANCE.getMapHolder_IntegerToStringMap(); - - /** - * The meta object literal for the 'String To String Map' map feature. - * - * @generated - */ - EReference MAP_HOLDER__STRING_TO_STRING_MAP = eINSTANCE.getMapHolder_StringToStringMap(); - - /** - * The meta object literal for the 'String To VAT Map' map feature. - * - * @generated - */ - EReference MAP_HOLDER__STRING_TO_VAT_MAP = eINSTANCE.getMapHolder_StringToVATMap(); - - /** - * The meta object literal for the 'String To Address Containment Map' map feature. - * - * @generated - */ - EReference MAP_HOLDER__STRING_TO_ADDRESS_CONTAINMENT_MAP = eINSTANCE.getMapHolder_StringToAddressContainmentMap(); - - /** - * The meta object literal for the 'String To Address Reference Map' map feature. - * - * @generated - */ - EReference MAP_HOLDER__STRING_TO_ADDRESS_REFERENCE_MAP = eINSTANCE.getMapHolder_StringToAddressReferenceMap(); - - /** - * The meta object literal for the 'EObject To EObject Map' map feature. - * - * - * @generated - */ - EReference MAP_HOLDER__EOBJECT_TO_EOBJECT_MAP = eINSTANCE.getMapHolder_EObjectToEObjectMap(); - - /** - * The meta object literal for the 'EObject To EObject Key Contained Map' map feature. - * - * @generated - */ - EReference MAP_HOLDER__EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP = eINSTANCE - .getMapHolder_EObjectToEObjectKeyContainedMap(); - - /** - * The meta object literal for the 'EObject To EObject Both Contained Map' map feature. - * - * @generated - */ - EReference MAP_HOLDER__EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP = eINSTANCE - .getMapHolder_EObjectToEObjectBothContainedMap(); - - /** - * The meta object literal for the 'EObject To EObject Value Contained Map' map feature. - * - * @generated - */ - EReference MAP_HOLDER__EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP = eINSTANCE - .getMapHolder_EObjectToEObjectValueContainedMap(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model2.impl.StringToStringMapImpl - * String To String Map}' class. - * - * @see org.eclipse.emf.cdo.tests.model2.impl.StringToStringMapImpl - * @see org.eclipse.emf.cdo.tests.model2.impl.Model2PackageImpl#getStringToStringMap() - * @generated - */ - EClass STRING_TO_STRING_MAP = eINSTANCE.getStringToStringMap(); - - /** - * The meta object literal for the 'Key' attribute feature. - * - * @generated - */ - EAttribute STRING_TO_STRING_MAP__KEY = eINSTANCE.getStringToStringMap_Key(); - - /** - * The meta object literal for the 'Value' attribute feature. - * - * @generated - */ - EAttribute STRING_TO_STRING_MAP__VALUE = eINSTANCE.getStringToStringMap_Value(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model2.impl.IntegerToStringMapImpl - * Integer To String Map}' class. - * - * @see org.eclipse.emf.cdo.tests.model2.impl.IntegerToStringMapImpl - * @see org.eclipse.emf.cdo.tests.model2.impl.Model2PackageImpl#getIntegerToStringMap() - * @generated - */ - EClass INTEGER_TO_STRING_MAP = eINSTANCE.getIntegerToStringMap(); - - /** - * The meta object literal for the 'Key' attribute feature. - * - * @generated - */ - EAttribute INTEGER_TO_STRING_MAP__KEY = eINSTANCE.getIntegerToStringMap_Key(); - - /** - * The meta object literal for the 'Value' attribute feature. - * - * @generated - */ - EAttribute INTEGER_TO_STRING_MAP__VALUE = eINSTANCE.getIntegerToStringMap_Value(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model2.impl.StringToVATMapImpl - * String To VAT Map}' class. - * - * @see org.eclipse.emf.cdo.tests.model2.impl.StringToVATMapImpl - * @see org.eclipse.emf.cdo.tests.model2.impl.Model2PackageImpl#getStringToVATMap() - * @generated - */ - EClass STRING_TO_VAT_MAP = eINSTANCE.getStringToVATMap(); - - /** - * The meta object literal for the 'Key' attribute feature. - * - * @generated - */ - EAttribute STRING_TO_VAT_MAP__KEY = eINSTANCE.getStringToVATMap_Key(); - - /** - * The meta object literal for the 'Value' attribute feature. - * - * @generated - */ - EAttribute STRING_TO_VAT_MAP__VALUE = eINSTANCE.getStringToVATMap_Value(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model2.impl.StringToAddressContainmentMapImpl - * String To Address Containment Map}' class. - * - * @see org.eclipse.emf.cdo.tests.model2.impl.StringToAddressContainmentMapImpl - * @see org.eclipse.emf.cdo.tests.model2.impl.Model2PackageImpl#getStringToAddressContainmentMap() - * @generated - */ - EClass STRING_TO_ADDRESS_CONTAINMENT_MAP = eINSTANCE.getStringToAddressContainmentMap(); - - /** - * The meta object literal for the 'Key' attribute feature. - * - * @generated - */ - EAttribute STRING_TO_ADDRESS_CONTAINMENT_MAP__KEY = eINSTANCE.getStringToAddressContainmentMap_Key(); - - /** - * The meta object literal for the 'Value' containment reference feature. - * - * - * @generated - */ - EReference STRING_TO_ADDRESS_CONTAINMENT_MAP__VALUE = eINSTANCE.getStringToAddressContainmentMap_Value(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model2.impl.StringToAddressReferenceMapImpl - * String To Address Reference Map}' class. - * - * @see org.eclipse.emf.cdo.tests.model2.impl.StringToAddressReferenceMapImpl - * @see org.eclipse.emf.cdo.tests.model2.impl.Model2PackageImpl#getStringToAddressReferenceMap() - * @generated - */ - EClass STRING_TO_ADDRESS_REFERENCE_MAP = eINSTANCE.getStringToAddressReferenceMap(); - - /** - * The meta object literal for the 'Key' attribute feature. - * - * @generated - */ - EAttribute STRING_TO_ADDRESS_REFERENCE_MAP__KEY = eINSTANCE.getStringToAddressReferenceMap_Key(); - - /** - * The meta object literal for the 'Value' reference feature. - * - * @generated - */ - EReference STRING_TO_ADDRESS_REFERENCE_MAP__VALUE = eINSTANCE.getStringToAddressReferenceMap_Value(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model2.impl.EObjectToEObjectMapImpl - * EObject To EObject Map}' class. - * - * @see org.eclipse.emf.cdo.tests.model2.impl.EObjectToEObjectMapImpl - * @see org.eclipse.emf.cdo.tests.model2.impl.Model2PackageImpl#getEObjectToEObjectMap() - * @generated - */ - EClass EOBJECT_TO_EOBJECT_MAP = eINSTANCE.getEObjectToEObjectMap(); - - /** - * The meta object literal for the 'Key' reference feature. - * - * @generated - */ - EReference EOBJECT_TO_EOBJECT_MAP__KEY = eINSTANCE.getEObjectToEObjectMap_Key(); - - /** - * The meta object literal for the 'Value' reference feature. - * - * @generated - */ - EReference EOBJECT_TO_EOBJECT_MAP__VALUE = eINSTANCE.getEObjectToEObjectMap_Value(); - - /** - * The meta object literal for the ' - * {@link org.eclipse.emf.cdo.tests.model2.impl.EObjectToEObjectKeyContainedMapImpl - * EObject To EObject Key Contained Map}' class. - * - * @see org.eclipse.emf.cdo.tests.model2.impl.EObjectToEObjectKeyContainedMapImpl - * @see org.eclipse.emf.cdo.tests.model2.impl.Model2PackageImpl#getEObjectToEObjectKeyContainedMap() - * @generated - */ - EClass EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP = eINSTANCE.getEObjectToEObjectKeyContainedMap(); - - /** - * The meta object literal for the 'Key' containment reference feature. - * - * @generated - */ - EReference EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP__KEY = eINSTANCE.getEObjectToEObjectKeyContainedMap_Key(); - - /** - * The meta object literal for the 'Value' reference feature. - * - * @generated - */ - EReference EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP__VALUE = eINSTANCE.getEObjectToEObjectKeyContainedMap_Value(); - - /** - * The meta object literal for the ' - * {@link org.eclipse.emf.cdo.tests.model2.impl.EObjectToEObjectBothContainedMapImpl - * EObject To EObject Both Contained Map}' class. - * - * @see org.eclipse.emf.cdo.tests.model2.impl.EObjectToEObjectBothContainedMapImpl - * @see org.eclipse.emf.cdo.tests.model2.impl.Model2PackageImpl#getEObjectToEObjectBothContainedMap() - * @generated - */ - EClass EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP = eINSTANCE.getEObjectToEObjectBothContainedMap(); - - /** - * The meta object literal for the 'Key' containment reference feature. - * - * @generated - */ - EReference EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP__KEY = eINSTANCE.getEObjectToEObjectBothContainedMap_Key(); - - /** - * The meta object literal for the 'Value' containment reference feature. - * - * - * @generated - */ - EReference EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP__VALUE = eINSTANCE.getEObjectToEObjectBothContainedMap_Value(); - - /** - * The meta object literal for the ' - * {@link org.eclipse.emf.cdo.tests.model2.impl.EObjectToEObjectValueContainedMapImpl - * EObject To EObject Value Contained Map}' class. - * - * @see org.eclipse.emf.cdo.tests.model2.impl.EObjectToEObjectValueContainedMapImpl - * @see org.eclipse.emf.cdo.tests.model2.impl.Model2PackageImpl#getEObjectToEObjectValueContainedMap() - * @generated - */ - EClass EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP = eINSTANCE.getEObjectToEObjectValueContainedMap(); - - /** - * The meta object literal for the 'Key' reference feature. - * - * @generated - */ - EReference EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP__KEY = eINSTANCE.getEObjectToEObjectValueContainedMap_Key(); - - /** - * The meta object literal for the 'Value' containment reference feature. - * - * - * @generated - */ - EReference EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP__VALUE = eINSTANCE.getEObjectToEObjectValueContainedMap_Value(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model2.impl.EnumListHolderImpl - * Enum List Holder}' class. - * - * @see org.eclipse.emf.cdo.tests.model2.impl.EnumListHolderImpl - * @see org.eclipse.emf.cdo.tests.model2.impl.Model2PackageImpl#getEnumListHolder() - * @generated - */ - EClass ENUM_LIST_HOLDER = eINSTANCE.getEnumListHolder(); - - /** - * The meta object literal for the 'Enum List' attribute list feature. - * - * @generated - */ - EAttribute ENUM_LIST_HOLDER__ENUM_LIST = eINSTANCE.getEnumListHolder_EnumList(); - - } - } // Model2Package diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/EObjectToEObjectBothContainedMapImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/EObjectToEObjectBothContainedMapImpl.java index 28efaa3fe4..7bba15e9ee 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/EObjectToEObjectBothContainedMapImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/EObjectToEObjectBothContainedMapImpl.java @@ -54,7 +54,7 @@ public class EObjectToEObjectBothContainedMapImpl extends CDOObjectImpl implemen @Override protected EClass eStaticClass() { - return Model2Package.Literals.EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP; + return Model2Package.eINSTANCE.getEObjectToEObjectBothContainedMap(); } /** @@ -75,7 +75,7 @@ public class EObjectToEObjectBothContainedMapImpl extends CDOObjectImpl implemen */ public EObject getTypedKey() { - return (EObject)eGet(Model2Package.Literals.EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP__KEY, true); + return (EObject)eGet(Model2Package.eINSTANCE.getEObjectToEObjectBothContainedMap_Key(), true); } /** @@ -85,7 +85,7 @@ public class EObjectToEObjectBothContainedMapImpl extends CDOObjectImpl implemen */ public void setTypedKey(EObject newKey) { - eSet(Model2Package.Literals.EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP__KEY, newKey); + eSet(Model2Package.eINSTANCE.getEObjectToEObjectBothContainedMap_Key(), newKey); } /** @@ -95,7 +95,7 @@ public class EObjectToEObjectBothContainedMapImpl extends CDOObjectImpl implemen */ public EObject getTypedValue() { - return (EObject)eGet(Model2Package.Literals.EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP__VALUE, true); + return (EObject)eGet(Model2Package.eINSTANCE.getEObjectToEObjectBothContainedMap_Value(), true); } /** @@ -105,7 +105,7 @@ public class EObjectToEObjectBothContainedMapImpl extends CDOObjectImpl implemen */ public void setTypedValue(EObject newValue) { - eSet(Model2Package.Literals.EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP__VALUE, newValue); + eSet(Model2Package.eINSTANCE.getEObjectToEObjectBothContainedMap_Value(), newValue); } /** diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/EObjectToEObjectKeyContainedMapImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/EObjectToEObjectKeyContainedMapImpl.java index 3ec6e2e5b3..cd3551ec20 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/EObjectToEObjectKeyContainedMapImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/EObjectToEObjectKeyContainedMapImpl.java @@ -54,7 +54,7 @@ public class EObjectToEObjectKeyContainedMapImpl extends CDOObjectImpl implement @Override protected EClass eStaticClass() { - return Model2Package.Literals.EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP; + return Model2Package.eINSTANCE.getEObjectToEObjectKeyContainedMap(); } /** @@ -75,7 +75,7 @@ public class EObjectToEObjectKeyContainedMapImpl extends CDOObjectImpl implement */ public EObject getTypedKey() { - return (EObject)eGet(Model2Package.Literals.EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP__KEY, true); + return (EObject)eGet(Model2Package.eINSTANCE.getEObjectToEObjectKeyContainedMap_Key(), true); } /** @@ -85,7 +85,7 @@ public class EObjectToEObjectKeyContainedMapImpl extends CDOObjectImpl implement */ public void setTypedKey(EObject newKey) { - eSet(Model2Package.Literals.EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP__KEY, newKey); + eSet(Model2Package.eINSTANCE.getEObjectToEObjectKeyContainedMap_Key(), newKey); } /** @@ -95,7 +95,7 @@ public class EObjectToEObjectKeyContainedMapImpl extends CDOObjectImpl implement */ public EObject getTypedValue() { - return (EObject)eGet(Model2Package.Literals.EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP__VALUE, true); + return (EObject)eGet(Model2Package.eINSTANCE.getEObjectToEObjectKeyContainedMap_Value(), true); } /** @@ -105,7 +105,7 @@ public class EObjectToEObjectKeyContainedMapImpl extends CDOObjectImpl implement */ public void setTypedValue(EObject newValue) { - eSet(Model2Package.Literals.EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP__VALUE, newValue); + eSet(Model2Package.eINSTANCE.getEObjectToEObjectKeyContainedMap_Value(), newValue); } /** diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/EObjectToEObjectMapImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/EObjectToEObjectMapImpl.java index 72df95d24a..2bdae1ec21 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/EObjectToEObjectMapImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/EObjectToEObjectMapImpl.java @@ -54,7 +54,7 @@ public class EObjectToEObjectMapImpl extends CDOObjectImpl implements BasicEMap. @Override protected EClass eStaticClass() { - return Model2Package.Literals.EOBJECT_TO_EOBJECT_MAP; + return Model2Package.eINSTANCE.getEObjectToEObjectMap(); } /** @@ -75,7 +75,7 @@ public class EObjectToEObjectMapImpl extends CDOObjectImpl implements BasicEMap. */ public EObject getTypedKey() { - return (EObject)eGet(Model2Package.Literals.EOBJECT_TO_EOBJECT_MAP__KEY, true); + return (EObject)eGet(Model2Package.eINSTANCE.getEObjectToEObjectMap_Key(), true); } /** @@ -85,7 +85,7 @@ public class EObjectToEObjectMapImpl extends CDOObjectImpl implements BasicEMap. */ public void setTypedKey(EObject newKey) { - eSet(Model2Package.Literals.EOBJECT_TO_EOBJECT_MAP__KEY, newKey); + eSet(Model2Package.eINSTANCE.getEObjectToEObjectMap_Key(), newKey); } /** @@ -95,7 +95,7 @@ public class EObjectToEObjectMapImpl extends CDOObjectImpl implements BasicEMap. */ public EObject getTypedValue() { - return (EObject)eGet(Model2Package.Literals.EOBJECT_TO_EOBJECT_MAP__VALUE, true); + return (EObject)eGet(Model2Package.eINSTANCE.getEObjectToEObjectMap_Value(), true); } /** @@ -105,7 +105,7 @@ public class EObjectToEObjectMapImpl extends CDOObjectImpl implements BasicEMap. */ public void setTypedValue(EObject newValue) { - eSet(Model2Package.Literals.EOBJECT_TO_EOBJECT_MAP__VALUE, newValue); + eSet(Model2Package.eINSTANCE.getEObjectToEObjectMap_Value(), newValue); } /** diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/EObjectToEObjectValueContainedMapImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/EObjectToEObjectValueContainedMapImpl.java index 9a8b7e0b9d..a683806434 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/EObjectToEObjectValueContainedMapImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/EObjectToEObjectValueContainedMapImpl.java @@ -54,7 +54,7 @@ public class EObjectToEObjectValueContainedMapImpl extends CDOObjectImpl impleme @Override protected EClass eStaticClass() { - return Model2Package.Literals.EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP; + return Model2Package.eINSTANCE.getEObjectToEObjectValueContainedMap(); } /** @@ -75,7 +75,7 @@ public class EObjectToEObjectValueContainedMapImpl extends CDOObjectImpl impleme */ public EObject getTypedKey() { - return (EObject)eGet(Model2Package.Literals.EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP__KEY, true); + return (EObject)eGet(Model2Package.eINSTANCE.getEObjectToEObjectValueContainedMap_Key(), true); } /** @@ -85,7 +85,7 @@ public class EObjectToEObjectValueContainedMapImpl extends CDOObjectImpl impleme */ public void setTypedKey(EObject newKey) { - eSet(Model2Package.Literals.EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP__KEY, newKey); + eSet(Model2Package.eINSTANCE.getEObjectToEObjectValueContainedMap_Key(), newKey); } /** @@ -95,7 +95,7 @@ public class EObjectToEObjectValueContainedMapImpl extends CDOObjectImpl impleme */ public EObject getTypedValue() { - return (EObject)eGet(Model2Package.Literals.EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP__VALUE, true); + return (EObject)eGet(Model2Package.eINSTANCE.getEObjectToEObjectValueContainedMap_Value(), true); } /** @@ -105,7 +105,7 @@ public class EObjectToEObjectValueContainedMapImpl extends CDOObjectImpl impleme */ public void setTypedValue(EObject newValue) { - eSet(Model2Package.Literals.EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP__VALUE, newValue); + eSet(Model2Package.eINSTANCE.getEObjectToEObjectValueContainedMap_Value(), newValue); } /** diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/EnumListHolderImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/EnumListHolderImpl.java index dae619b738..1557e130dd 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/EnumListHolderImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/EnumListHolderImpl.java @@ -51,7 +51,7 @@ public class EnumListHolderImpl extends CDOObjectImpl implements EnumListHolder @Override protected EClass eStaticClass() { - return Model2Package.Literals.ENUM_LIST_HOLDER; + return Model2Package.eINSTANCE.getEnumListHolder(); } /** @@ -73,7 +73,7 @@ public class EnumListHolderImpl extends CDOObjectImpl implements EnumListHolder @SuppressWarnings("unchecked") public EList getEnumList() { - return (EList)eGet(Model2Package.Literals.ENUM_LIST_HOLDER__ENUM_LIST, true); + return (EList)eGet(Model2Package.eINSTANCE.getEnumListHolder_EnumList(), true); } } // EnumListHolderImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/IntegerToStringMapImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/IntegerToStringMapImpl.java index 21e6be9375..9c1524c8a5 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/IntegerToStringMapImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/IntegerToStringMapImpl.java @@ -54,7 +54,7 @@ public class IntegerToStringMapImpl extends CDOObjectImpl implements BasicEMap.E @Override protected EClass eStaticClass() { - return Model2Package.Literals.INTEGER_TO_STRING_MAP; + return Model2Package.eINSTANCE.getIntegerToStringMap(); } /** @@ -75,7 +75,7 @@ public class IntegerToStringMapImpl extends CDOObjectImpl implements BasicEMap.E */ public Integer getTypedKey() { - return (Integer)eGet(Model2Package.Literals.INTEGER_TO_STRING_MAP__KEY, true); + return (Integer)eGet(Model2Package.eINSTANCE.getIntegerToStringMap_Key(), true); } /** @@ -85,7 +85,7 @@ public class IntegerToStringMapImpl extends CDOObjectImpl implements BasicEMap.E */ public void setTypedKey(Integer newKey) { - eSet(Model2Package.Literals.INTEGER_TO_STRING_MAP__KEY, newKey); + eSet(Model2Package.eINSTANCE.getIntegerToStringMap_Key(), newKey); } /** @@ -95,7 +95,7 @@ public class IntegerToStringMapImpl extends CDOObjectImpl implements BasicEMap.E */ public String getTypedValue() { - return (String)eGet(Model2Package.Literals.INTEGER_TO_STRING_MAP__VALUE, true); + return (String)eGet(Model2Package.eINSTANCE.getIntegerToStringMap_Value(), true); } /** @@ -105,7 +105,7 @@ public class IntegerToStringMapImpl extends CDOObjectImpl implements BasicEMap.E */ public void setTypedValue(String newValue) { - eSet(Model2Package.Literals.INTEGER_TO_STRING_MAP__VALUE, newValue); + eSet(Model2Package.eINSTANCE.getIntegerToStringMap_Value(), newValue); } /** diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/MapHolderImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/MapHolderImpl.java index e33c0fe469..b7c9cfe78d 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/MapHolderImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/MapHolderImpl.java @@ -68,7 +68,7 @@ public class MapHolderImpl extends CDOObjectImpl implements MapHolder @Override protected EClass eStaticClass() { - return Model2Package.Literals.MAP_HOLDER; + return Model2Package.eINSTANCE.getMapHolder(); } /** @@ -90,7 +90,7 @@ public class MapHolderImpl extends CDOObjectImpl implements MapHolder @SuppressWarnings("unchecked") public EMap getIntegerToStringMap() { - return (EMap)eGet(Model2Package.Literals.MAP_HOLDER__INTEGER_TO_STRING_MAP, true); + return (EMap)eGet(Model2Package.eINSTANCE.getMapHolder_IntegerToStringMap(), true); } /** @@ -101,7 +101,7 @@ public class MapHolderImpl extends CDOObjectImpl implements MapHolder @SuppressWarnings("unchecked") public EMap getStringToStringMap() { - return (EMap)eGet(Model2Package.Literals.MAP_HOLDER__STRING_TO_STRING_MAP, true); + return (EMap)eGet(Model2Package.eINSTANCE.getMapHolder_StringToStringMap(), true); } /** @@ -112,7 +112,7 @@ public class MapHolderImpl extends CDOObjectImpl implements MapHolder @SuppressWarnings("unchecked") public EMap getStringToVATMap() { - return (EMap)eGet(Model2Package.Literals.MAP_HOLDER__STRING_TO_VAT_MAP, true); + return (EMap)eGet(Model2Package.eINSTANCE.getMapHolder_StringToVATMap(), true); } /** @@ -123,7 +123,7 @@ public class MapHolderImpl extends CDOObjectImpl implements MapHolder @SuppressWarnings("unchecked") public EMap getStringToAddressContainmentMap() { - return (EMap)eGet(Model2Package.Literals.MAP_HOLDER__STRING_TO_ADDRESS_CONTAINMENT_MAP, true); + return (EMap)eGet(Model2Package.eINSTANCE.getMapHolder_StringToAddressContainmentMap(), true); } /** @@ -134,7 +134,7 @@ public class MapHolderImpl extends CDOObjectImpl implements MapHolder @SuppressWarnings("unchecked") public EMap getStringToAddressReferenceMap() { - return (EMap)eGet(Model2Package.Literals.MAP_HOLDER__STRING_TO_ADDRESS_REFERENCE_MAP, true); + return (EMap)eGet(Model2Package.eINSTANCE.getMapHolder_StringToAddressReferenceMap(), true); } /** @@ -145,7 +145,7 @@ public class MapHolderImpl extends CDOObjectImpl implements MapHolder @SuppressWarnings("unchecked") public EMap getEObjectToEObjectMap() { - return (EMap)eGet(Model2Package.Literals.MAP_HOLDER__EOBJECT_TO_EOBJECT_MAP, true); + return (EMap)eGet(Model2Package.eINSTANCE.getMapHolder_EObjectToEObjectMap(), true); } /** @@ -156,7 +156,7 @@ public class MapHolderImpl extends CDOObjectImpl implements MapHolder @SuppressWarnings("unchecked") public EMap getEObjectToEObjectKeyContainedMap() { - return (EMap)eGet(Model2Package.Literals.MAP_HOLDER__EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP, true); + return (EMap)eGet(Model2Package.eINSTANCE.getMapHolder_EObjectToEObjectKeyContainedMap(), true); } /** @@ -167,7 +167,7 @@ public class MapHolderImpl extends CDOObjectImpl implements MapHolder @SuppressWarnings("unchecked") public EMap getEObjectToEObjectBothContainedMap() { - return (EMap)eGet(Model2Package.Literals.MAP_HOLDER__EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP, true); + return (EMap)eGet(Model2Package.eINSTANCE.getMapHolder_EObjectToEObjectBothContainedMap(), true); } /** @@ -178,7 +178,7 @@ public class MapHolderImpl extends CDOObjectImpl implements MapHolder @SuppressWarnings("unchecked") public EMap getEObjectToEObjectValueContainedMap() { - return (EMap)eGet(Model2Package.Literals.MAP_HOLDER__EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP, true); + return (EMap)eGet(Model2Package.eINSTANCE.getMapHolder_EObjectToEObjectValueContainedMap(), true); } } // MapHolderImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/NotUnsettableImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/NotUnsettableImpl.java index b8f9f5e568..37ed426eca 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/NotUnsettableImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/NotUnsettableImpl.java @@ -72,7 +72,7 @@ public class NotUnsettableImpl extends CDOObjectImpl implements NotUnsettable @Override protected EClass eStaticClass() { - return Model2Package.Literals.NOT_UNSETTABLE; + return Model2Package.eINSTANCE.getNotUnsettable(); } /** @@ -93,7 +93,7 @@ public class NotUnsettableImpl extends CDOObjectImpl implements NotUnsettable */ public boolean isNotUnsettableBoolean() { - return (Boolean)eGet(Model2Package.Literals.NOT_UNSETTABLE__NOT_UNSETTABLE_BOOLEAN, true); + return (Boolean)eGet(Model2Package.eINSTANCE.getNotUnsettable_NotUnsettableBoolean(), true); } /** @@ -103,7 +103,7 @@ public class NotUnsettableImpl extends CDOObjectImpl implements NotUnsettable */ public void setNotUnsettableBoolean(boolean newNotUnsettableBoolean) { - eSet(Model2Package.Literals.NOT_UNSETTABLE__NOT_UNSETTABLE_BOOLEAN, newNotUnsettableBoolean); + eSet(Model2Package.eINSTANCE.getNotUnsettable_NotUnsettableBoolean(), newNotUnsettableBoolean); } /** @@ -113,7 +113,7 @@ public class NotUnsettableImpl extends CDOObjectImpl implements NotUnsettable */ public byte getNotUnsettableByte() { - return (Byte)eGet(Model2Package.Literals.NOT_UNSETTABLE__NOT_UNSETTABLE_BYTE, true); + return (Byte)eGet(Model2Package.eINSTANCE.getNotUnsettable_NotUnsettableByte(), true); } /** @@ -123,7 +123,7 @@ public class NotUnsettableImpl extends CDOObjectImpl implements NotUnsettable */ public void setNotUnsettableByte(byte newNotUnsettableByte) { - eSet(Model2Package.Literals.NOT_UNSETTABLE__NOT_UNSETTABLE_BYTE, newNotUnsettableByte); + eSet(Model2Package.eINSTANCE.getNotUnsettable_NotUnsettableByte(), newNotUnsettableByte); } /** @@ -133,7 +133,7 @@ public class NotUnsettableImpl extends CDOObjectImpl implements NotUnsettable */ public char getNotUnsettableChar() { - return (Character)eGet(Model2Package.Literals.NOT_UNSETTABLE__NOT_UNSETTABLE_CHAR, true); + return (Character)eGet(Model2Package.eINSTANCE.getNotUnsettable_NotUnsettableChar(), true); } /** @@ -143,7 +143,7 @@ public class NotUnsettableImpl extends CDOObjectImpl implements NotUnsettable */ public void setNotUnsettableChar(char newNotUnsettableChar) { - eSet(Model2Package.Literals.NOT_UNSETTABLE__NOT_UNSETTABLE_CHAR, newNotUnsettableChar); + eSet(Model2Package.eINSTANCE.getNotUnsettable_NotUnsettableChar(), newNotUnsettableChar); } /** @@ -153,7 +153,7 @@ public class NotUnsettableImpl extends CDOObjectImpl implements NotUnsettable */ public Date getNotUnsettableDate() { - return (Date)eGet(Model2Package.Literals.NOT_UNSETTABLE__NOT_UNSETTABLE_DATE, true); + return (Date)eGet(Model2Package.eINSTANCE.getNotUnsettable_NotUnsettableDate(), true); } /** @@ -163,7 +163,7 @@ public class NotUnsettableImpl extends CDOObjectImpl implements NotUnsettable */ public void setNotUnsettableDate(Date newNotUnsettableDate) { - eSet(Model2Package.Literals.NOT_UNSETTABLE__NOT_UNSETTABLE_DATE, newNotUnsettableDate); + eSet(Model2Package.eINSTANCE.getNotUnsettable_NotUnsettableDate(), newNotUnsettableDate); } /** @@ -173,7 +173,7 @@ public class NotUnsettableImpl extends CDOObjectImpl implements NotUnsettable */ public double getNotUnsettableDouble() { - return (Double)eGet(Model2Package.Literals.NOT_UNSETTABLE__NOT_UNSETTABLE_DOUBLE, true); + return (Double)eGet(Model2Package.eINSTANCE.getNotUnsettable_NotUnsettableDouble(), true); } /** @@ -183,7 +183,7 @@ public class NotUnsettableImpl extends CDOObjectImpl implements NotUnsettable */ public void setNotUnsettableDouble(double newNotUnsettableDouble) { - eSet(Model2Package.Literals.NOT_UNSETTABLE__NOT_UNSETTABLE_DOUBLE, newNotUnsettableDouble); + eSet(Model2Package.eINSTANCE.getNotUnsettable_NotUnsettableDouble(), newNotUnsettableDouble); } /** @@ -193,7 +193,7 @@ public class NotUnsettableImpl extends CDOObjectImpl implements NotUnsettable */ public float getNotUnsettableFloat() { - return (Float)eGet(Model2Package.Literals.NOT_UNSETTABLE__NOT_UNSETTABLE_FLOAT, true); + return (Float)eGet(Model2Package.eINSTANCE.getNotUnsettable_NotUnsettableFloat(), true); } /** @@ -203,7 +203,7 @@ public class NotUnsettableImpl extends CDOObjectImpl implements NotUnsettable */ public void setNotUnsettableFloat(float newNotUnsettableFloat) { - eSet(Model2Package.Literals.NOT_UNSETTABLE__NOT_UNSETTABLE_FLOAT, newNotUnsettableFloat); + eSet(Model2Package.eINSTANCE.getNotUnsettable_NotUnsettableFloat(), newNotUnsettableFloat); } /** @@ -213,7 +213,7 @@ public class NotUnsettableImpl extends CDOObjectImpl implements NotUnsettable */ public int getNotUnsettableInt() { - return (Integer)eGet(Model2Package.Literals.NOT_UNSETTABLE__NOT_UNSETTABLE_INT, true); + return (Integer)eGet(Model2Package.eINSTANCE.getNotUnsettable_NotUnsettableInt(), true); } /** @@ -223,7 +223,7 @@ public class NotUnsettableImpl extends CDOObjectImpl implements NotUnsettable */ public void setNotUnsettableInt(int newNotUnsettableInt) { - eSet(Model2Package.Literals.NOT_UNSETTABLE__NOT_UNSETTABLE_INT, newNotUnsettableInt); + eSet(Model2Package.eINSTANCE.getNotUnsettable_NotUnsettableInt(), newNotUnsettableInt); } /** @@ -233,7 +233,7 @@ public class NotUnsettableImpl extends CDOObjectImpl implements NotUnsettable */ public long getNotUnsettableLong() { - return (Long)eGet(Model2Package.Literals.NOT_UNSETTABLE__NOT_UNSETTABLE_LONG, true); + return (Long)eGet(Model2Package.eINSTANCE.getNotUnsettable_NotUnsettableLong(), true); } /** @@ -243,7 +243,7 @@ public class NotUnsettableImpl extends CDOObjectImpl implements NotUnsettable */ public void setNotUnsettableLong(long newNotUnsettableLong) { - eSet(Model2Package.Literals.NOT_UNSETTABLE__NOT_UNSETTABLE_LONG, newNotUnsettableLong); + eSet(Model2Package.eINSTANCE.getNotUnsettable_NotUnsettableLong(), newNotUnsettableLong); } /** @@ -253,7 +253,7 @@ public class NotUnsettableImpl extends CDOObjectImpl implements NotUnsettable */ public short getNotUnsettableShort() { - return (Short)eGet(Model2Package.Literals.NOT_UNSETTABLE__NOT_UNSETTABLE_SHORT, true); + return (Short)eGet(Model2Package.eINSTANCE.getNotUnsettable_NotUnsettableShort(), true); } /** @@ -263,7 +263,7 @@ public class NotUnsettableImpl extends CDOObjectImpl implements NotUnsettable */ public void setNotUnsettableShort(short newNotUnsettableShort) { - eSet(Model2Package.Literals.NOT_UNSETTABLE__NOT_UNSETTABLE_SHORT, newNotUnsettableShort); + eSet(Model2Package.eINSTANCE.getNotUnsettable_NotUnsettableShort(), newNotUnsettableShort); } /** @@ -273,7 +273,7 @@ public class NotUnsettableImpl extends CDOObjectImpl implements NotUnsettable */ public String getNotUnsettableString() { - return (String)eGet(Model2Package.Literals.NOT_UNSETTABLE__NOT_UNSETTABLE_STRING, true); + return (String)eGet(Model2Package.eINSTANCE.getNotUnsettable_NotUnsettableString(), true); } /** @@ -283,7 +283,7 @@ public class NotUnsettableImpl extends CDOObjectImpl implements NotUnsettable */ public void setNotUnsettableString(String newNotUnsettableString) { - eSet(Model2Package.Literals.NOT_UNSETTABLE__NOT_UNSETTABLE_STRING, newNotUnsettableString); + eSet(Model2Package.eINSTANCE.getNotUnsettable_NotUnsettableString(), newNotUnsettableString); } /** @@ -293,7 +293,7 @@ public class NotUnsettableImpl extends CDOObjectImpl implements NotUnsettable */ public VAT getNotUnsettableVAT() { - return (VAT)eGet(Model2Package.Literals.NOT_UNSETTABLE__NOT_UNSETTABLE_VAT, true); + return (VAT)eGet(Model2Package.eINSTANCE.getNotUnsettable_NotUnsettableVAT(), true); } /** @@ -303,7 +303,7 @@ public class NotUnsettableImpl extends CDOObjectImpl implements NotUnsettable */ public void setNotUnsettableVAT(VAT newNotUnsettableVAT) { - eSet(Model2Package.Literals.NOT_UNSETTABLE__NOT_UNSETTABLE_VAT, newNotUnsettableVAT); + eSet(Model2Package.eINSTANCE.getNotUnsettable_NotUnsettableVAT(), newNotUnsettableVAT); } } // NotUnsettableImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/NotUnsettableWithDefaultImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/NotUnsettableWithDefaultImpl.java index 7c29fcda28..576a41d4c6 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/NotUnsettableWithDefaultImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/NotUnsettableWithDefaultImpl.java @@ -75,7 +75,7 @@ public class NotUnsettableWithDefaultImpl extends CDOObjectImpl implements NotUn @Override protected EClass eStaticClass() { - return Model2Package.Literals.NOT_UNSETTABLE_WITH_DEFAULT; + return Model2Package.eINSTANCE.getNotUnsettableWithDefault(); } /** @@ -96,7 +96,7 @@ public class NotUnsettableWithDefaultImpl extends CDOObjectImpl implements NotUn */ public boolean isNotUnsettableBoolean() { - return (Boolean)eGet(Model2Package.Literals.NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_BOOLEAN, true); + return (Boolean)eGet(Model2Package.eINSTANCE.getNotUnsettableWithDefault_NotUnsettableBoolean(), true); } /** @@ -106,7 +106,7 @@ public class NotUnsettableWithDefaultImpl extends CDOObjectImpl implements NotUn */ public void setNotUnsettableBoolean(boolean newNotUnsettableBoolean) { - eSet(Model2Package.Literals.NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_BOOLEAN, newNotUnsettableBoolean); + eSet(Model2Package.eINSTANCE.getNotUnsettableWithDefault_NotUnsettableBoolean(), newNotUnsettableBoolean); } /** @@ -116,7 +116,7 @@ public class NotUnsettableWithDefaultImpl extends CDOObjectImpl implements NotUn */ public byte getNotUnsettableByte() { - return (Byte)eGet(Model2Package.Literals.NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_BYTE, true); + return (Byte)eGet(Model2Package.eINSTANCE.getNotUnsettableWithDefault_NotUnsettableByte(), true); } /** @@ -126,7 +126,7 @@ public class NotUnsettableWithDefaultImpl extends CDOObjectImpl implements NotUn */ public void setNotUnsettableByte(byte newNotUnsettableByte) { - eSet(Model2Package.Literals.NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_BYTE, newNotUnsettableByte); + eSet(Model2Package.eINSTANCE.getNotUnsettableWithDefault_NotUnsettableByte(), newNotUnsettableByte); } /** @@ -136,7 +136,7 @@ public class NotUnsettableWithDefaultImpl extends CDOObjectImpl implements NotUn */ public char getNotUnsettableChar() { - return (Character)eGet(Model2Package.Literals.NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_CHAR, true); + return (Character)eGet(Model2Package.eINSTANCE.getNotUnsettableWithDefault_NotUnsettableChar(), true); } /** @@ -146,7 +146,7 @@ public class NotUnsettableWithDefaultImpl extends CDOObjectImpl implements NotUn */ public void setNotUnsettableChar(char newNotUnsettableChar) { - eSet(Model2Package.Literals.NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_CHAR, newNotUnsettableChar); + eSet(Model2Package.eINSTANCE.getNotUnsettableWithDefault_NotUnsettableChar(), newNotUnsettableChar); } /** @@ -156,7 +156,7 @@ public class NotUnsettableWithDefaultImpl extends CDOObjectImpl implements NotUn */ public Date getNotUnsettableDate() { - return (Date)eGet(Model2Package.Literals.NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_DATE, true); + return (Date)eGet(Model2Package.eINSTANCE.getNotUnsettableWithDefault_NotUnsettableDate(), true); } /** @@ -166,7 +166,7 @@ public class NotUnsettableWithDefaultImpl extends CDOObjectImpl implements NotUn */ public void setNotUnsettableDate(Date newNotUnsettableDate) { - eSet(Model2Package.Literals.NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_DATE, newNotUnsettableDate); + eSet(Model2Package.eINSTANCE.getNotUnsettableWithDefault_NotUnsettableDate(), newNotUnsettableDate); } /** @@ -176,7 +176,7 @@ public class NotUnsettableWithDefaultImpl extends CDOObjectImpl implements NotUn */ public double getNotUnsettableDouble() { - return (Double)eGet(Model2Package.Literals.NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_DOUBLE, true); + return (Double)eGet(Model2Package.eINSTANCE.getNotUnsettableWithDefault_NotUnsettableDouble(), true); } /** @@ -186,7 +186,7 @@ public class NotUnsettableWithDefaultImpl extends CDOObjectImpl implements NotUn */ public void setNotUnsettableDouble(double newNotUnsettableDouble) { - eSet(Model2Package.Literals.NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_DOUBLE, newNotUnsettableDouble); + eSet(Model2Package.eINSTANCE.getNotUnsettableWithDefault_NotUnsettableDouble(), newNotUnsettableDouble); } /** @@ -196,7 +196,7 @@ public class NotUnsettableWithDefaultImpl extends CDOObjectImpl implements NotUn */ public float getNotUnsettableFloat() { - return (Float)eGet(Model2Package.Literals.NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_FLOAT, true); + return (Float)eGet(Model2Package.eINSTANCE.getNotUnsettableWithDefault_NotUnsettableFloat(), true); } /** @@ -206,7 +206,7 @@ public class NotUnsettableWithDefaultImpl extends CDOObjectImpl implements NotUn */ public void setNotUnsettableFloat(float newNotUnsettableFloat) { - eSet(Model2Package.Literals.NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_FLOAT, newNotUnsettableFloat); + eSet(Model2Package.eINSTANCE.getNotUnsettableWithDefault_NotUnsettableFloat(), newNotUnsettableFloat); } /** @@ -216,7 +216,7 @@ public class NotUnsettableWithDefaultImpl extends CDOObjectImpl implements NotUn */ public int getNotUnsettableInt() { - return (Integer)eGet(Model2Package.Literals.NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_INT, true); + return (Integer)eGet(Model2Package.eINSTANCE.getNotUnsettableWithDefault_NotUnsettableInt(), true); } /** @@ -226,7 +226,7 @@ public class NotUnsettableWithDefaultImpl extends CDOObjectImpl implements NotUn */ public void setNotUnsettableInt(int newNotUnsettableInt) { - eSet(Model2Package.Literals.NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_INT, newNotUnsettableInt); + eSet(Model2Package.eINSTANCE.getNotUnsettableWithDefault_NotUnsettableInt(), newNotUnsettableInt); } /** @@ -236,7 +236,7 @@ public class NotUnsettableWithDefaultImpl extends CDOObjectImpl implements NotUn */ public long getNotUnsettableLong() { - return (Long)eGet(Model2Package.Literals.NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_LONG, true); + return (Long)eGet(Model2Package.eINSTANCE.getNotUnsettableWithDefault_NotUnsettableLong(), true); } /** @@ -246,7 +246,7 @@ public class NotUnsettableWithDefaultImpl extends CDOObjectImpl implements NotUn */ public void setNotUnsettableLong(long newNotUnsettableLong) { - eSet(Model2Package.Literals.NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_LONG, newNotUnsettableLong); + eSet(Model2Package.eINSTANCE.getNotUnsettableWithDefault_NotUnsettableLong(), newNotUnsettableLong); } /** @@ -256,7 +256,7 @@ public class NotUnsettableWithDefaultImpl extends CDOObjectImpl implements NotUn */ public short getNotUnsettableShort() { - return (Short)eGet(Model2Package.Literals.NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_SHORT, true); + return (Short)eGet(Model2Package.eINSTANCE.getNotUnsettableWithDefault_NotUnsettableShort(), true); } /** @@ -266,7 +266,7 @@ public class NotUnsettableWithDefaultImpl extends CDOObjectImpl implements NotUn */ public void setNotUnsettableShort(short newNotUnsettableShort) { - eSet(Model2Package.Literals.NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_SHORT, newNotUnsettableShort); + eSet(Model2Package.eINSTANCE.getNotUnsettableWithDefault_NotUnsettableShort(), newNotUnsettableShort); } /** @@ -276,7 +276,7 @@ public class NotUnsettableWithDefaultImpl extends CDOObjectImpl implements NotUn */ public String getNotUnsettableString() { - return (String)eGet(Model2Package.Literals.NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_STRING, true); + return (String)eGet(Model2Package.eINSTANCE.getNotUnsettableWithDefault_NotUnsettableString(), true); } /** @@ -286,7 +286,7 @@ public class NotUnsettableWithDefaultImpl extends CDOObjectImpl implements NotUn */ public void setNotUnsettableString(String newNotUnsettableString) { - eSet(Model2Package.Literals.NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_STRING, newNotUnsettableString); + eSet(Model2Package.eINSTANCE.getNotUnsettableWithDefault_NotUnsettableString(), newNotUnsettableString); } /** @@ -296,7 +296,7 @@ public class NotUnsettableWithDefaultImpl extends CDOObjectImpl implements NotUn */ public VAT getNotUnsettableVAT() { - return (VAT)eGet(Model2Package.Literals.NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_VAT, true); + return (VAT)eGet(Model2Package.eINSTANCE.getNotUnsettableWithDefault_NotUnsettableVAT(), true); } /** @@ -306,7 +306,7 @@ public class NotUnsettableWithDefaultImpl extends CDOObjectImpl implements NotUn */ public void setNotUnsettableVAT(VAT newNotUnsettableVAT) { - eSet(Model2Package.Literals.NOT_UNSETTABLE_WITH_DEFAULT__NOT_UNSETTABLE_VAT, newNotUnsettableVAT); + eSet(Model2Package.eINSTANCE.getNotUnsettableWithDefault_NotUnsettableVAT(), newNotUnsettableVAT); } } // NotUnsettableWithDefaultImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/PersistentContainmentImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/PersistentContainmentImpl.java index 8a1d6421c6..3e232a15bb 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/PersistentContainmentImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/PersistentContainmentImpl.java @@ -53,7 +53,7 @@ public class PersistentContainmentImpl extends CDOObjectImpl implements Persiste @Override protected EClass eStaticClass() { - return Model2Package.Literals.PERSISTENT_CONTAINMENT; + return Model2Package.eINSTANCE.getPersistentContainment(); } /** @@ -74,7 +74,7 @@ public class PersistentContainmentImpl extends CDOObjectImpl implements Persiste */ public String getAttrBefore() { - return (String)eGet(Model2Package.Literals.PERSISTENT_CONTAINMENT__ATTR_BEFORE, true); + return (String)eGet(Model2Package.eINSTANCE.getPersistentContainment_AttrBefore(), true); } /** @@ -84,7 +84,7 @@ public class PersistentContainmentImpl extends CDOObjectImpl implements Persiste */ public void setAttrBefore(String newAttrBefore) { - eSet(Model2Package.Literals.PERSISTENT_CONTAINMENT__ATTR_BEFORE, newAttrBefore); + eSet(Model2Package.eINSTANCE.getPersistentContainment_AttrBefore(), newAttrBefore); } /** @@ -95,7 +95,7 @@ public class PersistentContainmentImpl extends CDOObjectImpl implements Persiste @SuppressWarnings("unchecked") public EList getChildren() { - return (EList)eGet(Model2Package.Literals.PERSISTENT_CONTAINMENT__CHILDREN, true); + return (EList)eGet(Model2Package.eINSTANCE.getPersistentContainment_Children(), true); } /** @@ -105,7 +105,7 @@ public class PersistentContainmentImpl extends CDOObjectImpl implements Persiste */ public String getAttrAfter() { - return (String)eGet(Model2Package.Literals.PERSISTENT_CONTAINMENT__ATTR_AFTER, true); + return (String)eGet(Model2Package.eINSTANCE.getPersistentContainment_AttrAfter(), true); } /** @@ -115,7 +115,7 @@ public class PersistentContainmentImpl extends CDOObjectImpl implements Persiste */ public void setAttrAfter(String newAttrAfter) { - eSet(Model2Package.Literals.PERSISTENT_CONTAINMENT__ATTR_AFTER, newAttrAfter); + eSet(Model2Package.eINSTANCE.getPersistentContainment_AttrAfter(), newAttrAfter); } } // PersistentContainmentImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/SpecialPurchaseOrderImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/SpecialPurchaseOrderImpl.java index 47c7cafe00..96cfe4a4fa 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/SpecialPurchaseOrderImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/SpecialPurchaseOrderImpl.java @@ -51,7 +51,7 @@ public class SpecialPurchaseOrderImpl extends PurchaseOrderImpl implements Speci @Override protected EClass eStaticClass() { - return Model2Package.Literals.SPECIAL_PURCHASE_ORDER; + return Model2Package.eINSTANCE.getSpecialPurchaseOrder(); } /** @@ -61,7 +61,7 @@ public class SpecialPurchaseOrderImpl extends PurchaseOrderImpl implements Speci */ public String getDiscountCode() { - return (String)eGet(Model2Package.Literals.SPECIAL_PURCHASE_ORDER__DISCOUNT_CODE, true); + return (String)eGet(Model2Package.eINSTANCE.getSpecialPurchaseOrder_DiscountCode(), true); } /** @@ -71,7 +71,7 @@ public class SpecialPurchaseOrderImpl extends PurchaseOrderImpl implements Speci */ public void setDiscountCode(String newDiscountCode) { - eSet(Model2Package.Literals.SPECIAL_PURCHASE_ORDER__DISCOUNT_CODE, newDiscountCode); + eSet(Model2Package.eINSTANCE.getSpecialPurchaseOrder_DiscountCode(), newDiscountCode); } /** @@ -81,7 +81,7 @@ public class SpecialPurchaseOrderImpl extends PurchaseOrderImpl implements Speci */ public Address getShippingAddress() { - return (Address)eGet(Model2Package.Literals.SPECIAL_PURCHASE_ORDER__SHIPPING_ADDRESS, true); + return (Address)eGet(Model2Package.eINSTANCE.getSpecialPurchaseOrder_ShippingAddress(), true); } /** @@ -91,7 +91,7 @@ public class SpecialPurchaseOrderImpl extends PurchaseOrderImpl implements Speci */ public void setShippingAddress(Address newShippingAddress) { - eSet(Model2Package.Literals.SPECIAL_PURCHASE_ORDER__SHIPPING_ADDRESS, newShippingAddress); + eSet(Model2Package.eINSTANCE.getSpecialPurchaseOrder_ShippingAddress(), newShippingAddress); } } // SpecialPurchaseOrderImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/StringToAddressContainmentMapImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/StringToAddressContainmentMapImpl.java index 3cbdfce53b..65dad60828 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/StringToAddressContainmentMapImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/StringToAddressContainmentMapImpl.java @@ -55,7 +55,7 @@ public class StringToAddressContainmentMapImpl extends CDOObjectImpl implements @Override protected EClass eStaticClass() { - return Model2Package.Literals.STRING_TO_ADDRESS_CONTAINMENT_MAP; + return Model2Package.eINSTANCE.getStringToAddressContainmentMap(); } /** @@ -76,7 +76,7 @@ public class StringToAddressContainmentMapImpl extends CDOObjectImpl implements */ public String getTypedKey() { - return (String)eGet(Model2Package.Literals.STRING_TO_ADDRESS_CONTAINMENT_MAP__KEY, true); + return (String)eGet(Model2Package.eINSTANCE.getStringToAddressContainmentMap_Key(), true); } /** @@ -86,7 +86,7 @@ public class StringToAddressContainmentMapImpl extends CDOObjectImpl implements */ public void setTypedKey(String newKey) { - eSet(Model2Package.Literals.STRING_TO_ADDRESS_CONTAINMENT_MAP__KEY, newKey); + eSet(Model2Package.eINSTANCE.getStringToAddressContainmentMap_Key(), newKey); } /** @@ -96,7 +96,7 @@ public class StringToAddressContainmentMapImpl extends CDOObjectImpl implements */ public Address getTypedValue() { - return (Address)eGet(Model2Package.Literals.STRING_TO_ADDRESS_CONTAINMENT_MAP__VALUE, true); + return (Address)eGet(Model2Package.eINSTANCE.getStringToAddressContainmentMap_Value(), true); } /** @@ -106,7 +106,7 @@ public class StringToAddressContainmentMapImpl extends CDOObjectImpl implements */ public void setTypedValue(Address newValue) { - eSet(Model2Package.Literals.STRING_TO_ADDRESS_CONTAINMENT_MAP__VALUE, newValue); + eSet(Model2Package.eINSTANCE.getStringToAddressContainmentMap_Value(), newValue); } /** diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/StringToAddressReferenceMapImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/StringToAddressReferenceMapImpl.java index 697d685407..b43951aac2 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/StringToAddressReferenceMapImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/StringToAddressReferenceMapImpl.java @@ -55,7 +55,7 @@ public class StringToAddressReferenceMapImpl extends CDOObjectImpl implements Ba @Override protected EClass eStaticClass() { - return Model2Package.Literals.STRING_TO_ADDRESS_REFERENCE_MAP; + return Model2Package.eINSTANCE.getStringToAddressReferenceMap(); } /** @@ -76,7 +76,7 @@ public class StringToAddressReferenceMapImpl extends CDOObjectImpl implements Ba */ public String getTypedKey() { - return (String)eGet(Model2Package.Literals.STRING_TO_ADDRESS_REFERENCE_MAP__KEY, true); + return (String)eGet(Model2Package.eINSTANCE.getStringToAddressReferenceMap_Key(), true); } /** @@ -86,7 +86,7 @@ public class StringToAddressReferenceMapImpl extends CDOObjectImpl implements Ba */ public void setTypedKey(String newKey) { - eSet(Model2Package.Literals.STRING_TO_ADDRESS_REFERENCE_MAP__KEY, newKey); + eSet(Model2Package.eINSTANCE.getStringToAddressReferenceMap_Key(), newKey); } /** @@ -96,7 +96,7 @@ public class StringToAddressReferenceMapImpl extends CDOObjectImpl implements Ba */ public Address getTypedValue() { - return (Address)eGet(Model2Package.Literals.STRING_TO_ADDRESS_REFERENCE_MAP__VALUE, true); + return (Address)eGet(Model2Package.eINSTANCE.getStringToAddressReferenceMap_Value(), true); } /** @@ -106,7 +106,7 @@ public class StringToAddressReferenceMapImpl extends CDOObjectImpl implements Ba */ public void setTypedValue(Address newValue) { - eSet(Model2Package.Literals.STRING_TO_ADDRESS_REFERENCE_MAP__VALUE, newValue); + eSet(Model2Package.eINSTANCE.getStringToAddressReferenceMap_Value(), newValue); } /** diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/StringToStringMapImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/StringToStringMapImpl.java index d0dd20e6ad..0cd3a9743b 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/StringToStringMapImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/StringToStringMapImpl.java @@ -54,7 +54,7 @@ public class StringToStringMapImpl extends CDOObjectImpl implements BasicEMap.En @Override protected EClass eStaticClass() { - return Model2Package.Literals.STRING_TO_STRING_MAP; + return Model2Package.eINSTANCE.getStringToStringMap(); } /** @@ -75,7 +75,7 @@ public class StringToStringMapImpl extends CDOObjectImpl implements BasicEMap.En */ public String getTypedKey() { - return (String)eGet(Model2Package.Literals.STRING_TO_STRING_MAP__KEY, true); + return (String)eGet(Model2Package.eINSTANCE.getStringToStringMap_Key(), true); } /** @@ -85,7 +85,7 @@ public class StringToStringMapImpl extends CDOObjectImpl implements BasicEMap.En */ public void setTypedKey(String newKey) { - eSet(Model2Package.Literals.STRING_TO_STRING_MAP__KEY, newKey); + eSet(Model2Package.eINSTANCE.getStringToStringMap_Key(), newKey); } /** @@ -95,7 +95,7 @@ public class StringToStringMapImpl extends CDOObjectImpl implements BasicEMap.En */ public String getTypedValue() { - return (String)eGet(Model2Package.Literals.STRING_TO_STRING_MAP__VALUE, true); + return (String)eGet(Model2Package.eINSTANCE.getStringToStringMap_Value(), true); } /** @@ -105,7 +105,7 @@ public class StringToStringMapImpl extends CDOObjectImpl implements BasicEMap.En */ public void setTypedValue(String newValue) { - eSet(Model2Package.Literals.STRING_TO_STRING_MAP__VALUE, newValue); + eSet(Model2Package.eINSTANCE.getStringToStringMap_Value(), newValue); } /** diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/StringToVATMapImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/StringToVATMapImpl.java index 98a07353fe..ecf1a0bde1 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/StringToVATMapImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/StringToVATMapImpl.java @@ -55,7 +55,7 @@ public class StringToVATMapImpl extends CDOObjectImpl implements BasicEMap.Entry @Override protected EClass eStaticClass() { - return Model2Package.Literals.STRING_TO_VAT_MAP; + return Model2Package.eINSTANCE.getStringToVATMap(); } /** @@ -76,7 +76,7 @@ public class StringToVATMapImpl extends CDOObjectImpl implements BasicEMap.Entry */ public String getTypedKey() { - return (String)eGet(Model2Package.Literals.STRING_TO_VAT_MAP__KEY, true); + return (String)eGet(Model2Package.eINSTANCE.getStringToVATMap_Key(), true); } /** @@ -86,7 +86,7 @@ public class StringToVATMapImpl extends CDOObjectImpl implements BasicEMap.Entry */ public void setTypedKey(String newKey) { - eSet(Model2Package.Literals.STRING_TO_VAT_MAP__KEY, newKey); + eSet(Model2Package.eINSTANCE.getStringToVATMap_Key(), newKey); } /** @@ -96,7 +96,7 @@ public class StringToVATMapImpl extends CDOObjectImpl implements BasicEMap.Entry */ public VAT getTypedValue() { - return (VAT)eGet(Model2Package.Literals.STRING_TO_VAT_MAP__VALUE, true); + return (VAT)eGet(Model2Package.eINSTANCE.getStringToVATMap_Value(), true); } /** @@ -106,7 +106,7 @@ public class StringToVATMapImpl extends CDOObjectImpl implements BasicEMap.Entry */ public void setTypedValue(VAT newValue) { - eSet(Model2Package.Literals.STRING_TO_VAT_MAP__VALUE, newValue); + eSet(Model2Package.eINSTANCE.getStringToVATMap_Value(), newValue); } /** diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/TaskContainerImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/TaskContainerImpl.java index 1b1f5e3f9d..ec6e20bb01 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/TaskContainerImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/TaskContainerImpl.java @@ -50,7 +50,7 @@ public class TaskContainerImpl extends CDOObjectImpl implements TaskContainer @Override protected EClass eStaticClass() { - return Model2Package.Literals.TASK_CONTAINER; + return Model2Package.eINSTANCE.getTaskContainer(); } /** @@ -72,7 +72,7 @@ public class TaskContainerImpl extends CDOObjectImpl implements TaskContainer @SuppressWarnings("unchecked") public EList getTasks() { - return (EList)eGet(Model2Package.Literals.TASK_CONTAINER__TASKS, true); + return (EList)eGet(Model2Package.eINSTANCE.getTaskContainer_Tasks(), true); } } // TaskContainerImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/TaskImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/TaskImpl.java index 52e7c3332a..ea54dc4c49 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/TaskImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/TaskImpl.java @@ -51,7 +51,7 @@ public class TaskImpl extends CDOObjectImpl implements Task @Override protected EClass eStaticClass() { - return Model2Package.Literals.TASK; + return Model2Package.eINSTANCE.getTask(); } /** @@ -72,7 +72,7 @@ public class TaskImpl extends CDOObjectImpl implements Task */ public TaskContainer getTaskContainer() { - return (TaskContainer)eGet(Model2Package.Literals.TASK__TASK_CONTAINER, true); + return (TaskContainer)eGet(Model2Package.eINSTANCE.getTask_TaskContainer(), true); } /** @@ -82,7 +82,7 @@ public class TaskImpl extends CDOObjectImpl implements Task */ public void setTaskContainer(TaskContainer newTaskContainer) { - eSet(Model2Package.Literals.TASK__TASK_CONTAINER, newTaskContainer); + eSet(Model2Package.eINSTANCE.getTask_TaskContainer(), newTaskContainer); } /** @@ -92,7 +92,7 @@ public class TaskImpl extends CDOObjectImpl implements Task */ public String getDescription() { - return (String)eGet(Model2Package.Literals.TASK__DESCRIPTION, true); + return (String)eGet(Model2Package.eINSTANCE.getTask_Description(), true); } /** @@ -102,7 +102,7 @@ public class TaskImpl extends CDOObjectImpl implements Task */ public void setDescription(String newDescription) { - eSet(Model2Package.Literals.TASK__DESCRIPTION, newDescription); + eSet(Model2Package.eINSTANCE.getTask_Description(), newDescription); } /** @@ -112,7 +112,7 @@ public class TaskImpl extends CDOObjectImpl implements Task */ public boolean isDone() { - return (Boolean)eGet(Model2Package.Literals.TASK__DONE, true); + return (Boolean)eGet(Model2Package.eINSTANCE.getTask_Done(), true); } /** @@ -122,7 +122,7 @@ public class TaskImpl extends CDOObjectImpl implements Task */ public void setDone(boolean newDone) { - eSet(Model2Package.Literals.TASK__DONE, newDone); + eSet(Model2Package.eINSTANCE.getTask_Done(), newDone); } } // TaskImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/TransientContainerImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/TransientContainerImpl.java index f4a4995822..dc2955cc26 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/TransientContainerImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/TransientContainerImpl.java @@ -52,7 +52,7 @@ public class TransientContainerImpl extends CDOObjectImpl implements TransientCo @Override protected EClass eStaticClass() { - return Model2Package.Literals.TRANSIENT_CONTAINER; + return Model2Package.eINSTANCE.getTransientContainer(); } /** @@ -73,7 +73,7 @@ public class TransientContainerImpl extends CDOObjectImpl implements TransientCo */ public String getAttrBefore() { - return (String)eGet(Model2Package.Literals.TRANSIENT_CONTAINER__ATTR_BEFORE, true); + return (String)eGet(Model2Package.eINSTANCE.getTransientContainer_AttrBefore(), true); } /** @@ -83,7 +83,7 @@ public class TransientContainerImpl extends CDOObjectImpl implements TransientCo */ public void setAttrBefore(String newAttrBefore) { - eSet(Model2Package.Literals.TRANSIENT_CONTAINER__ATTR_BEFORE, newAttrBefore); + eSet(Model2Package.eINSTANCE.getTransientContainer_AttrBefore(), newAttrBefore); } /** @@ -93,7 +93,7 @@ public class TransientContainerImpl extends CDOObjectImpl implements TransientCo */ public PersistentContainment getParent() { - return (PersistentContainment)eGet(Model2Package.Literals.TRANSIENT_CONTAINER__PARENT, true); + return (PersistentContainment)eGet(Model2Package.eINSTANCE.getTransientContainer_Parent(), true); } /** @@ -103,7 +103,7 @@ public class TransientContainerImpl extends CDOObjectImpl implements TransientCo */ public void setParent(PersistentContainment newParent) { - eSet(Model2Package.Literals.TRANSIENT_CONTAINER__PARENT, newParent); + eSet(Model2Package.eINSTANCE.getTransientContainer_Parent(), newParent); } /** @@ -113,7 +113,7 @@ public class TransientContainerImpl extends CDOObjectImpl implements TransientCo */ public String getAttrAfter() { - return (String)eGet(Model2Package.Literals.TRANSIENT_CONTAINER__ATTR_AFTER, true); + return (String)eGet(Model2Package.eINSTANCE.getTransientContainer_AttrAfter(), true); } /** @@ -123,7 +123,7 @@ public class TransientContainerImpl extends CDOObjectImpl implements TransientCo */ public void setAttrAfter(String newAttrAfter) { - eSet(Model2Package.Literals.TRANSIENT_CONTAINER__ATTR_AFTER, newAttrAfter); + eSet(Model2Package.eINSTANCE.getTransientContainer_AttrAfter(), newAttrAfter); } } // TransientContainerImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/Unsettable1Impl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/Unsettable1Impl.java index 8d8e63d614..a604fad7bb 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/Unsettable1Impl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/Unsettable1Impl.java @@ -61,7 +61,7 @@ public class Unsettable1Impl extends CDOObjectImpl implements Unsettable1 @Override protected EClass eStaticClass() { - return Model2Package.Literals.UNSETTABLE1; + return Model2Package.eINSTANCE.getUnsettable1(); } /** @@ -82,7 +82,7 @@ public class Unsettable1Impl extends CDOObjectImpl implements Unsettable1 */ public boolean isUnsettableBoolean() { - return (Boolean)eGet(Model2Package.Literals.UNSETTABLE1__UNSETTABLE_BOOLEAN, true); + return (Boolean)eGet(Model2Package.eINSTANCE.getUnsettable1_UnsettableBoolean(), true); } /** @@ -92,7 +92,7 @@ public class Unsettable1Impl extends CDOObjectImpl implements Unsettable1 */ public void setUnsettableBoolean(boolean newUnsettableBoolean) { - eSet(Model2Package.Literals.UNSETTABLE1__UNSETTABLE_BOOLEAN, newUnsettableBoolean); + eSet(Model2Package.eINSTANCE.getUnsettable1_UnsettableBoolean(), newUnsettableBoolean); } /** @@ -102,7 +102,7 @@ public class Unsettable1Impl extends CDOObjectImpl implements Unsettable1 */ public void unsetUnsettableBoolean() { - eUnset(Model2Package.Literals.UNSETTABLE1__UNSETTABLE_BOOLEAN); + eUnset(Model2Package.eINSTANCE.getUnsettable1_UnsettableBoolean()); } /** @@ -112,7 +112,7 @@ public class Unsettable1Impl extends CDOObjectImpl implements Unsettable1 */ public boolean isSetUnsettableBoolean() { - return eIsSet(Model2Package.Literals.UNSETTABLE1__UNSETTABLE_BOOLEAN); + return eIsSet(Model2Package.eINSTANCE.getUnsettable1_UnsettableBoolean()); } /** @@ -122,7 +122,7 @@ public class Unsettable1Impl extends CDOObjectImpl implements Unsettable1 */ public byte getUnsettableByte() { - return (Byte)eGet(Model2Package.Literals.UNSETTABLE1__UNSETTABLE_BYTE, true); + return (Byte)eGet(Model2Package.eINSTANCE.getUnsettable1_UnsettableByte(), true); } /** @@ -132,7 +132,7 @@ public class Unsettable1Impl extends CDOObjectImpl implements Unsettable1 */ public void setUnsettableByte(byte newUnsettableByte) { - eSet(Model2Package.Literals.UNSETTABLE1__UNSETTABLE_BYTE, newUnsettableByte); + eSet(Model2Package.eINSTANCE.getUnsettable1_UnsettableByte(), newUnsettableByte); } /** @@ -142,7 +142,7 @@ public class Unsettable1Impl extends CDOObjectImpl implements Unsettable1 */ public void unsetUnsettableByte() { - eUnset(Model2Package.Literals.UNSETTABLE1__UNSETTABLE_BYTE); + eUnset(Model2Package.eINSTANCE.getUnsettable1_UnsettableByte()); } /** @@ -152,7 +152,7 @@ public class Unsettable1Impl extends CDOObjectImpl implements Unsettable1 */ public boolean isSetUnsettableByte() { - return eIsSet(Model2Package.Literals.UNSETTABLE1__UNSETTABLE_BYTE); + return eIsSet(Model2Package.eINSTANCE.getUnsettable1_UnsettableByte()); } /** @@ -162,7 +162,7 @@ public class Unsettable1Impl extends CDOObjectImpl implements Unsettable1 */ public char getUnsettableChar() { - return (Character)eGet(Model2Package.Literals.UNSETTABLE1__UNSETTABLE_CHAR, true); + return (Character)eGet(Model2Package.eINSTANCE.getUnsettable1_UnsettableChar(), true); } /** @@ -172,7 +172,7 @@ public class Unsettable1Impl extends CDOObjectImpl implements Unsettable1 */ public void setUnsettableChar(char newUnsettableChar) { - eSet(Model2Package.Literals.UNSETTABLE1__UNSETTABLE_CHAR, newUnsettableChar); + eSet(Model2Package.eINSTANCE.getUnsettable1_UnsettableChar(), newUnsettableChar); } /** @@ -182,7 +182,7 @@ public class Unsettable1Impl extends CDOObjectImpl implements Unsettable1 */ public void unsetUnsettableChar() { - eUnset(Model2Package.Literals.UNSETTABLE1__UNSETTABLE_CHAR); + eUnset(Model2Package.eINSTANCE.getUnsettable1_UnsettableChar()); } /** @@ -192,7 +192,7 @@ public class Unsettable1Impl extends CDOObjectImpl implements Unsettable1 */ public boolean isSetUnsettableChar() { - return eIsSet(Model2Package.Literals.UNSETTABLE1__UNSETTABLE_CHAR); + return eIsSet(Model2Package.eINSTANCE.getUnsettable1_UnsettableChar()); } /** @@ -202,7 +202,7 @@ public class Unsettable1Impl extends CDOObjectImpl implements Unsettable1 */ public Date getUnsettableDate() { - return (Date)eGet(Model2Package.Literals.UNSETTABLE1__UNSETTABLE_DATE, true); + return (Date)eGet(Model2Package.eINSTANCE.getUnsettable1_UnsettableDate(), true); } /** @@ -212,7 +212,7 @@ public class Unsettable1Impl extends CDOObjectImpl implements Unsettable1 */ public void setUnsettableDate(Date newUnsettableDate) { - eSet(Model2Package.Literals.UNSETTABLE1__UNSETTABLE_DATE, newUnsettableDate); + eSet(Model2Package.eINSTANCE.getUnsettable1_UnsettableDate(), newUnsettableDate); } /** @@ -222,7 +222,7 @@ public class Unsettable1Impl extends CDOObjectImpl implements Unsettable1 */ public void unsetUnsettableDate() { - eUnset(Model2Package.Literals.UNSETTABLE1__UNSETTABLE_DATE); + eUnset(Model2Package.eINSTANCE.getUnsettable1_UnsettableDate()); } /** @@ -232,7 +232,7 @@ public class Unsettable1Impl extends CDOObjectImpl implements Unsettable1 */ public boolean isSetUnsettableDate() { - return eIsSet(Model2Package.Literals.UNSETTABLE1__UNSETTABLE_DATE); + return eIsSet(Model2Package.eINSTANCE.getUnsettable1_UnsettableDate()); } /** @@ -242,7 +242,7 @@ public class Unsettable1Impl extends CDOObjectImpl implements Unsettable1 */ public double getUnsettableDouble() { - return (Double)eGet(Model2Package.Literals.UNSETTABLE1__UNSETTABLE_DOUBLE, true); + return (Double)eGet(Model2Package.eINSTANCE.getUnsettable1_UnsettableDouble(), true); } /** @@ -252,7 +252,7 @@ public class Unsettable1Impl extends CDOObjectImpl implements Unsettable1 */ public void setUnsettableDouble(double newUnsettableDouble) { - eSet(Model2Package.Literals.UNSETTABLE1__UNSETTABLE_DOUBLE, newUnsettableDouble); + eSet(Model2Package.eINSTANCE.getUnsettable1_UnsettableDouble(), newUnsettableDouble); } /** @@ -262,7 +262,7 @@ public class Unsettable1Impl extends CDOObjectImpl implements Unsettable1 */ public void unsetUnsettableDouble() { - eUnset(Model2Package.Literals.UNSETTABLE1__UNSETTABLE_DOUBLE); + eUnset(Model2Package.eINSTANCE.getUnsettable1_UnsettableDouble()); } /** @@ -272,7 +272,7 @@ public class Unsettable1Impl extends CDOObjectImpl implements Unsettable1 */ public boolean isSetUnsettableDouble() { - return eIsSet(Model2Package.Literals.UNSETTABLE1__UNSETTABLE_DOUBLE); + return eIsSet(Model2Package.eINSTANCE.getUnsettable1_UnsettableDouble()); } /** @@ -282,7 +282,7 @@ public class Unsettable1Impl extends CDOObjectImpl implements Unsettable1 */ public float getUnsettableFloat() { - return (Float)eGet(Model2Package.Literals.UNSETTABLE1__UNSETTABLE_FLOAT, true); + return (Float)eGet(Model2Package.eINSTANCE.getUnsettable1_UnsettableFloat(), true); } /** @@ -292,7 +292,7 @@ public class Unsettable1Impl extends CDOObjectImpl implements Unsettable1 */ public void setUnsettableFloat(float newUnsettableFloat) { - eSet(Model2Package.Literals.UNSETTABLE1__UNSETTABLE_FLOAT, newUnsettableFloat); + eSet(Model2Package.eINSTANCE.getUnsettable1_UnsettableFloat(), newUnsettableFloat); } /** @@ -302,7 +302,7 @@ public class Unsettable1Impl extends CDOObjectImpl implements Unsettable1 */ public void unsetUnsettableFloat() { - eUnset(Model2Package.Literals.UNSETTABLE1__UNSETTABLE_FLOAT); + eUnset(Model2Package.eINSTANCE.getUnsettable1_UnsettableFloat()); } /** @@ -312,7 +312,7 @@ public class Unsettable1Impl extends CDOObjectImpl implements Unsettable1 */ public boolean isSetUnsettableFloat() { - return eIsSet(Model2Package.Literals.UNSETTABLE1__UNSETTABLE_FLOAT); + return eIsSet(Model2Package.eINSTANCE.getUnsettable1_UnsettableFloat()); } /** @@ -322,7 +322,7 @@ public class Unsettable1Impl extends CDOObjectImpl implements Unsettable1 */ public int getUnsettableInt() { - return (Integer)eGet(Model2Package.Literals.UNSETTABLE1__UNSETTABLE_INT, true); + return (Integer)eGet(Model2Package.eINSTANCE.getUnsettable1_UnsettableInt(), true); } /** @@ -332,7 +332,7 @@ public class Unsettable1Impl extends CDOObjectImpl implements Unsettable1 */ public void setUnsettableInt(int newUnsettableInt) { - eSet(Model2Package.Literals.UNSETTABLE1__UNSETTABLE_INT, newUnsettableInt); + eSet(Model2Package.eINSTANCE.getUnsettable1_UnsettableInt(), newUnsettableInt); } /** @@ -342,7 +342,7 @@ public class Unsettable1Impl extends CDOObjectImpl implements Unsettable1 */ public void unsetUnsettableInt() { - eUnset(Model2Package.Literals.UNSETTABLE1__UNSETTABLE_INT); + eUnset(Model2Package.eINSTANCE.getUnsettable1_UnsettableInt()); } /** @@ -352,7 +352,7 @@ public class Unsettable1Impl extends CDOObjectImpl implements Unsettable1 */ public boolean isSetUnsettableInt() { - return eIsSet(Model2Package.Literals.UNSETTABLE1__UNSETTABLE_INT); + return eIsSet(Model2Package.eINSTANCE.getUnsettable1_UnsettableInt()); } /** @@ -362,7 +362,7 @@ public class Unsettable1Impl extends CDOObjectImpl implements Unsettable1 */ public long getUnsettableLong() { - return (Long)eGet(Model2Package.Literals.UNSETTABLE1__UNSETTABLE_LONG, true); + return (Long)eGet(Model2Package.eINSTANCE.getUnsettable1_UnsettableLong(), true); } /** @@ -372,7 +372,7 @@ public class Unsettable1Impl extends CDOObjectImpl implements Unsettable1 */ public void setUnsettableLong(long newUnsettableLong) { - eSet(Model2Package.Literals.UNSETTABLE1__UNSETTABLE_LONG, newUnsettableLong); + eSet(Model2Package.eINSTANCE.getUnsettable1_UnsettableLong(), newUnsettableLong); } /** @@ -382,7 +382,7 @@ public class Unsettable1Impl extends CDOObjectImpl implements Unsettable1 */ public void unsetUnsettableLong() { - eUnset(Model2Package.Literals.UNSETTABLE1__UNSETTABLE_LONG); + eUnset(Model2Package.eINSTANCE.getUnsettable1_UnsettableLong()); } /** @@ -392,7 +392,7 @@ public class Unsettable1Impl extends CDOObjectImpl implements Unsettable1 */ public boolean isSetUnsettableLong() { - return eIsSet(Model2Package.Literals.UNSETTABLE1__UNSETTABLE_LONG); + return eIsSet(Model2Package.eINSTANCE.getUnsettable1_UnsettableLong()); } /** @@ -402,7 +402,7 @@ public class Unsettable1Impl extends CDOObjectImpl implements Unsettable1 */ public short getUnsettableShort() { - return (Short)eGet(Model2Package.Literals.UNSETTABLE1__UNSETTABLE_SHORT, true); + return (Short)eGet(Model2Package.eINSTANCE.getUnsettable1_UnsettableShort(), true); } /** @@ -412,7 +412,7 @@ public class Unsettable1Impl extends CDOObjectImpl implements Unsettable1 */ public void setUnsettableShort(short newUnsettableShort) { - eSet(Model2Package.Literals.UNSETTABLE1__UNSETTABLE_SHORT, newUnsettableShort); + eSet(Model2Package.eINSTANCE.getUnsettable1_UnsettableShort(), newUnsettableShort); } /** @@ -422,7 +422,7 @@ public class Unsettable1Impl extends CDOObjectImpl implements Unsettable1 */ public void unsetUnsettableShort() { - eUnset(Model2Package.Literals.UNSETTABLE1__UNSETTABLE_SHORT); + eUnset(Model2Package.eINSTANCE.getUnsettable1_UnsettableShort()); } /** @@ -432,7 +432,7 @@ public class Unsettable1Impl extends CDOObjectImpl implements Unsettable1 */ public boolean isSetUnsettableShort() { - return eIsSet(Model2Package.Literals.UNSETTABLE1__UNSETTABLE_SHORT); + return eIsSet(Model2Package.eINSTANCE.getUnsettable1_UnsettableShort()); } /** @@ -442,7 +442,7 @@ public class Unsettable1Impl extends CDOObjectImpl implements Unsettable1 */ public String getUnsettableString() { - return (String)eGet(Model2Package.Literals.UNSETTABLE1__UNSETTABLE_STRING, true); + return (String)eGet(Model2Package.eINSTANCE.getUnsettable1_UnsettableString(), true); } /** @@ -452,7 +452,7 @@ public class Unsettable1Impl extends CDOObjectImpl implements Unsettable1 */ public void setUnsettableString(String newUnsettableString) { - eSet(Model2Package.Literals.UNSETTABLE1__UNSETTABLE_STRING, newUnsettableString); + eSet(Model2Package.eINSTANCE.getUnsettable1_UnsettableString(), newUnsettableString); } /** @@ -462,7 +462,7 @@ public class Unsettable1Impl extends CDOObjectImpl implements Unsettable1 */ public void unsetUnsettableString() { - eUnset(Model2Package.Literals.UNSETTABLE1__UNSETTABLE_STRING); + eUnset(Model2Package.eINSTANCE.getUnsettable1_UnsettableString()); } /** @@ -472,7 +472,7 @@ public class Unsettable1Impl extends CDOObjectImpl implements Unsettable1 */ public boolean isSetUnsettableString() { - return eIsSet(Model2Package.Literals.UNSETTABLE1__UNSETTABLE_STRING); + return eIsSet(Model2Package.eINSTANCE.getUnsettable1_UnsettableString()); } /** @@ -482,7 +482,7 @@ public class Unsettable1Impl extends CDOObjectImpl implements Unsettable1 */ public VAT getUnsettableVAT() { - return (VAT)eGet(Model2Package.Literals.UNSETTABLE1__UNSETTABLE_VAT, true); + return (VAT)eGet(Model2Package.eINSTANCE.getUnsettable1_UnsettableVAT(), true); } /** @@ -492,7 +492,7 @@ public class Unsettable1Impl extends CDOObjectImpl implements Unsettable1 */ public void setUnsettableVAT(VAT newUnsettableVAT) { - eSet(Model2Package.Literals.UNSETTABLE1__UNSETTABLE_VAT, newUnsettableVAT); + eSet(Model2Package.eINSTANCE.getUnsettable1_UnsettableVAT(), newUnsettableVAT); } /** @@ -502,7 +502,7 @@ public class Unsettable1Impl extends CDOObjectImpl implements Unsettable1 */ public void unsetUnsettableVAT() { - eUnset(Model2Package.Literals.UNSETTABLE1__UNSETTABLE_VAT); + eUnset(Model2Package.eINSTANCE.getUnsettable1_UnsettableVAT()); } /** @@ -512,7 +512,7 @@ public class Unsettable1Impl extends CDOObjectImpl implements Unsettable1 */ public boolean isSetUnsettableVAT() { - return eIsSet(Model2Package.Literals.UNSETTABLE1__UNSETTABLE_VAT); + return eIsSet(Model2Package.eINSTANCE.getUnsettable1_UnsettableVAT()); } } // Unsettable1Impl diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/Unsettable2WithDefaultImpl.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/Unsettable2WithDefaultImpl.java index 08a0396008..33e1fb15de 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/Unsettable2WithDefaultImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/model2/impl/Unsettable2WithDefaultImpl.java @@ -73,7 +73,7 @@ public class Unsettable2WithDefaultImpl extends CDOObjectImpl implements Unsetta @Override protected EClass eStaticClass() { - return Model2Package.Literals.UNSETTABLE2_WITH_DEFAULT; + return Model2Package.eINSTANCE.getUnsettable2WithDefault(); } /** @@ -94,7 +94,7 @@ public class Unsettable2WithDefaultImpl extends CDOObjectImpl implements Unsetta */ public boolean isUnsettableBoolean() { - return (Boolean)eGet(Model2Package.Literals.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_BOOLEAN, true); + return (Boolean)eGet(Model2Package.eINSTANCE.getUnsettable2WithDefault_UnsettableBoolean(), true); } /** @@ -104,7 +104,7 @@ public class Unsettable2WithDefaultImpl extends CDOObjectImpl implements Unsetta */ public void setUnsettableBoolean(boolean newUnsettableBoolean) { - eSet(Model2Package.Literals.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_BOOLEAN, newUnsettableBoolean); + eSet(Model2Package.eINSTANCE.getUnsettable2WithDefault_UnsettableBoolean(), newUnsettableBoolean); } /** @@ -114,7 +114,7 @@ public class Unsettable2WithDefaultImpl extends CDOObjectImpl implements Unsetta */ public void unsetUnsettableBoolean() { - eUnset(Model2Package.Literals.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_BOOLEAN); + eUnset(Model2Package.eINSTANCE.getUnsettable2WithDefault_UnsettableBoolean()); } /** @@ -124,7 +124,7 @@ public class Unsettable2WithDefaultImpl extends CDOObjectImpl implements Unsetta */ public boolean isSetUnsettableBoolean() { - return eIsSet(Model2Package.Literals.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_BOOLEAN); + return eIsSet(Model2Package.eINSTANCE.getUnsettable2WithDefault_UnsettableBoolean()); } /** @@ -134,7 +134,7 @@ public class Unsettable2WithDefaultImpl extends CDOObjectImpl implements Unsetta */ public byte getUnsettableByte() { - return (Byte)eGet(Model2Package.Literals.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_BYTE, true); + return (Byte)eGet(Model2Package.eINSTANCE.getUnsettable2WithDefault_UnsettableByte(), true); } /** @@ -144,7 +144,7 @@ public class Unsettable2WithDefaultImpl extends CDOObjectImpl implements Unsetta */ public void setUnsettableByte(byte newUnsettableByte) { - eSet(Model2Package.Literals.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_BYTE, newUnsettableByte); + eSet(Model2Package.eINSTANCE.getUnsettable2WithDefault_UnsettableByte(), newUnsettableByte); } /** @@ -154,7 +154,7 @@ public class Unsettable2WithDefaultImpl extends CDOObjectImpl implements Unsetta */ public void unsetUnsettableByte() { - eUnset(Model2Package.Literals.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_BYTE); + eUnset(Model2Package.eINSTANCE.getUnsettable2WithDefault_UnsettableByte()); } /** @@ -164,7 +164,7 @@ public class Unsettable2WithDefaultImpl extends CDOObjectImpl implements Unsetta */ public boolean isSetUnsettableByte() { - return eIsSet(Model2Package.Literals.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_BYTE); + return eIsSet(Model2Package.eINSTANCE.getUnsettable2WithDefault_UnsettableByte()); } /** @@ -174,7 +174,7 @@ public class Unsettable2WithDefaultImpl extends CDOObjectImpl implements Unsetta */ public char getUnsettableChar() { - return (Character)eGet(Model2Package.Literals.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_CHAR, true); + return (Character)eGet(Model2Package.eINSTANCE.getUnsettable2WithDefault_UnsettableChar(), true); } /** @@ -184,7 +184,7 @@ public class Unsettable2WithDefaultImpl extends CDOObjectImpl implements Unsetta */ public void setUnsettableChar(char newUnsettableChar) { - eSet(Model2Package.Literals.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_CHAR, newUnsettableChar); + eSet(Model2Package.eINSTANCE.getUnsettable2WithDefault_UnsettableChar(), newUnsettableChar); } /** @@ -194,7 +194,7 @@ public class Unsettable2WithDefaultImpl extends CDOObjectImpl implements Unsetta */ public void unsetUnsettableChar() { - eUnset(Model2Package.Literals.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_CHAR); + eUnset(Model2Package.eINSTANCE.getUnsettable2WithDefault_UnsettableChar()); } /** @@ -204,7 +204,7 @@ public class Unsettable2WithDefaultImpl extends CDOObjectImpl implements Unsetta */ public boolean isSetUnsettableChar() { - return eIsSet(Model2Package.Literals.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_CHAR); + return eIsSet(Model2Package.eINSTANCE.getUnsettable2WithDefault_UnsettableChar()); } /** @@ -214,7 +214,7 @@ public class Unsettable2WithDefaultImpl extends CDOObjectImpl implements Unsetta */ public Date getUnsettableDate() { - return (Date)eGet(Model2Package.Literals.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_DATE, true); + return (Date)eGet(Model2Package.eINSTANCE.getUnsettable2WithDefault_UnsettableDate(), true); } /** @@ -224,7 +224,7 @@ public class Unsettable2WithDefaultImpl extends CDOObjectImpl implements Unsetta */ public void setUnsettableDate(Date newUnsettableDate) { - eSet(Model2Package.Literals.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_DATE, newUnsettableDate); + eSet(Model2Package.eINSTANCE.getUnsettable2WithDefault_UnsettableDate(), newUnsettableDate); } /** @@ -234,7 +234,7 @@ public class Unsettable2WithDefaultImpl extends CDOObjectImpl implements Unsetta */ public void unsetUnsettableDate() { - eUnset(Model2Package.Literals.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_DATE); + eUnset(Model2Package.eINSTANCE.getUnsettable2WithDefault_UnsettableDate()); } /** @@ -244,7 +244,7 @@ public class Unsettable2WithDefaultImpl extends CDOObjectImpl implements Unsetta */ public boolean isSetUnsettableDate() { - return eIsSet(Model2Package.Literals.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_DATE); + return eIsSet(Model2Package.eINSTANCE.getUnsettable2WithDefault_UnsettableDate()); } /** @@ -254,7 +254,7 @@ public class Unsettable2WithDefaultImpl extends CDOObjectImpl implements Unsetta */ public double getUnsettableDouble() { - return (Double)eGet(Model2Package.Literals.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_DOUBLE, true); + return (Double)eGet(Model2Package.eINSTANCE.getUnsettable2WithDefault_UnsettableDouble(), true); } /** @@ -264,7 +264,7 @@ public class Unsettable2WithDefaultImpl extends CDOObjectImpl implements Unsetta */ public void setUnsettableDouble(double newUnsettableDouble) { - eSet(Model2Package.Literals.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_DOUBLE, newUnsettableDouble); + eSet(Model2Package.eINSTANCE.getUnsettable2WithDefault_UnsettableDouble(), newUnsettableDouble); } /** @@ -274,7 +274,7 @@ public class Unsettable2WithDefaultImpl extends CDOObjectImpl implements Unsetta */ public void unsetUnsettableDouble() { - eUnset(Model2Package.Literals.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_DOUBLE); + eUnset(Model2Package.eINSTANCE.getUnsettable2WithDefault_UnsettableDouble()); } /** @@ -284,7 +284,7 @@ public class Unsettable2WithDefaultImpl extends CDOObjectImpl implements Unsetta */ public boolean isSetUnsettableDouble() { - return eIsSet(Model2Package.Literals.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_DOUBLE); + return eIsSet(Model2Package.eINSTANCE.getUnsettable2WithDefault_UnsettableDouble()); } /** @@ -294,7 +294,7 @@ public class Unsettable2WithDefaultImpl extends CDOObjectImpl implements Unsetta */ public float getUnsettableFloat() { - return (Float)eGet(Model2Package.Literals.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_FLOAT, true); + return (Float)eGet(Model2Package.eINSTANCE.getUnsettable2WithDefault_UnsettableFloat(), true); } /** @@ -304,7 +304,7 @@ public class Unsettable2WithDefaultImpl extends CDOObjectImpl implements Unsetta */ public void setUnsettableFloat(float newUnsettableFloat) { - eSet(Model2Package.Literals.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_FLOAT, newUnsettableFloat); + eSet(Model2Package.eINSTANCE.getUnsettable2WithDefault_UnsettableFloat(), newUnsettableFloat); } /** @@ -314,7 +314,7 @@ public class Unsettable2WithDefaultImpl extends CDOObjectImpl implements Unsetta */ public void unsetUnsettableFloat() { - eUnset(Model2Package.Literals.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_FLOAT); + eUnset(Model2Package.eINSTANCE.getUnsettable2WithDefault_UnsettableFloat()); } /** @@ -324,7 +324,7 @@ public class Unsettable2WithDefaultImpl extends CDOObjectImpl implements Unsetta */ public boolean isSetUnsettableFloat() { - return eIsSet(Model2Package.Literals.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_FLOAT); + return eIsSet(Model2Package.eINSTANCE.getUnsettable2WithDefault_UnsettableFloat()); } /** @@ -334,7 +334,7 @@ public class Unsettable2WithDefaultImpl extends CDOObjectImpl implements Unsetta */ public int getUnsettableInt() { - return (Integer)eGet(Model2Package.Literals.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_INT, true); + return (Integer)eGet(Model2Package.eINSTANCE.getUnsettable2WithDefault_UnsettableInt(), true); } /** @@ -344,7 +344,7 @@ public class Unsettable2WithDefaultImpl extends CDOObjectImpl implements Unsetta */ public void setUnsettableInt(int newUnsettableInt) { - eSet(Model2Package.Literals.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_INT, newUnsettableInt); + eSet(Model2Package.eINSTANCE.getUnsettable2WithDefault_UnsettableInt(), newUnsettableInt); } /** @@ -354,7 +354,7 @@ public class Unsettable2WithDefaultImpl extends CDOObjectImpl implements Unsetta */ public void unsetUnsettableInt() { - eUnset(Model2Package.Literals.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_INT); + eUnset(Model2Package.eINSTANCE.getUnsettable2WithDefault_UnsettableInt()); } /** @@ -364,7 +364,7 @@ public class Unsettable2WithDefaultImpl extends CDOObjectImpl implements Unsetta */ public boolean isSetUnsettableInt() { - return eIsSet(Model2Package.Literals.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_INT); + return eIsSet(Model2Package.eINSTANCE.getUnsettable2WithDefault_UnsettableInt()); } /** @@ -374,7 +374,7 @@ public class Unsettable2WithDefaultImpl extends CDOObjectImpl implements Unsetta */ public long getUnsettableLong() { - return (Long)eGet(Model2Package.Literals.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_LONG, true); + return (Long)eGet(Model2Package.eINSTANCE.getUnsettable2WithDefault_UnsettableLong(), true); } /** @@ -384,7 +384,7 @@ public class Unsettable2WithDefaultImpl extends CDOObjectImpl implements Unsetta */ public void setUnsettableLong(long newUnsettableLong) { - eSet(Model2Package.Literals.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_LONG, newUnsettableLong); + eSet(Model2Package.eINSTANCE.getUnsettable2WithDefault_UnsettableLong(), newUnsettableLong); } /** @@ -394,7 +394,7 @@ public class Unsettable2WithDefaultImpl extends CDOObjectImpl implements Unsetta */ public void unsetUnsettableLong() { - eUnset(Model2Package.Literals.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_LONG); + eUnset(Model2Package.eINSTANCE.getUnsettable2WithDefault_UnsettableLong()); } /** @@ -404,7 +404,7 @@ public class Unsettable2WithDefaultImpl extends CDOObjectImpl implements Unsetta */ public boolean isSetUnsettableLong() { - return eIsSet(Model2Package.Literals.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_LONG); + return eIsSet(Model2Package.eINSTANCE.getUnsettable2WithDefault_UnsettableLong()); } /** @@ -414,7 +414,7 @@ public class Unsettable2WithDefaultImpl extends CDOObjectImpl implements Unsetta */ public short getUnsettableShort() { - return (Short)eGet(Model2Package.Literals.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_SHORT, true); + return (Short)eGet(Model2Package.eINSTANCE.getUnsettable2WithDefault_UnsettableShort(), true); } /** @@ -424,7 +424,7 @@ public class Unsettable2WithDefaultImpl extends CDOObjectImpl implements Unsetta */ public void setUnsettableShort(short newUnsettableShort) { - eSet(Model2Package.Literals.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_SHORT, newUnsettableShort); + eSet(Model2Package.eINSTANCE.getUnsettable2WithDefault_UnsettableShort(), newUnsettableShort); } /** @@ -434,7 +434,7 @@ public class Unsettable2WithDefaultImpl extends CDOObjectImpl implements Unsetta */ public void unsetUnsettableShort() { - eUnset(Model2Package.Literals.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_SHORT); + eUnset(Model2Package.eINSTANCE.getUnsettable2WithDefault_UnsettableShort()); } /** @@ -444,7 +444,7 @@ public class Unsettable2WithDefaultImpl extends CDOObjectImpl implements Unsetta */ public boolean isSetUnsettableShort() { - return eIsSet(Model2Package.Literals.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_SHORT); + return eIsSet(Model2Package.eINSTANCE.getUnsettable2WithDefault_UnsettableShort()); } /** @@ -454,7 +454,7 @@ public class Unsettable2WithDefaultImpl extends CDOObjectImpl implements Unsetta */ public String getUnsettableString() { - return (String)eGet(Model2Package.Literals.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_STRING, true); + return (String)eGet(Model2Package.eINSTANCE.getUnsettable2WithDefault_UnsettableString(), true); } /** @@ -464,7 +464,7 @@ public class Unsettable2WithDefaultImpl extends CDOObjectImpl implements Unsetta */ public void setUnsettableString(String newUnsettableString) { - eSet(Model2Package.Literals.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_STRING, newUnsettableString); + eSet(Model2Package.eINSTANCE.getUnsettable2WithDefault_UnsettableString(), newUnsettableString); } /** @@ -474,7 +474,7 @@ public class Unsettable2WithDefaultImpl extends CDOObjectImpl implements Unsetta */ public void unsetUnsettableString() { - eUnset(Model2Package.Literals.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_STRING); + eUnset(Model2Package.eINSTANCE.getUnsettable2WithDefault_UnsettableString()); } /** @@ -484,7 +484,7 @@ public class Unsettable2WithDefaultImpl extends CDOObjectImpl implements Unsetta */ public boolean isSetUnsettableString() { - return eIsSet(Model2Package.Literals.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_STRING); + return eIsSet(Model2Package.eINSTANCE.getUnsettable2WithDefault_UnsettableString()); } /** @@ -494,7 +494,7 @@ public class Unsettable2WithDefaultImpl extends CDOObjectImpl implements Unsetta */ public VAT getUnsettableVAT() { - return (VAT)eGet(Model2Package.Literals.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_VAT, true); + return (VAT)eGet(Model2Package.eINSTANCE.getUnsettable2WithDefault_UnsettableVAT(), true); } /** @@ -504,7 +504,7 @@ public class Unsettable2WithDefaultImpl extends CDOObjectImpl implements Unsetta */ public void setUnsettableVAT(VAT newUnsettableVAT) { - eSet(Model2Package.Literals.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_VAT, newUnsettableVAT); + eSet(Model2Package.eINSTANCE.getUnsettable2WithDefault_UnsettableVAT(), newUnsettableVAT); } /** @@ -514,7 +514,7 @@ public class Unsettable2WithDefaultImpl extends CDOObjectImpl implements Unsetta */ public void unsetUnsettableVAT() { - eUnset(Model2Package.Literals.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_VAT); + eUnset(Model2Package.eINSTANCE.getUnsettable2WithDefault_UnsettableVAT()); } /** @@ -524,7 +524,7 @@ public class Unsettable2WithDefaultImpl extends CDOObjectImpl implements Unsetta */ public boolean isSetUnsettableVAT() { - return eIsSet(Model2Package.Literals.UNSETTABLE2_WITH_DEFAULT__UNSETTABLE_VAT); + return eIsSet(Model2Package.eINSTANCE.getUnsettable2WithDefault_UnsettableVAT()); } } // Unsettable2WithDefaultImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/model/model3-legacy.genmodel b/plugins/org.eclipse.emf.cdo.tests.model3/model/model3-legacy.genmodel index b5257de6e3..b829d2af7b 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/model/model3-legacy.genmodel +++ b/plugins/org.eclipse.emf.cdo.tests.model3/model/model3-legacy.genmodel @@ -9,13 +9,15 @@ model3.ecore CDO=org.eclipse.emf.cdo + literalsInterface="false" ecorePackage="model3.ecore#/"> + + diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/model/model3.genmodel b/plugins/org.eclipse.emf.cdo.tests.model3/model/model3.genmodel index afc506870b..2e539ba97c 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/model/model3.genmodel +++ b/plugins/org.eclipse.emf.cdo.tests.model3/model/model3.genmodel @@ -10,13 +10,15 @@ model3.ecore CDO=org.eclipse.emf.cdo + literalsInterface="false" ecorePackage="model3.ecore#/"> + + @@ -49,8 +51,14 @@ + + + + + + diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/Model3Package.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/Model3Package.java index 6a6df3d9d0..73b8525399 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/Model3Package.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/Model3Package.java @@ -895,345 +895,4 @@ public interface Model3Package extends org.eclipse.emf.cdo.tests.model3.Model3Pa */ Model3Factory getModel3Factory(); - /** - * 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.emf.cdo.tests.legacy.model3.impl.Class1Impl Class1}' - * class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model3.impl.Class1Impl - * @see org.eclipse.emf.cdo.tests.legacy.model3.impl.Model3PackageImpl#getClass1() - * @generated - */ - EClass CLASS1 = eINSTANCE.getClass1(); - - /** - * The meta object literal for the 'Class2' reference list feature. - * - * @generated - */ - EReference CLASS1__CLASS2 = eINSTANCE.getClass1_Class2(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.MetaRefImpl - * Meta Ref}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model3.impl.MetaRefImpl - * @see org.eclipse.emf.cdo.tests.legacy.model3.impl.Model3PackageImpl#getMetaRef() - * @generated - */ - EClass META_REF = eINSTANCE.getMetaRef(); - - /** - * The meta object literal for the 'EPackage Ref' reference feature. - * - * @generated - */ - EReference META_REF__EPACKAGE_REF = eINSTANCE.getMetaRef_EPackageRef(); - - /** - * The meta object literal for the 'EClass Ref' reference feature. - * - * @generated - */ - EReference META_REF__ECLASS_REF = eINSTANCE.getMetaRef_EClassRef(); - - /** - * The meta object literal for the 'EReference Ref' reference feature. - * - * @generated - */ - EReference META_REF__EREFERENCE_REF = eINSTANCE.getMetaRef_EReferenceRef(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.PolygonImpl - * Polygon}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model3.impl.PolygonImpl - * @see org.eclipse.emf.cdo.tests.legacy.model3.impl.Model3PackageImpl#getPolygon() - * @generated - */ - EClass POLYGON = eINSTANCE.getPolygon(); - - /** - * The meta object literal for the 'Points' attribute list feature. - * - * @generated - */ - EAttribute POLYGON__POINTS = eINSTANCE.getPolygon_Points(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.PolygonWithDuplicatesImpl - * Polygon With Duplicates}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model3.impl.PolygonWithDuplicatesImpl - * @see org.eclipse.emf.cdo.tests.legacy.model3.impl.Model3PackageImpl#getPolygonWithDuplicates() - * @generated - */ - EClass POLYGON_WITH_DUPLICATES = eINSTANCE.getPolygonWithDuplicates(); - - /** - * The meta object literal for the 'Points' attribute list feature. - * - * @generated - */ - EAttribute POLYGON_WITH_DUPLICATES__POINTS = eINSTANCE.getPolygonWithDuplicates_Points(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.NodeAImpl Node A}' - * class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model3.impl.NodeAImpl - * @see org.eclipse.emf.cdo.tests.legacy.model3.impl.Model3PackageImpl#getNodeA() - * @generated - */ - EClass NODE_A = eINSTANCE.getNodeA(); - - /** - * The meta object literal for the 'Children' containment reference list feature. - * - * @generated - */ - EReference NODE_A__CHILDREN = eINSTANCE.getNodeA_Children(); - - /** - * The meta object literal for the 'Name' attribute feature. - * - * @generated - */ - EAttribute NODE_A__NAME = eINSTANCE.getNodeA_Name(); - - /** - * The meta object literal for the 'Other Nodes' reference list feature. - * - * - * @generated - */ - EReference NODE_A__OTHER_NODES = eINSTANCE.getNodeA_OtherNodes(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.NodeBImpl Node B}' - * class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model3.impl.NodeBImpl - * @see org.eclipse.emf.cdo.tests.legacy.model3.impl.Model3PackageImpl#getNodeB() - * @generated - */ - EClass NODE_B = eINSTANCE.getNodeB(); - - /** - * The meta object literal for the 'Children' containment reference list feature. - * - * @generated - */ - EReference NODE_B__CHILDREN = eINSTANCE.getNodeB_Children(); - - /** - * The meta object literal for the 'Parent' container reference feature. - * - * - * @generated - */ - EReference NODE_B__PARENT = eINSTANCE.getNodeB_Parent(); - - /** - * The meta object literal for the 'Name' attribute feature. - * - * @generated - */ - EAttribute NODE_B__NAME = eINSTANCE.getNodeB_Name(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.NodeCImpl Node C}' - * class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model3.impl.NodeCImpl - * @see org.eclipse.emf.cdo.tests.legacy.model3.impl.Model3PackageImpl#getNodeC() - * @generated - */ - EClass NODE_C = eINSTANCE.getNodeC(); - - /** - * The meta object literal for the 'Children' containment reference list feature. - * - * @generated - */ - EReference NODE_C__CHILDREN = eINSTANCE.getNodeC_Children(); - - /** - * The meta object literal for the 'Parent' container reference feature. - * - * - * @generated - */ - EReference NODE_C__PARENT = eINSTANCE.getNodeC_Parent(); - - /** - * The meta object literal for the 'Name' attribute feature. - * - * @generated - */ - EAttribute NODE_C__NAME = eINSTANCE.getNodeC_Name(); - - /** - * The meta object literal for the 'Other Nodes' reference list feature. - * - * - * @generated - */ - EReference NODE_C__OTHER_NODES = eINSTANCE.getNodeC_OtherNodes(); - - /** - * The meta object literal for the 'Opposite Nodes' reference list feature. - * - * - * @generated - */ - EReference NODE_C__OPPOSITE_NODES = eINSTANCE.getNodeC_OppositeNodes(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.NodeDImpl Node D}' - * class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model3.impl.NodeDImpl - * @see org.eclipse.emf.cdo.tests.legacy.model3.impl.Model3PackageImpl#getNodeD() - * @generated - */ - EClass NODE_D = eINSTANCE.getNodeD(); - - /** - * The meta object literal for the 'Children' containment reference list feature. - * - * @generated - */ - EReference NODE_D__CHILDREN = eINSTANCE.getNodeD_Children(); - - /** - * The meta object literal for the 'Parent' container reference feature. - * - * - * @generated - */ - EReference NODE_D__PARENT = eINSTANCE.getNodeD_Parent(); - - /** - * The meta object literal for the 'Name' attribute feature. - * - * @generated - */ - EAttribute NODE_D__NAME = eINSTANCE.getNodeD_Name(); - - /** - * The meta object literal for the 'Other Nodes' reference list feature. - * - * - * @generated - */ - EReference NODE_D__OTHER_NODES = eINSTANCE.getNodeD_OtherNodes(); - - /** - * The meta object literal for the 'Opposite Node' reference feature. - * - * @generated - */ - EReference NODE_D__OPPOSITE_NODE = eINSTANCE.getNodeD_OppositeNode(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.ImageImpl Image}' - * class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model3.impl.ImageImpl - * @see org.eclipse.emf.cdo.tests.legacy.model3.impl.Model3PackageImpl#getImage() - * @generated - */ - EClass IMAGE = eINSTANCE.getImage(); - - /** - * The meta object literal for the 'Width' attribute feature. - * - * @generated - */ - EAttribute IMAGE__WIDTH = eINSTANCE.getImage_Width(); - - /** - * The meta object literal for the 'Height' attribute feature. - * - * @generated - */ - EAttribute IMAGE__HEIGHT = eINSTANCE.getImage_Height(); - - /** - * The meta object literal for the 'Data' attribute feature. - * - * @generated - */ - EAttribute IMAGE__DATA = eINSTANCE.getImage_Data(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model3.impl.FileImpl File}' - * class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model3.impl.FileImpl - * @see org.eclipse.emf.cdo.tests.legacy.model3.impl.Model3PackageImpl#getFile() - * @generated - */ - EClass FILE = eINSTANCE.getFile(); - - /** - * The meta object literal for the 'Name' attribute feature. - * - * @generated - */ - EAttribute FILE__NAME = eINSTANCE.getFile_Name(); - - /** - * The meta object literal for the 'Data' attribute feature. - * - * @generated - */ - EAttribute FILE__DATA = eINSTANCE.getFile_Data(); - - /** - * The meta object literal for the 'Point' data type. - * - * @see org.eclipse.emf.cdo.tests.model3.Point - * @see org.eclipse.emf.cdo.tests.legacy.model3.impl.Model3PackageImpl#getPoint() - * @generated - */ - EDataType POINT = eINSTANCE.getPoint(); - - } - } // Model3Package diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/Class1Impl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/Class1Impl.java index 065c2bc633..1e19d305c6 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/Class1Impl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/Class1Impl.java @@ -66,7 +66,7 @@ public class Class1Impl extends EObjectImpl implements Class1 @Override protected EClass eStaticClass() { - return Model3Package.Literals.CLASS1; + return Model3Package.eINSTANCE.getClass1(); } /** diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/FileImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/FileImpl.java index dab1fb3d3f..fc27140cdc 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/FileImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/FileImpl.java @@ -89,7 +89,7 @@ public class FileImpl extends EObjectImpl implements File @Override protected EClass eStaticClass() { - return Model3Package.Literals.FILE; + return Model3Package.eINSTANCE.getFile(); } /** diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/ImageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/ImageImpl.java index 6446ee9768..12bc8daede 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/ImageImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/ImageImpl.java @@ -111,7 +111,7 @@ public class ImageImpl extends EObjectImpl implements Image @Override protected EClass eStaticClass() { - return Model3Package.Literals.IMAGE; + return Model3Package.eINSTANCE.getImage(); } /** diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/MetaRefImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/MetaRefImpl.java index ee25463ac6..e4b1d1c6c0 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/MetaRefImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/MetaRefImpl.java @@ -84,7 +84,7 @@ public class MetaRefImpl extends EObjectImpl implements MetaRef @Override protected EClass eStaticClass() { - return Model3Package.Literals.META_REF; + return Model3Package.eINSTANCE.getMetaRef(); } /** diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/NodeAImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/NodeAImpl.java index 4eef65f772..0eb55c73ac 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/NodeAImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/NodeAImpl.java @@ -98,7 +98,7 @@ public class NodeAImpl extends EObjectImpl implements NodeA @Override protected EClass eStaticClass() { - return Model3Package.Literals.NODE_A; + return Model3Package.eINSTANCE.getNodeA(); } /** diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/NodeBImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/NodeBImpl.java index fc8c2e2773..5df1347e7b 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/NodeBImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/NodeBImpl.java @@ -88,7 +88,7 @@ public class NodeBImpl extends EObjectImpl implements NodeB @Override protected EClass eStaticClass() { - return Model3Package.Literals.NODE_B; + return Model3Package.eINSTANCE.getNodeB(); } /** diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/NodeCImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/NodeCImpl.java index 797b0a3fac..37265d7bea 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/NodeCImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/NodeCImpl.java @@ -111,7 +111,7 @@ public class NodeCImpl extends EObjectImpl implements NodeC @Override protected EClass eStaticClass() { - return Model3Package.Literals.NODE_C; + return Model3Package.eINSTANCE.getNodeC(); } /** diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/NodeDImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/NodeDImpl.java index 521aefad7d..f7e23a2673 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/NodeDImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/NodeDImpl.java @@ -111,7 +111,7 @@ public class NodeDImpl extends EObjectImpl implements NodeD @Override protected EClass eStaticClass() { - return Model3Package.Literals.NODE_D; + return Model3Package.eINSTANCE.getNodeD(); } /** diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/PolygonImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/PolygonImpl.java index 65420f0af4..5376564972 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/PolygonImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/PolygonImpl.java @@ -62,7 +62,7 @@ public class PolygonImpl extends EObjectImpl implements Polygon @Override protected EClass eStaticClass() { - return Model3Package.Literals.POLYGON; + return Model3Package.eINSTANCE.getPolygon(); } /** diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/PolygonWithDuplicatesImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/PolygonWithDuplicatesImpl.java index 368b8288ce..c9cd567452 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/PolygonWithDuplicatesImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/PolygonWithDuplicatesImpl.java @@ -63,7 +63,7 @@ public class PolygonWithDuplicatesImpl extends EObjectImpl implements PolygonWit @Override protected EClass eStaticClass() { - return Model3Package.Literals.POLYGON_WITH_DUPLICATES; + return Model3Package.eINSTANCE.getPolygonWithDuplicates(); } /** diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/Model3Package.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/Model3Package.java index b8f235dd1b..17e8b1751f 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/Model3Package.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/Model3Package.java @@ -892,345 +892,4 @@ public interface Model3Package extends EPackage */ Model3Factory getModel3Factory(); - /** - * 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.emf.cdo.tests.model3.impl.Class1Impl Class1}' class. - * - * - * @see org.eclipse.emf.cdo.tests.model3.impl.Class1Impl - * @see org.eclipse.emf.cdo.tests.model3.impl.Model3PackageImpl#getClass1() - * @generated - */ - EClass CLASS1 = eINSTANCE.getClass1(); - - /** - * The meta object literal for the 'Class2' reference list feature. - * - * @generated - */ - EReference CLASS1__CLASS2 = eINSTANCE.getClass1_Class2(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model3.impl.MetaRefImpl Meta Ref}' - * class. - * - * @see org.eclipse.emf.cdo.tests.model3.impl.MetaRefImpl - * @see org.eclipse.emf.cdo.tests.model3.impl.Model3PackageImpl#getMetaRef() - * @generated - */ - EClass META_REF = eINSTANCE.getMetaRef(); - - /** - * The meta object literal for the 'EPackage Ref' reference feature. - * - * @generated - */ - EReference META_REF__EPACKAGE_REF = eINSTANCE.getMetaRef_EPackageRef(); - - /** - * The meta object literal for the 'EClass Ref' reference feature. - * - * @generated - */ - EReference META_REF__ECLASS_REF = eINSTANCE.getMetaRef_EClassRef(); - - /** - * The meta object literal for the 'EReference Ref' reference feature. - * - * @generated - */ - EReference META_REF__EREFERENCE_REF = eINSTANCE.getMetaRef_EReferenceRef(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model3.impl.PolygonImpl Polygon}' - * class. - * - * @see org.eclipse.emf.cdo.tests.model3.impl.PolygonImpl - * @see org.eclipse.emf.cdo.tests.model3.impl.Model3PackageImpl#getPolygon() - * @generated - */ - EClass POLYGON = eINSTANCE.getPolygon(); - - /** - * The meta object literal for the 'Points' attribute list feature. - * - * @generated - */ - EAttribute POLYGON__POINTS = eINSTANCE.getPolygon_Points(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model3.impl.PolygonWithDuplicatesImpl - * Polygon With Duplicates}' class. - * - * @see org.eclipse.emf.cdo.tests.model3.impl.PolygonWithDuplicatesImpl - * @see org.eclipse.emf.cdo.tests.model3.impl.Model3PackageImpl#getPolygonWithDuplicates() - * @generated - */ - EClass POLYGON_WITH_DUPLICATES = eINSTANCE.getPolygonWithDuplicates(); - - /** - * The meta object literal for the 'Points' attribute list feature. - * - * @generated - */ - EAttribute POLYGON_WITH_DUPLICATES__POINTS = eINSTANCE.getPolygonWithDuplicates_Points(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model3.impl.NodeAImpl Node A}' class. - * - * - * @see org.eclipse.emf.cdo.tests.model3.impl.NodeAImpl - * @see org.eclipse.emf.cdo.tests.model3.impl.Model3PackageImpl#getNodeA() - * @generated - */ - EClass NODE_A = eINSTANCE.getNodeA(); - - /** - * The meta object literal for the 'Children' containment reference list feature. - * - * @generated - */ - EReference NODE_A__CHILDREN = eINSTANCE.getNodeA_Children(); - - /** - * The meta object literal for the 'Name' attribute feature. - * - * @generated - */ - EAttribute NODE_A__NAME = eINSTANCE.getNodeA_Name(); - - /** - * The meta object literal for the 'Other Nodes' reference list feature. - * - * - * @generated - */ - EReference NODE_A__OTHER_NODES = eINSTANCE.getNodeA_OtherNodes(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model3.impl.NodeBImpl Node B}' class. - * - * - * @see org.eclipse.emf.cdo.tests.model3.impl.NodeBImpl - * @see org.eclipse.emf.cdo.tests.model3.impl.Model3PackageImpl#getNodeB() - * @generated - */ - EClass NODE_B = eINSTANCE.getNodeB(); - - /** - * The meta object literal for the 'Children' containment reference list feature. - * - * @generated - */ - EReference NODE_B__CHILDREN = eINSTANCE.getNodeB_Children(); - - /** - * The meta object literal for the 'Parent' container reference feature. - * - * - * @generated - */ - EReference NODE_B__PARENT = eINSTANCE.getNodeB_Parent(); - - /** - * The meta object literal for the 'Name' attribute feature. - * - * @generated - */ - EAttribute NODE_B__NAME = eINSTANCE.getNodeB_Name(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model3.impl.NodeCImpl Node C}' class. - * - * - * @see org.eclipse.emf.cdo.tests.model3.impl.NodeCImpl - * @see org.eclipse.emf.cdo.tests.model3.impl.Model3PackageImpl#getNodeC() - * @generated - */ - EClass NODE_C = eINSTANCE.getNodeC(); - - /** - * The meta object literal for the 'Children' containment reference list feature. - * - * @generated - */ - EReference NODE_C__CHILDREN = eINSTANCE.getNodeC_Children(); - - /** - * The meta object literal for the 'Parent' container reference feature. - * - * - * @generated - */ - EReference NODE_C__PARENT = eINSTANCE.getNodeC_Parent(); - - /** - * The meta object literal for the 'Name' attribute feature. - * - * @generated - */ - EAttribute NODE_C__NAME = eINSTANCE.getNodeC_Name(); - - /** - * The meta object literal for the 'Other Nodes' reference list feature. - * - * - * @generated - */ - EReference NODE_C__OTHER_NODES = eINSTANCE.getNodeC_OtherNodes(); - - /** - * The meta object literal for the 'Opposite Nodes' reference list feature. - * - * - * @generated - */ - EReference NODE_C__OPPOSITE_NODES = eINSTANCE.getNodeC_OppositeNodes(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model3.impl.NodeDImpl Node D}' class. - * - * - * @see org.eclipse.emf.cdo.tests.model3.impl.NodeDImpl - * @see org.eclipse.emf.cdo.tests.model3.impl.Model3PackageImpl#getNodeD() - * @generated - */ - EClass NODE_D = eINSTANCE.getNodeD(); - - /** - * The meta object literal for the 'Children' containment reference list feature. - * - * @generated - */ - EReference NODE_D__CHILDREN = eINSTANCE.getNodeD_Children(); - - /** - * The meta object literal for the 'Parent' container reference feature. - * - * - * @generated - */ - EReference NODE_D__PARENT = eINSTANCE.getNodeD_Parent(); - - /** - * The meta object literal for the 'Name' attribute feature. - * - * @generated - */ - EAttribute NODE_D__NAME = eINSTANCE.getNodeD_Name(); - - /** - * The meta object literal for the 'Other Nodes' reference list feature. - * - * - * @generated - */ - EReference NODE_D__OTHER_NODES = eINSTANCE.getNodeD_OtherNodes(); - - /** - * The meta object literal for the 'Opposite Node' reference feature. - * - * @generated - */ - EReference NODE_D__OPPOSITE_NODE = eINSTANCE.getNodeD_OppositeNode(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model3.impl.ImageImpl Image}' class. - * - * - * @see org.eclipse.emf.cdo.tests.model3.impl.ImageImpl - * @see org.eclipse.emf.cdo.tests.model3.impl.Model3PackageImpl#getImage() - * @generated - */ - EClass IMAGE = eINSTANCE.getImage(); - - /** - * The meta object literal for the 'Width' attribute feature. - * - * @generated - */ - EAttribute IMAGE__WIDTH = eINSTANCE.getImage_Width(); - - /** - * The meta object literal for the 'Height' attribute feature. - * - * @generated - */ - EAttribute IMAGE__HEIGHT = eINSTANCE.getImage_Height(); - - /** - * The meta object literal for the 'Data' attribute feature. - * - * @generated - */ - EAttribute IMAGE__DATA = eINSTANCE.getImage_Data(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model3.impl.FileImpl File}' class. - * - * - * @see org.eclipse.emf.cdo.tests.model3.impl.FileImpl - * @see org.eclipse.emf.cdo.tests.model3.impl.Model3PackageImpl#getFile() - * @generated - */ - EClass FILE = eINSTANCE.getFile(); - - /** - * The meta object literal for the 'Name' attribute feature. - * - * @generated - */ - EAttribute FILE__NAME = eINSTANCE.getFile_Name(); - - /** - * The meta object literal for the 'Data' attribute feature. - * - * @generated - */ - EAttribute FILE__DATA = eINSTANCE.getFile_Data(); - - /** - * The meta object literal for the 'Point' data type. - * - * @see org.eclipse.emf.cdo.tests.model3.Point - * @see org.eclipse.emf.cdo.tests.model3.impl.Model3PackageImpl#getPoint() - * @generated - */ - EDataType POINT = eINSTANCE.getPoint(); - - } - } // Model3Package diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/Class1Impl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/Class1Impl.java index 7f2a9f7b74..09aeffa81c 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/Class1Impl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/Class1Impl.java @@ -50,7 +50,7 @@ public class Class1Impl extends CDOObjectImpl implements Class1 @Override protected EClass eStaticClass() { - return Model3Package.Literals.CLASS1; + return Model3Package.eINSTANCE.getClass1(); } /** @@ -72,7 +72,7 @@ public class Class1Impl extends CDOObjectImpl implements Class1 @SuppressWarnings("unchecked") public EList getClass2() { - return (EList)eGet(Model3Package.Literals.CLASS1__CLASS2, true); + return (EList)eGet(Model3Package.eINSTANCE.getClass1_Class2(), true); } /** @@ -82,7 +82,7 @@ public class Class1Impl extends CDOObjectImpl implements Class1 */ public void unsetClass2() { - eUnset(Model3Package.Literals.CLASS1__CLASS2); + eUnset(Model3Package.eINSTANCE.getClass1_Class2()); } /** @@ -92,7 +92,7 @@ public class Class1Impl extends CDOObjectImpl implements Class1 */ public boolean isSetClass2() { - return eIsSet(Model3Package.Literals.CLASS1__CLASS2); + return eIsSet(Model3Package.eINSTANCE.getClass1_Class2()); } } // Class1Impl diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/FileImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/FileImpl.java index de66a92d82..c5911defb3 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/FileImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/FileImpl.java @@ -50,7 +50,7 @@ public class FileImpl extends CDOObjectImpl implements File @Override protected EClass eStaticClass() { - return Model3Package.Literals.FILE; + return Model3Package.eINSTANCE.getFile(); } /** @@ -71,7 +71,7 @@ public class FileImpl extends CDOObjectImpl implements File */ public String getName() { - return (String)eGet(Model3Package.Literals.FILE__NAME, true); + return (String)eGet(Model3Package.eINSTANCE.getFile_Name(), true); } /** @@ -81,7 +81,7 @@ public class FileImpl extends CDOObjectImpl implements File */ public void setName(String newName) { - eSet(Model3Package.Literals.FILE__NAME, newName); + eSet(Model3Package.eINSTANCE.getFile_Name(), newName); } /** @@ -91,7 +91,7 @@ public class FileImpl extends CDOObjectImpl implements File */ public CDOClob getData() { - return (CDOClob)eGet(Model3Package.Literals.FILE__DATA, true); + return (CDOClob)eGet(Model3Package.eINSTANCE.getFile_Data(), true); } /** @@ -101,7 +101,7 @@ public class FileImpl extends CDOObjectImpl implements File */ public void setData(CDOClob newData) { - eSet(Model3Package.Literals.FILE__DATA, newData); + eSet(Model3Package.eINSTANCE.getFile_Data(), newData); } } // FileImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/ImageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/ImageImpl.java index 5f5fc593be..9d69f20cd2 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/ImageImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/ImageImpl.java @@ -51,7 +51,7 @@ public class ImageImpl extends CDOObjectImpl implements Image @Override protected EClass eStaticClass() { - return Model3Package.Literals.IMAGE; + return Model3Package.eINSTANCE.getImage(); } /** @@ -72,7 +72,7 @@ public class ImageImpl extends CDOObjectImpl implements Image */ public int getWidth() { - return (Integer)eGet(Model3Package.Literals.IMAGE__WIDTH, true); + return (Integer)eGet(Model3Package.eINSTANCE.getImage_Width(), true); } /** @@ -82,7 +82,7 @@ public class ImageImpl extends CDOObjectImpl implements Image */ public void setWidth(int newWidth) { - eSet(Model3Package.Literals.IMAGE__WIDTH, newWidth); + eSet(Model3Package.eINSTANCE.getImage_Width(), newWidth); } /** @@ -92,7 +92,7 @@ public class ImageImpl extends CDOObjectImpl implements Image */ public int getHeight() { - return (Integer)eGet(Model3Package.Literals.IMAGE__HEIGHT, true); + return (Integer)eGet(Model3Package.eINSTANCE.getImage_Height(), true); } /** @@ -102,7 +102,7 @@ public class ImageImpl extends CDOObjectImpl implements Image */ public void setHeight(int newHeight) { - eSet(Model3Package.Literals.IMAGE__HEIGHT, newHeight); + eSet(Model3Package.eINSTANCE.getImage_Height(), newHeight); } /** @@ -112,7 +112,7 @@ public class ImageImpl extends CDOObjectImpl implements Image */ public CDOBlob getData() { - return (CDOBlob)eGet(Model3Package.Literals.IMAGE__DATA, true); + return (CDOBlob)eGet(Model3Package.eINSTANCE.getImage_Data(), true); } /** @@ -122,7 +122,7 @@ public class ImageImpl extends CDOObjectImpl implements Image */ public void setData(CDOBlob newData) { - eSet(Model3Package.Literals.IMAGE__DATA, newData); + eSet(Model3Package.eINSTANCE.getImage_Data(), newData); } } // ImageImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/MetaRefImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/MetaRefImpl.java index b8bbb062ea..94cb7292da 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/MetaRefImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/MetaRefImpl.java @@ -51,7 +51,7 @@ public class MetaRefImpl extends CDOObjectImpl implements MetaRef @Override protected EClass eStaticClass() { - return Model3Package.Literals.META_REF; + return Model3Package.eINSTANCE.getMetaRef(); } /** @@ -72,7 +72,7 @@ public class MetaRefImpl extends CDOObjectImpl implements MetaRef */ public EPackage getEPackageRef() { - return (EPackage)eGet(Model3Package.Literals.META_REF__EPACKAGE_REF, true); + return (EPackage)eGet(Model3Package.eINSTANCE.getMetaRef_EPackageRef(), true); } /** @@ -82,7 +82,7 @@ public class MetaRefImpl extends CDOObjectImpl implements MetaRef */ public void setEPackageRef(EPackage newEPackageRef) { - eSet(Model3Package.Literals.META_REF__EPACKAGE_REF, newEPackageRef); + eSet(Model3Package.eINSTANCE.getMetaRef_EPackageRef(), newEPackageRef); } /** @@ -92,7 +92,7 @@ public class MetaRefImpl extends CDOObjectImpl implements MetaRef */ public EClass getEClassRef() { - return (EClass)eGet(Model3Package.Literals.META_REF__ECLASS_REF, true); + return (EClass)eGet(Model3Package.eINSTANCE.getMetaRef_EClassRef(), true); } /** @@ -102,7 +102,7 @@ public class MetaRefImpl extends CDOObjectImpl implements MetaRef */ public void setEClassRef(EClass newEClassRef) { - eSet(Model3Package.Literals.META_REF__ECLASS_REF, newEClassRef); + eSet(Model3Package.eINSTANCE.getMetaRef_EClassRef(), newEClassRef); } /** @@ -112,7 +112,7 @@ public class MetaRefImpl extends CDOObjectImpl implements MetaRef */ public EReference getEReferenceRef() { - return (EReference)eGet(Model3Package.Literals.META_REF__EREFERENCE_REF, true); + return (EReference)eGet(Model3Package.eINSTANCE.getMetaRef_EReferenceRef(), true); } /** @@ -122,7 +122,7 @@ public class MetaRefImpl extends CDOObjectImpl implements MetaRef */ public void setEReferenceRef(EReference newEReferenceRef) { - eSet(Model3Package.Literals.META_REF__EREFERENCE_REF, newEReferenceRef); + eSet(Model3Package.eINSTANCE.getMetaRef_EReferenceRef(), newEReferenceRef); } } // MetaRefImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/NodeAImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/NodeAImpl.java index d6540a6730..5b0c704299 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/NodeAImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/NodeAImpl.java @@ -51,7 +51,7 @@ public class NodeAImpl extends CDOObjectImpl implements NodeA @Override protected EClass eStaticClass() { - return Model3Package.Literals.NODE_A; + return Model3Package.eINSTANCE.getNodeA(); } /** @@ -73,7 +73,7 @@ public class NodeAImpl extends CDOObjectImpl implements NodeA @SuppressWarnings("unchecked") public EList getChildren() { - return (EList)eGet(Model3Package.Literals.NODE_A__CHILDREN, true); + return (EList)eGet(Model3Package.eINSTANCE.getNodeA_Children(), true); } /** @@ -83,7 +83,7 @@ public class NodeAImpl extends CDOObjectImpl implements NodeA */ public String getName() { - return (String)eGet(Model3Package.Literals.NODE_A__NAME, true); + return (String)eGet(Model3Package.eINSTANCE.getNodeA_Name(), true); } /** @@ -93,7 +93,7 @@ public class NodeAImpl extends CDOObjectImpl implements NodeA */ public void setName(String newName) { - eSet(Model3Package.Literals.NODE_A__NAME, newName); + eSet(Model3Package.eINSTANCE.getNodeA_Name(), newName); } /** @@ -104,7 +104,7 @@ public class NodeAImpl extends CDOObjectImpl implements NodeA @SuppressWarnings("unchecked") public EList getOtherNodes() { - return (EList)eGet(Model3Package.Literals.NODE_A__OTHER_NODES, true); + return (EList)eGet(Model3Package.eINSTANCE.getNodeA_OtherNodes(), true); } } // NodeAImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/NodeBImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/NodeBImpl.java index c0fe4319a9..9d29799ecb 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/NodeBImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/NodeBImpl.java @@ -51,7 +51,7 @@ public class NodeBImpl extends CDOObjectImpl implements NodeB @Override protected EClass eStaticClass() { - return Model3Package.Literals.NODE_B; + return Model3Package.eINSTANCE.getNodeB(); } /** @@ -73,7 +73,7 @@ public class NodeBImpl extends CDOObjectImpl implements NodeB @SuppressWarnings("unchecked") public EList getChildren() { - return (EList)eGet(Model3Package.Literals.NODE_B__CHILDREN, true); + return (EList)eGet(Model3Package.eINSTANCE.getNodeB_Children(), true); } /** @@ -83,7 +83,7 @@ public class NodeBImpl extends CDOObjectImpl implements NodeB */ public NodeB getParent() { - return (NodeB)eGet(Model3Package.Literals.NODE_B__PARENT, true); + return (NodeB)eGet(Model3Package.eINSTANCE.getNodeB_Parent(), true); } /** @@ -93,7 +93,7 @@ public class NodeBImpl extends CDOObjectImpl implements NodeB */ public void setParent(NodeB newParent) { - eSet(Model3Package.Literals.NODE_B__PARENT, newParent); + eSet(Model3Package.eINSTANCE.getNodeB_Parent(), newParent); } /** @@ -103,7 +103,7 @@ public class NodeBImpl extends CDOObjectImpl implements NodeB */ public String getName() { - return (String)eGet(Model3Package.Literals.NODE_B__NAME, true); + return (String)eGet(Model3Package.eINSTANCE.getNodeB_Name(), true); } /** @@ -113,7 +113,7 @@ public class NodeBImpl extends CDOObjectImpl implements NodeB */ public void setName(String newName) { - eSet(Model3Package.Literals.NODE_B__NAME, newName); + eSet(Model3Package.eINSTANCE.getNodeB_Name(), newName); } } // NodeBImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/NodeCImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/NodeCImpl.java index 0b3dd821db..20a2176fcd 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/NodeCImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/NodeCImpl.java @@ -53,7 +53,7 @@ public class NodeCImpl extends CDOObjectImpl implements NodeC @Override protected EClass eStaticClass() { - return Model3Package.Literals.NODE_C; + return Model3Package.eINSTANCE.getNodeC(); } /** @@ -75,7 +75,7 @@ public class NodeCImpl extends CDOObjectImpl implements NodeC @SuppressWarnings("unchecked") public EList getChildren() { - return (EList)eGet(Model3Package.Literals.NODE_C__CHILDREN, true); + return (EList)eGet(Model3Package.eINSTANCE.getNodeC_Children(), true); } /** @@ -85,7 +85,7 @@ public class NodeCImpl extends CDOObjectImpl implements NodeC */ public NodeC getParent() { - return (NodeC)eGet(Model3Package.Literals.NODE_C__PARENT, true); + return (NodeC)eGet(Model3Package.eINSTANCE.getNodeC_Parent(), true); } /** @@ -95,7 +95,7 @@ public class NodeCImpl extends CDOObjectImpl implements NodeC */ public void setParent(NodeC newParent) { - eSet(Model3Package.Literals.NODE_C__PARENT, newParent); + eSet(Model3Package.eINSTANCE.getNodeC_Parent(), newParent); } /** @@ -105,7 +105,7 @@ public class NodeCImpl extends CDOObjectImpl implements NodeC */ public String getName() { - return (String)eGet(Model3Package.Literals.NODE_C__NAME, true); + return (String)eGet(Model3Package.eINSTANCE.getNodeC_Name(), true); } /** @@ -115,7 +115,7 @@ public class NodeCImpl extends CDOObjectImpl implements NodeC */ public void setName(String newName) { - eSet(Model3Package.Literals.NODE_C__NAME, newName); + eSet(Model3Package.eINSTANCE.getNodeC_Name(), newName); } /** @@ -126,7 +126,7 @@ public class NodeCImpl extends CDOObjectImpl implements NodeC @SuppressWarnings("unchecked") public EList getOtherNodes() { - return (EList)eGet(Model3Package.Literals.NODE_C__OTHER_NODES, true); + return (EList)eGet(Model3Package.eINSTANCE.getNodeC_OtherNodes(), true); } /** @@ -137,7 +137,7 @@ public class NodeCImpl extends CDOObjectImpl implements NodeC @SuppressWarnings("unchecked") public EList getOppositeNodes() { - return (EList)eGet(Model3Package.Literals.NODE_C__OPPOSITE_NODES, true); + return (EList)eGet(Model3Package.eINSTANCE.getNodeC_OppositeNodes(), true); } } // NodeCImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/NodeDImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/NodeDImpl.java index a034d5baef..4645c77171 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/NodeDImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/NodeDImpl.java @@ -53,7 +53,7 @@ public class NodeDImpl extends CDOObjectImpl implements NodeD @Override protected EClass eStaticClass() { - return Model3Package.Literals.NODE_D; + return Model3Package.eINSTANCE.getNodeD(); } /** @@ -75,7 +75,7 @@ public class NodeDImpl extends CDOObjectImpl implements NodeD @SuppressWarnings("unchecked") public EList getChildren() { - return (EList)eGet(Model3Package.Literals.NODE_D__CHILDREN, true); + return (EList)eGet(Model3Package.eINSTANCE.getNodeD_Children(), true); } /** @@ -85,7 +85,7 @@ public class NodeDImpl extends CDOObjectImpl implements NodeD */ public NodeD getParent() { - return (NodeD)eGet(Model3Package.Literals.NODE_D__PARENT, true); + return (NodeD)eGet(Model3Package.eINSTANCE.getNodeD_Parent(), true); } /** @@ -95,7 +95,7 @@ public class NodeDImpl extends CDOObjectImpl implements NodeD */ public void setParent(NodeD newParent) { - eSet(Model3Package.Literals.NODE_D__PARENT, newParent); + eSet(Model3Package.eINSTANCE.getNodeD_Parent(), newParent); } /** @@ -105,7 +105,7 @@ public class NodeDImpl extends CDOObjectImpl implements NodeD */ public String getName() { - return (String)eGet(Model3Package.Literals.NODE_D__NAME, true); + return (String)eGet(Model3Package.eINSTANCE.getNodeD_Name(), true); } /** @@ -115,7 +115,7 @@ public class NodeDImpl extends CDOObjectImpl implements NodeD */ public void setName(String newName) { - eSet(Model3Package.Literals.NODE_D__NAME, newName); + eSet(Model3Package.eINSTANCE.getNodeD_Name(), newName); } /** @@ -126,7 +126,7 @@ public class NodeDImpl extends CDOObjectImpl implements NodeD @SuppressWarnings("unchecked") public EList getOtherNodes() { - return (EList)eGet(Model3Package.Literals.NODE_D__OTHER_NODES, true); + return (EList)eGet(Model3Package.eINSTANCE.getNodeD_OtherNodes(), true); } /** @@ -136,7 +136,7 @@ public class NodeDImpl extends CDOObjectImpl implements NodeD */ public NodeD getOppositeNode() { - return (NodeD)eGet(Model3Package.Literals.NODE_D__OPPOSITE_NODE, true); + return (NodeD)eGet(Model3Package.eINSTANCE.getNodeD_OppositeNode(), true); } /** @@ -146,7 +146,7 @@ public class NodeDImpl extends CDOObjectImpl implements NodeD */ public void setOppositeNode(NodeD newOppositeNode) { - eSet(Model3Package.Literals.NODE_D__OPPOSITE_NODE, newOppositeNode); + eSet(Model3Package.eINSTANCE.getNodeD_OppositeNode(), newOppositeNode); } } // NodeDImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/PolygonImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/PolygonImpl.java index 19b57bdeaa..23c36bb064 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/PolygonImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/PolygonImpl.java @@ -50,7 +50,7 @@ public class PolygonImpl extends CDOObjectImpl implements Polygon @Override protected EClass eStaticClass() { - return Model3Package.Literals.POLYGON; + return Model3Package.eINSTANCE.getPolygon(); } /** @@ -72,7 +72,7 @@ public class PolygonImpl extends CDOObjectImpl implements Polygon @SuppressWarnings("unchecked") public EList getPoints() { - return (EList)eGet(Model3Package.Literals.POLYGON__POINTS, true); + return (EList)eGet(Model3Package.eINSTANCE.getPolygon_Points(), true); } } // PolygonImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/PolygonWithDuplicatesImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/PolygonWithDuplicatesImpl.java index e09212c0c6..69f82a5a4f 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/PolygonWithDuplicatesImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/PolygonWithDuplicatesImpl.java @@ -51,7 +51,7 @@ public class PolygonWithDuplicatesImpl extends CDOObjectImpl implements PolygonW @Override protected EClass eStaticClass() { - return Model3Package.Literals.POLYGON_WITH_DUPLICATES; + return Model3Package.eINSTANCE.getPolygonWithDuplicates(); } /** @@ -73,7 +73,7 @@ public class PolygonWithDuplicatesImpl extends CDOObjectImpl implements PolygonW @SuppressWarnings("unchecked") public EList getPoints() { - return (EList)eGet(Model3Package.Literals.POLYGON_WITH_DUPLICATES__POINTS, true); + return (EList)eGet(Model3Package.eINSTANCE.getPolygonWithDuplicates_Points(), true); } } // PolygonWithDuplicatesImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/model/model4.genmodel b/plugins/org.eclipse.emf.cdo.tests.model4/model/model4.genmodel index 06b284f3ac..6af534ae6b 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/model/model4.genmodel +++ b/plugins/org.eclipse.emf.cdo.tests.model4/model/model4.genmodel @@ -11,7 +11,7 @@ model4.ecore CDO=org.eclipse.emf.cdo + literalsInterface="false" ecorePackage="model4.ecore#/"> @@ -40,6 +40,13 @@
    + + + + + + + diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/model/model4.legacy-genmodel b/plugins/org.eclipse.emf.cdo.tests.model4/model/model4.legacy-genmodel index 6ba575a717..3d08fac773 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/model/model4.legacy-genmodel +++ b/plugins/org.eclipse.emf.cdo.tests.model4/model/model4.legacy-genmodel @@ -1,101 +1,210 @@ - + model4.ecore CDO=org.eclipse.emf.cdo - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ContainedElementNoOppositeImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ContainedElementNoOppositeImpl.java index ee5860b691..4a1f2717ec 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ContainedElementNoOppositeImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ContainedElementNoOppositeImpl.java @@ -69,7 +69,7 @@ public class ContainedElementNoOppositeImpl extends EObjectImpl implements Conta @Override protected EClass eStaticClass() { - return model4Package.Literals.CONTAINED_ELEMENT_NO_OPPOSITE; + return model4Package.eINSTANCE.getContainedElementNoOpposite(); } /** @@ -92,10 +92,8 @@ public class ContainedElementNoOppositeImpl extends EObjectImpl implements Conta String oldName = name; name = newName; if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.SET, model4Package.CONTAINED_ELEMENT_NO_OPPOSITE__NAME, oldName, name)); - } } /** @@ -173,9 +171,7 @@ public class ContainedElementNoOppositeImpl extends EObjectImpl implements Conta public String toString() { if (eIsProxy()) - { return super.toString(); - } StringBuffer result = new StringBuffer(super.toString()); result.append(" (name: "); diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/GenRefMapNonContainedImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/GenRefMapNonContainedImpl.java index f469a12eb3..23d3b6baea 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/GenRefMapNonContainedImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/GenRefMapNonContainedImpl.java @@ -65,7 +65,7 @@ public class GenRefMapNonContainedImpl extends EObjectImpl implements GenRefMapN @Override protected EClass eStaticClass() { - return model4Package.Literals.GEN_REF_MAP_NON_CONTAINED; + return model4Package.eINSTANCE.getGenRefMapNonContained(); } /** @@ -77,8 +77,8 @@ public class GenRefMapNonContainedImpl extends EObjectImpl implements GenRefMapN { if (elements == null) { - elements = new EcoreEMap(model4Package.Literals.STRING_TO_EOBJECT, StringToEObjectImpl.class, - this, model4Package.GEN_REF_MAP_NON_CONTAINED__ELEMENTS); + elements = new EcoreEMap(model4Package.eINSTANCE.getStringToEObject(), + StringToEObjectImpl.class, this, model4Package.GEN_REF_MAP_NON_CONTAINED__ELEMENTS); } return elements; } @@ -111,13 +111,9 @@ public class GenRefMapNonContainedImpl extends EObjectImpl implements GenRefMapN { case model4Package.GEN_REF_MAP_NON_CONTAINED__ELEMENTS: if (coreType) - { return getElements(); - } else - { return getElements().map(); - } } return super.eGet(featureID, resolve, coreType); } diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/GenRefMultiContainedImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/GenRefMultiContainedImpl.java index 40ece0385e..64901d2f96 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/GenRefMultiContainedImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/GenRefMultiContainedImpl.java @@ -66,7 +66,7 @@ public class GenRefMultiContainedImpl extends EObjectImpl implements GenRefMulti @Override protected EClass eStaticClass() { - return model4Package.Literals.GEN_REF_MULTI_CONTAINED; + return model4Package.eINSTANCE.getGenRefMultiContained(); } /** diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/GenRefMultiNUNonContainedImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/GenRefMultiNUNonContainedImpl.java index 5d8115ba4c..02c107c130 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/GenRefMultiNUNonContainedImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/GenRefMultiNUNonContainedImpl.java @@ -63,7 +63,7 @@ public class GenRefMultiNUNonContainedImpl extends EObjectImpl implements GenRef @Override protected EClass eStaticClass() { - return model4Package.Literals.GEN_REF_MULTI_NU_NON_CONTAINED; + return model4Package.eINSTANCE.getGenRefMultiNUNonContained(); } /** diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/GenRefMultiNonContainedImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/GenRefMultiNonContainedImpl.java index 683b472900..dc9da18e25 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/GenRefMultiNonContainedImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/GenRefMultiNonContainedImpl.java @@ -63,7 +63,7 @@ public class GenRefMultiNonContainedImpl extends EObjectImpl implements GenRefMu @Override protected EClass eStaticClass() { - return model4Package.Literals.GEN_REF_MULTI_NON_CONTAINED; + return model4Package.eINSTANCE.getGenRefMultiNonContained(); } /** diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/GenRefSingleContainedImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/GenRefSingleContainedImpl.java index 48c780693d..31b1b7c9dd 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/GenRefSingleContainedImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/GenRefSingleContainedImpl.java @@ -63,7 +63,7 @@ public class GenRefSingleContainedImpl extends EObjectImpl implements GenRefSing @Override protected EClass eStaticClass() { - return model4Package.Literals.GEN_REF_SINGLE_CONTAINED; + return model4Package.eINSTANCE.getGenRefSingleContained(); } /** @@ -90,13 +90,9 @@ public class GenRefSingleContainedImpl extends EObjectImpl implements GenRefSing ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, model4Package.GEN_REF_SINGLE_CONTAINED__ELEMENT, oldElement, newElement); if (msgs == null) - { msgs = notification; - } else - { msgs.add(notification); - } } return msgs; } @@ -112,26 +108,18 @@ public class GenRefSingleContainedImpl extends EObjectImpl implements GenRefSing { NotificationChain msgs = null; if (element != null) - { msgs = ((InternalEObject)element).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - model4Package.GEN_REF_SINGLE_CONTAINED__ELEMENT, null, msgs); - } if (newElement != null) - { msgs = ((InternalEObject)newElement).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - model4Package.GEN_REF_SINGLE_CONTAINED__ELEMENT, null, msgs); - } msgs = basicSetElement(newElement, msgs); if (msgs != null) - { msgs.dispatch(); - } } else if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.SET, model4Package.GEN_REF_SINGLE_CONTAINED__ELEMENT, newElement, newElement)); - } } /** diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/GenRefSingleNonContainedImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/GenRefSingleNonContainedImpl.java index 09cb8d7897..ee8a932af9 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/GenRefSingleNonContainedImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/GenRefSingleNonContainedImpl.java @@ -62,7 +62,7 @@ public class GenRefSingleNonContainedImpl extends EObjectImpl implements GenRefS @Override protected EClass eStaticClass() { - return model4Package.Literals.GEN_REF_SINGLE_NON_CONTAINED; + return model4Package.eINSTANCE.getGenRefSingleNonContained(); } /** @@ -79,10 +79,8 @@ public class GenRefSingleNonContainedImpl extends EObjectImpl implements GenRefS if (element != oldElement) { if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.RESOLVE, model4Package.GEN_REF_SINGLE_NON_CONTAINED__ELEMENT, oldElement, element)); - } } } return element; @@ -108,10 +106,8 @@ public class GenRefSingleNonContainedImpl extends EObjectImpl implements GenRefS EObject oldElement = element; element = newElement; if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.SET, model4Package.GEN_REF_SINGLE_NON_CONTAINED__ELEMENT, oldElement, element)); - } } /** @@ -126,9 +122,7 @@ public class GenRefSingleNonContainedImpl extends EObjectImpl implements GenRefS { case model4Package.GEN_REF_SINGLE_NON_CONTAINED__ELEMENT: if (resolve) - { return getElement(); - } return basicGetElement(); } return super.eGet(featureID, resolve, coreType); diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplContainedElementNPLImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplContainedElementNPLImpl.java index 6d2bedac1a..b9cd5a8158 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplContainedElementNPLImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplContainedElementNPLImpl.java @@ -71,7 +71,7 @@ public class ImplContainedElementNPLImpl extends EObjectImpl implements ImplCont @Override protected EClass eStaticClass() { - return model4Package.Literals.IMPL_CONTAINED_ELEMENT_NPL; + return model4Package.eINSTANCE.getImplContainedElementNPL(); } /** @@ -94,10 +94,8 @@ public class ImplContainedElementNPLImpl extends EObjectImpl implements ImplCont String oldName = name; name = newName; if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.SET, model4Package.IMPL_CONTAINED_ELEMENT_NPL__NAME, oldName, name)); - } } /** @@ -217,9 +215,7 @@ public class ImplContainedElementNPLImpl extends EObjectImpl implements ImplCont public String toString() { if (eIsProxy()) - { return super.toString(); - } StringBuffer result = new StringBuffer(super.toString()); result.append(" (name: "); diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplMultiRefContainedElementImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplMultiRefContainedElementImpl.java index ceb6674e83..ebdfd26d63 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplMultiRefContainedElementImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplMultiRefContainedElementImpl.java @@ -75,7 +75,7 @@ public class ImplMultiRefContainedElementImpl extends EObjectImpl implements Imp @Override protected EClass eStaticClass() { - return model4Package.Literals.IMPL_MULTI_REF_CONTAINED_ELEMENT; + return model4Package.eINSTANCE.getImplMultiRefContainedElement(); } /** @@ -86,9 +86,7 @@ public class ImplMultiRefContainedElementImpl extends EObjectImpl implements Imp public IMultiRefContainer getParent() { if (eContainerFeatureID() != model4Package.IMPL_MULTI_REF_CONTAINED_ELEMENT__PARENT) - { return null; - } return (IMultiRefContainer)eContainer(); } @@ -111,33 +109,23 @@ public class ImplMultiRefContainedElementImpl extends EObjectImpl implements Imp public void setParent(IMultiRefContainer newParent) { if (newParent != eInternalContainer() - || eContainerFeatureID() != model4Package.IMPL_MULTI_REF_CONTAINED_ELEMENT__PARENT && newParent != null) + || (eContainerFeatureID() != model4Package.IMPL_MULTI_REF_CONTAINED_ELEMENT__PARENT && newParent != null)) { if (EcoreUtil.isAncestor(this, newParent)) - { throw new IllegalArgumentException("Recursive containment not allowed for " + toString()); - } NotificationChain msgs = null; if (eInternalContainer() != null) - { msgs = eBasicRemoveFromContainer(msgs); - } if (newParent != null) - { msgs = ((InternalEObject)newParent).eInverseAdd(this, model4interfacesPackage.IMULTI_REF_CONTAINER__ELEMENTS, IMultiRefContainer.class, msgs); - } msgs = basicSetParent(newParent, msgs); if (msgs != null) - { msgs.dispatch(); - } } else if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.SET, model4Package.IMPL_MULTI_REF_CONTAINED_ELEMENT__PARENT, newParent, newParent)); - } } /** @@ -160,10 +148,8 @@ public class ImplMultiRefContainedElementImpl extends EObjectImpl implements Imp String oldName = name; name = newName; if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.SET, model4Package.IMPL_MULTI_REF_CONTAINED_ELEMENT__NAME, oldName, name)); - } } /** @@ -178,9 +164,7 @@ public class ImplMultiRefContainedElementImpl extends EObjectImpl implements Imp { case model4Package.IMPL_MULTI_REF_CONTAINED_ELEMENT__PARENT: if (eInternalContainer() != null) - { msgs = eBasicRemoveFromContainer(msgs); - } return basicSetParent((IMultiRefContainer)otherEnd, msgs); } return super.eInverseAdd(otherEnd, featureID, msgs); @@ -304,9 +288,7 @@ public class ImplMultiRefContainedElementImpl extends EObjectImpl implements Imp public String toString() { if (eIsProxy()) - { return super.toString(); - } StringBuffer result = new StringBuffer(super.toString()); result.append(" (name: "); diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplMultiRefContainerImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplMultiRefContainerImpl.java index c2af2de896..c80689302e 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplMultiRefContainerImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplMultiRefContainerImpl.java @@ -67,7 +67,7 @@ public class ImplMultiRefContainerImpl extends EObjectImpl implements ImplMultiR @Override protected EClass eStaticClass() { - return model4Package.Literals.IMPL_MULTI_REF_CONTAINER; + return model4Package.eINSTANCE.getImplMultiRefContainer(); } /** diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplMultiRefContainerNPLImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplMultiRefContainerNPLImpl.java index bdf51e1e00..156b00ecfe 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplMultiRefContainerNPLImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplMultiRefContainerNPLImpl.java @@ -66,7 +66,7 @@ public class ImplMultiRefContainerNPLImpl extends EObjectImpl implements ImplMul @Override protected EClass eStaticClass() { - return model4Package.Literals.IMPL_MULTI_REF_CONTAINER_NPL; + return model4Package.eINSTANCE.getImplMultiRefContainerNPL(); } /** diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplMultiRefNonContainedElementImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplMultiRefNonContainedElementImpl.java index 6bec464846..a2ecec3e68 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplMultiRefNonContainedElementImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplMultiRefNonContainedElementImpl.java @@ -85,7 +85,7 @@ public class ImplMultiRefNonContainedElementImpl extends EObjectImpl implements @Override protected EClass eStaticClass() { - return model4Package.Literals.IMPL_MULTI_REF_NON_CONTAINED_ELEMENT; + return model4Package.eINSTANCE.getImplMultiRefNonContainedElement(); } /** @@ -102,10 +102,8 @@ public class ImplMultiRefNonContainedElementImpl extends EObjectImpl implements if (parent != oldParent) { if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.RESOLVE, model4Package.IMPL_MULTI_REF_NON_CONTAINED_ELEMENT__PARENT, oldParent, parent)); - } } } return parent; @@ -135,13 +133,9 @@ public class ImplMultiRefNonContainedElementImpl extends EObjectImpl implements ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, model4Package.IMPL_MULTI_REF_NON_CONTAINED_ELEMENT__PARENT, oldParent, newParent); if (msgs == null) - { msgs = notification; - } else - { msgs.add(notification); - } } return msgs; } @@ -157,26 +151,18 @@ public class ImplMultiRefNonContainedElementImpl extends EObjectImpl implements { NotificationChain msgs = null; if (parent != null) - { msgs = ((InternalEObject)parent).eInverseRemove(this, model4interfacesPackage.IMULTI_REF_NON_CONTAINER__ELEMENTS, IMultiRefNonContainer.class, msgs); - } if (newParent != null) - { msgs = ((InternalEObject)newParent).eInverseAdd(this, model4interfacesPackage.IMULTI_REF_NON_CONTAINER__ELEMENTS, IMultiRefNonContainer.class, msgs); - } msgs = basicSetParent(newParent, msgs); if (msgs != null) - { msgs.dispatch(); - } } else if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.SET, model4Package.IMPL_MULTI_REF_NON_CONTAINED_ELEMENT__PARENT, newParent, newParent)); - } } /** @@ -199,10 +185,8 @@ public class ImplMultiRefNonContainedElementImpl extends EObjectImpl implements String oldName = name; name = newName; if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.SET, model4Package.IMPL_MULTI_REF_NON_CONTAINED_ELEMENT__NAME, oldName, name)); - } } /** @@ -217,10 +201,8 @@ public class ImplMultiRefNonContainedElementImpl extends EObjectImpl implements { case model4Package.IMPL_MULTI_REF_NON_CONTAINED_ELEMENT__PARENT: if (parent != null) - { msgs = ((InternalEObject)parent).eInverseRemove(this, model4interfacesPackage.IMULTI_REF_NON_CONTAINER__ELEMENTS, IMultiRefNonContainer.class, msgs); - } return basicSetParent((IMultiRefNonContainer)otherEnd, msgs); } return super.eInverseAdd(otherEnd, featureID, msgs); @@ -254,9 +236,7 @@ public class ImplMultiRefNonContainedElementImpl extends EObjectImpl implements { case model4Package.IMPL_MULTI_REF_NON_CONTAINED_ELEMENT__PARENT: if (resolve) - { return getParent(); - } return basicGetParent(); case model4Package.IMPL_MULTI_REF_NON_CONTAINED_ELEMENT__NAME: return getName(); @@ -331,9 +311,7 @@ public class ImplMultiRefNonContainedElementImpl extends EObjectImpl implements public String toString() { if (eIsProxy()) - { return super.toString(); - } StringBuffer result = new StringBuffer(super.toString()); result.append(" (name: "); diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplMultiRefNonContainerImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplMultiRefNonContainerImpl.java index 661733dec0..c887450390 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplMultiRefNonContainerImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplMultiRefNonContainerImpl.java @@ -67,7 +67,7 @@ public class ImplMultiRefNonContainerImpl extends EObjectImpl implements ImplMul @Override protected EClass eStaticClass() { - return model4Package.Literals.IMPL_MULTI_REF_NON_CONTAINER; + return model4Package.eINSTANCE.getImplMultiRefNonContainer(); } /** diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplMultiRefNonContainerNPLImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplMultiRefNonContainerNPLImpl.java index c65b10495b..46e3e5f512 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplMultiRefNonContainerNPLImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplMultiRefNonContainerNPLImpl.java @@ -64,7 +64,7 @@ public class ImplMultiRefNonContainerNPLImpl extends EObjectImpl implements Impl @Override protected EClass eStaticClass() { - return model4Package.Literals.IMPL_MULTI_REF_NON_CONTAINER_NPL; + return model4Package.eINSTANCE.getImplMultiRefNonContainerNPL(); } /** diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplSingleRefContainedElementImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplSingleRefContainedElementImpl.java index 38b5a7be03..bcf81224d2 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplSingleRefContainedElementImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplSingleRefContainedElementImpl.java @@ -75,7 +75,7 @@ public class ImplSingleRefContainedElementImpl extends EObjectImpl implements Im @Override protected EClass eStaticClass() { - return model4Package.Literals.IMPL_SINGLE_REF_CONTAINED_ELEMENT; + return model4Package.eINSTANCE.getImplSingleRefContainedElement(); } /** @@ -86,9 +86,7 @@ public class ImplSingleRefContainedElementImpl extends EObjectImpl implements Im public ISingleRefContainer getParent() { if (eContainerFeatureID() != model4Package.IMPL_SINGLE_REF_CONTAINED_ELEMENT__PARENT) - { return null; - } return (ISingleRefContainer)eContainer(); } @@ -111,33 +109,23 @@ public class ImplSingleRefContainedElementImpl extends EObjectImpl implements Im public void setParent(ISingleRefContainer newParent) { if (newParent != eInternalContainer() - || eContainerFeatureID() != model4Package.IMPL_SINGLE_REF_CONTAINED_ELEMENT__PARENT && newParent != null) + || (eContainerFeatureID() != model4Package.IMPL_SINGLE_REF_CONTAINED_ELEMENT__PARENT && newParent != null)) { if (EcoreUtil.isAncestor(this, newParent)) - { throw new IllegalArgumentException("Recursive containment not allowed for " + toString()); - } NotificationChain msgs = null; if (eInternalContainer() != null) - { msgs = eBasicRemoveFromContainer(msgs); - } if (newParent != null) - { msgs = ((InternalEObject)newParent).eInverseAdd(this, model4interfacesPackage.ISINGLE_REF_CONTAINER__ELEMENT, ISingleRefContainer.class, msgs); - } msgs = basicSetParent(newParent, msgs); if (msgs != null) - { msgs.dispatch(); - } } else if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.SET, model4Package.IMPL_SINGLE_REF_CONTAINED_ELEMENT__PARENT, newParent, newParent)); - } } /** @@ -160,10 +148,8 @@ public class ImplSingleRefContainedElementImpl extends EObjectImpl implements Im String oldName = name; name = newName; if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.SET, model4Package.IMPL_SINGLE_REF_CONTAINED_ELEMENT__NAME, oldName, name)); - } } /** @@ -178,9 +164,7 @@ public class ImplSingleRefContainedElementImpl extends EObjectImpl implements Im { case model4Package.IMPL_SINGLE_REF_CONTAINED_ELEMENT__PARENT: if (eInternalContainer() != null) - { msgs = eBasicRemoveFromContainer(msgs); - } return basicSetParent((ISingleRefContainer)otherEnd, msgs); } return super.eInverseAdd(otherEnd, featureID, msgs); @@ -304,9 +288,7 @@ public class ImplSingleRefContainedElementImpl extends EObjectImpl implements Im public String toString() { if (eIsProxy()) - { return super.toString(); - } StringBuffer result = new StringBuffer(super.toString()); result.append(" (name: "); diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplSingleRefContainerImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplSingleRefContainerImpl.java index 2f05cf0db8..275a9a3c03 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplSingleRefContainerImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplSingleRefContainerImpl.java @@ -64,7 +64,7 @@ public class ImplSingleRefContainerImpl extends EObjectImpl implements ImplSingl @Override protected EClass eStaticClass() { - return model4Package.Literals.IMPL_SINGLE_REF_CONTAINER; + return model4Package.eINSTANCE.getImplSingleRefContainer(); } /** @@ -91,13 +91,9 @@ public class ImplSingleRefContainerImpl extends EObjectImpl implements ImplSingl ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, model4Package.IMPL_SINGLE_REF_CONTAINER__ELEMENT, oldElement, newElement); if (msgs == null) - { msgs = notification; - } else - { msgs.add(notification); - } } return msgs; } @@ -113,26 +109,18 @@ public class ImplSingleRefContainerImpl extends EObjectImpl implements ImplSingl { NotificationChain msgs = null; if (element != null) - { msgs = ((InternalEObject)element).eInverseRemove(this, model4interfacesPackage.ISINGLE_REF_CONTAINED_ELEMENT__PARENT, ISingleRefContainedElement.class, msgs); - } if (newElement != null) - { msgs = ((InternalEObject)newElement).eInverseAdd(this, model4interfacesPackage.ISINGLE_REF_CONTAINED_ELEMENT__PARENT, ISingleRefContainedElement.class, msgs); - } msgs = basicSetElement(newElement, msgs); if (msgs != null) - { msgs.dispatch(); - } } else if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.SET, model4Package.IMPL_SINGLE_REF_CONTAINER__ELEMENT, newElement, newElement)); - } } /** @@ -147,10 +135,8 @@ public class ImplSingleRefContainerImpl extends EObjectImpl implements ImplSingl { case model4Package.IMPL_SINGLE_REF_CONTAINER__ELEMENT: if (element != null) - { msgs = ((InternalEObject)element).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - model4Package.IMPL_SINGLE_REF_CONTAINER__ELEMENT, null, msgs); - } return basicSetElement((ISingleRefContainedElement)otherEnd, msgs); } return super.eInverseAdd(otherEnd, featureID, msgs); diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplSingleRefContainerNPLImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplSingleRefContainerNPLImpl.java index b6d45c7daf..5cb0afde5d 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplSingleRefContainerNPLImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplSingleRefContainerNPLImpl.java @@ -63,7 +63,7 @@ public class ImplSingleRefContainerNPLImpl extends EObjectImpl implements ImplSi @Override protected EClass eStaticClass() { - return model4Package.Literals.IMPL_SINGLE_REF_CONTAINER_NPL; + return model4Package.eINSTANCE.getImplSingleRefContainerNPL(); } /** @@ -90,13 +90,9 @@ public class ImplSingleRefContainerNPLImpl extends EObjectImpl implements ImplSi ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, model4Package.IMPL_SINGLE_REF_CONTAINER_NPL__ELEMENT, oldElement, newElement); if (msgs == null) - { msgs = notification; - } else - { msgs.add(notification); - } } return msgs; } @@ -112,26 +108,18 @@ public class ImplSingleRefContainerNPLImpl extends EObjectImpl implements ImplSi { NotificationChain msgs = null; if (element != null) - { msgs = ((InternalEObject)element).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - model4Package.IMPL_SINGLE_REF_CONTAINER_NPL__ELEMENT, null, msgs); - } if (newElement != null) - { msgs = ((InternalEObject)newElement).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - model4Package.IMPL_SINGLE_REF_CONTAINER_NPL__ELEMENT, null, msgs); - } msgs = basicSetElement(newElement, msgs); if (msgs != null) - { msgs.dispatch(); - } } else if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.SET, model4Package.IMPL_SINGLE_REF_CONTAINER_NPL__ELEMENT, newElement, newElement)); - } } /** diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplSingleRefNonContainedElementImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplSingleRefNonContainedElementImpl.java index 2314655bd4..b6ce0f7860 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplSingleRefNonContainedElementImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplSingleRefNonContainedElementImpl.java @@ -85,7 +85,7 @@ public class ImplSingleRefNonContainedElementImpl extends EObjectImpl implements @Override protected EClass eStaticClass() { - return model4Package.Literals.IMPL_SINGLE_REF_NON_CONTAINED_ELEMENT; + return model4Package.eINSTANCE.getImplSingleRefNonContainedElement(); } /** @@ -102,10 +102,8 @@ public class ImplSingleRefNonContainedElementImpl extends EObjectImpl implements if (parent != oldParent) { if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.RESOLVE, model4Package.IMPL_SINGLE_REF_NON_CONTAINED_ELEMENT__PARENT, oldParent, parent)); - } } } return parent; @@ -135,13 +133,9 @@ public class ImplSingleRefNonContainedElementImpl extends EObjectImpl implements ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, model4Package.IMPL_SINGLE_REF_NON_CONTAINED_ELEMENT__PARENT, oldParent, newParent); if (msgs == null) - { msgs = notification; - } else - { msgs.add(notification); - } } return msgs; } @@ -157,26 +151,18 @@ public class ImplSingleRefNonContainedElementImpl extends EObjectImpl implements { NotificationChain msgs = null; if (parent != null) - { msgs = ((InternalEObject)parent).eInverseRemove(this, model4interfacesPackage.ISINGLE_REF_NON_CONTAINER__ELEMENT, ISingleRefNonContainer.class, msgs); - } if (newParent != null) - { msgs = ((InternalEObject)newParent).eInverseAdd(this, model4interfacesPackage.ISINGLE_REF_NON_CONTAINER__ELEMENT, ISingleRefNonContainer.class, msgs); - } msgs = basicSetParent(newParent, msgs); if (msgs != null) - { msgs.dispatch(); - } } else if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.SET, model4Package.IMPL_SINGLE_REF_NON_CONTAINED_ELEMENT__PARENT, newParent, newParent)); - } } /** @@ -199,10 +185,8 @@ public class ImplSingleRefNonContainedElementImpl extends EObjectImpl implements String oldName = name; name = newName; if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.SET, model4Package.IMPL_SINGLE_REF_NON_CONTAINED_ELEMENT__NAME, oldName, name)); - } } /** @@ -217,10 +201,8 @@ public class ImplSingleRefNonContainedElementImpl extends EObjectImpl implements { case model4Package.IMPL_SINGLE_REF_NON_CONTAINED_ELEMENT__PARENT: if (parent != null) - { msgs = ((InternalEObject)parent).eInverseRemove(this, model4interfacesPackage.ISINGLE_REF_NON_CONTAINER__ELEMENT, ISingleRefNonContainer.class, msgs); - } return basicSetParent((ISingleRefNonContainer)otherEnd, msgs); } return super.eInverseAdd(otherEnd, featureID, msgs); @@ -254,9 +236,7 @@ public class ImplSingleRefNonContainedElementImpl extends EObjectImpl implements { case model4Package.IMPL_SINGLE_REF_NON_CONTAINED_ELEMENT__PARENT: if (resolve) - { return getParent(); - } return basicGetParent(); case model4Package.IMPL_SINGLE_REF_NON_CONTAINED_ELEMENT__NAME: return getName(); @@ -331,9 +311,7 @@ public class ImplSingleRefNonContainedElementImpl extends EObjectImpl implements public String toString() { if (eIsProxy()) - { return super.toString(); - } StringBuffer result = new StringBuffer(super.toString()); result.append(" (name: "); diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplSingleRefNonContainerImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplSingleRefNonContainerImpl.java index 34826f4f08..659965bce5 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplSingleRefNonContainerImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplSingleRefNonContainerImpl.java @@ -64,7 +64,7 @@ public class ImplSingleRefNonContainerImpl extends EObjectImpl implements ImplSi @Override protected EClass eStaticClass() { - return model4Package.Literals.IMPL_SINGLE_REF_NON_CONTAINER; + return model4Package.eINSTANCE.getImplSingleRefNonContainer(); } /** @@ -81,10 +81,8 @@ public class ImplSingleRefNonContainerImpl extends EObjectImpl implements ImplSi if (element != oldElement) { if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.RESOLVE, model4Package.IMPL_SINGLE_REF_NON_CONTAINER__ELEMENT, oldElement, element)); - } } } return element; @@ -114,13 +112,9 @@ public class ImplSingleRefNonContainerImpl extends EObjectImpl implements ImplSi ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, model4Package.IMPL_SINGLE_REF_NON_CONTAINER__ELEMENT, oldElement, newElement); if (msgs == null) - { msgs = notification; - } else - { msgs.add(notification); - } } return msgs; } @@ -136,28 +130,20 @@ public class ImplSingleRefNonContainerImpl extends EObjectImpl implements ImplSi { NotificationChain msgs = null; if (element != null) - { msgs = ((InternalEObject)element).eInverseRemove(this, model4interfacesPackage.ISINGLE_REF_NON_CONTAINED_ELEMENT__PARENT, ISingleRefNonContainedElement.class, msgs); - } if (newElement != null) - { msgs = ((InternalEObject)newElement).eInverseAdd(this, model4interfacesPackage.ISINGLE_REF_NON_CONTAINED_ELEMENT__PARENT, ISingleRefNonContainedElement.class, msgs); - } msgs = basicSetElement(newElement, msgs); if (msgs != null) - { msgs.dispatch(); - } } else if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.SET, model4Package.IMPL_SINGLE_REF_NON_CONTAINER__ELEMENT, newElement, newElement)); - } } /** @@ -172,11 +158,9 @@ public class ImplSingleRefNonContainerImpl extends EObjectImpl implements ImplSi { case model4Package.IMPL_SINGLE_REF_NON_CONTAINER__ELEMENT: if (element != null) - { msgs = ((InternalEObject)element).eInverseRemove(this, model4interfacesPackage.ISINGLE_REF_NON_CONTAINED_ELEMENT__PARENT, ISingleRefNonContainedElement.class, msgs); - } return basicSetElement((ISingleRefNonContainedElement)otherEnd, msgs); } return super.eInverseAdd(otherEnd, featureID, msgs); @@ -210,9 +194,7 @@ public class ImplSingleRefNonContainerImpl extends EObjectImpl implements ImplSi { case model4Package.IMPL_SINGLE_REF_NON_CONTAINER__ELEMENT: if (resolve) - { return getElement(); - } return basicGetElement(); } return super.eGet(featureID, resolve, coreType); diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplSingleRefNonContainerNPLImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplSingleRefNonContainerNPLImpl.java index 4fffbb8e0a..ede7caadff 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplSingleRefNonContainerNPLImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/ImplSingleRefNonContainerNPLImpl.java @@ -63,7 +63,7 @@ public class ImplSingleRefNonContainerNPLImpl extends EObjectImpl implements Imp @Override protected EClass eStaticClass() { - return model4Package.Literals.IMPL_SINGLE_REF_NON_CONTAINER_NPL; + return model4Package.eINSTANCE.getImplSingleRefNonContainerNPL(); } /** @@ -80,10 +80,8 @@ public class ImplSingleRefNonContainerNPLImpl extends EObjectImpl implements Imp if (element != oldElement) { if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.RESOLVE, model4Package.IMPL_SINGLE_REF_NON_CONTAINER_NPL__ELEMENT, oldElement, element)); - } } } return element; @@ -109,10 +107,8 @@ public class ImplSingleRefNonContainerNPLImpl extends EObjectImpl implements Imp IContainedElementNoParentLink oldElement = element; element = newElement; if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.SET, model4Package.IMPL_SINGLE_REF_NON_CONTAINER_NPL__ELEMENT, oldElement, element)); - } } /** @@ -127,9 +123,7 @@ public class ImplSingleRefNonContainerNPLImpl extends EObjectImpl implements Imp { case model4Package.IMPL_SINGLE_REF_NON_CONTAINER_NPL__ELEMENT: if (resolve) - { return getElement(); - } return basicGetElement(); } return super.eGet(featureID, resolve, coreType); diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/MultiContainedElementImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/MultiContainedElementImpl.java index 38064b9c7f..4f0257f795 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/MultiContainedElementImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/MultiContainedElementImpl.java @@ -74,7 +74,7 @@ public class MultiContainedElementImpl extends EObjectImpl implements MultiConta @Override protected EClass eStaticClass() { - return model4Package.Literals.MULTI_CONTAINED_ELEMENT; + return model4Package.eINSTANCE.getMultiContainedElement(); } /** @@ -97,9 +97,7 @@ public class MultiContainedElementImpl extends EObjectImpl implements MultiConta String oldName = name; name = newName; if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.SET, model4Package.MULTI_CONTAINED_ELEMENT__NAME, oldName, name)); - } } /** @@ -110,9 +108,7 @@ public class MultiContainedElementImpl extends EObjectImpl implements MultiConta public RefMultiContained getParent() { if (eContainerFeatureID() != model4Package.MULTI_CONTAINED_ELEMENT__PARENT) - { return null; - } return (RefMultiContained)eContainer(); } @@ -134,34 +130,24 @@ public class MultiContainedElementImpl extends EObjectImpl implements MultiConta */ public void setParent(RefMultiContained newParent) { - if (newParent != eInternalContainer() || eContainerFeatureID() != model4Package.MULTI_CONTAINED_ELEMENT__PARENT - && newParent != null) + if (newParent != eInternalContainer() + || (eContainerFeatureID() != model4Package.MULTI_CONTAINED_ELEMENT__PARENT && newParent != null)) { if (EcoreUtil.isAncestor(this, newParent)) - { throw new IllegalArgumentException("Recursive containment not allowed for " + toString()); - } NotificationChain msgs = null; if (eInternalContainer() != null) - { msgs = eBasicRemoveFromContainer(msgs); - } if (newParent != null) - { msgs = ((InternalEObject)newParent).eInverseAdd(this, model4Package.REF_MULTI_CONTAINED__ELEMENTS, RefMultiContained.class, msgs); - } msgs = basicSetParent(newParent, msgs); if (msgs != null) - { msgs.dispatch(); - } } else if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.SET, model4Package.MULTI_CONTAINED_ELEMENT__PARENT, newParent, newParent)); - } } /** @@ -176,9 +162,7 @@ public class MultiContainedElementImpl extends EObjectImpl implements MultiConta { case model4Package.MULTI_CONTAINED_ELEMENT__PARENT: if (eInternalContainer() != null) - { msgs = eBasicRemoveFromContainer(msgs); - } return basicSetParent((RefMultiContained)otherEnd, msgs); } return super.eInverseAdd(otherEnd, featureID, msgs); @@ -302,9 +286,7 @@ public class MultiContainedElementImpl extends EObjectImpl implements MultiConta public String toString() { if (eIsProxy()) - { return super.toString(); - } StringBuffer result = new StringBuffer(super.toString()); result.append(" (name: "); diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/MultiNonContainedElementImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/MultiNonContainedElementImpl.java index 10b2b4a205..aa0804369d 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/MultiNonContainedElementImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/MultiNonContainedElementImpl.java @@ -83,7 +83,7 @@ public class MultiNonContainedElementImpl extends EObjectImpl implements MultiNo @Override protected EClass eStaticClass() { - return model4Package.Literals.MULTI_NON_CONTAINED_ELEMENT; + return model4Package.eINSTANCE.getMultiNonContainedElement(); } /** @@ -106,10 +106,8 @@ public class MultiNonContainedElementImpl extends EObjectImpl implements MultiNo String oldName = name; name = newName; if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.SET, model4Package.MULTI_NON_CONTAINED_ELEMENT__NAME, oldName, name)); - } } /** @@ -126,10 +124,8 @@ public class MultiNonContainedElementImpl extends EObjectImpl implements MultiNo if (parent != oldParent) { if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.RESOLVE, model4Package.MULTI_NON_CONTAINED_ELEMENT__PARENT, oldParent, parent)); - } } } return parent; @@ -159,13 +155,9 @@ public class MultiNonContainedElementImpl extends EObjectImpl implements MultiNo ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, model4Package.MULTI_NON_CONTAINED_ELEMENT__PARENT, oldParent, newParent); if (msgs == null) - { msgs = notification; - } else - { msgs.add(notification); - } } return msgs; } @@ -181,26 +173,18 @@ public class MultiNonContainedElementImpl extends EObjectImpl implements MultiNo { NotificationChain msgs = null; if (parent != null) - { msgs = ((InternalEObject)parent).eInverseRemove(this, model4Package.REF_MULTI_NON_CONTAINED__ELEMENTS, RefMultiNonContained.class, msgs); - } if (newParent != null) - { msgs = ((InternalEObject)newParent).eInverseAdd(this, model4Package.REF_MULTI_NON_CONTAINED__ELEMENTS, RefMultiNonContained.class, msgs); - } msgs = basicSetParent(newParent, msgs); if (msgs != null) - { msgs.dispatch(); - } } else if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.SET, model4Package.MULTI_NON_CONTAINED_ELEMENT__PARENT, newParent, newParent)); - } } /** @@ -215,10 +199,8 @@ public class MultiNonContainedElementImpl extends EObjectImpl implements MultiNo { case model4Package.MULTI_NON_CONTAINED_ELEMENT__PARENT: if (parent != null) - { msgs = ((InternalEObject)parent).eInverseRemove(this, model4Package.REF_MULTI_NON_CONTAINED__ELEMENTS, RefMultiNonContained.class, msgs); - } return basicSetParent((RefMultiNonContained)otherEnd, msgs); } return super.eInverseAdd(otherEnd, featureID, msgs); @@ -254,9 +236,7 @@ public class MultiNonContainedElementImpl extends EObjectImpl implements MultiNo return getName(); case model4Package.MULTI_NON_CONTAINED_ELEMENT__PARENT: if (resolve) - { return getParent(); - } return basicGetParent(); } return super.eGet(featureID, resolve, coreType); @@ -329,9 +309,7 @@ public class MultiNonContainedElementImpl extends EObjectImpl implements MultiNo public String toString() { if (eIsProxy()) - { return super.toString(); - } StringBuffer result = new StringBuffer(super.toString()); result.append(" (name: "); diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/MultiNonContainedUnsettableElementImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/MultiNonContainedUnsettableElementImpl.java index d6ab69ca64..b122de80d2 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/MultiNonContainedUnsettableElementImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/MultiNonContainedUnsettableElementImpl.java @@ -93,7 +93,7 @@ public class MultiNonContainedUnsettableElementImpl extends EObjectImpl implemen @Override protected EClass eStaticClass() { - return model4Package.Literals.MULTI_NON_CONTAINED_UNSETTABLE_ELEMENT; + return model4Package.eINSTANCE.getMultiNonContainedUnsettableElement(); } /** @@ -116,10 +116,8 @@ public class MultiNonContainedUnsettableElementImpl extends EObjectImpl implemen String oldName = name; name = newName; if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.SET, model4Package.MULTI_NON_CONTAINED_UNSETTABLE_ELEMENT__NAME, oldName, name)); - } } /** @@ -136,10 +134,8 @@ public class MultiNonContainedUnsettableElementImpl extends EObjectImpl implemen if (parent != oldParent) { if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.RESOLVE, model4Package.MULTI_NON_CONTAINED_UNSETTABLE_ELEMENT__PARENT, oldParent, parent)); - } } } return parent; @@ -171,13 +167,9 @@ public class MultiNonContainedUnsettableElementImpl extends EObjectImpl implemen ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, model4Package.MULTI_NON_CONTAINED_UNSETTABLE_ELEMENT__PARENT, oldParent, newParent, !oldParentESet); if (msgs == null) - { msgs = notification; - } else - { msgs.add(notification); - } } return msgs; } @@ -193,30 +185,22 @@ public class MultiNonContainedUnsettableElementImpl extends EObjectImpl implemen { NotificationChain msgs = null; if (parent != null) - { msgs = ((InternalEObject)parent).eInverseRemove(this, model4Package.REF_MULTI_NON_CONTAINED_UNSETTABLE__ELEMENTS, RefMultiNonContainedUnsettable.class, msgs); - } if (newParent != null) - { msgs = ((InternalEObject)newParent).eInverseAdd(this, model4Package.REF_MULTI_NON_CONTAINED_UNSETTABLE__ELEMENTS, RefMultiNonContainedUnsettable.class, msgs); - } msgs = basicSetParent(newParent, msgs); if (msgs != null) - { msgs.dispatch(); - } } else { boolean oldParentESet = parentESet; parentESet = true; if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.SET, model4Package.MULTI_NON_CONTAINED_UNSETTABLE_ELEMENT__PARENT, newParent, newParent, !oldParentESet)); - } } } @@ -236,13 +220,9 @@ public class MultiNonContainedUnsettableElementImpl extends EObjectImpl implemen ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, model4Package.MULTI_NON_CONTAINED_UNSETTABLE_ELEMENT__PARENT, oldParent, null, oldParentESet); if (msgs == null) - { msgs = notification; - } else - { msgs.add(notification); - } } return msgs; } @@ -261,19 +241,15 @@ public class MultiNonContainedUnsettableElementImpl extends EObjectImpl implemen RefMultiNonContainedUnsettable.class, msgs); msgs = basicUnsetParent(msgs); if (msgs != null) - { msgs.dispatch(); - } } else { boolean oldParentESet = parentESet; parentESet = false; if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.UNSET, model4Package.MULTI_NON_CONTAINED_UNSETTABLE_ELEMENT__PARENT, null, null, oldParentESet)); - } } } @@ -299,10 +275,8 @@ public class MultiNonContainedUnsettableElementImpl extends EObjectImpl implemen { case model4Package.MULTI_NON_CONTAINED_UNSETTABLE_ELEMENT__PARENT: if (parent != null) - { msgs = ((InternalEObject)parent).eInverseRemove(this, model4Package.REF_MULTI_NON_CONTAINED_UNSETTABLE__ELEMENTS, RefMultiNonContainedUnsettable.class, msgs); - } return basicSetParent((RefMultiNonContainedUnsettable)otherEnd, msgs); } return super.eInverseAdd(otherEnd, featureID, msgs); @@ -338,9 +312,7 @@ public class MultiNonContainedUnsettableElementImpl extends EObjectImpl implemen return getName(); case model4Package.MULTI_NON_CONTAINED_UNSETTABLE_ELEMENT__PARENT: if (resolve) - { return getParent(); - } return basicGetParent(); } return super.eGet(featureID, resolve, coreType); @@ -413,9 +385,7 @@ public class MultiNonContainedUnsettableElementImpl extends EObjectImpl implemen public String toString() { if (eIsProxy()) - { return super.toString(); - } StringBuffer result = new StringBuffer(super.toString()); result.append(" (name: "); diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefMultiContainedImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefMultiContainedImpl.java index dabd655045..785e93c263 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefMultiContainedImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefMultiContainedImpl.java @@ -66,7 +66,7 @@ public class RefMultiContainedImpl extends EObjectImpl implements RefMultiContai @Override protected EClass eStaticClass() { - return model4Package.Literals.REF_MULTI_CONTAINED; + return model4Package.eINSTANCE.getRefMultiContained(); } /** diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefMultiContainedNPLImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefMultiContainedNPLImpl.java index 6b3c3da8f1..f44258b566 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefMultiContainedNPLImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefMultiContainedNPLImpl.java @@ -66,7 +66,7 @@ public class RefMultiContainedNPLImpl extends EObjectImpl implements RefMultiCon @Override protected EClass eStaticClass() { - return model4Package.Literals.REF_MULTI_CONTAINED_NPL; + return model4Package.eINSTANCE.getRefMultiContainedNPL(); } /** diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefMultiNonContainedImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefMultiNonContainedImpl.java index bfd229aa1b..9aaf595431 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefMultiNonContainedImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefMultiNonContainedImpl.java @@ -66,7 +66,7 @@ public class RefMultiNonContainedImpl extends EObjectImpl implements RefMultiNon @Override protected EClass eStaticClass() { - return model4Package.Literals.REF_MULTI_NON_CONTAINED; + return model4Package.eINSTANCE.getRefMultiNonContained(); } /** diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefMultiNonContainedNPLImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefMultiNonContainedNPLImpl.java index 9aa317baf8..0cbc565915 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefMultiNonContainedNPLImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefMultiNonContainedNPLImpl.java @@ -63,7 +63,7 @@ public class RefMultiNonContainedNPLImpl extends EObjectImpl implements RefMulti @Override protected EClass eStaticClass() { - return model4Package.Literals.REF_MULTI_NON_CONTAINED_NPL; + return model4Package.eINSTANCE.getRefMultiNonContainedNPL(); } /** diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefMultiNonContainedUnsettableImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefMultiNonContainedUnsettableImpl.java index 483de2f303..42a31e6860 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefMultiNonContainedUnsettableImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefMultiNonContainedUnsettableImpl.java @@ -67,7 +67,7 @@ public class RefMultiNonContainedUnsettableImpl extends EObjectImpl implements R @Override protected EClass eStaticClass() { - return model4Package.Literals.REF_MULTI_NON_CONTAINED_UNSETTABLE; + return model4Package.eINSTANCE.getRefMultiNonContainedUnsettable(); } /** @@ -94,9 +94,7 @@ public class RefMultiNonContainedUnsettableImpl extends EObjectImpl implements R public void unsetElements() { if (elements != null) - { ((InternalEList.Unsettable)elements).unset(); - } } /** diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefSingleContainedImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefSingleContainedImpl.java index 1eb2ca3356..398db98c2f 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefSingleContainedImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefSingleContainedImpl.java @@ -63,7 +63,7 @@ public class RefSingleContainedImpl extends EObjectImpl implements RefSingleCont @Override protected EClass eStaticClass() { - return model4Package.Literals.REF_SINGLE_CONTAINED; + return model4Package.eINSTANCE.getRefSingleContained(); } /** @@ -90,13 +90,9 @@ public class RefSingleContainedImpl extends EObjectImpl implements RefSingleCont ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, model4Package.REF_SINGLE_CONTAINED__ELEMENT, oldElement, newElement); if (msgs == null) - { msgs = notification; - } else - { msgs.add(notification); - } } return msgs; } @@ -112,26 +108,18 @@ public class RefSingleContainedImpl extends EObjectImpl implements RefSingleCont { NotificationChain msgs = null; if (element != null) - { msgs = ((InternalEObject)element).eInverseRemove(this, model4Package.SINGLE_CONTAINED_ELEMENT__PARENT, SingleContainedElement.class, msgs); - } if (newElement != null) - { msgs = ((InternalEObject)newElement).eInverseAdd(this, model4Package.SINGLE_CONTAINED_ELEMENT__PARENT, SingleContainedElement.class, msgs); - } msgs = basicSetElement(newElement, msgs); if (msgs != null) - { msgs.dispatch(); - } } else if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.SET, model4Package.REF_SINGLE_CONTAINED__ELEMENT, newElement, newElement)); - } } /** @@ -146,10 +134,8 @@ public class RefSingleContainedImpl extends EObjectImpl implements RefSingleCont { case model4Package.REF_SINGLE_CONTAINED__ELEMENT: if (element != null) - { msgs = ((InternalEObject)element).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - model4Package.REF_SINGLE_CONTAINED__ELEMENT, null, msgs); - } return basicSetElement((SingleContainedElement)otherEnd, msgs); } return super.eInverseAdd(otherEnd, featureID, msgs); diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefSingleContainedNPLImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefSingleContainedNPLImpl.java index 0758c723fd..4b21900c3d 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefSingleContainedNPLImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefSingleContainedNPLImpl.java @@ -63,7 +63,7 @@ public class RefSingleContainedNPLImpl extends EObjectImpl implements RefSingleC @Override protected EClass eStaticClass() { - return model4Package.Literals.REF_SINGLE_CONTAINED_NPL; + return model4Package.eINSTANCE.getRefSingleContainedNPL(); } /** @@ -90,13 +90,9 @@ public class RefSingleContainedNPLImpl extends EObjectImpl implements RefSingleC ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, model4Package.REF_SINGLE_CONTAINED_NPL__ELEMENT, oldElement, newElement); if (msgs == null) - { msgs = notification; - } else - { msgs.add(notification); - } } return msgs; } @@ -112,26 +108,18 @@ public class RefSingleContainedNPLImpl extends EObjectImpl implements RefSingleC { NotificationChain msgs = null; if (element != null) - { msgs = ((InternalEObject)element).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - model4Package.REF_SINGLE_CONTAINED_NPL__ELEMENT, null, msgs); - } if (newElement != null) - { msgs = ((InternalEObject)newElement).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - model4Package.REF_SINGLE_CONTAINED_NPL__ELEMENT, null, msgs); - } msgs = basicSetElement(newElement, msgs); if (msgs != null) - { msgs.dispatch(); - } } else if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.SET, model4Package.REF_SINGLE_CONTAINED_NPL__ELEMENT, newElement, newElement)); - } } /** diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefSingleNonContainedImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefSingleNonContainedImpl.java index 703f5054fb..efeab9e32d 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefSingleNonContainedImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefSingleNonContainedImpl.java @@ -63,7 +63,7 @@ public class RefSingleNonContainedImpl extends EObjectImpl implements RefSingleN @Override protected EClass eStaticClass() { - return model4Package.Literals.REF_SINGLE_NON_CONTAINED; + return model4Package.eINSTANCE.getRefSingleNonContained(); } /** @@ -80,10 +80,8 @@ public class RefSingleNonContainedImpl extends EObjectImpl implements RefSingleN if (element != oldElement) { if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.RESOLVE, model4Package.REF_SINGLE_NON_CONTAINED__ELEMENT, oldElement, element)); - } } } return element; @@ -113,13 +111,9 @@ public class RefSingleNonContainedImpl extends EObjectImpl implements RefSingleN ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, model4Package.REF_SINGLE_NON_CONTAINED__ELEMENT, oldElement, newElement); if (msgs == null) - { msgs = notification; - } else - { msgs.add(notification); - } } return msgs; } @@ -135,26 +129,18 @@ public class RefSingleNonContainedImpl extends EObjectImpl implements RefSingleN { NotificationChain msgs = null; if (element != null) - { msgs = ((InternalEObject)element).eInverseRemove(this, model4Package.SINGLE_NON_CONTAINED_ELEMENT__PARENT, SingleNonContainedElement.class, msgs); - } if (newElement != null) - { msgs = ((InternalEObject)newElement).eInverseAdd(this, model4Package.SINGLE_NON_CONTAINED_ELEMENT__PARENT, SingleNonContainedElement.class, msgs); - } msgs = basicSetElement(newElement, msgs); if (msgs != null) - { msgs.dispatch(); - } } else if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.SET, model4Package.REF_SINGLE_NON_CONTAINED__ELEMENT, newElement, newElement)); - } } /** @@ -169,10 +155,8 @@ public class RefSingleNonContainedImpl extends EObjectImpl implements RefSingleN { case model4Package.REF_SINGLE_NON_CONTAINED__ELEMENT: if (element != null) - { msgs = ((InternalEObject)element).eInverseRemove(this, model4Package.SINGLE_NON_CONTAINED_ELEMENT__PARENT, SingleNonContainedElement.class, msgs); - } return basicSetElement((SingleNonContainedElement)otherEnd, msgs); } return super.eInverseAdd(otherEnd, featureID, msgs); @@ -206,9 +190,7 @@ public class RefSingleNonContainedImpl extends EObjectImpl implements RefSingleN { case model4Package.REF_SINGLE_NON_CONTAINED__ELEMENT: if (resolve) - { return getElement(); - } return basicGetElement(); } return super.eGet(featureID, resolve, coreType); diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefSingleNonContainedNPLImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefSingleNonContainedNPLImpl.java index c7c5eb6bcb..487fd3372a 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefSingleNonContainedNPLImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/RefSingleNonContainedNPLImpl.java @@ -62,7 +62,7 @@ public class RefSingleNonContainedNPLImpl extends EObjectImpl implements RefSing @Override protected EClass eStaticClass() { - return model4Package.Literals.REF_SINGLE_NON_CONTAINED_NPL; + return model4Package.eINSTANCE.getRefSingleNonContainedNPL(); } /** @@ -79,10 +79,8 @@ public class RefSingleNonContainedNPLImpl extends EObjectImpl implements RefSing if (element != oldElement) { if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.RESOLVE, model4Package.REF_SINGLE_NON_CONTAINED_NPL__ELEMENT, oldElement, element)); - } } } return element; @@ -108,10 +106,8 @@ public class RefSingleNonContainedNPLImpl extends EObjectImpl implements RefSing ContainedElementNoOpposite oldElement = element; element = newElement; if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.SET, model4Package.REF_SINGLE_NON_CONTAINED_NPL__ELEMENT, oldElement, element)); - } } /** @@ -126,9 +122,7 @@ public class RefSingleNonContainedNPLImpl extends EObjectImpl implements RefSing { case model4Package.REF_SINGLE_NON_CONTAINED_NPL__ELEMENT: if (resolve) - { return getElement(); - } return basicGetElement(); } return super.eGet(featureID, resolve, coreType); diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/SingleContainedElementImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/SingleContainedElementImpl.java index e57059b6b6..b58bac4e8c 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/SingleContainedElementImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/SingleContainedElementImpl.java @@ -74,7 +74,7 @@ public class SingleContainedElementImpl extends EObjectImpl implements SingleCon @Override protected EClass eStaticClass() { - return model4Package.Literals.SINGLE_CONTAINED_ELEMENT; + return model4Package.eINSTANCE.getSingleContainedElement(); } /** @@ -97,9 +97,7 @@ public class SingleContainedElementImpl extends EObjectImpl implements SingleCon String oldName = name; name = newName; if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.SET, model4Package.SINGLE_CONTAINED_ELEMENT__NAME, oldName, name)); - } } /** @@ -110,9 +108,7 @@ public class SingleContainedElementImpl extends EObjectImpl implements SingleCon public RefSingleContained getParent() { if (eContainerFeatureID() != model4Package.SINGLE_CONTAINED_ELEMENT__PARENT) - { return null; - } return (RefSingleContained)eContainer(); } @@ -134,34 +130,24 @@ public class SingleContainedElementImpl extends EObjectImpl implements SingleCon */ public void setParent(RefSingleContained newParent) { - if (newParent != eInternalContainer() || eContainerFeatureID() != model4Package.SINGLE_CONTAINED_ELEMENT__PARENT - && newParent != null) + if (newParent != eInternalContainer() + || (eContainerFeatureID() != model4Package.SINGLE_CONTAINED_ELEMENT__PARENT && newParent != null)) { if (EcoreUtil.isAncestor(this, newParent)) - { throw new IllegalArgumentException("Recursive containment not allowed for " + toString()); - } NotificationChain msgs = null; if (eInternalContainer() != null) - { msgs = eBasicRemoveFromContainer(msgs); - } if (newParent != null) - { msgs = ((InternalEObject)newParent).eInverseAdd(this, model4Package.REF_SINGLE_CONTAINED__ELEMENT, RefSingleContained.class, msgs); - } msgs = basicSetParent(newParent, msgs); if (msgs != null) - { msgs.dispatch(); - } } else if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.SET, model4Package.SINGLE_CONTAINED_ELEMENT__PARENT, newParent, newParent)); - } } /** @@ -176,9 +162,7 @@ public class SingleContainedElementImpl extends EObjectImpl implements SingleCon { case model4Package.SINGLE_CONTAINED_ELEMENT__PARENT: if (eInternalContainer() != null) - { msgs = eBasicRemoveFromContainer(msgs); - } return basicSetParent((RefSingleContained)otherEnd, msgs); } return super.eInverseAdd(otherEnd, featureID, msgs); @@ -302,9 +286,7 @@ public class SingleContainedElementImpl extends EObjectImpl implements SingleCon public String toString() { if (eIsProxy()) - { return super.toString(); - } StringBuffer result = new StringBuffer(super.toString()); result.append(" (name: "); diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/SingleNonContainedElementImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/SingleNonContainedElementImpl.java index ff394c32f2..5f75085652 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/SingleNonContainedElementImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/SingleNonContainedElementImpl.java @@ -83,7 +83,7 @@ public class SingleNonContainedElementImpl extends EObjectImpl implements Single @Override protected EClass eStaticClass() { - return model4Package.Literals.SINGLE_NON_CONTAINED_ELEMENT; + return model4Package.eINSTANCE.getSingleNonContainedElement(); } /** @@ -106,10 +106,8 @@ public class SingleNonContainedElementImpl extends EObjectImpl implements Single String oldName = name; name = newName; if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.SET, model4Package.SINGLE_NON_CONTAINED_ELEMENT__NAME, oldName, name)); - } } /** @@ -126,10 +124,8 @@ public class SingleNonContainedElementImpl extends EObjectImpl implements Single if (parent != oldParent) { if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.RESOLVE, model4Package.SINGLE_NON_CONTAINED_ELEMENT__PARENT, oldParent, parent)); - } } } return parent; @@ -159,13 +155,9 @@ public class SingleNonContainedElementImpl extends EObjectImpl implements Single ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, model4Package.SINGLE_NON_CONTAINED_ELEMENT__PARENT, oldParent, newParent); if (msgs == null) - { msgs = notification; - } else - { msgs.add(notification); - } } return msgs; } @@ -181,26 +173,18 @@ public class SingleNonContainedElementImpl extends EObjectImpl implements Single { NotificationChain msgs = null; if (parent != null) - { msgs = ((InternalEObject)parent).eInverseRemove(this, model4Package.REF_SINGLE_NON_CONTAINED__ELEMENT, RefSingleNonContained.class, msgs); - } if (newParent != null) - { msgs = ((InternalEObject)newParent).eInverseAdd(this, model4Package.REF_SINGLE_NON_CONTAINED__ELEMENT, RefSingleNonContained.class, msgs); - } msgs = basicSetParent(newParent, msgs); if (msgs != null) - { msgs.dispatch(); - } } else if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.SET, model4Package.SINGLE_NON_CONTAINED_ELEMENT__PARENT, newParent, newParent)); - } } /** @@ -215,10 +199,8 @@ public class SingleNonContainedElementImpl extends EObjectImpl implements Single { case model4Package.SINGLE_NON_CONTAINED_ELEMENT__PARENT: if (parent != null) - { msgs = ((InternalEObject)parent).eInverseRemove(this, model4Package.REF_SINGLE_NON_CONTAINED__ELEMENT, RefSingleNonContained.class, msgs); - } return basicSetParent((RefSingleNonContained)otherEnd, msgs); } return super.eInverseAdd(otherEnd, featureID, msgs); @@ -254,9 +236,7 @@ public class SingleNonContainedElementImpl extends EObjectImpl implements Single return getName(); case model4Package.SINGLE_NON_CONTAINED_ELEMENT__PARENT: if (resolve) - { return getParent(); - } return basicGetParent(); } return super.eGet(featureID, resolve, coreType); @@ -329,9 +309,7 @@ public class SingleNonContainedElementImpl extends EObjectImpl implements Single public String toString() { if (eIsProxy()) - { return super.toString(); - } StringBuffer result = new StringBuffer(super.toString()); result.append(" (name: "); diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/StringToEObjectImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/StringToEObjectImpl.java index 420cceb552..735f674a5b 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/StringToEObjectImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/StringToEObjectImpl.java @@ -83,7 +83,7 @@ public class StringToEObjectImpl extends EObjectImpl implements BasicEMap.Entry< @Override protected EClass eStaticClass() { - return model4Package.Literals.STRING_TO_EOBJECT; + return model4Package.eINSTANCE.getStringToEObject(); } /** @@ -106,9 +106,7 @@ public class StringToEObjectImpl extends EObjectImpl implements BasicEMap.Entry< String oldKey = key; key = newKey; if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.SET, model4Package.STRING_TO_EOBJECT__KEY, oldKey, key)); - } } /** @@ -131,9 +129,7 @@ public class StringToEObjectImpl extends EObjectImpl implements BasicEMap.Entry< EObject oldValue = value; value = newValue; if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.SET, model4Package.STRING_TO_EOBJECT__VALUE, oldValue, value)); - } } /** @@ -221,9 +217,7 @@ public class StringToEObjectImpl extends EObjectImpl implements BasicEMap.Entry< public String toString() { if (eIsProxy()) - { return super.toString(); - } StringBuffer result = new StringBuffer(super.toString()); result.append(" (key: "); @@ -249,7 +243,7 @@ public class StringToEObjectImpl extends EObjectImpl implements BasicEMap.Entry< if (hash == -1) { Object theKey = getKey(); - hash = theKey == null ? 0 : theKey.hashCode(); + hash = (theKey == null ? 0 : theKey.hashCode()); } return hash; } diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/model4PackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/model4PackageImpl.java index 7613fe4f30..0422c182de 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/model4PackageImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/impl/model4PackageImpl.java @@ -348,9 +348,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package public static model4Package init() { if (isInited) - { return (model4Package)EPackage.Registry.INSTANCE.getEPackage(model4Package.eNS_URI); - } // Obtain or create and register package model4PackageImpl themodel4Package = (model4PackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof model4PackageImpl ? EPackage.Registry.INSTANCE @@ -1071,9 +1069,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package public void createPackageContents() { if (isCreated) - { return; - } isCreated = true; // Create classes and their features @@ -1196,9 +1192,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package public void initializePackageContents() { if (isInitialized) - { return; - } isInitialized = true; // Initialize package @@ -1236,23 +1230,25 @@ public class model4PackageImpl extends EPackageImpl implements model4Package // Initialize classes and features; add operations and parameters initEClass(refSingleContainedEClass, RefSingleContained.class, "RefSingleContained", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getRefSingleContained_Element(), getSingleContainedElement(), getSingleContainedElement_Parent(), - "element", null, 0, 1, RefSingleContained.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, - !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getRefSingleContained_Element(), this.getSingleContainedElement(), + this.getSingleContainedElement_Parent(), "element", null, 0, 1, RefSingleContained.class, !IS_TRANSIENT, + !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, + IS_ORDERED); initEClass(singleContainedElementEClass, SingleContainedElement.class, "SingleContainedElement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getSingleContainedElement_Name(), ecorePackage.getEString(), "name", null, 0, 1, SingleContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getSingleContainedElement_Parent(), getRefSingleContained(), getRefSingleContained_Element(), - "parent", null, 0, 1, SingleContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, - !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getSingleContainedElement_Parent(), this.getRefSingleContained(), + this.getRefSingleContained_Element(), "parent", null, 0, 1, SingleContainedElement.class, !IS_TRANSIENT, + !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, + IS_ORDERED); initEClass(refSingleNonContainedEClass, RefSingleNonContained.class, "RefSingleNonContained", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getRefSingleNonContained_Element(), getSingleNonContainedElement(), - getSingleNonContainedElement_Parent(), "element", null, 0, 1, RefSingleNonContained.class, !IS_TRANSIENT, + initEReference(getRefSingleNonContained_Element(), this.getSingleNonContainedElement(), + this.getSingleNonContainedElement_Parent(), "element", null, 0, 1, RefSingleNonContained.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); @@ -1261,30 +1257,32 @@ public class model4PackageImpl extends EPackageImpl implements model4Package initEAttribute(getSingleNonContainedElement_Name(), ecorePackage.getEString(), "name", null, 0, 1, SingleNonContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getSingleNonContainedElement_Parent(), getRefSingleNonContained(), - getRefSingleNonContained_Element(), "parent", null, 0, 1, SingleNonContainedElement.class, !IS_TRANSIENT, + initEReference(getSingleNonContainedElement_Parent(), this.getRefSingleNonContained(), + this.getRefSingleNonContained_Element(), "parent", null, 0, 1, SingleNonContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(refMultiContainedEClass, RefMultiContained.class, "RefMultiContained", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getRefMultiContained_Elements(), getMultiContainedElement(), getMultiContainedElement_Parent(), - "elements", null, 0, -1, RefMultiContained.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, - !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getRefMultiContained_Elements(), this.getMultiContainedElement(), + this.getMultiContainedElement_Parent(), "elements", null, 0, -1, RefMultiContained.class, !IS_TRANSIENT, + !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, + IS_ORDERED); initEClass(multiContainedElementEClass, MultiContainedElement.class, "MultiContainedElement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getMultiContainedElement_Name(), ecorePackage.getEString(), "name", null, 0, 1, MultiContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getMultiContainedElement_Parent(), getRefMultiContained(), getRefMultiContained_Elements(), - "parent", null, 0, 1, MultiContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, - !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getMultiContainedElement_Parent(), this.getRefMultiContained(), + this.getRefMultiContained_Elements(), "parent", null, 0, 1, MultiContainedElement.class, !IS_TRANSIENT, + !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, + IS_ORDERED); initEClass(refMultiNonContainedEClass, RefMultiNonContained.class, "RefMultiNonContained", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getRefMultiNonContained_Elements(), getMultiNonContainedElement(), - getMultiNonContainedElement_Parent(), "elements", null, 0, -1, RefMultiNonContained.class, !IS_TRANSIENT, + initEReference(getRefMultiNonContained_Elements(), this.getMultiNonContainedElement(), + this.getMultiNonContainedElement_Parent(), "elements", null, 0, -1, RefMultiNonContained.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); @@ -1293,49 +1291,50 @@ public class model4PackageImpl extends EPackageImpl implements model4Package initEAttribute(getMultiNonContainedElement_Name(), ecorePackage.getEString(), "name", null, 0, 1, MultiNonContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getMultiNonContainedElement_Parent(), getRefMultiNonContained(), getRefMultiNonContained_Elements(), - "parent", null, 0, 1, MultiNonContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, - !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getMultiNonContainedElement_Parent(), this.getRefMultiNonContained(), + this.getRefMultiNonContained_Elements(), "parent", null, 0, 1, MultiNonContainedElement.class, !IS_TRANSIENT, + !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, + IS_ORDERED); initEClass(refMultiNonContainedUnsettableEClass, RefMultiNonContainedUnsettable.class, "RefMultiNonContainedUnsettable", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getRefMultiNonContainedUnsettable_Elements(), getMultiNonContainedUnsettableElement(), - getMultiNonContainedUnsettableElement_Parent(), "elements", null, 0, -1, RefMultiNonContainedUnsettable.class, - !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, - !IS_DERIVED, IS_ORDERED); + initEReference(getRefMultiNonContainedUnsettable_Elements(), this.getMultiNonContainedUnsettableElement(), + this.getMultiNonContainedUnsettableElement_Parent(), "elements", null, 0, -1, + RefMultiNonContainedUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, + IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(multiNonContainedUnsettableElementEClass, MultiNonContainedUnsettableElement.class, "MultiNonContainedUnsettableElement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getMultiNonContainedUnsettableElement_Name(), ecorePackage.getEString(), "name", null, 0, 1, MultiNonContainedUnsettableElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getMultiNonContainedUnsettableElement_Parent(), getRefMultiNonContainedUnsettable(), - getRefMultiNonContainedUnsettable_Elements(), "parent", null, 0, 1, MultiNonContainedUnsettableElement.class, - !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, - !IS_DERIVED, IS_ORDERED); + initEReference(getMultiNonContainedUnsettableElement_Parent(), this.getRefMultiNonContainedUnsettable(), + this.getRefMultiNonContainedUnsettable_Elements(), "parent", null, 0, 1, + MultiNonContainedUnsettableElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, + IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(refSingleContainedNPLEClass, RefSingleContainedNPL.class, "RefSingleContainedNPL", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getRefSingleContainedNPL_Element(), getContainedElementNoOpposite(), null, "element", null, 0, 1, - RefSingleContainedNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, + initEReference(getRefSingleContainedNPL_Element(), this.getContainedElementNoOpposite(), null, "element", null, 0, + 1, RefSingleContainedNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(refSingleNonContainedNPLEClass, RefSingleNonContainedNPL.class, "RefSingleNonContainedNPL", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getRefSingleNonContainedNPL_Element(), getContainedElementNoOpposite(), null, "element", null, 0, 1, - RefSingleNonContainedNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, - !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getRefSingleNonContainedNPL_Element(), this.getContainedElementNoOpposite(), null, "element", null, + 0, 1, RefSingleNonContainedNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, + IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(refMultiContainedNPLEClass, RefMultiContainedNPL.class, "RefMultiContainedNPL", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getRefMultiContainedNPL_Elements(), getContainedElementNoOpposite(), null, "elements", null, 0, -1, - RefMultiContainedNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, + initEReference(getRefMultiContainedNPL_Elements(), this.getContainedElementNoOpposite(), null, "elements", null, 0, + -1, RefMultiContainedNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(refMultiNonContainedNPLEClass, RefMultiNonContainedNPL.class, "RefMultiNonContainedNPL", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getRefMultiNonContainedNPL_Elements(), getContainedElementNoOpposite(), null, "elements", null, 0, - -1, RefMultiNonContainedNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, + initEReference(getRefMultiNonContainedNPL_Elements(), this.getContainedElementNoOpposite(), null, "elements", null, + 0, -1, RefMultiNonContainedNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(containedElementNoOppositeEClass, ContainedElementNoOpposite.class, "ContainedElementNoOpposite", @@ -1427,7 +1426,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package initEClass(genRefMapNonContainedEClass, GenRefMapNonContained.class, "GenRefMapNonContained", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getGenRefMapNonContained_Elements(), getStringToEObject(), null, "elements", null, 0, -1, + initEReference(getGenRefMapNonContained_Elements(), this.getStringToEObject(), null, "elements", null, 0, -1, GenRefMapNonContained.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/model4Package.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/model4Package.java index b18d72cdeb..4ee38aebcb 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/model4Package.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/model4Package.java @@ -1841,645 +1841,4 @@ public interface model4Package extends org.eclipse.emf.cdo.tests.model4.model4Pa */ model4Factory getmodel4Factory(); - /** - * 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.emf.cdo.tests.legacy.model4.impl.RefSingleContainedImpl - * Ref Single Contained}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.RefSingleContainedImpl - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getRefSingleContained() - * @generated - */ - EClass REF_SINGLE_CONTAINED = eINSTANCE.getRefSingleContained(); - - /** - * The meta object literal for the 'Element' containment reference feature. - * - * - * @generated - */ - EReference REF_SINGLE_CONTAINED__ELEMENT = eINSTANCE.getRefSingleContained_Element(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.SingleContainedElementImpl - * Single Contained Element}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.SingleContainedElementImpl - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getSingleContainedElement() - * @generated - */ - EClass SINGLE_CONTAINED_ELEMENT = eINSTANCE.getSingleContainedElement(); - - /** - * The meta object literal for the 'Name' attribute feature. - * - * @generated - */ - EAttribute SINGLE_CONTAINED_ELEMENT__NAME = eINSTANCE.getSingleContainedElement_Name(); - - /** - * The meta object literal for the 'Parent' container reference feature. - * - * - * @generated - */ - EReference SINGLE_CONTAINED_ELEMENT__PARENT = eINSTANCE.getSingleContainedElement_Parent(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.RefSingleNonContainedImpl - * Ref Single Non Contained}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.RefSingleNonContainedImpl - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getRefSingleNonContained() - * @generated - */ - EClass REF_SINGLE_NON_CONTAINED = eINSTANCE.getRefSingleNonContained(); - - /** - * The meta object literal for the 'Element' reference feature. - * - * @generated - */ - EReference REF_SINGLE_NON_CONTAINED__ELEMENT = eINSTANCE.getRefSingleNonContained_Element(); - - /** - * The meta object literal for the ' - * {@link org.eclipse.emf.cdo.tests.legacy.model4.impl.SingleNonContainedElementImpl - * Single Non Contained Element}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.SingleNonContainedElementImpl - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getSingleNonContainedElement() - * @generated - */ - EClass SINGLE_NON_CONTAINED_ELEMENT = eINSTANCE.getSingleNonContainedElement(); - - /** - * The meta object literal for the 'Name' attribute feature. - * - * @generated - */ - EAttribute SINGLE_NON_CONTAINED_ELEMENT__NAME = eINSTANCE.getSingleNonContainedElement_Name(); - - /** - * The meta object literal for the 'Parent' reference feature. - * - * @generated - */ - EReference SINGLE_NON_CONTAINED_ELEMENT__PARENT = eINSTANCE.getSingleNonContainedElement_Parent(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.RefMultiContainedImpl - * Ref Multi Contained}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.RefMultiContainedImpl - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getRefMultiContained() - * @generated - */ - EClass REF_MULTI_CONTAINED = eINSTANCE.getRefMultiContained(); - - /** - * The meta object literal for the 'Elements' containment reference list feature. - * - * @generated - */ - EReference REF_MULTI_CONTAINED__ELEMENTS = eINSTANCE.getRefMultiContained_Elements(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.MultiContainedElementImpl - * Multi Contained Element}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.MultiContainedElementImpl - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getMultiContainedElement() - * @generated - */ - EClass MULTI_CONTAINED_ELEMENT = eINSTANCE.getMultiContainedElement(); - - /** - * The meta object literal for the 'Name' attribute feature. - * - * @generated - */ - EAttribute MULTI_CONTAINED_ELEMENT__NAME = eINSTANCE.getMultiContainedElement_Name(); - - /** - * The meta object literal for the 'Parent' container reference feature. - * - * - * @generated - */ - EReference MULTI_CONTAINED_ELEMENT__PARENT = eINSTANCE.getMultiContainedElement_Parent(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.RefMultiNonContainedImpl - * Ref Multi Non Contained}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.RefMultiNonContainedImpl - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getRefMultiNonContained() - * @generated - */ - EClass REF_MULTI_NON_CONTAINED = eINSTANCE.getRefMultiNonContained(); - - /** - * The meta object literal for the 'Elements' reference list feature. - * - * @generated - */ - EReference REF_MULTI_NON_CONTAINED__ELEMENTS = eINSTANCE.getRefMultiNonContained_Elements(); - - /** - * The meta object literal for the ' - * {@link org.eclipse.emf.cdo.tests.legacy.model4.impl.MultiNonContainedElementImpl - * Multi Non Contained Element}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.MultiNonContainedElementImpl - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getMultiNonContainedElement() - * @generated - */ - EClass MULTI_NON_CONTAINED_ELEMENT = eINSTANCE.getMultiNonContainedElement(); - - /** - * The meta object literal for the 'Name' attribute feature. - * - * @generated - */ - EAttribute MULTI_NON_CONTAINED_ELEMENT__NAME = eINSTANCE.getMultiNonContainedElement_Name(); - - /** - * The meta object literal for the 'Parent' reference feature. - * - * @generated - */ - EReference MULTI_NON_CONTAINED_ELEMENT__PARENT = eINSTANCE.getMultiNonContainedElement_Parent(); - - /** - * The meta object literal for the ' - * {@link org.eclipse.emf.cdo.tests.legacy.model4.impl.RefMultiNonContainedUnsettableImpl - * Ref Multi Non Contained Unsettable}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.RefMultiNonContainedUnsettableImpl - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getRefMultiNonContainedUnsettable() - * @generated - */ - EClass REF_MULTI_NON_CONTAINED_UNSETTABLE = eINSTANCE.getRefMultiNonContainedUnsettable(); - - /** - * The meta object literal for the 'Elements' reference list feature. - * - * @generated - */ - EReference REF_MULTI_NON_CONTAINED_UNSETTABLE__ELEMENTS = eINSTANCE.getRefMultiNonContainedUnsettable_Elements(); - - /** - * The meta object literal for the ' - * {@link org.eclipse.emf.cdo.tests.legacy.model4.impl.MultiNonContainedUnsettableElementImpl - * Multi Non Contained Unsettable Element}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.MultiNonContainedUnsettableElementImpl - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getMultiNonContainedUnsettableElement() - * @generated - */ - EClass MULTI_NON_CONTAINED_UNSETTABLE_ELEMENT = eINSTANCE.getMultiNonContainedUnsettableElement(); - - /** - * The meta object literal for the 'Name' attribute feature. - * - * @generated - */ - EAttribute MULTI_NON_CONTAINED_UNSETTABLE_ELEMENT__NAME = eINSTANCE.getMultiNonContainedUnsettableElement_Name(); - - /** - * The meta object literal for the 'Parent' reference feature. - * - * @generated - */ - EReference MULTI_NON_CONTAINED_UNSETTABLE_ELEMENT__PARENT = eINSTANCE - .getMultiNonContainedUnsettableElement_Parent(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.RefSingleContainedNPLImpl - * Ref Single Contained NPL}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.RefSingleContainedNPLImpl - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getRefSingleContainedNPL() - * @generated - */ - EClass REF_SINGLE_CONTAINED_NPL = eINSTANCE.getRefSingleContainedNPL(); - - /** - * The meta object literal for the 'Element' containment reference feature. - * - * - * @generated - */ - EReference REF_SINGLE_CONTAINED_NPL__ELEMENT = eINSTANCE.getRefSingleContainedNPL_Element(); - - /** - * The meta object literal for the ' - * {@link org.eclipse.emf.cdo.tests.legacy.model4.impl.RefSingleNonContainedNPLImpl - * Ref Single Non Contained NPL}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.RefSingleNonContainedNPLImpl - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getRefSingleNonContainedNPL() - * @generated - */ - EClass REF_SINGLE_NON_CONTAINED_NPL = eINSTANCE.getRefSingleNonContainedNPL(); - - /** - * The meta object literal for the 'Element' reference feature. - * - * @generated - */ - EReference REF_SINGLE_NON_CONTAINED_NPL__ELEMENT = eINSTANCE.getRefSingleNonContainedNPL_Element(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.RefMultiContainedNPLImpl - * Ref Multi Contained NPL}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.RefMultiContainedNPLImpl - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getRefMultiContainedNPL() - * @generated - */ - EClass REF_MULTI_CONTAINED_NPL = eINSTANCE.getRefMultiContainedNPL(); - - /** - * The meta object literal for the 'Elements' containment reference list feature. - * - * @generated - */ - EReference REF_MULTI_CONTAINED_NPL__ELEMENTS = eINSTANCE.getRefMultiContainedNPL_Elements(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.RefMultiNonContainedNPLImpl - * Ref Multi Non Contained NPL}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.RefMultiNonContainedNPLImpl - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getRefMultiNonContainedNPL() - * @generated - */ - EClass REF_MULTI_NON_CONTAINED_NPL = eINSTANCE.getRefMultiNonContainedNPL(); - - /** - * The meta object literal for the 'Elements' reference list feature. - * - * @generated - */ - EReference REF_MULTI_NON_CONTAINED_NPL__ELEMENTS = eINSTANCE.getRefMultiNonContainedNPL_Elements(); - - /** - * The meta object literal for the ' - * {@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ContainedElementNoOppositeImpl - * Contained Element No Opposite}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.ContainedElementNoOppositeImpl - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getContainedElementNoOpposite() - * @generated - */ - EClass CONTAINED_ELEMENT_NO_OPPOSITE = eINSTANCE.getContainedElementNoOpposite(); - - /** - * The meta object literal for the 'Name' attribute feature. - * - * @generated - */ - EAttribute CONTAINED_ELEMENT_NO_OPPOSITE__NAME = eINSTANCE.getContainedElementNoOpposite_Name(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.GenRefSingleContainedImpl - * Gen Ref Single Contained}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.GenRefSingleContainedImpl - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getGenRefSingleContained() - * @generated - */ - EClass GEN_REF_SINGLE_CONTAINED = eINSTANCE.getGenRefSingleContained(); - - /** - * The meta object literal for the 'Element' containment reference feature. - * - * - * @generated - */ - EReference GEN_REF_SINGLE_CONTAINED__ELEMENT = eINSTANCE.getGenRefSingleContained_Element(); - - /** - * The meta object literal for the ' - * {@link org.eclipse.emf.cdo.tests.legacy.model4.impl.GenRefSingleNonContainedImpl - * Gen Ref Single Non Contained}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.GenRefSingleNonContainedImpl - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getGenRefSingleNonContained() - * @generated - */ - EClass GEN_REF_SINGLE_NON_CONTAINED = eINSTANCE.getGenRefSingleNonContained(); - - /** - * The meta object literal for the 'Element' reference feature. - * - * @generated - */ - EReference GEN_REF_SINGLE_NON_CONTAINED__ELEMENT = eINSTANCE.getGenRefSingleNonContained_Element(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.GenRefMultiContainedImpl - * Gen Ref Multi Contained}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.GenRefMultiContainedImpl - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getGenRefMultiContained() - * @generated - */ - EClass GEN_REF_MULTI_CONTAINED = eINSTANCE.getGenRefMultiContained(); - - /** - * The meta object literal for the 'Elements' containment reference list feature. - * - * @generated - */ - EReference GEN_REF_MULTI_CONTAINED__ELEMENTS = eINSTANCE.getGenRefMultiContained_Elements(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.GenRefMultiNonContainedImpl - * Gen Ref Multi Non Contained}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.GenRefMultiNonContainedImpl - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getGenRefMultiNonContained() - * @generated - */ - EClass GEN_REF_MULTI_NON_CONTAINED = eINSTANCE.getGenRefMultiNonContained(); - - /** - * The meta object literal for the 'Elements' reference list feature. - * - * @generated - */ - EReference GEN_REF_MULTI_NON_CONTAINED__ELEMENTS = eINSTANCE.getGenRefMultiNonContained_Elements(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplSingleRefContainerImpl - * Impl Single Ref Container}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplSingleRefContainerImpl - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getImplSingleRefContainer() - * @generated - */ - EClass IMPL_SINGLE_REF_CONTAINER = eINSTANCE.getImplSingleRefContainer(); - - /** - * The meta object literal for the ' - * {@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplSingleRefContainedElementImpl - * Impl Single Ref Contained Element}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplSingleRefContainedElementImpl - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getImplSingleRefContainedElement() - * @generated - */ - EClass IMPL_SINGLE_REF_CONTAINED_ELEMENT = eINSTANCE.getImplSingleRefContainedElement(); - - /** - * The meta object literal for the 'Name' attribute feature. - * - * @generated - */ - EAttribute IMPL_SINGLE_REF_CONTAINED_ELEMENT__NAME = eINSTANCE.getImplSingleRefContainedElement_Name(); - - /** - * The meta object literal for the ' - * {@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplSingleRefNonContainerImpl - * Impl Single Ref Non Container}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplSingleRefNonContainerImpl - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getImplSingleRefNonContainer() - * @generated - */ - EClass IMPL_SINGLE_REF_NON_CONTAINER = eINSTANCE.getImplSingleRefNonContainer(); - - /** - * The meta object literal for the ' - * {@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplSingleRefNonContainedElementImpl - * Impl Single Ref Non Contained Element}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplSingleRefNonContainedElementImpl - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getImplSingleRefNonContainedElement() - * @generated - */ - EClass IMPL_SINGLE_REF_NON_CONTAINED_ELEMENT = eINSTANCE.getImplSingleRefNonContainedElement(); - - /** - * The meta object literal for the 'Name' attribute feature. - * - * @generated - */ - EAttribute IMPL_SINGLE_REF_NON_CONTAINED_ELEMENT__NAME = eINSTANCE.getImplSingleRefNonContainedElement_Name(); - - /** - * The meta object literal for the ' - * {@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplMultiRefNonContainerImpl - * Impl Multi Ref Non Container}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplMultiRefNonContainerImpl - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getImplMultiRefNonContainer() - * @generated - */ - EClass IMPL_MULTI_REF_NON_CONTAINER = eINSTANCE.getImplMultiRefNonContainer(); - - /** - * The meta object literal for the ' - * {@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplMultiRefNonContainedElementImpl - * Impl Multi Ref Non Contained Element}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplMultiRefNonContainedElementImpl - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getImplMultiRefNonContainedElement() - * @generated - */ - EClass IMPL_MULTI_REF_NON_CONTAINED_ELEMENT = eINSTANCE.getImplMultiRefNonContainedElement(); - - /** - * The meta object literal for the 'Name' attribute feature. - * - * @generated - */ - EAttribute IMPL_MULTI_REF_NON_CONTAINED_ELEMENT__NAME = eINSTANCE.getImplMultiRefNonContainedElement_Name(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplMultiRefContainerImpl - * Impl Multi Ref Container}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplMultiRefContainerImpl - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getImplMultiRefContainer() - * @generated - */ - EClass IMPL_MULTI_REF_CONTAINER = eINSTANCE.getImplMultiRefContainer(); - - /** - * The meta object literal for the ' - * {@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplMultiRefContainedElementImpl - * Impl Multi Ref Contained Element}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplMultiRefContainedElementImpl - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getImplMultiRefContainedElement() - * @generated - */ - EClass IMPL_MULTI_REF_CONTAINED_ELEMENT = eINSTANCE.getImplMultiRefContainedElement(); - - /** - * The meta object literal for the 'Name' attribute feature. - * - * @generated - */ - EAttribute IMPL_MULTI_REF_CONTAINED_ELEMENT__NAME = eINSTANCE.getImplMultiRefContainedElement_Name(); - - /** - * The meta object literal for the ' - * {@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplSingleRefContainerNPLImpl - * Impl Single Ref Container NPL}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplSingleRefContainerNPLImpl - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getImplSingleRefContainerNPL() - * @generated - */ - EClass IMPL_SINGLE_REF_CONTAINER_NPL = eINSTANCE.getImplSingleRefContainerNPL(); - - /** - * The meta object literal for the ' - * {@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplSingleRefNonContainerNPLImpl - * Impl Single Ref Non Container NPL}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplSingleRefNonContainerNPLImpl - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getImplSingleRefNonContainerNPL() - * @generated - */ - EClass IMPL_SINGLE_REF_NON_CONTAINER_NPL = eINSTANCE.getImplSingleRefNonContainerNPL(); - - /** - * The meta object literal for the ' - * {@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplMultiRefContainerNPLImpl - * Impl Multi Ref Container NPL}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplMultiRefContainerNPLImpl - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getImplMultiRefContainerNPL() - * @generated - */ - EClass IMPL_MULTI_REF_CONTAINER_NPL = eINSTANCE.getImplMultiRefContainerNPL(); - - /** - * The meta object literal for the ' - * {@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplMultiRefNonContainerNPLImpl - * Impl Multi Ref Non Container NPL}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplMultiRefNonContainerNPLImpl - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getImplMultiRefNonContainerNPL() - * @generated - */ - EClass IMPL_MULTI_REF_NON_CONTAINER_NPL = eINSTANCE.getImplMultiRefNonContainerNPL(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplContainedElementNPLImpl - * Impl Contained Element NPL}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.ImplContainedElementNPLImpl - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getImplContainedElementNPL() - * @generated - */ - EClass IMPL_CONTAINED_ELEMENT_NPL = eINSTANCE.getImplContainedElementNPL(); - - /** - * The meta object literal for the ' - * {@link org.eclipse.emf.cdo.tests.legacy.model4.impl.GenRefMultiNUNonContainedImpl - * Gen Ref Multi NU Non Contained}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.GenRefMultiNUNonContainedImpl - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getGenRefMultiNUNonContained() - * @generated - */ - EClass GEN_REF_MULTI_NU_NON_CONTAINED = eINSTANCE.getGenRefMultiNUNonContained(); - - /** - * The meta object literal for the 'Elements' reference list feature. - * - * @generated - */ - EReference GEN_REF_MULTI_NU_NON_CONTAINED__ELEMENTS = eINSTANCE.getGenRefMultiNUNonContained_Elements(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.GenRefMapNonContainedImpl - * Gen Ref Map Non Contained}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.GenRefMapNonContainedImpl - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getGenRefMapNonContained() - * @generated - */ - EClass GEN_REF_MAP_NON_CONTAINED = eINSTANCE.getGenRefMapNonContained(); - - /** - * The meta object literal for the 'Elements' map feature. - * - * @generated - */ - EReference GEN_REF_MAP_NON_CONTAINED__ELEMENTS = eINSTANCE.getGenRefMapNonContained_Elements(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4.impl.StringToEObjectImpl - * String To EObject}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.StringToEObjectImpl - * @see org.eclipse.emf.cdo.tests.legacy.model4.impl.model4PackageImpl#getStringToEObject() - * @generated - */ - EClass STRING_TO_EOBJECT = eINSTANCE.getStringToEObject(); - - /** - * The meta object literal for the 'Key' attribute feature. - * - * @generated - */ - EAttribute STRING_TO_EOBJECT__KEY = eINSTANCE.getStringToEObject_Key(); - - /** - * The meta object literal for the 'Value' reference feature. - * - * @generated - */ - EReference STRING_TO_EOBJECT__VALUE = eINSTANCE.getStringToEObject_Value(); - - } - } // model4Package diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/util/model4Switch.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/util/model4Switch.java index d373c3d2a9..e948bec1f1 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/util/model4Switch.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/util/model4Switch.java @@ -145,9 +145,7 @@ public class model4Switch RefSingleContained refSingleContained = (RefSingleContained)theEObject; T result = caseRefSingleContained(refSingleContained); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.SINGLE_CONTAINED_ELEMENT: @@ -155,9 +153,7 @@ public class model4Switch SingleContainedElement singleContainedElement = (SingleContainedElement)theEObject; T result = caseSingleContainedElement(singleContainedElement); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.REF_SINGLE_NON_CONTAINED: @@ -165,9 +161,7 @@ public class model4Switch RefSingleNonContained refSingleNonContained = (RefSingleNonContained)theEObject; T result = caseRefSingleNonContained(refSingleNonContained); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.SINGLE_NON_CONTAINED_ELEMENT: @@ -175,9 +169,7 @@ public class model4Switch SingleNonContainedElement singleNonContainedElement = (SingleNonContainedElement)theEObject; T result = caseSingleNonContainedElement(singleNonContainedElement); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.REF_MULTI_CONTAINED: @@ -185,9 +177,7 @@ public class model4Switch RefMultiContained refMultiContained = (RefMultiContained)theEObject; T result = caseRefMultiContained(refMultiContained); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.MULTI_CONTAINED_ELEMENT: @@ -195,9 +185,7 @@ public class model4Switch MultiContainedElement multiContainedElement = (MultiContainedElement)theEObject; T result = caseMultiContainedElement(multiContainedElement); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.REF_MULTI_NON_CONTAINED: @@ -205,9 +193,7 @@ public class model4Switch RefMultiNonContained refMultiNonContained = (RefMultiNonContained)theEObject; T result = caseRefMultiNonContained(refMultiNonContained); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.MULTI_NON_CONTAINED_ELEMENT: @@ -215,9 +201,7 @@ public class model4Switch MultiNonContainedElement multiNonContainedElement = (MultiNonContainedElement)theEObject; T result = caseMultiNonContainedElement(multiNonContainedElement); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.REF_MULTI_NON_CONTAINED_UNSETTABLE: @@ -225,9 +209,7 @@ public class model4Switch RefMultiNonContainedUnsettable refMultiNonContainedUnsettable = (RefMultiNonContainedUnsettable)theEObject; T result = caseRefMultiNonContainedUnsettable(refMultiNonContainedUnsettable); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.MULTI_NON_CONTAINED_UNSETTABLE_ELEMENT: @@ -235,9 +217,7 @@ public class model4Switch MultiNonContainedUnsettableElement multiNonContainedUnsettableElement = (MultiNonContainedUnsettableElement)theEObject; T result = caseMultiNonContainedUnsettableElement(multiNonContainedUnsettableElement); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.REF_SINGLE_CONTAINED_NPL: @@ -245,9 +225,7 @@ public class model4Switch RefSingleContainedNPL refSingleContainedNPL = (RefSingleContainedNPL)theEObject; T result = caseRefSingleContainedNPL(refSingleContainedNPL); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.REF_SINGLE_NON_CONTAINED_NPL: @@ -255,9 +233,7 @@ public class model4Switch RefSingleNonContainedNPL refSingleNonContainedNPL = (RefSingleNonContainedNPL)theEObject; T result = caseRefSingleNonContainedNPL(refSingleNonContainedNPL); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.REF_MULTI_CONTAINED_NPL: @@ -265,9 +241,7 @@ public class model4Switch RefMultiContainedNPL refMultiContainedNPL = (RefMultiContainedNPL)theEObject; T result = caseRefMultiContainedNPL(refMultiContainedNPL); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.REF_MULTI_NON_CONTAINED_NPL: @@ -275,9 +249,7 @@ public class model4Switch RefMultiNonContainedNPL refMultiNonContainedNPL = (RefMultiNonContainedNPL)theEObject; T result = caseRefMultiNonContainedNPL(refMultiNonContainedNPL); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.CONTAINED_ELEMENT_NO_OPPOSITE: @@ -285,9 +257,7 @@ public class model4Switch ContainedElementNoOpposite containedElementNoOpposite = (ContainedElementNoOpposite)theEObject; T result = caseContainedElementNoOpposite(containedElementNoOpposite); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.GEN_REF_SINGLE_CONTAINED: @@ -295,9 +265,7 @@ public class model4Switch GenRefSingleContained genRefSingleContained = (GenRefSingleContained)theEObject; T result = caseGenRefSingleContained(genRefSingleContained); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.GEN_REF_SINGLE_NON_CONTAINED: @@ -305,9 +273,7 @@ public class model4Switch GenRefSingleNonContained genRefSingleNonContained = (GenRefSingleNonContained)theEObject; T result = caseGenRefSingleNonContained(genRefSingleNonContained); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.GEN_REF_MULTI_CONTAINED: @@ -315,9 +281,7 @@ public class model4Switch GenRefMultiContained genRefMultiContained = (GenRefMultiContained)theEObject; T result = caseGenRefMultiContained(genRefMultiContained); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.GEN_REF_MULTI_NON_CONTAINED: @@ -325,9 +289,7 @@ public class model4Switch GenRefMultiNonContained genRefMultiNonContained = (GenRefMultiNonContained)theEObject; T result = caseGenRefMultiNonContained(genRefMultiNonContained); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.IMPL_SINGLE_REF_CONTAINER: @@ -335,13 +297,9 @@ public class model4Switch ImplSingleRefContainer implSingleRefContainer = (ImplSingleRefContainer)theEObject; T result = caseImplSingleRefContainer(implSingleRefContainer); if (result == null) - { result = caseISingleRefContainer(implSingleRefContainer); - } if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.IMPL_SINGLE_REF_CONTAINED_ELEMENT: @@ -349,13 +307,9 @@ public class model4Switch ImplSingleRefContainedElement implSingleRefContainedElement = (ImplSingleRefContainedElement)theEObject; T result = caseImplSingleRefContainedElement(implSingleRefContainedElement); if (result == null) - { result = caseISingleRefContainedElement(implSingleRefContainedElement); - } if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.IMPL_SINGLE_REF_NON_CONTAINER: @@ -363,13 +317,9 @@ public class model4Switch ImplSingleRefNonContainer implSingleRefNonContainer = (ImplSingleRefNonContainer)theEObject; T result = caseImplSingleRefNonContainer(implSingleRefNonContainer); if (result == null) - { result = caseISingleRefNonContainer(implSingleRefNonContainer); - } if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.IMPL_SINGLE_REF_NON_CONTAINED_ELEMENT: @@ -377,13 +327,9 @@ public class model4Switch ImplSingleRefNonContainedElement implSingleRefNonContainedElement = (ImplSingleRefNonContainedElement)theEObject; T result = caseImplSingleRefNonContainedElement(implSingleRefNonContainedElement); if (result == null) - { result = caseISingleRefNonContainedElement(implSingleRefNonContainedElement); - } if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.IMPL_MULTI_REF_NON_CONTAINER: @@ -391,13 +337,9 @@ public class model4Switch ImplMultiRefNonContainer implMultiRefNonContainer = (ImplMultiRefNonContainer)theEObject; T result = caseImplMultiRefNonContainer(implMultiRefNonContainer); if (result == null) - { result = caseIMultiRefNonContainer(implMultiRefNonContainer); - } if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.IMPL_MULTI_REF_NON_CONTAINED_ELEMENT: @@ -405,13 +347,9 @@ public class model4Switch ImplMultiRefNonContainedElement implMultiRefNonContainedElement = (ImplMultiRefNonContainedElement)theEObject; T result = caseImplMultiRefNonContainedElement(implMultiRefNonContainedElement); if (result == null) - { result = caseIMultiRefNonContainedElement(implMultiRefNonContainedElement); - } if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.IMPL_MULTI_REF_CONTAINER: @@ -419,13 +357,9 @@ public class model4Switch ImplMultiRefContainer implMultiRefContainer = (ImplMultiRefContainer)theEObject; T result = caseImplMultiRefContainer(implMultiRefContainer); if (result == null) - { result = caseIMultiRefContainer(implMultiRefContainer); - } if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.IMPL_MULTI_REF_CONTAINED_ELEMENT: @@ -433,13 +367,9 @@ public class model4Switch ImplMultiRefContainedElement implMultiRefContainedElement = (ImplMultiRefContainedElement)theEObject; T result = caseImplMultiRefContainedElement(implMultiRefContainedElement); if (result == null) - { result = caseIMultiRefContainedElement(implMultiRefContainedElement); - } if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.IMPL_SINGLE_REF_CONTAINER_NPL: @@ -447,13 +377,9 @@ public class model4Switch ImplSingleRefContainerNPL implSingleRefContainerNPL = (ImplSingleRefContainerNPL)theEObject; T result = caseImplSingleRefContainerNPL(implSingleRefContainerNPL); if (result == null) - { result = caseISingleRefContainerNPL(implSingleRefContainerNPL); - } if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.IMPL_SINGLE_REF_NON_CONTAINER_NPL: @@ -461,13 +387,9 @@ public class model4Switch ImplSingleRefNonContainerNPL implSingleRefNonContainerNPL = (ImplSingleRefNonContainerNPL)theEObject; T result = caseImplSingleRefNonContainerNPL(implSingleRefNonContainerNPL); if (result == null) - { result = caseISingleRefNonContainerNPL(implSingleRefNonContainerNPL); - } if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.IMPL_MULTI_REF_CONTAINER_NPL: @@ -475,13 +397,9 @@ public class model4Switch ImplMultiRefContainerNPL implMultiRefContainerNPL = (ImplMultiRefContainerNPL)theEObject; T result = caseImplMultiRefContainerNPL(implMultiRefContainerNPL); if (result == null) - { result = caseIMultiRefContainerNPL(implMultiRefContainerNPL); - } if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.IMPL_MULTI_REF_NON_CONTAINER_NPL: @@ -489,13 +407,9 @@ public class model4Switch ImplMultiRefNonContainerNPL implMultiRefNonContainerNPL = (ImplMultiRefNonContainerNPL)theEObject; T result = caseImplMultiRefNonContainerNPL(implMultiRefNonContainerNPL); if (result == null) - { result = caseIMultiRefNonContainerNPL(implMultiRefNonContainerNPL); - } if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.IMPL_CONTAINED_ELEMENT_NPL: @@ -503,17 +417,11 @@ public class model4Switch ImplContainedElementNPL implContainedElementNPL = (ImplContainedElementNPL)theEObject; T result = caseImplContainedElementNPL(implContainedElementNPL); if (result == null) - { result = caseIContainedElementNoParentLink(implContainedElementNPL); - } if (result == null) - { result = caseINamedElement(implContainedElementNPL); - } if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.GEN_REF_MULTI_NU_NON_CONTAINED: @@ -521,9 +429,7 @@ public class model4Switch GenRefMultiNUNonContained genRefMultiNUNonContained = (GenRefMultiNUNonContained)theEObject; T result = caseGenRefMultiNUNonContained(genRefMultiNUNonContained); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.GEN_REF_MAP_NON_CONTAINED: @@ -531,9 +437,7 @@ public class model4Switch GenRefMapNonContained genRefMapNonContained = (GenRefMapNonContained)theEObject; T result = caseGenRefMapNonContained(genRefMapNonContained); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.STRING_TO_EOBJECT: @@ -542,9 +446,7 @@ public class model4Switch Map.Entry stringToEObject = (Map.Entry)theEObject; T result = caseStringToEObject(stringToEObject); if (result == null) - { result = defaultCase(theEObject); - } return result; } default: diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ContainedElementNoOppositeImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ContainedElementNoOppositeImpl.java index 354a1f92c0..ff1d22ed3e 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ContainedElementNoOppositeImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ContainedElementNoOppositeImpl.java @@ -49,7 +49,7 @@ public class ContainedElementNoOppositeImpl extends CDOObjectImpl implements Con @Override protected EClass eStaticClass() { - return model4Package.Literals.CONTAINED_ELEMENT_NO_OPPOSITE; + return model4Package.eINSTANCE.getContainedElementNoOpposite(); } /** @@ -70,7 +70,7 @@ public class ContainedElementNoOppositeImpl extends CDOObjectImpl implements Con */ public String getName() { - return (String)eGet(model4Package.Literals.CONTAINED_ELEMENT_NO_OPPOSITE__NAME, true); + return (String)eGet(model4Package.eINSTANCE.getContainedElementNoOpposite_Name(), true); } /** @@ -80,7 +80,7 @@ public class ContainedElementNoOppositeImpl extends CDOObjectImpl implements Con */ public void setName(String newName) { - eSet(model4Package.Literals.CONTAINED_ELEMENT_NO_OPPOSITE__NAME, newName); + eSet(model4Package.eINSTANCE.getContainedElementNoOpposite_Name(), newName); } } // ContainedElementNoOppositeImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/GenRefMapNonContainedImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/GenRefMapNonContainedImpl.java index db370f0e25..dd994fbb2c 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/GenRefMapNonContainedImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/GenRefMapNonContainedImpl.java @@ -51,7 +51,7 @@ public class GenRefMapNonContainedImpl extends CDOObjectImpl implements GenRefMa @Override protected EClass eStaticClass() { - return model4Package.Literals.GEN_REF_MAP_NON_CONTAINED; + return model4Package.eINSTANCE.getGenRefMapNonContained(); } /** @@ -73,7 +73,7 @@ public class GenRefMapNonContainedImpl extends CDOObjectImpl implements GenRefMa @SuppressWarnings("unchecked") public EMap getElements() { - return (EMap)eGet(model4Package.Literals.GEN_REF_MAP_NON_CONTAINED__ELEMENTS, true); + return (EMap)eGet(model4Package.eINSTANCE.getGenRefMapNonContained_Elements(), true); } } // GenRefMapNonContainedImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/GenRefMultiContainedImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/GenRefMultiContainedImpl.java index 487391b417..8bcabccceb 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/GenRefMultiContainedImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/GenRefMultiContainedImpl.java @@ -51,7 +51,7 @@ public class GenRefMultiContainedImpl extends CDOObjectImpl implements GenRefMul @Override protected EClass eStaticClass() { - return model4Package.Literals.GEN_REF_MULTI_CONTAINED; + return model4Package.eINSTANCE.getGenRefMultiContained(); } /** @@ -73,7 +73,7 @@ public class GenRefMultiContainedImpl extends CDOObjectImpl implements GenRefMul @SuppressWarnings("unchecked") public EList getElements() { - return (EList)eGet(model4Package.Literals.GEN_REF_MULTI_CONTAINED__ELEMENTS, true); + return (EList)eGet(model4Package.eINSTANCE.getGenRefMultiContained_Elements(), true); } } // GenRefMultiContainedImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/GenRefMultiNUNonContainedImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/GenRefMultiNUNonContainedImpl.java index b25d0a1bbc..fdd8111553 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/GenRefMultiNUNonContainedImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/GenRefMultiNUNonContainedImpl.java @@ -51,7 +51,7 @@ public class GenRefMultiNUNonContainedImpl extends CDOObjectImpl implements GenR @Override protected EClass eStaticClass() { - return model4Package.Literals.GEN_REF_MULTI_NU_NON_CONTAINED; + return model4Package.eINSTANCE.getGenRefMultiNUNonContained(); } /** @@ -73,7 +73,7 @@ public class GenRefMultiNUNonContainedImpl extends CDOObjectImpl implements GenR @SuppressWarnings("unchecked") public EList getElements() { - return (EList)eGet(model4Package.Literals.GEN_REF_MULTI_NU_NON_CONTAINED__ELEMENTS, true); + return (EList)eGet(model4Package.eINSTANCE.getGenRefMultiNUNonContained_Elements(), true); } } // GenRefMultiNUNonContainedImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/GenRefMultiNonContainedImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/GenRefMultiNonContainedImpl.java index 738a26bdda..a531e6b1d8 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/GenRefMultiNonContainedImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/GenRefMultiNonContainedImpl.java @@ -51,7 +51,7 @@ public class GenRefMultiNonContainedImpl extends CDOObjectImpl implements GenRef @Override protected EClass eStaticClass() { - return model4Package.Literals.GEN_REF_MULTI_NON_CONTAINED; + return model4Package.eINSTANCE.getGenRefMultiNonContained(); } /** @@ -73,7 +73,7 @@ public class GenRefMultiNonContainedImpl extends CDOObjectImpl implements GenRef @SuppressWarnings("unchecked") public EList getElements() { - return (EList)eGet(model4Package.Literals.GEN_REF_MULTI_NON_CONTAINED__ELEMENTS, true); + return (EList)eGet(model4Package.eINSTANCE.getGenRefMultiNonContained_Elements(), true); } } // GenRefMultiNonContainedImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/GenRefSingleContainedImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/GenRefSingleContainedImpl.java index 2583152cd4..7a7e62f7eb 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/GenRefSingleContainedImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/GenRefSingleContainedImpl.java @@ -50,7 +50,7 @@ public class GenRefSingleContainedImpl extends CDOObjectImpl implements GenRefSi @Override protected EClass eStaticClass() { - return model4Package.Literals.GEN_REF_SINGLE_CONTAINED; + return model4Package.eINSTANCE.getGenRefSingleContained(); } /** @@ -71,7 +71,7 @@ public class GenRefSingleContainedImpl extends CDOObjectImpl implements GenRefSi */ public EObject getElement() { - return (EObject)eGet(model4Package.Literals.GEN_REF_SINGLE_CONTAINED__ELEMENT, true); + return (EObject)eGet(model4Package.eINSTANCE.getGenRefSingleContained_Element(), true); } /** @@ -81,7 +81,7 @@ public class GenRefSingleContainedImpl extends CDOObjectImpl implements GenRefSi */ public void setElement(EObject newElement) { - eSet(model4Package.Literals.GEN_REF_SINGLE_CONTAINED__ELEMENT, newElement); + eSet(model4Package.eINSTANCE.getGenRefSingleContained_Element(), newElement); } } // GenRefSingleContainedImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/GenRefSingleNonContainedImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/GenRefSingleNonContainedImpl.java index b1092bc346..7676a23a32 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/GenRefSingleNonContainedImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/GenRefSingleNonContainedImpl.java @@ -50,7 +50,7 @@ public class GenRefSingleNonContainedImpl extends CDOObjectImpl implements GenRe @Override protected EClass eStaticClass() { - return model4Package.Literals.GEN_REF_SINGLE_NON_CONTAINED; + return model4Package.eINSTANCE.getGenRefSingleNonContained(); } /** @@ -71,7 +71,7 @@ public class GenRefSingleNonContainedImpl extends CDOObjectImpl implements GenRe */ public EObject getElement() { - return (EObject)eGet(model4Package.Literals.GEN_REF_SINGLE_NON_CONTAINED__ELEMENT, true); + return (EObject)eGet(model4Package.eINSTANCE.getGenRefSingleNonContained_Element(), true); } /** @@ -81,7 +81,7 @@ public class GenRefSingleNonContainedImpl extends CDOObjectImpl implements GenRe */ public void setElement(EObject newElement) { - eSet(model4Package.Literals.GEN_REF_SINGLE_NON_CONTAINED__ELEMENT, newElement); + eSet(model4Package.eINSTANCE.getGenRefSingleNonContained_Element(), newElement); } } // GenRefSingleNonContainedImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplContainedElementNPLImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplContainedElementNPLImpl.java index 038196374b..4040ee3a3a 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplContainedElementNPLImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplContainedElementNPLImpl.java @@ -51,7 +51,7 @@ public class ImplContainedElementNPLImpl extends CDOObjectImpl implements ImplCo @Override protected EClass eStaticClass() { - return model4Package.Literals.IMPL_CONTAINED_ELEMENT_NPL; + return model4Package.eINSTANCE.getImplContainedElementNPL(); } /** @@ -72,7 +72,7 @@ public class ImplContainedElementNPLImpl extends CDOObjectImpl implements ImplCo */ public String getName() { - return (String)eGet(model4interfacesPackage.Literals.INAMED_ELEMENT__NAME, true); + return (String)eGet(model4interfacesPackage.eINSTANCE.getINamedElement_Name(), true); } /** @@ -82,7 +82,7 @@ public class ImplContainedElementNPLImpl extends CDOObjectImpl implements ImplCo */ public void setName(String newName) { - eSet(model4interfacesPackage.Literals.INAMED_ELEMENT__NAME, newName); + eSet(model4interfacesPackage.eINSTANCE.getINamedElement_Name(), newName); } /** diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplMultiRefContainedElementImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplMultiRefContainedElementImpl.java index f7e2d82bce..2c4258d98c 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplMultiRefContainedElementImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplMultiRefContainedElementImpl.java @@ -52,7 +52,7 @@ public class ImplMultiRefContainedElementImpl extends CDOObjectImpl implements I @Override protected EClass eStaticClass() { - return model4Package.Literals.IMPL_MULTI_REF_CONTAINED_ELEMENT; + return model4Package.eINSTANCE.getImplMultiRefContainedElement(); } /** @@ -73,7 +73,7 @@ public class ImplMultiRefContainedElementImpl extends CDOObjectImpl implements I */ public IMultiRefContainer getParent() { - return (IMultiRefContainer)eGet(model4interfacesPackage.Literals.IMULTI_REF_CONTAINED_ELEMENT__PARENT, true); + return (IMultiRefContainer)eGet(model4interfacesPackage.eINSTANCE.getIMultiRefContainedElement_Parent(), true); } /** @@ -83,7 +83,7 @@ public class ImplMultiRefContainedElementImpl extends CDOObjectImpl implements I */ public void setParent(IMultiRefContainer newParent) { - eSet(model4interfacesPackage.Literals.IMULTI_REF_CONTAINED_ELEMENT__PARENT, newParent); + eSet(model4interfacesPackage.eINSTANCE.getIMultiRefContainedElement_Parent(), newParent); } /** @@ -93,7 +93,7 @@ public class ImplMultiRefContainedElementImpl extends CDOObjectImpl implements I */ public String getName() { - return (String)eGet(model4Package.Literals.IMPL_MULTI_REF_CONTAINED_ELEMENT__NAME, true); + return (String)eGet(model4Package.eINSTANCE.getImplMultiRefContainedElement_Name(), true); } /** @@ -103,7 +103,7 @@ public class ImplMultiRefContainedElementImpl extends CDOObjectImpl implements I */ public void setName(String newName) { - eSet(model4Package.Literals.IMPL_MULTI_REF_CONTAINED_ELEMENT__NAME, newName); + eSet(model4Package.eINSTANCE.getImplMultiRefContainedElement_Name(), newName); } } // ImplMultiRefContainedElementImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplMultiRefContainerImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplMultiRefContainerImpl.java index b000e15772..466d58fce0 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplMultiRefContainerImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplMultiRefContainerImpl.java @@ -52,7 +52,7 @@ public class ImplMultiRefContainerImpl extends CDOObjectImpl implements ImplMult @Override protected EClass eStaticClass() { - return model4Package.Literals.IMPL_MULTI_REF_CONTAINER; + return model4Package.eINSTANCE.getImplMultiRefContainer(); } /** @@ -74,7 +74,8 @@ public class ImplMultiRefContainerImpl extends CDOObjectImpl implements ImplMult @SuppressWarnings("unchecked") public EList getElements() { - return (EList)eGet(model4interfacesPackage.Literals.IMULTI_REF_CONTAINER__ELEMENTS, true); + return (EList)eGet(model4interfacesPackage.eINSTANCE.getIMultiRefContainer_Elements(), + true); } } // ImplMultiRefContainerImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplMultiRefContainerNPLImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplMultiRefContainerNPLImpl.java index 8977bfd917..390c0e6d72 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplMultiRefContainerNPLImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplMultiRefContainerNPLImpl.java @@ -52,7 +52,7 @@ public class ImplMultiRefContainerNPLImpl extends CDOObjectImpl implements ImplM @Override protected EClass eStaticClass() { - return model4Package.Literals.IMPL_MULTI_REF_CONTAINER_NPL; + return model4Package.eINSTANCE.getImplMultiRefContainerNPL(); } /** @@ -75,7 +75,7 @@ public class ImplMultiRefContainerNPLImpl extends CDOObjectImpl implements ImplM public EList getElements() { return (EList)eGet( - model4interfacesPackage.Literals.IMULTI_REF_CONTAINER_NPL__ELEMENTS, true); + model4interfacesPackage.eINSTANCE.getIMultiRefContainerNPL_Elements(), true); } } // ImplMultiRefContainerNPLImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplMultiRefNonContainedElementImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplMultiRefNonContainedElementImpl.java index 0422c834b7..3017fedb77 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplMultiRefNonContainedElementImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplMultiRefNonContainedElementImpl.java @@ -52,7 +52,7 @@ public class ImplMultiRefNonContainedElementImpl extends CDOObjectImpl implement @Override protected EClass eStaticClass() { - return model4Package.Literals.IMPL_MULTI_REF_NON_CONTAINED_ELEMENT; + return model4Package.eINSTANCE.getImplMultiRefNonContainedElement(); } /** @@ -73,7 +73,7 @@ public class ImplMultiRefNonContainedElementImpl extends CDOObjectImpl implement */ public IMultiRefNonContainer getParent() { - return (IMultiRefNonContainer)eGet(model4interfacesPackage.Literals.IMULTI_REF_NON_CONTAINED_ELEMENT__PARENT, true); + return (IMultiRefNonContainer)eGet(model4interfacesPackage.eINSTANCE.getIMultiRefNonContainedElement_Parent(), true); } /** @@ -83,7 +83,7 @@ public class ImplMultiRefNonContainedElementImpl extends CDOObjectImpl implement */ public void setParent(IMultiRefNonContainer newParent) { - eSet(model4interfacesPackage.Literals.IMULTI_REF_NON_CONTAINED_ELEMENT__PARENT, newParent); + eSet(model4interfacesPackage.eINSTANCE.getIMultiRefNonContainedElement_Parent(), newParent); } /** @@ -93,7 +93,7 @@ public class ImplMultiRefNonContainedElementImpl extends CDOObjectImpl implement */ public String getName() { - return (String)eGet(model4Package.Literals.IMPL_MULTI_REF_NON_CONTAINED_ELEMENT__NAME, true); + return (String)eGet(model4Package.eINSTANCE.getImplMultiRefNonContainedElement_Name(), true); } /** @@ -103,7 +103,7 @@ public class ImplMultiRefNonContainedElementImpl extends CDOObjectImpl implement */ public void setName(String newName) { - eSet(model4Package.Literals.IMPL_MULTI_REF_NON_CONTAINED_ELEMENT__NAME, newName); + eSet(model4Package.eINSTANCE.getImplMultiRefNonContainedElement_Name(), newName); } } // ImplMultiRefNonContainedElementImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplMultiRefNonContainerImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplMultiRefNonContainerImpl.java index 125e0efa96..ea48661736 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplMultiRefNonContainerImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplMultiRefNonContainerImpl.java @@ -52,7 +52,7 @@ public class ImplMultiRefNonContainerImpl extends CDOObjectImpl implements ImplM @Override protected EClass eStaticClass() { - return model4Package.Literals.IMPL_MULTI_REF_NON_CONTAINER; + return model4Package.eINSTANCE.getImplMultiRefNonContainer(); } /** @@ -75,7 +75,7 @@ public class ImplMultiRefNonContainerImpl extends CDOObjectImpl implements ImplM public EList getElements() { return (EList)eGet( - model4interfacesPackage.Literals.IMULTI_REF_NON_CONTAINER__ELEMENTS, true); + model4interfacesPackage.eINSTANCE.getIMultiRefNonContainer_Elements(), true); } } // ImplMultiRefNonContainerImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplMultiRefNonContainerNPLImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplMultiRefNonContainerNPLImpl.java index dad723532b..6479ac5427 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplMultiRefNonContainerNPLImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplMultiRefNonContainerNPLImpl.java @@ -52,7 +52,7 @@ public class ImplMultiRefNonContainerNPLImpl extends CDOObjectImpl implements Im @Override protected EClass eStaticClass() { - return model4Package.Literals.IMPL_MULTI_REF_NON_CONTAINER_NPL; + return model4Package.eINSTANCE.getImplMultiRefNonContainerNPL(); } /** @@ -75,7 +75,7 @@ public class ImplMultiRefNonContainerNPLImpl extends CDOObjectImpl implements Im public EList getElements() { return (EList)eGet( - model4interfacesPackage.Literals.IMULTI_REF_NON_CONTAINER_NPL__ELEMENTS, true); + model4interfacesPackage.eINSTANCE.getIMultiRefNonContainerNPL_Elements(), true); } } // ImplMultiRefNonContainerNPLImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplSingleRefContainedElementImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplSingleRefContainedElementImpl.java index ffc2169656..eed9bd715f 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplSingleRefContainedElementImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplSingleRefContainedElementImpl.java @@ -52,7 +52,7 @@ public class ImplSingleRefContainedElementImpl extends CDOObjectImpl implements @Override protected EClass eStaticClass() { - return model4Package.Literals.IMPL_SINGLE_REF_CONTAINED_ELEMENT; + return model4Package.eINSTANCE.getImplSingleRefContainedElement(); } /** @@ -73,7 +73,7 @@ public class ImplSingleRefContainedElementImpl extends CDOObjectImpl implements */ public ISingleRefContainer getParent() { - return (ISingleRefContainer)eGet(model4interfacesPackage.Literals.ISINGLE_REF_CONTAINED_ELEMENT__PARENT, true); + return (ISingleRefContainer)eGet(model4interfacesPackage.eINSTANCE.getISingleRefContainedElement_Parent(), true); } /** @@ -83,7 +83,7 @@ public class ImplSingleRefContainedElementImpl extends CDOObjectImpl implements */ public void setParent(ISingleRefContainer newParent) { - eSet(model4interfacesPackage.Literals.ISINGLE_REF_CONTAINED_ELEMENT__PARENT, newParent); + eSet(model4interfacesPackage.eINSTANCE.getISingleRefContainedElement_Parent(), newParent); } /** @@ -93,7 +93,7 @@ public class ImplSingleRefContainedElementImpl extends CDOObjectImpl implements */ public String getName() { - return (String)eGet(model4Package.Literals.IMPL_SINGLE_REF_CONTAINED_ELEMENT__NAME, true); + return (String)eGet(model4Package.eINSTANCE.getImplSingleRefContainedElement_Name(), true); } /** @@ -103,7 +103,7 @@ public class ImplSingleRefContainedElementImpl extends CDOObjectImpl implements */ public void setName(String newName) { - eSet(model4Package.Literals.IMPL_SINGLE_REF_CONTAINED_ELEMENT__NAME, newName); + eSet(model4Package.eINSTANCE.getImplSingleRefContainedElement_Name(), newName); } } // ImplSingleRefContainedElementImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplSingleRefContainerImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplSingleRefContainerImpl.java index 7d44aaed05..ca71ed8b06 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplSingleRefContainerImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplSingleRefContainerImpl.java @@ -51,7 +51,7 @@ public class ImplSingleRefContainerImpl extends CDOObjectImpl implements ImplSin @Override protected EClass eStaticClass() { - return model4Package.Literals.IMPL_SINGLE_REF_CONTAINER; + return model4Package.eINSTANCE.getImplSingleRefContainer(); } /** @@ -72,7 +72,7 @@ public class ImplSingleRefContainerImpl extends CDOObjectImpl implements ImplSin */ public ISingleRefContainedElement getElement() { - return (ISingleRefContainedElement)eGet(model4interfacesPackage.Literals.ISINGLE_REF_CONTAINER__ELEMENT, true); + return (ISingleRefContainedElement)eGet(model4interfacesPackage.eINSTANCE.getISingleRefContainer_Element(), true); } /** @@ -82,7 +82,7 @@ public class ImplSingleRefContainerImpl extends CDOObjectImpl implements ImplSin */ public void setElement(ISingleRefContainedElement newElement) { - eSet(model4interfacesPackage.Literals.ISINGLE_REF_CONTAINER__ELEMENT, newElement); + eSet(model4interfacesPackage.eINSTANCE.getISingleRefContainer_Element(), newElement); } } // ImplSingleRefContainerImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplSingleRefContainerNPLImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplSingleRefContainerNPLImpl.java index 61bd4da3af..ee66bc982f 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplSingleRefContainerNPLImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplSingleRefContainerNPLImpl.java @@ -51,7 +51,7 @@ public class ImplSingleRefContainerNPLImpl extends CDOObjectImpl implements Impl @Override protected EClass eStaticClass() { - return model4Package.Literals.IMPL_SINGLE_REF_CONTAINER_NPL; + return model4Package.eINSTANCE.getImplSingleRefContainerNPL(); } /** @@ -72,7 +72,7 @@ public class ImplSingleRefContainerNPLImpl extends CDOObjectImpl implements Impl */ public IContainedElementNoParentLink getElement() { - return (IContainedElementNoParentLink)eGet(model4interfacesPackage.Literals.ISINGLE_REF_CONTAINER_NPL__ELEMENT, + return (IContainedElementNoParentLink)eGet(model4interfacesPackage.eINSTANCE.getISingleRefContainerNPL_Element(), true); } @@ -83,7 +83,7 @@ public class ImplSingleRefContainerNPLImpl extends CDOObjectImpl implements Impl */ public void setElement(IContainedElementNoParentLink newElement) { - eSet(model4interfacesPackage.Literals.ISINGLE_REF_CONTAINER_NPL__ELEMENT, newElement); + eSet(model4interfacesPackage.eINSTANCE.getISingleRefContainerNPL_Element(), newElement); } } // ImplSingleRefContainerNPLImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplSingleRefNonContainedElementImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplSingleRefNonContainedElementImpl.java index ace1ace171..0dd174a535 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplSingleRefNonContainedElementImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplSingleRefNonContainedElementImpl.java @@ -52,7 +52,7 @@ public class ImplSingleRefNonContainedElementImpl extends CDOObjectImpl implemen @Override protected EClass eStaticClass() { - return model4Package.Literals.IMPL_SINGLE_REF_NON_CONTAINED_ELEMENT; + return model4Package.eINSTANCE.getImplSingleRefNonContainedElement(); } /** @@ -73,7 +73,7 @@ public class ImplSingleRefNonContainedElementImpl extends CDOObjectImpl implemen */ public ISingleRefNonContainer getParent() { - return (ISingleRefNonContainer)eGet(model4interfacesPackage.Literals.ISINGLE_REF_NON_CONTAINED_ELEMENT__PARENT, + return (ISingleRefNonContainer)eGet(model4interfacesPackage.eINSTANCE.getISingleRefNonContainedElement_Parent(), true); } @@ -84,7 +84,7 @@ public class ImplSingleRefNonContainedElementImpl extends CDOObjectImpl implemen */ public void setParent(ISingleRefNonContainer newParent) { - eSet(model4interfacesPackage.Literals.ISINGLE_REF_NON_CONTAINED_ELEMENT__PARENT, newParent); + eSet(model4interfacesPackage.eINSTANCE.getISingleRefNonContainedElement_Parent(), newParent); } /** @@ -94,7 +94,7 @@ public class ImplSingleRefNonContainedElementImpl extends CDOObjectImpl implemen */ public String getName() { - return (String)eGet(model4Package.Literals.IMPL_SINGLE_REF_NON_CONTAINED_ELEMENT__NAME, true); + return (String)eGet(model4Package.eINSTANCE.getImplSingleRefNonContainedElement_Name(), true); } /** @@ -104,7 +104,7 @@ public class ImplSingleRefNonContainedElementImpl extends CDOObjectImpl implemen */ public void setName(String newName) { - eSet(model4Package.Literals.IMPL_SINGLE_REF_NON_CONTAINED_ELEMENT__NAME, newName); + eSet(model4Package.eINSTANCE.getImplSingleRefNonContainedElement_Name(), newName); } } // ImplSingleRefNonContainedElementImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplSingleRefNonContainerImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplSingleRefNonContainerImpl.java index 331c9a73e2..f7e7bf2e68 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplSingleRefNonContainerImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplSingleRefNonContainerImpl.java @@ -51,7 +51,7 @@ public class ImplSingleRefNonContainerImpl extends CDOObjectImpl implements Impl @Override protected EClass eStaticClass() { - return model4Package.Literals.IMPL_SINGLE_REF_NON_CONTAINER; + return model4Package.eINSTANCE.getImplSingleRefNonContainer(); } /** @@ -72,7 +72,7 @@ public class ImplSingleRefNonContainerImpl extends CDOObjectImpl implements Impl */ public ISingleRefNonContainedElement getElement() { - return (ISingleRefNonContainedElement)eGet(model4interfacesPackage.Literals.ISINGLE_REF_NON_CONTAINER__ELEMENT, + return (ISingleRefNonContainedElement)eGet(model4interfacesPackage.eINSTANCE.getISingleRefNonContainer_Element(), true); } @@ -83,7 +83,7 @@ public class ImplSingleRefNonContainerImpl extends CDOObjectImpl implements Impl */ public void setElement(ISingleRefNonContainedElement newElement) { - eSet(model4interfacesPackage.Literals.ISINGLE_REF_NON_CONTAINER__ELEMENT, newElement); + eSet(model4interfacesPackage.eINSTANCE.getISingleRefNonContainer_Element(), newElement); } } // ImplSingleRefNonContainerImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplSingleRefNonContainerNPLImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplSingleRefNonContainerNPLImpl.java index 7b93571a6d..48e987e46d 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplSingleRefNonContainerNPLImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/ImplSingleRefNonContainerNPLImpl.java @@ -51,7 +51,7 @@ public class ImplSingleRefNonContainerNPLImpl extends CDOObjectImpl implements I @Override protected EClass eStaticClass() { - return model4Package.Literals.IMPL_SINGLE_REF_NON_CONTAINER_NPL; + return model4Package.eINSTANCE.getImplSingleRefNonContainerNPL(); } /** @@ -72,8 +72,8 @@ public class ImplSingleRefNonContainerNPLImpl extends CDOObjectImpl implements I */ public IContainedElementNoParentLink getElement() { - return (IContainedElementNoParentLink)eGet(model4interfacesPackage.Literals.ISINGLE_REF_NON_CONTAINER_NPL__ELEMENT, - true); + return (IContainedElementNoParentLink)eGet( + model4interfacesPackage.eINSTANCE.getISingleRefNonContainerNPL_Element(), true); } /** @@ -83,7 +83,7 @@ public class ImplSingleRefNonContainerNPLImpl extends CDOObjectImpl implements I */ public void setElement(IContainedElementNoParentLink newElement) { - eSet(model4interfacesPackage.Literals.ISINGLE_REF_NON_CONTAINER_NPL__ELEMENT, newElement); + eSet(model4interfacesPackage.eINSTANCE.getISingleRefNonContainerNPL_Element(), newElement); } } // ImplSingleRefNonContainerNPLImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/MultiContainedElementImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/MultiContainedElementImpl.java index 9fd3a47d9f..58bc9413c6 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/MultiContainedElementImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/MultiContainedElementImpl.java @@ -51,7 +51,7 @@ public class MultiContainedElementImpl extends CDOObjectImpl implements MultiCon @Override protected EClass eStaticClass() { - return model4Package.Literals.MULTI_CONTAINED_ELEMENT; + return model4Package.eINSTANCE.getMultiContainedElement(); } /** @@ -72,7 +72,7 @@ public class MultiContainedElementImpl extends CDOObjectImpl implements MultiCon */ public String getName() { - return (String)eGet(model4Package.Literals.MULTI_CONTAINED_ELEMENT__NAME, true); + return (String)eGet(model4Package.eINSTANCE.getMultiContainedElement_Name(), true); } /** @@ -82,7 +82,7 @@ public class MultiContainedElementImpl extends CDOObjectImpl implements MultiCon */ public void setName(String newName) { - eSet(model4Package.Literals.MULTI_CONTAINED_ELEMENT__NAME, newName); + eSet(model4Package.eINSTANCE.getMultiContainedElement_Name(), newName); } /** @@ -92,7 +92,7 @@ public class MultiContainedElementImpl extends CDOObjectImpl implements MultiCon */ public RefMultiContained getParent() { - return (RefMultiContained)eGet(model4Package.Literals.MULTI_CONTAINED_ELEMENT__PARENT, true); + return (RefMultiContained)eGet(model4Package.eINSTANCE.getMultiContainedElement_Parent(), true); } /** @@ -102,7 +102,7 @@ public class MultiContainedElementImpl extends CDOObjectImpl implements MultiCon */ public void setParent(RefMultiContained newParent) { - eSet(model4Package.Literals.MULTI_CONTAINED_ELEMENT__PARENT, newParent); + eSet(model4Package.eINSTANCE.getMultiContainedElement_Parent(), newParent); } } // MultiContainedElementImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/MultiNonContainedElementImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/MultiNonContainedElementImpl.java index 08779f919b..ab7e3a5506 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/MultiNonContainedElementImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/MultiNonContainedElementImpl.java @@ -51,7 +51,7 @@ public class MultiNonContainedElementImpl extends CDOObjectImpl implements Multi @Override protected EClass eStaticClass() { - return model4Package.Literals.MULTI_NON_CONTAINED_ELEMENT; + return model4Package.eINSTANCE.getMultiNonContainedElement(); } /** @@ -72,7 +72,7 @@ public class MultiNonContainedElementImpl extends CDOObjectImpl implements Multi */ public String getName() { - return (String)eGet(model4Package.Literals.MULTI_NON_CONTAINED_ELEMENT__NAME, true); + return (String)eGet(model4Package.eINSTANCE.getMultiNonContainedElement_Name(), true); } /** @@ -82,7 +82,7 @@ public class MultiNonContainedElementImpl extends CDOObjectImpl implements Multi */ public void setName(String newName) { - eSet(model4Package.Literals.MULTI_NON_CONTAINED_ELEMENT__NAME, newName); + eSet(model4Package.eINSTANCE.getMultiNonContainedElement_Name(), newName); } /** @@ -92,7 +92,7 @@ public class MultiNonContainedElementImpl extends CDOObjectImpl implements Multi */ public RefMultiNonContained getParent() { - return (RefMultiNonContained)eGet(model4Package.Literals.MULTI_NON_CONTAINED_ELEMENT__PARENT, true); + return (RefMultiNonContained)eGet(model4Package.eINSTANCE.getMultiNonContainedElement_Parent(), true); } /** @@ -102,7 +102,7 @@ public class MultiNonContainedElementImpl extends CDOObjectImpl implements Multi */ public void setParent(RefMultiNonContained newParent) { - eSet(model4Package.Literals.MULTI_NON_CONTAINED_ELEMENT__PARENT, newParent); + eSet(model4Package.eINSTANCE.getMultiNonContainedElement_Parent(), newParent); } } // MultiNonContainedElementImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/MultiNonContainedUnsettableElementImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/MultiNonContainedUnsettableElementImpl.java index be53df6498..841854c211 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/MultiNonContainedUnsettableElementImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/MultiNonContainedUnsettableElementImpl.java @@ -51,7 +51,7 @@ public class MultiNonContainedUnsettableElementImpl extends CDOObjectImpl implem @Override protected EClass eStaticClass() { - return model4Package.Literals.MULTI_NON_CONTAINED_UNSETTABLE_ELEMENT; + return model4Package.eINSTANCE.getMultiNonContainedUnsettableElement(); } /** @@ -72,7 +72,7 @@ public class MultiNonContainedUnsettableElementImpl extends CDOObjectImpl implem */ public String getName() { - return (String)eGet(model4Package.Literals.MULTI_NON_CONTAINED_UNSETTABLE_ELEMENT__NAME, true); + return (String)eGet(model4Package.eINSTANCE.getMultiNonContainedUnsettableElement_Name(), true); } /** @@ -82,7 +82,7 @@ public class MultiNonContainedUnsettableElementImpl extends CDOObjectImpl implem */ public void setName(String newName) { - eSet(model4Package.Literals.MULTI_NON_CONTAINED_UNSETTABLE_ELEMENT__NAME, newName); + eSet(model4Package.eINSTANCE.getMultiNonContainedUnsettableElement_Name(), newName); } /** @@ -92,7 +92,7 @@ public class MultiNonContainedUnsettableElementImpl extends CDOObjectImpl implem */ public RefMultiNonContainedUnsettable getParent() { - return (RefMultiNonContainedUnsettable)eGet(model4Package.Literals.MULTI_NON_CONTAINED_UNSETTABLE_ELEMENT__PARENT, + return (RefMultiNonContainedUnsettable)eGet(model4Package.eINSTANCE.getMultiNonContainedUnsettableElement_Parent(), true); } @@ -103,7 +103,7 @@ public class MultiNonContainedUnsettableElementImpl extends CDOObjectImpl implem */ public void setParent(RefMultiNonContainedUnsettable newParent) { - eSet(model4Package.Literals.MULTI_NON_CONTAINED_UNSETTABLE_ELEMENT__PARENT, newParent); + eSet(model4Package.eINSTANCE.getMultiNonContainedUnsettableElement_Parent(), newParent); } /** @@ -113,7 +113,7 @@ public class MultiNonContainedUnsettableElementImpl extends CDOObjectImpl implem */ public void unsetParent() { - eUnset(model4Package.Literals.MULTI_NON_CONTAINED_UNSETTABLE_ELEMENT__PARENT); + eUnset(model4Package.eINSTANCE.getMultiNonContainedUnsettableElement_Parent()); } /** @@ -123,7 +123,7 @@ public class MultiNonContainedUnsettableElementImpl extends CDOObjectImpl implem */ public boolean isSetParent() { - return eIsSet(model4Package.Literals.MULTI_NON_CONTAINED_UNSETTABLE_ELEMENT__PARENT); + return eIsSet(model4Package.eINSTANCE.getMultiNonContainedUnsettableElement_Parent()); } } // MultiNonContainedUnsettableElementImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefMultiContainedImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefMultiContainedImpl.java index b91ca2f0ef..db1bfcd9db 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefMultiContainedImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefMultiContainedImpl.java @@ -51,7 +51,7 @@ public class RefMultiContainedImpl extends CDOObjectImpl implements RefMultiCont @Override protected EClass eStaticClass() { - return model4Package.Literals.REF_MULTI_CONTAINED; + return model4Package.eINSTANCE.getRefMultiContained(); } /** @@ -73,7 +73,7 @@ public class RefMultiContainedImpl extends CDOObjectImpl implements RefMultiCont @SuppressWarnings("unchecked") public EList getElements() { - return (EList)eGet(model4Package.Literals.REF_MULTI_CONTAINED__ELEMENTS, true); + return (EList)eGet(model4Package.eINSTANCE.getRefMultiContained_Elements(), true); } } // RefMultiContainedImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefMultiContainedNPLImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefMultiContainedNPLImpl.java index b80134dc6a..7f22e355c5 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefMultiContainedNPLImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefMultiContainedNPLImpl.java @@ -51,7 +51,7 @@ public class RefMultiContainedNPLImpl extends CDOObjectImpl implements RefMultiC @Override protected EClass eStaticClass() { - return model4Package.Literals.REF_MULTI_CONTAINED_NPL; + return model4Package.eINSTANCE.getRefMultiContainedNPL(); } /** @@ -73,7 +73,7 @@ public class RefMultiContainedNPLImpl extends CDOObjectImpl implements RefMultiC @SuppressWarnings("unchecked") public EList getElements() { - return (EList)eGet(model4Package.Literals.REF_MULTI_CONTAINED_NPL__ELEMENTS, true); + return (EList)eGet(model4Package.eINSTANCE.getRefMultiContainedNPL_Elements(), true); } } // RefMultiContainedNPLImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefMultiNonContainedImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefMultiNonContainedImpl.java index 75832a1339..3605fdf084 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefMultiNonContainedImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefMultiNonContainedImpl.java @@ -51,7 +51,7 @@ public class RefMultiNonContainedImpl extends CDOObjectImpl implements RefMultiN @Override protected EClass eStaticClass() { - return model4Package.Literals.REF_MULTI_NON_CONTAINED; + return model4Package.eINSTANCE.getRefMultiNonContained(); } /** @@ -73,7 +73,7 @@ public class RefMultiNonContainedImpl extends CDOObjectImpl implements RefMultiN @SuppressWarnings("unchecked") public EList getElements() { - return (EList)eGet(model4Package.Literals.REF_MULTI_NON_CONTAINED__ELEMENTS, true); + return (EList)eGet(model4Package.eINSTANCE.getRefMultiNonContained_Elements(), true); } } // RefMultiNonContainedImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefMultiNonContainedNPLImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefMultiNonContainedNPLImpl.java index d753f25561..db52e44aaa 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefMultiNonContainedNPLImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefMultiNonContainedNPLImpl.java @@ -51,7 +51,7 @@ public class RefMultiNonContainedNPLImpl extends CDOObjectImpl implements RefMul @Override protected EClass eStaticClass() { - return model4Package.Literals.REF_MULTI_NON_CONTAINED_NPL; + return model4Package.eINSTANCE.getRefMultiNonContainedNPL(); } /** @@ -73,7 +73,7 @@ public class RefMultiNonContainedNPLImpl extends CDOObjectImpl implements RefMul @SuppressWarnings("unchecked") public EList getElements() { - return (EList)eGet(model4Package.Literals.REF_MULTI_NON_CONTAINED_NPL__ELEMENTS, true); + return (EList)eGet(model4Package.eINSTANCE.getRefMultiNonContainedNPL_Elements(), true); } } // RefMultiNonContainedNPLImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefMultiNonContainedUnsettableImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefMultiNonContainedUnsettableImpl.java index 0bed3adb72..a5f364aaab 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefMultiNonContainedUnsettableImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefMultiNonContainedUnsettableImpl.java @@ -51,7 +51,7 @@ public class RefMultiNonContainedUnsettableImpl extends CDOObjectImpl implements @Override protected EClass eStaticClass() { - return model4Package.Literals.REF_MULTI_NON_CONTAINED_UNSETTABLE; + return model4Package.eINSTANCE.getRefMultiNonContainedUnsettable(); } /** @@ -74,7 +74,7 @@ public class RefMultiNonContainedUnsettableImpl extends CDOObjectImpl implements public EList getElements() { return (EList)eGet( - model4Package.Literals.REF_MULTI_NON_CONTAINED_UNSETTABLE__ELEMENTS, true); + model4Package.eINSTANCE.getRefMultiNonContainedUnsettable_Elements(), true); } /** @@ -84,7 +84,7 @@ public class RefMultiNonContainedUnsettableImpl extends CDOObjectImpl implements */ public void unsetElements() { - eUnset(model4Package.Literals.REF_MULTI_NON_CONTAINED_UNSETTABLE__ELEMENTS); + eUnset(model4Package.eINSTANCE.getRefMultiNonContainedUnsettable_Elements()); } /** @@ -94,7 +94,7 @@ public class RefMultiNonContainedUnsettableImpl extends CDOObjectImpl implements */ public boolean isSetElements() { - return eIsSet(model4Package.Literals.REF_MULTI_NON_CONTAINED_UNSETTABLE__ELEMENTS); + return eIsSet(model4Package.eINSTANCE.getRefMultiNonContainedUnsettable_Elements()); } } // RefMultiNonContainedUnsettableImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefSingleContainedImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefSingleContainedImpl.java index f8e6de3b9a..a0cfd9f2a5 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefSingleContainedImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefSingleContainedImpl.java @@ -50,7 +50,7 @@ public class RefSingleContainedImpl extends CDOObjectImpl implements RefSingleCo @Override protected EClass eStaticClass() { - return model4Package.Literals.REF_SINGLE_CONTAINED; + return model4Package.eINSTANCE.getRefSingleContained(); } /** @@ -71,7 +71,7 @@ public class RefSingleContainedImpl extends CDOObjectImpl implements RefSingleCo */ public SingleContainedElement getElement() { - return (SingleContainedElement)eGet(model4Package.Literals.REF_SINGLE_CONTAINED__ELEMENT, true); + return (SingleContainedElement)eGet(model4Package.eINSTANCE.getRefSingleContained_Element(), true); } /** @@ -81,7 +81,7 @@ public class RefSingleContainedImpl extends CDOObjectImpl implements RefSingleCo */ public void setElement(SingleContainedElement newElement) { - eSet(model4Package.Literals.REF_SINGLE_CONTAINED__ELEMENT, newElement); + eSet(model4Package.eINSTANCE.getRefSingleContained_Element(), newElement); } } // RefSingleContainedImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefSingleContainedNPLImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefSingleContainedNPLImpl.java index a7f904c105..a80ff8d726 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefSingleContainedNPLImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefSingleContainedNPLImpl.java @@ -50,7 +50,7 @@ public class RefSingleContainedNPLImpl extends CDOObjectImpl implements RefSingl @Override protected EClass eStaticClass() { - return model4Package.Literals.REF_SINGLE_CONTAINED_NPL; + return model4Package.eINSTANCE.getRefSingleContainedNPL(); } /** @@ -71,7 +71,7 @@ public class RefSingleContainedNPLImpl extends CDOObjectImpl implements RefSingl */ public ContainedElementNoOpposite getElement() { - return (ContainedElementNoOpposite)eGet(model4Package.Literals.REF_SINGLE_CONTAINED_NPL__ELEMENT, true); + return (ContainedElementNoOpposite)eGet(model4Package.eINSTANCE.getRefSingleContainedNPL_Element(), true); } /** @@ -81,7 +81,7 @@ public class RefSingleContainedNPLImpl extends CDOObjectImpl implements RefSingl */ public void setElement(ContainedElementNoOpposite newElement) { - eSet(model4Package.Literals.REF_SINGLE_CONTAINED_NPL__ELEMENT, newElement); + eSet(model4Package.eINSTANCE.getRefSingleContainedNPL_Element(), newElement); } } // RefSingleContainedNPLImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefSingleNonContainedImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefSingleNonContainedImpl.java index e7429ca272..08b62bc044 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefSingleNonContainedImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefSingleNonContainedImpl.java @@ -50,7 +50,7 @@ public class RefSingleNonContainedImpl extends CDOObjectImpl implements RefSingl @Override protected EClass eStaticClass() { - return model4Package.Literals.REF_SINGLE_NON_CONTAINED; + return model4Package.eINSTANCE.getRefSingleNonContained(); } /** @@ -71,7 +71,7 @@ public class RefSingleNonContainedImpl extends CDOObjectImpl implements RefSingl */ public SingleNonContainedElement getElement() { - return (SingleNonContainedElement)eGet(model4Package.Literals.REF_SINGLE_NON_CONTAINED__ELEMENT, true); + return (SingleNonContainedElement)eGet(model4Package.eINSTANCE.getRefSingleNonContained_Element(), true); } /** @@ -81,7 +81,7 @@ public class RefSingleNonContainedImpl extends CDOObjectImpl implements RefSingl */ public void setElement(SingleNonContainedElement newElement) { - eSet(model4Package.Literals.REF_SINGLE_NON_CONTAINED__ELEMENT, newElement); + eSet(model4Package.eINSTANCE.getRefSingleNonContained_Element(), newElement); } } // RefSingleNonContainedImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefSingleNonContainedNPLImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefSingleNonContainedNPLImpl.java index d3da32c0c3..59bdd90706 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefSingleNonContainedNPLImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/RefSingleNonContainedNPLImpl.java @@ -50,7 +50,7 @@ public class RefSingleNonContainedNPLImpl extends CDOObjectImpl implements RefSi @Override protected EClass eStaticClass() { - return model4Package.Literals.REF_SINGLE_NON_CONTAINED_NPL; + return model4Package.eINSTANCE.getRefSingleNonContainedNPL(); } /** @@ -71,7 +71,7 @@ public class RefSingleNonContainedNPLImpl extends CDOObjectImpl implements RefSi */ public ContainedElementNoOpposite getElement() { - return (ContainedElementNoOpposite)eGet(model4Package.Literals.REF_SINGLE_NON_CONTAINED_NPL__ELEMENT, true); + return (ContainedElementNoOpposite)eGet(model4Package.eINSTANCE.getRefSingleNonContainedNPL_Element(), true); } /** @@ -81,7 +81,7 @@ public class RefSingleNonContainedNPLImpl extends CDOObjectImpl implements RefSi */ public void setElement(ContainedElementNoOpposite newElement) { - eSet(model4Package.Literals.REF_SINGLE_NON_CONTAINED_NPL__ELEMENT, newElement); + eSet(model4Package.eINSTANCE.getRefSingleNonContainedNPL_Element(), newElement); } } // RefSingleNonContainedNPLImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/SingleContainedElementImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/SingleContainedElementImpl.java index fe9ae7ddaf..9b3b27b895 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/SingleContainedElementImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/SingleContainedElementImpl.java @@ -51,7 +51,7 @@ public class SingleContainedElementImpl extends CDOObjectImpl implements SingleC @Override protected EClass eStaticClass() { - return model4Package.Literals.SINGLE_CONTAINED_ELEMENT; + return model4Package.eINSTANCE.getSingleContainedElement(); } /** @@ -72,7 +72,7 @@ public class SingleContainedElementImpl extends CDOObjectImpl implements SingleC */ public String getName() { - return (String)eGet(model4Package.Literals.SINGLE_CONTAINED_ELEMENT__NAME, true); + return (String)eGet(model4Package.eINSTANCE.getSingleContainedElement_Name(), true); } /** @@ -82,7 +82,7 @@ public class SingleContainedElementImpl extends CDOObjectImpl implements SingleC */ public void setName(String newName) { - eSet(model4Package.Literals.SINGLE_CONTAINED_ELEMENT__NAME, newName); + eSet(model4Package.eINSTANCE.getSingleContainedElement_Name(), newName); } /** @@ -92,7 +92,7 @@ public class SingleContainedElementImpl extends CDOObjectImpl implements SingleC */ public RefSingleContained getParent() { - return (RefSingleContained)eGet(model4Package.Literals.SINGLE_CONTAINED_ELEMENT__PARENT, true); + return (RefSingleContained)eGet(model4Package.eINSTANCE.getSingleContainedElement_Parent(), true); } /** @@ -102,7 +102,7 @@ public class SingleContainedElementImpl extends CDOObjectImpl implements SingleC */ public void setParent(RefSingleContained newParent) { - eSet(model4Package.Literals.SINGLE_CONTAINED_ELEMENT__PARENT, newParent); + eSet(model4Package.eINSTANCE.getSingleContainedElement_Parent(), newParent); } } // SingleContainedElementImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/SingleNonContainedElementImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/SingleNonContainedElementImpl.java index a36c0dd3ab..c1600ee589 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/SingleNonContainedElementImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/SingleNonContainedElementImpl.java @@ -51,7 +51,7 @@ public class SingleNonContainedElementImpl extends CDOObjectImpl implements Sing @Override protected EClass eStaticClass() { - return model4Package.Literals.SINGLE_NON_CONTAINED_ELEMENT; + return model4Package.eINSTANCE.getSingleNonContainedElement(); } /** @@ -72,7 +72,7 @@ public class SingleNonContainedElementImpl extends CDOObjectImpl implements Sing */ public String getName() { - return (String)eGet(model4Package.Literals.SINGLE_NON_CONTAINED_ELEMENT__NAME, true); + return (String)eGet(model4Package.eINSTANCE.getSingleNonContainedElement_Name(), true); } /** @@ -82,7 +82,7 @@ public class SingleNonContainedElementImpl extends CDOObjectImpl implements Sing */ public void setName(String newName) { - eSet(model4Package.Literals.SINGLE_NON_CONTAINED_ELEMENT__NAME, newName); + eSet(model4Package.eINSTANCE.getSingleNonContainedElement_Name(), newName); } /** @@ -92,7 +92,7 @@ public class SingleNonContainedElementImpl extends CDOObjectImpl implements Sing */ public RefSingleNonContained getParent() { - return (RefSingleNonContained)eGet(model4Package.Literals.SINGLE_NON_CONTAINED_ELEMENT__PARENT, true); + return (RefSingleNonContained)eGet(model4Package.eINSTANCE.getSingleNonContainedElement_Parent(), true); } /** @@ -102,7 +102,7 @@ public class SingleNonContainedElementImpl extends CDOObjectImpl implements Sing */ public void setParent(RefSingleNonContained newParent) { - eSet(model4Package.Literals.SINGLE_NON_CONTAINED_ELEMENT__PARENT, newParent); + eSet(model4Package.eINSTANCE.getSingleNonContainedElement_Parent(), newParent); } } // SingleNonContainedElementImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/StringToEObjectImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/StringToEObjectImpl.java index 63fd3a1a3e..fdb8bb007f 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/StringToEObjectImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/StringToEObjectImpl.java @@ -52,7 +52,7 @@ public class StringToEObjectImpl extends CDOObjectImpl implements BasicEMap.Entr @Override protected EClass eStaticClass() { - return model4Package.Literals.STRING_TO_EOBJECT; + return model4Package.eINSTANCE.getStringToEObject(); } /** @@ -73,7 +73,7 @@ public class StringToEObjectImpl extends CDOObjectImpl implements BasicEMap.Entr */ public String getTypedKey() { - return (String)eGet(model4Package.Literals.STRING_TO_EOBJECT__KEY, true); + return (String)eGet(model4Package.eINSTANCE.getStringToEObject_Key(), true); } /** @@ -83,7 +83,7 @@ public class StringToEObjectImpl extends CDOObjectImpl implements BasicEMap.Entr */ public void setTypedKey(String newKey) { - eSet(model4Package.Literals.STRING_TO_EOBJECT__KEY, newKey); + eSet(model4Package.eINSTANCE.getStringToEObject_Key(), newKey); } /** @@ -93,7 +93,7 @@ public class StringToEObjectImpl extends CDOObjectImpl implements BasicEMap.Entr */ public EObject getTypedValue() { - return (EObject)eGet(model4Package.Literals.STRING_TO_EOBJECT__VALUE, true); + return (EObject)eGet(model4Package.eINSTANCE.getStringToEObject_Value(), true); } /** @@ -103,7 +103,7 @@ public class StringToEObjectImpl extends CDOObjectImpl implements BasicEMap.Entr */ public void setTypedValue(EObject newValue) { - eSet(model4Package.Literals.STRING_TO_EOBJECT__VALUE, newValue); + eSet(model4Package.eINSTANCE.getStringToEObject_Value(), newValue); } /** @@ -123,7 +123,7 @@ public class StringToEObjectImpl extends CDOObjectImpl implements BasicEMap.Entr if (hash == -1) { Object theKey = getKey(); - hash = theKey == null ? 0 : theKey.hashCode(); + hash = (theKey == null ? 0 : theKey.hashCode()); } return hash; } diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/model4PackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/model4PackageImpl.java index 4a5623f122..7059bd177b 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/model4PackageImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/model4PackageImpl.java @@ -348,9 +348,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package public static model4Package init() { if (isInited) - { return (model4Package)EPackage.Registry.INSTANCE.getEPackage(model4Package.eNS_URI); - } // Obtain or create and register package model4PackageImpl themodel4Package = (model4PackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof model4PackageImpl ? EPackage.Registry.INSTANCE @@ -1071,9 +1069,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package public void createPackageContents() { if (isCreated) - { return; - } isCreated = true; // Create classes and their features @@ -1196,9 +1192,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package public void initializePackageContents() { if (isInitialized) - { return; - } isInitialized = true; // Initialize package @@ -1236,23 +1230,25 @@ public class model4PackageImpl extends EPackageImpl implements model4Package // Initialize classes and features; add operations and parameters initEClass(refSingleContainedEClass, RefSingleContained.class, "RefSingleContained", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getRefSingleContained_Element(), getSingleContainedElement(), getSingleContainedElement_Parent(), - "element", null, 0, 1, RefSingleContained.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, - !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getRefSingleContained_Element(), this.getSingleContainedElement(), + this.getSingleContainedElement_Parent(), "element", null, 0, 1, RefSingleContained.class, !IS_TRANSIENT, + !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, + IS_ORDERED); initEClass(singleContainedElementEClass, SingleContainedElement.class, "SingleContainedElement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getSingleContainedElement_Name(), ecorePackage.getEString(), "name", null, 0, 1, SingleContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getSingleContainedElement_Parent(), getRefSingleContained(), getRefSingleContained_Element(), - "parent", null, 0, 1, SingleContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, - !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getSingleContainedElement_Parent(), this.getRefSingleContained(), + this.getRefSingleContained_Element(), "parent", null, 0, 1, SingleContainedElement.class, !IS_TRANSIENT, + !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, + IS_ORDERED); initEClass(refSingleNonContainedEClass, RefSingleNonContained.class, "RefSingleNonContained", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getRefSingleNonContained_Element(), getSingleNonContainedElement(), - getSingleNonContainedElement_Parent(), "element", null, 0, 1, RefSingleNonContained.class, !IS_TRANSIENT, + initEReference(getRefSingleNonContained_Element(), this.getSingleNonContainedElement(), + this.getSingleNonContainedElement_Parent(), "element", null, 0, 1, RefSingleNonContained.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); @@ -1261,30 +1257,32 @@ public class model4PackageImpl extends EPackageImpl implements model4Package initEAttribute(getSingleNonContainedElement_Name(), ecorePackage.getEString(), "name", null, 0, 1, SingleNonContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getSingleNonContainedElement_Parent(), getRefSingleNonContained(), - getRefSingleNonContained_Element(), "parent", null, 0, 1, SingleNonContainedElement.class, !IS_TRANSIENT, + initEReference(getSingleNonContainedElement_Parent(), this.getRefSingleNonContained(), + this.getRefSingleNonContained_Element(), "parent", null, 0, 1, SingleNonContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(refMultiContainedEClass, RefMultiContained.class, "RefMultiContained", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getRefMultiContained_Elements(), getMultiContainedElement(), getMultiContainedElement_Parent(), - "elements", null, 0, -1, RefMultiContained.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, - !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getRefMultiContained_Elements(), this.getMultiContainedElement(), + this.getMultiContainedElement_Parent(), "elements", null, 0, -1, RefMultiContained.class, !IS_TRANSIENT, + !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, + IS_ORDERED); initEClass(multiContainedElementEClass, MultiContainedElement.class, "MultiContainedElement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getMultiContainedElement_Name(), ecorePackage.getEString(), "name", null, 0, 1, MultiContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getMultiContainedElement_Parent(), getRefMultiContained(), getRefMultiContained_Elements(), - "parent", null, 0, 1, MultiContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, - !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getMultiContainedElement_Parent(), this.getRefMultiContained(), + this.getRefMultiContained_Elements(), "parent", null, 0, 1, MultiContainedElement.class, !IS_TRANSIENT, + !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, + IS_ORDERED); initEClass(refMultiNonContainedEClass, RefMultiNonContained.class, "RefMultiNonContained", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getRefMultiNonContained_Elements(), getMultiNonContainedElement(), - getMultiNonContainedElement_Parent(), "elements", null, 0, -1, RefMultiNonContained.class, !IS_TRANSIENT, + initEReference(getRefMultiNonContained_Elements(), this.getMultiNonContainedElement(), + this.getMultiNonContainedElement_Parent(), "elements", null, 0, -1, RefMultiNonContained.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); @@ -1293,49 +1291,50 @@ public class model4PackageImpl extends EPackageImpl implements model4Package initEAttribute(getMultiNonContainedElement_Name(), ecorePackage.getEString(), "name", null, 0, 1, MultiNonContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getMultiNonContainedElement_Parent(), getRefMultiNonContained(), getRefMultiNonContained_Elements(), - "parent", null, 0, 1, MultiNonContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, - !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getMultiNonContainedElement_Parent(), this.getRefMultiNonContained(), + this.getRefMultiNonContained_Elements(), "parent", null, 0, 1, MultiNonContainedElement.class, !IS_TRANSIENT, + !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, + IS_ORDERED); initEClass(refMultiNonContainedUnsettableEClass, RefMultiNonContainedUnsettable.class, "RefMultiNonContainedUnsettable", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getRefMultiNonContainedUnsettable_Elements(), getMultiNonContainedUnsettableElement(), - getMultiNonContainedUnsettableElement_Parent(), "elements", null, 0, -1, RefMultiNonContainedUnsettable.class, - !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, - !IS_DERIVED, IS_ORDERED); + initEReference(getRefMultiNonContainedUnsettable_Elements(), this.getMultiNonContainedUnsettableElement(), + this.getMultiNonContainedUnsettableElement_Parent(), "elements", null, 0, -1, + RefMultiNonContainedUnsettable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, + IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(multiNonContainedUnsettableElementEClass, MultiNonContainedUnsettableElement.class, "MultiNonContainedUnsettableElement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getMultiNonContainedUnsettableElement_Name(), ecorePackage.getEString(), "name", null, 0, 1, MultiNonContainedUnsettableElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getMultiNonContainedUnsettableElement_Parent(), getRefMultiNonContainedUnsettable(), - getRefMultiNonContainedUnsettable_Elements(), "parent", null, 0, 1, MultiNonContainedUnsettableElement.class, - !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, - !IS_DERIVED, IS_ORDERED); + initEReference(getMultiNonContainedUnsettableElement_Parent(), this.getRefMultiNonContainedUnsettable(), + this.getRefMultiNonContainedUnsettable_Elements(), "parent", null, 0, 1, + MultiNonContainedUnsettableElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, + IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(refSingleContainedNPLEClass, RefSingleContainedNPL.class, "RefSingleContainedNPL", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getRefSingleContainedNPL_Element(), getContainedElementNoOpposite(), null, "element", null, 0, 1, - RefSingleContainedNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, + initEReference(getRefSingleContainedNPL_Element(), this.getContainedElementNoOpposite(), null, "element", null, 0, + 1, RefSingleContainedNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(refSingleNonContainedNPLEClass, RefSingleNonContainedNPL.class, "RefSingleNonContainedNPL", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getRefSingleNonContainedNPL_Element(), getContainedElementNoOpposite(), null, "element", null, 0, 1, - RefSingleNonContainedNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, - !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getRefSingleNonContainedNPL_Element(), this.getContainedElementNoOpposite(), null, "element", null, + 0, 1, RefSingleNonContainedNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, + IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(refMultiContainedNPLEClass, RefMultiContainedNPL.class, "RefMultiContainedNPL", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getRefMultiContainedNPL_Elements(), getContainedElementNoOpposite(), null, "elements", null, 0, -1, - RefMultiContainedNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, + initEReference(getRefMultiContainedNPL_Elements(), this.getContainedElementNoOpposite(), null, "elements", null, 0, + -1, RefMultiContainedNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(refMultiNonContainedNPLEClass, RefMultiNonContainedNPL.class, "RefMultiNonContainedNPL", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getRefMultiNonContainedNPL_Elements(), getContainedElementNoOpposite(), null, "elements", null, 0, - -1, RefMultiNonContainedNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, + initEReference(getRefMultiNonContainedNPL_Elements(), this.getContainedElementNoOpposite(), null, "elements", null, + 0, -1, RefMultiNonContainedNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(containedElementNoOppositeEClass, ContainedElementNoOpposite.class, "ContainedElementNoOpposite", @@ -1427,7 +1426,7 @@ public class model4PackageImpl extends EPackageImpl implements model4Package initEClass(genRefMapNonContainedEClass, GenRefMapNonContained.class, "GenRefMapNonContained", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getGenRefMapNonContained_Elements(), getStringToEObject(), null, "elements", null, 0, -1, + initEReference(getGenRefMapNonContained_Elements(), this.getStringToEObject(), null, "elements", null, 0, -1, GenRefMapNonContained.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/model4Package.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/model4Package.java index 0b8919a539..1f36f342be 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/model4Package.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/model4Package.java @@ -1835,630 +1835,4 @@ public interface model4Package extends EPackage */ model4Factory getmodel4Factory(); - /** - * 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.emf.cdo.tests.model4.impl.RefSingleContainedImpl - * Ref Single Contained}' class. - * - * @see org.eclipse.emf.cdo.tests.model4.impl.RefSingleContainedImpl - * @see org.eclipse.emf.cdo.tests.model4.impl.model4PackageImpl#getRefSingleContained() - * @generated - */ - EClass REF_SINGLE_CONTAINED = eINSTANCE.getRefSingleContained(); - - /** - * The meta object literal for the 'Element' containment reference feature. - * - * - * @generated - */ - EReference REF_SINGLE_CONTAINED__ELEMENT = eINSTANCE.getRefSingleContained_Element(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4.impl.SingleContainedElementImpl - * Single Contained Element}' class. - * - * @see org.eclipse.emf.cdo.tests.model4.impl.SingleContainedElementImpl - * @see org.eclipse.emf.cdo.tests.model4.impl.model4PackageImpl#getSingleContainedElement() - * @generated - */ - EClass SINGLE_CONTAINED_ELEMENT = eINSTANCE.getSingleContainedElement(); - - /** - * The meta object literal for the 'Name' attribute feature. - * - * @generated - */ - EAttribute SINGLE_CONTAINED_ELEMENT__NAME = eINSTANCE.getSingleContainedElement_Name(); - - /** - * The meta object literal for the 'Parent' container reference feature. - * - * - * @generated - */ - EReference SINGLE_CONTAINED_ELEMENT__PARENT = eINSTANCE.getSingleContainedElement_Parent(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4.impl.RefSingleNonContainedImpl - * Ref Single Non Contained}' class. - * - * @see org.eclipse.emf.cdo.tests.model4.impl.RefSingleNonContainedImpl - * @see org.eclipse.emf.cdo.tests.model4.impl.model4PackageImpl#getRefSingleNonContained() - * @generated - */ - EClass REF_SINGLE_NON_CONTAINED = eINSTANCE.getRefSingleNonContained(); - - /** - * The meta object literal for the 'Element' reference feature. - * - * @generated - */ - EReference REF_SINGLE_NON_CONTAINED__ELEMENT = eINSTANCE.getRefSingleNonContained_Element(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4.impl.SingleNonContainedElementImpl - * Single Non Contained Element}' class. - * - * @see org.eclipse.emf.cdo.tests.model4.impl.SingleNonContainedElementImpl - * @see org.eclipse.emf.cdo.tests.model4.impl.model4PackageImpl#getSingleNonContainedElement() - * @generated - */ - EClass SINGLE_NON_CONTAINED_ELEMENT = eINSTANCE.getSingleNonContainedElement(); - - /** - * The meta object literal for the 'Name' attribute feature. - * - * @generated - */ - EAttribute SINGLE_NON_CONTAINED_ELEMENT__NAME = eINSTANCE.getSingleNonContainedElement_Name(); - - /** - * The meta object literal for the 'Parent' reference feature. - * - * @generated - */ - EReference SINGLE_NON_CONTAINED_ELEMENT__PARENT = eINSTANCE.getSingleNonContainedElement_Parent(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4.impl.RefMultiContainedImpl - * Ref Multi Contained}' class. - * - * @see org.eclipse.emf.cdo.tests.model4.impl.RefMultiContainedImpl - * @see org.eclipse.emf.cdo.tests.model4.impl.model4PackageImpl#getRefMultiContained() - * @generated - */ - EClass REF_MULTI_CONTAINED = eINSTANCE.getRefMultiContained(); - - /** - * The meta object literal for the 'Elements' containment reference list feature. - * - * @generated - */ - EReference REF_MULTI_CONTAINED__ELEMENTS = eINSTANCE.getRefMultiContained_Elements(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4.impl.MultiContainedElementImpl - * Multi Contained Element}' class. - * - * @see org.eclipse.emf.cdo.tests.model4.impl.MultiContainedElementImpl - * @see org.eclipse.emf.cdo.tests.model4.impl.model4PackageImpl#getMultiContainedElement() - * @generated - */ - EClass MULTI_CONTAINED_ELEMENT = eINSTANCE.getMultiContainedElement(); - - /** - * The meta object literal for the 'Name' attribute feature. - * - * @generated - */ - EAttribute MULTI_CONTAINED_ELEMENT__NAME = eINSTANCE.getMultiContainedElement_Name(); - - /** - * The meta object literal for the 'Parent' container reference feature. - * - * - * @generated - */ - EReference MULTI_CONTAINED_ELEMENT__PARENT = eINSTANCE.getMultiContainedElement_Parent(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4.impl.RefMultiNonContainedImpl - * Ref Multi Non Contained}' class. - * - * @see org.eclipse.emf.cdo.tests.model4.impl.RefMultiNonContainedImpl - * @see org.eclipse.emf.cdo.tests.model4.impl.model4PackageImpl#getRefMultiNonContained() - * @generated - */ - EClass REF_MULTI_NON_CONTAINED = eINSTANCE.getRefMultiNonContained(); - - /** - * The meta object literal for the 'Elements' containment reference list feature. - * - * @generated - */ - EReference REF_MULTI_NON_CONTAINED__ELEMENTS = eINSTANCE.getRefMultiNonContained_Elements(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4.impl.MultiNonContainedElementImpl - * Multi Non Contained Element}' class. - * - * @see org.eclipse.emf.cdo.tests.model4.impl.MultiNonContainedElementImpl - * @see org.eclipse.emf.cdo.tests.model4.impl.model4PackageImpl#getMultiNonContainedElement() - * @generated - */ - EClass MULTI_NON_CONTAINED_ELEMENT = eINSTANCE.getMultiNonContainedElement(); - - /** - * The meta object literal for the 'Name' attribute feature. - * - * @generated - */ - EAttribute MULTI_NON_CONTAINED_ELEMENT__NAME = eINSTANCE.getMultiNonContainedElement_Name(); - - /** - * The meta object literal for the 'Parent' reference feature. - * - * @generated - */ - EReference MULTI_NON_CONTAINED_ELEMENT__PARENT = eINSTANCE.getMultiNonContainedElement_Parent(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4.impl.RefMultiNonContainedUnsettableImpl - * Ref Multi Non Contained Unsettable}' class. - * - * @see org.eclipse.emf.cdo.tests.model4.impl.RefMultiNonContainedUnsettableImpl - * @see org.eclipse.emf.cdo.tests.model4.impl.model4PackageImpl#getRefMultiNonContainedUnsettable() - * @generated - */ - EClass REF_MULTI_NON_CONTAINED_UNSETTABLE = eINSTANCE.getRefMultiNonContainedUnsettable(); - - /** - * The meta object literal for the 'Elements' reference list feature. - * - * @generated - */ - EReference REF_MULTI_NON_CONTAINED_UNSETTABLE__ELEMENTS = eINSTANCE.getRefMultiNonContainedUnsettable_Elements(); - - /** - * The meta object literal for the ' - * {@link org.eclipse.emf.cdo.tests.model4.impl.MultiNonContainedUnsettableElementImpl - * Multi Non Contained Unsettable Element}' class. - * - * @see org.eclipse.emf.cdo.tests.model4.impl.MultiNonContainedUnsettableElementImpl - * @see org.eclipse.emf.cdo.tests.model4.impl.model4PackageImpl#getMultiNonContainedUnsettableElement() - * @generated - */ - EClass MULTI_NON_CONTAINED_UNSETTABLE_ELEMENT = eINSTANCE.getMultiNonContainedUnsettableElement(); - - /** - * The meta object literal for the 'Name' attribute feature. - * - * @generated - */ - EAttribute MULTI_NON_CONTAINED_UNSETTABLE_ELEMENT__NAME = eINSTANCE.getMultiNonContainedUnsettableElement_Name(); - - /** - * The meta object literal for the 'Parent' reference feature. - * - * @generated - */ - EReference MULTI_NON_CONTAINED_UNSETTABLE_ELEMENT__PARENT = eINSTANCE - .getMultiNonContainedUnsettableElement_Parent(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4.impl.RefSingleContainedNPLImpl - * Ref Single Contained NPL}' class. - * - * @see org.eclipse.emf.cdo.tests.model4.impl.RefSingleContainedNPLImpl - * @see org.eclipse.emf.cdo.tests.model4.impl.model4PackageImpl#getRefSingleContainedNPL() - * @generated - */ - EClass REF_SINGLE_CONTAINED_NPL = eINSTANCE.getRefSingleContainedNPL(); - - /** - * The meta object literal for the 'Element' containment reference feature. - * - * - * @generated - */ - EReference REF_SINGLE_CONTAINED_NPL__ELEMENT = eINSTANCE.getRefSingleContainedNPL_Element(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4.impl.RefSingleNonContainedNPLImpl - * Ref Single Non Contained NPL}' class. - * - * @see org.eclipse.emf.cdo.tests.model4.impl.RefSingleNonContainedNPLImpl - * @see org.eclipse.emf.cdo.tests.model4.impl.model4PackageImpl#getRefSingleNonContainedNPL() - * @generated - */ - EClass REF_SINGLE_NON_CONTAINED_NPL = eINSTANCE.getRefSingleNonContainedNPL(); - - /** - * The meta object literal for the 'Element' reference feature. - * - * @generated - */ - EReference REF_SINGLE_NON_CONTAINED_NPL__ELEMENT = eINSTANCE.getRefSingleNonContainedNPL_Element(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4.impl.RefMultiContainedNPLImpl - * Ref Multi Contained NPL}' class. - * - * @see org.eclipse.emf.cdo.tests.model4.impl.RefMultiContainedNPLImpl - * @see org.eclipse.emf.cdo.tests.model4.impl.model4PackageImpl#getRefMultiContainedNPL() - * @generated - */ - EClass REF_MULTI_CONTAINED_NPL = eINSTANCE.getRefMultiContainedNPL(); - - /** - * The meta object literal for the 'Elements' containment reference list feature. - * - * @generated - */ - EReference REF_MULTI_CONTAINED_NPL__ELEMENTS = eINSTANCE.getRefMultiContainedNPL_Elements(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4.impl.RefMultiNonContainedNPLImpl - * Ref Multi Non Contained NPL}' class. - * - * @see org.eclipse.emf.cdo.tests.model4.impl.RefMultiNonContainedNPLImpl - * @see org.eclipse.emf.cdo.tests.model4.impl.model4PackageImpl#getRefMultiNonContainedNPL() - * @generated - */ - EClass REF_MULTI_NON_CONTAINED_NPL = eINSTANCE.getRefMultiNonContainedNPL(); - - /** - * The meta object literal for the 'Elements' reference list feature. - * - * @generated - */ - EReference REF_MULTI_NON_CONTAINED_NPL__ELEMENTS = eINSTANCE.getRefMultiNonContainedNPL_Elements(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4.impl.ContainedElementNoOppositeImpl - * Contained Element No Opposite}' class. - * - * @see org.eclipse.emf.cdo.tests.model4.impl.ContainedElementNoOppositeImpl - * @see org.eclipse.emf.cdo.tests.model4.impl.model4PackageImpl#getContainedElementNoOpposite() - * @generated - */ - EClass CONTAINED_ELEMENT_NO_OPPOSITE = eINSTANCE.getContainedElementNoOpposite(); - - /** - * The meta object literal for the 'Name' attribute feature. - * - * @generated - */ - EAttribute CONTAINED_ELEMENT_NO_OPPOSITE__NAME = eINSTANCE.getContainedElementNoOpposite_Name(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4.impl.GenRefSingleContainedImpl - * Gen Ref Single Contained}' class. - * - * @see org.eclipse.emf.cdo.tests.model4.impl.GenRefSingleContainedImpl - * @see org.eclipse.emf.cdo.tests.model4.impl.model4PackageImpl#getGenRefSingleContained() - * @generated - */ - EClass GEN_REF_SINGLE_CONTAINED = eINSTANCE.getGenRefSingleContained(); - - /** - * The meta object literal for the 'Element' containment reference feature. - * - * - * @generated - */ - EReference GEN_REF_SINGLE_CONTAINED__ELEMENT = eINSTANCE.getGenRefSingleContained_Element(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4.impl.GenRefSingleNonContainedImpl - * Gen Ref Single Non Contained}' class. - * - * @see org.eclipse.emf.cdo.tests.model4.impl.GenRefSingleNonContainedImpl - * @see org.eclipse.emf.cdo.tests.model4.impl.model4PackageImpl#getGenRefSingleNonContained() - * @generated - */ - EClass GEN_REF_SINGLE_NON_CONTAINED = eINSTANCE.getGenRefSingleNonContained(); - - /** - * The meta object literal for the 'Element' reference feature. - * - * @generated - */ - EReference GEN_REF_SINGLE_NON_CONTAINED__ELEMENT = eINSTANCE.getGenRefSingleNonContained_Element(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4.impl.GenRefMultiContainedImpl - * Gen Ref Multi Contained}' class. - * - * @see org.eclipse.emf.cdo.tests.model4.impl.GenRefMultiContainedImpl - * @see org.eclipse.emf.cdo.tests.model4.impl.model4PackageImpl#getGenRefMultiContained() - * @generated - */ - EClass GEN_REF_MULTI_CONTAINED = eINSTANCE.getGenRefMultiContained(); - - /** - * The meta object literal for the 'Elements' containment reference list feature. - * - * @generated - */ - EReference GEN_REF_MULTI_CONTAINED__ELEMENTS = eINSTANCE.getGenRefMultiContained_Elements(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4.impl.GenRefMultiNonContainedImpl - * Gen Ref Multi Non Contained}' class. - * - * @see org.eclipse.emf.cdo.tests.model4.impl.GenRefMultiNonContainedImpl - * @see org.eclipse.emf.cdo.tests.model4.impl.model4PackageImpl#getGenRefMultiNonContained() - * @generated - */ - EClass GEN_REF_MULTI_NON_CONTAINED = eINSTANCE.getGenRefMultiNonContained(); - - /** - * The meta object literal for the 'Elements' reference list feature. - * - * @generated - */ - EReference GEN_REF_MULTI_NON_CONTAINED__ELEMENTS = eINSTANCE.getGenRefMultiNonContained_Elements(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4.impl.ImplSingleRefContainerImpl - * Impl Single Ref Container}' class. - * - * @see org.eclipse.emf.cdo.tests.model4.impl.ImplSingleRefContainerImpl - * @see org.eclipse.emf.cdo.tests.model4.impl.model4PackageImpl#getImplSingleRefContainer() - * @generated - */ - EClass IMPL_SINGLE_REF_CONTAINER = eINSTANCE.getImplSingleRefContainer(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4.impl.ImplSingleRefContainedElementImpl - * Impl Single Ref Contained Element}' class. - * - * @see org.eclipse.emf.cdo.tests.model4.impl.ImplSingleRefContainedElementImpl - * @see org.eclipse.emf.cdo.tests.model4.impl.model4PackageImpl#getImplSingleRefContainedElement() - * @generated - */ - EClass IMPL_SINGLE_REF_CONTAINED_ELEMENT = eINSTANCE.getImplSingleRefContainedElement(); - - /** - * The meta object literal for the 'Name' attribute feature. - * - * @generated - */ - EAttribute IMPL_SINGLE_REF_CONTAINED_ELEMENT__NAME = eINSTANCE.getImplSingleRefContainedElement_Name(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4.impl.ImplSingleRefNonContainerImpl - * Impl Single Ref Non Container}' class. - * - * @see org.eclipse.emf.cdo.tests.model4.impl.ImplSingleRefNonContainerImpl - * @see org.eclipse.emf.cdo.tests.model4.impl.model4PackageImpl#getImplSingleRefNonContainer() - * @generated - */ - EClass IMPL_SINGLE_REF_NON_CONTAINER = eINSTANCE.getImplSingleRefNonContainer(); - - /** - * The meta object literal for the ' - * {@link org.eclipse.emf.cdo.tests.model4.impl.ImplSingleRefNonContainedElementImpl - * Impl Single Ref Non Contained Element}' class. - * - * @see org.eclipse.emf.cdo.tests.model4.impl.ImplSingleRefNonContainedElementImpl - * @see org.eclipse.emf.cdo.tests.model4.impl.model4PackageImpl#getImplSingleRefNonContainedElement() - * @generated - */ - EClass IMPL_SINGLE_REF_NON_CONTAINED_ELEMENT = eINSTANCE.getImplSingleRefNonContainedElement(); - - /** - * The meta object literal for the 'Name' attribute feature. - * - * @generated - */ - EAttribute IMPL_SINGLE_REF_NON_CONTAINED_ELEMENT__NAME = eINSTANCE.getImplSingleRefNonContainedElement_Name(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4.impl.ImplMultiRefNonContainerImpl - * Impl Multi Ref Non Container}' class. - * - * @see org.eclipse.emf.cdo.tests.model4.impl.ImplMultiRefNonContainerImpl - * @see org.eclipse.emf.cdo.tests.model4.impl.model4PackageImpl#getImplMultiRefNonContainer() - * @generated - */ - EClass IMPL_MULTI_REF_NON_CONTAINER = eINSTANCE.getImplMultiRefNonContainer(); - - /** - * The meta object literal for the ' - * {@link org.eclipse.emf.cdo.tests.model4.impl.ImplMultiRefNonContainedElementImpl - * Impl Multi Ref Non Contained Element}' class. - * - * @see org.eclipse.emf.cdo.tests.model4.impl.ImplMultiRefNonContainedElementImpl - * @see org.eclipse.emf.cdo.tests.model4.impl.model4PackageImpl#getImplMultiRefNonContainedElement() - * @generated - */ - EClass IMPL_MULTI_REF_NON_CONTAINED_ELEMENT = eINSTANCE.getImplMultiRefNonContainedElement(); - - /** - * The meta object literal for the 'Name' attribute feature. - * - * @generated - */ - EAttribute IMPL_MULTI_REF_NON_CONTAINED_ELEMENT__NAME = eINSTANCE.getImplMultiRefNonContainedElement_Name(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4.impl.ImplMultiRefContainerImpl - * Impl Multi Ref Container}' class. - * - * @see org.eclipse.emf.cdo.tests.model4.impl.ImplMultiRefContainerImpl - * @see org.eclipse.emf.cdo.tests.model4.impl.model4PackageImpl#getImplMultiRefContainer() - * @generated - */ - EClass IMPL_MULTI_REF_CONTAINER = eINSTANCE.getImplMultiRefContainer(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4.impl.ImplMultiRefContainedElementImpl - * Impl Multi Ref Contained Element}' class. - * - * @see org.eclipse.emf.cdo.tests.model4.impl.ImplMultiRefContainedElementImpl - * @see org.eclipse.emf.cdo.tests.model4.impl.model4PackageImpl#getImplMultiRefContainedElement() - * @generated - */ - EClass IMPL_MULTI_REF_CONTAINED_ELEMENT = eINSTANCE.getImplMultiRefContainedElement(); - - /** - * The meta object literal for the 'Name' attribute feature. - * - * @generated - */ - EAttribute IMPL_MULTI_REF_CONTAINED_ELEMENT__NAME = eINSTANCE.getImplMultiRefContainedElement_Name(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4.impl.ImplSingleRefContainerNPLImpl - * Impl Single Ref Container NPL}' class. - * - * @see org.eclipse.emf.cdo.tests.model4.impl.ImplSingleRefContainerNPLImpl - * @see org.eclipse.emf.cdo.tests.model4.impl.model4PackageImpl#getImplSingleRefContainerNPL() - * @generated - */ - EClass IMPL_SINGLE_REF_CONTAINER_NPL = eINSTANCE.getImplSingleRefContainerNPL(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4.impl.ImplSingleRefNonContainerNPLImpl - * Impl Single Ref Non Container NPL}' class. - * - * @see org.eclipse.emf.cdo.tests.model4.impl.ImplSingleRefNonContainerNPLImpl - * @see org.eclipse.emf.cdo.tests.model4.impl.model4PackageImpl#getImplSingleRefNonContainerNPL() - * @generated - */ - EClass IMPL_SINGLE_REF_NON_CONTAINER_NPL = eINSTANCE.getImplSingleRefNonContainerNPL(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4.impl.ImplMultiRefContainerNPLImpl - * Impl Multi Ref Container NPL}' class. - * - * @see org.eclipse.emf.cdo.tests.model4.impl.ImplMultiRefContainerNPLImpl - * @see org.eclipse.emf.cdo.tests.model4.impl.model4PackageImpl#getImplMultiRefContainerNPL() - * @generated - */ - EClass IMPL_MULTI_REF_CONTAINER_NPL = eINSTANCE.getImplMultiRefContainerNPL(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4.impl.ImplMultiRefNonContainerNPLImpl - * Impl Multi Ref Non Container NPL}' class. - * - * @see org.eclipse.emf.cdo.tests.model4.impl.ImplMultiRefNonContainerNPLImpl - * @see org.eclipse.emf.cdo.tests.model4.impl.model4PackageImpl#getImplMultiRefNonContainerNPL() - * @generated - */ - EClass IMPL_MULTI_REF_NON_CONTAINER_NPL = eINSTANCE.getImplMultiRefNonContainerNPL(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4.impl.ImplContainedElementNPLImpl - * Impl Contained Element NPL}' class. - * - * @see org.eclipse.emf.cdo.tests.model4.impl.ImplContainedElementNPLImpl - * @see org.eclipse.emf.cdo.tests.model4.impl.model4PackageImpl#getImplContainedElementNPL() - * @generated - */ - EClass IMPL_CONTAINED_ELEMENT_NPL = eINSTANCE.getImplContainedElementNPL(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4.impl.GenRefMultiNUNonContainedImpl - * Gen Ref Multi NU Non Contained}' class. - * - * @see org.eclipse.emf.cdo.tests.model4.impl.GenRefMultiNUNonContainedImpl - * @see org.eclipse.emf.cdo.tests.model4.impl.model4PackageImpl#getGenRefMultiNUNonContained() - * @generated - */ - EClass GEN_REF_MULTI_NU_NON_CONTAINED = eINSTANCE.getGenRefMultiNUNonContained(); - - /** - * The meta object literal for the 'Elements' reference list feature. - * - * @generated - */ - EReference GEN_REF_MULTI_NU_NON_CONTAINED__ELEMENTS = eINSTANCE.getGenRefMultiNUNonContained_Elements(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4.impl.GenRefMapNonContainedImpl - * Gen Ref Map Non Contained}' class. - * - * @see org.eclipse.emf.cdo.tests.model4.impl.GenRefMapNonContainedImpl - * @see org.eclipse.emf.cdo.tests.model4.impl.model4PackageImpl#getGenRefMapNonContained() - * @generated - */ - EClass GEN_REF_MAP_NON_CONTAINED = eINSTANCE.getGenRefMapNonContained(); - - /** - * The meta object literal for the 'Elements' map feature. - * - * @generated - */ - EReference GEN_REF_MAP_NON_CONTAINED__ELEMENTS = eINSTANCE.getGenRefMapNonContained_Elements(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4.impl.StringToEObjectImpl - * String To EObject}' class. - * - * @see org.eclipse.emf.cdo.tests.model4.impl.StringToEObjectImpl - * @see org.eclipse.emf.cdo.tests.model4.impl.model4PackageImpl#getStringToEObject() - * @generated - */ - EClass STRING_TO_EOBJECT = eINSTANCE.getStringToEObject(); - - /** - * The meta object literal for the 'Key' attribute feature. - * - * @generated - */ - EAttribute STRING_TO_EOBJECT__KEY = eINSTANCE.getStringToEObject_Key(); - - /** - * The meta object literal for the 'Value' reference feature. - * - * @generated - */ - EReference STRING_TO_EOBJECT__VALUE = eINSTANCE.getStringToEObject_Value(); - - } - } // model4Package diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/util/model4Switch.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/util/model4Switch.java index 957e89213b..7e86c115d8 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/util/model4Switch.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/util/model4Switch.java @@ -145,9 +145,7 @@ public class model4Switch RefSingleContained refSingleContained = (RefSingleContained)theEObject; T result = caseRefSingleContained(refSingleContained); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.SINGLE_CONTAINED_ELEMENT: @@ -155,9 +153,7 @@ public class model4Switch SingleContainedElement singleContainedElement = (SingleContainedElement)theEObject; T result = caseSingleContainedElement(singleContainedElement); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.REF_SINGLE_NON_CONTAINED: @@ -165,9 +161,7 @@ public class model4Switch RefSingleNonContained refSingleNonContained = (RefSingleNonContained)theEObject; T result = caseRefSingleNonContained(refSingleNonContained); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.SINGLE_NON_CONTAINED_ELEMENT: @@ -175,9 +169,7 @@ public class model4Switch SingleNonContainedElement singleNonContainedElement = (SingleNonContainedElement)theEObject; T result = caseSingleNonContainedElement(singleNonContainedElement); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.REF_MULTI_CONTAINED: @@ -185,9 +177,7 @@ public class model4Switch RefMultiContained refMultiContained = (RefMultiContained)theEObject; T result = caseRefMultiContained(refMultiContained); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.MULTI_CONTAINED_ELEMENT: @@ -195,9 +185,7 @@ public class model4Switch MultiContainedElement multiContainedElement = (MultiContainedElement)theEObject; T result = caseMultiContainedElement(multiContainedElement); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.REF_MULTI_NON_CONTAINED: @@ -205,9 +193,7 @@ public class model4Switch RefMultiNonContained refMultiNonContained = (RefMultiNonContained)theEObject; T result = caseRefMultiNonContained(refMultiNonContained); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.MULTI_NON_CONTAINED_ELEMENT: @@ -215,9 +201,7 @@ public class model4Switch MultiNonContainedElement multiNonContainedElement = (MultiNonContainedElement)theEObject; T result = caseMultiNonContainedElement(multiNonContainedElement); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.REF_MULTI_NON_CONTAINED_UNSETTABLE: @@ -225,9 +209,7 @@ public class model4Switch RefMultiNonContainedUnsettable refMultiNonContainedUnsettable = (RefMultiNonContainedUnsettable)theEObject; T result = caseRefMultiNonContainedUnsettable(refMultiNonContainedUnsettable); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.MULTI_NON_CONTAINED_UNSETTABLE_ELEMENT: @@ -235,9 +217,7 @@ public class model4Switch MultiNonContainedUnsettableElement multiNonContainedUnsettableElement = (MultiNonContainedUnsettableElement)theEObject; T result = caseMultiNonContainedUnsettableElement(multiNonContainedUnsettableElement); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.REF_SINGLE_CONTAINED_NPL: @@ -245,9 +225,7 @@ public class model4Switch RefSingleContainedNPL refSingleContainedNPL = (RefSingleContainedNPL)theEObject; T result = caseRefSingleContainedNPL(refSingleContainedNPL); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.REF_SINGLE_NON_CONTAINED_NPL: @@ -255,9 +233,7 @@ public class model4Switch RefSingleNonContainedNPL refSingleNonContainedNPL = (RefSingleNonContainedNPL)theEObject; T result = caseRefSingleNonContainedNPL(refSingleNonContainedNPL); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.REF_MULTI_CONTAINED_NPL: @@ -265,9 +241,7 @@ public class model4Switch RefMultiContainedNPL refMultiContainedNPL = (RefMultiContainedNPL)theEObject; T result = caseRefMultiContainedNPL(refMultiContainedNPL); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.REF_MULTI_NON_CONTAINED_NPL: @@ -275,9 +249,7 @@ public class model4Switch RefMultiNonContainedNPL refMultiNonContainedNPL = (RefMultiNonContainedNPL)theEObject; T result = caseRefMultiNonContainedNPL(refMultiNonContainedNPL); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.CONTAINED_ELEMENT_NO_OPPOSITE: @@ -285,9 +257,7 @@ public class model4Switch ContainedElementNoOpposite containedElementNoOpposite = (ContainedElementNoOpposite)theEObject; T result = caseContainedElementNoOpposite(containedElementNoOpposite); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.GEN_REF_SINGLE_CONTAINED: @@ -295,9 +265,7 @@ public class model4Switch GenRefSingleContained genRefSingleContained = (GenRefSingleContained)theEObject; T result = caseGenRefSingleContained(genRefSingleContained); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.GEN_REF_SINGLE_NON_CONTAINED: @@ -305,9 +273,7 @@ public class model4Switch GenRefSingleNonContained genRefSingleNonContained = (GenRefSingleNonContained)theEObject; T result = caseGenRefSingleNonContained(genRefSingleNonContained); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.GEN_REF_MULTI_CONTAINED: @@ -315,9 +281,7 @@ public class model4Switch GenRefMultiContained genRefMultiContained = (GenRefMultiContained)theEObject; T result = caseGenRefMultiContained(genRefMultiContained); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.GEN_REF_MULTI_NON_CONTAINED: @@ -325,9 +289,7 @@ public class model4Switch GenRefMultiNonContained genRefMultiNonContained = (GenRefMultiNonContained)theEObject; T result = caseGenRefMultiNonContained(genRefMultiNonContained); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.IMPL_SINGLE_REF_CONTAINER: @@ -335,13 +297,9 @@ public class model4Switch ImplSingleRefContainer implSingleRefContainer = (ImplSingleRefContainer)theEObject; T result = caseImplSingleRefContainer(implSingleRefContainer); if (result == null) - { result = caseISingleRefContainer(implSingleRefContainer); - } if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.IMPL_SINGLE_REF_CONTAINED_ELEMENT: @@ -349,13 +307,9 @@ public class model4Switch ImplSingleRefContainedElement implSingleRefContainedElement = (ImplSingleRefContainedElement)theEObject; T result = caseImplSingleRefContainedElement(implSingleRefContainedElement); if (result == null) - { result = caseISingleRefContainedElement(implSingleRefContainedElement); - } if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.IMPL_SINGLE_REF_NON_CONTAINER: @@ -363,13 +317,9 @@ public class model4Switch ImplSingleRefNonContainer implSingleRefNonContainer = (ImplSingleRefNonContainer)theEObject; T result = caseImplSingleRefNonContainer(implSingleRefNonContainer); if (result == null) - { result = caseISingleRefNonContainer(implSingleRefNonContainer); - } if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.IMPL_SINGLE_REF_NON_CONTAINED_ELEMENT: @@ -377,13 +327,9 @@ public class model4Switch ImplSingleRefNonContainedElement implSingleRefNonContainedElement = (ImplSingleRefNonContainedElement)theEObject; T result = caseImplSingleRefNonContainedElement(implSingleRefNonContainedElement); if (result == null) - { result = caseISingleRefNonContainedElement(implSingleRefNonContainedElement); - } if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.IMPL_MULTI_REF_NON_CONTAINER: @@ -391,13 +337,9 @@ public class model4Switch ImplMultiRefNonContainer implMultiRefNonContainer = (ImplMultiRefNonContainer)theEObject; T result = caseImplMultiRefNonContainer(implMultiRefNonContainer); if (result == null) - { result = caseIMultiRefNonContainer(implMultiRefNonContainer); - } if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.IMPL_MULTI_REF_NON_CONTAINED_ELEMENT: @@ -405,13 +347,9 @@ public class model4Switch ImplMultiRefNonContainedElement implMultiRefNonContainedElement = (ImplMultiRefNonContainedElement)theEObject; T result = caseImplMultiRefNonContainedElement(implMultiRefNonContainedElement); if (result == null) - { result = caseIMultiRefNonContainedElement(implMultiRefNonContainedElement); - } if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.IMPL_MULTI_REF_CONTAINER: @@ -419,13 +357,9 @@ public class model4Switch ImplMultiRefContainer implMultiRefContainer = (ImplMultiRefContainer)theEObject; T result = caseImplMultiRefContainer(implMultiRefContainer); if (result == null) - { result = caseIMultiRefContainer(implMultiRefContainer); - } if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.IMPL_MULTI_REF_CONTAINED_ELEMENT: @@ -433,13 +367,9 @@ public class model4Switch ImplMultiRefContainedElement implMultiRefContainedElement = (ImplMultiRefContainedElement)theEObject; T result = caseImplMultiRefContainedElement(implMultiRefContainedElement); if (result == null) - { result = caseIMultiRefContainedElement(implMultiRefContainedElement); - } if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.IMPL_SINGLE_REF_CONTAINER_NPL: @@ -447,13 +377,9 @@ public class model4Switch ImplSingleRefContainerNPL implSingleRefContainerNPL = (ImplSingleRefContainerNPL)theEObject; T result = caseImplSingleRefContainerNPL(implSingleRefContainerNPL); if (result == null) - { result = caseISingleRefContainerNPL(implSingleRefContainerNPL); - } if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.IMPL_SINGLE_REF_NON_CONTAINER_NPL: @@ -461,13 +387,9 @@ public class model4Switch ImplSingleRefNonContainerNPL implSingleRefNonContainerNPL = (ImplSingleRefNonContainerNPL)theEObject; T result = caseImplSingleRefNonContainerNPL(implSingleRefNonContainerNPL); if (result == null) - { result = caseISingleRefNonContainerNPL(implSingleRefNonContainerNPL); - } if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.IMPL_MULTI_REF_CONTAINER_NPL: @@ -475,13 +397,9 @@ public class model4Switch ImplMultiRefContainerNPL implMultiRefContainerNPL = (ImplMultiRefContainerNPL)theEObject; T result = caseImplMultiRefContainerNPL(implMultiRefContainerNPL); if (result == null) - { result = caseIMultiRefContainerNPL(implMultiRefContainerNPL); - } if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.IMPL_MULTI_REF_NON_CONTAINER_NPL: @@ -489,13 +407,9 @@ public class model4Switch ImplMultiRefNonContainerNPL implMultiRefNonContainerNPL = (ImplMultiRefNonContainerNPL)theEObject; T result = caseImplMultiRefNonContainerNPL(implMultiRefNonContainerNPL); if (result == null) - { result = caseIMultiRefNonContainerNPL(implMultiRefNonContainerNPL); - } if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.IMPL_CONTAINED_ELEMENT_NPL: @@ -503,17 +417,11 @@ public class model4Switch ImplContainedElementNPL implContainedElementNPL = (ImplContainedElementNPL)theEObject; T result = caseImplContainedElementNPL(implContainedElementNPL); if (result == null) - { result = caseIContainedElementNoParentLink(implContainedElementNPL); - } if (result == null) - { result = caseINamedElement(implContainedElementNPL); - } if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.GEN_REF_MULTI_NU_NON_CONTAINED: @@ -521,9 +429,7 @@ public class model4Switch GenRefMultiNUNonContained genRefMultiNUNonContained = (GenRefMultiNUNonContained)theEObject; T result = caseGenRefMultiNUNonContained(genRefMultiNUNonContained); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.GEN_REF_MAP_NON_CONTAINED: @@ -531,9 +437,7 @@ public class model4Switch GenRefMapNonContained genRefMapNonContained = (GenRefMapNonContained)theEObject; T result = caseGenRefMapNonContained(genRefMapNonContained); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4Package.STRING_TO_EOBJECT: @@ -542,9 +446,7 @@ public class model4Switch Map.Entry stringToEObject = (Map.Entry)theEObject; T result = caseStringToEObject(stringToEObject); if (result == null) - { result = defaultCase(theEObject); - } return result; } default: diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/model/interfaces.genmodel b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/model/interfaces.genmodel index 62dce20299..e06e8320b8 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/model/interfaces.genmodel +++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/model/interfaces.genmodel @@ -11,7 +11,7 @@ interfaces.ecore CDO=org.eclipse.emf.cdo + literalsInterface="false" ecorePackage="interfaces.ecore#/"> diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/model/interfaces.legacy-genmodel b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/model/interfaces.legacy-genmodel index ec04321e4f..b50c546cda 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/model/interfaces.legacy-genmodel +++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/model/interfaces.legacy-genmodel @@ -1,55 +1,89 @@ - + interfaces.ecore CDO=org.eclipse.emf.cdo - - - + + + + + + + - - + + + + + - - + + + + + - - + + + + + - - + + + + + - - + + + + + - - + + + + + - - + + + + + - - + + + + + - - - + + - - + + + + + - - + + + + + - - + + + + + + + + + + + diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/impl/model4interfacesPackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/impl/model4interfacesPackageImpl.java index 20e48f201a..4a2ef98aa5 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/impl/model4interfacesPackageImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/impl/model4interfacesPackageImpl.java @@ -178,9 +178,7 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i public static model4interfacesPackage init() { if (isInited) - { return (model4interfacesPackage)EPackage.Registry.INSTANCE.getEPackage(model4interfacesPackage.eNS_URI); - } // Obtain or create and register package model4interfacesPackageImpl themodel4interfacesPackage = (model4interfacesPackageImpl)(EPackage.Registry.INSTANCE @@ -499,9 +497,7 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i public void createPackageContents() { if (isCreated) - { return; - } isCreated = true; // Create classes and their features @@ -563,9 +559,7 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i public void initializePackageContents() { if (isInitialized) - { return; - } isInitialized = true; // Initialize package @@ -582,57 +576,59 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i // Initialize classes and features; add operations and parameters initEClass(iSingleRefContainerEClass, ISingleRefContainer.class, "ISingleRefContainer", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getISingleRefContainer_Element(), getISingleRefContainedElement(), - getISingleRefContainedElement_Parent(), "element", null, 0, 1, ISingleRefContainer.class, !IS_TRANSIENT, + initEReference(getISingleRefContainer_Element(), this.getISingleRefContainedElement(), + this.getISingleRefContainedElement_Parent(), "element", null, 0, 1, ISingleRefContainer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(iSingleRefContainedElementEClass, ISingleRefContainedElement.class, "ISingleRefContainedElement", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getISingleRefContainedElement_Parent(), getISingleRefContainer(), getISingleRefContainer_Element(), - "parent", null, 0, 1, ISingleRefContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, - !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getISingleRefContainedElement_Parent(), this.getISingleRefContainer(), + this.getISingleRefContainer_Element(), "parent", null, 0, 1, ISingleRefContainedElement.class, !IS_TRANSIENT, + !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, + IS_ORDERED); initEClass(iSingleRefNonContainerEClass, ISingleRefNonContainer.class, "ISingleRefNonContainer", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getISingleRefNonContainer_Element(), getISingleRefNonContainedElement(), - getISingleRefNonContainedElement_Parent(), "element", null, 0, 1, ISingleRefNonContainer.class, !IS_TRANSIENT, - !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, - IS_ORDERED); + initEReference(getISingleRefNonContainer_Element(), this.getISingleRefNonContainedElement(), + this.getISingleRefNonContainedElement_Parent(), "element", null, 0, 1, ISingleRefNonContainer.class, + !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, + !IS_DERIVED, IS_ORDERED); initEClass(iSingleRefNonContainedElementEClass, ISingleRefNonContainedElement.class, "ISingleRefNonContainedElement", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getISingleRefNonContainedElement_Parent(), getISingleRefNonContainer(), - getISingleRefNonContainer_Element(), "parent", null, 0, 1, ISingleRefNonContainedElement.class, !IS_TRANSIENT, - !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, - IS_ORDERED); + initEReference(getISingleRefNonContainedElement_Parent(), this.getISingleRefNonContainer(), + this.getISingleRefNonContainer_Element(), "parent", null, 0, 1, ISingleRefNonContainedElement.class, + !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, + !IS_DERIVED, IS_ORDERED); initEClass(iMultiRefContainerEClass, IMultiRefContainer.class, "IMultiRefContainer", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getIMultiRefContainer_Elements(), getIMultiRefContainedElement(), - getIMultiRefContainedElement_Parent(), "elements", null, 0, -1, IMultiRefContainer.class, !IS_TRANSIENT, + initEReference(getIMultiRefContainer_Elements(), this.getIMultiRefContainedElement(), + this.getIMultiRefContainedElement_Parent(), "elements", null, 0, -1, IMultiRefContainer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(iMultiRefContainedElementEClass, IMultiRefContainedElement.class, "IMultiRefContainedElement", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getIMultiRefContainedElement_Parent(), getIMultiRefContainer(), getIMultiRefContainer_Elements(), - "parent", null, 0, 1, IMultiRefContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, - !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getIMultiRefContainedElement_Parent(), this.getIMultiRefContainer(), + this.getIMultiRefContainer_Elements(), "parent", null, 0, 1, IMultiRefContainedElement.class, !IS_TRANSIENT, + !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, + IS_ORDERED); initEClass(iMultiRefNonContainerEClass, IMultiRefNonContainer.class, "IMultiRefNonContainer", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getIMultiRefNonContainer_Elements(), getIMultiRefNonContainedElement(), - getIMultiRefNonContainedElement_Parent(), "elements", null, 0, -1, IMultiRefNonContainer.class, !IS_TRANSIENT, - !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, - IS_ORDERED); + initEReference(getIMultiRefNonContainer_Elements(), this.getIMultiRefNonContainedElement(), + this.getIMultiRefNonContainedElement_Parent(), "elements", null, 0, -1, IMultiRefNonContainer.class, + !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, + !IS_DERIVED, IS_ORDERED); initEClass(iMultiRefNonContainedElementEClass, IMultiRefNonContainedElement.class, "IMultiRefNonContainedElement", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getIMultiRefNonContainedElement_Parent(), getIMultiRefNonContainer(), - getIMultiRefNonContainer_Elements(), "parent", null, 0, 1, IMultiRefNonContainedElement.class, !IS_TRANSIENT, - !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, - IS_ORDERED); + initEReference(getIMultiRefNonContainedElement_Parent(), this.getIMultiRefNonContainer(), + this.getIMultiRefNonContainer_Elements(), "parent", null, 0, 1, IMultiRefNonContainedElement.class, + !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, + !IS_DERIVED, IS_ORDERED); initEClass(iNamedElementEClass, INamedElement.class, "INamedElement", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); @@ -644,26 +640,26 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i initEClass(iSingleRefContainerNPLEClass, ISingleRefContainerNPL.class, "ISingleRefContainerNPL", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getISingleRefContainerNPL_Element(), getIContainedElementNoParentLink(), null, "element", null, 0, - 1, ISingleRefContainerNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, - !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getISingleRefContainerNPL_Element(), this.getIContainedElementNoParentLink(), null, "element", null, + 0, 1, ISingleRefContainerNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, + !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(iSingleRefNonContainerNPLEClass, ISingleRefNonContainerNPL.class, "ISingleRefNonContainerNPL", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getISingleRefNonContainerNPL_Element(), getIContainedElementNoParentLink(), null, "element", null, - 0, 1, ISingleRefNonContainerNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, + initEReference(getISingleRefNonContainerNPL_Element(), this.getIContainedElementNoParentLink(), null, "element", + null, 0, 1, ISingleRefNonContainerNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(iMultiRefContainerNPLEClass, IMultiRefContainerNPL.class, "IMultiRefContainerNPL", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getIMultiRefContainerNPL_Elements(), getIContainedElementNoParentLink(), null, "elements", null, 0, - -1, IMultiRefContainerNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, - !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getIMultiRefContainerNPL_Elements(), this.getIContainedElementNoParentLink(), null, "elements", + null, 0, -1, IMultiRefContainerNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, + !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(iMultiRefNonContainerNPLEClass, IMultiRefNonContainerNPL.class, "IMultiRefNonContainerNPL", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getIMultiRefNonContainerNPL_Elements(), getIContainedElementNoParentLink(), null, "elements", null, - 0, -1, IMultiRefNonContainerNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, + initEReference(getIMultiRefNonContainerNPL_Elements(), this.getIContainedElementNoParentLink(), null, "elements", + null, 0, -1, IMultiRefNonContainerNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); // Create resource diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/model4interfacesPackage.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/model4interfacesPackage.java index 3ae024ed18..4538aae6f2 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/model4interfacesPackage.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/model4interfacesPackage.java @@ -744,271 +744,4 @@ public interface model4interfacesPackage extends org.eclipse.emf.cdo.tests.model */ model4interfacesFactory getmodel4interfacesFactory(); - /** - * 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.emf.cdo.tests.legacy.model4interfaces.ISingleRefContainer - * ISingle Ref Container}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefContainer - * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.impl.model4interfacesPackageImpl#getISingleRefContainer() - * @generated - */ - EClass ISINGLE_REF_CONTAINER = eINSTANCE.getISingleRefContainer(); - - /** - * The meta object literal for the 'Element' containment reference feature. - * - * - * @generated - */ - EReference ISINGLE_REF_CONTAINER__ELEMENT = eINSTANCE.getISingleRefContainer_Element(); - - /** - * The meta object literal for the ' - * {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefContainedElement - * ISingle Ref Contained Element}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefContainedElement - * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.impl.model4interfacesPackageImpl#getISingleRefContainedElement() - * @generated - */ - EClass ISINGLE_REF_CONTAINED_ELEMENT = eINSTANCE.getISingleRefContainedElement(); - - /** - * The meta object literal for the 'Parent' container reference feature. - * - * - * @generated - */ - EReference ISINGLE_REF_CONTAINED_ELEMENT__PARENT = eINSTANCE.getISingleRefContainedElement_Parent(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefNonContainer - * ISingle Ref Non Container}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefNonContainer - * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.impl.model4interfacesPackageImpl#getISingleRefNonContainer() - * @generated - */ - EClass ISINGLE_REF_NON_CONTAINER = eINSTANCE.getISingleRefNonContainer(); - - /** - * The meta object literal for the 'Element' reference feature. - * - * @generated - */ - EReference ISINGLE_REF_NON_CONTAINER__ELEMENT = eINSTANCE.getISingleRefNonContainer_Element(); - - /** - * The meta object literal for the ' - * {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefNonContainedElement - * ISingle Ref Non Contained Element}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefNonContainedElement - * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.impl.model4interfacesPackageImpl#getISingleRefNonContainedElement() - * @generated - */ - EClass ISINGLE_REF_NON_CONTAINED_ELEMENT = eINSTANCE.getISingleRefNonContainedElement(); - - /** - * The meta object literal for the 'Parent' reference feature. - * - * @generated - */ - EReference ISINGLE_REF_NON_CONTAINED_ELEMENT__PARENT = eINSTANCE.getISingleRefNonContainedElement_Parent(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefContainer - * IMulti Ref Container}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefContainer - * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.impl.model4interfacesPackageImpl#getIMultiRefContainer() - * @generated - */ - EClass IMULTI_REF_CONTAINER = eINSTANCE.getIMultiRefContainer(); - - /** - * The meta object literal for the 'Elements' containment reference list feature. - * - * @generated - */ - EReference IMULTI_REF_CONTAINER__ELEMENTS = eINSTANCE.getIMultiRefContainer_Elements(); - - /** - * The meta object literal for the ' - * {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefContainedElement - * IMulti Ref Contained Element}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefContainedElement - * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.impl.model4interfacesPackageImpl#getIMultiRefContainedElement() - * @generated - */ - EClass IMULTI_REF_CONTAINED_ELEMENT = eINSTANCE.getIMultiRefContainedElement(); - - /** - * The meta object literal for the 'Parent' container reference feature. - * - * - * @generated - */ - EReference IMULTI_REF_CONTAINED_ELEMENT__PARENT = eINSTANCE.getIMultiRefContainedElement_Parent(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefNonContainer - * IMulti Ref Non Container}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefNonContainer - * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.impl.model4interfacesPackageImpl#getIMultiRefNonContainer() - * @generated - */ - EClass IMULTI_REF_NON_CONTAINER = eINSTANCE.getIMultiRefNonContainer(); - - /** - * The meta object literal for the 'Elements' reference list feature. - * - * @generated - */ - EReference IMULTI_REF_NON_CONTAINER__ELEMENTS = eINSTANCE.getIMultiRefNonContainer_Elements(); - - /** - * The meta object literal for the ' - * {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefNonContainedElement - * IMulti Ref Non Contained Element}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefNonContainedElement - * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.impl.model4interfacesPackageImpl#getIMultiRefNonContainedElement() - * @generated - */ - EClass IMULTI_REF_NON_CONTAINED_ELEMENT = eINSTANCE.getIMultiRefNonContainedElement(); - - /** - * The meta object literal for the 'Parent' reference feature. - * - * @generated - */ - EReference IMULTI_REF_NON_CONTAINED_ELEMENT__PARENT = eINSTANCE.getIMultiRefNonContainedElement_Parent(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.INamedElement - * INamed Element}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.INamedElement - * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.impl.model4interfacesPackageImpl#getINamedElement() - * @generated - */ - EClass INAMED_ELEMENT = eINSTANCE.getINamedElement(); - - /** - * The meta object literal for the 'Name' attribute feature. - * - * @generated - */ - EAttribute INAMED_ELEMENT__NAME = eINSTANCE.getINamedElement_Name(); - - /** - * The meta object literal for the ' - * {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IContainedElementNoParentLink - * IContained Element No Parent Link}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.IContainedElementNoParentLink - * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.impl.model4interfacesPackageImpl#getIContainedElementNoParentLink() - * @generated - */ - EClass ICONTAINED_ELEMENT_NO_PARENT_LINK = eINSTANCE.getIContainedElementNoParentLink(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefContainerNPL - * ISingle Ref Container NPL}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefContainerNPL - * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.impl.model4interfacesPackageImpl#getISingleRefContainerNPL() - * @generated - */ - EClass ISINGLE_REF_CONTAINER_NPL = eINSTANCE.getISingleRefContainerNPL(); - - /** - * The meta object literal for the 'Element' containment reference feature. - * - * - * @generated - */ - EReference ISINGLE_REF_CONTAINER_NPL__ELEMENT = eINSTANCE.getISingleRefContainerNPL_Element(); - - /** - * The meta object literal for the ' - * {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefNonContainerNPL - * ISingle Ref Non Container NPL}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefNonContainerNPL - * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.impl.model4interfacesPackageImpl#getISingleRefNonContainerNPL() - * @generated - */ - EClass ISINGLE_REF_NON_CONTAINER_NPL = eINSTANCE.getISingleRefNonContainerNPL(); - - /** - * The meta object literal for the 'Element' reference feature. - * - * @generated - */ - EReference ISINGLE_REF_NON_CONTAINER_NPL__ELEMENT = eINSTANCE.getISingleRefNonContainerNPL_Element(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefContainerNPL - * IMulti Ref Container NPL}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefContainerNPL - * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.impl.model4interfacesPackageImpl#getIMultiRefContainerNPL() - * @generated - */ - EClass IMULTI_REF_CONTAINER_NPL = eINSTANCE.getIMultiRefContainerNPL(); - - /** - * The meta object literal for the 'Elements' containment reference list feature. - * - * @generated - */ - EReference IMULTI_REF_CONTAINER_NPL__ELEMENTS = eINSTANCE.getIMultiRefContainerNPL_Elements(); - - /** - * The meta object literal for the ' - * {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefNonContainerNPL - * IMulti Ref Non Container NPL}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefNonContainerNPL - * @see org.eclipse.emf.cdo.tests.legacy.model4interfaces.impl.model4interfacesPackageImpl#getIMultiRefNonContainerNPL() - * @generated - */ - EClass IMULTI_REF_NON_CONTAINER_NPL = eINSTANCE.getIMultiRefNonContainerNPL(); - - /** - * The meta object literal for the 'Elements' reference list feature. - * - * @generated - */ - EReference IMULTI_REF_NON_CONTAINER_NPL__ELEMENTS = eINSTANCE.getIMultiRefNonContainerNPL_Elements(); - - } - } // model4interfacesPackage diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/util/model4interfacesSwitch.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/util/model4interfacesSwitch.java index 3b161d8b95..e444fa000f 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/util/model4interfacesSwitch.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/util/model4interfacesSwitch.java @@ -110,9 +110,7 @@ public class model4interfacesSwitch ISingleRefContainer iSingleRefContainer = (ISingleRefContainer)theEObject; T result = caseISingleRefContainer(iSingleRefContainer); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4interfacesPackage.ISINGLE_REF_CONTAINED_ELEMENT: @@ -120,9 +118,7 @@ public class model4interfacesSwitch ISingleRefContainedElement iSingleRefContainedElement = (ISingleRefContainedElement)theEObject; T result = caseISingleRefContainedElement(iSingleRefContainedElement); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4interfacesPackage.ISINGLE_REF_NON_CONTAINER: @@ -130,9 +126,7 @@ public class model4interfacesSwitch ISingleRefNonContainer iSingleRefNonContainer = (ISingleRefNonContainer)theEObject; T result = caseISingleRefNonContainer(iSingleRefNonContainer); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4interfacesPackage.ISINGLE_REF_NON_CONTAINED_ELEMENT: @@ -140,9 +134,7 @@ public class model4interfacesSwitch ISingleRefNonContainedElement iSingleRefNonContainedElement = (ISingleRefNonContainedElement)theEObject; T result = caseISingleRefNonContainedElement(iSingleRefNonContainedElement); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4interfacesPackage.IMULTI_REF_CONTAINER: @@ -150,9 +142,7 @@ public class model4interfacesSwitch IMultiRefContainer iMultiRefContainer = (IMultiRefContainer)theEObject; T result = caseIMultiRefContainer(iMultiRefContainer); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4interfacesPackage.IMULTI_REF_CONTAINED_ELEMENT: @@ -160,9 +150,7 @@ public class model4interfacesSwitch IMultiRefContainedElement iMultiRefContainedElement = (IMultiRefContainedElement)theEObject; T result = caseIMultiRefContainedElement(iMultiRefContainedElement); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4interfacesPackage.IMULTI_REF_NON_CONTAINER: @@ -170,9 +158,7 @@ public class model4interfacesSwitch IMultiRefNonContainer iMultiRefNonContainer = (IMultiRefNonContainer)theEObject; T result = caseIMultiRefNonContainer(iMultiRefNonContainer); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4interfacesPackage.IMULTI_REF_NON_CONTAINED_ELEMENT: @@ -180,9 +166,7 @@ public class model4interfacesSwitch IMultiRefNonContainedElement iMultiRefNonContainedElement = (IMultiRefNonContainedElement)theEObject; T result = caseIMultiRefNonContainedElement(iMultiRefNonContainedElement); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4interfacesPackage.INAMED_ELEMENT: @@ -190,9 +174,7 @@ public class model4interfacesSwitch INamedElement iNamedElement = (INamedElement)theEObject; T result = caseINamedElement(iNamedElement); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4interfacesPackage.ICONTAINED_ELEMENT_NO_PARENT_LINK: @@ -200,9 +182,7 @@ public class model4interfacesSwitch IContainedElementNoParentLink iContainedElementNoParentLink = (IContainedElementNoParentLink)theEObject; T result = caseIContainedElementNoParentLink(iContainedElementNoParentLink); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4interfacesPackage.ISINGLE_REF_CONTAINER_NPL: @@ -210,9 +190,7 @@ public class model4interfacesSwitch ISingleRefContainerNPL iSingleRefContainerNPL = (ISingleRefContainerNPL)theEObject; T result = caseISingleRefContainerNPL(iSingleRefContainerNPL); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4interfacesPackage.ISINGLE_REF_NON_CONTAINER_NPL: @@ -220,9 +198,7 @@ public class model4interfacesSwitch ISingleRefNonContainerNPL iSingleRefNonContainerNPL = (ISingleRefNonContainerNPL)theEObject; T result = caseISingleRefNonContainerNPL(iSingleRefNonContainerNPL); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4interfacesPackage.IMULTI_REF_CONTAINER_NPL: @@ -230,9 +206,7 @@ public class model4interfacesSwitch IMultiRefContainerNPL iMultiRefContainerNPL = (IMultiRefContainerNPL)theEObject; T result = caseIMultiRefContainerNPL(iMultiRefContainerNPL); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4interfacesPackage.IMULTI_REF_NON_CONTAINER_NPL: @@ -240,9 +214,7 @@ public class model4interfacesSwitch IMultiRefNonContainerNPL iMultiRefNonContainerNPL = (IMultiRefNonContainerNPL)theEObject; T result = caseIMultiRefNonContainerNPL(iMultiRefNonContainerNPL); if (result == null) - { result = defaultCase(theEObject); - } return result; } default: diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/impl/model4interfacesPackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/impl/model4interfacesPackageImpl.java index d7986eb361..272c712386 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/impl/model4interfacesPackageImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/impl/model4interfacesPackageImpl.java @@ -178,9 +178,7 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i public static model4interfacesPackage init() { if (isInited) - { return (model4interfacesPackage)EPackage.Registry.INSTANCE.getEPackage(model4interfacesPackage.eNS_URI); - } // Obtain or create and register package model4interfacesPackageImpl themodel4interfacesPackage = (model4interfacesPackageImpl)(EPackage.Registry.INSTANCE @@ -499,9 +497,7 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i public void createPackageContents() { if (isCreated) - { return; - } isCreated = true; // Create classes and their features @@ -563,9 +559,7 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i public void initializePackageContents() { if (isInitialized) - { return; - } isInitialized = true; // Initialize package @@ -582,57 +576,59 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i // Initialize classes and features; add operations and parameters initEClass(iSingleRefContainerEClass, ISingleRefContainer.class, "ISingleRefContainer", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getISingleRefContainer_Element(), getISingleRefContainedElement(), - getISingleRefContainedElement_Parent(), "element", null, 0, 1, ISingleRefContainer.class, !IS_TRANSIENT, + initEReference(getISingleRefContainer_Element(), this.getISingleRefContainedElement(), + this.getISingleRefContainedElement_Parent(), "element", null, 0, 1, ISingleRefContainer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(iSingleRefContainedElementEClass, ISingleRefContainedElement.class, "ISingleRefContainedElement", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getISingleRefContainedElement_Parent(), getISingleRefContainer(), getISingleRefContainer_Element(), - "parent", null, 0, 1, ISingleRefContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, - !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getISingleRefContainedElement_Parent(), this.getISingleRefContainer(), + this.getISingleRefContainer_Element(), "parent", null, 0, 1, ISingleRefContainedElement.class, !IS_TRANSIENT, + !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, + IS_ORDERED); initEClass(iSingleRefNonContainerEClass, ISingleRefNonContainer.class, "ISingleRefNonContainer", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getISingleRefNonContainer_Element(), getISingleRefNonContainedElement(), - getISingleRefNonContainedElement_Parent(), "element", null, 0, 1, ISingleRefNonContainer.class, !IS_TRANSIENT, - !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, - IS_ORDERED); + initEReference(getISingleRefNonContainer_Element(), this.getISingleRefNonContainedElement(), + this.getISingleRefNonContainedElement_Parent(), "element", null, 0, 1, ISingleRefNonContainer.class, + !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, + !IS_DERIVED, IS_ORDERED); initEClass(iSingleRefNonContainedElementEClass, ISingleRefNonContainedElement.class, "ISingleRefNonContainedElement", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getISingleRefNonContainedElement_Parent(), getISingleRefNonContainer(), - getISingleRefNonContainer_Element(), "parent", null, 0, 1, ISingleRefNonContainedElement.class, !IS_TRANSIENT, - !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, - IS_ORDERED); + initEReference(getISingleRefNonContainedElement_Parent(), this.getISingleRefNonContainer(), + this.getISingleRefNonContainer_Element(), "parent", null, 0, 1, ISingleRefNonContainedElement.class, + !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, + !IS_DERIVED, IS_ORDERED); initEClass(iMultiRefContainerEClass, IMultiRefContainer.class, "IMultiRefContainer", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getIMultiRefContainer_Elements(), getIMultiRefContainedElement(), - getIMultiRefContainedElement_Parent(), "elements", null, 0, -1, IMultiRefContainer.class, !IS_TRANSIENT, + initEReference(getIMultiRefContainer_Elements(), this.getIMultiRefContainedElement(), + this.getIMultiRefContainedElement_Parent(), "elements", null, 0, -1, IMultiRefContainer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(iMultiRefContainedElementEClass, IMultiRefContainedElement.class, "IMultiRefContainedElement", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getIMultiRefContainedElement_Parent(), getIMultiRefContainer(), getIMultiRefContainer_Elements(), - "parent", null, 0, 1, IMultiRefContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, - !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getIMultiRefContainedElement_Parent(), this.getIMultiRefContainer(), + this.getIMultiRefContainer_Elements(), "parent", null, 0, 1, IMultiRefContainedElement.class, !IS_TRANSIENT, + !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, + IS_ORDERED); initEClass(iMultiRefNonContainerEClass, IMultiRefNonContainer.class, "IMultiRefNonContainer", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getIMultiRefNonContainer_Elements(), getIMultiRefNonContainedElement(), - getIMultiRefNonContainedElement_Parent(), "elements", null, 0, -1, IMultiRefNonContainer.class, !IS_TRANSIENT, - !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, - IS_ORDERED); + initEReference(getIMultiRefNonContainer_Elements(), this.getIMultiRefNonContainedElement(), + this.getIMultiRefNonContainedElement_Parent(), "elements", null, 0, -1, IMultiRefNonContainer.class, + !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, + !IS_DERIVED, IS_ORDERED); initEClass(iMultiRefNonContainedElementEClass, IMultiRefNonContainedElement.class, "IMultiRefNonContainedElement", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getIMultiRefNonContainedElement_Parent(), getIMultiRefNonContainer(), - getIMultiRefNonContainer_Elements(), "parent", null, 0, 1, IMultiRefNonContainedElement.class, !IS_TRANSIENT, - !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, - IS_ORDERED); + initEReference(getIMultiRefNonContainedElement_Parent(), this.getIMultiRefNonContainer(), + this.getIMultiRefNonContainer_Elements(), "parent", null, 0, 1, IMultiRefNonContainedElement.class, + !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, + !IS_DERIVED, IS_ORDERED); initEClass(iNamedElementEClass, INamedElement.class, "INamedElement", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); @@ -644,26 +640,26 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i initEClass(iSingleRefContainerNPLEClass, ISingleRefContainerNPL.class, "ISingleRefContainerNPL", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getISingleRefContainerNPL_Element(), getIContainedElementNoParentLink(), null, "element", null, 0, - 1, ISingleRefContainerNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, - !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getISingleRefContainerNPL_Element(), this.getIContainedElementNoParentLink(), null, "element", null, + 0, 1, ISingleRefContainerNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, + !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(iSingleRefNonContainerNPLEClass, ISingleRefNonContainerNPL.class, "ISingleRefNonContainerNPL", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getISingleRefNonContainerNPL_Element(), getIContainedElementNoParentLink(), null, "element", null, - 0, 1, ISingleRefNonContainerNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, + initEReference(getISingleRefNonContainerNPL_Element(), this.getIContainedElementNoParentLink(), null, "element", + null, 0, 1, ISingleRefNonContainerNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(iMultiRefContainerNPLEClass, IMultiRefContainerNPL.class, "IMultiRefContainerNPL", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getIMultiRefContainerNPL_Elements(), getIContainedElementNoParentLink(), null, "elements", null, 0, - -1, IMultiRefContainerNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, - !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getIMultiRefContainerNPL_Elements(), this.getIContainedElementNoParentLink(), null, "elements", + null, 0, -1, IMultiRefContainerNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, + !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(iMultiRefNonContainerNPLEClass, IMultiRefNonContainerNPL.class, "IMultiRefNonContainerNPL", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getIMultiRefNonContainerNPL_Elements(), getIContainedElementNoParentLink(), null, "elements", null, - 0, -1, IMultiRefNonContainerNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, + initEReference(getIMultiRefNonContainerNPL_Elements(), this.getIContainedElementNoParentLink(), null, "elements", + null, 0, -1, IMultiRefNonContainerNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); // Create resource diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/model4interfacesPackage.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/model4interfacesPackage.java index 92f3ce5c66..048cb9004e 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/model4interfacesPackage.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/model4interfacesPackage.java @@ -737,264 +737,4 @@ public interface model4interfacesPackage extends EPackage */ model4interfacesFactory getmodel4interfacesFactory(); - /** - * 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.emf.cdo.tests.model4interfaces.ISingleRefContainer - * ISingle Ref Container}' class. - * - * @see org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefContainer - * @see org.eclipse.emf.cdo.tests.model4interfaces.impl.model4interfacesPackageImpl#getISingleRefContainer() - * @generated - */ - EClass ISINGLE_REF_CONTAINER = eINSTANCE.getISingleRefContainer(); - - /** - * The meta object literal for the 'Element' containment reference feature. - * - * - * @generated - */ - EReference ISINGLE_REF_CONTAINER__ELEMENT = eINSTANCE.getISingleRefContainer_Element(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefContainedElement - * ISingle Ref Contained Element}' class. - * - * @see org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefContainedElement - * @see org.eclipse.emf.cdo.tests.model4interfaces.impl.model4interfacesPackageImpl#getISingleRefContainedElement() - * @generated - */ - EClass ISINGLE_REF_CONTAINED_ELEMENT = eINSTANCE.getISingleRefContainedElement(); - - /** - * The meta object literal for the 'Parent' container reference feature. - * - * - * @generated - */ - EReference ISINGLE_REF_CONTAINED_ELEMENT__PARENT = eINSTANCE.getISingleRefContainedElement_Parent(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainer - * ISingle Ref Non Container}' class. - * - * @see org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainer - * @see org.eclipse.emf.cdo.tests.model4interfaces.impl.model4interfacesPackageImpl#getISingleRefNonContainer() - * @generated - */ - EClass ISINGLE_REF_NON_CONTAINER = eINSTANCE.getISingleRefNonContainer(); - - /** - * The meta object literal for the 'Element' reference feature. - * - * @generated - */ - EReference ISINGLE_REF_NON_CONTAINER__ELEMENT = eINSTANCE.getISingleRefNonContainer_Element(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainedElement - * ISingle Ref Non Contained Element}' class. - * - * @see org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainedElement - * @see org.eclipse.emf.cdo.tests.model4interfaces.impl.model4interfacesPackageImpl#getISingleRefNonContainedElement() - * @generated - */ - EClass ISINGLE_REF_NON_CONTAINED_ELEMENT = eINSTANCE.getISingleRefNonContainedElement(); - - /** - * The meta object literal for the 'Parent' reference feature. - * - * @generated - */ - EReference ISINGLE_REF_NON_CONTAINED_ELEMENT__PARENT = eINSTANCE.getISingleRefNonContainedElement_Parent(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainer - * IMulti Ref Container}' class. - * - * @see org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainer - * @see org.eclipse.emf.cdo.tests.model4interfaces.impl.model4interfacesPackageImpl#getIMultiRefContainer() - * @generated - */ - EClass IMULTI_REF_CONTAINER = eINSTANCE.getIMultiRefContainer(); - - /** - * The meta object literal for the 'Elements' containment reference list feature. - * - * @generated - */ - EReference IMULTI_REF_CONTAINER__ELEMENTS = eINSTANCE.getIMultiRefContainer_Elements(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainedElement - * IMulti Ref Contained Element}' class. - * - * @see org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainedElement - * @see org.eclipse.emf.cdo.tests.model4interfaces.impl.model4interfacesPackageImpl#getIMultiRefContainedElement() - * @generated - */ - EClass IMULTI_REF_CONTAINED_ELEMENT = eINSTANCE.getIMultiRefContainedElement(); - - /** - * The meta object literal for the 'Parent' container reference feature. - * - * - * @generated - */ - EReference IMULTI_REF_CONTAINED_ELEMENT__PARENT = eINSTANCE.getIMultiRefContainedElement_Parent(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainer - * IMulti Ref Non Container}' class. - * - * @see org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainer - * @see org.eclipse.emf.cdo.tests.model4interfaces.impl.model4interfacesPackageImpl#getIMultiRefNonContainer() - * @generated - */ - EClass IMULTI_REF_NON_CONTAINER = eINSTANCE.getIMultiRefNonContainer(); - - /** - * The meta object literal for the 'Elements' reference list feature. - * - * @generated - */ - EReference IMULTI_REF_NON_CONTAINER__ELEMENTS = eINSTANCE.getIMultiRefNonContainer_Elements(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainedElement - * IMulti Ref Non Contained Element}' class. - * - * @see org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainedElement - * @see org.eclipse.emf.cdo.tests.model4interfaces.impl.model4interfacesPackageImpl#getIMultiRefNonContainedElement() - * @generated - */ - EClass IMULTI_REF_NON_CONTAINED_ELEMENT = eINSTANCE.getIMultiRefNonContainedElement(); - - /** - * The meta object literal for the 'Parent' reference feature. - * - * @generated - */ - EReference IMULTI_REF_NON_CONTAINED_ELEMENT__PARENT = eINSTANCE.getIMultiRefNonContainedElement_Parent(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4interfaces.INamedElement - * INamed Element}' class. - * - * @see org.eclipse.emf.cdo.tests.model4interfaces.INamedElement - * @see org.eclipse.emf.cdo.tests.model4interfaces.impl.model4interfacesPackageImpl#getINamedElement() - * @generated - */ - EClass INAMED_ELEMENT = eINSTANCE.getINamedElement(); - - /** - * The meta object literal for the 'Name' attribute feature. - * - * @generated - */ - EAttribute INAMED_ELEMENT__NAME = eINSTANCE.getINamedElement_Name(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4interfaces.IContainedElementNoParentLink - * IContained Element No Parent Link}' class. - * - * @see org.eclipse.emf.cdo.tests.model4interfaces.IContainedElementNoParentLink - * @see org.eclipse.emf.cdo.tests.model4interfaces.impl.model4interfacesPackageImpl#getIContainedElementNoParentLink() - * @generated - */ - EClass ICONTAINED_ELEMENT_NO_PARENT_LINK = eINSTANCE.getIContainedElementNoParentLink(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefContainerNPL - * ISingle Ref Container NPL}' class. - * - * @see org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefContainerNPL - * @see org.eclipse.emf.cdo.tests.model4interfaces.impl.model4interfacesPackageImpl#getISingleRefContainerNPL() - * @generated - */ - EClass ISINGLE_REF_CONTAINER_NPL = eINSTANCE.getISingleRefContainerNPL(); - - /** - * The meta object literal for the 'Element' containment reference feature. - * - * - * @generated - */ - EReference ISINGLE_REF_CONTAINER_NPL__ELEMENT = eINSTANCE.getISingleRefContainerNPL_Element(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainerNPL - * ISingle Ref Non Container NPL}' class. - * - * @see org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainerNPL - * @see org.eclipse.emf.cdo.tests.model4interfaces.impl.model4interfacesPackageImpl#getISingleRefNonContainerNPL() - * @generated - */ - EClass ISINGLE_REF_NON_CONTAINER_NPL = eINSTANCE.getISingleRefNonContainerNPL(); - - /** - * The meta object literal for the 'Element' reference feature. - * - * @generated - */ - EReference ISINGLE_REF_NON_CONTAINER_NPL__ELEMENT = eINSTANCE.getISingleRefNonContainerNPL_Element(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainerNPL - * IMulti Ref Container NPL}' class. - * - * @see org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainerNPL - * @see org.eclipse.emf.cdo.tests.model4interfaces.impl.model4interfacesPackageImpl#getIMultiRefContainerNPL() - * @generated - */ - EClass IMULTI_REF_CONTAINER_NPL = eINSTANCE.getIMultiRefContainerNPL(); - - /** - * The meta object literal for the 'Elements' containment reference list feature. - * - * @generated - */ - EReference IMULTI_REF_CONTAINER_NPL__ELEMENTS = eINSTANCE.getIMultiRefContainerNPL_Elements(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainerNPL - * IMulti Ref Non Container NPL}' class. - * - * @see org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainerNPL - * @see org.eclipse.emf.cdo.tests.model4interfaces.impl.model4interfacesPackageImpl#getIMultiRefNonContainerNPL() - * @generated - */ - EClass IMULTI_REF_NON_CONTAINER_NPL = eINSTANCE.getIMultiRefNonContainerNPL(); - - /** - * The meta object literal for the 'Elements' reference list feature. - * - * @generated - */ - EReference IMULTI_REF_NON_CONTAINER_NPL__ELEMENTS = eINSTANCE.getIMultiRefNonContainerNPL_Elements(); - - } - } // model4interfacesPackage diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/util/model4interfacesSwitch.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/util/model4interfacesSwitch.java index 72eba867fa..f38a4631fa 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/util/model4interfacesSwitch.java +++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/util/model4interfacesSwitch.java @@ -110,9 +110,7 @@ public class model4interfacesSwitch ISingleRefContainer iSingleRefContainer = (ISingleRefContainer)theEObject; T result = caseISingleRefContainer(iSingleRefContainer); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4interfacesPackage.ISINGLE_REF_CONTAINED_ELEMENT: @@ -120,9 +118,7 @@ public class model4interfacesSwitch ISingleRefContainedElement iSingleRefContainedElement = (ISingleRefContainedElement)theEObject; T result = caseISingleRefContainedElement(iSingleRefContainedElement); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4interfacesPackage.ISINGLE_REF_NON_CONTAINER: @@ -130,9 +126,7 @@ public class model4interfacesSwitch ISingleRefNonContainer iSingleRefNonContainer = (ISingleRefNonContainer)theEObject; T result = caseISingleRefNonContainer(iSingleRefNonContainer); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4interfacesPackage.ISINGLE_REF_NON_CONTAINED_ELEMENT: @@ -140,9 +134,7 @@ public class model4interfacesSwitch ISingleRefNonContainedElement iSingleRefNonContainedElement = (ISingleRefNonContainedElement)theEObject; T result = caseISingleRefNonContainedElement(iSingleRefNonContainedElement); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4interfacesPackage.IMULTI_REF_CONTAINER: @@ -150,9 +142,7 @@ public class model4interfacesSwitch IMultiRefContainer iMultiRefContainer = (IMultiRefContainer)theEObject; T result = caseIMultiRefContainer(iMultiRefContainer); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4interfacesPackage.IMULTI_REF_CONTAINED_ELEMENT: @@ -160,9 +150,7 @@ public class model4interfacesSwitch IMultiRefContainedElement iMultiRefContainedElement = (IMultiRefContainedElement)theEObject; T result = caseIMultiRefContainedElement(iMultiRefContainedElement); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4interfacesPackage.IMULTI_REF_NON_CONTAINER: @@ -170,9 +158,7 @@ public class model4interfacesSwitch IMultiRefNonContainer iMultiRefNonContainer = (IMultiRefNonContainer)theEObject; T result = caseIMultiRefNonContainer(iMultiRefNonContainer); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4interfacesPackage.IMULTI_REF_NON_CONTAINED_ELEMENT: @@ -180,9 +166,7 @@ public class model4interfacesSwitch IMultiRefNonContainedElement iMultiRefNonContainedElement = (IMultiRefNonContainedElement)theEObject; T result = caseIMultiRefNonContainedElement(iMultiRefNonContainedElement); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4interfacesPackage.INAMED_ELEMENT: @@ -190,9 +174,7 @@ public class model4interfacesSwitch INamedElement iNamedElement = (INamedElement)theEObject; T result = caseINamedElement(iNamedElement); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4interfacesPackage.ICONTAINED_ELEMENT_NO_PARENT_LINK: @@ -200,9 +182,7 @@ public class model4interfacesSwitch IContainedElementNoParentLink iContainedElementNoParentLink = (IContainedElementNoParentLink)theEObject; T result = caseIContainedElementNoParentLink(iContainedElementNoParentLink); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4interfacesPackage.ISINGLE_REF_CONTAINER_NPL: @@ -210,9 +190,7 @@ public class model4interfacesSwitch ISingleRefContainerNPL iSingleRefContainerNPL = (ISingleRefContainerNPL)theEObject; T result = caseISingleRefContainerNPL(iSingleRefContainerNPL); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4interfacesPackage.ISINGLE_REF_NON_CONTAINER_NPL: @@ -220,9 +198,7 @@ public class model4interfacesSwitch ISingleRefNonContainerNPL iSingleRefNonContainerNPL = (ISingleRefNonContainerNPL)theEObject; T result = caseISingleRefNonContainerNPL(iSingleRefNonContainerNPL); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4interfacesPackage.IMULTI_REF_CONTAINER_NPL: @@ -230,9 +206,7 @@ public class model4interfacesSwitch IMultiRefContainerNPL iMultiRefContainerNPL = (IMultiRefContainerNPL)theEObject; T result = caseIMultiRefContainerNPL(iMultiRefContainerNPL); if (result == null) - { result = defaultCase(theEObject); - } return result; } case model4interfacesPackage.IMULTI_REF_NON_CONTAINER_NPL: @@ -240,9 +214,7 @@ public class model4interfacesSwitch IMultiRefNonContainerNPL iMultiRefNonContainerNPL = (IMultiRefNonContainerNPL)theEObject; T result = caseIMultiRefNonContainerNPL(iMultiRefNonContainerNPL); if (result == null) - { result = defaultCase(theEObject); - } return result; } default: diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/model/model5.genmodel b/plugins/org.eclipse.emf.cdo.tests.model5/model/model5.genmodel index d4ac9a48ac..c2d97563fd 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model5/model/model5.genmodel +++ b/plugins/org.eclipse.emf.cdo.tests.model5/model/model5.genmodel @@ -10,7 +10,9 @@ model5.ecore CDO=org.eclipse.emf.cdo + literalsInterface="false" extensibleProviderFactory="true" childCreationExtenders="true" + ecorePackage="model5.ecore#/"> + @@ -48,5 +50,8 @@ + + +
    diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/model/model5.legacy-genmodel b/plugins/org.eclipse.emf.cdo.tests.model5/model/model5.legacy-genmodel index 20d7e97e2d..9c588ae725 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model5/model/model5.legacy-genmodel +++ b/plugins/org.eclipse.emf.cdo.tests.model5/model/model5.legacy-genmodel @@ -2,8 +2,11 @@ model5.ecore CDO=org.eclipse.emf.cdo - + + + + @@ -82,5 +85,11 @@ + + + + + + diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/Model5Package.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/Model5Package.java index 4d15e00700..7fc15a2fd1 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/Model5Package.java +++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/Model5Package.java @@ -775,280 +775,4 @@ public interface Model5Package extends org.eclipse.emf.cdo.tests.model5.Model5Pa */ Model5Factory getModel5Factory(); - /** - * 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.emf.cdo.tests.legacy.model5.impl.TestFeatureMapImpl - * Test Feature Map}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.TestFeatureMapImpl - * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.Model5PackageImpl#getTestFeatureMap() - * @generated - */ - EClass TEST_FEATURE_MAP = eINSTANCE.getTestFeatureMap(); - - /** - * The meta object literal for the 'Managers' reference list feature. - * - * @generated - */ - EReference TEST_FEATURE_MAP__MANAGERS = eINSTANCE.getTestFeatureMap_Managers(); - - /** - * The meta object literal for the 'Doctors' reference list feature. - * - * @generated - */ - EReference TEST_FEATURE_MAP__DOCTORS = eINSTANCE.getTestFeatureMap_Doctors(); - - /** - * The meta object literal for the 'People' attribute list feature. - * - * @generated - */ - EAttribute TEST_FEATURE_MAP__PEOPLE = eINSTANCE.getTestFeatureMap_People(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model5.impl.ManagerImpl - * Manager}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.ManagerImpl - * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.Model5PackageImpl#getManager() - * @generated - */ - EClass MANAGER = eINSTANCE.getManager(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model5.impl.DoctorImpl Doctor}' - * class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.DoctorImpl - * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.Model5PackageImpl#getDoctor() - * @generated - */ - EClass DOCTOR = eINSTANCE.getDoctor(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfStringImpl - * Gen List Of String}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfStringImpl - * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.Model5PackageImpl#getGenListOfString() - * @generated - */ - EClass GEN_LIST_OF_STRING = eINSTANCE.getGenListOfString(); - - /** - * The meta object literal for the 'Elements' attribute list feature. - * - * @generated - */ - EAttribute GEN_LIST_OF_STRING__ELEMENTS = eINSTANCE.getGenListOfString_Elements(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfIntImpl - * Gen List Of Int}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfIntImpl - * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.Model5PackageImpl#getGenListOfInt() - * @generated - */ - EClass GEN_LIST_OF_INT = eINSTANCE.getGenListOfInt(); - - /** - * The meta object literal for the 'Elements' attribute list feature. - * - * @generated - */ - EAttribute GEN_LIST_OF_INT__ELEMENTS = eINSTANCE.getGenListOfInt_Elements(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfIntegerImpl - * Gen List Of Integer}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfIntegerImpl - * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.Model5PackageImpl#getGenListOfInteger() - * @generated - */ - EClass GEN_LIST_OF_INTEGER = eINSTANCE.getGenListOfInteger(); - - /** - * The meta object literal for the 'Elements' attribute list feature. - * - * @generated - */ - EAttribute GEN_LIST_OF_INTEGER__ELEMENTS = eINSTANCE.getGenListOfInteger_Elements(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfLongImpl - * Gen List Of Long}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfLongImpl - * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.Model5PackageImpl#getGenListOfLong() - * @generated - */ - EClass GEN_LIST_OF_LONG = eINSTANCE.getGenListOfLong(); - - /** - * The meta object literal for the 'Elements' attribute list feature. - * - * @generated - */ - EAttribute GEN_LIST_OF_LONG__ELEMENTS = eINSTANCE.getGenListOfLong_Elements(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfBooleanImpl - * Gen List Of Boolean}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfBooleanImpl - * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.Model5PackageImpl#getGenListOfBoolean() - * @generated - */ - EClass GEN_LIST_OF_BOOLEAN = eINSTANCE.getGenListOfBoolean(); - - /** - * The meta object literal for the 'Elements' attribute list feature. - * - * @generated - */ - EAttribute GEN_LIST_OF_BOOLEAN__ELEMENTS = eINSTANCE.getGenListOfBoolean_Elements(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfShortImpl - * Gen List Of Short}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfShortImpl - * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.Model5PackageImpl#getGenListOfShort() - * @generated - */ - EClass GEN_LIST_OF_SHORT = eINSTANCE.getGenListOfShort(); - - /** - * The meta object literal for the 'Elements' attribute list feature. - * - * @generated - */ - EAttribute GEN_LIST_OF_SHORT__ELEMENTS = eINSTANCE.getGenListOfShort_Elements(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfFloatImpl - * Gen List Of Float}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfFloatImpl - * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.Model5PackageImpl#getGenListOfFloat() - * @generated - */ - EClass GEN_LIST_OF_FLOAT = eINSTANCE.getGenListOfFloat(); - - /** - * The meta object literal for the 'Elements' attribute list feature. - * - * @generated - */ - EAttribute GEN_LIST_OF_FLOAT__ELEMENTS = eINSTANCE.getGenListOfFloat_Elements(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfDoubleImpl - * Gen List Of Double}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfDoubleImpl - * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.Model5PackageImpl#getGenListOfDouble() - * @generated - */ - EClass GEN_LIST_OF_DOUBLE = eINSTANCE.getGenListOfDouble(); - - /** - * The meta object literal for the 'Elements' attribute list feature. - * - * @generated - */ - EAttribute GEN_LIST_OF_DOUBLE__ELEMENTS = eINSTANCE.getGenListOfDouble_Elements(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfDateImpl - * Gen List Of Date}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfDateImpl - * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.Model5PackageImpl#getGenListOfDate() - * @generated - */ - EClass GEN_LIST_OF_DATE = eINSTANCE.getGenListOfDate(); - - /** - * The meta object literal for the 'Elements' attribute list feature. - * - * @generated - */ - EAttribute GEN_LIST_OF_DATE__ELEMENTS = eINSTANCE.getGenListOfDate_Elements(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfCharImpl - * Gen List Of Char}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfCharImpl - * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.Model5PackageImpl#getGenListOfChar() - * @generated - */ - EClass GEN_LIST_OF_CHAR = eINSTANCE.getGenListOfChar(); - - /** - * The meta object literal for the 'Elements' attribute list feature. - * - * @generated - */ - EAttribute GEN_LIST_OF_CHAR__ELEMENTS = eINSTANCE.getGenListOfChar_Elements(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfIntArrayImpl - * Gen List Of Int Array}' class. - * - * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfIntArrayImpl - * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.Model5PackageImpl#getGenListOfIntArray() - * @generated - */ - EClass GEN_LIST_OF_INT_ARRAY = eINSTANCE.getGenListOfIntArray(); - - /** - * The meta object literal for the 'Elements' attribute list feature. - * - * @generated - */ - EAttribute GEN_LIST_OF_INT_ARRAY__ELEMENTS = eINSTANCE.getGenListOfIntArray_Elements(); - - /** - * The meta object literal for the 'Int Array' data type. - * - * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.Model5PackageImpl#getIntArray() - * @generated - */ - EDataType INT_ARRAY = eINSTANCE.getIntArray(); - - } - } // Model5Package diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/DoctorImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/DoctorImpl.java index bec8796b75..4dfb296c2d 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/DoctorImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/DoctorImpl.java @@ -50,7 +50,7 @@ public class DoctorImpl extends EObjectImpl implements Doctor @Override protected EClass eStaticClass() { - return Model5Package.Literals.DOCTOR; + return Model5Package.eINSTANCE.getDoctor(); } } // DoctorImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfBooleanImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfBooleanImpl.java index 6624e8a16d..1cb9ee3c58 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfBooleanImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfBooleanImpl.java @@ -69,7 +69,7 @@ public class GenListOfBooleanImpl extends EObjectImpl implements GenListOfBoolea @Override protected EClass eStaticClass() { - return Model5Package.Literals.GEN_LIST_OF_BOOLEAN; + return Model5Package.eINSTANCE.getGenListOfBoolean(); } /** diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfCharImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfCharImpl.java index ff384474f9..1a54f4cabf 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfCharImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfCharImpl.java @@ -69,7 +69,7 @@ public class GenListOfCharImpl extends EObjectImpl implements GenListOfChar @Override protected EClass eStaticClass() { - return Model5Package.Literals.GEN_LIST_OF_CHAR; + return Model5Package.eINSTANCE.getGenListOfChar(); } /** diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfDateImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfDateImpl.java index 56143746c8..c46215ab10 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfDateImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfDateImpl.java @@ -70,7 +70,7 @@ public class GenListOfDateImpl extends EObjectImpl implements GenListOfDate @Override protected EClass eStaticClass() { - return Model5Package.Literals.GEN_LIST_OF_DATE; + return Model5Package.eINSTANCE.getGenListOfDate(); } /** diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfDoubleImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfDoubleImpl.java index a2ec44c4e3..c0811439ab 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfDoubleImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfDoubleImpl.java @@ -69,7 +69,7 @@ public class GenListOfDoubleImpl extends EObjectImpl implements GenListOfDouble @Override protected EClass eStaticClass() { - return Model5Package.Literals.GEN_LIST_OF_DOUBLE; + return Model5Package.eINSTANCE.getGenListOfDouble(); } /** diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfFloatImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfFloatImpl.java index 76496fccbf..2bc60bc0e0 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfFloatImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfFloatImpl.java @@ -69,7 +69,7 @@ public class GenListOfFloatImpl extends EObjectImpl implements GenListOfFloat @Override protected EClass eStaticClass() { - return Model5Package.Literals.GEN_LIST_OF_FLOAT; + return Model5Package.eINSTANCE.getGenListOfFloat(); } /** diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfIntArrayImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfIntArrayImpl.java index d5feedec1d..77f01cf41e 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfIntArrayImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfIntArrayImpl.java @@ -69,7 +69,7 @@ public class GenListOfIntArrayImpl extends EObjectImpl implements GenListOfIntAr @Override protected EClass eStaticClass() { - return Model5Package.Literals.GEN_LIST_OF_INT_ARRAY; + return Model5Package.eINSTANCE.getGenListOfIntArray(); } /** diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfIntImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfIntImpl.java index 4360b51d17..2db758877b 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfIntImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfIntImpl.java @@ -69,7 +69,7 @@ public class GenListOfIntImpl extends EObjectImpl implements GenListOfInt @Override protected EClass eStaticClass() { - return Model5Package.Literals.GEN_LIST_OF_INT; + return Model5Package.eINSTANCE.getGenListOfInt(); } /** diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfIntegerImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfIntegerImpl.java index 3c916ed53f..27ee57c32f 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfIntegerImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfIntegerImpl.java @@ -69,7 +69,7 @@ public class GenListOfIntegerImpl extends EObjectImpl implements GenListOfIntege @Override protected EClass eStaticClass() { - return Model5Package.Literals.GEN_LIST_OF_INTEGER; + return Model5Package.eINSTANCE.getGenListOfInteger(); } /** diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfLongImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfLongImpl.java index cc28a8bd2a..ccb7a8290f 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfLongImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfLongImpl.java @@ -69,7 +69,7 @@ public class GenListOfLongImpl extends EObjectImpl implements GenListOfLong @Override protected EClass eStaticClass() { - return Model5Package.Literals.GEN_LIST_OF_LONG; + return Model5Package.eINSTANCE.getGenListOfLong(); } /** diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfShortImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfShortImpl.java index d179798d70..ffe37ae721 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfShortImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfShortImpl.java @@ -69,7 +69,7 @@ public class GenListOfShortImpl extends EObjectImpl implements GenListOfShort @Override protected EClass eStaticClass() { - return Model5Package.Literals.GEN_LIST_OF_SHORT; + return Model5Package.eINSTANCE.getGenListOfShort(); } /** diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfStringImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfStringImpl.java index c94b4d6f9a..193e3b0d5b 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfStringImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfStringImpl.java @@ -69,7 +69,7 @@ public class GenListOfStringImpl extends EObjectImpl implements GenListOfString @Override protected EClass eStaticClass() { - return Model5Package.Literals.GEN_LIST_OF_STRING; + return Model5Package.eINSTANCE.getGenListOfString(); } /** diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/ManagerImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/ManagerImpl.java index 46ed336707..fae5d1b400 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/ManagerImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/ManagerImpl.java @@ -50,7 +50,7 @@ public class ManagerImpl extends EObjectImpl implements Manager @Override protected EClass eStaticClass() { - return Model5Package.Literals.MANAGER; + return Model5Package.eINSTANCE.getManager(); } } // ManagerImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/TestFeatureMapImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/TestFeatureMapImpl.java index a943e9b7bf..873d51ab7d 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/TestFeatureMapImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/TestFeatureMapImpl.java @@ -98,7 +98,7 @@ public class TestFeatureMapImpl extends EObjectImpl implements TestFeatureMap @Override protected EClass eStaticClass() { - return Model5Package.Literals.TEST_FEATURE_MAP; + return Model5Package.eINSTANCE.getTestFeatureMap(); } /** diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/Model5Package.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/Model5Package.java index 61d8f92b1a..d3a95c770f 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/Model5Package.java +++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/Model5Package.java @@ -767,280 +767,4 @@ public interface Model5Package extends EPackage */ Model5Factory getModel5Factory(); - /** - * 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.emf.cdo.tests.model5.impl.TestFeatureMapImpl - * Test Feature Map}' class. - * - * @see org.eclipse.emf.cdo.tests.model5.impl.TestFeatureMapImpl - * @see org.eclipse.emf.cdo.tests.model5.impl.Model5PackageImpl#getTestFeatureMap() - * @generated - */ - EClass TEST_FEATURE_MAP = eINSTANCE.getTestFeatureMap(); - - /** - * The meta object literal for the 'Managers' reference list feature. - * - * @generated - */ - EReference TEST_FEATURE_MAP__MANAGERS = eINSTANCE.getTestFeatureMap_Managers(); - - /** - * The meta object literal for the 'Doctors' reference list feature. - * - * @generated - */ - EReference TEST_FEATURE_MAP__DOCTORS = eINSTANCE.getTestFeatureMap_Doctors(); - - /** - * The meta object literal for the 'People' attribute list feature. - * - * @generated - */ - EAttribute TEST_FEATURE_MAP__PEOPLE = eINSTANCE.getTestFeatureMap_People(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model5.impl.ManagerImpl Manager}' - * class. - * - * @see org.eclipse.emf.cdo.tests.model5.impl.ManagerImpl - * @see org.eclipse.emf.cdo.tests.model5.impl.Model5PackageImpl#getManager() - * @generated - */ - EClass MANAGER = eINSTANCE.getManager(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model5.impl.DoctorImpl Doctor}' class. - * - * - * @see org.eclipse.emf.cdo.tests.model5.impl.DoctorImpl - * @see org.eclipse.emf.cdo.tests.model5.impl.Model5PackageImpl#getDoctor() - * @generated - */ - EClass DOCTOR = eINSTANCE.getDoctor(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model5.impl.GenListOfIntImpl - * Gen List Of Int}' class. - * - * @see org.eclipse.emf.cdo.tests.model5.impl.GenListOfIntImpl - * @see org.eclipse.emf.cdo.tests.model5.impl.Model5PackageImpl#getGenListOfInt() - * @generated - */ - EClass GEN_LIST_OF_INT = eINSTANCE.getGenListOfInt(); - - /** - * The meta object literal for the 'Elements' attribute list feature. - * - * @generated - */ - EAttribute GEN_LIST_OF_INT__ELEMENTS = eINSTANCE.getGenListOfInt_Elements(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model5.impl.GenListOfIntegerImpl - * Gen List Of Integer}' class. - * - * @see org.eclipse.emf.cdo.tests.model5.impl.GenListOfIntegerImpl - * @see org.eclipse.emf.cdo.tests.model5.impl.Model5PackageImpl#getGenListOfInteger() - * @generated - */ - EClass GEN_LIST_OF_INTEGER = eINSTANCE.getGenListOfInteger(); - - /** - * The meta object literal for the 'Elements' attribute list feature. - * - * @generated - */ - EAttribute GEN_LIST_OF_INTEGER__ELEMENTS = eINSTANCE.getGenListOfInteger_Elements(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model5.impl.GenListOfLongImpl - * Gen List Of Long}' class. - * - * @see org.eclipse.emf.cdo.tests.model5.impl.GenListOfLongImpl - * @see org.eclipse.emf.cdo.tests.model5.impl.Model5PackageImpl#getGenListOfLong() - * @generated - */ - EClass GEN_LIST_OF_LONG = eINSTANCE.getGenListOfLong(); - - /** - * The meta object literal for the 'Elements' attribute list feature. - * - * @generated - */ - EAttribute GEN_LIST_OF_LONG__ELEMENTS = eINSTANCE.getGenListOfLong_Elements(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model5.impl.GenListOfBooleanImpl - * Gen List Of Boolean}' class. - * - * @see org.eclipse.emf.cdo.tests.model5.impl.GenListOfBooleanImpl - * @see org.eclipse.emf.cdo.tests.model5.impl.Model5PackageImpl#getGenListOfBoolean() - * @generated - */ - EClass GEN_LIST_OF_BOOLEAN = eINSTANCE.getGenListOfBoolean(); - - /** - * The meta object literal for the 'Elements' attribute list feature. - * - * @generated - */ - EAttribute GEN_LIST_OF_BOOLEAN__ELEMENTS = eINSTANCE.getGenListOfBoolean_Elements(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model5.impl.GenListOfShortImpl - * Gen List Of Short}' class. - * - * @see org.eclipse.emf.cdo.tests.model5.impl.GenListOfShortImpl - * @see org.eclipse.emf.cdo.tests.model5.impl.Model5PackageImpl#getGenListOfShort() - * @generated - */ - EClass GEN_LIST_OF_SHORT = eINSTANCE.getGenListOfShort(); - - /** - * The meta object literal for the 'Elements' attribute list feature. - * - * @generated - */ - EAttribute GEN_LIST_OF_SHORT__ELEMENTS = eINSTANCE.getGenListOfShort_Elements(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model5.impl.GenListOfFloatImpl - * Gen List Of Float}' class. - * - * @see org.eclipse.emf.cdo.tests.model5.impl.GenListOfFloatImpl - * @see org.eclipse.emf.cdo.tests.model5.impl.Model5PackageImpl#getGenListOfFloat() - * @generated - */ - EClass GEN_LIST_OF_FLOAT = eINSTANCE.getGenListOfFloat(); - - /** - * The meta object literal for the 'Elements' attribute list feature. - * - * @generated - */ - EAttribute GEN_LIST_OF_FLOAT__ELEMENTS = eINSTANCE.getGenListOfFloat_Elements(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model5.impl.GenListOfDoubleImpl - * Gen List Of Double}' class. - * - * @see org.eclipse.emf.cdo.tests.model5.impl.GenListOfDoubleImpl - * @see org.eclipse.emf.cdo.tests.model5.impl.Model5PackageImpl#getGenListOfDouble() - * @generated - */ - EClass GEN_LIST_OF_DOUBLE = eINSTANCE.getGenListOfDouble(); - - /** - * The meta object literal for the 'Elements' attribute list feature. - * - * @generated - */ - EAttribute GEN_LIST_OF_DOUBLE__ELEMENTS = eINSTANCE.getGenListOfDouble_Elements(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model5.impl.GenListOfDateImpl - * Gen List Of Date}' class. - * - * @see org.eclipse.emf.cdo.tests.model5.impl.GenListOfDateImpl - * @see org.eclipse.emf.cdo.tests.model5.impl.Model5PackageImpl#getGenListOfDate() - * @generated - */ - EClass GEN_LIST_OF_DATE = eINSTANCE.getGenListOfDate(); - - /** - * The meta object literal for the 'Elements' attribute list feature. - * - * @generated - */ - EAttribute GEN_LIST_OF_DATE__ELEMENTS = eINSTANCE.getGenListOfDate_Elements(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model5.impl.GenListOfCharImpl - * Gen List Of Char}' class. - * - * @see org.eclipse.emf.cdo.tests.model5.impl.GenListOfCharImpl - * @see org.eclipse.emf.cdo.tests.model5.impl.Model5PackageImpl#getGenListOfChar() - * @generated - */ - EClass GEN_LIST_OF_CHAR = eINSTANCE.getGenListOfChar(); - - /** - * The meta object literal for the 'Elements' attribute list feature. - * - * @generated - */ - EAttribute GEN_LIST_OF_CHAR__ELEMENTS = eINSTANCE.getGenListOfChar_Elements(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model5.impl.GenListOfIntArrayImpl - * Gen List Of Int Array}' class. - * - * @see org.eclipse.emf.cdo.tests.model5.impl.GenListOfIntArrayImpl - * @see org.eclipse.emf.cdo.tests.model5.impl.Model5PackageImpl#getGenListOfIntArray() - * @generated - */ - EClass GEN_LIST_OF_INT_ARRAY = eINSTANCE.getGenListOfIntArray(); - - /** - * The meta object literal for the 'Elements' attribute list feature. - * - * @generated - */ - EAttribute GEN_LIST_OF_INT_ARRAY__ELEMENTS = eINSTANCE.getGenListOfIntArray_Elements(); - - /** - * The meta object literal for the 'Int Array' data type. - * - * @see org.eclipse.emf.cdo.tests.model5.impl.Model5PackageImpl#getIntArray() - * @generated - */ - EDataType INT_ARRAY = eINSTANCE.getIntArray(); - - /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model5.impl.GenListOfStringImpl - * Gen List Of String}' class. - * - * @see org.eclipse.emf.cdo.tests.model5.impl.GenListOfStringImpl - * @see org.eclipse.emf.cdo.tests.model5.impl.Model5PackageImpl#getGenListOfString() - * @generated - */ - EClass GEN_LIST_OF_STRING = eINSTANCE.getGenListOfString(); - - /** - * The meta object literal for the 'Elements' attribute list feature. - * - * @generated - */ - EAttribute GEN_LIST_OF_STRING__ELEMENTS = eINSTANCE.getGenListOfString_Elements(); - - } - } // Model5Package diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/DoctorImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/DoctorImpl.java index 95796066e9..606c479042 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/DoctorImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/DoctorImpl.java @@ -51,7 +51,7 @@ public class DoctorImpl extends CDOObjectImpl implements Doctor @Override protected EClass eStaticClass() { - return Model5Package.Literals.DOCTOR; + return Model5Package.eINSTANCE.getDoctor(); } /** diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfBooleanImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfBooleanImpl.java index aa94ebad61..f739e0af69 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfBooleanImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfBooleanImpl.java @@ -57,7 +57,7 @@ public class GenListOfBooleanImpl extends CDOObjectImpl implements GenListOfBool @Override protected EClass eStaticClass() { - return Model5Package.Literals.GEN_LIST_OF_BOOLEAN; + return Model5Package.eINSTANCE.getGenListOfBoolean(); } /** @@ -79,7 +79,7 @@ public class GenListOfBooleanImpl extends CDOObjectImpl implements GenListOfBool @SuppressWarnings("unchecked") public EList getElements() { - return (EList)eGet(Model5Package.Literals.GEN_LIST_OF_BOOLEAN__ELEMENTS, true); + return (EList)eGet(Model5Package.eINSTANCE.getGenListOfBoolean_Elements(), true); } } // GenListOfBooleanImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfCharImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfCharImpl.java index c6406f6356..f6b27457b3 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfCharImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfCharImpl.java @@ -57,7 +57,7 @@ public class GenListOfCharImpl extends CDOObjectImpl implements GenListOfChar @Override protected EClass eStaticClass() { - return Model5Package.Literals.GEN_LIST_OF_CHAR; + return Model5Package.eINSTANCE.getGenListOfChar(); } /** @@ -79,7 +79,7 @@ public class GenListOfCharImpl extends CDOObjectImpl implements GenListOfChar @SuppressWarnings("unchecked") public EList getElements() { - return (EList)eGet(Model5Package.Literals.GEN_LIST_OF_CHAR__ELEMENTS, true); + return (EList)eGet(Model5Package.eINSTANCE.getGenListOfChar_Elements(), true); } } // GenListOfCharImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfDateImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfDateImpl.java index 6131d95566..2486ce2808 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfDateImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfDateImpl.java @@ -59,7 +59,7 @@ public class GenListOfDateImpl extends CDOObjectImpl implements GenListOfDate @Override protected EClass eStaticClass() { - return Model5Package.Literals.GEN_LIST_OF_DATE; + return Model5Package.eINSTANCE.getGenListOfDate(); } /** @@ -81,7 +81,7 @@ public class GenListOfDateImpl extends CDOObjectImpl implements GenListOfDate @SuppressWarnings("unchecked") public EList getElements() { - return (EList)eGet(Model5Package.Literals.GEN_LIST_OF_DATE__ELEMENTS, true); + return (EList)eGet(Model5Package.eINSTANCE.getGenListOfDate_Elements(), true); } } // GenListOfDateImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfDoubleImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfDoubleImpl.java index 70a84357b4..bb0a1c119a 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfDoubleImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfDoubleImpl.java @@ -57,7 +57,7 @@ public class GenListOfDoubleImpl extends CDOObjectImpl implements GenListOfDoubl @Override protected EClass eStaticClass() { - return Model5Package.Literals.GEN_LIST_OF_DOUBLE; + return Model5Package.eINSTANCE.getGenListOfDouble(); } /** @@ -79,7 +79,7 @@ public class GenListOfDoubleImpl extends CDOObjectImpl implements GenListOfDoubl @SuppressWarnings("unchecked") public EList getElements() { - return (EList)eGet(Model5Package.Literals.GEN_LIST_OF_DOUBLE__ELEMENTS, true); + return (EList)eGet(Model5Package.eINSTANCE.getGenListOfDouble_Elements(), true); } } // GenListOfDoubleImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfFloatImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfFloatImpl.java index 1a68da6d62..11cc10b53f 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfFloatImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfFloatImpl.java @@ -57,7 +57,7 @@ public class GenListOfFloatImpl extends CDOObjectImpl implements GenListOfFloat @Override protected EClass eStaticClass() { - return Model5Package.Literals.GEN_LIST_OF_FLOAT; + return Model5Package.eINSTANCE.getGenListOfFloat(); } /** @@ -79,7 +79,7 @@ public class GenListOfFloatImpl extends CDOObjectImpl implements GenListOfFloat @SuppressWarnings("unchecked") public EList getElements() { - return (EList)eGet(Model5Package.Literals.GEN_LIST_OF_FLOAT__ELEMENTS, true); + return (EList)eGet(Model5Package.eINSTANCE.getGenListOfFloat_Elements(), true); } } // GenListOfFloatImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfIntArrayImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfIntArrayImpl.java index 64d6cf7fc2..205469caf0 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfIntArrayImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfIntArrayImpl.java @@ -57,7 +57,7 @@ public class GenListOfIntArrayImpl extends CDOObjectImpl implements GenListOfInt @Override protected EClass eStaticClass() { - return Model5Package.Literals.GEN_LIST_OF_INT_ARRAY; + return Model5Package.eINSTANCE.getGenListOfIntArray(); } /** @@ -79,7 +79,7 @@ public class GenListOfIntArrayImpl extends CDOObjectImpl implements GenListOfInt @SuppressWarnings("unchecked") public EList getElements() { - return (EList)eGet(Model5Package.Literals.GEN_LIST_OF_INT_ARRAY__ELEMENTS, true); + return (EList)eGet(Model5Package.eINSTANCE.getGenListOfIntArray_Elements(), true); } } // GenListOfIntArrayImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfIntImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfIntImpl.java index 31a8fab94b..2fe9cc5879 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfIntImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfIntImpl.java @@ -57,7 +57,7 @@ public class GenListOfIntImpl extends CDOObjectImpl implements GenListOfInt @Override protected EClass eStaticClass() { - return Model5Package.Literals.GEN_LIST_OF_INT; + return Model5Package.eINSTANCE.getGenListOfInt(); } /** @@ -79,7 +79,7 @@ public class GenListOfIntImpl extends CDOObjectImpl implements GenListOfInt @SuppressWarnings("unchecked") public EList getElements() { - return (EList)eGet(Model5Package.Literals.GEN_LIST_OF_INT__ELEMENTS, true); + return (EList)eGet(Model5Package.eINSTANCE.getGenListOfInt_Elements(), true); } } // GenListOfIntImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfIntegerImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfIntegerImpl.java index 7f431993d8..a99d1b190f 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfIntegerImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfIntegerImpl.java @@ -57,7 +57,7 @@ public class GenListOfIntegerImpl extends CDOObjectImpl implements GenListOfInte @Override protected EClass eStaticClass() { - return Model5Package.Literals.GEN_LIST_OF_INTEGER; + return Model5Package.eINSTANCE.getGenListOfInteger(); } /** @@ -79,7 +79,7 @@ public class GenListOfIntegerImpl extends CDOObjectImpl implements GenListOfInte @SuppressWarnings("unchecked") public EList getElements() { - return (EList)eGet(Model5Package.Literals.GEN_LIST_OF_INTEGER__ELEMENTS, true); + return (EList)eGet(Model5Package.eINSTANCE.getGenListOfInteger_Elements(), true); } } // GenListOfIntegerImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfLongImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfLongImpl.java index a8bda3c331..b5905ebdd3 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfLongImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfLongImpl.java @@ -57,7 +57,7 @@ public class GenListOfLongImpl extends CDOObjectImpl implements GenListOfLong @Override protected EClass eStaticClass() { - return Model5Package.Literals.GEN_LIST_OF_LONG; + return Model5Package.eINSTANCE.getGenListOfLong(); } /** @@ -79,7 +79,7 @@ public class GenListOfLongImpl extends CDOObjectImpl implements GenListOfLong @SuppressWarnings("unchecked") public EList getElements() { - return (EList)eGet(Model5Package.Literals.GEN_LIST_OF_LONG__ELEMENTS, true); + return (EList)eGet(Model5Package.eINSTANCE.getGenListOfLong_Elements(), true); } } // GenListOfLongImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfShortImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfShortImpl.java index d8ee089aef..289a55e00f 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfShortImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfShortImpl.java @@ -57,7 +57,7 @@ public class GenListOfShortImpl extends CDOObjectImpl implements GenListOfShort @Override protected EClass eStaticClass() { - return Model5Package.Literals.GEN_LIST_OF_SHORT; + return Model5Package.eINSTANCE.getGenListOfShort(); } /** @@ -79,7 +79,7 @@ public class GenListOfShortImpl extends CDOObjectImpl implements GenListOfShort @SuppressWarnings("unchecked") public EList getElements() { - return (EList)eGet(Model5Package.Literals.GEN_LIST_OF_SHORT__ELEMENTS, true); + return (EList)eGet(Model5Package.eINSTANCE.getGenListOfShort_Elements(), true); } } // GenListOfShortImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfStringImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfStringImpl.java index 27bb9b7705..ec434b6c6b 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfStringImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfStringImpl.java @@ -57,7 +57,7 @@ public class GenListOfStringImpl extends CDOObjectImpl implements GenListOfStrin @Override protected EClass eStaticClass() { - return Model5Package.Literals.GEN_LIST_OF_STRING; + return Model5Package.eINSTANCE.getGenListOfString(); } /** @@ -79,7 +79,7 @@ public class GenListOfStringImpl extends CDOObjectImpl implements GenListOfStrin @SuppressWarnings("unchecked") public EList getElements() { - return (EList)eGet(Model5Package.Literals.GEN_LIST_OF_STRING__ELEMENTS, true); + return (EList)eGet(Model5Package.eINSTANCE.getGenListOfString_Elements(), true); } } // GenListOfStringImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/ManagerImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/ManagerImpl.java index 81b70518a1..209848d364 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/ManagerImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/ManagerImpl.java @@ -51,7 +51,7 @@ public class ManagerImpl extends CDOObjectImpl implements Manager @Override protected EClass eStaticClass() { - return Model5Package.Literals.MANAGER; + return Model5Package.eINSTANCE.getManager(); } /** diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/TestFeatureMapImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/TestFeatureMapImpl.java index 35df960171..99126521e0 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/TestFeatureMapImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/TestFeatureMapImpl.java @@ -62,7 +62,7 @@ public class TestFeatureMapImpl extends CDOObjectImpl implements TestFeatureMap @Override protected EClass eStaticClass() { - return Model5Package.Literals.TEST_FEATURE_MAP; + return Model5Package.eINSTANCE.getTestFeatureMap(); } /** @@ -84,7 +84,7 @@ public class TestFeatureMapImpl extends CDOObjectImpl implements TestFeatureMap @SuppressWarnings("unchecked") public EList getManagers() { - return (EList)eGet(Model5Package.Literals.TEST_FEATURE_MAP__MANAGERS, true); + return (EList)eGet(Model5Package.eINSTANCE.getTestFeatureMap_Managers(), true); } /** @@ -95,7 +95,7 @@ public class TestFeatureMapImpl extends CDOObjectImpl implements TestFeatureMap @SuppressWarnings("unchecked") public EList getDoctors() { - return (EList)eGet(Model5Package.Literals.TEST_FEATURE_MAP__DOCTORS, true); + return (EList)eGet(Model5Package.eINSTANCE.getTestFeatureMap_Doctors(), true); } /** @@ -105,7 +105,7 @@ public class TestFeatureMapImpl extends CDOObjectImpl implements TestFeatureMap */ public FeatureMap getPeople() { - return (FeatureMap)eGet(Model5Package.Literals.TEST_FEATURE_MAP__PEOPLE, true); + return (FeatureMap)eGet(Model5Package.eINSTANCE.getTestFeatureMap_People(), true); } } // TestFeatureMapImpl diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_305527_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_305527_Test.java index 1483bfcb2c..b9b510f29a 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_305527_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_305527_Test.java @@ -33,6 +33,7 @@ public class Bugzilla_305527_Test extends AbstractCDOTest { public void testAvoidReferencingDifferentViews() throws CommitException { + skipConfig(LEGACY); skipUnlessAuditing(); final CDOSession session = openSession(); long commitTime; diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_335772_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_335772_Test.java index f61420420d..4b086578bb 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_335772_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_335772_Test.java @@ -1,3 +1,13 @@ +/** + * Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Eike Stepper - initial API and implementation + */ package org.eclipse.emf.cdo.tests.bugzilla; import org.eclipse.emf.cdo.common.id.CDOID; @@ -6,7 +16,6 @@ import org.eclipse.emf.cdo.session.CDOSession; import org.eclipse.emf.cdo.tests.AbstractCDOTest; import org.eclipse.emf.cdo.tests.model1.Customer; import org.eclipse.emf.cdo.tests.model1.Model1Factory; -import org.eclipse.emf.cdo.tests.model1.Model1Package; import org.eclipse.emf.cdo.tests.model1.Product1; import org.eclipse.emf.cdo.tests.model1.SalesOrder; import org.eclipse.emf.cdo.transaction.CDOTransaction; @@ -20,6 +29,9 @@ import org.eclipse.emf.ecore.EObject; import java.util.HashMap; import java.util.Map; +/** + * @author Eike Stepper + */ public class Bugzilla_335772_Test extends AbstractCDOTest { @@ -53,7 +65,7 @@ public class Bugzilla_335772_Test extends AbstractCDOTest map = new HashMap(); map.put(product1, order1); - customer.eSet(Model1Package.Literals.CUSTOMER__ORDER_BY_PRODUCT, map); + customer.eSet(getModel1Package().getCustomer_OrderByProduct(), map); // delegateEList is not empty at this point customer.getOrderByProduct().get(0); @@ -99,14 +111,14 @@ public class Bugzilla_335772_Test extends AbstractCDOTest { map.put(product1, order2); assertEquals(1, map.size()); - customer.eSet(Model1Package.Literals.CUSTOMER__ORDER_BY_PRODUCT, map); + customer.eSet(getModel1Package().getCustomer_OrderByProduct(), map); } private void addMapEntry() { map.put(product2, order2); assertEquals(2, map.size()); - customer.eSet(Model1Package.Literals.CUSTOMER__ORDER_BY_PRODUCT, map); + customer.eSet(getModel1Package().getCustomer_OrderByProduct(), map); } private Integer persistAndRetrieveOrderIdForProduct1() throws CommitException -- cgit v1.2.3