diff options
| author | Eike Stepper | 2011-01-07 18:02:25 +0000 |
|---|---|---|
| committer | Eike Stepper | 2011-01-07 18:02:25 +0000 |
| commit | 85526250336e72dac2ebd742219905dbbb8a2e0c (patch) | |
| tree | ffeb996948be607f01d00baa6775c818ccc03377 | |
| parent | 47704f34a4561db54ffc7d00e8d43220350f6157 (diff) | |
| download | cdo-85526250336e72dac2ebd742219905dbbb8a2e0c.tar.gz cdo-85526250336e72dac2ebd742219905dbbb8a2e0c.tar.xz cdo-85526250336e72dac2ebd742219905dbbb8a2e0c.zip | |
[333648] querying the XRef and ensureReferentialIntegrity=true with abstract EMF classes
https://bugs.eclipse.org/bugs/show_bug.cgi?id=333648
73 files changed, 1215 insertions, 2088 deletions
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/AbstractMappingStrategy.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/AbstractMappingStrategy.java index fc1404e0e6..ff581d93e5 100644 --- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/AbstractMappingStrategy.java +++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/AbstractMappingStrategy.java @@ -529,6 +529,11 @@ public abstract class AbstractMappingStrategy extends Lifecycle implements IMapp public final IClassMapping getClassMapping(EClass eClass) { + if (!isMapped(eClass)) + { + throw new IllegalArgumentException("Class is not mapped: " + eClass); + } + // Try without synchronization first; this will almost always succeed, so it avoids the // performance penalty of syncing in the majority of cases IClassMapping result = classMappings.get(eClass); @@ -586,7 +591,7 @@ public abstract class AbstractMappingStrategy extends Lifecycle implements IMapp if (eClassifier instanceof EClass) { EClass eClass = (EClass)eClassifier; - if (!eClass.isAbstract() && !eClass.isInterface()) + if (isMapped(eClass)) { getClassMapping(eClass); // Get or create it } @@ -596,6 +601,8 @@ public abstract class AbstractMappingStrategy extends Lifecycle implements IMapp } } + protected abstract boolean isMapped(EClass eClass); + public ITypeMapping createValueMapping(EStructuralFeature feature) { ITypeMapping.Provider provider = getTypeMappingProvider(); diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/AbstractHorizontalMappingStrategy.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/AbstractHorizontalMappingStrategy.java index 5b432a0591..25ad04b8ea 100644 --- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/AbstractHorizontalMappingStrategy.java +++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/AbstractHorizontalMappingStrategy.java @@ -295,6 +295,12 @@ public abstract class AbstractHorizontalMappingStrategy extends AbstractMappingS } @Override + protected boolean isMapped(EClass eClass) + { + return !eClass.isAbstract() && !eClass.isInterface(); + } + + @Override protected Collection<EClass> getClassesWithObjectInfo() { return getClassMappings().keySet(); diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/XRefsQueryHandler.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/XRefsQueryHandler.java index da7e3732db..c3f7702fc8 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/XRefsQueryHandler.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/XRefsQueryHandler.java @@ -123,11 +123,14 @@ public class XRefsQueryHandler implements IQueryHandler public static void collectSourceCandidates(EClass eClass, Collection<EClass> concreteTypes, Map<EClass, List<EReference>> sourceCandidates) { - for (EStructuralFeature eStructuralFeature : eClass.getEAllStructuralFeatures()) + if (!eClass.isAbstract() && !eClass.isInterface()) { - if (eStructuralFeature instanceof EReference && EMFUtil.isPersistent(eStructuralFeature)) + for (EStructuralFeature eStructuralFeature : eClass.getEAllStructuralFeatures()) { - collectSourceCandidates(eClass, (EReference)eStructuralFeature, concreteTypes, sourceCandidates); + if (eStructuralFeature instanceof EReference && EMFUtil.isPersistent(eStructuralFeature)) + { + collectSourceCandidates(eClass, (EReference)eStructuralFeature, concreteTypes, sourceCandidates); + } } } } diff --git a/plugins/org.eclipse.emf.cdo.tests.db/CDO AutomatedTests (DBStore).launch b/plugins/org.eclipse.emf.cdo.tests.db/CDO AllTests (DBStore).launch index fd2779465f..fd2779465f 100644 --- a/plugins/org.eclipse.emf.cdo.tests.db/CDO AutomatedTests (DBStore).launch +++ b/plugins/org.eclipse.emf.cdo.tests.db/CDO AllTests (DBStore).launch diff --git a/plugins/org.eclipse.emf.cdo.tests.db/build.properties b/plugins/org.eclipse.emf.cdo.tests.db/build.properties index 68c82f4c98..f6c72dd766 100644 --- a/plugins/org.eclipse.emf.cdo.tests.db/build.properties +++ b/plugins/org.eclipse.emf.cdo.tests.db/build.properties @@ -28,4 +28,4 @@ src.includes = about.html,\ CDO AllTests (Hsqldb non-audit).launch,\ CDO AllTests (Mysql).launch,\ CDO AllTests (PostgreSQL non-audit).launch,\ - CDO AutomatedTests (DBStore).launch + CDO AllTests (DBStore).launch diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/DISABLE_XRefTest.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/DISABLE_XRefTest.java index 228954d7a2..2477f2efd4 100644 --- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/DISABLE_XRefTest.java +++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/DISABLE_XRefTest.java @@ -4,7 +4,7 @@ * 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 */ @@ -19,23 +19,30 @@ import org.eclipse.emf.cdo.tests.db.AllTestsDBH2.H2; public class DISABLE_XRefTest extends XRefTest { @Override - public void testCrossReferenceMultivalueEReferenceQuery() throws Exception + protected void doSetUp() throws Exception { + super.doSetUp(); skipConfig(H2.ReusableFolder.RANGE_INSTANCE); - super.testCrossReferenceMultivalueEReferenceQuery(); } - @Override - public void testXRefsToMany() throws Exception - { - skipConfig(H2.ReusableFolder.RANGE_INSTANCE); - super.testXRefsToMany(); - } - - @Override - public void testXRefsToOne() throws Exception - { - skipConfig(H2.ReusableFolder.RANGE_INSTANCE); - super.testXRefsToOne(); - } + // @Override + // public void testCrossReferenceMultivalueEReferenceQuery() throws Exception + // { + // skipConfig(H2.ReusableFolder.RANGE_INSTANCE); + // super.testCrossReferenceMultivalueEReferenceQuery(); + // } + // + // @Override + // public void testXRefsToMany() throws Exception + // { + // skipConfig(H2.ReusableFolder.RANGE_INSTANCE); + // super.testXRefsToMany(); + // } + // + // @Override + // public void testXRefsToOne() throws Exception + // { + // skipConfig(H2.ReusableFolder.RANGE_INSTANCE); + // super.testXRefsToOne(); + // } } diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/model/model1.ecore b/plugins/org.eclipse.emf.cdo.tests.model1/model/model1.ecore index b9b7bcebec..402722dcf5 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/model/model1.ecore +++ b/plugins/org.eclipse.emf.cdo.tests.model1/model/model1.ecore @@ -35,7 +35,7 @@ <eStructuralFeatures xsi:type="ecore:EReference" name="orderByProduct" upperBound="-1" eType="#//ProductToOrder" containment="true"/> </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="Order"> + <eClassifiers xsi:type="ecore:EClass" name="Order" abstract="true"> <eAnnotations source="teneo.jpa"> <details key="value" value="@Entity(name="BaseOrder")"/> </eAnnotations> 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 7066996757..467b04cdf7 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 @@ -14,7 +14,6 @@ import org.eclipse.emf.cdo.tests.model1.Address; import org.eclipse.emf.cdo.tests.model1.Category; import org.eclipse.emf.cdo.tests.model1.Company; import org.eclipse.emf.cdo.tests.model1.Customer; -import org.eclipse.emf.cdo.tests.model1.Order; import org.eclipse.emf.cdo.tests.model1.OrderAddress; import org.eclipse.emf.cdo.tests.model1.OrderDetail; import org.eclipse.emf.cdo.tests.model1.Product1; @@ -25,7 +24,6 @@ import org.eclipse.emf.cdo.tests.model1.Supplier; /** * <!-- begin-user-doc --> The <b>Factory</b> for the model. It provides a create method for each non-abstract class of * the model. <!-- end-user-doc --> - * * @see org.eclipse.emf.cdo.tests.legacy.model1.Model1Package * @generated */ @@ -33,109 +31,100 @@ public interface Model1Factory extends org.eclipse.emf.cdo.tests.model1.Model1Fa { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @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. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The singleton instance of the factory. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ Model1Factory eINSTANCE = org.eclipse.emf.cdo.tests.legacy.model1.impl.Model1FactoryImpl.init(); /** - * Returns a new object of class '<em>Address</em>'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns a new object of class '<em>Address</em>'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return a new object of class '<em>Address</em>'. * @generated */ Address createAddress(); /** - * Returns a new object of class '<em>Company</em>'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns a new object of class '<em>Company</em>'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return a new object of class '<em>Company</em>'. * @generated */ Company createCompany(); /** - * Returns a new object of class '<em>Supplier</em>'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns a new object of class '<em>Supplier</em>'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return a new object of class '<em>Supplier</em>'. * @generated */ Supplier createSupplier(); /** - * Returns a new object of class '<em>Customer</em>'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns a new object of class '<em>Customer</em>'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return a new object of class '<em>Customer</em>'. * @generated */ Customer createCustomer(); /** - * Returns a new object of class '<em>Order</em>'. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @return a new object of class '<em>Order</em>'. - * @generated - */ - Order createOrder(); - - /** - * Returns a new object of class '<em>Order Detail</em>'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns a new object of class '<em>Order Detail</em>'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return a new object of class '<em>Order Detail</em>'. * @generated */ OrderDetail createOrderDetail(); /** - * Returns a new object of class '<em>Purchase Order</em>'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns a new object of class '<em>Purchase Order</em>'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return a new object of class '<em>Purchase Order</em>'. * @generated */ PurchaseOrder createPurchaseOrder(); /** - * Returns a new object of class '<em>Sales Order</em>'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns a new object of class '<em>Sales Order</em>'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return a new object of class '<em>Sales Order</em>'. * @generated */ SalesOrder createSalesOrder(); /** - * Returns a new object of class '<em>Category</em>'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns a new object of class '<em>Category</em>'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return a new object of class '<em>Category</em>'. * @generated */ Category createCategory(); /** - * Returns a new object of class '<em>Product1</em>'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns a new object of class '<em>Product1</em>'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return a new object of class '<em>Product1</em>'. * @generated */ Product1 createProduct1(); /** - * Returns a new object of class '<em>Order Address</em>'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns a new object of class '<em>Order Address</em>'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return a new object of class '<em>Order Address</em>'. * @generated */ OrderAddress createOrderAddress(); /** - * Returns the package supported by this factory. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns the package supported by this factory. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @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 a8e225ab39..1901ec0362 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,23 +24,22 @@ import org.eclipse.emf.ecore.EReference; * <li>and each data type</li> * </ul> * <!-- end-user-doc --> - * * @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\")})'" * @generated */ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Package { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @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. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The package name. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ String eNAME = "model1"; @@ -53,23 +52,22 @@ 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. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The package namespace name. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ String eNS_PREFIX = "model1"; /** - * The singleton instance of the package. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The singleton instance of the package. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @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 <em>Address</em>}' - * class. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.AddressImpl <em>Address</em>}' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.AddressImpl * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.Model1PackageImpl#getAddress() * @generated @@ -77,41 +75,40 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa int ADDRESS = 0; /** - * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Name</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int ADDRESS__NAME = 0; /** - * The feature id for the '<em><b>Street</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Street</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int ADDRESS__STREET = 1; /** - * The feature id for the '<em><b>City</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>City</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int ADDRESS__CITY = 2; /** - * The number of structural features of the '<em>Address</em>' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The number of structural features of the '<em>Address</em>' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int ADDRESS_FEATURE_COUNT = 3; /** - * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.CompanyImpl <em>Company</em>}' - * class. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.CompanyImpl <em>Company</em>}' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.CompanyImpl * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.Model1PackageImpl#getCompany() * @generated @@ -119,86 +116,85 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa int COMPANY = 1; /** - * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Name</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int COMPANY__NAME = ADDRESS__NAME; /** - * The feature id for the '<em><b>Street</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Street</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int COMPANY__STREET = ADDRESS__STREET; /** - * The feature id for the '<em><b>City</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>City</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int COMPANY__CITY = ADDRESS__CITY; /** - * The feature id for the '<em><b>Categories</b></em>' containment reference list. <!-- begin-user-doc --> <!-- + * The feature id for the '<em><b>Categories</b></em>' containment reference list. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated * @ordered */ int COMPANY__CATEGORIES = ADDRESS_FEATURE_COUNT + 0; /** - * The feature id for the '<em><b>Suppliers</b></em>' containment reference list. <!-- begin-user-doc --> <!-- + * The feature id for the '<em><b>Suppliers</b></em>' containment reference list. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated * @ordered */ int COMPANY__SUPPLIERS = ADDRESS_FEATURE_COUNT + 1; /** - * The feature id for the '<em><b>Customers</b></em>' containment reference list. <!-- begin-user-doc --> <!-- + * The feature id for the '<em><b>Customers</b></em>' containment reference list. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated * @ordered */ int COMPANY__CUSTOMERS = ADDRESS_FEATURE_COUNT + 2; /** - * The feature id for the '<em><b>Purchase Orders</b></em>' containment reference list. <!-- begin-user-doc --> <!-- + * The feature id for the '<em><b>Purchase Orders</b></em>' containment reference list. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated * @ordered */ int COMPANY__PURCHASE_ORDERS = ADDRESS_FEATURE_COUNT + 3; /** - * The feature id for the '<em><b>Sales Orders</b></em>' containment reference list. <!-- begin-user-doc --> <!-- + * The feature id for the '<em><b>Sales Orders</b></em>' containment reference list. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated * @ordered */ int COMPANY__SALES_ORDERS = ADDRESS_FEATURE_COUNT + 4; /** - * The number of structural features of the '<em>Company</em>' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The number of structural features of the '<em>Company</em>' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @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 <em>Supplier</em>}' - * class. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.SupplierImpl <em>Supplier</em>}' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.SupplierImpl * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.Model1PackageImpl#getSupplier() * @generated @@ -206,24 +202,24 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa int SUPPLIER = 2; /** - * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Name</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int SUPPLIER__NAME = ADDRESS__NAME; /** - * The feature id for the '<em><b>Street</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Street</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int SUPPLIER__STREET = ADDRESS__STREET; /** - * The feature id for the '<em><b>City</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>City</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ @@ -239,25 +235,24 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa int SUPPLIER__PURCHASE_ORDERS = ADDRESS_FEATURE_COUNT + 0; /** - * The feature id for the '<em><b>Preferred</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Preferred</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int SUPPLIER__PREFERRED = ADDRESS_FEATURE_COUNT + 1; /** - * The number of structural features of the '<em>Supplier</em>' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The number of structural features of the '<em>Supplier</em>' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @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 <em>Customer</em>}' - * class. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.CustomerImpl <em>Customer</em>}' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.CustomerImpl * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.Model1PackageImpl#getCustomer() * @generated @@ -265,48 +260,48 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa int CUSTOMER = 3; /** - * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Name</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int CUSTOMER__NAME = ADDRESS__NAME; /** - * The feature id for the '<em><b>Street</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Street</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int CUSTOMER__STREET = ADDRESS__STREET; /** - * The feature id for the '<em><b>City</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>City</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int CUSTOMER__CITY = ADDRESS__CITY; /** - * The feature id for the '<em><b>Sales Orders</b></em>' reference list. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Sales Orders</b></em>' reference list. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int CUSTOMER__SALES_ORDERS = ADDRESS_FEATURE_COUNT + 0; /** - * The feature id for the '<em><b>Order By Product</b></em>' map. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Order By Product</b></em>' map. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int CUSTOMER__ORDER_BY_PRODUCT = ADDRESS_FEATURE_COUNT + 1; /** - * The number of structural features of the '<em>Customer</em>' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The number of structural features of the '<em>Customer</em>' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ @@ -315,7 +310,6 @@ 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 <em>Order</em>}' class. * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.OrderImpl * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.Model1PackageImpl#getOrder() * @generated @@ -323,26 +317,25 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa int ORDER = 4; /** - * The feature id for the '<em><b>Order Details</b></em>' containment reference list. <!-- begin-user-doc --> <!-- + * The feature id for the '<em><b>Order Details</b></em>' containment reference list. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated * @ordered */ int ORDER__ORDER_DETAILS = 0; /** - * The number of structural features of the '<em>Order</em>' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The number of structural features of the '<em>Order</em>' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int ORDER_FEATURE_COUNT = 1; /** - * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.OrderDetailImpl - * <em>Order Detail</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.OrderDetailImpl <em>Order Detail</em>}' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.OrderDetailImpl * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.Model1PackageImpl#getOrderDetail() * @generated @@ -350,24 +343,24 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa int ORDER_DETAIL = 5; /** - * The feature id for the '<em><b>Order</b></em>' container reference. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Order</b></em>' container reference. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int ORDER_DETAIL__ORDER = 0; /** - * The feature id for the '<em><b>Product</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Product</b></em>' reference. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int ORDER_DETAIL__PRODUCT = 1; /** - * The feature id for the '<em><b>Price</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Price</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ @@ -383,9 +376,8 @@ 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 - * <em>Purchase Order</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.PurchaseOrderImpl <em>Purchase Order</em>}' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.PurchaseOrderImpl * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.Model1PackageImpl#getPurchaseOrder() * @generated @@ -393,25 +385,25 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa int PURCHASE_ORDER = 6; /** - * The feature id for the '<em><b>Order Details</b></em>' containment reference list. <!-- begin-user-doc --> <!-- + * The feature id for the '<em><b>Order Details</b></em>' containment reference list. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated * @ordered */ int PURCHASE_ORDER__ORDER_DETAILS = ORDER__ORDER_DETAILS; /** - * The feature id for the '<em><b>Date</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Date</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int PURCHASE_ORDER__DATE = ORDER_FEATURE_COUNT + 0; /** - * The feature id for the '<em><b>Supplier</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Supplier</b></em>' reference. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ @@ -427,9 +419,8 @@ 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 - * <em>Sales Order</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.SalesOrderImpl <em>Sales Order</em>}' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.SalesOrderImpl * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.Model1PackageImpl#getSalesOrder() * @generated @@ -437,25 +428,25 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa int SALES_ORDER = 7; /** - * The feature id for the '<em><b>Order Details</b></em>' containment reference list. <!-- begin-user-doc --> <!-- + * The feature id for the '<em><b>Order Details</b></em>' containment reference list. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated * @ordered */ int SALES_ORDER__ORDER_DETAILS = ORDER__ORDER_DETAILS; /** - * The feature id for the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Id</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int SALES_ORDER__ID = ORDER_FEATURE_COUNT + 0; /** - * The feature id for the '<em><b>Customer</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Customer</b></em>' reference. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ @@ -471,9 +462,8 @@ 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 <em>Category</em>}' - * class. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.CategoryImpl <em>Category</em>}' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.CategoryImpl * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.Model1PackageImpl#getCategory() * @generated @@ -481,43 +471,42 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa int CATEGORY = 8; /** - * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Name</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int CATEGORY__NAME = 0; /** - * The feature id for the '<em><b>Categories</b></em>' containment reference list. <!-- begin-user-doc --> <!-- + * The feature id for the '<em><b>Categories</b></em>' containment reference list. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated * @ordered */ int CATEGORY__CATEGORIES = 1; /** - * The feature id for the '<em><b>Products</b></em>' containment reference list. <!-- begin-user-doc --> <!-- + * The feature id for the '<em><b>Products</b></em>' containment reference list. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated * @ordered */ int CATEGORY__PRODUCTS = 2; /** - * The number of structural features of the '<em>Category</em>' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The number of structural features of the '<em>Category</em>' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int CATEGORY_FEATURE_COUNT = 3; /** - * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.Product1Impl <em>Product1</em>}' - * class. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.Product1Impl <em>Product1</em>}' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.Product1Impl * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.Model1PackageImpl#getProduct1() * @generated @@ -525,8 +514,8 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa int PRODUCT1 = 9; /** - * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Name</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ @@ -542,33 +531,32 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa int PRODUCT1__ORDER_DETAILS = 1; /** - * The feature id for the '<em><b>Vat</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Vat</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int PRODUCT1__VAT = 2; /** - * The feature id for the '<em><b>Description</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Description</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int PRODUCT1__DESCRIPTION = 3; /** - * The number of structural features of the '<em>Product1</em>' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The number of structural features of the '<em>Product1</em>' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int PRODUCT1_FEATURE_COUNT = 4; /** - * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.OrderAddressImpl - * <em>Order Address</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.OrderAddressImpl <em>Order Address</em>}' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.OrderAddressImpl * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.Model1PackageImpl#getOrderAddress() * @generated @@ -576,65 +564,65 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa int ORDER_ADDRESS = 10; /** - * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Name</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int ORDER_ADDRESS__NAME = ADDRESS__NAME; /** - * The feature id for the '<em><b>Street</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Street</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int ORDER_ADDRESS__STREET = ADDRESS__STREET; /** - * The feature id for the '<em><b>City</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>City</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int ORDER_ADDRESS__CITY = ADDRESS__CITY; /** - * The feature id for the '<em><b>Order Details</b></em>' containment reference list. <!-- begin-user-doc --> <!-- + * The feature id for the '<em><b>Order Details</b></em>' containment reference list. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated * @ordered */ int ORDER_ADDRESS__ORDER_DETAILS = ADDRESS_FEATURE_COUNT + 0; /** - * The feature id for the '<em><b>Order</b></em>' container reference. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Order</b></em>' container reference. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int ORDER_ADDRESS__ORDER = ADDRESS_FEATURE_COUNT + 1; /** - * The feature id for the '<em><b>Product</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Product</b></em>' reference. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int ORDER_ADDRESS__PRODUCT = ADDRESS_FEATURE_COUNT + 2; /** - * The feature id for the '<em><b>Price</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Price</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int ORDER_ADDRESS__PRICE = ADDRESS_FEATURE_COUNT + 3; /** - * The feature id for the '<em><b>Test Attribute</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Test Attribute</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ @@ -650,9 +638,8 @@ 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 - * <em>Product To Order</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.ProductToOrderImpl <em>Product To Order</em>}' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.ProductToOrderImpl * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.Model1PackageImpl#getProductToOrder() * @generated @@ -660,25 +647,25 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa int PRODUCT_TO_ORDER = 11; /** - * The feature id for the '<em><b>Key</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Key</b></em>' reference. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int PRODUCT_TO_ORDER__KEY = 0; /** - * The feature id for the '<em><b>Value</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Value</b></em>' reference. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int PRODUCT_TO_ORDER__VALUE = 1; /** - * The number of structural features of the '<em>Product To Order</em>' class. <!-- begin-user-doc --> <!-- + * The number of structural features of the '<em>Product To Order</em>' class. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated * @ordered */ @@ -705,9 +692,8 @@ 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 - * <em>Name</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model1.Address#getName <em>Name</em>}'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return the meta object for the attribute '<em>Name</em>'. * @see org.eclipse.emf.cdo.tests.legacy.model1.Address#getName() * @see #getAddress() @@ -716,9 +702,8 @@ 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 - * <em>Street</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model1.Address#getStreet <em>Street</em>}'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return the meta object for the attribute '<em>Street</em>'. * @see org.eclipse.emf.cdo.tests.legacy.model1.Address#getStreet() * @see #getAddress() @@ -727,9 +712,8 @@ 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 - * <em>City</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model1.Address#getCity <em>City</em>}'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return the meta object for the attribute '<em>City</em>'. * @see org.eclipse.emf.cdo.tests.legacy.model1.Address#getCity() * @see #getAddress() @@ -748,10 +732,9 @@ 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 <em>Categories</em>}'. <!-- begin-user-doc --> + * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.legacy.model1.Company#getCategories <em>Categories</em>}'. + * <!-- begin-user-doc --> * <!-- end-user-doc --> - * * @return the meta object for the containment reference list '<em>Categories</em>'. * @see org.eclipse.emf.cdo.tests.legacy.model1.Company#getCategories() * @see #getCompany() @@ -760,10 +743,9 @@ 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 <em>Suppliers</em>}'. <!-- begin-user-doc --> + * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.legacy.model1.Company#getSuppliers <em>Suppliers</em>}'. + * <!-- begin-user-doc --> * <!-- end-user-doc --> - * * @return the meta object for the containment reference list '<em>Suppliers</em>'. * @see org.eclipse.emf.cdo.tests.legacy.model1.Company#getSuppliers() * @see #getCompany() @@ -772,10 +754,9 @@ 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 <em>Customers</em>}'. <!-- begin-user-doc --> + * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.legacy.model1.Company#getCustomers <em>Customers</em>}'. + * <!-- begin-user-doc --> * <!-- end-user-doc --> - * * @return the meta object for the containment reference list '<em>Customers</em>'. * @see org.eclipse.emf.cdo.tests.legacy.model1.Company#getCustomers() * @see #getCompany() @@ -796,10 +777,9 @@ 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 <em>Sales Orders</em>}'. <!-- begin-user-doc + * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.legacy.model1.Company#getSalesOrders <em>Sales Orders</em>}'. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @return the meta object for the containment reference list '<em>Sales Orders</em>'. * @see org.eclipse.emf.cdo.tests.legacy.model1.Company#getSalesOrders() * @see #getCompany() @@ -810,7 +790,6 @@ 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 <em>Supplier</em>}'. * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @return the meta object for class '<em>Supplier</em>'. * @see org.eclipse.emf.cdo.tests.legacy.model1.Supplier * @generated @@ -830,9 +809,8 @@ 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 - * <em>Preferred</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model1.Supplier#isPreferred <em>Preferred</em>}'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return the meta object for the attribute '<em>Preferred</em>'. * @see org.eclipse.emf.cdo.tests.legacy.model1.Supplier#isPreferred() * @see #getSupplier() @@ -843,7 +821,6 @@ 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 <em>Customer</em>}'. * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @return the meta object for class '<em>Customer</em>'. * @see org.eclipse.emf.cdo.tests.legacy.model1.Customer * @generated @@ -851,10 +828,9 @@ 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 <em>Sales Orders</em>}'. <!-- begin-user-doc + * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.tests.legacy.model1.Customer#getSalesOrders <em>Sales Orders</em>}'. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @return the meta object for the reference list '<em>Sales Orders</em>'. * @see org.eclipse.emf.cdo.tests.legacy.model1.Customer#getSalesOrders() * @see #getCustomer() @@ -863,9 +839,8 @@ 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 - * <em>Order By Product</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns the meta object for the map '{@link org.eclipse.emf.cdo.tests.legacy.model1.Customer#getOrderByProduct <em>Order By Product</em>}'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return the meta object for the map '<em>Order By Product</em>'. * @see org.eclipse.emf.cdo.tests.legacy.model1.Customer#getOrderByProduct() * @see #getCustomer() @@ -884,10 +859,9 @@ 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 <em>Order Details</em>}'. <!-- begin-user-doc + * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.legacy.model1.Order#getOrderDetails <em>Order Details</em>}'. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @return the meta object for the containment reference list '<em>Order Details</em>'. * @see org.eclipse.emf.cdo.tests.legacy.model1.Order#getOrderDetails() * @see #getOrder() @@ -896,9 +870,8 @@ 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 - * <em>Order Detail</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model1.OrderDetail <em>Order Detail</em>}'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return the meta object for class '<em>Order Detail</em>'. * @see org.eclipse.emf.cdo.tests.legacy.model1.OrderDetail * @generated @@ -906,10 +879,9 @@ 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 <em>Order</em>}'. <!-- begin-user-doc --> <!-- + * Returns the meta object for the container reference '{@link org.eclipse.emf.cdo.tests.legacy.model1.OrderDetail#getOrder <em>Order</em>}'. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @return the meta object for the container reference '<em>Order</em>'. * @see org.eclipse.emf.cdo.tests.legacy.model1.OrderDetail#getOrder() * @see #getOrderDetail() @@ -918,9 +890,8 @@ 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 - * <em>Product</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.tests.legacy.model1.OrderDetail#getProduct <em>Product</em>}'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return the meta object for the reference '<em>Product</em>'. * @see org.eclipse.emf.cdo.tests.legacy.model1.OrderDetail#getProduct() * @see #getOrderDetail() @@ -929,9 +900,8 @@ 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 - * <em>Price</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model1.OrderDetail#getPrice <em>Price</em>}'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return the meta object for the attribute '<em>Price</em>'. * @see org.eclipse.emf.cdo.tests.legacy.model1.OrderDetail#getPrice() * @see #getOrderDetail() @@ -940,9 +910,8 @@ 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 - * <em>Purchase Order</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model1.PurchaseOrder <em>Purchase Order</em>}'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return the meta object for class '<em>Purchase Order</em>'. * @see org.eclipse.emf.cdo.tests.legacy.model1.PurchaseOrder * @generated @@ -950,9 +919,8 @@ 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 - * <em>Date</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model1.PurchaseOrder#getDate <em>Date</em>}'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return the meta object for the attribute '<em>Date</em>'. * @see org.eclipse.emf.cdo.tests.legacy.model1.PurchaseOrder#getDate() * @see #getPurchaseOrder() @@ -961,10 +929,9 @@ 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 <em>Supplier</em>}'. <!-- begin-user-doc + * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.tests.legacy.model1.PurchaseOrder#getSupplier <em>Supplier</em>}'. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @return the meta object for the reference '<em>Supplier</em>'. * @see org.eclipse.emf.cdo.tests.legacy.model1.PurchaseOrder#getSupplier() * @see #getPurchaseOrder() @@ -973,9 +940,8 @@ 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 <em>Sales Order</em>} - * '. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model1.SalesOrder <em>Sales Order</em>}'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return the meta object for class '<em>Sales Order</em>'. * @see org.eclipse.emf.cdo.tests.legacy.model1.SalesOrder * @generated @@ -983,9 +949,8 @@ 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 - * <em>Id</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model1.SalesOrder#getId <em>Id</em>}'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return the meta object for the attribute '<em>Id</em>'. * @see org.eclipse.emf.cdo.tests.legacy.model1.SalesOrder#getId() * @see #getSalesOrder() @@ -994,9 +959,8 @@ 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 - * <em>Customer</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.tests.legacy.model1.SalesOrder#getCustomer <em>Customer</em>}'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return the meta object for the reference '<em>Customer</em>'. * @see org.eclipse.emf.cdo.tests.legacy.model1.SalesOrder#getCustomer() * @see #getSalesOrder() @@ -1007,7 +971,6 @@ 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 <em>Category</em>}'. * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @return the meta object for class '<em>Category</em>'. * @see org.eclipse.emf.cdo.tests.legacy.model1.Category * @generated @@ -1015,9 +978,8 @@ 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 - * <em>Name</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model1.Category#getName <em>Name</em>}'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return the meta object for the attribute '<em>Name</em>'. * @see org.eclipse.emf.cdo.tests.legacy.model1.Category#getName() * @see #getCategory() @@ -1026,10 +988,9 @@ 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 <em>Categories</em>}'. <!-- begin-user-doc + * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.legacy.model1.Category#getCategories <em>Categories</em>}'. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @return the meta object for the containment reference list '<em>Categories</em>'. * @see org.eclipse.emf.cdo.tests.legacy.model1.Category#getCategories() * @see #getCategory() @@ -1038,10 +999,9 @@ 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 <em>Products</em>}'. <!-- begin-user-doc --> + * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.legacy.model1.Category#getProducts <em>Products</em>}'. + * <!-- begin-user-doc --> * <!-- end-user-doc --> - * * @return the meta object for the containment reference list '<em>Products</em>'. * @see org.eclipse.emf.cdo.tests.legacy.model1.Category#getProducts() * @see #getCategory() @@ -1052,7 +1012,6 @@ 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 <em>Product1</em>}'. * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @return the meta object for class '<em>Product1</em>'. * @see org.eclipse.emf.cdo.tests.legacy.model1.Product1 * @generated @@ -1060,9 +1019,8 @@ 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 - * <em>Name</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model1.Product1#getName <em>Name</em>}'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return the meta object for the attribute '<em>Name</em>'. * @see org.eclipse.emf.cdo.tests.legacy.model1.Product1#getName() * @see #getProduct1() @@ -1083,9 +1041,8 @@ 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 - * <em>Vat</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model1.Product1#getVat <em>Vat</em>}'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return the meta object for the attribute '<em>Vat</em>'. * @see org.eclipse.emf.cdo.tests.legacy.model1.Product1#getVat() * @see #getProduct1() @@ -1094,9 +1051,8 @@ 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 - * <em>Description</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model1.Product1#getDescription <em>Description</em>}'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return the meta object for the attribute '<em>Description</em>'. * @see org.eclipse.emf.cdo.tests.legacy.model1.Product1#getDescription() * @see #getProduct1() @@ -1105,9 +1061,8 @@ 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 - * <em>Order Address</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model1.OrderAddress <em>Order Address</em>}'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return the meta object for class '<em>Order Address</em>'. * @see org.eclipse.emf.cdo.tests.legacy.model1.OrderAddress * @generated @@ -1127,9 +1082,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 <em>Product To Order</em>}'. <!-- begin-user-doc --> + * Returns the meta object for class '{@link java.util.Map.Entry <em>Product To Order</em>}'. + * <!-- begin-user-doc --> * <!-- end-user-doc --> - * * @return the meta object for class '<em>Product To Order</em>'. * @see java.util.Map.Entry * @model keyType="org.eclipse.emf.cdo.tests.legacy.model1.Product1" @@ -1139,9 +1094,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 <em>Key</em>}'. <!-- begin-user-doc --> <!-- + * Returns the meta object for the reference '{@link java.util.Map.Entry <em>Key</em>}'. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @return the meta object for the reference '<em>Key</em>'. * @see java.util.Map.Entry * @see #getProductToOrder() @@ -1150,9 +1105,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 <em>Value</em>}'. <!-- begin-user-doc --> + * Returns the meta object for the reference '{@link java.util.Map.Entry <em>Value</em>}'. + * <!-- begin-user-doc --> * <!-- end-user-doc --> - * * @return the meta object for the reference '<em>Value</em>'. * @see java.util.Map.Entry * @see #getProductToOrder() @@ -1171,8 +1126,8 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa EEnum getVAT(); /** - * Returns the factory that creates the instances of the model. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns the factory that creates the instances of the model. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return the factory that creates the instances of the model. * @generated */ @@ -1187,15 +1142,13 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa * <li>and each data type</li> * </ul> * <!-- end-user-doc --> - * * @generated */ interface Literals { /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.AddressImpl - * <em>Address</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.AddressImpl <em>Address</em>}' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.AddressImpl * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.Model1PackageImpl#getAddress() * @generated @@ -1203,33 +1156,32 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa EClass ADDRESS = eINSTANCE.getAddress(); /** - * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!-- begin-user-doc --> <!-- + * The meta object literal for the '<em><b>Name</b></em>' attribute feature. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated */ EAttribute ADDRESS__NAME = eINSTANCE.getAddress_Name(); /** - * The meta object literal for the '<em><b>Street</b></em>' attribute feature. <!-- begin-user-doc --> <!-- + * The meta object literal for the '<em><b>Street</b></em>' attribute feature. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated */ EAttribute ADDRESS__STREET = eINSTANCE.getAddress_Street(); /** - * The meta object literal for the '<em><b>City</b></em>' attribute feature. <!-- begin-user-doc --> <!-- + * The meta object literal for the '<em><b>City</b></em>' attribute feature. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated */ EAttribute ADDRESS__CITY = eINSTANCE.getAddress_City(); /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.CompanyImpl - * <em>Company</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.CompanyImpl <em>Company</em>}' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.CompanyImpl * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.Model1PackageImpl#getCompany() * @generated @@ -1277,9 +1229,8 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa EReference COMPANY__SALES_ORDERS = eINSTANCE.getCompany_SalesOrders(); /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.SupplierImpl - * <em>Supplier</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.SupplierImpl <em>Supplier</em>}' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.SupplierImpl * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.Model1PackageImpl#getSupplier() * @generated @@ -1287,25 +1238,24 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa EClass SUPPLIER = eINSTANCE.getSupplier(); /** - * The meta object literal for the '<em><b>Purchase Orders</b></em>' reference list feature. <!-- begin-user-doc --> + * The meta object literal for the '<em><b>Purchase Orders</b></em>' reference list feature. + * <!-- begin-user-doc --> * <!-- end-user-doc --> - * * @generated */ EReference SUPPLIER__PURCHASE_ORDERS = eINSTANCE.getSupplier_PurchaseOrders(); /** - * The meta object literal for the '<em><b>Preferred</b></em>' attribute feature. <!-- begin-user-doc --> <!-- + * The meta object literal for the '<em><b>Preferred</b></em>' attribute feature. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated */ EAttribute SUPPLIER__PREFERRED = eINSTANCE.getSupplier_Preferred(); /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.CustomerImpl - * <em>Customer</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.CustomerImpl <em>Customer</em>}' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.CustomerImpl * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.Model1PackageImpl#getCustomer() * @generated @@ -1313,25 +1263,24 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa EClass CUSTOMER = eINSTANCE.getCustomer(); /** - * The meta object literal for the '<em><b>Sales Orders</b></em>' reference list feature. <!-- begin-user-doc --> + * The meta object literal for the '<em><b>Sales Orders</b></em>' reference list feature. + * <!-- begin-user-doc --> * <!-- end-user-doc --> - * * @generated */ EReference CUSTOMER__SALES_ORDERS = eINSTANCE.getCustomer_SalesOrders(); /** - * The meta object literal for the '<em><b>Order By Product</b></em>' map feature. <!-- begin-user-doc --> <!-- + * The meta object literal for the '<em><b>Order By Product</b></em>' map feature. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @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 <em>Order</em>}' - * class. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.OrderImpl <em>Order</em>}' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.OrderImpl * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.Model1PackageImpl#getOrder() * @generated @@ -1347,9 +1296,8 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa EReference ORDER__ORDER_DETAILS = eINSTANCE.getOrder_OrderDetails(); /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.OrderDetailImpl - * <em>Order Detail</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.OrderDetailImpl <em>Order Detail</em>}' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.OrderDetailImpl * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.Model1PackageImpl#getOrderDetail() * @generated @@ -1357,33 +1305,32 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa EClass ORDER_DETAIL = eINSTANCE.getOrderDetail(); /** - * The meta object literal for the '<em><b>Order</b></em>' container reference feature. <!-- begin-user-doc --> <!-- + * The meta object literal for the '<em><b>Order</b></em>' container reference feature. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated */ EReference ORDER_DETAIL__ORDER = eINSTANCE.getOrderDetail_Order(); /** - * The meta object literal for the '<em><b>Product</b></em>' reference feature. <!-- begin-user-doc --> <!-- + * The meta object literal for the '<em><b>Product</b></em>' reference feature. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated */ EReference ORDER_DETAIL__PRODUCT = eINSTANCE.getOrderDetail_Product(); /** - * The meta object literal for the '<em><b>Price</b></em>' attribute feature. <!-- begin-user-doc --> <!-- + * The meta object literal for the '<em><b>Price</b></em>' attribute feature. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated */ EAttribute ORDER_DETAIL__PRICE = eINSTANCE.getOrderDetail_Price(); /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.PurchaseOrderImpl - * <em>Purchase Order</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.PurchaseOrderImpl <em>Purchase Order</em>}' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.PurchaseOrderImpl * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.Model1PackageImpl#getPurchaseOrder() * @generated @@ -1391,25 +1338,24 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa EClass PURCHASE_ORDER = eINSTANCE.getPurchaseOrder(); /** - * The meta object literal for the '<em><b>Date</b></em>' attribute feature. <!-- begin-user-doc --> <!-- + * The meta object literal for the '<em><b>Date</b></em>' attribute feature. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated */ EAttribute PURCHASE_ORDER__DATE = eINSTANCE.getPurchaseOrder_Date(); /** - * The meta object literal for the '<em><b>Supplier</b></em>' reference feature. <!-- begin-user-doc --> <!-- + * The meta object literal for the '<em><b>Supplier</b></em>' reference feature. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated */ EReference PURCHASE_ORDER__SUPPLIER = eINSTANCE.getPurchaseOrder_Supplier(); /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.SalesOrderImpl - * <em>Sales Order</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.SalesOrderImpl <em>Sales Order</em>}' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.SalesOrderImpl * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.Model1PackageImpl#getSalesOrder() * @generated @@ -1425,17 +1371,16 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa EAttribute SALES_ORDER__ID = eINSTANCE.getSalesOrder_Id(); /** - * The meta object literal for the '<em><b>Customer</b></em>' reference feature. <!-- begin-user-doc --> <!-- + * The meta object literal for the '<em><b>Customer</b></em>' reference feature. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated */ EReference SALES_ORDER__CUSTOMER = eINSTANCE.getSalesOrder_Customer(); /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.CategoryImpl - * <em>Category</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.CategoryImpl <em>Category</em>}' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.CategoryImpl * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.Model1PackageImpl#getCategory() * @generated @@ -1443,9 +1388,9 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa EClass CATEGORY = eINSTANCE.getCategory(); /** - * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!-- begin-user-doc --> <!-- + * The meta object literal for the '<em><b>Name</b></em>' attribute feature. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated */ EAttribute CATEGORY__NAME = eINSTANCE.getCategory_Name(); @@ -1467,9 +1412,8 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa EReference CATEGORY__PRODUCTS = eINSTANCE.getCategory_Products(); /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.Product1Impl - * <em>Product1</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.Product1Impl <em>Product1</em>}' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.Product1Impl * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.Model1PackageImpl#getProduct1() * @generated @@ -1477,41 +1421,40 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa EClass PRODUCT1 = eINSTANCE.getProduct1(); /** - * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!-- begin-user-doc --> <!-- + * The meta object literal for the '<em><b>Name</b></em>' attribute feature. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated */ EAttribute PRODUCT1__NAME = eINSTANCE.getProduct1_Name(); /** - * The meta object literal for the '<em><b>Order Details</b></em>' reference list feature. <!-- begin-user-doc --> + * The meta object literal for the '<em><b>Order Details</b></em>' reference list feature. + * <!-- begin-user-doc --> * <!-- end-user-doc --> - * * @generated */ EReference PRODUCT1__ORDER_DETAILS = eINSTANCE.getProduct1_OrderDetails(); /** - * The meta object literal for the '<em><b>Vat</b></em>' attribute feature. <!-- begin-user-doc --> <!-- + * The meta object literal for the '<em><b>Vat</b></em>' attribute feature. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated */ EAttribute PRODUCT1__VAT = eINSTANCE.getProduct1_Vat(); /** - * The meta object literal for the '<em><b>Description</b></em>' attribute feature. <!-- begin-user-doc --> <!-- + * The meta object literal for the '<em><b>Description</b></em>' attribute feature. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated */ EAttribute PRODUCT1__DESCRIPTION = eINSTANCE.getProduct1_Description(); /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.OrderAddressImpl - * <em>Order Address</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.OrderAddressImpl <em>Order Address</em>}' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.OrderAddressImpl * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.Model1PackageImpl#getOrderAddress() * @generated @@ -1519,17 +1462,16 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa EClass ORDER_ADDRESS = eINSTANCE.getOrderAddress(); /** - * The meta object literal for the '<em><b>Test Attribute</b></em>' attribute feature. <!-- begin-user-doc --> <!-- + * The meta object literal for the '<em><b>Test Attribute</b></em>' attribute feature. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @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 - * <em>Product To Order</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.ProductToOrderImpl <em>Product To Order</em>}' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.ProductToOrderImpl * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.Model1PackageImpl#getProductToOrder() * @generated @@ -1537,17 +1479,17 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa EClass PRODUCT_TO_ORDER = eINSTANCE.getProductToOrder(); /** - * The meta object literal for the '<em><b>Key</b></em>' reference feature. <!-- begin-user-doc --> <!-- + * The meta object literal for the '<em><b>Key</b></em>' reference feature. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated */ EReference PRODUCT_TO_ORDER__KEY = eINSTANCE.getProductToOrder_Key(); /** - * The meta object literal for the '<em><b>Value</b></em>' reference feature. <!-- begin-user-doc --> <!-- + * The meta object literal for the '<em><b>Value</b></em>' reference feature. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated */ EReference PRODUCT_TO_ORDER__VALUE = eINSTANCE.getProductToOrder_Value(); 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 8b399f4501..02f55151fb 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,19 +23,18 @@ import org.eclipse.emf.ecore.impl.EObjectImpl; * <p> * The following features are implemented: * <ul> - * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.AddressImpl#getName <em>Name</em>}</li> - * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.AddressImpl#getStreet <em>Street</em>}</li> - * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.AddressImpl#getCity <em>City</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.AddressImpl#getName <em>Name</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.AddressImpl#getStreet <em>Street</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.AddressImpl#getCity <em>City</em>}</li> * </ul> * </p> - * + * * @generated */ public class AddressImpl extends EObjectImpl implements Address { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @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"; @@ -51,8 +50,8 @@ public class AddressImpl extends EObjectImpl implements Address protected static final String NAME_EDEFAULT = null; /** - * The cached value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The cached value of the '{@link #getName() <em>Name</em>}' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @see #getName() * @generated * @ordered @@ -60,9 +59,9 @@ public class AddressImpl extends EObjectImpl implements Address protected String name = NAME_EDEFAULT; /** - * The default value of the '{@link #getStreet() <em>Street</em>}' attribute. <!-- begin-user-doc --> <!-- + * The default value of the '{@link #getStreet() <em>Street</em>}' attribute. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @see #getStreet() * @generated * @ordered @@ -90,8 +89,8 @@ public class AddressImpl extends EObjectImpl implements Address protected static final String CITY_EDEFAULT = null; /** - * The cached value of the '{@link #getCity() <em>City</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The cached value of the '{@link #getCity() <em>City</em>}' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @see #getCity() * @generated * @ordered @@ -100,7 +99,6 @@ public class AddressImpl extends EObjectImpl implements Address /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ protected AddressImpl() @@ -110,7 +108,6 @@ public class AddressImpl extends EObjectImpl implements Address /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -121,7 +118,6 @@ public class AddressImpl extends EObjectImpl implements Address /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public String getName() @@ -131,7 +127,6 @@ public class AddressImpl extends EObjectImpl implements Address /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void setName(String newName) @@ -139,14 +134,11 @@ public class AddressImpl extends EObjectImpl implements Address String oldName = name; name = newName; if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.SET, Model1Package.ADDRESS__NAME, oldName, name)); - } } /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public String getStreet() @@ -156,7 +148,6 @@ public class AddressImpl extends EObjectImpl implements Address /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void setStreet(String newStreet) @@ -164,14 +155,11 @@ public class AddressImpl extends EObjectImpl implements Address String oldStreet = street; street = newStreet; if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.SET, Model1Package.ADDRESS__STREET, oldStreet, street)); - } } /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public String getCity() @@ -181,7 +169,6 @@ public class AddressImpl extends EObjectImpl implements Address /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void setCity(String newCity) @@ -189,14 +176,11 @@ public class AddressImpl extends EObjectImpl implements Address String oldCity = city; city = newCity; if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.SET, Model1Package.ADDRESS__CITY, oldCity, city)); - } } /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -216,7 +200,6 @@ public class AddressImpl extends EObjectImpl implements Address /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -239,7 +222,6 @@ public class AddressImpl extends EObjectImpl implements Address /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -262,7 +244,6 @@ public class AddressImpl extends EObjectImpl implements Address /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -282,16 +263,13 @@ public class AddressImpl extends EObjectImpl implements Address /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override 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.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 c01b12e4f3..df081bdb5e 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,19 +31,18 @@ import java.util.Collection; * <p> * The following features are implemented: * <ul> - * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.CategoryImpl#getName <em>Name</em>}</li> - * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.CategoryImpl#getCategories <em>Categories</em>}</li> - * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.CategoryImpl#getProducts <em>Products</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.CategoryImpl#getName <em>Name</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.CategoryImpl#getCategories <em>Categories</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.CategoryImpl#getProducts <em>Products</em>}</li> * </ul> * </p> - * + * * @generated */ public class CategoryImpl extends EObjectImpl implements Category { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @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"; @@ -59,8 +58,8 @@ public class CategoryImpl extends EObjectImpl implements Category protected static final String NAME_EDEFAULT = null; /** - * The cached value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The cached value of the '{@link #getName() <em>Name</em>}' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @see #getName() * @generated * @ordered @@ -78,9 +77,9 @@ public class CategoryImpl extends EObjectImpl implements Category protected EList<Category> categories; /** - * The cached value of the '{@link #getProducts() <em>Products</em>}' containment reference list. <!-- begin-user-doc + * The cached value of the '{@link #getProducts() <em>Products</em>}' containment reference list. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @see #getProducts() * @generated * @ordered @@ -89,7 +88,6 @@ public class CategoryImpl extends EObjectImpl implements Category /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ protected CategoryImpl() @@ -99,7 +97,6 @@ public class CategoryImpl extends EObjectImpl implements Category /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -110,7 +107,6 @@ public class CategoryImpl extends EObjectImpl implements Category /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public String getName() @@ -120,7 +116,6 @@ public class CategoryImpl extends EObjectImpl implements Category /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void setName(String newName) @@ -128,14 +123,11 @@ public class CategoryImpl extends EObjectImpl implements Category String oldName = name; name = newName; if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.SET, Model1Package.CATEGORY__NAME, oldName, name)); - } } /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EList<Category> getCategories() @@ -149,7 +141,6 @@ public class CategoryImpl extends EObjectImpl implements Category /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EList<Product1> getProducts() @@ -163,7 +154,6 @@ public class CategoryImpl extends EObjectImpl implements Category /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -181,7 +171,6 @@ public class CategoryImpl extends EObjectImpl implements Category /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -201,7 +190,6 @@ public class CategoryImpl extends EObjectImpl implements Category /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @SuppressWarnings("unchecked") @@ -227,7 +215,6 @@ public class CategoryImpl extends EObjectImpl implements Category /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -250,7 +237,6 @@ public class CategoryImpl extends EObjectImpl implements Category /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -270,16 +256,13 @@ public class CategoryImpl extends EObjectImpl implements Category /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override 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.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 124d0ecf13..4c1733a592 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,21 +32,20 @@ import java.util.Collection; * <p> * The following features are implemented: * <ul> - * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.CompanyImpl#getCategories <em>Categories</em>}</li> - * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.CompanyImpl#getSuppliers <em>Suppliers</em>}</li> - * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.CompanyImpl#getCustomers <em>Customers</em>}</li> - * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.CompanyImpl#getPurchaseOrders <em>Purchase Orders</em>}</li> - * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.CompanyImpl#getSalesOrders <em>Sales Orders</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.CompanyImpl#getCategories <em>Categories</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.CompanyImpl#getSuppliers <em>Suppliers</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.CompanyImpl#getCustomers <em>Customers</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.CompanyImpl#getPurchaseOrders <em>Purchase Orders</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.CompanyImpl#getSalesOrders <em>Sales Orders</em>}</li> * </ul> * </p> - * + * * @generated */ public class CompanyImpl extends AddressImpl implements Company { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @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"; @@ -103,7 +102,6 @@ public class CompanyImpl extends AddressImpl implements Company /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ protected CompanyImpl() @@ -113,7 +111,6 @@ public class CompanyImpl extends AddressImpl implements Company /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -124,7 +121,6 @@ public class CompanyImpl extends AddressImpl implements Company /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EList<Category> getCategories() @@ -138,7 +134,6 @@ public class CompanyImpl extends AddressImpl implements Company /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EList<Supplier> getSuppliers() @@ -152,7 +147,6 @@ public class CompanyImpl extends AddressImpl implements Company /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EList<Customer> getCustomers() @@ -166,7 +160,6 @@ public class CompanyImpl extends AddressImpl implements Company /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EList<PurchaseOrder> getPurchaseOrders() @@ -181,7 +174,6 @@ public class CompanyImpl extends AddressImpl implements Company /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EList<SalesOrder> getSalesOrders() @@ -195,7 +187,6 @@ public class CompanyImpl extends AddressImpl implements Company /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -219,7 +210,6 @@ public class CompanyImpl extends AddressImpl implements Company /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -243,7 +233,6 @@ public class CompanyImpl extends AddressImpl implements Company /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @SuppressWarnings("unchecked") @@ -278,7 +267,6 @@ public class CompanyImpl extends AddressImpl implements Company /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -307,7 +295,6 @@ public class CompanyImpl extends AddressImpl implements Company /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @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 0ebfddd472..f5645eb4b6 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,26 +32,25 @@ import java.util.Collection; * <p> * The following features are implemented: * <ul> - * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.CustomerImpl#getSalesOrders <em>Sales Orders</em>}</li> - * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.CustomerImpl#getOrderByProduct <em>Order By Product</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.CustomerImpl#getSalesOrders <em>Sales Orders</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.CustomerImpl#getOrderByProduct <em>Order By Product</em>}</li> * </ul> * </p> - * + * * @generated */ public class CustomerImpl extends AddressImpl implements Customer { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @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() <em>Sales Orders</em>}' reference list. <!-- begin-user-doc --> + * The cached value of the '{@link #getSalesOrders() <em>Sales Orders</em>}' reference list. + * <!-- begin-user-doc --> * <!-- end-user-doc --> - * * @see #getSalesOrders() * @generated * @ordered @@ -59,9 +58,9 @@ public class CustomerImpl extends AddressImpl implements Customer protected EList<SalesOrder> salesOrders; /** - * The cached value of the '{@link #getOrderByProduct() <em>Order By Product</em>}' map. <!-- begin-user-doc --> <!-- + * The cached value of the '{@link #getOrderByProduct() <em>Order By Product</em>}' map. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @see #getOrderByProduct() * @generated * @ordered @@ -70,7 +69,6 @@ public class CustomerImpl extends AddressImpl implements Customer /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ protected CustomerImpl() @@ -80,7 +78,6 @@ public class CustomerImpl extends AddressImpl implements Customer /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -91,7 +88,6 @@ public class CustomerImpl extends AddressImpl implements Customer /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EList<SalesOrder> getSalesOrders() @@ -106,7 +102,6 @@ public class CustomerImpl extends AddressImpl implements Customer /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EMap<Product1, SalesOrder> getOrderByProduct() @@ -121,7 +116,6 @@ public class CustomerImpl extends AddressImpl implements Customer /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @SuppressWarnings("unchecked") @@ -138,7 +132,6 @@ public class CustomerImpl extends AddressImpl implements Customer /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -156,7 +149,6 @@ public class CustomerImpl extends AddressImpl implements Customer /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -168,20 +160,15 @@ public class CustomerImpl extends AddressImpl implements Customer return getSalesOrders(); case Model1Package.CUSTOMER__ORDER_BY_PRODUCT: if (coreType) - { return getOrderByProduct(); - } else - { return getOrderByProduct().map(); - } } return super.eGet(featureID, resolve, coreType); } /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @SuppressWarnings("unchecked") @@ -203,7 +190,6 @@ public class CustomerImpl extends AddressImpl implements Customer /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -223,7 +209,6 @@ public class CustomerImpl extends AddressImpl implements Customer /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @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 70e95d82fc..354ae8b56b 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 @@ -16,7 +16,6 @@ import org.eclipse.emf.cdo.tests.model1.Address; import org.eclipse.emf.cdo.tests.model1.Category; import org.eclipse.emf.cdo.tests.model1.Company; import org.eclipse.emf.cdo.tests.model1.Customer; -import org.eclipse.emf.cdo.tests.model1.Order; import org.eclipse.emf.cdo.tests.model1.OrderAddress; import org.eclipse.emf.cdo.tests.model1.OrderDetail; import org.eclipse.emf.cdo.tests.model1.Product1; @@ -36,14 +35,12 @@ import java.util.Map; /** * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!-- end-user-doc --> - * * @generated */ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @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"; @@ -72,8 +69,8 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory } /** - * Creates an instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Creates an instance of the factory. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ public Model1FactoryImpl() @@ -83,7 +80,6 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -99,8 +95,6 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory return createSupplier(); case Model1Package.CUSTOMER: return createCustomer(); - case Model1Package.ORDER: - return createOrder(); case Model1Package.ORDER_DETAIL: return createOrderDetail(); case Model1Package.PURCHASE_ORDER: @@ -122,7 +116,6 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -139,7 +132,6 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -156,7 +148,6 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public Address createAddress() @@ -167,7 +158,6 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public Company createCompany() @@ -178,7 +168,6 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public Supplier createSupplier() @@ -189,7 +178,6 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public Customer createCustomer() @@ -200,18 +188,6 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @generated - */ - public Order createOrder() - { - OrderImpl order = new OrderImpl(); - return order; - } - - /** - * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public OrderDetail createOrderDetail() @@ -222,7 +198,6 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public PurchaseOrder createPurchaseOrder() @@ -233,7 +208,6 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public SalesOrder createSalesOrder() @@ -244,7 +218,6 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public Category createCategory() @@ -255,7 +228,6 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public Product1 createProduct1() @@ -266,7 +238,6 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public OrderAddress createOrderAddress() @@ -277,7 +248,6 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public Map.Entry<Product1, SalesOrder> createProductToOrder() @@ -288,23 +258,19 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public VAT createVATFromString(EDataType eDataType, String initialValue) { VAT result = VAT.get(initialValue); if (result == null) - { throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); - } return result; } /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public String convertVATToString(EDataType eDataType, Object instanceValue) @@ -314,7 +280,6 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public Model1Package getModel1Package() @@ -324,7 +289,6 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @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 0acdd1745b..61663387d7 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,105 +35,90 @@ import java.util.Map; /** * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!-- end-user-doc --> - * * @generated */ public class Model1PackageImpl extends EPackageImpl implements Model1Package { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @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"; /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private EClass addressEClass = null; /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private EClass companyEClass = null; /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private EClass supplierEClass = null; /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private EClass customerEClass = null; /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private EClass orderEClass = null; /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private EClass orderDetailEClass = null; /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private EClass purchaseOrderEClass = null; /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private EClass salesOrderEClass = null; /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private EClass categoryEClass = null; /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private EClass product1EClass = null; /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private EClass orderAddressEClass = null; /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private EClass productToOrderEClass = null; /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private EEnum vatEEnum = null; @@ -158,7 +143,6 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private static boolean isInited = false; @@ -204,7 +188,6 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EClass getAddress() @@ -214,7 +197,6 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EAttribute getAddress_Name() @@ -224,7 +206,6 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EAttribute getAddress_Street() @@ -234,7 +215,6 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EAttribute getAddress_City() @@ -244,7 +224,6 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EClass getCompany() @@ -254,7 +233,6 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getCompany_Categories() @@ -264,7 +242,6 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getCompany_Suppliers() @@ -274,7 +251,6 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getCompany_Customers() @@ -284,7 +260,6 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getCompany_PurchaseOrders() @@ -294,7 +269,6 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getCompany_SalesOrders() @@ -304,7 +278,6 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EClass getSupplier() @@ -314,7 +287,6 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getSupplier_PurchaseOrders() @@ -324,7 +296,6 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EAttribute getSupplier_Preferred() @@ -334,7 +305,6 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EClass getCustomer() @@ -344,7 +314,6 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getCustomer_SalesOrders() @@ -354,7 +323,6 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getCustomer_OrderByProduct() @@ -364,7 +332,6 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EClass getOrder() @@ -374,7 +341,6 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getOrder_OrderDetails() @@ -384,7 +350,6 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EClass getOrderDetail() @@ -394,7 +359,6 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getOrderDetail_Order() @@ -404,7 +368,6 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getOrderDetail_Product() @@ -414,7 +377,6 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EAttribute getOrderDetail_Price() @@ -424,7 +386,6 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EClass getPurchaseOrder() @@ -434,7 +395,6 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EAttribute getPurchaseOrder_Date() @@ -444,7 +404,6 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getPurchaseOrder_Supplier() @@ -454,7 +413,6 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EClass getSalesOrder() @@ -464,7 +422,6 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EAttribute getSalesOrder_Id() @@ -474,7 +431,6 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getSalesOrder_Customer() @@ -484,7 +440,6 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EClass getCategory() @@ -494,7 +449,6 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EAttribute getCategory_Name() @@ -504,7 +458,6 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getCategory_Categories() @@ -514,7 +467,6 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getCategory_Products() @@ -524,7 +476,6 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EClass getProduct1() @@ -534,7 +485,6 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EAttribute getProduct1_Name() @@ -544,7 +494,6 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getProduct1_OrderDetails() @@ -554,7 +503,6 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EAttribute getProduct1_Vat() @@ -564,7 +512,6 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EAttribute getProduct1_Description() @@ -574,7 +521,6 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EClass getOrderAddress() @@ -584,7 +530,6 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EAttribute getOrderAddress_TestAttribute() @@ -594,7 +539,6 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EClass getProductToOrder() @@ -604,7 +548,6 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getProductToOrder_Key() @@ -614,7 +557,6 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getProductToOrder_Value() @@ -624,7 +566,6 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EEnum getVAT() @@ -634,7 +575,6 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public Model1Factory getModel1Factory() @@ -644,23 +584,20 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @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. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Creates the meta-model objects for the package. This method is + * guarded to have no affect on any invocation but its first. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ public void createPackageContents() { if (isCreated) - { return; - } isCreated = true; // Create classes and their features @@ -724,23 +661,20 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @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. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Complete the initialization of the package and its meta-model. This + * method is guarded to have no affect on any invocation but its first. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ public void initializePackageContents() { if (isInitialized) - { return; - } isInitialized = true; // Initialize package @@ -753,14 +687,14 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package // Set bounds for type parameters // Add supertypes to classes - 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()); + 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()); // Initialize classes and features; add operations and parameters initEClass(addressEClass, Address.class, "Address", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); @@ -772,49 +706,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(), getCategory(), null, "categories", null, 0, -1, Company.class, + initEReference(getCompany_Categories(), this.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(), 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, + 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, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getCompany_SalesOrders(), getSalesOrder(), null, "salesOrders", null, 0, -1, Company.class, + 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, !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(), 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); + 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); 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(), 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, + 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, 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(), 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(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); initEClass(orderDetailEClass, OrderDetail.class, "OrderDetail", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - 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, + 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, !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); @@ -823,35 +757,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(), getSupplier(), getSupplier_PurchaseOrders(), "supplier", null, 1, 1, - PurchaseOrder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, + 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, !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(), getCustomer(), getCustomer_SalesOrders(), "customer", null, 1, 1, - SalesOrder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, + 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, !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(), getCategory(), null, "categories", null, 0, -1, Category.class, + 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, !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(), 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, + 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, 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); @@ -864,10 +798,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(), 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, + 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, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); @@ -886,13 +820,19 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package } /** - * Initializes the annotations for <b>teneo.jpa</b>. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Initializes the annotations for <b>teneo.jpa</b>. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ protected void createTeneoAnnotations() { String source = "teneo.jpa"; + addAnnotation( + this, + source, + new String[] { + "value", + "@hbGenericGenerators({@GenericGenerator(name=\"system-uuid\", strategy = \"org.eclipse.emf.cdo.server.internal.hibernate.tuplizer.CDOUUIDHexGenerator\")})" }); addAnnotation(orderEClass, source, new String[] { "value", "@Entity(name=\"BaseOrder\")" }); addAnnotation(getProduct1_Name(), source, new String[] { "value", "@Id" }); addAnnotation(orderAddressEClass, source, new String[] { "value", 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 b4fa0ad9bf..e7d8895e4f 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,21 +33,20 @@ import java.util.Collection; * <p> * The following features are implemented: * <ul> - * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.OrderAddressImpl#getOrderDetails <em>Order Details</em>}</li> - * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.OrderAddressImpl#getOrder <em>Order</em>}</li> - * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.OrderAddressImpl#getProduct <em>Product</em>}</li> - * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.OrderAddressImpl#getPrice <em>Price</em>}</li> - * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.OrderAddressImpl#isTestAttribute <em>Test Attribute</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.OrderAddressImpl#getOrderDetails <em>Order Details</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.OrderAddressImpl#getOrder <em>Order</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.OrderAddressImpl#getProduct <em>Product</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.OrderAddressImpl#getPrice <em>Price</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.OrderAddressImpl#isTestAttribute <em>Test Attribute</em>}</li> * </ul> * </p> - * + * * @generated */ public class OrderAddressImpl extends AddressImpl implements OrderAddress { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @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"; @@ -63,9 +62,9 @@ public class OrderAddressImpl extends AddressImpl implements OrderAddress protected EList<OrderDetail> orderDetails; /** - * The cached value of the '{@link #getProduct() <em>Product</em>}' reference. <!-- begin-user-doc --> <!-- + * The cached value of the '{@link #getProduct() <em>Product</em>}' reference. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @see #getProduct() * @generated * @ordered @@ -93,9 +92,9 @@ public class OrderAddressImpl extends AddressImpl implements OrderAddress protected float price = PRICE_EDEFAULT; /** - * The default value of the '{@link #isTestAttribute() <em>Test Attribute</em>}' attribute. <!-- begin-user-doc --> + * The default value of the '{@link #isTestAttribute() <em>Test Attribute</em>}' attribute. + * <!-- begin-user-doc --> * <!-- end-user-doc --> - * * @see #isTestAttribute() * @generated * @ordered @@ -103,9 +102,9 @@ public class OrderAddressImpl extends AddressImpl implements OrderAddress protected static final boolean TEST_ATTRIBUTE_EDEFAULT = false; /** - * The cached value of the '{@link #isTestAttribute() <em>Test Attribute</em>}' attribute. <!-- begin-user-doc --> + * The cached value of the '{@link #isTestAttribute() <em>Test Attribute</em>}' attribute. + * <!-- begin-user-doc --> * <!-- end-user-doc --> - * * @see #isTestAttribute() * @generated * @ordered @@ -114,7 +113,6 @@ public class OrderAddressImpl extends AddressImpl implements OrderAddress /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ protected OrderAddressImpl() @@ -124,7 +122,6 @@ public class OrderAddressImpl extends AddressImpl implements OrderAddress /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -135,7 +132,6 @@ public class OrderAddressImpl extends AddressImpl implements OrderAddress /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EList<OrderDetail> getOrderDetails() @@ -150,21 +146,17 @@ public class OrderAddressImpl extends AddressImpl implements OrderAddress /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public Order getOrder() { if (eContainerFeatureID() != Model1Package.ORDER_ADDRESS__ORDER) - { return null; - } return (Order)eContainer(); } /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public NotificationChain basicSetOrder(Order newOrder, NotificationChain msgs) @@ -175,42 +167,30 @@ public class OrderAddressImpl extends AddressImpl implements OrderAddress /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void setOrder(Order newOrder) { - if (newOrder != eInternalContainer() || eContainerFeatureID() != Model1Package.ORDER_ADDRESS__ORDER - && newOrder != null) + if (newOrder != eInternalContainer() + || (eContainerFeatureID() != Model1Package.ORDER_ADDRESS__ORDER && newOrder != null)) { if (EcoreUtil.isAncestor(this, newOrder)) - { throw new IllegalArgumentException("Recursive containment not allowed for " + toString()); - } NotificationChain msgs = null; if (eInternalContainer() != null) - { msgs = eBasicRemoveFromContainer(msgs); - } if (newOrder != null) - { msgs = ((InternalEObject)newOrder).eInverseAdd(this, Model1Package.ORDER__ORDER_DETAILS, Order.class, msgs); - } msgs = basicSetOrder(newOrder, msgs); if (msgs != null) - { msgs.dispatch(); - } } else if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.SET, Model1Package.ORDER_ADDRESS__ORDER, newOrder, newOrder)); - } } /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public Product1 getProduct() @@ -222,10 +202,8 @@ public class OrderAddressImpl extends AddressImpl implements OrderAddress if (product != oldProduct) { if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.RESOLVE, Model1Package.ORDER_ADDRESS__PRODUCT, oldProduct, product)); - } } } return product; @@ -233,7 +211,6 @@ public class OrderAddressImpl extends AddressImpl implements OrderAddress /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public Product1 basicGetProduct() @@ -243,7 +220,6 @@ public class OrderAddressImpl extends AddressImpl implements OrderAddress /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public NotificationChain basicSetProduct(Product1 newProduct, NotificationChain msgs) @@ -255,20 +231,15 @@ public class OrderAddressImpl extends AddressImpl implements OrderAddress ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, Model1Package.ORDER_ADDRESS__PRODUCT, oldProduct, newProduct); if (msgs == null) - { msgs = notification; - } else - { msgs.add(notification); - } } return msgs; } /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void setProduct(Product1 newProduct) @@ -277,31 +248,22 @@ public class OrderAddressImpl extends AddressImpl implements OrderAddress { NotificationChain msgs = null; if (product != null) - { msgs = ((InternalEObject)product).eInverseRemove(this, Model1Package.PRODUCT1__ORDER_DETAILS, Product1.class, msgs); - } if (newProduct != null) - { msgs = ((InternalEObject)newProduct).eInverseAdd(this, Model1Package.PRODUCT1__ORDER_DETAILS, Product1.class, msgs); - } msgs = basicSetProduct(newProduct, msgs); if (msgs != null) - { msgs.dispatch(); - } } else if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.SET, Model1Package.ORDER_ADDRESS__PRODUCT, newProduct, newProduct)); - } } /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public float getPrice() @@ -311,7 +273,6 @@ public class OrderAddressImpl extends AddressImpl implements OrderAddress /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void setPrice(float newPrice) @@ -319,14 +280,11 @@ public class OrderAddressImpl extends AddressImpl implements OrderAddress float oldPrice = price; price = newPrice; if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.SET, Model1Package.ORDER_ADDRESS__PRICE, oldPrice, price)); - } } /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public boolean isTestAttribute() @@ -336,7 +294,6 @@ public class OrderAddressImpl extends AddressImpl implements OrderAddress /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void setTestAttribute(boolean newTestAttribute) @@ -344,15 +301,12 @@ public class OrderAddressImpl extends AddressImpl implements OrderAddress boolean oldTestAttribute = testAttribute; testAttribute = newTestAttribute; if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.SET, Model1Package.ORDER_ADDRESS__TEST_ATTRIBUTE, oldTestAttribute, testAttribute)); - } } /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @SuppressWarnings("unchecked") @@ -365,16 +319,12 @@ public class OrderAddressImpl extends AddressImpl implements OrderAddress return ((InternalEList<InternalEObject>)(InternalEList<?>)getOrderDetails()).basicAdd(otherEnd, msgs); case Model1Package.ORDER_ADDRESS__ORDER: if (eInternalContainer() != null) - { msgs = eBasicRemoveFromContainer(msgs); - } return basicSetOrder((Order)otherEnd, msgs); case Model1Package.ORDER_ADDRESS__PRODUCT: if (product != null) - { msgs = ((InternalEObject)product).eInverseRemove(this, Model1Package.PRODUCT1__ORDER_DETAILS, Product1.class, msgs); - } return basicSetProduct((Product1)otherEnd, msgs); } return super.eInverseAdd(otherEnd, featureID, msgs); @@ -382,7 +332,6 @@ public class OrderAddressImpl extends AddressImpl implements OrderAddress /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -402,7 +351,6 @@ public class OrderAddressImpl extends AddressImpl implements OrderAddress /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -418,7 +366,6 @@ public class OrderAddressImpl extends AddressImpl implements OrderAddress /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -432,9 +379,7 @@ public class OrderAddressImpl extends AddressImpl implements OrderAddress return getOrder(); case Model1Package.ORDER_ADDRESS__PRODUCT: if (resolve) - { return getProduct(); - } return basicGetProduct(); case Model1Package.ORDER_ADDRESS__PRICE: return getPrice(); @@ -446,7 +391,6 @@ public class OrderAddressImpl extends AddressImpl implements OrderAddress /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @SuppressWarnings("unchecked") @@ -477,7 +421,6 @@ public class OrderAddressImpl extends AddressImpl implements OrderAddress /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -506,7 +449,6 @@ public class OrderAddressImpl extends AddressImpl implements OrderAddress /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -530,7 +472,6 @@ public class OrderAddressImpl extends AddressImpl implements OrderAddress /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -565,7 +506,6 @@ public class OrderAddressImpl extends AddressImpl implements OrderAddress /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -600,16 +540,13 @@ public class OrderAddressImpl extends AddressImpl implements OrderAddress /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override public String toString() { if (eIsProxy()) - { return super.toString(); - } StringBuffer result = new StringBuffer(super.toString()); result.append(" (price: "); 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 ce77c9c7ec..996415d728 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,27 +28,26 @@ import org.eclipse.emf.ecore.util.EcoreUtil; * <p> * The following features are implemented: * <ul> - * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.OrderDetailImpl#getOrder <em>Order</em>}</li> - * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.OrderDetailImpl#getProduct <em>Product</em>}</li> - * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.OrderDetailImpl#getPrice <em>Price</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.OrderDetailImpl#getOrder <em>Order</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.OrderDetailImpl#getProduct <em>Product</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.OrderDetailImpl#getPrice <em>Price</em>}</li> * </ul> * </p> - * + * * @generated */ public class OrderDetailImpl extends EObjectImpl implements OrderDetail { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @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() <em>Product</em>}' reference. <!-- begin-user-doc --> <!-- + * The cached value of the '{@link #getProduct() <em>Product</em>}' reference. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @see #getProduct() * @generated * @ordered @@ -77,7 +76,6 @@ public class OrderDetailImpl extends EObjectImpl implements OrderDetail /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ protected OrderDetailImpl() @@ -87,7 +85,6 @@ public class OrderDetailImpl extends EObjectImpl implements OrderDetail /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -98,21 +95,17 @@ public class OrderDetailImpl extends EObjectImpl implements OrderDetail /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public Order getOrder() { if (eContainerFeatureID() != Model1Package.ORDER_DETAIL__ORDER) - { return null; - } return (Order)eContainer(); } /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public NotificationChain basicSetOrder(Order newOrder, NotificationChain msgs) @@ -123,42 +116,30 @@ public class OrderDetailImpl extends EObjectImpl implements OrderDetail /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void setOrder(Order newOrder) { - if (newOrder != eInternalContainer() || eContainerFeatureID() != Model1Package.ORDER_DETAIL__ORDER - && newOrder != null) + if (newOrder != eInternalContainer() + || (eContainerFeatureID() != Model1Package.ORDER_DETAIL__ORDER && newOrder != null)) { if (EcoreUtil.isAncestor(this, newOrder)) - { throw new IllegalArgumentException("Recursive containment not allowed for " + toString()); - } NotificationChain msgs = null; if (eInternalContainer() != null) - { msgs = eBasicRemoveFromContainer(msgs); - } if (newOrder != null) - { msgs = ((InternalEObject)newOrder).eInverseAdd(this, Model1Package.ORDER__ORDER_DETAILS, Order.class, msgs); - } msgs = basicSetOrder(newOrder, msgs); if (msgs != null) - { msgs.dispatch(); - } } else if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.SET, Model1Package.ORDER_DETAIL__ORDER, newOrder, newOrder)); - } } /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public Product1 getProduct() @@ -170,10 +151,8 @@ public class OrderDetailImpl extends EObjectImpl implements OrderDetail if (product != oldProduct) { if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.RESOLVE, Model1Package.ORDER_DETAIL__PRODUCT, oldProduct, product)); - } } } return product; @@ -181,7 +160,6 @@ public class OrderDetailImpl extends EObjectImpl implements OrderDetail /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public Product1 basicGetProduct() @@ -191,7 +169,6 @@ public class OrderDetailImpl extends EObjectImpl implements OrderDetail /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public NotificationChain basicSetProduct(Product1 newProduct, NotificationChain msgs) @@ -203,20 +180,15 @@ public class OrderDetailImpl extends EObjectImpl implements OrderDetail ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, Model1Package.ORDER_DETAIL__PRODUCT, oldProduct, newProduct); if (msgs == null) - { msgs = notification; - } else - { msgs.add(notification); - } } return msgs; } /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void setProduct(Product1 newProduct) @@ -225,30 +197,21 @@ public class OrderDetailImpl extends EObjectImpl implements OrderDetail { NotificationChain msgs = null; if (product != null) - { msgs = ((InternalEObject)product).eInverseRemove(this, Model1Package.PRODUCT1__ORDER_DETAILS, Product1.class, msgs); - } if (newProduct != null) - { msgs = ((InternalEObject)newProduct).eInverseAdd(this, Model1Package.PRODUCT1__ORDER_DETAILS, Product1.class, msgs); - } msgs = basicSetProduct(newProduct, msgs); if (msgs != null) - { msgs.dispatch(); - } } else if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.SET, Model1Package.ORDER_DETAIL__PRODUCT, newProduct, newProduct)); - } } /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public float getPrice() @@ -258,7 +221,6 @@ public class OrderDetailImpl extends EObjectImpl implements OrderDetail /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void setPrice(float newPrice) @@ -266,14 +228,11 @@ public class OrderDetailImpl extends EObjectImpl implements OrderDetail float oldPrice = price; price = newPrice; if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.SET, Model1Package.ORDER_DETAIL__PRICE, oldPrice, price)); - } } /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -283,16 +242,12 @@ public class OrderDetailImpl extends EObjectImpl implements OrderDetail { case Model1Package.ORDER_DETAIL__ORDER: if (eInternalContainer() != null) - { msgs = eBasicRemoveFromContainer(msgs); - } return basicSetOrder((Order)otherEnd, msgs); case Model1Package.ORDER_DETAIL__PRODUCT: if (product != null) - { msgs = ((InternalEObject)product).eInverseRemove(this, Model1Package.PRODUCT1__ORDER_DETAILS, Product1.class, msgs); - } return basicSetProduct((Product1)otherEnd, msgs); } return super.eInverseAdd(otherEnd, featureID, msgs); @@ -300,7 +255,6 @@ public class OrderDetailImpl extends EObjectImpl implements OrderDetail /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -318,7 +272,6 @@ public class OrderDetailImpl extends EObjectImpl implements OrderDetail /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -334,7 +287,6 @@ public class OrderDetailImpl extends EObjectImpl implements OrderDetail /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -346,9 +298,7 @@ public class OrderDetailImpl extends EObjectImpl implements OrderDetail return getOrder(); case Model1Package.ORDER_DETAIL__PRODUCT: if (resolve) - { return getProduct(); - } return basicGetProduct(); case Model1Package.ORDER_DETAIL__PRICE: return getPrice(); @@ -358,7 +308,6 @@ public class OrderDetailImpl extends EObjectImpl implements OrderDetail /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -381,7 +330,6 @@ public class OrderDetailImpl extends EObjectImpl implements OrderDetail /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -404,7 +352,6 @@ public class OrderDetailImpl extends EObjectImpl implements OrderDetail /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -424,16 +371,13 @@ public class OrderDetailImpl extends EObjectImpl implements OrderDetail /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override public String toString() { if (eIsProxy()) - { return super.toString(); - } StringBuffer result = new StringBuffer(super.toString()); result.append(" (price: "); 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 198f7709db..3ed57bc7f5 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,17 +29,16 @@ import java.util.Collection; * <p> * The following features are implemented: * <ul> - * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.OrderImpl#getOrderDetails <em>Order Details</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.OrderImpl#getOrderDetails <em>Order Details</em>}</li> * </ul> * </p> - * + * * @generated */ -public class OrderImpl extends EObjectImpl implements Order +public abstract class OrderImpl extends EObjectImpl implements Order { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @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"; @@ -56,7 +55,6 @@ public class OrderImpl extends EObjectImpl implements Order /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ protected OrderImpl() @@ -66,7 +64,6 @@ public class OrderImpl extends EObjectImpl implements Order /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -77,7 +74,6 @@ public class OrderImpl extends EObjectImpl implements Order /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EList<OrderDetail> getOrderDetails() @@ -92,7 +88,6 @@ public class OrderImpl extends EObjectImpl implements Order /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @SuppressWarnings("unchecked") @@ -109,7 +104,6 @@ public class OrderImpl extends EObjectImpl implements Order /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -125,7 +119,6 @@ public class OrderImpl extends EObjectImpl implements Order /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -141,7 +134,6 @@ public class OrderImpl extends EObjectImpl implements Order /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @SuppressWarnings("unchecked") @@ -160,7 +152,6 @@ public class OrderImpl extends EObjectImpl implements Order /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -177,7 +168,6 @@ public class OrderImpl extends EObjectImpl implements Order /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @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 ba71e49552..8408dacf89 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,20 +32,19 @@ import java.util.Collection; * <p> * The following features are implemented: * <ul> - * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.Product1Impl#getName <em>Name</em>}</li> - * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.Product1Impl#getOrderDetails <em>Order Details</em>}</li> - * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.Product1Impl#getVat <em>Vat</em>}</li> - * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.Product1Impl#getDescription <em>Description</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.Product1Impl#getName <em>Name</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.Product1Impl#getOrderDetails <em>Order Details</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.Product1Impl#getVat <em>Vat</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.Product1Impl#getDescription <em>Description</em>}</li> * </ul> * </p> - * + * * @generated */ public class Product1Impl extends EObjectImpl implements Product1 { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @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"; @@ -61,8 +60,8 @@ public class Product1Impl extends EObjectImpl implements Product1 protected static final String NAME_EDEFAULT = null; /** - * The cached value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The cached value of the '{@link #getName() <em>Name</em>}' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @see #getName() * @generated * @ordered @@ -70,9 +69,9 @@ public class Product1Impl extends EObjectImpl implements Product1 protected String name = NAME_EDEFAULT; /** - * The cached value of the '{@link #getOrderDetails() <em>Order Details</em>}' reference list. <!-- begin-user-doc --> + * The cached value of the '{@link #getOrderDetails() <em>Order Details</em>}' reference list. + * <!-- begin-user-doc --> * <!-- end-user-doc --> - * * @see #getOrderDetails() * @generated * @ordered @@ -80,8 +79,8 @@ public class Product1Impl extends EObjectImpl implements Product1 protected EList<OrderDetail> orderDetails; /** - * The default value of the '{@link #getVat() <em>Vat</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The default value of the '{@link #getVat() <em>Vat</em>}' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @see #getVat() * @generated * @ordered @@ -89,8 +88,8 @@ public class Product1Impl extends EObjectImpl implements Product1 protected static final VAT VAT_EDEFAULT = VAT.VAT15; /** - * The cached value of the '{@link #getVat() <em>Vat</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The cached value of the '{@link #getVat() <em>Vat</em>}' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @see #getVat() * @generated * @ordered @@ -98,9 +97,9 @@ public class Product1Impl extends EObjectImpl implements Product1 protected VAT vat = VAT_EDEFAULT; /** - * The default value of the '{@link #getDescription() <em>Description</em>}' attribute. <!-- begin-user-doc --> <!-- + * The default value of the '{@link #getDescription() <em>Description</em>}' attribute. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @see #getDescription() * @generated * @ordered @@ -108,9 +107,9 @@ public class Product1Impl extends EObjectImpl implements Product1 protected static final String DESCRIPTION_EDEFAULT = null; /** - * The cached value of the '{@link #getDescription() <em>Description</em>}' attribute. <!-- begin-user-doc --> <!-- + * The cached value of the '{@link #getDescription() <em>Description</em>}' attribute. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @see #getDescription() * @generated * @ordered @@ -119,7 +118,6 @@ public class Product1Impl extends EObjectImpl implements Product1 /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ protected Product1Impl() @@ -129,7 +127,6 @@ public class Product1Impl extends EObjectImpl implements Product1 /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -140,7 +137,6 @@ public class Product1Impl extends EObjectImpl implements Product1 /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public String getName() @@ -150,7 +146,6 @@ public class Product1Impl extends EObjectImpl implements Product1 /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void setName(String newName) @@ -158,14 +153,11 @@ public class Product1Impl extends EObjectImpl implements Product1 String oldName = name; name = newName; if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.SET, Model1Package.PRODUCT1__NAME, oldName, name)); - } } /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EList<OrderDetail> getOrderDetails() @@ -180,7 +172,6 @@ public class Product1Impl extends EObjectImpl implements Product1 /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public VAT getVat() @@ -190,7 +181,6 @@ public class Product1Impl extends EObjectImpl implements Product1 /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void setVat(VAT newVat) @@ -198,14 +188,11 @@ public class Product1Impl extends EObjectImpl implements Product1 VAT oldVat = vat; vat = newVat == null ? VAT_EDEFAULT : newVat; if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.SET, Model1Package.PRODUCT1__VAT, oldVat, vat)); - } } /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public String getDescription() @@ -215,7 +202,6 @@ public class Product1Impl extends EObjectImpl implements Product1 /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void setDescription(String newDescription) @@ -223,15 +209,12 @@ public class Product1Impl extends EObjectImpl implements Product1 String oldDescription = description; description = newDescription; if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.SET, Model1Package.PRODUCT1__DESCRIPTION, oldDescription, description)); - } } /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @SuppressWarnings("unchecked") @@ -248,7 +231,6 @@ public class Product1Impl extends EObjectImpl implements Product1 /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -264,7 +246,6 @@ public class Product1Impl extends EObjectImpl implements Product1 /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -286,7 +267,6 @@ public class Product1Impl extends EObjectImpl implements Product1 /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @SuppressWarnings("unchecked") @@ -314,7 +294,6 @@ public class Product1Impl extends EObjectImpl implements Product1 /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -340,7 +319,6 @@ public class Product1Impl extends EObjectImpl implements Product1 /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -362,16 +340,13 @@ public class Product1Impl extends EObjectImpl implements Product1 /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override 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.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 d2c2663263..ef0663bce1 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,7 +40,6 @@ public class ProductToOrderImpl extends EObjectImpl implements BasicEMap.Entry<P { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @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"; @@ -56,9 +55,9 @@ public class ProductToOrderImpl extends EObjectImpl implements BasicEMap.Entry<P protected Product1 key; /** - * The cached value of the '{@link #getTypedValue() <em>Value</em>}' reference. <!-- begin-user-doc --> <!-- + * The cached value of the '{@link #getTypedValue() <em>Value</em>}' reference. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @see #getTypedValue() * @generated * @ordered @@ -67,7 +66,6 @@ public class ProductToOrderImpl extends EObjectImpl implements BasicEMap.Entry<P /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ protected ProductToOrderImpl() @@ -77,7 +75,6 @@ public class ProductToOrderImpl extends EObjectImpl implements BasicEMap.Entry<P /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -88,7 +85,6 @@ public class ProductToOrderImpl extends EObjectImpl implements BasicEMap.Entry<P /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public Product1 getTypedKey() @@ -100,9 +96,7 @@ public class ProductToOrderImpl extends EObjectImpl implements BasicEMap.Entry<P if (key != oldKey) { if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.RESOLVE, Model1Package.PRODUCT_TO_ORDER__KEY, oldKey, key)); - } } } return key; @@ -110,7 +104,6 @@ public class ProductToOrderImpl extends EObjectImpl implements BasicEMap.Entry<P /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public Product1 basicGetTypedKey() @@ -120,7 +113,6 @@ public class ProductToOrderImpl extends EObjectImpl implements BasicEMap.Entry<P /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void setTypedKey(Product1 newKey) @@ -128,14 +120,11 @@ public class ProductToOrderImpl extends EObjectImpl implements BasicEMap.Entry<P Product1 oldKey = key; key = newKey; if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.SET, Model1Package.PRODUCT_TO_ORDER__KEY, oldKey, key)); - } } /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public SalesOrder getTypedValue() @@ -147,10 +136,8 @@ public class ProductToOrderImpl extends EObjectImpl implements BasicEMap.Entry<P if (value != oldValue) { if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.RESOLVE, Model1Package.PRODUCT_TO_ORDER__VALUE, oldValue, value)); - } } } return value; @@ -158,7 +145,6 @@ public class ProductToOrderImpl extends EObjectImpl implements BasicEMap.Entry<P /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public SalesOrder basicGetTypedValue() @@ -168,7 +154,6 @@ public class ProductToOrderImpl extends EObjectImpl implements BasicEMap.Entry<P /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void setTypedValue(SalesOrder newValue) @@ -176,14 +161,11 @@ public class ProductToOrderImpl extends EObjectImpl implements BasicEMap.Entry<P SalesOrder oldValue = value; value = newValue; if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.SET, Model1Package.PRODUCT_TO_ORDER__VALUE, oldValue, value)); - } } /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -193,15 +175,11 @@ public class ProductToOrderImpl extends EObjectImpl implements BasicEMap.Entry<P { case Model1Package.PRODUCT_TO_ORDER__KEY: if (resolve) - { return getTypedKey(); - } return basicGetTypedKey(); case Model1Package.PRODUCT_TO_ORDER__VALUE: if (resolve) - { return getTypedValue(); - } return basicGetTypedValue(); } return super.eGet(featureID, resolve, coreType); @@ -209,7 +187,6 @@ public class ProductToOrderImpl extends EObjectImpl implements BasicEMap.Entry<P /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -229,7 +206,6 @@ public class ProductToOrderImpl extends EObjectImpl implements BasicEMap.Entry<P /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -249,7 +225,6 @@ public class ProductToOrderImpl extends EObjectImpl implements BasicEMap.Entry<P /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -267,14 +242,12 @@ public class ProductToOrderImpl extends EObjectImpl implements BasicEMap.Entry<P /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ protected int hash = -1; /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public int getHash() @@ -282,14 +255,13 @@ public class ProductToOrderImpl extends EObjectImpl implements BasicEMap.Entry<P if (hash == -1) { Object theKey = getKey(); - hash = theKey == null ? 0 : theKey.hashCode(); + hash = (theKey == null ? 0 : theKey.hashCode()); } return hash; } /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void setHash(int hash) @@ -299,7 +271,6 @@ public class ProductToOrderImpl extends EObjectImpl implements BasicEMap.Entry<P /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public Product1 getKey() @@ -309,7 +280,6 @@ public class ProductToOrderImpl extends EObjectImpl implements BasicEMap.Entry<P /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void setKey(Product1 key) @@ -319,7 +289,6 @@ public class ProductToOrderImpl extends EObjectImpl implements BasicEMap.Entry<P /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public SalesOrder getValue() @@ -329,7 +298,6 @@ public class ProductToOrderImpl extends EObjectImpl implements BasicEMap.Entry<P /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public SalesOrder setValue(SalesOrder value) @@ -341,7 +309,6 @@ public class ProductToOrderImpl extends EObjectImpl implements BasicEMap.Entry<P /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @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 0da87b4199..3548b59819 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,7 +22,6 @@ public class PurchaseOrderImpl extends OrderImpl implements PurchaseOrder { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @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"; @@ -38,8 +37,8 @@ public class PurchaseOrderImpl extends OrderImpl implements PurchaseOrder protected static final Date DATE_EDEFAULT = null; /** - * The cached value of the '{@link #getDate() <em>Date</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The cached value of the '{@link #getDate() <em>Date</em>}' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @see #getDate() * @generated * @ordered @@ -47,9 +46,9 @@ public class PurchaseOrderImpl extends OrderImpl implements PurchaseOrder protected Date date = DATE_EDEFAULT; /** - * The cached value of the '{@link #getSupplier() <em>Supplier</em>}' reference. <!-- begin-user-doc --> <!-- + * The cached value of the '{@link #getSupplier() <em>Supplier</em>}' reference. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @see #getSupplier() * @generated * @ordered @@ -58,7 +57,6 @@ public class PurchaseOrderImpl extends OrderImpl implements PurchaseOrder /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ protected PurchaseOrderImpl() @@ -68,7 +66,6 @@ public class PurchaseOrderImpl extends OrderImpl implements PurchaseOrder /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -79,7 +76,6 @@ public class PurchaseOrderImpl extends OrderImpl implements PurchaseOrder /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public Date getDate() @@ -89,7 +85,6 @@ public class PurchaseOrderImpl extends OrderImpl implements PurchaseOrder /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void setDate(Date newDate) @@ -97,14 +92,11 @@ public class PurchaseOrderImpl extends OrderImpl implements PurchaseOrder Date oldDate = date; date = newDate; if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.SET, Model1Package.PURCHASE_ORDER__DATE, oldDate, date)); - } } /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public Supplier getSupplier() @@ -116,10 +108,8 @@ public class PurchaseOrderImpl extends OrderImpl implements PurchaseOrder if (supplier != oldSupplier) { if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.RESOLVE, Model1Package.PURCHASE_ORDER__SUPPLIER, oldSupplier, supplier)); - } } } return supplier; @@ -127,7 +117,6 @@ public class PurchaseOrderImpl extends OrderImpl implements PurchaseOrder /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public Supplier basicGetSupplier() @@ -137,7 +126,6 @@ public class PurchaseOrderImpl extends OrderImpl implements PurchaseOrder /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public NotificationChain basicSetSupplier(Supplier newSupplier, NotificationChain msgs) @@ -149,20 +137,15 @@ public class PurchaseOrderImpl extends OrderImpl implements PurchaseOrder ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, Model1Package.PURCHASE_ORDER__SUPPLIER, oldSupplier, newSupplier); if (msgs == null) - { msgs = notification; - } else - { msgs.add(notification); - } } return msgs; } /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void setSupplier(Supplier newSupplier) @@ -171,31 +154,22 @@ public class PurchaseOrderImpl extends OrderImpl implements PurchaseOrder { NotificationChain msgs = null; if (supplier != null) - { msgs = ((InternalEObject)supplier).eInverseRemove(this, Model1Package.SUPPLIER__PURCHASE_ORDERS, Supplier.class, msgs); - } if (newSupplier != null) - { msgs = ((InternalEObject)newSupplier).eInverseAdd(this, Model1Package.SUPPLIER__PURCHASE_ORDERS, Supplier.class, msgs); - } msgs = basicSetSupplier(newSupplier, msgs); if (msgs != null) - { msgs.dispatch(); - } } else if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.SET, Model1Package.PURCHASE_ORDER__SUPPLIER, newSupplier, newSupplier)); - } } /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -205,10 +179,8 @@ public class PurchaseOrderImpl extends OrderImpl implements PurchaseOrder { case Model1Package.PURCHASE_ORDER__SUPPLIER: if (supplier != null) - { msgs = ((InternalEObject)supplier).eInverseRemove(this, Model1Package.SUPPLIER__PURCHASE_ORDERS, Supplier.class, msgs); - } return basicSetSupplier((Supplier)otherEnd, msgs); } return super.eInverseAdd(otherEnd, featureID, msgs); @@ -216,7 +188,6 @@ public class PurchaseOrderImpl extends OrderImpl implements PurchaseOrder /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -232,7 +203,6 @@ public class PurchaseOrderImpl extends OrderImpl implements PurchaseOrder /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -244,9 +214,7 @@ public class PurchaseOrderImpl extends OrderImpl implements PurchaseOrder return getDate(); case Model1Package.PURCHASE_ORDER__SUPPLIER: if (resolve) - { return getSupplier(); - } return basicGetSupplier(); } return super.eGet(featureID, resolve, coreType); @@ -254,7 +222,6 @@ public class PurchaseOrderImpl extends OrderImpl implements PurchaseOrder /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -274,7 +241,6 @@ public class PurchaseOrderImpl extends OrderImpl implements PurchaseOrder /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -294,7 +260,6 @@ public class PurchaseOrderImpl extends OrderImpl implements PurchaseOrder /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -312,16 +277,13 @@ public class PurchaseOrderImpl extends OrderImpl implements PurchaseOrder /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override public String toString() { if (eIsProxy()) - { return super.toString(); - } StringBuffer result = new StringBuffer(super.toString()); result.append(" (date: "); 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 17ba76836d..ca9134182b 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,25 +25,24 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl; * <p> * The following features are implemented: * <ul> - * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.SalesOrderImpl#getId <em>Id</em>}</li> - * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.SalesOrderImpl#getCustomer <em>Customer</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.SalesOrderImpl#getId <em>Id</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.SalesOrderImpl#getCustomer <em>Customer</em>}</li> * </ul> * </p> - * + * * @generated */ public class SalesOrderImpl extends OrderImpl implements SalesOrder { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @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() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The default value of the '{@link #getId() <em>Id</em>}' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @see #getId() * @generated * @ordered @@ -51,8 +50,8 @@ public class SalesOrderImpl extends OrderImpl implements SalesOrder protected static final int ID_EDEFAULT = 0; /** - * The cached value of the '{@link #getId() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The cached value of the '{@link #getId() <em>Id</em>}' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @see #getId() * @generated * @ordered @@ -60,9 +59,9 @@ public class SalesOrderImpl extends OrderImpl implements SalesOrder protected int id = ID_EDEFAULT; /** - * The cached value of the '{@link #getCustomer() <em>Customer</em>}' reference. <!-- begin-user-doc --> <!-- + * The cached value of the '{@link #getCustomer() <em>Customer</em>}' reference. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @see #getCustomer() * @generated * @ordered @@ -71,7 +70,6 @@ public class SalesOrderImpl extends OrderImpl implements SalesOrder /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ protected SalesOrderImpl() @@ -81,7 +79,6 @@ public class SalesOrderImpl extends OrderImpl implements SalesOrder /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -92,7 +89,6 @@ public class SalesOrderImpl extends OrderImpl implements SalesOrder /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public int getId() @@ -102,7 +98,6 @@ public class SalesOrderImpl extends OrderImpl implements SalesOrder /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void setId(int newId) @@ -110,14 +105,11 @@ public class SalesOrderImpl extends OrderImpl implements SalesOrder int oldId = id; id = newId; if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.SET, Model1Package.SALES_ORDER__ID, oldId, id)); - } } /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public Customer getCustomer() @@ -129,10 +121,8 @@ public class SalesOrderImpl extends OrderImpl implements SalesOrder if (customer != oldCustomer) { if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.RESOLVE, Model1Package.SALES_ORDER__CUSTOMER, oldCustomer, customer)); - } } } return customer; @@ -140,7 +130,6 @@ public class SalesOrderImpl extends OrderImpl implements SalesOrder /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public Customer basicGetCustomer() @@ -150,7 +139,6 @@ public class SalesOrderImpl extends OrderImpl implements SalesOrder /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public NotificationChain basicSetCustomer(Customer newCustomer, NotificationChain msgs) @@ -162,20 +150,15 @@ public class SalesOrderImpl extends OrderImpl implements SalesOrder ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, Model1Package.SALES_ORDER__CUSTOMER, oldCustomer, newCustomer); if (msgs == null) - { msgs = notification; - } else - { msgs.add(notification); - } } return msgs; } /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void setCustomer(Customer newCustomer) @@ -184,31 +167,22 @@ public class SalesOrderImpl extends OrderImpl implements SalesOrder { NotificationChain msgs = null; if (customer != null) - { msgs = ((InternalEObject)customer).eInverseRemove(this, Model1Package.CUSTOMER__SALES_ORDERS, Customer.class, msgs); - } if (newCustomer != null) - { msgs = ((InternalEObject)newCustomer).eInverseAdd(this, Model1Package.CUSTOMER__SALES_ORDERS, Customer.class, msgs); - } msgs = basicSetCustomer(newCustomer, msgs); if (msgs != null) - { msgs.dispatch(); - } } else if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.SET, Model1Package.SALES_ORDER__CUSTOMER, newCustomer, newCustomer)); - } } /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -218,10 +192,8 @@ public class SalesOrderImpl extends OrderImpl implements SalesOrder { case Model1Package.SALES_ORDER__CUSTOMER: if (customer != null) - { msgs = ((InternalEObject)customer).eInverseRemove(this, Model1Package.CUSTOMER__SALES_ORDERS, Customer.class, msgs); - } return basicSetCustomer((Customer)otherEnd, msgs); } return super.eInverseAdd(otherEnd, featureID, msgs); @@ -229,7 +201,6 @@ public class SalesOrderImpl extends OrderImpl implements SalesOrder /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -245,7 +216,6 @@ public class SalesOrderImpl extends OrderImpl implements SalesOrder /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -257,9 +227,7 @@ public class SalesOrderImpl extends OrderImpl implements SalesOrder return getId(); case Model1Package.SALES_ORDER__CUSTOMER: if (resolve) - { return getCustomer(); - } return basicGetCustomer(); } return super.eGet(featureID, resolve, coreType); @@ -267,7 +235,6 @@ public class SalesOrderImpl extends OrderImpl implements SalesOrder /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -287,7 +254,6 @@ public class SalesOrderImpl extends OrderImpl implements SalesOrder /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -307,7 +273,6 @@ public class SalesOrderImpl extends OrderImpl implements SalesOrder /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -325,16 +290,13 @@ public class SalesOrderImpl extends OrderImpl implements SalesOrder /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override public String toString() { if (eIsProxy()) - { return super.toString(); - } StringBuffer result = new StringBuffer(super.toString()); result.append(" (id: "); 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 865db79c37..8861f17df4 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,26 +30,25 @@ import java.util.Collection; * <p> * The following features are implemented: * <ul> - * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.SupplierImpl#getPurchaseOrders <em>Purchase Orders</em>}</li> - * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.SupplierImpl#isPreferred <em>Preferred</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.SupplierImpl#getPurchaseOrders <em>Purchase Orders</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.SupplierImpl#isPreferred <em>Preferred</em>}</li> * </ul> * </p> - * + * * @generated */ public class SupplierImpl extends AddressImpl implements Supplier { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @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() <em>Purchase Orders</em>}' reference list. <!-- begin-user-doc + * The cached value of the '{@link #getPurchaseOrders() <em>Purchase Orders</em>}' reference list. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @see #getPurchaseOrders() * @generated * @ordered @@ -57,9 +56,9 @@ public class SupplierImpl extends AddressImpl implements Supplier protected EList<PurchaseOrder> purchaseOrders; /** - * The default value of the '{@link #isPreferred() <em>Preferred</em>}' attribute. <!-- begin-user-doc --> <!-- + * The default value of the '{@link #isPreferred() <em>Preferred</em>}' attribute. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @see #isPreferred() * @generated * @ordered @@ -67,9 +66,9 @@ public class SupplierImpl extends AddressImpl implements Supplier protected static final boolean PREFERRED_EDEFAULT = true; /** - * The cached value of the '{@link #isPreferred() <em>Preferred</em>}' attribute. <!-- begin-user-doc --> <!-- + * The cached value of the '{@link #isPreferred() <em>Preferred</em>}' attribute. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @see #isPreferred() * @generated * @ordered @@ -78,7 +77,6 @@ public class SupplierImpl extends AddressImpl implements Supplier /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ protected SupplierImpl() @@ -88,7 +86,6 @@ public class SupplierImpl extends AddressImpl implements Supplier /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -99,7 +96,6 @@ public class SupplierImpl extends AddressImpl implements Supplier /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EList<PurchaseOrder> getPurchaseOrders() @@ -114,7 +110,6 @@ public class SupplierImpl extends AddressImpl implements Supplier /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public boolean isPreferred() @@ -124,7 +119,6 @@ public class SupplierImpl extends AddressImpl implements Supplier /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void setPreferred(boolean newPreferred) @@ -132,14 +126,11 @@ public class SupplierImpl extends AddressImpl implements Supplier boolean oldPreferred = preferred; preferred = newPreferred; if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.SET, Model1Package.SUPPLIER__PREFERRED, oldPreferred, preferred)); - } } /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @SuppressWarnings("unchecked") @@ -156,7 +147,6 @@ public class SupplierImpl extends AddressImpl implements Supplier /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -172,7 +162,6 @@ public class SupplierImpl extends AddressImpl implements Supplier /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -190,7 +179,6 @@ public class SupplierImpl extends AddressImpl implements Supplier /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @SuppressWarnings("unchecked") @@ -212,7 +200,6 @@ public class SupplierImpl extends AddressImpl implements Supplier /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -232,7 +219,6 @@ public class SupplierImpl extends AddressImpl implements Supplier /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -250,16 +236,13 @@ public class SupplierImpl extends AddressImpl implements Supplier /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override public String toString() { if (eIsProxy()) - { return super.toString(); - } StringBuffer result = new StringBuffer(super.toString()); result.append(" (preferred: "); 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 9ca6b40596..8197d4787e 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,15 +14,16 @@ import org.eclipse.emf.ecore.EObject; /** * <!-- begin-user-doc --> A representation of the model object '<em><b>Address</b></em>'. <!-- end-user-doc --> + * * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.emf.cdo.tests.model1.Address#getName <em>Name</em>}</li> - * <li>{@link org.eclipse.emf.cdo.tests.model1.Address#getStreet <em>Street</em>}</li> - * <li>{@link org.eclipse.emf.cdo.tests.model1.Address#getCity <em>City</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model1.Address#getName <em>Name</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model1.Address#getStreet <em>Street</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model1.Address#getCity <em>City</em>}</li> * </ul> * </p> - * + * * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getAddress() * @model * @generated @@ -31,18 +32,17 @@ public interface Address extends EObject { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @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 '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> + * Returns the value of the '<em><b>Name</b></em>' attribute. + * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a description here... * </p> * <!-- end-user-doc --> - * * @return the value of the '<em>Name</em>' attribute. * @see #setName(String) * @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 '<em><b>Street</b></em>' attribute. <!-- begin-user-doc --> + * Returns the value of the '<em><b>Street</b></em>' attribute. + * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Street</em>' attribute isn't clear, there really should be more of a description here... * </p> * <!-- end-user-doc --> - * * @return the value of the '<em>Street</em>' 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 '<em><b>City</b></em>' attribute. <!-- begin-user-doc --> + * Returns the value of the '<em><b>City</b></em>' attribute. + * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>City</em>' attribute isn't clear, there really should be more of a description here... * </p> * <!-- end-user-doc --> - * * @return the value of the '<em>City</em>' 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 faae2e6b39..a943c6bf8e 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,15 +15,16 @@ import org.eclipse.emf.ecore.EObject; /** * <!-- begin-user-doc --> A representation of the model object '<em><b>Category</b></em>'. <!-- end-user-doc --> + * * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.emf.cdo.tests.model1.Category#getName <em>Name</em>}</li> - * <li>{@link org.eclipse.emf.cdo.tests.model1.Category#getCategories <em>Categories</em>}</li> - * <li>{@link org.eclipse.emf.cdo.tests.model1.Category#getProducts <em>Products</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model1.Category#getName <em>Name</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model1.Category#getCategories <em>Categories</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model1.Category#getProducts <em>Products</em>}</li> * </ul> * </p> - * + * * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getCategory() * @model * @generated @@ -32,18 +33,17 @@ public interface Category extends EObject { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @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 '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> + * Returns the value of the '<em><b>Name</b></em>' attribute. + * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a description here... * </p> * <!-- end-user-doc --> - * * @return the value of the '<em>Name</em>' attribute. * @see #setName(String) * @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 '<em><b>Categories</b></em>' containment reference list. The list contents are of type - * {@link org.eclipse.emf.cdo.tests.model1.Category}. <!-- begin-user-doc --> + * Returns the value of the '<em><b>Categories</b></em>' containment reference list. + * The list contents are of type {@link org.eclipse.emf.cdo.tests.model1.Category}. + * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Categories</em>' containment reference list isn't clear, there really should be more of * a description here... * </p> * <!-- end-user-doc --> - * * @return the value of the '<em>Categories</em>' 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<Category> getCategories(); /** - * Returns the value of the '<em><b>Products</b></em>' containment reference list. The list contents are of type - * {@link org.eclipse.emf.cdo.tests.model1.Product1}. <!-- begin-user-doc --> + * Returns the value of the '<em><b>Products</b></em>' containment reference list. + * The list contents are of type {@link org.eclipse.emf.cdo.tests.model1.Product1}. + * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Products</em>' containment reference list isn't clear, there really should be more of a * description here... * </p> * <!-- end-user-doc --> - * * @return the value of the '<em>Products</em>' 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 3aa2d2944c..852283d8c6 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,17 +14,18 @@ import org.eclipse.emf.common.util.EList; /** * <!-- begin-user-doc --> A representation of the model object '<em><b>Company</b></em>'. <!-- end-user-doc --> + * * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.emf.cdo.tests.model1.Company#getCategories <em>Categories</em>}</li> - * <li>{@link org.eclipse.emf.cdo.tests.model1.Company#getSuppliers <em>Suppliers</em>}</li> - * <li>{@link org.eclipse.emf.cdo.tests.model1.Company#getCustomers <em>Customers</em>}</li> - * <li>{@link org.eclipse.emf.cdo.tests.model1.Company#getPurchaseOrders <em>Purchase Orders</em>}</li> - * <li>{@link org.eclipse.emf.cdo.tests.model1.Company#getSalesOrders <em>Sales Orders</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model1.Company#getCategories <em>Categories</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model1.Company#getSuppliers <em>Suppliers</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model1.Company#getCustomers <em>Customers</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model1.Company#getPurchaseOrders <em>Purchase Orders</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model1.Company#getSalesOrders <em>Sales Orders</em>}</li> * </ul> * </p> - * + * * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getCompany() * @model * @generated @@ -33,20 +34,19 @@ public interface Company extends Address { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @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 '<em><b>Categories</b></em>' containment reference list. The list contents are of type - * {@link org.eclipse.emf.cdo.tests.model1.Category}. <!-- begin-user-doc --> + * Returns the value of the '<em><b>Categories</b></em>' containment reference list. + * The list contents are of type {@link org.eclipse.emf.cdo.tests.model1.Category}. + * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Categories</em>' containment reference list isn't clear, there really should be more of * a description here... * </p> * <!-- end-user-doc --> - * * @return the value of the '<em>Categories</em>' 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<Category> getCategories(); /** - * Returns the value of the '<em><b>Suppliers</b></em>' containment reference list. The list contents are of type - * {@link org.eclipse.emf.cdo.tests.model1.Supplier}. <!-- begin-user-doc --> + * Returns the value of the '<em><b>Suppliers</b></em>' containment reference list. + * The list contents are of type {@link org.eclipse.emf.cdo.tests.model1.Supplier}. + * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Suppliers</em>' containment reference list isn't clear, there really should be more of a * description here... * </p> * <!-- end-user-doc --> - * * @return the value of the '<em>Suppliers</em>' 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<Supplier> getSuppliers(); /** - * Returns the value of the '<em><b>Purchase Orders</b></em>' containment reference list. The list contents are of - * type {@link org.eclipse.emf.cdo.tests.model1.PurchaseOrder}. <!-- begin-user-doc --> + * Returns the value of the '<em><b>Purchase Orders</b></em>' containment reference list. + * The list contents are of type {@link org.eclipse.emf.cdo.tests.model1.PurchaseOrder}. + * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Purchase Orders</em>' containment reference list isn't clear, there really should be * more of a description here... * </p> * <!-- end-user-doc --> - * * @return the value of the '<em>Purchase Orders</em>' 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<PurchaseOrder> getPurchaseOrders(); /** - * Returns the value of the '<em><b>Customers</b></em>' containment reference list. The list contents are of type - * {@link org.eclipse.emf.cdo.tests.model1.Customer}. <!-- begin-user-doc --> + * Returns the value of the '<em><b>Customers</b></em>' containment reference list. + * The list contents are of type {@link org.eclipse.emf.cdo.tests.model1.Customer}. + * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Customers</em>' containment reference list isn't clear, there really should be more of a * description here... * </p> * <!-- end-user-doc --> - * * @return the value of the '<em>Customers</em>' 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<Customer> getCustomers(); /** - * Returns the value of the '<em><b>Sales Orders</b></em>' containment reference list. The list contents are of type - * {@link org.eclipse.emf.cdo.tests.model1.SalesOrder}. <!-- begin-user-doc --> + * Returns the value of the '<em><b>Sales Orders</b></em>' containment reference list. + * The list contents are of type {@link org.eclipse.emf.cdo.tests.model1.SalesOrder}. + * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Sales Orders</em>' containment reference list isn't clear, there really should be more * of a description here... * </p> * <!-- end-user-doc --> - * * @return the value of the '<em>Sales Orders</em>' 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 4736bb9c30..0f8e0bfc01 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,14 +15,15 @@ import org.eclipse.emf.common.util.EMap; /** * <!-- begin-user-doc --> A representation of the model object '<em><b>Customer</b></em>'. <!-- end-user-doc --> + * * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.emf.cdo.tests.model1.Customer#getSalesOrders <em>Sales Orders</em>}</li> - * <li>{@link org.eclipse.emf.cdo.tests.model1.Customer#getOrderByProduct <em>Order By Product</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model1.Customer#getSalesOrders <em>Sales Orders</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model1.Customer#getOrderByProduct <em>Order By Product</em>}</li> * </ul> * </p> - * + * * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getCustomer() * @model * @generated @@ -31,21 +32,20 @@ public interface Customer extends Address { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @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 '<em><b>Sales Orders</b></em>' 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 <em>Customer</em>}'. <!-- begin-user-doc --> + * Returns the value of the '<em><b>Sales Orders</b></em>' 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 <em>Customer</em>}'. + * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Sales Orders</em>' reference list isn't clear, there really should be more of a * description here... * </p> * <!-- end-user-doc --> - * * @return the value of the '<em>Sales Orders</em>' reference list. * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getCustomer_SalesOrders() * @see org.eclipse.emf.cdo.tests.model1.SalesOrder#getCustomer @@ -55,19 +55,18 @@ public interface Customer extends Address EList<SalesOrder> getSalesOrders(); /** - * Returns the value of the '<em><b>Order By Product</b></em>' 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}, <!-- begin-user-doc --> + * Returns the value of the '<em><b>Order By Product</b></em>' 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}, + * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Order By Product</em>' map isn't clear, there really should be more of a description * here... * </p> * <!-- end-user-doc --> - * * @return the value of the '<em>Order By Product</em>' map. * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getCustomer_OrderByProduct() - * @model mapType= - * "org.eclipse.emf.cdo.tests.model1.ProductToOrder<org.eclipse.emf.cdo.tests.model1.Product1, org.eclipse.emf.cdo.tests.model1.SalesOrder>" + * @model mapType="org.eclipse.emf.cdo.tests.model1.ProductToOrder<org.eclipse.emf.cdo.tests.model1.Product1, org.eclipse.emf.cdo.tests.model1.SalesOrder>" * @generated */ EMap<Product1, SalesOrder> 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 f90ed9a93b..1a2799851b 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,7 +15,6 @@ import org.eclipse.emf.ecore.EFactory; /** * <!-- begin-user-doc --> The <b>Factory</b> for the model. It provides a create method for each non-abstract class of * the model. <!-- end-user-doc --> - * * @see org.eclipse.emf.cdo.tests.model1.Model1Package * @generated */ @@ -23,109 +22,100 @@ public interface Model1Factory extends EFactory { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @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. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The singleton instance of the factory. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ Model1Factory eINSTANCE = org.eclipse.emf.cdo.tests.model1.impl.Model1FactoryImpl.init(); /** - * Returns a new object of class '<em>Address</em>'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns a new object of class '<em>Address</em>'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return a new object of class '<em>Address</em>'. * @generated */ Address createAddress(); /** - * Returns a new object of class '<em>Supplier</em>'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns a new object of class '<em>Supplier</em>'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return a new object of class '<em>Supplier</em>'. * @generated */ Supplier createSupplier(); /** - * Returns a new object of class '<em>Purchase Order</em>'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns a new object of class '<em>Purchase Order</em>'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return a new object of class '<em>Purchase Order</em>'. * @generated */ PurchaseOrder createPurchaseOrder(); /** - * Returns a new object of class '<em>Order Detail</em>'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns a new object of class '<em>Order Detail</em>'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return a new object of class '<em>Order Detail</em>'. * @generated */ OrderDetail createOrderDetail(); /** - * Returns a new object of class '<em>Order Address</em>'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns a new object of class '<em>Order Address</em>'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return a new object of class '<em>Order Address</em>'. * @generated */ OrderAddress createOrderAddress(); /** - * Returns a new object of class '<em>Category</em>'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns a new object of class '<em>Category</em>'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return a new object of class '<em>Category</em>'. * @generated */ Category createCategory(); /** - * Returns a new object of class '<em>Product1</em>'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns a new object of class '<em>Product1</em>'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return a new object of class '<em>Product1</em>'. * @generated */ Product1 createProduct1(); /** - * Returns a new object of class '<em>Company</em>'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns a new object of class '<em>Company</em>'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return a new object of class '<em>Company</em>'. * @generated */ Company createCompany(); /** - * Returns a new object of class '<em>Customer</em>'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns a new object of class '<em>Customer</em>'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return a new object of class '<em>Customer</em>'. * @generated */ Customer createCustomer(); /** - * Returns a new object of class '<em>Order</em>'. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @return a new object of class '<em>Order</em>'. - * @generated - */ - Order createOrder(); - - /** - * Returns a new object of class '<em>Sales Order</em>'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns a new object of class '<em>Sales Order</em>'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return a new object of class '<em>Sales Order</em>'. * @generated */ SalesOrder createSalesOrder(); /** - * Returns the package supported by this factory. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns the package supported by this factory. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @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 916a453581..b2e01a926d 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,46 +25,43 @@ import org.eclipse.emf.ecore.EReference; * <li>and each data type</li> * </ul> * <!-- end-user-doc --> - * * @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 { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @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. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The package name. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ String eNAME = "model1"; /** - * The package namespace URI. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The package namespace URI. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ String eNS_URI = "http://www.eclipse.org/emf/CDO/tests/model1/1.0.0"; /** - * The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The package namespace name. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ String eNS_PREFIX = "model1"; /** - * The singleton instance of the package. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The singleton instance of the package. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ Model1Package eINSTANCE = org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl.init(); @@ -80,32 +77,32 @@ public interface Model1Package extends EPackage int ADDRESS = 0; /** - * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Name</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int ADDRESS__NAME = 0; /** - * The feature id for the '<em><b>Street</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Street</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int ADDRESS__STREET = 1; /** - * The feature id for the '<em><b>City</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>City</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int ADDRESS__CITY = 2; /** - * The number of structural features of the '<em>Address</em>' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The number of structural features of the '<em>Address</em>' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ @@ -114,7 +111,6 @@ public interface Model1Package extends EPackage /** * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model1.impl.SupplierImpl <em>Supplier</em>}' class. * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @see org.eclipse.emf.cdo.tests.model1.impl.SupplierImpl * @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getSupplier() * @generated @@ -122,9 +118,8 @@ public interface Model1Package extends EPackage int SUPPLIER = 2; /** - * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model1.impl.PurchaseOrderImpl <em>Purchase Order</em>} - * ' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model1.impl.PurchaseOrderImpl <em>Purchase Order</em>}' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @see org.eclipse.emf.cdo.tests.model1.impl.PurchaseOrderImpl * @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getPurchaseOrder() * @generated @@ -132,9 +127,8 @@ public interface Model1Package extends EPackage int PURCHASE_ORDER = 6; /** - * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model1.impl.OrderDetailImpl <em>Order Detail</em>}' - * class. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model1.impl.OrderDetailImpl <em>Order Detail</em>}' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @see org.eclipse.emf.cdo.tests.model1.impl.OrderDetailImpl * @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getOrderDetail() * @generated @@ -154,7 +148,6 @@ public interface Model1Package extends EPackage /** * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model1.Address#getName <em>Name</em>}'. * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @return the meta object for the attribute '<em>Name</em>'. * @see org.eclipse.emf.cdo.tests.model1.Address#getName() * @see #getAddress() @@ -163,9 +156,8 @@ public interface Model1Package extends EPackage EAttribute getAddress_Name(); /** - * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model1.Address#getStreet - * <em>Street</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model1.Address#getStreet <em>Street</em>}'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return the meta object for the attribute '<em>Street</em>'. * @see org.eclipse.emf.cdo.tests.model1.Address#getStreet() * @see #getAddress() @@ -176,7 +168,6 @@ public interface Model1Package extends EPackage /** * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model1.Address#getCity <em>City</em>}'. * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @return the meta object for the attribute '<em>City</em>'. * @see org.eclipse.emf.cdo.tests.model1.Address#getCity() * @see #getAddress() @@ -187,7 +178,6 @@ public interface Model1Package extends EPackage /** * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model1.impl.CategoryImpl <em>Category</em>}' class. * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @see org.eclipse.emf.cdo.tests.model1.impl.CategoryImpl * @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getCategory() * @generated @@ -205,101 +195,101 @@ public interface Model1Package extends EPackage int COMPANY = 1; /** - * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Name</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int COMPANY__NAME = ADDRESS__NAME; /** - * The feature id for the '<em><b>Street</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Street</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int COMPANY__STREET = ADDRESS__STREET; /** - * The feature id for the '<em><b>City</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>City</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int COMPANY__CITY = ADDRESS__CITY; /** - * The feature id for the '<em><b>Categories</b></em>' containment reference list. <!-- begin-user-doc --> <!-- + * The feature id for the '<em><b>Categories</b></em>' containment reference list. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated * @ordered */ int COMPANY__CATEGORIES = ADDRESS_FEATURE_COUNT + 0; /** - * The feature id for the '<em><b>Suppliers</b></em>' containment reference list. <!-- begin-user-doc --> <!-- + * The feature id for the '<em><b>Suppliers</b></em>' containment reference list. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated * @ordered */ int COMPANY__SUPPLIERS = ADDRESS_FEATURE_COUNT + 1; /** - * The feature id for the '<em><b>Customers</b></em>' containment reference list. <!-- begin-user-doc --> <!-- + * The feature id for the '<em><b>Customers</b></em>' containment reference list. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated * @ordered */ int COMPANY__CUSTOMERS = ADDRESS_FEATURE_COUNT + 2; /** - * The feature id for the '<em><b>Purchase Orders</b></em>' containment reference list. <!-- begin-user-doc --> <!-- + * The feature id for the '<em><b>Purchase Orders</b></em>' containment reference list. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated * @ordered */ int COMPANY__PURCHASE_ORDERS = ADDRESS_FEATURE_COUNT + 3; /** - * The feature id for the '<em><b>Sales Orders</b></em>' containment reference list. <!-- begin-user-doc --> <!-- + * The feature id for the '<em><b>Sales Orders</b></em>' containment reference list. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated * @ordered */ int COMPANY__SALES_ORDERS = ADDRESS_FEATURE_COUNT + 4; /** - * The number of structural features of the '<em>Company</em>' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The number of structural features of the '<em>Company</em>' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int COMPANY_FEATURE_COUNT = ADDRESS_FEATURE_COUNT + 5; /** - * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Name</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int SUPPLIER__NAME = ADDRESS__NAME; /** - * The feature id for the '<em><b>Street</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Street</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int SUPPLIER__STREET = ADDRESS__STREET; /** - * The feature id for the '<em><b>City</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>City</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ @@ -315,16 +305,16 @@ public interface Model1Package extends EPackage int SUPPLIER__PURCHASE_ORDERS = ADDRESS_FEATURE_COUNT + 0; /** - * The feature id for the '<em><b>Preferred</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Preferred</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int SUPPLIER__PREFERRED = ADDRESS_FEATURE_COUNT + 1; /** - * The number of structural features of the '<em>Supplier</em>' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The number of structural features of the '<em>Supplier</em>' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ @@ -333,7 +323,6 @@ public interface Model1Package extends EPackage /** * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model1.impl.CustomerImpl <em>Customer</em>}' class. * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @see org.eclipse.emf.cdo.tests.model1.impl.CustomerImpl * @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getCustomer() * @generated @@ -341,48 +330,48 @@ public interface Model1Package extends EPackage int CUSTOMER = 3; /** - * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Name</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int CUSTOMER__NAME = ADDRESS__NAME; /** - * The feature id for the '<em><b>Street</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Street</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int CUSTOMER__STREET = ADDRESS__STREET; /** - * The feature id for the '<em><b>City</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>City</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int CUSTOMER__CITY = ADDRESS__CITY; /** - * The feature id for the '<em><b>Sales Orders</b></em>' reference list. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Sales Orders</b></em>' reference list. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int CUSTOMER__SALES_ORDERS = ADDRESS_FEATURE_COUNT + 0; /** - * The feature id for the '<em><b>Order By Product</b></em>' map. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Order By Product</b></em>' map. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int CUSTOMER__ORDER_BY_PRODUCT = ADDRESS_FEATURE_COUNT + 1; /** - * The number of structural features of the '<em>Customer</em>' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The number of structural features of the '<em>Customer</em>' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ @@ -399,41 +388,41 @@ public interface Model1Package extends EPackage int ORDER = 4; /** - * The feature id for the '<em><b>Order Details</b></em>' containment reference list. <!-- begin-user-doc --> <!-- + * The feature id for the '<em><b>Order Details</b></em>' containment reference list. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated * @ordered */ int ORDER__ORDER_DETAILS = 0; /** - * The number of structural features of the '<em>Order</em>' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The number of structural features of the '<em>Order</em>' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int ORDER_FEATURE_COUNT = 1; /** - * The feature id for the '<em><b>Order</b></em>' container reference. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Order</b></em>' container reference. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int ORDER_DETAIL__ORDER = 0; /** - * The feature id for the '<em><b>Product</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Product</b></em>' reference. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int ORDER_DETAIL__PRODUCT = 1; /** - * The feature id for the '<em><b>Price</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Price</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ @@ -449,25 +438,25 @@ public interface Model1Package extends EPackage int ORDER_DETAIL_FEATURE_COUNT = 3; /** - * The feature id for the '<em><b>Order Details</b></em>' containment reference list. <!-- begin-user-doc --> <!-- + * The feature id for the '<em><b>Order Details</b></em>' containment reference list. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated * @ordered */ int PURCHASE_ORDER__ORDER_DETAILS = ORDER__ORDER_DETAILS; /** - * The feature id for the '<em><b>Date</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Date</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int PURCHASE_ORDER__DATE = ORDER_FEATURE_COUNT + 0; /** - * The feature id for the '<em><b>Supplier</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Supplier</b></em>' reference. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ @@ -483,9 +472,8 @@ 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 <em>Sales Order</em>}' - * class. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model1.impl.SalesOrderImpl <em>Sales Order</em>}' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @see org.eclipse.emf.cdo.tests.model1.impl.SalesOrderImpl * @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getSalesOrder() * @generated @@ -493,25 +481,25 @@ public interface Model1Package extends EPackage int SALES_ORDER = 7; /** - * The feature id for the '<em><b>Order Details</b></em>' containment reference list. <!-- begin-user-doc --> <!-- + * The feature id for the '<em><b>Order Details</b></em>' containment reference list. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated * @ordered */ int SALES_ORDER__ORDER_DETAILS = ORDER__ORDER_DETAILS; /** - * The feature id for the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Id</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int SALES_ORDER__ID = ORDER_FEATURE_COUNT + 0; /** - * The feature id for the '<em><b>Customer</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Customer</b></em>' reference. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ @@ -527,34 +515,34 @@ public interface Model1Package extends EPackage int SALES_ORDER_FEATURE_COUNT = ORDER_FEATURE_COUNT + 2; /** - * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Name</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int CATEGORY__NAME = 0; /** - * The feature id for the '<em><b>Categories</b></em>' containment reference list. <!-- begin-user-doc --> <!-- + * The feature id for the '<em><b>Categories</b></em>' containment reference list. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated * @ordered */ int CATEGORY__CATEGORIES = 1; /** - * The feature id for the '<em><b>Products</b></em>' containment reference list. <!-- begin-user-doc --> <!-- + * The feature id for the '<em><b>Products</b></em>' containment reference list. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated * @ordered */ int CATEGORY__PRODUCTS = 2; /** - * The number of structural features of the '<em>Category</em>' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The number of structural features of the '<em>Category</em>' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ @@ -563,7 +551,6 @@ public interface Model1Package extends EPackage /** * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model1.impl.Product1Impl <em>Product1</em>}' class. * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @see org.eclipse.emf.cdo.tests.model1.impl.Product1Impl * @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getProduct1() * @generated @@ -571,8 +558,8 @@ public interface Model1Package extends EPackage int PRODUCT1 = 9; /** - * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Name</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ @@ -588,33 +575,32 @@ public interface Model1Package extends EPackage int PRODUCT1__ORDER_DETAILS = 1; /** - * The feature id for the '<em><b>Vat</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Vat</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int PRODUCT1__VAT = 2; /** - * The feature id for the '<em><b>Description</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Description</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int PRODUCT1__DESCRIPTION = 3; /** - * The number of structural features of the '<em>Product1</em>' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The number of structural features of the '<em>Product1</em>' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int PRODUCT1_FEATURE_COUNT = 4; /** - * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model1.impl.OrderAddressImpl <em>Order Address</em>}' - * class. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model1.impl.OrderAddressImpl <em>Order Address</em>}' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @see org.eclipse.emf.cdo.tests.model1.impl.OrderAddressImpl * @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getOrderAddress() * @generated @@ -622,65 +608,65 @@ public interface Model1Package extends EPackage int ORDER_ADDRESS = 10; /** - * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Name</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int ORDER_ADDRESS__NAME = ADDRESS__NAME; /** - * The feature id for the '<em><b>Street</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Street</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int ORDER_ADDRESS__STREET = ADDRESS__STREET; /** - * The feature id for the '<em><b>City</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>City</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int ORDER_ADDRESS__CITY = ADDRESS__CITY; /** - * The feature id for the '<em><b>Order Details</b></em>' containment reference list. <!-- begin-user-doc --> <!-- + * The feature id for the '<em><b>Order Details</b></em>' containment reference list. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated * @ordered */ int ORDER_ADDRESS__ORDER_DETAILS = ADDRESS_FEATURE_COUNT + 0; /** - * The feature id for the '<em><b>Order</b></em>' container reference. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Order</b></em>' container reference. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int ORDER_ADDRESS__ORDER = ADDRESS_FEATURE_COUNT + 1; /** - * The feature id for the '<em><b>Product</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Product</b></em>' reference. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int ORDER_ADDRESS__PRODUCT = ADDRESS_FEATURE_COUNT + 2; /** - * The feature id for the '<em><b>Price</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Price</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int ORDER_ADDRESS__PRICE = ADDRESS_FEATURE_COUNT + 3; /** - * The feature id for the '<em><b>Test Attribute</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Test Attribute</b></em>' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ @@ -696,9 +682,8 @@ 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 - * <em>Product To Order</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model1.impl.ProductToOrderImpl <em>Product To Order</em>}' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @see org.eclipse.emf.cdo.tests.model1.impl.ProductToOrderImpl * @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getProductToOrder() * @generated @@ -706,34 +691,34 @@ public interface Model1Package extends EPackage int PRODUCT_TO_ORDER = 11; /** - * The feature id for the '<em><b>Key</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Key</b></em>' reference. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int PRODUCT_TO_ORDER__KEY = 0; /** - * The feature id for the '<em><b>Value</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The feature id for the '<em><b>Value</b></em>' reference. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated * @ordered */ int PRODUCT_TO_ORDER__VALUE = 1; /** - * The number of structural features of the '<em>Product To Order</em>' class. <!-- begin-user-doc --> <!-- + * The number of structural features of the '<em>Product To Order</em>' class. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated * @ordered */ int PRODUCT_TO_ORDER_FEATURE_COUNT = 2; /** - * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model1.VAT <em>VAT</em>}' enum. <!-- begin-user-doc + * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model1.VAT <em>VAT</em>}' enum. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @see org.eclipse.emf.cdo.tests.model1.VAT * @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getVAT() * @generated @@ -751,9 +736,8 @@ public interface Model1Package extends EPackage EClass getSupplier(); /** - * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.tests.model1.Supplier#getPurchaseOrders - * <em>Purchase Orders</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.tests.model1.Supplier#getPurchaseOrders <em>Purchase Orders</em>}'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return the meta object for the reference list '<em>Purchase Orders</em>'. * @see org.eclipse.emf.cdo.tests.model1.Supplier#getPurchaseOrders() * @see #getSupplier() @@ -762,9 +746,8 @@ public interface Model1Package extends EPackage EReference getSupplier_PurchaseOrders(); /** - * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model1.Supplier#isPreferred - * <em>Preferred</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model1.Supplier#isPreferred <em>Preferred</em>}'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return the meta object for the attribute '<em>Preferred</em>'. * @see org.eclipse.emf.cdo.tests.model1.Supplier#isPreferred() * @see #getSupplier() @@ -775,7 +758,6 @@ public interface Model1Package extends EPackage /** * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model1.PurchaseOrder <em>Purchase Order</em>}'. * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @return the meta object for class '<em>Purchase Order</em>'. * @see org.eclipse.emf.cdo.tests.model1.PurchaseOrder * @generated @@ -783,9 +765,8 @@ public interface Model1Package extends EPackage EClass getPurchaseOrder(); /** - * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model1.PurchaseOrder#getDate - * <em>Date</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model1.PurchaseOrder#getDate <em>Date</em>}'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return the meta object for the attribute '<em>Date</em>'. * @see org.eclipse.emf.cdo.tests.model1.PurchaseOrder#getDate() * @see #getPurchaseOrder() @@ -794,9 +775,8 @@ public interface Model1Package extends EPackage EAttribute getPurchaseOrder_Date(); /** - * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.tests.model1.PurchaseOrder#getSupplier - * <em>Supplier</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.tests.model1.PurchaseOrder#getSupplier <em>Supplier</em>}'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return the meta object for the reference '<em>Supplier</em>'. * @see org.eclipse.emf.cdo.tests.model1.PurchaseOrder#getSupplier() * @see #getPurchaseOrder() @@ -807,7 +787,6 @@ public interface Model1Package extends EPackage /** * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model1.OrderDetail <em>Order Detail</em>}'. * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @return the meta object for class '<em>Order Detail</em>'. * @see org.eclipse.emf.cdo.tests.model1.OrderDetail * @generated @@ -815,9 +794,8 @@ public interface Model1Package extends EPackage EClass getOrderDetail(); /** - * Returns the meta object for the container reference '{@link org.eclipse.emf.cdo.tests.model1.OrderDetail#getOrder - * <em>Order</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns the meta object for the container reference '{@link org.eclipse.emf.cdo.tests.model1.OrderDetail#getOrder <em>Order</em>}'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return the meta object for the container reference '<em>Order</em>'. * @see org.eclipse.emf.cdo.tests.model1.OrderDetail#getOrder() * @see #getOrderDetail() @@ -826,9 +804,8 @@ public interface Model1Package extends EPackage EReference getOrderDetail_Order(); /** - * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.tests.model1.OrderDetail#getProduct - * <em>Product</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.tests.model1.OrderDetail#getProduct <em>Product</em>}'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return the meta object for the reference '<em>Product</em>'. * @see org.eclipse.emf.cdo.tests.model1.OrderDetail#getProduct() * @see #getOrderDetail() @@ -837,9 +814,8 @@ public interface Model1Package extends EPackage EReference getOrderDetail_Product(); /** - * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model1.OrderDetail#getPrice - * <em>Price</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model1.OrderDetail#getPrice <em>Price</em>}'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return the meta object for the attribute '<em>Price</em>'. * @see org.eclipse.emf.cdo.tests.model1.OrderDetail#getPrice() * @see #getOrderDetail() @@ -850,7 +826,6 @@ public interface Model1Package extends EPackage /** * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model1.OrderAddress <em>Order Address</em>}'. * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @return the meta object for class '<em>Order Address</em>'. * @see org.eclipse.emf.cdo.tests.model1.OrderAddress * @generated @@ -858,9 +833,8 @@ public interface Model1Package extends EPackage EClass getOrderAddress(); /** - * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model1.OrderAddress#isTestAttribute - * <em>Test Attribute</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model1.OrderAddress#isTestAttribute <em>Test Attribute</em>}'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return the meta object for the attribute '<em>Test Attribute</em>'. * @see org.eclipse.emf.cdo.tests.model1.OrderAddress#isTestAttribute() * @see #getOrderAddress() @@ -869,20 +843,21 @@ public interface Model1Package extends EPackage EAttribute getOrderAddress_TestAttribute(); /** - * Returns the meta object for class '{@link java.util.Map.Entry <em>Product To Order</em>}'. <!-- begin-user-doc --> + * Returns the meta object for class '{@link java.util.Map.Entry <em>Product To Order</em>}'. + * <!-- begin-user-doc --> * <!-- end-user-doc --> - * * @return the meta object for class '<em>Product To Order</em>'. * @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 <em>Key</em>}'. <!-- begin-user-doc --> <!-- + * Returns the meta object for the reference '{@link java.util.Map.Entry <em>Key</em>}'. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @return the meta object for the reference '<em>Key</em>'. * @see java.util.Map.Entry * @see #getProductToOrder() @@ -891,9 +866,9 @@ public interface Model1Package extends EPackage EReference getProductToOrder_Key(); /** - * Returns the meta object for the reference '{@link java.util.Map.Entry <em>Value</em>}'. <!-- begin-user-doc --> + * Returns the meta object for the reference '{@link java.util.Map.Entry <em>Value</em>}'. + * <!-- begin-user-doc --> * <!-- end-user-doc --> - * * @return the meta object for the reference '<em>Value</em>'. * @see java.util.Map.Entry * @see #getProductToOrder() @@ -902,9 +877,9 @@ public interface Model1Package extends EPackage EReference getProductToOrder_Value(); /** - * Returns the meta object for enum '{@link org.eclipse.emf.cdo.tests.model1.VAT <em>VAT</em>}'. <!-- begin-user-doc + * Returns the meta object for enum '{@link org.eclipse.emf.cdo.tests.model1.VAT <em>VAT</em>}'. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @return the meta object for enum '<em>VAT</em>'. * @see org.eclipse.emf.cdo.tests.model1.VAT * @generated @@ -922,9 +897,8 @@ public interface Model1Package extends EPackage EClass getCategory(); /** - * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model1.Category#getName <em>Name</em>} - * '. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model1.Category#getName <em>Name</em>}'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return the meta object for the attribute '<em>Name</em>'. * @see org.eclipse.emf.cdo.tests.model1.Category#getName() * @see #getCategory() @@ -933,10 +907,9 @@ 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 <em>Categories</em>}'. <!-- begin-user-doc --> <!-- + * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.model1.Category#getCategories <em>Categories</em>}'. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @return the meta object for the containment reference list '<em>Categories</em>'. * @see org.eclipse.emf.cdo.tests.model1.Category#getCategories() * @see #getCategory() @@ -945,10 +918,9 @@ 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 <em>Products</em>}'. <!-- begin-user-doc --> <!-- + * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.model1.Category#getProducts <em>Products</em>}'. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @return the meta object for the containment reference list '<em>Products</em>'. * @see org.eclipse.emf.cdo.tests.model1.Category#getProducts() * @see #getCategory() @@ -967,9 +939,8 @@ public interface Model1Package extends EPackage EClass getProduct1(); /** - * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model1.Product1#getName <em>Name</em>} - * '. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model1.Product1#getName <em>Name</em>}'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return the meta object for the attribute '<em>Name</em>'. * @see org.eclipse.emf.cdo.tests.model1.Product1#getName() * @see #getProduct1() @@ -978,9 +949,8 @@ 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 - * <em>Order Details</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.tests.model1.Product1#getOrderDetails <em>Order Details</em>}'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return the meta object for the reference list '<em>Order Details</em>'. * @see org.eclipse.emf.cdo.tests.model1.Product1#getOrderDetails() * @see #getProduct1() @@ -991,7 +961,6 @@ public interface Model1Package extends EPackage /** * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model1.Product1#getVat <em>Vat</em>}'. * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @return the meta object for the attribute '<em>Vat</em>'. * @see org.eclipse.emf.cdo.tests.model1.Product1#getVat() * @see #getProduct1() @@ -1000,9 +969,8 @@ public interface Model1Package extends EPackage EAttribute getProduct1_Vat(); /** - * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model1.Product1#getDescription - * <em>Description</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model1.Product1#getDescription <em>Description</em>}'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return the meta object for the attribute '<em>Description</em>'. * @see org.eclipse.emf.cdo.tests.model1.Product1#getDescription() * @see #getProduct1() @@ -1021,10 +989,9 @@ 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 <em>Categories</em>}'. <!-- begin-user-doc --> <!-- + * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.model1.Company#getCategories <em>Categories</em>}'. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @return the meta object for the containment reference list '<em>Categories</em>'. * @see org.eclipse.emf.cdo.tests.model1.Company#getCategories() * @see #getCompany() @@ -1033,10 +1000,9 @@ 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 <em>Suppliers</em>}'. <!-- begin-user-doc --> <!-- + * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.model1.Company#getSuppliers <em>Suppliers</em>}'. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @return the meta object for the containment reference list '<em>Suppliers</em>'. * @see org.eclipse.emf.cdo.tests.model1.Company#getSuppliers() * @see #getCompany() @@ -1045,10 +1011,9 @@ 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 <em>Purchase Orders</em>}'. <!-- begin-user-doc + * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.model1.Company#getPurchaseOrders <em>Purchase Orders</em>}'. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @return the meta object for the containment reference list '<em>Purchase Orders</em>'. * @see org.eclipse.emf.cdo.tests.model1.Company#getPurchaseOrders() * @see #getCompany() @@ -1057,10 +1022,9 @@ 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 <em>Customers</em>}'. <!-- begin-user-doc --> <!-- + * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.model1.Company#getCustomers <em>Customers</em>}'. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @return the meta object for the containment reference list '<em>Customers</em>'. * @see org.eclipse.emf.cdo.tests.model1.Company#getCustomers() * @see #getCompany() @@ -1069,10 +1033,9 @@ 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 <em>Sales Orders</em>}'. <!-- begin-user-doc --> + * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.model1.Company#getSalesOrders <em>Sales Orders</em>}'. + * <!-- begin-user-doc --> * <!-- end-user-doc --> - * * @return the meta object for the containment reference list '<em>Sales Orders</em>'. * @see org.eclipse.emf.cdo.tests.model1.Company#getSalesOrders() * @see #getCompany() @@ -1091,9 +1054,8 @@ public interface Model1Package extends EPackage EClass getCustomer(); /** - * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.tests.model1.Customer#getSalesOrders - * <em>Sales Orders</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.tests.model1.Customer#getSalesOrders <em>Sales Orders</em>}'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return the meta object for the reference list '<em>Sales Orders</em>'. * @see org.eclipse.emf.cdo.tests.model1.Customer#getSalesOrders() * @see #getCustomer() @@ -1102,9 +1064,8 @@ public interface Model1Package extends EPackage EReference getCustomer_SalesOrders(); /** - * Returns the meta object for the map '{@link org.eclipse.emf.cdo.tests.model1.Customer#getOrderByProduct - * <em>Order By Product</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns the meta object for the map '{@link org.eclipse.emf.cdo.tests.model1.Customer#getOrderByProduct <em>Order By Product</em>}'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return the meta object for the map '<em>Order By Product</em>'. * @see org.eclipse.emf.cdo.tests.model1.Customer#getOrderByProduct() * @see #getCustomer() @@ -1123,10 +1084,9 @@ 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 <em>Order Details</em>}'. <!-- begin-user-doc --> + * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.model1.Order#getOrderDetails <em>Order Details</em>}'. + * <!-- begin-user-doc --> * <!-- end-user-doc --> - * * @return the meta object for the containment reference list '<em>Order Details</em>'. * @see org.eclipse.emf.cdo.tests.model1.Order#getOrderDetails() * @see #getOrder() @@ -1147,7 +1107,6 @@ public interface Model1Package extends EPackage /** * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model1.SalesOrder#getId <em>Id</em>}'. * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @return the meta object for the attribute '<em>Id</em>'. * @see org.eclipse.emf.cdo.tests.model1.SalesOrder#getId() * @see #getSalesOrder() @@ -1156,9 +1115,8 @@ public interface Model1Package extends EPackage EAttribute getSalesOrder_Id(); /** - * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.tests.model1.SalesOrder#getCustomer - * <em>Customer</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.tests.model1.SalesOrder#getCustomer <em>Customer</em>}'. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return the meta object for the reference '<em>Customer</em>'. * @see org.eclipse.emf.cdo.tests.model1.SalesOrder#getCustomer() * @see #getSalesOrder() @@ -1167,8 +1125,8 @@ public interface Model1Package extends EPackage EReference getSalesOrder_Customer(); /** - * Returns the factory that creates the instances of the model. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns the factory that creates the instances of the model. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return the factory that creates the instances of the model. * @generated */ @@ -1183,15 +1141,13 @@ public interface Model1Package extends EPackage * <li>and each data type</li> * </ul> * <!-- end-user-doc --> - * * @generated */ interface Literals { /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model1.impl.AddressImpl <em>Address</em>}' - * class. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model1.impl.AddressImpl <em>Address</em>}' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @see org.eclipse.emf.cdo.tests.model1.impl.AddressImpl * @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getAddress() * @generated @@ -1199,33 +1155,32 @@ public interface Model1Package extends EPackage EClass ADDRESS = eINSTANCE.getAddress(); /** - * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!-- begin-user-doc --> <!-- + * The meta object literal for the '<em><b>Name</b></em>' attribute feature. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated */ EAttribute ADDRESS__NAME = eINSTANCE.getAddress_Name(); /** - * The meta object literal for the '<em><b>Street</b></em>' attribute feature. <!-- begin-user-doc --> <!-- + * The meta object literal for the '<em><b>Street</b></em>' attribute feature. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated */ EAttribute ADDRESS__STREET = eINSTANCE.getAddress_Street(); /** - * The meta object literal for the '<em><b>City</b></em>' attribute feature. <!-- begin-user-doc --> <!-- + * The meta object literal for the '<em><b>City</b></em>' attribute feature. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated */ EAttribute ADDRESS__CITY = eINSTANCE.getAddress_City(); /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model1.impl.SupplierImpl <em>Supplier</em>}' - * class. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model1.impl.SupplierImpl <em>Supplier</em>}' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @see org.eclipse.emf.cdo.tests.model1.impl.SupplierImpl * @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getSupplier() * @generated @@ -1233,25 +1188,24 @@ public interface Model1Package extends EPackage EClass SUPPLIER = eINSTANCE.getSupplier(); /** - * The meta object literal for the '<em><b>Purchase Orders</b></em>' reference list feature. <!-- begin-user-doc --> + * The meta object literal for the '<em><b>Purchase Orders</b></em>' reference list feature. + * <!-- begin-user-doc --> * <!-- end-user-doc --> - * * @generated */ EReference SUPPLIER__PURCHASE_ORDERS = eINSTANCE.getSupplier_PurchaseOrders(); /** - * The meta object literal for the '<em><b>Preferred</b></em>' attribute feature. <!-- begin-user-doc --> <!-- + * The meta object literal for the '<em><b>Preferred</b></em>' attribute feature. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated */ EAttribute SUPPLIER__PREFERRED = eINSTANCE.getSupplier_Preferred(); /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model1.impl.PurchaseOrderImpl - * <em>Purchase Order</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model1.impl.PurchaseOrderImpl <em>Purchase Order</em>}' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @see org.eclipse.emf.cdo.tests.model1.impl.PurchaseOrderImpl * @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getPurchaseOrder() * @generated @@ -1259,25 +1213,24 @@ public interface Model1Package extends EPackage EClass PURCHASE_ORDER = eINSTANCE.getPurchaseOrder(); /** - * The meta object literal for the '<em><b>Date</b></em>' attribute feature. <!-- begin-user-doc --> <!-- + * The meta object literal for the '<em><b>Date</b></em>' attribute feature. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated */ EAttribute PURCHASE_ORDER__DATE = eINSTANCE.getPurchaseOrder_Date(); /** - * The meta object literal for the '<em><b>Supplier</b></em>' reference feature. <!-- begin-user-doc --> <!-- + * The meta object literal for the '<em><b>Supplier</b></em>' reference feature. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated */ EReference PURCHASE_ORDER__SUPPLIER = eINSTANCE.getPurchaseOrder_Supplier(); /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model1.impl.OrderDetailImpl - * <em>Order Detail</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model1.impl.OrderDetailImpl <em>Order Detail</em>}' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @see org.eclipse.emf.cdo.tests.model1.impl.OrderDetailImpl * @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getOrderDetail() * @generated @@ -1285,33 +1238,32 @@ public interface Model1Package extends EPackage EClass ORDER_DETAIL = eINSTANCE.getOrderDetail(); /** - * The meta object literal for the '<em><b>Order</b></em>' container reference feature. <!-- begin-user-doc --> <!-- + * The meta object literal for the '<em><b>Order</b></em>' container reference feature. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated */ EReference ORDER_DETAIL__ORDER = eINSTANCE.getOrderDetail_Order(); /** - * The meta object literal for the '<em><b>Product</b></em>' reference feature. <!-- begin-user-doc --> <!-- + * The meta object literal for the '<em><b>Product</b></em>' reference feature. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated */ EReference ORDER_DETAIL__PRODUCT = eINSTANCE.getOrderDetail_Product(); /** - * The meta object literal for the '<em><b>Price</b></em>' attribute feature. <!-- begin-user-doc --> <!-- + * The meta object literal for the '<em><b>Price</b></em>' attribute feature. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated */ EAttribute ORDER_DETAIL__PRICE = eINSTANCE.getOrderDetail_Price(); /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model1.impl.OrderAddressImpl - * <em>Order Address</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model1.impl.OrderAddressImpl <em>Order Address</em>}' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @see org.eclipse.emf.cdo.tests.model1.impl.OrderAddressImpl * @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getOrderAddress() * @generated @@ -1319,17 +1271,16 @@ public interface Model1Package extends EPackage EClass ORDER_ADDRESS = eINSTANCE.getOrderAddress(); /** - * The meta object literal for the '<em><b>Test Attribute</b></em>' attribute feature. <!-- begin-user-doc --> <!-- + * The meta object literal for the '<em><b>Test Attribute</b></em>' attribute feature. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated */ EAttribute ORDER_ADDRESS__TEST_ATTRIBUTE = eINSTANCE.getOrderAddress_TestAttribute(); /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model1.impl.ProductToOrderImpl - * <em>Product To Order</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model1.impl.ProductToOrderImpl <em>Product To Order</em>}' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @see org.eclipse.emf.cdo.tests.model1.impl.ProductToOrderImpl * @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getProductToOrder() * @generated @@ -1337,17 +1288,17 @@ public interface Model1Package extends EPackage EClass PRODUCT_TO_ORDER = eINSTANCE.getProductToOrder(); /** - * The meta object literal for the '<em><b>Key</b></em>' reference feature. <!-- begin-user-doc --> <!-- + * The meta object literal for the '<em><b>Key</b></em>' reference feature. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated */ EReference PRODUCT_TO_ORDER__KEY = eINSTANCE.getProductToOrder_Key(); /** - * The meta object literal for the '<em><b>Value</b></em>' reference feature. <!-- begin-user-doc --> <!-- + * The meta object literal for the '<em><b>Value</b></em>' reference feature. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated */ EReference PRODUCT_TO_ORDER__VALUE = eINSTANCE.getProductToOrder_Value(); @@ -1363,9 +1314,8 @@ public interface Model1Package extends EPackage EEnum VAT = eINSTANCE.getVAT(); /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model1.impl.CategoryImpl <em>Category</em>}' - * class. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model1.impl.CategoryImpl <em>Category</em>}' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @see org.eclipse.emf.cdo.tests.model1.impl.CategoryImpl * @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getCategory() * @generated @@ -1373,9 +1323,9 @@ public interface Model1Package extends EPackage EClass CATEGORY = eINSTANCE.getCategory(); /** - * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!-- begin-user-doc --> <!-- + * The meta object literal for the '<em><b>Name</b></em>' attribute feature. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated */ EAttribute CATEGORY__NAME = eINSTANCE.getCategory_Name(); @@ -1397,9 +1347,8 @@ public interface Model1Package extends EPackage EReference CATEGORY__PRODUCTS = eINSTANCE.getCategory_Products(); /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model1.impl.Product1Impl <em>Product1</em>}' - * class. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model1.impl.Product1Impl <em>Product1</em>}' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @see org.eclipse.emf.cdo.tests.model1.impl.Product1Impl * @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getProduct1() * @generated @@ -1407,41 +1356,40 @@ public interface Model1Package extends EPackage EClass PRODUCT1 = eINSTANCE.getProduct1(); /** - * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!-- begin-user-doc --> <!-- + * The meta object literal for the '<em><b>Name</b></em>' attribute feature. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated */ EAttribute PRODUCT1__NAME = eINSTANCE.getProduct1_Name(); /** - * The meta object literal for the '<em><b>Order Details</b></em>' reference list feature. <!-- begin-user-doc --> + * The meta object literal for the '<em><b>Order Details</b></em>' reference list feature. + * <!-- begin-user-doc --> * <!-- end-user-doc --> - * * @generated */ EReference PRODUCT1__ORDER_DETAILS = eINSTANCE.getProduct1_OrderDetails(); /** - * The meta object literal for the '<em><b>Vat</b></em>' attribute feature. <!-- begin-user-doc --> <!-- + * The meta object literal for the '<em><b>Vat</b></em>' attribute feature. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated */ EAttribute PRODUCT1__VAT = eINSTANCE.getProduct1_Vat(); /** - * The meta object literal for the '<em><b>Description</b></em>' attribute feature. <!-- begin-user-doc --> <!-- + * The meta object literal for the '<em><b>Description</b></em>' attribute feature. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated */ EAttribute PRODUCT1__DESCRIPTION = eINSTANCE.getProduct1_Description(); /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model1.impl.CompanyImpl <em>Company</em>}' - * class. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model1.impl.CompanyImpl <em>Company</em>}' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @see org.eclipse.emf.cdo.tests.model1.impl.CompanyImpl * @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getCompany() * @generated @@ -1489,9 +1437,8 @@ public interface Model1Package extends EPackage EReference COMPANY__SALES_ORDERS = eINSTANCE.getCompany_SalesOrders(); /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model1.impl.CustomerImpl <em>Customer</em>}' - * class. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model1.impl.CustomerImpl <em>Customer</em>}' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @see org.eclipse.emf.cdo.tests.model1.impl.CustomerImpl * @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getCustomer() * @generated @@ -1499,17 +1446,17 @@ public interface Model1Package extends EPackage EClass CUSTOMER = eINSTANCE.getCustomer(); /** - * The meta object literal for the '<em><b>Sales Orders</b></em>' reference list feature. <!-- begin-user-doc --> + * The meta object literal for the '<em><b>Sales Orders</b></em>' reference list feature. + * <!-- begin-user-doc --> * <!-- end-user-doc --> - * * @generated */ EReference CUSTOMER__SALES_ORDERS = eINSTANCE.getCustomer_SalesOrders(); /** - * The meta object literal for the '<em><b>Order By Product</b></em>' map feature. <!-- begin-user-doc --> <!-- + * The meta object literal for the '<em><b>Order By Product</b></em>' map feature. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated */ EReference CUSTOMER__ORDER_BY_PRODUCT = eINSTANCE.getCustomer_OrderByProduct(); @@ -1517,7 +1464,6 @@ public interface Model1Package extends EPackage /** * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model1.impl.OrderImpl <em>Order</em>}' class. * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @see org.eclipse.emf.cdo.tests.model1.impl.OrderImpl * @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getOrder() * @generated @@ -1533,9 +1479,8 @@ public interface Model1Package extends EPackage EReference ORDER__ORDER_DETAILS = eINSTANCE.getOrder_OrderDetails(); /** - * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model1.impl.SalesOrderImpl - * <em>Sales Order</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model1.impl.SalesOrderImpl <em>Sales Order</em>}' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @see org.eclipse.emf.cdo.tests.model1.impl.SalesOrderImpl * @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getSalesOrder() * @generated @@ -1551,9 +1496,9 @@ public interface Model1Package extends EPackage EAttribute SALES_ORDER__ID = eINSTANCE.getSalesOrder_Id(); /** - * The meta object literal for the '<em><b>Customer</b></em>' reference feature. <!-- begin-user-doc --> <!-- + * The meta object literal for the '<em><b>Customer</b></em>' reference feature. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated */ EReference SALES_ORDER__CUSTOMER = eINSTANCE.getSalesOrder_Customer(); 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 c17ce14fab..ce0156a407 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,36 +15,37 @@ import org.eclipse.emf.ecore.EObject; /** * <!-- begin-user-doc --> A representation of the model object '<em><b>Order</b></em>'. <!-- end-user-doc --> + * * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.emf.cdo.tests.model1.Order#getOrderDetails <em>Order Details</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model1.Order#getOrderDetails <em>Order Details</em>}</li> * </ul> * </p> - * + * * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getOrder() - * @model annotation="teneo.jpa value='@Entity(name=\"BaseOrder\")'" + * @model abstract="true" + * annotation="teneo.jpa value='@Entity(name=\"BaseOrder\")'" * @generated */ public interface Order extends EObject { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @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 '<em><b>Order Details</b></em>' 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 <em>Order</em>}'. <!-- begin-user-doc --> + * Returns the value of the '<em><b>Order Details</b></em>' 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 <em>Order</em>}'. + * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Order Details</em>' containment reference list isn't clear, there really should be more * of a description here... * </p> * <!-- end-user-doc --> - * * @return the value of the '<em>Order Details</em>' 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 63ed3d0087..cbb37f31a9 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,35 +12,34 @@ package org.eclipse.emf.cdo.tests.model1; /** * <!-- begin-user-doc --> A representation of the model object '<em><b>Order Address</b></em>'. <!-- end-user-doc --> + * * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.emf.cdo.tests.model1.OrderAddress#isTestAttribute <em>Test Attribute</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model1.OrderAddress#isTestAttribute <em>Test Attribute</em>}</li> * </ul> * </p> - * + * * @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 { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @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 '<em><b>Test Attribute</b></em>' attribute. <!-- begin-user-doc --> + * Returns the value of the '<em><b>Test Attribute</b></em>' attribute. + * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Test Attribute</em>' attribute isn't clear, there really should be more of a description * here... * </p> * <!-- end-user-doc --> - * * @return the value of the '<em>Test Attribute</em>' attribute. * @see #setTestAttribute(boolean) * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getOrderAddress_TestAttribute() @@ -50,11 +49,9 @@ public interface OrderAddress extends Address, Order, OrderDetail boolean isTestAttribute(); /** - * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model1.OrderAddress#isTestAttribute - * <em>Test Attribute</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @param value - * the new value of the '<em>Test Attribute</em>' attribute. + * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model1.OrderAddress#isTestAttribute <em>Test Attribute</em>}' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * @param value the new value of the '<em>Test Attribute</em>' 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 8c833a790b..8cdf98ec60 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,15 +14,16 @@ import org.eclipse.emf.ecore.EObject; /** * <!-- begin-user-doc --> A representation of the model object '<em><b>Order Detail</b></em>'. <!-- end-user-doc --> + * * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.emf.cdo.tests.model1.OrderDetail#getOrder <em>Order</em>}</li> - * <li>{@link org.eclipse.emf.cdo.tests.model1.OrderDetail#getProduct <em>Product</em>}</li> - * <li>{@link org.eclipse.emf.cdo.tests.model1.OrderDetail#getPrice <em>Price</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model1.OrderDetail#getOrder <em>Order</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model1.OrderDetail#getProduct <em>Product</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model1.OrderDetail#getPrice <em>Price</em>}</li> * </ul> * </p> - * + * * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getOrderDetail() * @model * @generated @@ -31,20 +32,19 @@ public interface OrderDetail extends EObject { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @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 '<em><b>Order</b></em>' container reference. It is bidirectional and its opposite is ' - * {@link org.eclipse.emf.cdo.tests.model1.Order#getOrderDetails <em>Order Details</em>}'. <!-- begin-user-doc --> + * Returns the value of the '<em><b>Order</b></em>' container reference. + * It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.model1.Order#getOrderDetails <em>Order Details</em>}'. + * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Order</em>' container reference isn't clear, there really should be more of a * description here... * </p> * <!-- end-user-doc --> - * * @return the value of the '<em>Order</em>' container reference. * @see #setOrder(Order) * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getOrderDetail_Order() @@ -55,25 +55,23 @@ public interface OrderDetail extends EObject Order getOrder(); /** - * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model1.OrderDetail#getOrder <em>Order</em>}' container - * reference. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @param value - * the new value of the '<em>Order</em>' container reference. + * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model1.OrderDetail#getOrder <em>Order</em>}' container reference. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * @param value the new value of the '<em>Order</em>' container reference. * @see #getOrder() * @generated */ void setOrder(Order value); /** - * Returns the value of the '<em><b>Product</b></em>' reference. It is bidirectional and its opposite is ' - * {@link org.eclipse.emf.cdo.tests.model1.Product1#getOrderDetails <em>Order Details</em>}'. <!-- begin-user-doc --> + * Returns the value of the '<em><b>Product</b></em>' reference. + * It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.model1.Product1#getOrderDetails <em>Order Details</em>}'. + * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Product</em>' reference isn't clear, there really should be more of a description * here... * </p> * <!-- end-user-doc --> - * * @return the value of the '<em>Product</em>' reference. * @see #setProduct(Product1) * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getOrderDetail_Product() @@ -86,21 +84,19 @@ public interface OrderDetail extends EObject /** * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model1.OrderDetail#getProduct <em>Product</em>}' reference. * <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @param value - * the new value of the '<em>Product</em>' reference. + * @param value the new value of the '<em>Product</em>' reference. * @see #getProduct() * @generated */ void setProduct(Product1 value); /** - * Returns the value of the '<em><b>Price</b></em>' attribute. <!-- begin-user-doc --> + * Returns the value of the '<em><b>Price</b></em>' attribute. + * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Price</em>' attribute isn't clear, there really should be more of a description here... * </p> * <!-- end-user-doc --> - * * @return the value of the '<em>Price</em>' attribute. * @see #setPrice(float) * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getOrderDetail_Price() @@ -112,9 +108,7 @@ public interface OrderDetail extends EObject /** * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model1.OrderDetail#getPrice <em>Price</em>}' attribute. * <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @param value - * the new value of the '<em>Price</em>' attribute. + * @param value the new value of the '<em>Price</em>' 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 ea11e438b9..43e931d2f0 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,16 +15,17 @@ import org.eclipse.emf.ecore.EObject; /** * <!-- begin-user-doc --> A representation of the model object '<em><b>Product</b></em>'. <!-- end-user-doc --> + * * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.emf.cdo.tests.model1.Product1#getName <em>Name</em>}</li> - * <li>{@link org.eclipse.emf.cdo.tests.model1.Product1#getOrderDetails <em>Order Details</em>}</li> - * <li>{@link org.eclipse.emf.cdo.tests.model1.Product1#getVat <em>Vat</em>}</li> - * <li>{@link org.eclipse.emf.cdo.tests.model1.Product1#getDescription <em>Description</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model1.Product1#getName <em>Name</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model1.Product1#getOrderDetails <em>Order Details</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model1.Product1#getVat <em>Vat</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model1.Product1#getDescription <em>Description</em>}</li> * </ul> * </p> - * + * * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getProduct1() * @model * @generated @@ -33,18 +34,17 @@ public interface Product1 extends EObject { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @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 '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> + * Returns the value of the '<em><b>Name</b></em>' attribute. + * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a description here... * </p> * <!-- end-user-doc --> - * * @return the value of the '<em>Name</em>' attribute. * @see #setName(String) * @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 '<em><b>Order Details</b></em>' 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 <em>Product</em>}'. <!-- begin-user-doc --> + * Returns the value of the '<em><b>Order Details</b></em>' 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 <em>Product</em>}'. + * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Order Details</em>' reference list isn't clear, there really should be more of a * description here... * </p> * <!-- end-user-doc --> - * * @return the value of the '<em>Order Details</em>' reference list. * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getProduct1_OrderDetails() * @see org.eclipse.emf.cdo.tests.model1.OrderDetail#getProduct @@ -83,13 +83,14 @@ public interface Product1 extends EObject EList<OrderDetail> getOrderDetails(); /** - * Returns the value of the '<em><b>Vat</b></em>' attribute. The default value is <code>"vat15"</code>. The literals - * are from the enumeration {@link org.eclipse.emf.cdo.tests.model1.VAT}. <!-- begin-user-doc --> + * Returns the value of the '<em><b>Vat</b></em>' attribute. + * The default value is <code>"vat15"</code>. + * The literals are from the enumeration {@link org.eclipse.emf.cdo.tests.model1.VAT}. + * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Vat</em>' attribute isn't clear, there really should be more of a description here... * </p> * <!-- end-user-doc --> - * * @return the value of the '<em>Vat</em>' attribute. * @see org.eclipse.emf.cdo.tests.model1.VAT * @see #setVat(VAT) @@ -112,13 +113,13 @@ public interface Product1 extends EObject void setVat(VAT value); /** - * Returns the value of the '<em><b>Description</b></em>' attribute. <!-- begin-user-doc --> + * Returns the value of the '<em><b>Description</b></em>' attribute. + * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Description</em>' attribute isn't clear, there really should be more of a description * here... * </p> * <!-- end-user-doc --> - * * @return the value of the '<em>Description</em>' attribute. * @see #setDescription(String) * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getProduct1_Description() @@ -128,11 +129,9 @@ public interface Product1 extends EObject String getDescription(); /** - * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model1.Product1#getDescription <em>Description</em>}' - * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @param value - * the new value of the '<em>Description</em>' attribute. + * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model1.Product1#getDescription <em>Description</em>}' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * @param value the new value of the '<em>Description</em>' 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 1a5192ac96..889a2c6d92 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,14 +14,15 @@ import java.util.Date; /** * <!-- begin-user-doc --> A representation of the model object '<em><b>Purchase Order</b></em>'. <!-- end-user-doc --> + * * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.emf.cdo.tests.model1.PurchaseOrder#getDate <em>Date</em>}</li> - * <li>{@link org.eclipse.emf.cdo.tests.model1.PurchaseOrder#getSupplier <em>Supplier</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model1.PurchaseOrder#getDate <em>Date</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model1.PurchaseOrder#getSupplier <em>Supplier</em>}</li> * </ul> * </p> - * + * * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getPurchaseOrder() * @model * @generated @@ -30,18 +31,17 @@ public interface PurchaseOrder extends Order { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @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 '<em><b>Date</b></em>' attribute. <!-- begin-user-doc --> + * Returns the value of the '<em><b>Date</b></em>' attribute. + * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Date</em>' attribute isn't clear, there really should be more of a description here... * </p> * <!-- end-user-doc --> - * * @return the value of the '<em>Date</em>' attribute. * @see #setDate(Date) * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getPurchaseOrder_Date() @@ -53,24 +53,22 @@ public interface PurchaseOrder extends Order /** * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model1.PurchaseOrder#getDate <em>Date</em>}' attribute. * <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @param value - * the new value of the '<em>Date</em>' attribute. + * @param value the new value of the '<em>Date</em>' attribute. * @see #getDate() * @generated */ void setDate(Date value); /** - * Returns the value of the '<em><b>Supplier</b></em>' reference. It is bidirectional and its opposite is ' - * {@link org.eclipse.emf.cdo.tests.model1.Supplier#getPurchaseOrders <em>Purchase Orders</em>}'. <!-- begin-user-doc + * Returns the value of the '<em><b>Supplier</b></em>' reference. + * It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.model1.Supplier#getPurchaseOrders <em>Purchase Orders</em>}'. + * <!-- begin-user-doc * --> * <p> * If the meaning of the '<em>Supplier</em>' reference isn't clear, there really should be more of a description * here... * </p> * <!-- end-user-doc --> - * * @return the value of the '<em>Supplier</em>' reference. * @see #setSupplier(Supplier) * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getPurchaseOrder_Supplier() @@ -81,11 +79,9 @@ public interface PurchaseOrder extends Order Supplier getSupplier(); /** - * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model1.PurchaseOrder#getSupplier <em>Supplier</em>}' - * reference. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @param value - * the new value of the '<em>Supplier</em>' reference. + * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model1.PurchaseOrder#getSupplier <em>Supplier</em>}' reference. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * @param value the new value of the '<em>Supplier</em>' 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 7cb33eb6c9..925e916f8d 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,14 +12,15 @@ package org.eclipse.emf.cdo.tests.model1; /** * <!-- begin-user-doc --> A representation of the model object '<em><b>Sales Order</b></em>'. <!-- end-user-doc --> + * * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.emf.cdo.tests.model1.SalesOrder#getId <em>Id</em>}</li> - * <li>{@link org.eclipse.emf.cdo.tests.model1.SalesOrder#getCustomer <em>Customer</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model1.SalesOrder#getId <em>Id</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model1.SalesOrder#getCustomer <em>Customer</em>}</li> * </ul> * </p> - * + * * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getSalesOrder() * @model * @generated @@ -28,18 +29,17 @@ public interface SalesOrder extends Order { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @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 '<em><b>Id</b></em>' attribute. <!-- begin-user-doc --> + * Returns the value of the '<em><b>Id</b></em>' attribute. + * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Id</em>' attribute isn't clear, there really should be more of a description here... * </p> * <!-- end-user-doc --> - * * @return the value of the '<em>Id</em>' 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 '<em><b>Customer</b></em>' reference. It is bidirectional and its opposite is ' - * {@link org.eclipse.emf.cdo.tests.model1.Customer#getSalesOrders <em>Sales Orders</em>}'. <!-- begin-user-doc --> + * Returns the value of the '<em><b>Customer</b></em>' reference. + * It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.model1.Customer#getSalesOrders <em>Sales Orders</em>}'. + * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Customer</em>' reference isn't clear, there really should be more of a description * here... * </p> * <!-- end-user-doc --> - * * @return the value of the '<em>Customer</em>' reference. * @see #setCustomer(Customer) * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getSalesOrder_Customer() @@ -78,11 +78,9 @@ public interface SalesOrder extends Order Customer getCustomer(); /** - * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model1.SalesOrder#getCustomer <em>Customer</em>}' - * reference. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @param value - * the new value of the '<em>Customer</em>' reference. + * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model1.SalesOrder#getCustomer <em>Customer</em>}' reference. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * @param value the new value of the '<em>Customer</em>' 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 1bd1f1b942..ece821b65d 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,14 +14,15 @@ import org.eclipse.emf.common.util.EList; /** * <!-- begin-user-doc --> A representation of the model object '<em><b>Supplier</b></em>'. <!-- end-user-doc --> + * * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.emf.cdo.tests.model1.Supplier#getPurchaseOrders <em>Purchase Orders</em>}</li> - * <li>{@link org.eclipse.emf.cdo.tests.model1.Supplier#isPreferred <em>Preferred</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model1.Supplier#getPurchaseOrders <em>Purchase Orders</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model1.Supplier#isPreferred <em>Preferred</em>}</li> * </ul> * </p> - * + * * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getSupplier() * @model * @generated @@ -30,21 +31,20 @@ public interface Supplier extends Address { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @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 '<em><b>Purchase Orders</b></em>' 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 <em>Supplier</em>}'. <!-- begin-user-doc --> + * Returns the value of the '<em><b>Purchase Orders</b></em>' 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 <em>Supplier</em>}'. + * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Purchase Orders</em>' reference list isn't clear, there really should be more of a * description here... * </p> * <!-- end-user-doc --> - * * @return the value of the '<em>Purchase Orders</em>' reference list. * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getSupplier_PurchaseOrders() * @see org.eclipse.emf.cdo.tests.model1.PurchaseOrder#getSupplier @@ -73,9 +73,7 @@ public interface Supplier extends Address /** * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model1.Supplier#isPreferred <em>Preferred</em>}' attribute. * <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @param value - * the new value of the '<em>Preferred</em>' attribute. + * @param value the new value of the '<em>Preferred</em>' 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 1ac2cf965d..8787593dd2 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,7 +19,6 @@ import java.util.List; /** * <!-- begin-user-doc --> A representation of the literals of the enumeration '<em><b>VAT</b></em>', and utility * methods for working with them. <!-- end-user-doc --> - * * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getVAT() * @model * @generated @@ -27,8 +26,8 @@ import java.util.List; public enum VAT implements Enumerator { /** - * The '<em><b>Vat0</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The '<em><b>Vat0</b></em>' literal object. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @see #VAT0_VALUE * @generated * @ordered @@ -36,8 +35,8 @@ public enum VAT implements Enumerator VAT0(0, "vat0", "vat0"), /** - * The '<em><b>Vat7</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The '<em><b>Vat7</b></em>' literal object. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @see #VAT7_VALUE * @generated * @ordered @@ -45,8 +44,8 @@ public enum VAT implements Enumerator VAT7(7, "vat7", "vat7"), /** - * The '<em><b>Vat15</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The '<em><b>Vat15</b></em>' literal object. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @see #VAT15_VALUE * @generated * @ordered @@ -55,19 +54,18 @@ public enum VAT implements Enumerator /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @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 '<em><b>Vat0</b></em>' literal value. <!-- begin-user-doc --> + * The '<em><b>Vat0</b></em>' literal value. + * <!-- begin-user-doc --> * <p> * If the meaning of '<em><b>Vat0</b></em>' literal object isn't clear, there really should be more of a description * here... * </p> * <!-- end-user-doc --> - * * @see #VAT0 * @model name="vat0" * @generated @@ -76,13 +74,13 @@ public enum VAT implements Enumerator public static final int VAT0_VALUE = 0; /** - * The '<em><b>Vat7</b></em>' literal value. <!-- begin-user-doc --> + * The '<em><b>Vat7</b></em>' literal value. + * <!-- begin-user-doc --> * <p> * If the meaning of '<em><b>Vat7</b></em>' literal object isn't clear, there really should be more of a description * here... * </p> * <!-- end-user-doc --> - * * @see #VAT7 * @model name="vat7" * @generated @@ -91,13 +89,13 @@ public enum VAT implements Enumerator public static final int VAT7_VALUE = 7; /** - * The '<em><b>Vat15</b></em>' literal value. <!-- begin-user-doc --> + * The '<em><b>Vat15</b></em>' literal value. + * <!-- begin-user-doc --> * <p> * If the meaning of '<em><b>Vat15</b></em>' literal object isn't clear, there really should be more of a description * here... * </p> * <!-- end-user-doc --> - * * @see #VAT15 * @model name="vat15" * @generated @@ -106,23 +104,23 @@ public enum VAT implements Enumerator public static final int VAT15_VALUE = 15; /** - * An array of all the '<em><b>VAT</b></em>' enumerators. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * An array of all the '<em><b>VAT</b></em>' enumerators. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ private static final VAT[] VALUES_ARRAY = new VAT[] { VAT0, VAT7, VAT15, }; /** - * A public read-only list of all the '<em><b>VAT</b></em>' enumerators. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * A public read-only list of all the '<em><b>VAT</b></em>' enumerators. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ public static final List<VAT> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY)); /** - * Returns the '<em><b>VAT</b></em>' literal with the specified literal value. <!-- begin-user-doc --> <!-- + * Returns the '<em><b>VAT</b></em>' literal with the specified literal value. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated */ public static VAT get(String literal) @@ -139,8 +137,8 @@ public enum VAT implements Enumerator } /** - * Returns the '<em><b>VAT</b></em>' literal with the specified name. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns the '<em><b>VAT</b></em>' literal with the specified name. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ public static VAT getByName(String name) @@ -157,9 +155,9 @@ public enum VAT implements Enumerator } /** - * Returns the '<em><b>VAT</b></em>' literal with the specified integer value. <!-- begin-user-doc --> <!-- + * Returns the '<em><b>VAT</b></em>' literal with the specified integer value. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated */ public static VAT get(int value) @@ -178,28 +176,25 @@ public enum VAT implements Enumerator /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private final int value; /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private final String name; /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private final String literal; /** - * Only this class can construct instances. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Only this class can construct instances. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ private VAT(int value, String name, String literal) @@ -211,7 +206,6 @@ public enum VAT implements Enumerator /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public int getValue() @@ -221,7 +215,6 @@ public enum VAT implements Enumerator /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public String getName() @@ -231,7 +224,6 @@ public enum VAT implements Enumerator /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public String getLiteral() @@ -240,9 +232,9 @@ public enum VAT implements Enumerator } /** - * Returns the literal value of the enumerator, which is its string representation. <!-- begin-user-doc --> <!-- + * Returns the literal value of the enumerator, which is its string representation. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @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 73eb3cfc8a..f9719e9f93 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,26 +22,24 @@ import org.eclipse.emf.ecore.EClass; * <p> * The following features are implemented: * <ul> - * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.AddressImpl#getName <em>Name</em>}</li> - * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.AddressImpl#getStreet <em>Street</em>}</li> - * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.AddressImpl#getCity <em>City</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.AddressImpl#getName <em>Name</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.AddressImpl#getStreet <em>Street</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.AddressImpl#getCity <em>City</em>}</li> * </ul> * </p> - * + * * @generated */ public class AddressImpl extends CDOObjectImpl implements Address { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @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"; /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ protected AddressImpl() @@ -51,7 +49,6 @@ public class AddressImpl extends CDOObjectImpl implements Address /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -62,7 +59,6 @@ public class AddressImpl extends CDOObjectImpl implements Address /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -73,7 +69,6 @@ public class AddressImpl extends CDOObjectImpl implements Address /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public String getName() @@ -83,7 +78,6 @@ public class AddressImpl extends CDOObjectImpl implements Address /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void setName(String newName) @@ -93,7 +87,6 @@ public class AddressImpl extends CDOObjectImpl implements Address /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public String getStreet() @@ -103,7 +96,6 @@ public class AddressImpl extends CDOObjectImpl implements Address /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void setStreet(String newStreet) @@ -113,7 +105,6 @@ public class AddressImpl extends CDOObjectImpl implements Address /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public String getCity() @@ -123,7 +114,6 @@ public class AddressImpl extends CDOObjectImpl implements Address /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void setCity(String newCity) 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 a62d9d1a34..169592089a 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,26 +24,24 @@ import org.eclipse.emf.ecore.EClass; * <p> * The following features are implemented: * <ul> - * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.CategoryImpl#getName <em>Name</em>}</li> - * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.CategoryImpl#getCategories <em>Categories</em>}</li> - * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.CategoryImpl#getProducts <em>Products</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.CategoryImpl#getName <em>Name</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.CategoryImpl#getCategories <em>Categories</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.CategoryImpl#getProducts <em>Products</em>}</li> * </ul> * </p> - * + * * @generated */ public class CategoryImpl extends CDOObjectImpl implements Category { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @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"; /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ protected CategoryImpl() @@ -53,7 +51,6 @@ public class CategoryImpl extends CDOObjectImpl implements Category /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -64,7 +61,6 @@ public class CategoryImpl extends CDOObjectImpl implements Category /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -75,7 +71,6 @@ public class CategoryImpl extends CDOObjectImpl implements Category /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public String getName() @@ -85,7 +80,6 @@ public class CategoryImpl extends CDOObjectImpl implements Category /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void setName(String newName) @@ -95,7 +89,6 @@ public class CategoryImpl extends CDOObjectImpl implements Category /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @SuppressWarnings("unchecked") @@ -106,7 +99,6 @@ public class CategoryImpl extends CDOObjectImpl implements Category /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @SuppressWarnings("unchecked") 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 aebebe05d5..5f9690ad7d 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,28 +26,26 @@ import org.eclipse.emf.ecore.EClass; * <p> * The following features are implemented: * <ul> - * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.CompanyImpl#getCategories <em>Categories</em>}</li> - * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.CompanyImpl#getSuppliers <em>Suppliers</em>}</li> - * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.CompanyImpl#getCustomers <em>Customers</em>}</li> - * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.CompanyImpl#getPurchaseOrders <em>Purchase Orders</em>}</li> - * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.CompanyImpl#getSalesOrders <em>Sales Orders</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.CompanyImpl#getCategories <em>Categories</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.CompanyImpl#getSuppliers <em>Suppliers</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.CompanyImpl#getCustomers <em>Customers</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.CompanyImpl#getPurchaseOrders <em>Purchase Orders</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.CompanyImpl#getSalesOrders <em>Sales Orders</em>}</li> * </ul> * </p> - * + * * @generated */ public class CompanyImpl extends AddressImpl implements Company { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @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"; /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ protected CompanyImpl() @@ -57,7 +55,6 @@ public class CompanyImpl extends AddressImpl implements Company /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -68,7 +65,6 @@ public class CompanyImpl extends AddressImpl implements Company /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @SuppressWarnings("unchecked") @@ -79,7 +75,6 @@ public class CompanyImpl extends AddressImpl implements Company /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @SuppressWarnings("unchecked") @@ -90,7 +85,6 @@ public class CompanyImpl extends AddressImpl implements Company /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @SuppressWarnings("unchecked") @@ -101,7 +95,6 @@ public class CompanyImpl extends AddressImpl implements Company /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @SuppressWarnings("unchecked") @@ -112,7 +105,6 @@ public class CompanyImpl extends AddressImpl implements Company /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @SuppressWarnings("unchecked") 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 78b534c436..3cb95d638b 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,25 +24,23 @@ import org.eclipse.emf.ecore.EClass; * <p> * The following features are implemented: * <ul> - * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.CustomerImpl#getSalesOrders <em>Sales Orders</em>}</li> - * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.CustomerImpl#getOrderByProduct <em>Order By Product</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.CustomerImpl#getSalesOrders <em>Sales Orders</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.CustomerImpl#getOrderByProduct <em>Order By Product</em>}</li> * </ul> * </p> - * + * * @generated */ public class CustomerImpl extends AddressImpl implements Customer { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @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"; /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ protected CustomerImpl() @@ -52,7 +50,6 @@ public class CustomerImpl extends AddressImpl implements Customer /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -63,7 +60,6 @@ public class CustomerImpl extends AddressImpl implements Customer /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @SuppressWarnings("unchecked") @@ -74,7 +70,6 @@ public class CustomerImpl extends AddressImpl implements Customer /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @SuppressWarnings("unchecked") 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 c09c3be4a9..3889087c52 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 @@ -16,7 +16,6 @@ import org.eclipse.emf.cdo.tests.model1.Company; 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.Order; import org.eclipse.emf.cdo.tests.model1.OrderAddress; import org.eclipse.emf.cdo.tests.model1.OrderDetail; import org.eclipse.emf.cdo.tests.model1.Product1; @@ -36,21 +35,19 @@ import java.util.Map; /** * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!-- end-user-doc --> - * * @generated */ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @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. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Creates the default factory implementation. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ public static Model1Factory init() @@ -72,8 +69,8 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory } /** - * Creates an instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Creates an instance of the factory. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ public Model1FactoryImpl() @@ -83,7 +80,6 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -99,8 +95,6 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory return createSupplier(); case Model1Package.CUSTOMER: return createCustomer(); - case Model1Package.ORDER: - return createOrder(); case Model1Package.ORDER_DETAIL: return createOrderDetail(); case Model1Package.PURCHASE_ORDER: @@ -122,7 +116,6 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -139,7 +132,6 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -156,7 +148,6 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public Address createAddress() @@ -167,7 +158,6 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public Supplier createSupplier() @@ -178,7 +168,6 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public PurchaseOrder createPurchaseOrder() @@ -189,7 +178,6 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public OrderDetail createOrderDetail() @@ -200,7 +188,6 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public OrderAddress createOrderAddress() @@ -211,7 +198,6 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public Map.Entry<Product1, SalesOrder> createProductToOrder() @@ -222,23 +208,19 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public VAT createVATFromString(EDataType eDataType, String initialValue) { VAT result = VAT.get(initialValue); if (result == null) - { throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); - } return result; } /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public String convertVATToString(EDataType eDataType, Object instanceValue) @@ -248,7 +230,6 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public Category createCategory() @@ -259,7 +240,6 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public Product1 createProduct1() @@ -270,7 +250,6 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public Company createCompany() @@ -281,7 +260,6 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public Customer createCustomer() @@ -292,18 +270,6 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @generated - */ - public Order createOrder() - { - OrderImpl order = new OrderImpl(); - return order; - } - - /** - * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public SalesOrder createSalesOrder() @@ -314,7 +280,6 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public Model1Package getModel1Package() @@ -324,7 +289,6 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @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 57e65a4733..87ad346d1c 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,105 +35,90 @@ import java.util.Map; /** * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!-- end-user-doc --> - * * @generated */ public class Model1PackageImpl extends EPackageImpl implements Model1Package { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @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"; /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private EClass addressEClass = null; /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private EClass supplierEClass = null; /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private EClass purchaseOrderEClass = null; /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private EClass orderDetailEClass = null; /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private EClass orderAddressEClass = null; /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private EClass productToOrderEClass = null; /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private EEnum vatEEnum = null; /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private EClass categoryEClass = null; /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private EClass product1EClass = null; /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private EClass companyEClass = null; /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private EClass customerEClass = null; /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private EClass orderEClass = null; /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private EClass salesOrderEClass = null; @@ -158,18 +143,17 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private static boolean isInited = false; /** * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends. - * <p> - * This method is used to initialize {@link Model1Package#eINSTANCE} when that field is accessed. Clients should not - * invoke it directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc --> - * <!-- end-user-doc --> * + * <p>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. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> * @see #eNS_URI * @see #createPackageContents() * @see #initializePackageContents() @@ -178,9 +162,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package public static Model1Package init() { if (isInited) - { return (Model1Package)EPackage.Registry.INSTANCE.getEPackage(Model1Package.eNS_URI); - } // Obtain or create and register package Model1PackageImpl theModel1Package = (Model1PackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof Model1PackageImpl ? EPackage.Registry.INSTANCE @@ -204,7 +186,6 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EClass getAddress() @@ -214,7 +195,6 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EAttribute getAddress_Name() @@ -224,7 +204,6 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EAttribute getAddress_Street() @@ -234,7 +213,6 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EAttribute getAddress_City() @@ -244,7 +222,6 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EClass getSupplier() @@ -254,7 +231,6 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getSupplier_PurchaseOrders() @@ -264,7 +240,6 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EAttribute getSupplier_Preferred() @@ -274,7 +249,6 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EClass getPurchaseOrder() @@ -284,7 +258,6 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EAttribute getPurchaseOrder_Date() @@ -294,7 +267,6 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getPurchaseOrder_Supplier() @@ -304,7 +276,6 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EClass getOrderDetail() @@ -314,7 +285,6 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getOrderDetail_Order() @@ -324,7 +294,6 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getOrderDetail_Product() @@ -334,7 +303,6 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EAttribute getOrderDetail_Price() @@ -344,7 +312,6 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EClass getOrderAddress() @@ -354,7 +321,6 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EAttribute getOrderAddress_TestAttribute() @@ -364,7 +330,6 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EClass getProductToOrder() @@ -374,7 +339,6 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getProductToOrder_Key() @@ -384,7 +348,6 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getProductToOrder_Value() @@ -394,7 +357,6 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EEnum getVAT() @@ -404,7 +366,6 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EClass getCategory() @@ -414,7 +375,6 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EAttribute getCategory_Name() @@ -424,7 +384,6 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getCategory_Categories() @@ -434,7 +393,6 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getCategory_Products() @@ -444,7 +402,6 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EClass getProduct1() @@ -454,7 +411,6 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EAttribute getProduct1_Name() @@ -464,7 +420,6 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getProduct1_OrderDetails() @@ -474,7 +429,6 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EAttribute getProduct1_Vat() @@ -484,7 +438,6 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EAttribute getProduct1_Description() @@ -494,7 +447,6 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EClass getCompany() @@ -504,7 +456,6 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getCompany_Categories() @@ -514,7 +465,6 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getCompany_Suppliers() @@ -524,7 +474,6 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getCompany_PurchaseOrders() @@ -534,7 +483,6 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getCompany_Customers() @@ -544,7 +492,6 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getCompany_SalesOrders() @@ -554,7 +501,6 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EClass getCustomer() @@ -564,7 +510,6 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getCustomer_SalesOrders() @@ -574,7 +519,6 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getCustomer_OrderByProduct() @@ -584,7 +528,6 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EClass getOrder() @@ -594,7 +537,6 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getOrder_OrderDetails() @@ -604,7 +546,6 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EClass getSalesOrder() @@ -614,7 +555,6 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EAttribute getSalesOrder_Id() @@ -624,7 +564,6 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getSalesOrder_Customer() @@ -634,7 +573,6 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public Model1Factory getModel1Factory() @@ -644,23 +582,20 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @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. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Creates the meta-model objects for the package. This method is + * guarded to have no affect on any invocation but its first. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ public void createPackageContents() { if (isCreated) - { return; - } isCreated = true; // Create classes and their features @@ -724,23 +659,20 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @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. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Complete the initialization of the package and its meta-model. This + * method is guarded to have no affect on any invocation but its first. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ public void initializePackageContents() { if (isInitialized) - { return; - } isInitialized = true; // Initialize package @@ -753,14 +685,14 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package // Set bounds for type parameters // Add supertypes to classes - 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()); + 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()); // Initialize classes and features; add operations and parameters initEClass(addressEClass, Address.class, "Address", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); @@ -772,49 +704,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(), getCategory(), null, "categories", null, 0, -1, Company.class, + initEReference(getCompany_Categories(), this.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(), 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, + 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, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getCompany_SalesOrders(), getSalesOrder(), null, "salesOrders", null, 0, -1, Company.class, + 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, !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(), 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); + 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); 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(), 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, + 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, 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(), 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(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); initEClass(orderDetailEClass, OrderDetail.class, "OrderDetail", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - 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, + 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, !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); @@ -823,35 +755,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(), getSupplier(), getSupplier_PurchaseOrders(), "supplier", null, 1, 1, - PurchaseOrder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, + 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, !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(), getCustomer(), getCustomer_SalesOrders(), "customer", null, 1, 1, - SalesOrder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, + 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, !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(), getCategory(), null, "categories", null, 0, -1, Category.class, + 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, !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(), 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, + 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, 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); @@ -864,10 +796,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(), 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, + 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, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); @@ -886,8 +818,8 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package } /** - * Initializes the annotations for <b>teneo.jpa</b>. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Initializes the annotations for <b>teneo.jpa</b>. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @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 5d8c634e56..f9973c9cac 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,28 +24,26 @@ import org.eclipse.emf.ecore.EClass; * <p> * The following features are implemented: * <ul> - * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.OrderAddressImpl#getOrderDetails <em>Order Details</em>}</li> - * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.OrderAddressImpl#getOrder <em>Order</em>}</li> - * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.OrderAddressImpl#getProduct <em>Product</em>}</li> - * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.OrderAddressImpl#getPrice <em>Price</em>}</li> - * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.OrderAddressImpl#isTestAttribute <em>Test Attribute</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.OrderAddressImpl#getOrderDetails <em>Order Details</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.OrderAddressImpl#getOrder <em>Order</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.OrderAddressImpl#getProduct <em>Product</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.OrderAddressImpl#getPrice <em>Price</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.OrderAddressImpl#isTestAttribute <em>Test Attribute</em>}</li> * </ul> * </p> - * + * * @generated */ public class OrderAddressImpl extends AddressImpl implements OrderAddress { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @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"; /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ protected OrderAddressImpl() @@ -55,7 +53,6 @@ public class OrderAddressImpl extends AddressImpl implements OrderAddress /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -66,7 +63,6 @@ public class OrderAddressImpl extends AddressImpl implements OrderAddress /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @SuppressWarnings("unchecked") @@ -77,7 +73,6 @@ public class OrderAddressImpl extends AddressImpl implements OrderAddress /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public Order getOrder() @@ -87,7 +82,6 @@ public class OrderAddressImpl extends AddressImpl implements OrderAddress /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void setOrder(Order newOrder) @@ -97,7 +91,6 @@ public class OrderAddressImpl extends AddressImpl implements OrderAddress /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public Product1 getProduct() @@ -107,7 +100,6 @@ public class OrderAddressImpl extends AddressImpl implements OrderAddress /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void setProduct(Product1 newProduct) @@ -117,7 +109,6 @@ public class OrderAddressImpl extends AddressImpl implements OrderAddress /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public float getPrice() @@ -127,7 +118,6 @@ public class OrderAddressImpl extends AddressImpl implements OrderAddress /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void setPrice(float newPrice) @@ -137,7 +127,6 @@ public class OrderAddressImpl extends AddressImpl implements OrderAddress /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public boolean isTestAttribute() @@ -147,7 +136,6 @@ public class OrderAddressImpl extends AddressImpl implements OrderAddress /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void setTestAttribute(boolean newTestAttribute) @@ -157,7 +145,6 @@ public class OrderAddressImpl extends AddressImpl implements OrderAddress /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -192,7 +179,6 @@ public class OrderAddressImpl extends AddressImpl implements OrderAddress /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @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 590c16dbda..edf56175b0 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,26 +24,24 @@ import org.eclipse.emf.ecore.EClass; * <p> * The following features are implemented: * <ul> - * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.OrderDetailImpl#getOrder <em>Order</em>}</li> - * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.OrderDetailImpl#getProduct <em>Product</em>}</li> - * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.OrderDetailImpl#getPrice <em>Price</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.OrderDetailImpl#getOrder <em>Order</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.OrderDetailImpl#getProduct <em>Product</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.OrderDetailImpl#getPrice <em>Price</em>}</li> * </ul> * </p> - * + * * @generated */ public class OrderDetailImpl extends CDOObjectImpl implements OrderDetail { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @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"; /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ protected OrderDetailImpl() @@ -53,7 +51,6 @@ public class OrderDetailImpl extends CDOObjectImpl implements OrderDetail /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -64,7 +61,6 @@ public class OrderDetailImpl extends CDOObjectImpl implements OrderDetail /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -75,7 +71,6 @@ public class OrderDetailImpl extends CDOObjectImpl implements OrderDetail /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public Order getOrder() @@ -85,7 +80,6 @@ public class OrderDetailImpl extends CDOObjectImpl implements OrderDetail /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void setOrder(Order newOrder) @@ -95,7 +89,6 @@ public class OrderDetailImpl extends CDOObjectImpl implements OrderDetail /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public Product1 getProduct() @@ -105,7 +98,6 @@ public class OrderDetailImpl extends CDOObjectImpl implements OrderDetail /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void setProduct(Product1 newProduct) @@ -115,7 +107,6 @@ public class OrderDetailImpl extends CDOObjectImpl implements OrderDetail /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public float getPrice() @@ -125,7 +116,6 @@ public class OrderDetailImpl extends CDOObjectImpl implements OrderDetail /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void setPrice(float newPrice) 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 59c8bff67a..d7998be8b4 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,24 +24,22 @@ import org.eclipse.emf.ecore.EClass; * <p> * The following features are implemented: * <ul> - * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.OrderImpl#getOrderDetails <em>Order Details</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.OrderImpl#getOrderDetails <em>Order Details</em>}</li> * </ul> * </p> - * + * * @generated */ -public class OrderImpl extends CDOObjectImpl implements Order +public abstract class OrderImpl extends CDOObjectImpl implements Order { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @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"; /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ protected OrderImpl() @@ -51,7 +49,6 @@ public class OrderImpl extends CDOObjectImpl implements Order /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -62,7 +59,6 @@ public class OrderImpl extends CDOObjectImpl implements Order /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -73,7 +69,6 @@ public class OrderImpl extends CDOObjectImpl implements Order /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @SuppressWarnings("unchecked") 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 4c58a29034..609c64ac4b 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,27 +25,25 @@ import org.eclipse.emf.ecore.EClass; * <p> * The following features are implemented: * <ul> - * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.Product1Impl#getName <em>Name</em>}</li> - * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.Product1Impl#getOrderDetails <em>Order Details</em>}</li> - * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.Product1Impl#getVat <em>Vat</em>}</li> - * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.Product1Impl#getDescription <em>Description</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.Product1Impl#getName <em>Name</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.Product1Impl#getOrderDetails <em>Order Details</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.Product1Impl#getVat <em>Vat</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.Product1Impl#getDescription <em>Description</em>}</li> * </ul> * </p> - * + * * @generated */ public class Product1Impl extends CDOObjectImpl implements Product1 { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @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"; /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ protected Product1Impl() @@ -55,7 +53,6 @@ public class Product1Impl extends CDOObjectImpl implements Product1 /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -66,7 +63,6 @@ public class Product1Impl extends CDOObjectImpl implements Product1 /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -77,7 +73,6 @@ public class Product1Impl extends CDOObjectImpl implements Product1 /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public String getName() @@ -87,7 +82,6 @@ public class Product1Impl extends CDOObjectImpl implements Product1 /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void setName(String newName) @@ -97,7 +91,6 @@ public class Product1Impl extends CDOObjectImpl implements Product1 /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @SuppressWarnings("unchecked") @@ -108,7 +101,6 @@ public class Product1Impl extends CDOObjectImpl implements Product1 /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public VAT getVat() @@ -118,7 +110,6 @@ public class Product1Impl extends CDOObjectImpl implements Product1 /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void setVat(VAT newVat) @@ -128,7 +119,6 @@ public class Product1Impl extends CDOObjectImpl implements Product1 /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public String getDescription() @@ -138,7 +128,6 @@ public class Product1Impl extends CDOObjectImpl implements Product1 /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void setDescription(String newDescription) 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 3fc0e3d04b..269ada1e9b 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,14 +38,12 @@ public class ProductToOrderImpl extends CDOObjectImpl implements BasicEMap.Entry { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @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"; /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ protected ProductToOrderImpl() @@ -55,7 +53,6 @@ public class ProductToOrderImpl extends CDOObjectImpl implements BasicEMap.Entry /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -66,7 +63,6 @@ public class ProductToOrderImpl extends CDOObjectImpl implements BasicEMap.Entry /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -77,7 +73,6 @@ public class ProductToOrderImpl extends CDOObjectImpl implements BasicEMap.Entry /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public Product1 getTypedKey() @@ -87,7 +82,6 @@ public class ProductToOrderImpl extends CDOObjectImpl implements BasicEMap.Entry /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void setTypedKey(Product1 newKey) @@ -97,7 +91,6 @@ public class ProductToOrderImpl extends CDOObjectImpl implements BasicEMap.Entry /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public SalesOrder getTypedValue() @@ -107,7 +100,6 @@ public class ProductToOrderImpl extends CDOObjectImpl implements BasicEMap.Entry /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void setTypedValue(SalesOrder newValue) @@ -117,14 +109,12 @@ public class ProductToOrderImpl extends CDOObjectImpl implements BasicEMap.Entry /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ protected int hash = -1; /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public int getHash() @@ -132,14 +122,13 @@ public class ProductToOrderImpl extends CDOObjectImpl implements BasicEMap.Entry if (hash == -1) { Object theKey = getKey(); - hash = theKey == null ? 0 : theKey.hashCode(); + hash = (theKey == null ? 0 : theKey.hashCode()); } return hash; } /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void setHash(int hash) @@ -149,7 +138,6 @@ public class ProductToOrderImpl extends CDOObjectImpl implements BasicEMap.Entry /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public Product1 getKey() @@ -159,7 +147,6 @@ public class ProductToOrderImpl extends CDOObjectImpl implements BasicEMap.Entry /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void setKey(Product1 key) @@ -169,7 +156,6 @@ public class ProductToOrderImpl extends CDOObjectImpl implements BasicEMap.Entry /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public SalesOrder getValue() @@ -179,7 +165,6 @@ public class ProductToOrderImpl extends CDOObjectImpl implements BasicEMap.Entry /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public SalesOrder setValue(SalesOrder value) @@ -191,7 +176,6 @@ public class ProductToOrderImpl extends CDOObjectImpl implements BasicEMap.Entry /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @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 00614a752d..830acf4f78 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,25 +23,23 @@ import java.util.Date; * <p> * The following features are implemented: * <ul> - * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.PurchaseOrderImpl#getDate <em>Date</em>}</li> - * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.PurchaseOrderImpl#getSupplier <em>Supplier</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.PurchaseOrderImpl#getDate <em>Date</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.PurchaseOrderImpl#getSupplier <em>Supplier</em>}</li> * </ul> * </p> - * + * * @generated */ public class PurchaseOrderImpl extends OrderImpl implements PurchaseOrder { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @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"; /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ protected PurchaseOrderImpl() @@ -51,7 +49,6 @@ public class PurchaseOrderImpl extends OrderImpl implements PurchaseOrder /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -62,7 +59,6 @@ public class PurchaseOrderImpl extends OrderImpl implements PurchaseOrder /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public Date getDate() @@ -72,7 +68,6 @@ public class PurchaseOrderImpl extends OrderImpl implements PurchaseOrder /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void setDate(Date newDate) @@ -82,7 +77,6 @@ public class PurchaseOrderImpl extends OrderImpl implements PurchaseOrder /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public Supplier getSupplier() @@ -92,7 +86,6 @@ public class PurchaseOrderImpl extends OrderImpl implements PurchaseOrder /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void setSupplier(Supplier newSupplier) 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 3fdd91ae27..4bf7517f4c 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,25 +21,23 @@ import org.eclipse.emf.ecore.EClass; * <p> * The following features are implemented: * <ul> - * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.SalesOrderImpl#getId <em>Id</em>}</li> - * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.SalesOrderImpl#getCustomer <em>Customer</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.SalesOrderImpl#getId <em>Id</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.SalesOrderImpl#getCustomer <em>Customer</em>}</li> * </ul> * </p> - * + * * @generated */ public class SalesOrderImpl extends OrderImpl implements SalesOrder { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @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"; /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ protected SalesOrderImpl() @@ -49,7 +47,6 @@ public class SalesOrderImpl extends OrderImpl implements SalesOrder /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -60,7 +57,6 @@ public class SalesOrderImpl extends OrderImpl implements SalesOrder /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public int getId() @@ -70,7 +66,6 @@ public class SalesOrderImpl extends OrderImpl implements SalesOrder /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void setId(int newId) @@ -80,7 +75,6 @@ public class SalesOrderImpl extends OrderImpl implements SalesOrder /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public Customer getCustomer() @@ -90,7 +84,6 @@ public class SalesOrderImpl extends OrderImpl implements SalesOrder /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void setCustomer(Customer newCustomer) 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 95077bb7b8..3ad24ed748 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,25 +22,23 @@ import org.eclipse.emf.ecore.EClass; * <p> * The following features are implemented: * <ul> - * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.SupplierImpl#getPurchaseOrders <em>Purchase Orders</em>}</li> - * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.SupplierImpl#isPreferred <em>Preferred</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.SupplierImpl#getPurchaseOrders <em>Purchase Orders</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.SupplierImpl#isPreferred <em>Preferred</em>}</li> * </ul> * </p> - * + * * @generated */ public class SupplierImpl extends AddressImpl implements Supplier { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @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"; /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ protected SupplierImpl() @@ -50,7 +48,6 @@ public class SupplierImpl extends AddressImpl implements Supplier /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @Override @@ -61,7 +58,6 @@ public class SupplierImpl extends AddressImpl implements Supplier /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ @SuppressWarnings("unchecked") @@ -72,7 +68,6 @@ public class SupplierImpl extends AddressImpl implements Supplier /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public boolean isPreferred() @@ -82,7 +77,6 @@ public class SupplierImpl extends AddressImpl implements Supplier /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void setPreferred(boolean newPreferred) 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 cb5354602f..596247135e 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,7 +33,6 @@ import java.util.Map; /** * <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides an adapter <code>createXXX</code> * method for each class of the model. <!-- end-user-doc --> - * * @see org.eclipse.emf.cdo.tests.model1.Model1Package * @generated */ @@ -41,21 +40,20 @@ public class Model1AdapterFactory extends AdapterFactoryImpl { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @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. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The cached model package. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ protected static Model1Package modelPackage; /** - * Creates an instance of the adapter factory. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Creates an instance of the adapter factory. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ public Model1AdapterFactory() @@ -67,10 +65,10 @@ public class Model1AdapterFactory extends AdapterFactoryImpl } /** - * Returns whether this factory is applicable for the type of the object. <!-- begin-user-doc --> This implementation + * Returns whether this factory is applicable for the type of the object. + * <!-- begin-user-doc --> This implementation * returns <code>true</code> if the object is either the model's package or is an instance object of the model. <!-- * end-user-doc --> - * * @return whether this factory is applicable for the type of the object. * @generated */ @@ -89,8 +87,8 @@ public class Model1AdapterFactory extends AdapterFactoryImpl } /** - * The switch that delegates to the <code>createXXX</code> methods. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The switch that delegates to the <code>createXXX</code> methods. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ protected Model1Switch<Adapter> modelSwitch = new Model1Switch<Adapter>() @@ -175,10 +173,9 @@ public class Model1AdapterFactory extends AdapterFactoryImpl }; /** - * Creates an adapter for the <code>target</code>. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @param target - * the object to adapt. + * Creates an adapter for the <code>target</code>. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * @param target the object to adapt. * @return the adapter for the <code>target</code>. * @generated */ @@ -192,7 +189,6 @@ public class Model1AdapterFactory extends AdapterFactoryImpl * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model1.Address <em>Address</em>}'. * <!-- begin-user-doc --> 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. <!-- end-user-doc --> - * * @return the new adapter. * @see org.eclipse.emf.cdo.tests.model1.Address * @generated @@ -206,7 +202,6 @@ public class Model1AdapterFactory extends AdapterFactoryImpl * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model1.Supplier <em>Supplier</em>}'. * <!-- begin-user-doc --> 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. <!-- end-user-doc --> - * * @return the new adapter. * @see org.eclipse.emf.cdo.tests.model1.Supplier * @generated @@ -217,10 +212,9 @@ public class Model1AdapterFactory extends AdapterFactoryImpl } /** - * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model1.PurchaseOrder - * <em>Purchase Order</em>}'. <!-- begin-user-doc --> 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 <em>Purchase Order</em>}'. + * <!-- begin-user-doc --> 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. <!-- end-user-doc --> - * * @return the new adapter. * @see org.eclipse.emf.cdo.tests.model1.PurchaseOrder * @generated @@ -231,10 +225,9 @@ public class Model1AdapterFactory extends AdapterFactoryImpl } /** - * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model1.OrderDetail - * <em>Order Detail</em>}'. <!-- begin-user-doc --> 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 <em>Order Detail</em>}'. + * <!-- begin-user-doc --> 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. <!-- end-user-doc --> - * * @return the new adapter. * @see org.eclipse.emf.cdo.tests.model1.OrderDetail * @generated @@ -245,10 +238,9 @@ public class Model1AdapterFactory extends AdapterFactoryImpl } /** - * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model1.OrderAddress - * <em>Order Address</em>}'. <!-- begin-user-doc --> 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 <em>Order Address</em>}'. + * <!-- begin-user-doc --> 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. <!-- end-user-doc --> - * * @return the new adapter. * @see org.eclipse.emf.cdo.tests.model1.OrderAddress * @generated @@ -276,7 +268,6 @@ public class Model1AdapterFactory extends AdapterFactoryImpl * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model1.Category <em>Category</em>}'. * <!-- begin-user-doc --> 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. <!-- end-user-doc --> - * * @return the new adapter. * @see org.eclipse.emf.cdo.tests.model1.Category * @generated @@ -290,7 +281,6 @@ public class Model1AdapterFactory extends AdapterFactoryImpl * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model1.Product1 <em>Product1</em>}'. * <!-- begin-user-doc --> 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. <!-- end-user-doc --> - * * @return the new adapter. * @see org.eclipse.emf.cdo.tests.model1.Product1 * @generated @@ -304,7 +294,6 @@ public class Model1AdapterFactory extends AdapterFactoryImpl * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model1.Company <em>Company</em>}'. * <!-- begin-user-doc --> 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. <!-- end-user-doc --> - * * @return the new adapter. * @see org.eclipse.emf.cdo.tests.model1.Company * @generated @@ -318,7 +307,6 @@ public class Model1AdapterFactory extends AdapterFactoryImpl * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model1.Customer <em>Customer</em>}'. * <!-- begin-user-doc --> 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. <!-- end-user-doc --> - * * @return the new adapter. * @see org.eclipse.emf.cdo.tests.model1.Customer * @generated @@ -343,10 +331,9 @@ public class Model1AdapterFactory extends AdapterFactoryImpl } /** - * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model1.SalesOrder - * <em>Sales Order</em>}'. <!-- begin-user-doc --> 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 <em>Sales Order</em>}'. + * <!-- begin-user-doc --> 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. <!-- end-user-doc --> - * * @return the new adapter. * @see org.eclipse.emf.cdo.tests.model1.SalesOrder * @generated @@ -357,9 +344,9 @@ public class Model1AdapterFactory extends AdapterFactoryImpl } /** - * Creates a new adapter for the default case. <!-- begin-user-doc --> This default implementation returns null. <!-- + * Creates a new adapter for the default case. + * <!-- begin-user-doc --> This default implementation returns null. <!-- * end-user-doc --> - * * @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 4c7bdca2e4..20a9f6d480 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,7 +34,6 @@ import java.util.Map; * {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> 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. <!-- end-user-doc --> - * * @see org.eclipse.emf.cdo.tests.model1.Model1Package * @generated */ @@ -42,21 +41,20 @@ public class Model1Switch<T> { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @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 <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The cached model package + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ protected static Model1Package modelPackage; /** - * Creates an instance of the switch. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Creates an instance of the switch. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ public Model1Switch() @@ -70,7 +68,6 @@ public class Model1Switch<T> /** * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result. * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @return the first non-null result returned by a <code>caseXXX</code> call. * @generated */ @@ -82,7 +79,6 @@ public class Model1Switch<T> /** * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result. * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @return the first non-null result returned by a <code>caseXXX</code> call. * @generated */ @@ -102,7 +98,6 @@ public class Model1Switch<T> /** * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result. * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @return the first non-null result returned by a <code>caseXXX</code> call. * @generated */ @@ -115,9 +110,7 @@ public class Model1Switch<T> Address address = (Address)theEObject; T result = caseAddress(address); if (result == null) - { result = defaultCase(theEObject); - } return result; } case Model1Package.COMPANY: @@ -125,13 +118,9 @@ public class Model1Switch<T> Company company = (Company)theEObject; T result = caseCompany(company); if (result == null) - { result = caseAddress(company); - } if (result == null) - { result = defaultCase(theEObject); - } return result; } case Model1Package.SUPPLIER: @@ -139,13 +128,9 @@ public class Model1Switch<T> Supplier supplier = (Supplier)theEObject; T result = caseSupplier(supplier); if (result == null) - { result = caseAddress(supplier); - } if (result == null) - { result = defaultCase(theEObject); - } return result; } case Model1Package.CUSTOMER: @@ -153,13 +138,9 @@ public class Model1Switch<T> Customer customer = (Customer)theEObject; T result = caseCustomer(customer); if (result == null) - { result = caseAddress(customer); - } if (result == null) - { result = defaultCase(theEObject); - } return result; } case Model1Package.ORDER: @@ -167,9 +148,7 @@ public class Model1Switch<T> Order order = (Order)theEObject; T result = caseOrder(order); if (result == null) - { result = defaultCase(theEObject); - } return result; } case Model1Package.ORDER_DETAIL: @@ -177,9 +156,7 @@ public class Model1Switch<T> OrderDetail orderDetail = (OrderDetail)theEObject; T result = caseOrderDetail(orderDetail); if (result == null) - { result = defaultCase(theEObject); - } return result; } case Model1Package.PURCHASE_ORDER: @@ -187,13 +164,9 @@ public class Model1Switch<T> PurchaseOrder purchaseOrder = (PurchaseOrder)theEObject; T result = casePurchaseOrder(purchaseOrder); if (result == null) - { result = caseOrder(purchaseOrder); - } if (result == null) - { result = defaultCase(theEObject); - } return result; } case Model1Package.SALES_ORDER: @@ -201,13 +174,9 @@ public class Model1Switch<T> SalesOrder salesOrder = (SalesOrder)theEObject; T result = caseSalesOrder(salesOrder); if (result == null) - { result = caseOrder(salesOrder); - } if (result == null) - { result = defaultCase(theEObject); - } return result; } case Model1Package.CATEGORY: @@ -215,9 +184,7 @@ public class Model1Switch<T> Category category = (Category)theEObject; T result = caseCategory(category); if (result == null) - { result = defaultCase(theEObject); - } return result; } case Model1Package.PRODUCT1: @@ -225,9 +192,7 @@ public class Model1Switch<T> Product1 product1 = (Product1)theEObject; T result = caseProduct1(product1); if (result == null) - { result = defaultCase(theEObject); - } return result; } case Model1Package.ORDER_ADDRESS: @@ -235,21 +200,13 @@ public class Model1Switch<T> OrderAddress orderAddress = (OrderAddress)theEObject; T result = caseOrderAddress(orderAddress); if (result == null) - { result = caseAddress(orderAddress); - } if (result == null) - { result = caseOrder(orderAddress); - } if (result == null) - { result = caseOrderDetail(orderAddress); - } if (result == null) - { result = defaultCase(theEObject); - } return result; } case Model1Package.PRODUCT_TO_ORDER: @@ -258,9 +215,7 @@ public class Model1Switch<T> Map.Entry<Product1, SalesOrder> productToOrder = (Map.Entry<Product1, SalesOrder>)theEObject; T result = caseProductToOrder(productToOrder); if (result == null) - { result = defaultCase(theEObject); - } return result; } default: @@ -269,11 +224,10 @@ public class Model1Switch<T> } /** - * Returns the result of interpreting the object as an instance of '<em>Address</em>'. <!-- begin-user-doc --> This + * Returns the result of interpreting the object as an instance of '<em>Address</em>'. + * <!-- begin-user-doc --> This * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc --> - * - * @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 '<em>Address</em>'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated @@ -284,11 +238,10 @@ public class Model1Switch<T> } /** - * Returns the result of interpreting the object as an instance of '<em>Supplier</em>'. <!-- begin-user-doc --> This + * Returns the result of interpreting the object as an instance of '<em>Supplier</em>'. + * <!-- begin-user-doc --> This * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc --> - * - * @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 '<em>Supplier</em>'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated @@ -299,11 +252,10 @@ public class Model1Switch<T> } /** - * Returns the result of interpreting the object as an instance of '<em>Purchase Order</em>'. <!-- begin-user-doc --> + * Returns the result of interpreting the object as an instance of '<em>Purchase Order</em>'. + * <!-- begin-user-doc --> * This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc --> - * - * @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 '<em>Purchase Order</em>'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated @@ -314,11 +266,10 @@ public class Model1Switch<T> } /** - * Returns the result of interpreting the object as an instance of '<em>Order Detail</em>'. <!-- begin-user-doc --> + * Returns the result of interpreting the object as an instance of '<em>Order Detail</em>'. + * <!-- begin-user-doc --> * This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc --> - * - * @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 '<em>Order Detail</em>'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated @@ -329,11 +280,10 @@ public class Model1Switch<T> } /** - * Returns the result of interpreting the object as an instance of '<em>Order Address</em>'. <!-- begin-user-doc --> + * Returns the result of interpreting the object as an instance of '<em>Order Address</em>'. + * <!-- begin-user-doc --> * This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc --> - * - * @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 '<em>Order Address</em>'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated @@ -344,11 +294,10 @@ public class Model1Switch<T> } /** - * Returns the result of interpreting the object as an instance of '<em>Product To Order</em>'. <!-- begin-user-doc + * Returns the result of interpreting the object as an instance of '<em>Product To Order</em>'. + * <!-- begin-user-doc * --> This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc --> - * - * @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 '<em>Product To Order</em>'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated @@ -359,11 +308,10 @@ public class Model1Switch<T> } /** - * Returns the result of interpreting the object as an instance of '<em>Category</em>'. <!-- begin-user-doc --> This + * Returns the result of interpreting the object as an instance of '<em>Category</em>'. + * <!-- begin-user-doc --> This * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc --> - * - * @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 '<em>Category</em>'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated @@ -374,11 +322,10 @@ public class Model1Switch<T> } /** - * Returns the result of interpreting the object as an instance of '<em>Product1</em>'. <!-- begin-user-doc --> This + * Returns the result of interpreting the object as an instance of '<em>Product1</em>'. + * <!-- begin-user-doc --> This * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc --> - * - * @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 '<em>Product1</em>'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated @@ -389,11 +336,10 @@ public class Model1Switch<T> } /** - * Returns the result of interpreting the object as an instance of '<em>Company</em>'. <!-- begin-user-doc --> This + * Returns the result of interpreting the object as an instance of '<em>Company</em>'. + * <!-- begin-user-doc --> This * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc --> - * - * @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 '<em>Company</em>'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated @@ -404,11 +350,10 @@ public class Model1Switch<T> } /** - * Returns the result of interpreting the object as an instance of '<em>Customer</em>'. <!-- begin-user-doc --> This + * Returns the result of interpreting the object as an instance of '<em>Customer</em>'. + * <!-- begin-user-doc --> This * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc --> - * - * @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 '<em>Customer</em>'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated @@ -419,11 +364,10 @@ public class Model1Switch<T> } /** - * Returns the result of interpreting the object as an instance of '<em>Order</em>'. <!-- begin-user-doc --> This + * Returns the result of interpreting the object as an instance of '<em>Order</em>'. + * <!-- begin-user-doc --> This * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc --> - * - * @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 '<em>Order</em>'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated @@ -434,11 +378,10 @@ public class Model1Switch<T> } /** - * Returns the result of interpreting the object as an instance of '<em>Sales Order</em>'. <!-- begin-user-doc --> + * Returns the result of interpreting the object as an instance of '<em>Sales Order</em>'. + * <!-- begin-user-doc --> * This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc --> - * - * @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 '<em>Sales Order</em>'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated @@ -449,12 +392,11 @@ public class Model1Switch<T> } /** - * Returns the result of interpreting the object as an instance of '<em>EObject</em>'. <!-- begin-user-doc --> This + * Returns the result of interpreting the object as an instance of '<em>EObject</em>'. + * <!-- begin-user-doc --> This * implementation returns null; returning a non-null result will terminate the switch, but this is the last case * anyway. <!-- end-user-doc --> - * - * @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 '<em>EObject</em>'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) * @generated diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ContainmentTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ContainmentTest.java index 38d26dfe32..06b66bdb85 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ContainmentTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ContainmentTest.java @@ -364,7 +364,7 @@ public class ContainmentTest extends AbstractCDOTest EClass eClass = (EClass)packageObject.getEClassifier("SchoolBook"); EObject container = packageObject.getEFactoryInstance().create(eClass); - Order contained = getModel1Factory().createOrder(); + Order contained = getModel1Factory().createPurchaseOrder(); resource1.getContents().add(container); resource2.getContents().add(contained); @@ -423,7 +423,7 @@ public class ContainmentTest extends AbstractCDOTest EClass eClass = (EClass)packageObject.getEClassifier("SchoolBook"); EObject container = packageObject.getEFactoryInstance().create(eClass); - Order contained = getModel1Factory().createOrder(); + Order contained = getModel1Factory().createPurchaseOrder(); resource1.getContents().add(container); resource2.getContents().add(contained); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/DetachTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/DetachTest.java index e631020410..ce8d50695a 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/DetachTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/DetachTest.java @@ -223,7 +223,7 @@ public class DetachTest extends AbstractCDOTest private void detachResource(ResourceSet rset, CDOResource resource, boolean commitBeforeDelete) throws Exception { CDOTransaction transaction = (CDOTransaction)resource.cdoView(); - Order order = getModel1Factory().createOrder(); + Order order = getModel1Factory().createPurchaseOrder(); OrderDetail orderDetail = getModel1Factory().createOrderDetail(); Product1 product1 = getModel1Factory().createProduct1(); product1.setName("product1"); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/MapTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/MapTest.java index c305797856..9e5851b9c1 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/MapTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/MapTest.java @@ -122,9 +122,9 @@ public class MapTest extends AbstractCDOTest { Map<Order, OrderDetail> objects = new HashMap<Order, OrderDetail>(); - objects.put(getModel1Factory().createOrder(), getModel1Factory().createOrderDetail()); - objects.put(getModel1Factory().createOrder(), getModel1Factory().createOrderDetail()); - objects.put(getModel1Factory().createOrder(), getModel1Factory().createOrderDetail()); + objects.put(getModel1Factory().createPurchaseOrder(), getModel1Factory().createOrderDetail()); + objects.put(getModel1Factory().createPurchaseOrder(), getModel1Factory().createOrderDetail()); + objects.put(getModel1Factory().createPurchaseOrder(), getModel1Factory().createOrderDetail()); testMap(getModel2Factory().createMapHolder(), getModel2Package().getMapHolder_EObjectToEObjectMap(), objects, null); } @@ -133,9 +133,9 @@ public class MapTest extends AbstractCDOTest { Map<Order, OrderDetail> objects = new HashMap<Order, OrderDetail>(); - objects.put(getModel1Factory().createOrder(), getModel1Factory().createOrderDetail()); - objects.put(getModel1Factory().createOrder(), getModel1Factory().createOrderDetail()); - objects.put(getModel1Factory().createOrder(), getModel1Factory().createOrderDetail()); + objects.put(getModel1Factory().createPurchaseOrder(), getModel1Factory().createOrderDetail()); + objects.put(getModel1Factory().createPurchaseOrder(), getModel1Factory().createOrderDetail()); + objects.put(getModel1Factory().createPurchaseOrder(), getModel1Factory().createOrderDetail()); testMap(getModel2Factory().createMapHolder(), getModel2Package().getMapHolder_EObjectToEObjectKeyContainedMap(), objects, null); @@ -145,9 +145,9 @@ public class MapTest extends AbstractCDOTest { Map<Order, OrderDetail> objects = new HashMap<Order, OrderDetail>(); - objects.put(getModel1Factory().createOrder(), getModel1Factory().createOrderDetail()); - objects.put(getModel1Factory().createOrder(), getModel1Factory().createOrderDetail()); - objects.put(getModel1Factory().createOrder(), getModel1Factory().createOrderDetail()); + objects.put(getModel1Factory().createPurchaseOrder(), getModel1Factory().createOrderDetail()); + objects.put(getModel1Factory().createPurchaseOrder(), getModel1Factory().createOrderDetail()); + objects.put(getModel1Factory().createPurchaseOrder(), getModel1Factory().createOrderDetail()); testMap(getModel2Factory().createMapHolder(), getModel2Package().getMapHolder_EObjectToEObjectValueContainedMap(), objects, null); @@ -157,9 +157,9 @@ public class MapTest extends AbstractCDOTest { Map<Order, OrderDetail> objects = new HashMap<Order, OrderDetail>(); - objects.put(getModel1Factory().createOrder(), getModel1Factory().createOrderDetail()); - objects.put(getModel1Factory().createOrder(), getModel1Factory().createOrderDetail()); - objects.put(getModel1Factory().createOrder(), getModel1Factory().createOrderDetail()); + objects.put(getModel1Factory().createPurchaseOrder(), getModel1Factory().createOrderDetail()); + objects.put(getModel1Factory().createPurchaseOrder(), getModel1Factory().createOrderDetail()); + objects.put(getModel1Factory().createPurchaseOrder(), getModel1Factory().createOrderDetail()); testMap(getModel2Factory().createMapHolder(), getModel2Package().getMapHolder_EObjectToEObjectBothContainedMap(), objects, null); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ResourceTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ResourceTest.java index 13505166d1..5c7bdadeef 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ResourceTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ResourceTest.java @@ -1562,7 +1562,7 @@ public class ResourceTest extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); CDOResource resource = transaction.createResource(oldPath); - Order order = getModel1Factory().createOrder(); + Order order = getModel1Factory().createPurchaseOrder(); resource.getContents().add(order); String path = CDOURIUtil.extractResourcePath(resource.getURI()); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/SavePointTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/SavePointTest.java index c3a4b7854a..2d67bb4068 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/SavePointTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/SavePointTest.java @@ -297,7 +297,7 @@ public class SavePointTest extends AbstractCDOTest CDOSession client2 = openSession(); CDOTransaction transaction2 = client2.openTransaction(); CDOResource object2Y = transaction2.getResource("/object2"); - object2Y.getContents().add(getModel1Factory().createOrder()); + object2Y.getContents().add(getModel1Factory().createPurchaseOrder()); // client2 commits transaction2.commit(); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/TransactionHandlerTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/TransactionHandlerTest.java index f081d6e583..b9b4a57e97 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/TransactionHandlerTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/TransactionHandlerTest.java @@ -51,7 +51,7 @@ public class TransactionHandlerTest extends AbstractCDOTest assertEquals(true, handler.getListOfAddingObject().contains(resource1)); - Order order = getModel1Factory().createOrder(); + Order order = getModel1Factory().createPurchaseOrder(); OrderDetail orderDetail = getModel1Factory().createOrderDetail(); order.getOrderDetails().add(orderDetail); @@ -76,7 +76,7 @@ public class TransactionHandlerTest extends AbstractCDOTest } }); - Order order = getModel1Factory().createOrder(); + Order order = getModel1Factory().createPurchaseOrder(); OrderDetail orderDetail = getModel1Factory().createOrderDetail(); order.getOrderDetails().add(orderDetail); @@ -100,7 +100,7 @@ public class TransactionHandlerTest extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - Order order = getModel1Factory().createOrder(); + Order order = getModel1Factory().createPurchaseOrder(); OrderDetail orderDetail = getModel1Factory().createOrderDetail(); order.getOrderDetails().add(orderDetail); @@ -138,7 +138,7 @@ public class TransactionHandlerTest extends AbstractCDOTest transaction.addTransactionHandler(handler); CDOResource resource1 = transaction.getOrCreateResource("/test1"); - Order order = getModel1Factory().createOrder(); + Order order = getModel1Factory().createPurchaseOrder(); OrderDetail orderDetail = getModel1Factory().createOrderDetail(); order.getOrderDetails().add(orderDetail); @@ -170,7 +170,7 @@ public class TransactionHandlerTest extends AbstractCDOTest } }); - Order order = getModel1Factory().createOrder(); + Order order = getModel1Factory().createPurchaseOrder(); OrderDetail orderDetail = getModel1Factory().createOrderDetail(); order.getOrderDetails().add(orderDetail); @@ -201,7 +201,7 @@ public class TransactionHandlerTest extends AbstractCDOTest transaction.addTransactionHandler(handler); CDOResource resource1 = transaction.getOrCreateResource("/test1"); - Order order = getModel1Factory().createOrder(); + Order order = getModel1Factory().createPurchaseOrder(); OrderDetail orderDetail = getModel1Factory().createOrderDetail(); order.getOrderDetails().add(orderDetail); @@ -230,7 +230,7 @@ public class TransactionHandlerTest extends AbstractCDOTest } }); - Order order = getModel1Factory().createOrder(); + Order order = getModel1Factory().createPurchaseOrder(); OrderDetail orderDetail = getModel1Factory().createOrderDetail(); order.getOrderDetails().add(orderDetail); @@ -254,7 +254,7 @@ public class TransactionHandlerTest extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - Order order = getModel1Factory().createOrder(); + Order order = getModel1Factory().createPurchaseOrder(); OrderDetail orderDetail = getModel1Factory().createOrderDetail(); order.getOrderDetails().add(orderDetail); @@ -325,7 +325,7 @@ public class TransactionHandlerTest extends AbstractCDOTest CDOSession session = openSession(); CDOTransaction transaction = session.openTransaction(); - Order order = getModel1Factory().createOrder(); + Order order = getModel1Factory().createPurchaseOrder(); final Company company = getModel1Factory().createCompany(); final CDOResource resource = transaction.getOrCreateResource("/test1"); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_246622_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_246622_Test.java index a5914333d4..f054859ce1 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_246622_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_246622_Test.java @@ -38,7 +38,7 @@ public class Bugzilla_246622_Test extends AbstractCDOTest CDOTransaction transaction1 = session.openTransaction(); CDOResource res = transaction1.createResource("/test1"); - Order order = getModel1Factory().createOrder(); + Order order = getModel1Factory().createPurchaseOrder(); OrderDetail orderDetail = getModel1Factory().createOrderDetail(); res.getContents().add(order); @@ -48,7 +48,7 @@ public class Bugzilla_246622_Test extends AbstractCDOTest assertEquals(CDOUtil.getCDOObject(order), CDOUtil.getCDOObject(orderDetail).cdoRevision().data().getContainerID()); - Order order2 = getModel1Factory().createOrder(); + Order order2 = getModel1Factory().createPurchaseOrder(); OrderDetail orderDetail2 = getModel1Factory().createOrderDetail(); order2.getOrderDetails().add(orderDetail2); @@ -70,7 +70,7 @@ public class Bugzilla_246622_Test extends AbstractCDOTest assertEquals(CDOUtil.getCDOObject(order2).cdoID(), CDOUtil.getCDOObject(orderDetail2).cdoRevision().data() .getContainerID()); - Order order3 = getModel1Factory().createOrder(); + Order order3 = getModel1Factory().createPurchaseOrder(); res.getContents().add(order3); order3.getOrderDetails().add(orderDetail2); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_251544_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_251544_Test.java index fc56d13ef9..23a267b3d5 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_251544_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_251544_Test.java @@ -37,7 +37,7 @@ public class Bugzilla_251544_Test extends AbstractCDOTest CDOTransaction transaction = session.openTransaction(); CDOResource resource = transaction.createResource("/my/resource"); - Order order1 = getModel1Factory().createOrder(); + Order order1 = getModel1Factory().createPurchaseOrder(); OrderDetail orderDetail = getModel1Factory().createOrderDetail(); Product1 product = getModel1Factory().createProduct1(); product.setName("product"); @@ -64,7 +64,7 @@ public class Bugzilla_251544_Test extends AbstractCDOTest CDOTransaction transaction = session.openTransaction(); CDOResource resource = transaction.createResource("/my/resource"); - Order order1 = getModel1Factory().createOrder(); + Order order1 = getModel1Factory().createPurchaseOrder(); OrderDetail orderDetail = getModel1Factory().createOrderDetail(); EList<OrderDetail> orderDetails = order1.getOrderDetails(); order1.getOrderDetails().add(orderDetail); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_258933_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_258933_Test.java index 2ecef5769d..7ff1d6d43a 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_258933_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_258933_Test.java @@ -152,7 +152,7 @@ public class Bugzilla_258933_Test extends AbstractCDOTest public void testBugzilla_258278_List() throws Exception { { - Order order = getModel1Factory().createOrder(); + Order order = getModel1Factory().createPurchaseOrder(); assertEquals(false, order.eIsSet(getModel1Package().getOrder_OrderDetails())); CDOSession session = openSession(); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_283985_CDOTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_283985_CDOTest.java index 016c2c6f75..0c831c886e 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_283985_CDOTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_283985_CDOTest.java @@ -170,10 +170,10 @@ public class Bugzilla_283985_CDOTest extends AbstractCDOTest r1.getContents().clear(); // Set things up - Model1Factory factory = Model1Factory.eINSTANCE; - Order order1 = factory.createOrder(); - Order order2 = factory.createOrder(); - Order order3 = factory.createOrder(); + Model1Factory factory = getModel1Factory(); + Order order1 = factory.createPurchaseOrder(); + Order order2 = factory.createPurchaseOrder(); + Order order3 = factory.createPurchaseOrder(); OrderDetail detail1 = factory.createOrderDetail(); OrderDetail detail2 = factory.createOrderDetail(); OrderDetail detail3 = factory.createOrderDetail(); @@ -353,9 +353,9 @@ public class Bugzilla_283985_CDOTest extends AbstractCDOTest r1.getContents().clear(); // Set things up - Model1Factory factory = Model1Factory.eINSTANCE; - Order order1 = factory.createOrder(); - Order order2 = factory.createOrder(); + Model1Factory factory = getModel1Factory(); + Order order1 = factory.createPurchaseOrder(); + Order order2 = factory.createPurchaseOrder(); OrderDetail detail1 = factory.createOrderDetail(); r1.getContents().add(order1); r1.getContents().add(order2); @@ -420,9 +420,9 @@ public class Bugzilla_283985_CDOTest extends AbstractCDOTest r1.getContents().clear(); // Set things up - Model1Factory factory = Model1Factory.eINSTANCE; - Order order1 = factory.createOrder(); - Order order2 = factory.createOrder(); + Model1Factory factory = getModel1Factory(); + Order order1 = factory.createPurchaseOrder(); + Order order2 = factory.createPurchaseOrder(); OrderDetail detail1 = factory.createOrderDetail(); order1.getOrderDetails().add(detail1); r1.getContents().add(order1); @@ -476,9 +476,9 @@ public class Bugzilla_283985_CDOTest extends AbstractCDOTest r1.getContents().clear(); // Set things up - Model1Factory factory = Model1Factory.eINSTANCE; - Order order1 = factory.createOrder(); - Order order2 = factory.createOrder(); + Model1Factory factory = getModel1Factory(); + Order order1 = factory.createPurchaseOrder(); + Order order2 = factory.createPurchaseOrder(); OrderDetail detail1 = factory.createOrderDetail(); r1.getContents().add(order1); r1.getContents().add(order2); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_283985_CDOTest2.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_283985_CDOTest2.java index 7b7129cebc..60e2a3d8a9 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_283985_CDOTest2.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_283985_CDOTest2.java @@ -14,7 +14,6 @@ package org.eclipse.emf.cdo.tests.bugzilla; import org.eclipse.emf.cdo.eresource.CDOResource; import org.eclipse.emf.cdo.session.CDOSession; import org.eclipse.emf.cdo.tests.AbstractCDOTest; -import org.eclipse.emf.cdo.tests.model1.Model1Factory; import org.eclipse.emf.cdo.tests.model1.Order; import org.eclipse.emf.cdo.tests.model1.OrderDetail; import org.eclipse.emf.cdo.transaction.CDOTransaction; @@ -35,14 +34,12 @@ public class Bugzilla_283985_CDOTest2 extends AbstractCDOTest { super.setUp(); - Model1Factory factory = Model1Factory.eINSTANCE; - - order1 = factory.createOrder(); - order2 = factory.createOrder(); - detail1 = factory.createOrderDetail(); - detail2 = factory.createOrderDetail(); - detail3 = factory.createOrderDetail(); - detail4 = factory.createOrderDetail(); + order1 = getModel1Factory().createPurchaseOrder(); + order2 = getModel1Factory().createPurchaseOrder(); + detail1 = getModel1Factory().createOrderDetail(); + detail2 = getModel1Factory().createOrderDetail(); + detail3 = getModel1Factory().createOrderDetail(); + detail4 = getModel1Factory().createOrderDetail(); order1.getOrderDetails().add(detail1); order1.getOrderDetails().add(detail2); @@ -91,7 +88,7 @@ public class Bugzilla_283985_CDOTest2 extends AbstractCDOTest order2 = (Order)r1.getContents().get(1); // lookup detail object in new transaction - detail1 = (OrderDetail)tx.getObject(CDOUtil.getCDOObject(detail1).cdoID()); + detail1 = (OrderDetail)CDOUtil.getEObject(tx.getObject(CDOUtil.getCDOObject(detail1).cdoID())); boolean contains1 = order1.getOrderDetails().contains(detail1); boolean contains2 = order2.getOrderDetails().contains(detail1); @@ -147,7 +144,7 @@ public class Bugzilla_283985_CDOTest2 extends AbstractCDOTest CDOResource r1 = tx.getResource("/r1"); order1 = (Order)r1.getContents().get(0); order2 = (Order)r1.getContents().get(1); - detail1 = (OrderDetail)tx.getObject(CDOUtil.getCDOObject(detail1).cdoID()); + detail1 = (OrderDetail)CDOUtil.getEObject(tx.getObject(CDOUtil.getCDOObject(detail1).cdoID())); boolean contains1 = order1.getOrderDetails().contains(detail1); boolean contains2 = order2.getOrderDetails().contains(detail1); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_283985_SavePointTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_283985_SavePointTest.java index 8d8a1b9349..5cad971271 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_283985_SavePointTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_283985_SavePointTest.java @@ -44,10 +44,10 @@ public class Bugzilla_283985_SavePointTest extends AbstractCDOTest { super.setUp(); - Model1Factory factory = Model1Factory.eINSTANCE; + Model1Factory factory = getModel1Factory(); - order1 = factory.createOrder(); - order2 = factory.createOrder(); + order1 = factory.createPurchaseOrder(); + order2 = factory.createPurchaseOrder(); detail1 = factory.createOrderDetail(); detail2 = factory.createOrderDetail(); detail3 = factory.createOrderDetail(); @@ -98,13 +98,13 @@ public class Bugzilla_283985_SavePointTest extends AbstractCDOTest order1.getOrderDetails().remove(detail1); assertTransient(detail1); - assertTrue(sp.getDetachedObjects().containsValue(detail1)); + assertTrue(sp.getDetachedObjects().containsValue(CDOUtil.getCDOObject(detail1))); sp = (InternalCDOSavepoint)transaction.setSavepoint(); - assertTrue(sp.getPreviousSavepoint().getDetachedObjects().containsValue(detail1)); + assertTrue(sp.getPreviousSavepoint().getDetachedObjects().containsValue(CDOUtil.getCDOObject(detail1))); order1.getOrderDetails().add(detail1); - assertTrue(sp.getReattachedObjects().containsValue(detail1)); + assertTrue(sp.getReattachedObjects().containsValue(CDOUtil.getCDOObject(detail1))); assertDirty(detail1, transaction); sp.rollback(); @@ -148,16 +148,16 @@ public class Bugzilla_283985_SavePointTest extends AbstractCDOTest public void test4() { CDOID id = CDOUtil.getCDOObject(detail1).cdoID(); - assertSame(transaction.getObject(id), detail1); + assertSame(transaction.getObject(id), CDOUtil.getCDOObject(detail1)); // Detach order1.getOrderDetails().remove(detail1); // And re-attach order1.getOrderDetails().add(detail1); - assertSame(transaction.getObject(id), detail1); + assertSame(transaction.getObject(id), CDOUtil.getCDOObject(detail1)); transaction.rollback(); - assertSame(transaction.getObject(id), detail1); + assertSame(transaction.getObject(id), CDOUtil.getCDOObject(detail1)); } } diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_293283_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_293283_Test.java index 6df8873883..7b7cb46a6f 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_293283_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_293283_Test.java @@ -3,7 +3,6 @@ package org.eclipse.emf.cdo.tests.bugzilla; import org.eclipse.emf.cdo.eresource.CDOResource; import org.eclipse.emf.cdo.session.CDOSession; import org.eclipse.emf.cdo.tests.AbstractCDOTest; -import org.eclipse.emf.cdo.tests.model1.Model1Factory; import org.eclipse.emf.cdo.tests.model1.Order; import org.eclipse.emf.cdo.tests.model1.OrderDetail; import org.eclipse.emf.cdo.transaction.CDOTransaction; @@ -14,7 +13,7 @@ import org.eclipse.emf.cdo.transaction.CDOTransaction; * 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: * Caspar De Groot - initial API and implementation */ @@ -42,10 +41,9 @@ public class Bugzilla_293283_Test extends AbstractCDOTest CDOResource r1 = tx.getOrCreateResource("/r1"); //$NON-NLS-1$ r1.getContents().clear(); - Model1Factory factory = Model1Factory.eINSTANCE; - order1 = factory.createOrder(); - OrderDetail detail1 = factory.createOrderDetail(); - OrderDetail detail2 = factory.createOrderDetail(); + order1 = getModel1Factory().createPurchaseOrder(); + OrderDetail detail1 = getModel1Factory().createOrderDetail(); + OrderDetail detail2 = getModel1Factory().createOrderDetail(); order1.getOrderDetails().add(detail1); order1.getOrderDetails().add(detail2); r1.getContents().add(order1); @@ -99,7 +97,7 @@ public class Bugzilla_293283_Test extends AbstractCDOTest { case ADD: { - OrderDetail newDetail = Model1Factory.eINSTANCE.createOrderDetail(); + OrderDetail newDetail = getModel1Factory().createOrderDetail(); order1.getOrderDetails().add(3, newDetail); break; } @@ -122,7 +120,7 @@ public class Bugzilla_293283_Test extends AbstractCDOTest case SET: { - OrderDetail newDetail = Model1Factory.eINSTANCE.createOrderDetail(); + OrderDetail newDetail = getModel1Factory().createOrderDetail(); order1.getOrderDetails().set(3, newDetail); break; } diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_294859_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_294859_Test.java index c347a8d69f..ae0771fcc9 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_294859_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_294859_Test.java @@ -19,7 +19,6 @@ import org.eclipse.emf.cdo.eresource.CDOResource; import org.eclipse.emf.cdo.session.CDOSession; import org.eclipse.emf.cdo.tests.AbstractCDOTest; import org.eclipse.emf.cdo.tests.model1.Company; -import org.eclipse.emf.cdo.tests.model1.Model1Factory; import org.eclipse.emf.cdo.tests.model1.PurchaseOrder; import org.eclipse.emf.cdo.transaction.CDOTransaction; import org.eclipse.emf.cdo.util.CDOUtil; @@ -52,9 +51,9 @@ public class Bugzilla_294859_Test extends AbstractCDOTest CDOResource r1 = tx.createResource(RESOURCE_NAME); - Company company1 = Model1Factory.eINSTANCE.createCompany(); - Company company2 = Model1Factory.eINSTANCE.createCompany(); - PurchaseOrder purchaseOrder = Model1Factory.eINSTANCE.createPurchaseOrder(); + Company company1 = getModel1Factory().createCompany(); + Company company2 = getModel1Factory().createCompany(); + PurchaseOrder purchaseOrder = getModel1Factory().createPurchaseOrder(); company1.getPurchaseOrders().add(purchaseOrder); r1.getContents().add(company1); r1.getContents().add(company2); @@ -83,7 +82,7 @@ public class Bugzilla_294859_Test extends AbstractCDOTest assertNotNull(revDelta); assertTrue(revDelta.getFeatureDeltas().size() == 1); CDOFeatureDelta featDelta = revDelta.getFeatureDeltas().get(0); - EAttribute eAttr = Model1Factory.eINSTANCE.getModel1Package().getPurchaseOrder_Date(); + EAttribute eAttr = getModel1Factory().getModel1Package().getPurchaseOrder_Date(); assertTrue(featDelta instanceof CDOSetFeatureDelta); CDOSetFeatureDelta setFeatDelta = (CDOSetFeatureDelta)featDelta; assertSame(eAttr, setFeatDelta.getFeature()); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_302233_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_302233_Test.java index fd56639ae4..b58389854d 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_302233_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_302233_Test.java @@ -33,7 +33,7 @@ public class Bugzilla_302233_Test extends AbstractCDOTest { public void testUnset() throws Exception { - Order order = getModel1Factory().createOrder(); + Order order = getModel1Factory().createPurchaseOrder(); EStructuralFeature feature = getModel1Package().getOrder_OrderDetails(); assertEquals(false, order.eIsSet(feature)); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_302414_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_302414_Test.java index c0cbc39acb..79b757a933 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_302414_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_302414_Test.java @@ -14,7 +14,6 @@ import org.eclipse.emf.cdo.eresource.CDOResource; import org.eclipse.emf.cdo.session.CDOSession; import org.eclipse.emf.cdo.tests.AbstractCDOTest; import org.eclipse.emf.cdo.tests.model1.Company; -import org.eclipse.emf.cdo.tests.model1.Model1Factory; import org.eclipse.emf.cdo.tests.model1.PurchaseOrder; import org.eclipse.emf.cdo.transaction.CDOTransaction; import org.eclipse.emf.cdo.util.CommitException; @@ -34,22 +33,22 @@ public class Bugzilla_302414_Test extends AbstractCDOTest CDOTransaction tx = session.openTransaction(); CDOResource r1 = tx.createResource("/r1"); //$NON-NLS-1$ - Company company = Model1Factory.eINSTANCE.createCompany(); + Company company = getModel1Factory().createCompany(); r1.getContents().add(company); tx.commit(); List<PurchaseOrder> list = company.getPurchaseOrders(); - PurchaseOrder foo = Model1Factory.eINSTANCE.createPurchaseOrder(); + PurchaseOrder foo = getModel1Factory().createPurchaseOrder(); list.add(foo); list.remove(foo); - PurchaseOrder bar = Model1Factory.eINSTANCE.createPurchaseOrder(); + PurchaseOrder bar = getModel1Factory().createPurchaseOrder(); list.add(bar); for (int i = 0; i < 10; i++) { - company.getPurchaseOrders().add(Model1Factory.eINSTANCE.createPurchaseOrder()); + company.getPurchaseOrders().add(getModel1Factory().createPurchaseOrder()); } try @@ -72,7 +71,7 @@ public class Bugzilla_302414_Test extends AbstractCDOTest CDOTransaction tx = session.openTransaction(); CDOResource r1 = tx.createResource("/r1"); //$NON-NLS-1$ - Company company = Model1Factory.eINSTANCE.createCompany(); + Company company = getModel1Factory().createCompany(); r1.getContents().add(company); tx.commit(); @@ -82,8 +81,8 @@ public class Bugzilla_302414_Test extends AbstractCDOTest { for (int i = 0; i < 20; i++) { - PurchaseOrder foo1 = Model1Factory.eINSTANCE.createPurchaseOrder(); - PurchaseOrder foo2 = Model1Factory.eINSTANCE.createPurchaseOrder(); + PurchaseOrder foo1 = getModel1Factory().createPurchaseOrder(); + PurchaseOrder foo2 = getModel1Factory().createPurchaseOrder(); list.add(foo1); list.add(foo2); list.remove(foo1); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_318844_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_318844_Test.java index 6f8af90346..51e7903eb8 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_318844_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_318844_Test.java @@ -14,7 +14,6 @@ import org.eclipse.emf.cdo.eresource.CDOResource; import org.eclipse.emf.cdo.session.CDOSession; import org.eclipse.emf.cdo.tests.AbstractCDOTest; import org.eclipse.emf.cdo.tests.TestAdapter; -import org.eclipse.emf.cdo.tests.model1.Model1Factory; import org.eclipse.emf.cdo.tests.model1.PurchaseOrder; import org.eclipse.emf.cdo.tests.model1.Supplier; import org.eclipse.emf.cdo.transaction.CDOTransaction; @@ -38,14 +37,14 @@ public class Bugzilla_318844_Test extends AbstractCDOTest CDOTransaction tx = session.openTransaction(); CDOResource r1 = tx.createResource("/r1"); //$NON-NLS-1$ - PurchaseOrder po1 = Model1Factory.eINSTANCE.createPurchaseOrder(); + PurchaseOrder po1 = getModel1Factory().createPurchaseOrder(); po1.setDate(new Date()); r1.getContents().add(po1); tx.commit(); // Create a new supplier but don't commit it - Supplier supplier = Model1Factory.eINSTANCE.createSupplier(); + Supplier supplier = getModel1Factory().createSupplier(); r1.getContents().add(supplier); // Create a reference to po1 but don't commit it diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_318876_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_318876_Test.java index 69ddbed795..f393bd3406 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_318876_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_318876_Test.java @@ -14,7 +14,6 @@ import org.eclipse.emf.cdo.CDOState; import org.eclipse.emf.cdo.eresource.CDOResource; import org.eclipse.emf.cdo.session.CDOSession; import org.eclipse.emf.cdo.tests.AbstractCDOTest; -import org.eclipse.emf.cdo.tests.model1.Model1Factory; import org.eclipse.emf.cdo.tests.model1.PurchaseOrder; import org.eclipse.emf.cdo.tests.model1.Supplier; import org.eclipse.emf.cdo.transaction.CDOTransaction; @@ -40,11 +39,11 @@ public class Bugzilla_318876_Test extends AbstractCDOTest CDOTransaction tx = session.openTransaction(); CDOResource r1 = tx.createResource("/r1"); //$NON-NLS-1$ - PurchaseOrder po1 = Model1Factory.eINSTANCE.createPurchaseOrder(); + PurchaseOrder po1 = getModel1Factory().createPurchaseOrder(); po1.setDate(new Date()); r1.getContents().add(po1); - Supplier supplier = Model1Factory.eINSTANCE.createSupplier(); + Supplier supplier = getModel1Factory().createSupplier(); supplier.getPurchaseOrders().add(po1); r1.getContents().add(supplier); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_321699_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_321699_Test.java index 636043dcd8..8480e0cb3c 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_321699_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_321699_Test.java @@ -16,7 +16,6 @@ import org.eclipse.emf.cdo.eresource.CDOResource; 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.transaction.CDOTransaction; import org.eclipse.emf.cdo.util.CDOUtil; import org.eclipse.emf.cdo.util.CommitException; @@ -42,7 +41,7 @@ public class Bugzilla_321699_Test extends AbstractCDOTest msg("Post-commit ID of resource = " + resource.cdoID()); - Customer customer = Model1Factory.eINSTANCE.createCustomer(); + Customer customer = getModel1Factory().createCustomer(); resource.getContents().add(customer); CDOID customerID = CDOUtil.getCDOObject(customer).cdoID(); msg("Pre-commit ID of customer = " + customerID); @@ -51,7 +50,7 @@ public class Bugzilla_321699_Test extends AbstractCDOTest msg("Object fetched for customerID = " + fetchedObject); - assertSame(customer, fetchedObject); + assertSame(CDOUtil.getEObject(customer), CDOUtil.getEObject(fetchedObject)); tx.close(); session.close(); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_328790_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_328790_Test.java index c4d51e68ea..b164bf0676 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_328790_Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_328790_Test.java @@ -13,7 +13,6 @@ package org.eclipse.emf.cdo.tests.bugzilla; import org.eclipse.emf.cdo.eresource.CDOResource; import org.eclipse.emf.cdo.session.CDOSession; import org.eclipse.emf.cdo.tests.AbstractCDOTest; -import org.eclipse.emf.cdo.tests.legacy.model1.Model1Factory; import org.eclipse.emf.cdo.transaction.CDOTransaction; import org.eclipse.emf.cdo.util.CommitException; @@ -37,7 +36,7 @@ public class Bugzilla_328790_Test extends AbstractCDOTest CDOTransaction tx = session.openTransaction(resourceSet); Resource resource = resourceSet.createResource(URI.createURI("cdo://myUri")); - EObject object = Model1Factory.eINSTANCE.createAddress(); + EObject object = getModel1Factory().createAddress(); resource.getContents().add(object); assertTrue(resource.isLoaded()); @@ -56,7 +55,7 @@ public class Bugzilla_328790_Test extends AbstractCDOTest CDOTransaction tx = session.openTransaction(); CDOResource resource = tx.createResource("/myUri"); - EObject object = Model1Factory.eINSTANCE.createAddress(); + EObject object = getModel1Factory().createAddress(); resource.getContents().add(object); assertTrue(resource.isLoaded()); |