diff options
author | Eike Stepper | 2016-10-09 07:25:18 +0000 |
---|---|---|
committer | Eike Stepper | 2016-10-09 07:25:18 +0000 |
commit | 09c0c3d136e607f3f4f8a949e743bd15cd0332a2 (patch) | |
tree | 6dc5a7680d8c4f1dca1ef69feb4812077353d1c0 /plugins/org.eclipse.emf.cdo.tests.model1 | |
parent | 2ffd84347afa6f75edf142245c2ca618750b6889 (diff) | |
download | cdo-09c0c3d136e607f3f4f8a949e743bd15cd0332a2.tar.gz cdo-09c0c3d136e607f3f4f8a949e743bd15cd0332a2.tar.xz cdo-09c0c3d136e607f3f4f8a949e743bd15cd0332a2.zip |
[Releng] Add an m:n relationship to model1.ecore
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.tests.model1')
14 files changed, 337 insertions, 35 deletions
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 fc6c469837..2352b09a8e 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/model/model1.ecore +++ b/plugins/org.eclipse.emf.cdo.tests.model1/model/model1.ecore @@ -52,11 +52,15 @@ <eStructuralFeatures xsi:type="ecore:EAttribute" name="date" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDate"/> <eStructuralFeatures xsi:type="ecore:EReference" name="supplier" lowerBound="1" eType="#//Supplier" eOpposite="#//Supplier/purchaseOrders"/> + <eStructuralFeatures xsi:type="ecore:EReference" name="salesOrders" upperBound="-1" + eType="#//SalesOrder" eOpposite="#//SalesOrder/purchaseOrders"/> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="SalesOrder" eSuperTypes="#//Order"> <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/> <eStructuralFeatures xsi:type="ecore:EReference" name="customer" lowerBound="1" eType="#//Customer" eOpposite="#//Customer/salesOrders"/> + <eStructuralFeatures xsi:type="ecore:EReference" name="purchaseOrders" upperBound="-1" + eType="#//PurchaseOrder" eOpposite="#//PurchaseOrder/salesOrders"/> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="Category"> <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/model/model1.genmodel b/plugins/org.eclipse.emf.cdo.tests.model1/model/model1.genmodel index 24eb5368c3..809b99d2a5 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/model/model1.genmodel +++ b/plugins/org.eclipse.emf.cdo.tests.model1/model/model1.genmodel @@ -48,10 +48,12 @@ <genClasses ecoreClass="model1.ecore#//PurchaseOrder"> <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model1.ecore#//PurchaseOrder/date"/> <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model1.ecore#//PurchaseOrder/supplier"/> + <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model1.ecore#//PurchaseOrder/salesOrders"/> </genClasses> <genClasses ecoreClass="model1.ecore#//SalesOrder"> <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model1.ecore#//SalesOrder/id"/> <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model1.ecore#//SalesOrder/customer"/> + <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model1.ecore#//SalesOrder/purchaseOrders"/> </genClasses> <genClasses ecoreClass="model1.ecore#//Category"> <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model1.ecore#//Category/name"/> diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/model/model1.legacy.genmodel b/plugins/org.eclipse.emf.cdo.tests.model1/model/model1.legacy.genmodel index 3e2a768064..eb046542ae 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/model/model1.legacy.genmodel +++ b/plugins/org.eclipse.emf.cdo.tests.model1/model/model1.legacy.genmodel @@ -46,10 +46,12 @@ <genClasses ecoreClass="model1.ecore#//PurchaseOrder"> <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model1.ecore#//PurchaseOrder/date"/> <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model1.ecore#//PurchaseOrder/supplier"/> + <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model1.ecore#//PurchaseOrder/salesOrders"/> </genClasses> <genClasses ecoreClass="model1.ecore#//SalesOrder"> <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model1.ecore#//SalesOrder/id"/> <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model1.ecore#//SalesOrder/customer"/> + <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model1.ecore#//SalesOrder/purchaseOrders"/> </genClasses> <genClasses ecoreClass="model1.ecore#//Category"> <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model1.ecore#//Category/name"/> diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/plugin.xml b/plugins/org.eclipse.emf.cdo.tests.model1/plugin.xml index 4b81a6128f..64f4f366c2 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/plugin.xml +++ b/plugins/org.eclipse.emf.cdo.tests.model1/plugin.xml @@ -20,12 +20,4 @@ genModel = "model/model1.genmodel"/> </extension> - - <extension point="org.eclipse.emf.ecore.generated_package"> - <!-- @generated model1.legacy --> - <package - uri="http://www.eclipse.org/emf/CDO/tests/model1/1.0.0" - class="org.eclipse.emf.cdo.tests.model1.legacy.Model1Package"/> - </extension> - </plugin> 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 4f10a083bd..547205d004 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 @@ -457,13 +457,22 @@ public interface Model1Package extends EPackage int PURCHASE_ORDER__SUPPLIER = ORDER_FEATURE_COUNT + 1; /** + * The feature id for the '<em><b>Sales Orders</b></em>' reference list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int PURCHASE_ORDER__SALES_ORDERS = ORDER_FEATURE_COUNT + 2; + + /** * The number of structural features of the '<em>Purchase Order</em>' class. <!-- begin-user-doc --> <!-- end-user-doc * --> * * @generated * @ordered */ - int PURCHASE_ORDER_FEATURE_COUNT = ORDER_FEATURE_COUNT + 2; + int PURCHASE_ORDER_FEATURE_COUNT = ORDER_FEATURE_COUNT + 3; /** * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model1.impl.SalesOrderImpl <em>Sales Order</em>}' class. @@ -500,13 +509,22 @@ public interface Model1Package extends EPackage int SALES_ORDER__CUSTOMER = ORDER_FEATURE_COUNT + 1; /** + * The feature id for the '<em><b>Purchase Orders</b></em>' reference list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int SALES_ORDER__PURCHASE_ORDERS = ORDER_FEATURE_COUNT + 2; + + /** * The number of structural features of the '<em>Sales Order</em>' class. <!-- begin-user-doc --> <!-- end-user-doc * --> * * @generated * @ordered */ - int SALES_ORDER_FEATURE_COUNT = ORDER_FEATURE_COUNT + 2; + int SALES_ORDER_FEATURE_COUNT = ORDER_FEATURE_COUNT + 3; /** * The feature id for the '<em><b>Name</b></em>' attribute. @@ -788,12 +806,23 @@ public interface Model1Package extends EPackage EReference getPurchaseOrder_Supplier(); /** - * 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 + * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.tests.model1.PurchaseOrder#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.PurchaseOrder#getSalesOrders() + * @see #getPurchaseOrder() * @generated */ + EReference getPurchaseOrder_SalesOrders(); + + /** + * 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 + */ EClass getOrderDetail(); /** @@ -1139,11 +1168,22 @@ public interface Model1Package extends EPackage EReference getSalesOrder_Customer(); /** - * 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. + * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.tests.model1.SalesOrder#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.SalesOrder#getPurchaseOrders() + * @see #getSalesOrder() * @generated */ + EReference getSalesOrder_PurchaseOrders(); + + /** + * 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 + */ Model1Factory getModel1Factory(); } // Model1Package 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 407248d845..66377dd35f 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 @@ -10,6 +10,8 @@ */ package org.eclipse.emf.cdo.tests.model1; +import org.eclipse.emf.common.util.EList; + import java.util.Date; /** @@ -21,6 +23,7 @@ import java.util.Date; * <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#getSalesOrders <em>Sales Orders</em>}</li> * </ul> * * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getPurchaseOrder() @@ -81,4 +84,22 @@ public interface PurchaseOrder extends Order */ void setSupplier(Supplier value); + /** + * 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#getPurchaseOrders <em>Purchase Orders</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#getPurchaseOrder_SalesOrders() + * @see org.eclipse.emf.cdo.tests.model1.SalesOrder#getPurchaseOrders + * @model opposite="purchaseOrders" + * @generated + */ + EList<SalesOrder> getSalesOrders(); + } // PurchaseOrder 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 0400f7d2fc..1942abcfb2 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 @@ -10,6 +10,8 @@ */ package org.eclipse.emf.cdo.tests.model1; +import org.eclipse.emf.common.util.EList; + /** * <!-- begin-user-doc --> A representation of the model object '<em><b>Sales Order</b></em>'. <!-- end-user-doc --> * @@ -19,6 +21,7 @@ package org.eclipse.emf.cdo.tests.model1; * <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#getPurchaseOrders <em>Purchase Orders</em>}</li> * </ul> * * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getSalesOrder() @@ -80,4 +83,22 @@ public interface SalesOrder extends Order */ void setCustomer(Customer value); + /** + * 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#getSalesOrders <em>Sales Orders</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#getSalesOrder_PurchaseOrders() + * @see org.eclipse.emf.cdo.tests.model1.PurchaseOrder#getSalesOrders + * @model opposite="salesOrders" + * @generated + */ + EList<PurchaseOrder> getPurchaseOrders(); + } // SalesOrder 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 546a604bb1..6631f50d6e 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 @@ -271,9 +271,19 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package } /** - * <!-- begin-user-doc --> <!-- end-user-doc --> + * <!-- begin-user-doc --> + * <!-- end-user-doc --> * @generated */ + public EReference getPurchaseOrder_SalesOrders() + { + return (EReference)purchaseOrderEClass.getEStructuralFeatures().get(2); + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * @generated + */ public EClass getOrderDetail() { return orderDetailEClass; @@ -578,9 +588,19 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package } /** - * <!-- begin-user-doc --> <!-- end-user-doc --> + * <!-- begin-user-doc --> + * <!-- end-user-doc --> * @generated */ + public EReference getSalesOrder_PurchaseOrders() + { + return (EReference)salesOrderEClass.getEStructuralFeatures().get(2); + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * @generated + */ public Model1Factory getModel1Factory() { return (Model1Factory)getEFactoryInstance(); @@ -638,10 +658,12 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package purchaseOrderEClass = createEClass(PURCHASE_ORDER); createEAttribute(purchaseOrderEClass, PURCHASE_ORDER__DATE); createEReference(purchaseOrderEClass, PURCHASE_ORDER__SUPPLIER); + createEReference(purchaseOrderEClass, PURCHASE_ORDER__SALES_ORDERS); salesOrderEClass = createEClass(SALES_ORDER); createEAttribute(salesOrderEClass, SALES_ORDER__ID); createEReference(salesOrderEClass, SALES_ORDER__CUSTOMER); + createEReference(salesOrderEClass, SALES_ORDER__PURCHASE_ORDERS); categoryEClass = createEClass(CATEGORY); createEAttribute(categoryEClass, CATEGORY__NAME); @@ -769,6 +791,9 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package initEReference(getPurchaseOrder_Supplier(), getSupplier(), getSupplier_PurchaseOrders(), "supplier", null, 1, 1, PurchaseOrder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getPurchaseOrder_SalesOrders(), getSalesOrder(), getSalesOrder_PurchaseOrders(), "salesOrders", null, + 0, -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); @@ -777,6 +802,9 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package initEReference(getSalesOrder_Customer(), getCustomer(), getCustomer_SalesOrders(), "customer", null, 1, 1, SalesOrder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getSalesOrder_PurchaseOrders(), getPurchaseOrder(), getPurchaseOrder_SalesOrders(), "purchaseOrders", + null, 0, -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, 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 7a4b96429f..742b2c6a88 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 @@ -12,8 +12,10 @@ package org.eclipse.emf.cdo.tests.model1.impl; import org.eclipse.emf.cdo.tests.model1.Model1Package; import org.eclipse.emf.cdo.tests.model1.PurchaseOrder; +import org.eclipse.emf.cdo.tests.model1.SalesOrder; import org.eclipse.emf.cdo.tests.model1.Supplier; +import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EClass; import java.util.Date; @@ -26,6 +28,7 @@ import java.util.Date; * <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#getSalesOrders <em>Sales Orders</em>}</li> * </ul> * * @generated @@ -87,4 +90,15 @@ public class PurchaseOrderImpl extends OrderImpl implements PurchaseOrder eSet(Model1Package.eINSTANCE.getPurchaseOrder_Supplier(), newSupplier); } + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @SuppressWarnings("unchecked") + public EList<SalesOrder> getSalesOrders() + { + return (EList<SalesOrder>)eGet(Model1Package.eINSTANCE.getPurchaseOrder_SalesOrders(), true); + } + } // PurchaseOrderImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/SalesOrderImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/SalesOrderImpl.java index 9e9edfe076..71229eaf19 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 @@ -12,8 +12,10 @@ package org.eclipse.emf.cdo.tests.model1.impl; import org.eclipse.emf.cdo.tests.model1.Customer; import org.eclipse.emf.cdo.tests.model1.Model1Package; +import org.eclipse.emf.cdo.tests.model1.PurchaseOrder; import org.eclipse.emf.cdo.tests.model1.SalesOrder; +import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EClass; /** @@ -24,6 +26,7 @@ import org.eclipse.emf.ecore.EClass; * <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#getPurchaseOrders <em>Purchase Orders</em>}</li> * </ul> * * @generated @@ -85,4 +88,15 @@ public class SalesOrderImpl extends OrderImpl implements SalesOrder eSet(Model1Package.eINSTANCE.getSalesOrder_Customer(), newCustomer); } + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @SuppressWarnings("unchecked") + public EList<PurchaseOrder> getPurchaseOrders() + { + return (EList<PurchaseOrder>)eGet(Model1Package.eINSTANCE.getSalesOrder_PurchaseOrders(), true); + } + } // SalesOrderImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/Model1Package.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/Model1Package.java index f6588589f0..4052da0c9d 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/Model1Package.java +++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/Model1Package.java @@ -406,13 +406,22 @@ public interface Model1Package extends EPackage, org.eclipse.emf.cdo.tests.model int PURCHASE_ORDER__SUPPLIER = ORDER_FEATURE_COUNT + 1; /** + * The feature id for the '<em><b>Sales Orders</b></em>' reference list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int PURCHASE_ORDER__SALES_ORDERS = ORDER_FEATURE_COUNT + 2; + + /** * The number of structural features of the '<em>Purchase Order</em>' class. <!-- begin-user-doc --> <!-- end-user-doc * --> * * @generated * @ordered */ - int PURCHASE_ORDER_FEATURE_COUNT = ORDER_FEATURE_COUNT + 2; + int PURCHASE_ORDER_FEATURE_COUNT = ORDER_FEATURE_COUNT + 3; /** * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model1.legacy.impl.SalesOrderImpl <em>Sales Order</em>}' class. @@ -449,13 +458,22 @@ public interface Model1Package extends EPackage, org.eclipse.emf.cdo.tests.model int SALES_ORDER__CUSTOMER = ORDER_FEATURE_COUNT + 1; /** + * The feature id for the '<em><b>Purchase Orders</b></em>' reference list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int SALES_ORDER__PURCHASE_ORDERS = ORDER_FEATURE_COUNT + 2; + + /** * The number of structural features of the '<em>Sales Order</em>' class. <!-- begin-user-doc --> <!-- end-user-doc * --> * * @generated * @ordered */ - int SALES_ORDER_FEATURE_COUNT = ORDER_FEATURE_COUNT + 2; + int SALES_ORDER_FEATURE_COUNT = ORDER_FEATURE_COUNT + 3; /** * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model1.legacy.impl.CategoryImpl <em>Category</em>}' class. @@ -945,12 +963,23 @@ public interface Model1Package extends EPackage, org.eclipse.emf.cdo.tests.model EReference getPurchaseOrder_Supplier(); /** - * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.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.model1.SalesOrder + * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.tests.model1.PurchaseOrder#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.PurchaseOrder#getSalesOrders() + * @see #getPurchaseOrder() * @generated */ + EReference getPurchaseOrder_SalesOrders(); + + /** + * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.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.model1.SalesOrder + * @generated + */ EClass getSalesOrder(); /** @@ -974,12 +1003,23 @@ public interface Model1Package extends EPackage, org.eclipse.emf.cdo.tests.model EReference getSalesOrder_Customer(); /** - * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.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.model1.Category + * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.tests.model1.SalesOrder#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.SalesOrder#getPurchaseOrders() + * @see #getSalesOrder() * @generated */ + EReference getSalesOrder_PurchaseOrders(); + + /** + * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.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.model1.Category + * @generated + */ EClass getCategory(); /** diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/Model1PackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/Model1PackageImpl.java index e64f9b41fe..f6dc40ed18 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/Model1PackageImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/Model1PackageImpl.java @@ -409,9 +409,19 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package } /** - * <!-- begin-user-doc --> <!-- end-user-doc --> + * <!-- begin-user-doc --> + * <!-- end-user-doc --> * @generated */ + public EReference getPurchaseOrder_SalesOrders() + { + return (EReference)purchaseOrderEClass.getEStructuralFeatures().get(2); + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * @generated + */ public EClass getSalesOrder() { return salesOrderEClass; @@ -436,9 +446,19 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package } /** - * <!-- begin-user-doc --> <!-- end-user-doc --> + * <!-- begin-user-doc --> + * <!-- end-user-doc --> * @generated */ + public EReference getSalesOrder_PurchaseOrders() + { + return (EReference)salesOrderEClass.getEStructuralFeatures().get(2); + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * @generated + */ public EClass getCategory() { return categoryEClass; @@ -641,10 +661,12 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package purchaseOrderEClass = createEClass(PURCHASE_ORDER); createEAttribute(purchaseOrderEClass, PURCHASE_ORDER__DATE); createEReference(purchaseOrderEClass, PURCHASE_ORDER__SUPPLIER); + createEReference(purchaseOrderEClass, PURCHASE_ORDER__SALES_ORDERS); salesOrderEClass = createEClass(SALES_ORDER); createEAttribute(salesOrderEClass, SALES_ORDER__ID); createEReference(salesOrderEClass, SALES_ORDER__CUSTOMER); + createEReference(salesOrderEClass, SALES_ORDER__PURCHASE_ORDERS); categoryEClass = createEClass(CATEGORY); createEAttribute(categoryEClass, CATEGORY__NAME); @@ -772,6 +794,9 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package initEReference(getPurchaseOrder_Supplier(), getSupplier(), getSupplier_PurchaseOrders(), "supplier", null, 1, 1, PurchaseOrder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getPurchaseOrder_SalesOrders(), getSalesOrder(), getSalesOrder_PurchaseOrders(), "salesOrders", null, + 0, -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); @@ -780,6 +805,9 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package initEReference(getSalesOrder_Customer(), getCustomer(), getCustomer_SalesOrders(), "customer", null, 1, 1, SalesOrder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getSalesOrder_PurchaseOrders(), getPurchaseOrder(), getPurchaseOrder_SalesOrders(), "purchaseOrders", + null, 0, -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, diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/PurchaseOrderImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/PurchaseOrderImpl.java index 0573d58756..0570eba5b0 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/PurchaseOrderImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/PurchaseOrderImpl.java @@ -11,15 +11,20 @@ package org.eclipse.emf.cdo.tests.model1.legacy.impl; import org.eclipse.emf.cdo.tests.model1.PurchaseOrder; +import org.eclipse.emf.cdo.tests.model1.SalesOrder; import org.eclipse.emf.cdo.tests.model1.Supplier; import org.eclipse.emf.cdo.tests.model1.legacy.Model1Package; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; +import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.impl.ENotificationImpl; +import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList; +import org.eclipse.emf.ecore.util.InternalEList; +import java.util.Collection; import java.util.Date; /** @@ -57,9 +62,19 @@ public class PurchaseOrderImpl extends OrderImpl implements PurchaseOrder protected Supplier supplier; /** - * <!-- begin-user-doc --> <!-- end-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 */ + protected EList<SalesOrder> salesOrders; + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * @generated + */ protected PurchaseOrderImpl() { super(); @@ -186,9 +201,25 @@ public class PurchaseOrderImpl extends OrderImpl implements PurchaseOrder } /** - * <!-- begin-user-doc --> <!-- end-user-doc --> + * <!-- begin-user-doc --> + * <!-- end-user-doc --> * @generated */ + public EList<SalesOrder> getSalesOrders() + { + if (salesOrders == null) + { + salesOrders = new EObjectWithInverseResolvingEList.ManyInverse<SalesOrder>(SalesOrder.class, this, + Model1Package.PURCHASE_ORDER__SALES_ORDERS, Model1Package.SALES_ORDER__PURCHASE_ORDERS); + } + return salesOrders; + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * @generated + */ + @SuppressWarnings("unchecked") @Override public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) { @@ -201,6 +232,8 @@ public class PurchaseOrderImpl extends OrderImpl implements PurchaseOrder msgs); } return basicSetSupplier((Supplier)otherEnd, msgs); + case Model1Package.PURCHASE_ORDER__SALES_ORDERS: + return ((InternalEList<InternalEObject>)(InternalEList<?>)getSalesOrders()).basicAdd(otherEnd, msgs); } return super.eInverseAdd(otherEnd, featureID, msgs); } @@ -216,6 +249,8 @@ public class PurchaseOrderImpl extends OrderImpl implements PurchaseOrder { case Model1Package.PURCHASE_ORDER__SUPPLIER: return basicSetSupplier(null, msgs); + case Model1Package.PURCHASE_ORDER__SALES_ORDERS: + return ((InternalEList<?>)getSalesOrders()).basicRemove(otherEnd, msgs); } return super.eInverseRemove(otherEnd, featureID, msgs); } @@ -237,6 +272,8 @@ public class PurchaseOrderImpl extends OrderImpl implements PurchaseOrder return getSupplier(); } return basicGetSupplier(); + case Model1Package.PURCHASE_ORDER__SALES_ORDERS: + return getSalesOrders(); } return super.eGet(featureID, resolve, coreType); } @@ -245,6 +282,7 @@ public class PurchaseOrderImpl extends OrderImpl implements PurchaseOrder * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @SuppressWarnings("unchecked") @Override public void eSet(int featureID, Object newValue) { @@ -256,6 +294,10 @@ public class PurchaseOrderImpl extends OrderImpl implements PurchaseOrder case Model1Package.PURCHASE_ORDER__SUPPLIER: setSupplier((Supplier)newValue); return; + case Model1Package.PURCHASE_ORDER__SALES_ORDERS: + getSalesOrders().clear(); + getSalesOrders().addAll((Collection<? extends SalesOrder>)newValue); + return; } super.eSet(featureID, newValue); } @@ -275,6 +317,9 @@ public class PurchaseOrderImpl extends OrderImpl implements PurchaseOrder case Model1Package.PURCHASE_ORDER__SUPPLIER: setSupplier((Supplier)null); return; + case Model1Package.PURCHASE_ORDER__SALES_ORDERS: + getSalesOrders().clear(); + return; } super.eUnset(featureID); } @@ -292,6 +337,8 @@ public class PurchaseOrderImpl extends OrderImpl implements PurchaseOrder return DATE_EDEFAULT == null ? date != null : !DATE_EDEFAULT.equals(date); case Model1Package.PURCHASE_ORDER__SUPPLIER: return supplier != null; + case Model1Package.PURCHASE_ORDER__SALES_ORDERS: + return salesOrders != null && !salesOrders.isEmpty(); } return super.eIsSet(featureID); } diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/SalesOrderImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/SalesOrderImpl.java index 96a4b139b2..25a7c4df0b 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/SalesOrderImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/impl/SalesOrderImpl.java @@ -11,14 +11,20 @@ package org.eclipse.emf.cdo.tests.model1.legacy.impl; import org.eclipse.emf.cdo.tests.model1.Customer; +import org.eclipse.emf.cdo.tests.model1.PurchaseOrder; import org.eclipse.emf.cdo.tests.model1.SalesOrder; import org.eclipse.emf.cdo.tests.model1.legacy.Model1Package; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; +import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.impl.ENotificationImpl; +import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList; +import org.eclipse.emf.ecore.util.InternalEList; + +import java.util.Collection; /** * <!-- begin-user-doc --> An implementation of the model object '<em><b>Sales Order</b></em>'. <!-- end-user-doc --> @@ -28,6 +34,7 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl; * <ul> * <li>{@link org.eclipse.emf.cdo.tests.model1.legacy.impl.SalesOrderImpl#getId <em>Id</em>}</li> * <li>{@link org.eclipse.emf.cdo.tests.model1.legacy.impl.SalesOrderImpl#getCustomer <em>Customer</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model1.legacy.impl.SalesOrderImpl#getPurchaseOrders <em>Purchase Orders</em>}</li> * </ul> * * @generated @@ -63,9 +70,19 @@ public class SalesOrderImpl extends OrderImpl implements SalesOrder protected Customer customer; /** - * <!-- begin-user-doc --> <!-- end-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 */ + protected EList<PurchaseOrder> purchaseOrders; + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * @generated + */ protected SalesOrderImpl() { super(); @@ -192,9 +209,25 @@ public class SalesOrderImpl extends OrderImpl implements SalesOrder } /** - * <!-- begin-user-doc --> <!-- end-user-doc --> + * <!-- begin-user-doc --> + * <!-- end-user-doc --> * @generated */ + public EList<PurchaseOrder> getPurchaseOrders() + { + if (purchaseOrders == null) + { + purchaseOrders = new EObjectWithInverseResolvingEList.ManyInverse<PurchaseOrder>(PurchaseOrder.class, this, + Model1Package.SALES_ORDER__PURCHASE_ORDERS, Model1Package.PURCHASE_ORDER__SALES_ORDERS); + } + return purchaseOrders; + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * @generated + */ + @SuppressWarnings("unchecked") @Override public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) { @@ -207,6 +240,8 @@ public class SalesOrderImpl extends OrderImpl implements SalesOrder msgs); } return basicSetCustomer((Customer)otherEnd, msgs); + case Model1Package.SALES_ORDER__PURCHASE_ORDERS: + return ((InternalEList<InternalEObject>)(InternalEList<?>)getPurchaseOrders()).basicAdd(otherEnd, msgs); } return super.eInverseAdd(otherEnd, featureID, msgs); } @@ -222,6 +257,8 @@ public class SalesOrderImpl extends OrderImpl implements SalesOrder { case Model1Package.SALES_ORDER__CUSTOMER: return basicSetCustomer(null, msgs); + case Model1Package.SALES_ORDER__PURCHASE_ORDERS: + return ((InternalEList<?>)getPurchaseOrders()).basicRemove(otherEnd, msgs); } return super.eInverseRemove(otherEnd, featureID, msgs); } @@ -243,6 +280,8 @@ public class SalesOrderImpl extends OrderImpl implements SalesOrder return getCustomer(); } return basicGetCustomer(); + case Model1Package.SALES_ORDER__PURCHASE_ORDERS: + return getPurchaseOrders(); } return super.eGet(featureID, resolve, coreType); } @@ -251,6 +290,7 @@ public class SalesOrderImpl extends OrderImpl implements SalesOrder * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @SuppressWarnings("unchecked") @Override public void eSet(int featureID, Object newValue) { @@ -262,6 +302,10 @@ public class SalesOrderImpl extends OrderImpl implements SalesOrder case Model1Package.SALES_ORDER__CUSTOMER: setCustomer((Customer)newValue); return; + case Model1Package.SALES_ORDER__PURCHASE_ORDERS: + getPurchaseOrders().clear(); + getPurchaseOrders().addAll((Collection<? extends PurchaseOrder>)newValue); + return; } super.eSet(featureID, newValue); } @@ -281,6 +325,9 @@ public class SalesOrderImpl extends OrderImpl implements SalesOrder case Model1Package.SALES_ORDER__CUSTOMER: setCustomer((Customer)null); return; + case Model1Package.SALES_ORDER__PURCHASE_ORDERS: + getPurchaseOrders().clear(); + return; } super.eUnset(featureID); } @@ -298,6 +345,8 @@ public class SalesOrderImpl extends OrderImpl implements SalesOrder return id != ID_EDEFAULT; case Model1Package.SALES_ORDER__CUSTOMER: return customer != null; + case Model1Package.SALES_ORDER__PURCHASE_ORDERS: + return purchaseOrders != null && !purchaseOrders.isEmpty(); } return super.eIsSet(featureID); } |