diff options
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests')
32 files changed, 1100 insertions, 611 deletions
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 63e5b45c2a..e1615abb7e 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 @@ -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 */ @@ -33,6 +33,8 @@ import org.eclipse.emf.ecore.plugin.EcorePlugin; import java.util.Map; +//import org.eclipse.emf.cdo.tests.model1.*; + /** * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!-- end-user-doc --> * @generated @@ -210,10 +212,8 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory { VAT result = VAT.get(initialValue); if (result == null) - { throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); - } return result; } diff --git a/plugins/org.eclipse.emf.cdo.tests.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/model1/legacy/Model1Factory.java index a4901c00ea..b316195765 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/model1/legacy/Model1Factory.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation */ -package org.eclipse.emf.cdo.tests.legacy.model1; +package org.eclipse.emf.cdo.tests.model1.legacy; import org.eclipse.emf.cdo.tests.model1.Address; import org.eclipse.emf.cdo.tests.model1.Category; @@ -21,13 +21,17 @@ 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.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.legacy.model1.Model1Package + * <!-- begin-user-doc --> + * The <b>Factory</b> for the model. It provides a create method for each non-abstract class of the model. + * @extends org.eclipse.emf.cdo.tests.model1.Model1Factory + * <!-- end-user-doc --> + * @see org.eclipse.emf.cdo.tests.model1.legacy.Model1Package * @generated */ -public interface Model1Factory extends org.eclipse.emf.cdo.tests.model1.Model1Factory +public interface Model1Factory extends EFactory, org.eclipse.emf.cdo.tests.model1.Model1Factory { /** * <!-- begin-user-doc --> <!-- end-user-doc --> @@ -40,7 +44,7 @@ public interface Model1Factory extends org.eclipse.emf.cdo.tests.model1.Model1Fa * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ - Model1Factory eINSTANCE = org.eclipse.emf.cdo.tests.legacy.model1.impl.Model1FactoryImpl.init(); + Model1Factory eINSTANCE = org.eclipse.emf.cdo.tests.model1.legacy.impl.Model1FactoryImpl.init(); /** * Returns a new object of class '<em>Address</em>'. 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/model1/legacy/Model1Package.java index 0a2dc323f9..944fe9da99 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/model1/legacy/Model1Package.java @@ -8,11 +8,12 @@ * Contributors: * Eike Stepper - initial API and implementation */ -package org.eclipse.emf.cdo.tests.legacy.model1; +package org.eclipse.emf.cdo.tests.model1.legacy; import org.eclipse.emf.ecore.EAttribute; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EEnum; +import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.EReference; /** @@ -23,13 +24,14 @@ import org.eclipse.emf.ecore.EReference; * <li>each enum,</li> * <li>and each data type</li> * </ul> + * @extends org.eclipse.emf.cdo.tests.model1.Model1Package * <!-- end-user-doc --> - * @see org.eclipse.emf.cdo.tests.legacy.model1.Model1Factory + * @see org.eclipse.emf.cdo.tests.model1.legacy.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 +public interface Model1Package extends EPackage, org.eclipse.emf.cdo.tests.model1.Model1Package { /** * <!-- begin-user-doc --> <!-- end-user-doc --> @@ -46,7 +48,7 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa /** * The package namespace URI. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * * @generated NOT */ String eNS_URI = "http://www.eclipse.org/emf/CDO/tests/legacy/model1/1.0.0"; @@ -63,13 +65,13 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ - Model1Package eINSTANCE = org.eclipse.emf.cdo.tests.legacy.model1.impl.Model1PackageImpl.init(); + Model1Package eINSTANCE = org.eclipse.emf.cdo.tests.model1.legacy.impl.Model1PackageImpl.init(); /** - * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.AddressImpl <em>Address</em>}' class. + * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model1.legacy.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() + * @see org.eclipse.emf.cdo.tests.model1.legacy.impl.AddressImpl + * @see org.eclipse.emf.cdo.tests.model1.legacy.impl.Model1PackageImpl#getAddress() * @generated */ int ADDRESS = 0; @@ -107,10 +109,10 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa 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. + * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model1.legacy.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() + * @see org.eclipse.emf.cdo.tests.model1.legacy.impl.CompanyImpl + * @see org.eclipse.emf.cdo.tests.model1.legacy.impl.Model1PackageImpl#getCompany() * @generated */ int COMPANY = 1; @@ -193,10 +195,10 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa 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. + * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model1.legacy.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() + * @see org.eclipse.emf.cdo.tests.model1.legacy.impl.SupplierImpl + * @see org.eclipse.emf.cdo.tests.model1.legacy.impl.Model1PackageImpl#getSupplier() * @generated */ int SUPPLIER = 2; @@ -228,7 +230,7 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa /** * The feature id for the '<em><b>Purchase Orders</b></em>' reference list. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @generated * @ordered */ @@ -251,10 +253,10 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa 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. + * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model1.legacy.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() + * @see org.eclipse.emf.cdo.tests.model1.legacy.impl.CustomerImpl + * @see org.eclipse.emf.cdo.tests.model1.legacy.impl.Model1PackageImpl#getCustomer() * @generated */ int CUSTOMER = 3; @@ -308,10 +310,10 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa int CUSTOMER_FEATURE_COUNT = ADDRESS_FEATURE_COUNT + 2; /** - * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.OrderImpl <em>Order</em>}' class. + * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model1.legacy.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() + * @see org.eclipse.emf.cdo.tests.model1.legacy.impl.OrderImpl + * @see org.eclipse.emf.cdo.tests.model1.legacy.impl.Model1PackageImpl#getOrder() * @generated */ int ORDER = 4; @@ -334,10 +336,10 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa 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. + * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model1.legacy.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() + * @see org.eclipse.emf.cdo.tests.model1.legacy.impl.OrderDetailImpl + * @see org.eclipse.emf.cdo.tests.model1.legacy.impl.Model1PackageImpl#getOrderDetail() * @generated */ int ORDER_DETAIL = 5; @@ -369,17 +371,17 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa /** * The number of structural features of the '<em>Order Detail</em>' class. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @generated * @ordered */ 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. + * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model1.legacy.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() + * @see org.eclipse.emf.cdo.tests.model1.legacy.impl.PurchaseOrderImpl + * @see org.eclipse.emf.cdo.tests.model1.legacy.impl.Model1PackageImpl#getPurchaseOrder() * @generated */ int PURCHASE_ORDER = 6; @@ -412,17 +414,17 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa /** * 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; /** - * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.SalesOrderImpl <em>Sales Order</em>}' class. + * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model1.legacy.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() + * @see org.eclipse.emf.cdo.tests.model1.legacy.impl.SalesOrderImpl + * @see org.eclipse.emf.cdo.tests.model1.legacy.impl.Model1PackageImpl#getSalesOrder() * @generated */ int SALES_ORDER = 7; @@ -455,17 +457,17 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa /** * 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; /** - * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.CategoryImpl <em>Category</em>}' class. + * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model1.legacy.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() + * @see org.eclipse.emf.cdo.tests.model1.legacy.impl.CategoryImpl + * @see org.eclipse.emf.cdo.tests.model1.legacy.impl.Model1PackageImpl#getCategory() * @generated */ int CATEGORY = 8; @@ -505,10 +507,10 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa 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. + * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model1.legacy.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() + * @see org.eclipse.emf.cdo.tests.model1.legacy.impl.Product1Impl + * @see org.eclipse.emf.cdo.tests.model1.legacy.impl.Model1PackageImpl#getProduct1() * @generated */ int PRODUCT1 = 9; @@ -524,7 +526,7 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa /** * The feature id for the '<em><b>Order Details</b></em>' reference list. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @generated * @ordered */ @@ -564,10 +566,10 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa int PRODUCT1_FEATURE_COUNT = 5; /** - * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.OrderAddressImpl <em>Order Address</em>}' class. + * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model1.legacy.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() + * @see org.eclipse.emf.cdo.tests.model1.legacy.impl.OrderAddressImpl + * @see org.eclipse.emf.cdo.tests.model1.legacy.impl.Model1PackageImpl#getOrderAddress() * @generated */ int ORDER_ADDRESS = 10; @@ -640,17 +642,17 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa /** * The number of structural features of the '<em>Order Address</em>' class. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @generated * @ordered */ 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. + * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model1.legacy.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() + * @see org.eclipse.emf.cdo.tests.model1.legacy.impl.ProductToOrderImpl + * @see org.eclipse.emf.cdo.tests.model1.legacy.impl.Model1PackageImpl#getProductToOrder() * @generated */ int PRODUCT_TO_ORDER = 11; @@ -683,7 +685,7 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa /** * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model1.VAT <em>VAT</em>}' enum. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @see org.eclipse.emf.cdo.tests.legacy.model1.VAT * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.Model1PackageImpl#getVAT() * @generated @@ -693,7 +695,7 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa /** * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model1.Address <em>Address</em>}'. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @return the meta object for class '<em>Address</em>'. * @see org.eclipse.emf.cdo.tests.legacy.model1.Address * @generated @@ -701,30 +703,30 @@ 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>}'. + * 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.legacy.model1.Address#getName() + * @see org.eclipse.emf.cdo.tests.model1.Address#getName() * @see #getAddress() * @generated */ EAttribute getAddress_Name(); /** - * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model1.Address#getStreet <em>Street</em>}'. + * 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.legacy.model1.Address#getStreet() + * @see org.eclipse.emf.cdo.tests.model1.Address#getStreet() * @see #getAddress() * @generated */ EAttribute getAddress_Street(); /** - * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model1.Address#getCity <em>City</em>}'. + * 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.legacy.model1.Address#getCity() + * @see org.eclipse.emf.cdo.tests.model1.Address#getCity() * @see #getAddress() * @generated */ @@ -733,7 +735,7 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa /** * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model1.Company <em>Company</em>}'. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @return the meta object for class '<em>Company</em>'. * @see org.eclipse.emf.cdo.tests.legacy.model1.Company * @generated @@ -741,33 +743,33 @@ 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>}'. + * 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.legacy.model1.Company#getCategories() + * @see org.eclipse.emf.cdo.tests.model1.Company#getCategories() * @see #getCompany() * @generated */ 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>}'. + * 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.legacy.model1.Company#getSuppliers() + * @see org.eclipse.emf.cdo.tests.model1.Company#getSuppliers() * @see #getCompany() * @generated */ 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>}'. + * 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.legacy.model1.Company#getCustomers() + * @see org.eclipse.emf.cdo.tests.model1.Company#getCustomers() * @see #getCompany() * @generated */ @@ -777,7 +779,7 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa * Returns the meta object for the containment reference list ' * {@link org.eclipse.emf.cdo.tests.legacy.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.legacy.model1.Company#getPurchaseOrders() * @see #getCompany() @@ -786,21 +788,21 @@ 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>}'. + * 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.legacy.model1.Company#getSalesOrders() + * @see org.eclipse.emf.cdo.tests.model1.Company#getSalesOrders() * @see #getCompany() * @generated */ EReference getCompany_SalesOrders(); /** - * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model1.Supplier <em>Supplier</em>}'. + * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.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 + * @see org.eclipse.emf.cdo.tests.model1.Supplier * @generated */ EClass getSupplier(); @@ -809,7 +811,7 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa * Returns the meta object for the reference list ' * {@link org.eclipse.emf.cdo.tests.legacy.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.legacy.model1.Supplier#getPurchaseOrders() * @see #getSupplier() @@ -818,40 +820,40 @@ 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>}'. + * 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.legacy.model1.Supplier#isPreferred() + * @see org.eclipse.emf.cdo.tests.model1.Supplier#isPreferred() * @see #getSupplier() * @generated */ EAttribute getSupplier_Preferred(); /** - * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model1.Customer <em>Customer</em>}'. + * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.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 + * @see org.eclipse.emf.cdo.tests.model1.Customer * @generated */ EClass getCustomer(); /** - * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.tests.legacy.model1.Customer#getSalesOrders <em>Sales Orders</em>}'. + * 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.legacy.model1.Customer#getSalesOrders() + * @see org.eclipse.emf.cdo.tests.model1.Customer#getSalesOrders() * @see #getCustomer() * @generated */ 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>}'. + * 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.legacy.model1.Customer#getOrderByProduct() + * @see org.eclipse.emf.cdo.tests.model1.Customer#getOrderByProduct() * @see #getCustomer() * @generated */ @@ -860,7 +862,7 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa /** * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model1.Order <em>Order</em>}'. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @return the meta object for class '<em>Order</em>'. * @see org.eclipse.emf.cdo.tests.legacy.model1.Order * @generated @@ -868,170 +870,170 @@ 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>}'. + * 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.legacy.model1.Order#getOrderDetails() + * @see org.eclipse.emf.cdo.tests.model1.Order#getOrderDetails() * @see #getOrder() * @generated */ EReference getOrder_OrderDetails(); /** - * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model1.OrderDetail <em>Order Detail</em>}'. + * 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.legacy.model1.OrderDetail + * @see org.eclipse.emf.cdo.tests.model1.OrderDetail * @generated */ EClass getOrderDetail(); /** - * Returns the meta object for the container reference '{@link org.eclipse.emf.cdo.tests.legacy.model1.OrderDetail#getOrder <em>Order</em>}'. + * 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.legacy.model1.OrderDetail#getOrder() + * @see org.eclipse.emf.cdo.tests.model1.OrderDetail#getOrder() * @see #getOrderDetail() * @generated */ EReference getOrderDetail_Order(); /** - * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.tests.legacy.model1.OrderDetail#getProduct <em>Product</em>}'. + * 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.legacy.model1.OrderDetail#getProduct() + * @see org.eclipse.emf.cdo.tests.model1.OrderDetail#getProduct() * @see #getOrderDetail() * @generated */ EReference getOrderDetail_Product(); /** - * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model1.OrderDetail#getPrice <em>Price</em>}'. + * 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.legacy.model1.OrderDetail#getPrice() + * @see org.eclipse.emf.cdo.tests.model1.OrderDetail#getPrice() * @see #getOrderDetail() * @generated */ EAttribute getOrderDetail_Price(); /** - * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model1.PurchaseOrder <em>Purchase Order</em>}'. + * 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.legacy.model1.PurchaseOrder + * @see org.eclipse.emf.cdo.tests.model1.PurchaseOrder * @generated */ EClass getPurchaseOrder(); /** - * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model1.PurchaseOrder#getDate <em>Date</em>}'. + * 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.legacy.model1.PurchaseOrder#getDate() + * @see org.eclipse.emf.cdo.tests.model1.PurchaseOrder#getDate() * @see #getPurchaseOrder() * @generated */ EAttribute getPurchaseOrder_Date(); /** - * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.tests.legacy.model1.PurchaseOrder#getSupplier <em>Supplier</em>}'. + * 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.legacy.model1.PurchaseOrder#getSupplier() + * @see org.eclipse.emf.cdo.tests.model1.PurchaseOrder#getSupplier() * @see #getPurchaseOrder() * @generated */ EReference getPurchaseOrder_Supplier(); /** - * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model1.SalesOrder <em>Sales Order</em>}'. + * 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.legacy.model1.SalesOrder + * @see org.eclipse.emf.cdo.tests.model1.SalesOrder * @generated */ EClass getSalesOrder(); /** - * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model1.SalesOrder#getId <em>Id</em>}'. + * 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.legacy.model1.SalesOrder#getId() + * @see org.eclipse.emf.cdo.tests.model1.SalesOrder#getId() * @see #getSalesOrder() * @generated */ EAttribute getSalesOrder_Id(); /** - * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.tests.legacy.model1.SalesOrder#getCustomer <em>Customer</em>}'. + * 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.legacy.model1.SalesOrder#getCustomer() + * @see org.eclipse.emf.cdo.tests.model1.SalesOrder#getCustomer() * @see #getSalesOrder() * @generated */ EReference getSalesOrder_Customer(); /** - * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model1.Category <em>Category</em>}'. + * 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.legacy.model1.Category + * @see org.eclipse.emf.cdo.tests.model1.Category * @generated */ EClass getCategory(); /** - * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model1.Category#getName <em>Name</em>}'. + * 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.legacy.model1.Category#getName() + * @see org.eclipse.emf.cdo.tests.model1.Category#getName() * @see #getCategory() * @generated */ 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>}'. + * 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.legacy.model1.Category#getCategories() + * @see org.eclipse.emf.cdo.tests.model1.Category#getCategories() * @see #getCategory() * @generated */ 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>}'. + * 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.legacy.model1.Category#getProducts() + * @see org.eclipse.emf.cdo.tests.model1.Category#getProducts() * @see #getCategory() * @generated */ EReference getCategory_Products(); /** - * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model1.Product1 <em>Product1</em>}'. + * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.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 + * @see org.eclipse.emf.cdo.tests.model1.Product1 * @generated */ EClass getProduct1(); /** - * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model1.Product1#getName <em>Name</em>}'. + * 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.legacy.model1.Product1#getName() + * @see org.eclipse.emf.cdo.tests.model1.Product1#getName() * @see #getProduct1() * @generated */ @@ -1041,7 +1043,7 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa * Returns the meta object for the reference list ' * {@link org.eclipse.emf.cdo.tests.legacy.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.legacy.model1.Product1#getOrderDetails() * @see #getProduct1() @@ -1050,41 +1052,41 @@ 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>}'. + * 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.legacy.model1.Product1#getVat() + * @see org.eclipse.emf.cdo.tests.model1.Product1#getVat() * @see #getProduct1() * @generated */ EAttribute getProduct1_Vat(); /** - * Returns the meta object for the attribute list '{@link org.eclipse.emf.cdo.tests.legacy.model1.Product1#getOtherVATs <em>Other VA Ts</em>}'. + * Returns the meta object for the attribute list '{@link org.eclipse.emf.cdo.tests.model1.Product1#getOtherVATs <em>Other VA Ts</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute list '<em>Other VA Ts</em>'. - * @see org.eclipse.emf.cdo.tests.legacy.model1.Product1#getOtherVATs() + * @see org.eclipse.emf.cdo.tests.model1.Product1#getOtherVATs() * @see #getProduct1() * @generated */ EAttribute getProduct1_OtherVATs(); /** - * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model1.Product1#getDescription <em>Description</em>}'. + * 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.legacy.model1.Product1#getDescription() + * @see org.eclipse.emf.cdo.tests.model1.Product1#getDescription() * @see #getProduct1() * @generated */ EAttribute getProduct1_Description(); /** - * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model1.OrderAddress <em>Order Address</em>}'. + * 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.legacy.model1.OrderAddress + * @see org.eclipse.emf.cdo.tests.model1.OrderAddress * @generated */ EClass getOrderAddress(); @@ -1093,7 +1095,7 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa * Returns the meta object for the attribute ' * {@link org.eclipse.emf.cdo.tests.legacy.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.legacy.model1.OrderAddress#isTestAttribute() * @see #getOrderAddress() @@ -1107,8 +1109,8 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa * <!-- 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" - * valueType="org.eclipse.emf.cdo.tests.legacy.model1.SalesOrder" + * @model keyType="org.eclipse.emf.cdo.tests.model1.Product1" + * valueType="org.eclipse.emf.cdo.tests.model1.SalesOrder" * @generated */ EClass getProductToOrder(); @@ -1138,7 +1140,7 @@ public interface Model1Package extends org.eclipse.emf.cdo.tests.model1.Model1Pa /** * Returns the meta object for enum '{@link org.eclipse.emf.cdo.tests.legacy.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.legacy.model1.VAT * @generated 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/model1/legacy/impl/AddressImpl.java index dc41e00a26..77f22193b0 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/model1/legacy/impl/AddressImpl.java @@ -8,10 +8,10 @@ * Contributors: * Eike Stepper - initial API and implementation */ -package org.eclipse.emf.cdo.tests.legacy.model1.impl; +package org.eclipse.emf.cdo.tests.model1.legacy.impl; -import org.eclipse.emf.cdo.tests.legacy.model1.Model1Package; import org.eclipse.emf.cdo.tests.model1.Address; +import org.eclipse.emf.cdo.tests.model1.legacy.Model1Package; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EClass; @@ -23,9 +23,9 @@ 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.model1.legacy.impl.AddressImpl#getName <em>Name</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model1.legacy.impl.AddressImpl#getStreet <em>Street</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model1.legacy.impl.AddressImpl#getCity <em>City</em>}</li> * </ul> * </p> * 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/model1/legacy/impl/CategoryImpl.java index d4b2edcb03..1d31f4bbae 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/model1/legacy/impl/CategoryImpl.java @@ -8,11 +8,11 @@ * Contributors: * Eike Stepper - initial API and implementation */ -package org.eclipse.emf.cdo.tests.legacy.model1.impl; +package org.eclipse.emf.cdo.tests.model1.legacy.impl; -import org.eclipse.emf.cdo.tests.legacy.model1.Model1Package; import org.eclipse.emf.cdo.tests.model1.Category; import org.eclipse.emf.cdo.tests.model1.Product1; +import org.eclipse.emf.cdo.tests.model1.legacy.Model1Package; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; @@ -31,9 +31,9 @@ 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.model1.legacy.impl.CategoryImpl#getName <em>Name</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model1.legacy.impl.CategoryImpl#getCategories <em>Categories</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model1.legacy.impl.CategoryImpl#getProducts <em>Products</em>}</li> * </ul> * </p> * 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/model1/legacy/impl/CompanyImpl.java index 1a2677d157..fc565da799 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/model1/legacy/impl/CompanyImpl.java @@ -8,15 +8,15 @@ * Contributors: * Eike Stepper - initial API and implementation */ -package org.eclipse.emf.cdo.tests.legacy.model1.impl; +package org.eclipse.emf.cdo.tests.model1.legacy.impl; -import org.eclipse.emf.cdo.tests.legacy.model1.Model1Package; 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.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.NotificationChain; import org.eclipse.emf.common.util.EList; @@ -32,11 +32,11 @@ 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.model1.legacy.impl.CompanyImpl#getCategories <em>Categories</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model1.legacy.impl.CompanyImpl#getSuppliers <em>Suppliers</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model1.legacy.impl.CompanyImpl#getCustomers <em>Customers</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model1.legacy.impl.CompanyImpl#getPurchaseOrders <em>Purchase Orders</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model1.legacy.impl.CompanyImpl#getSalesOrders <em>Sales Orders</em>}</li> * </ul> * </p> * 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/model1/legacy/impl/CustomerImpl.java index 9d301ecb75..070af935f6 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/model1/legacy/impl/CustomerImpl.java @@ -8,12 +8,12 @@ * Contributors: * Eike Stepper - initial API and implementation */ -package org.eclipse.emf.cdo.tests.legacy.model1.impl; +package org.eclipse.emf.cdo.tests.model1.legacy.impl; -import org.eclipse.emf.cdo.tests.legacy.model1.Model1Package; import org.eclipse.emf.cdo.tests.model1.Customer; import org.eclipse.emf.cdo.tests.model1.Product1; import org.eclipse.emf.cdo.tests.model1.SalesOrder; +import org.eclipse.emf.cdo.tests.model1.legacy.Model1Package; import org.eclipse.emf.common.notify.NotificationChain; import org.eclipse.emf.common.util.EList; @@ -32,8 +32,8 @@ 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.model1.legacy.impl.CustomerImpl#getSalesOrders <em>Sales Orders</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model1.legacy.impl.CustomerImpl#getOrderByProduct <em>Order By Product</em>}</li> * </ul> * </p> * 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/model1/legacy/impl/Model1FactoryImpl.java index 000302f3f9..95415342f8 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/model1/legacy/impl/Model1FactoryImpl.java @@ -8,10 +8,8 @@ * Contributors: * Eike Stepper - initial API and implementation */ -package org.eclipse.emf.cdo.tests.legacy.model1.impl; +package org.eclipse.emf.cdo.tests.model1.legacy.impl; -import org.eclipse.emf.cdo.tests.legacy.model1.Model1Factory; -import org.eclipse.emf.cdo.tests.legacy.model1.Model1Package; import org.eclipse.emf.cdo.tests.model1.Address; import org.eclipse.emf.cdo.tests.model1.Category; import org.eclipse.emf.cdo.tests.model1.Company; @@ -23,6 +21,8 @@ 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.VAT; +import org.eclipse.emf.cdo.tests.model1.legacy.Model1Factory; +import org.eclipse.emf.cdo.tests.model1.legacy.Model1Package; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EDataType; @@ -33,6 +33,8 @@ import org.eclipse.emf.ecore.plugin.EcorePlugin; import java.util.Map; +//import org.eclipse.emf.cdo.tests.model1.*; + /** * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!-- end-user-doc --> * @generated @@ -47,7 +49,7 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory /** * Creates the default factory implementation. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * * @generated NOT */ public static Model1Factory init() 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/model1/legacy/impl/Model1PackageImpl.java index d3059a3f7f..c2d39fc7dd 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/model1/legacy/impl/Model1PackageImpl.java @@ -8,10 +8,8 @@ * Contributors: * Eike Stepper - initial API and implementation */ -package org.eclipse.emf.cdo.tests.legacy.model1.impl; +package org.eclipse.emf.cdo.tests.model1.legacy.impl; -import org.eclipse.emf.cdo.tests.legacy.model1.Model1Factory; -import org.eclipse.emf.cdo.tests.legacy.model1.Model1Package; import org.eclipse.emf.cdo.tests.model1.Address; import org.eclipse.emf.cdo.tests.model1.Category; import org.eclipse.emf.cdo.tests.model1.Company; @@ -23,7 +21,8 @@ import org.eclipse.emf.cdo.tests.model1.Product1; 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.VAT; +import org.eclipse.emf.cdo.tests.model1.legacy.Model1Factory; +import org.eclipse.emf.cdo.tests.model1.legacy.Model1Package; import org.eclipse.emf.ecore.EAttribute; import org.eclipse.emf.ecore.EClass; @@ -34,6 +33,8 @@ import org.eclipse.emf.ecore.impl.EPackageImpl; import java.util.Map; +//import org.eclipse.emf.cdo.tests.model1.VAT; + /** * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!-- end-user-doc --> * @generated @@ -608,9 +609,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package public void createPackageContents() { if (isCreated) - { return; - } isCreated = true; // Create classes and their features @@ -688,9 +687,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package public void initializePackageContents() { if (isInitialized) - { return; - } isInitialized = true; // Initialize package @@ -703,14 +700,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); @@ -722,49 +719,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_SalesOrders(), getSalesOrder(), null, "salesOrders", null, 0, -1, Company.class, + 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_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); + 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); @@ -773,37 +770,37 @@ 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_OtherVATs(), getVAT(), "otherVATs", "vat15", 0, -1, Product1.class, !IS_TRANSIENT, + initEAttribute(getProduct1_OtherVATs(), this.getVAT(), "otherVATs", "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); @@ -816,15 +813,15 @@ 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); // Initialize enums and add enum literals - initEEnum(vatEEnum, VAT.class, "VAT"); + initEEnum(vatEEnum, org.eclipse.emf.cdo.tests.model1.VAT.class, "VAT"); addEEnumLiteral(vatEEnum, org.eclipse.emf.cdo.tests.model1.VAT.VAT0); addEEnumLiteral(vatEEnum, org.eclipse.emf.cdo.tests.model1.VAT.VAT7); addEEnumLiteral(vatEEnum, org.eclipse.emf.cdo.tests.model1.VAT.VAT15); 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/model1/legacy/impl/OrderAddressImpl.java index e552f4fec0..19df5bc739 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/model1/legacy/impl/OrderAddressImpl.java @@ -8,13 +8,13 @@ * Contributors: * Eike Stepper - initial API and implementation */ -package org.eclipse.emf.cdo.tests.legacy.model1.impl; +package org.eclipse.emf.cdo.tests.model1.legacy.impl; -import org.eclipse.emf.cdo.tests.legacy.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; +import org.eclipse.emf.cdo.tests.model1.legacy.Model1Package; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; @@ -33,11 +33,11 @@ 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.model1.legacy.impl.OrderAddressImpl#getOrderDetails <em>Order Details</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model1.legacy.impl.OrderAddressImpl#getOrder <em>Order</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model1.legacy.impl.OrderAddressImpl#getProduct <em>Product</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model1.legacy.impl.OrderAddressImpl#getPrice <em>Price</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model1.legacy.impl.OrderAddressImpl#isTestAttribute <em>Test Attribute</em>}</li> * </ul> * </p> * 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/model1/legacy/impl/OrderDetailImpl.java index 51302df7f2..3082cca7b7 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/model1/legacy/impl/OrderDetailImpl.java @@ -8,12 +8,12 @@ * Contributors: * Eike Stepper - initial API and implementation */ -package org.eclipse.emf.cdo.tests.legacy.model1.impl; +package org.eclipse.emf.cdo.tests.model1.legacy.impl; -import org.eclipse.emf.cdo.tests.legacy.model1.Model1Package; import org.eclipse.emf.cdo.tests.model1.Order; import org.eclipse.emf.cdo.tests.model1.OrderDetail; import org.eclipse.emf.cdo.tests.model1.Product1; +import org.eclipse.emf.cdo.tests.model1.legacy.Model1Package; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; @@ -28,9 +28,9 @@ 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.model1.legacy.impl.OrderDetailImpl#getOrder <em>Order</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model1.legacy.impl.OrderDetailImpl#getProduct <em>Product</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model1.legacy.impl.OrderDetailImpl#getPrice <em>Price</em>}</li> * </ul> * </p> * 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/model1/legacy/impl/OrderImpl.java index a5f028c594..7da8a5efc2 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/model1/legacy/impl/OrderImpl.java @@ -8,11 +8,11 @@ * Contributors: * Eike Stepper - initial API and implementation */ -package org.eclipse.emf.cdo.tests.legacy.model1.impl; +package org.eclipse.emf.cdo.tests.model1.legacy.impl; -import org.eclipse.emf.cdo.tests.legacy.model1.Model1Package; import org.eclipse.emf.cdo.tests.model1.Order; import org.eclipse.emf.cdo.tests.model1.OrderDetail; +import org.eclipse.emf.cdo.tests.model1.legacy.Model1Package; import org.eclipse.emf.common.notify.NotificationChain; import org.eclipse.emf.common.util.EList; @@ -29,7 +29,7 @@ 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.model1.legacy.impl.OrderImpl#getOrderDetails <em>Order Details</em>}</li> * </ul> * </p> * 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/model1/legacy/impl/Product1Impl.java index e91cf25f7d..855677ad8c 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/model1/legacy/impl/Product1Impl.java @@ -8,12 +8,12 @@ * Contributors: * Eike Stepper - initial API and implementation */ -package org.eclipse.emf.cdo.tests.legacy.model1.impl; +package org.eclipse.emf.cdo.tests.model1.legacy.impl; -import org.eclipse.emf.cdo.tests.legacy.model1.Model1Package; import org.eclipse.emf.cdo.tests.model1.OrderDetail; import org.eclipse.emf.cdo.tests.model1.Product1; import org.eclipse.emf.cdo.tests.model1.VAT; +import org.eclipse.emf.cdo.tests.model1.legacy.Model1Package; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; @@ -33,11 +33,11 @@ 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#getOtherVATs <em>Other VA Ts</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.model1.legacy.impl.Product1Impl#getName <em>Name</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model1.legacy.impl.Product1Impl#getOrderDetails <em>Order Details</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model1.legacy.impl.Product1Impl#getVat <em>Vat</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model1.legacy.impl.Product1Impl#getOtherVATs <em>Other VA Ts</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model1.legacy.impl.Product1Impl#getDescription <em>Description</em>}</li> * </ul> * </p> * 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/model1/legacy/impl/ProductToOrderImpl.java index 7ef6d38144..97ad6dadfc 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/model1/legacy/impl/ProductToOrderImpl.java @@ -8,11 +8,11 @@ * Contributors: * Eike Stepper - initial API and implementation */ -package org.eclipse.emf.cdo.tests.legacy.model1.impl; +package org.eclipse.emf.cdo.tests.model1.legacy.impl; -import org.eclipse.emf.cdo.tests.legacy.model1.Model1Package; import org.eclipse.emf.cdo.tests.model1.Product1; 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.util.BasicEMap; 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/model1/legacy/impl/PurchaseOrderImpl.java index 367c6288f3..27d12e1f1c 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/model1/legacy/impl/PurchaseOrderImpl.java @@ -8,11 +8,11 @@ * Contributors: * Eike Stepper - initial API and implementation */ -package org.eclipse.emf.cdo.tests.legacy.model1.impl; +package org.eclipse.emf.cdo.tests.model1.legacy.impl; -import org.eclipse.emf.cdo.tests.legacy.model1.Model1Package; import org.eclipse.emf.cdo.tests.model1.PurchaseOrder; 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; 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/model1/legacy/impl/SalesOrderImpl.java index 3302ccdaad..2177864c0c 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/model1/legacy/impl/SalesOrderImpl.java @@ -8,11 +8,11 @@ * Contributors: * Eike Stepper - initial API and implementation */ -package org.eclipse.emf.cdo.tests.legacy.model1.impl; +package org.eclipse.emf.cdo.tests.model1.legacy.impl; -import org.eclipse.emf.cdo.tests.legacy.model1.Model1Package; import org.eclipse.emf.cdo.tests.model1.Customer; 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; @@ -25,8 +25,8 @@ 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.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> * </ul> * </p> * 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/model1/legacy/impl/SupplierImpl.java index 7c264f31b4..2b9c67a7d7 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/model1/legacy/impl/SupplierImpl.java @@ -8,11 +8,11 @@ * Contributors: * Eike Stepper - initial API and implementation */ -package org.eclipse.emf.cdo.tests.legacy.model1.impl; +package org.eclipse.emf.cdo.tests.model1.legacy.impl; -import org.eclipse.emf.cdo.tests.legacy.model1.Model1Package; import org.eclipse.emf.cdo.tests.model1.PurchaseOrder; 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; @@ -30,8 +30,8 @@ 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.model1.legacy.impl.SupplierImpl#getPurchaseOrders <em>Purchase Orders</em>}</li> + * <li>{@link org.eclipse.emf.cdo.tests.model1.legacy.impl.SupplierImpl#isPreferred <em>Preferred</em>}</li> * </ul> * </p> * diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/util/Model1AdapterFactory.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/util/Model1AdapterFactory.java new file mode 100644 index 0000000000..ca63acce2a --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/util/Model1AdapterFactory.java @@ -0,0 +1,390 @@ +/** + * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Eike Stepper - initial API and implementation + */ +package org.eclipse.emf.cdo.tests.model1.legacy.util; + +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; +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.Adapter; +import org.eclipse.emf.common.notify.Notifier; +import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl; +import org.eclipse.emf.ecore.EObject; + +import java.util.Map; + +//import org.eclipse.emf.cdo.tests.model1.*; + +/** + * <!-- 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.legacy.Model1Package + * @generated + */ +public class Model1AdapterFactory extends AdapterFactoryImpl +{ + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public static final String copyright = "Copyright (c) 2004 - 2012 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 --> + * @generated + */ + protected static Model1Package modelPackage; + + /** + * Creates an instance of the adapter factory. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public Model1AdapterFactory() + { + if (modelPackage == null) + { + modelPackage = Model1Package.eINSTANCE; + } + } + + /** + * 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 + */ + @Override + public boolean isFactoryForType(Object object) + { + if (object == modelPackage) + { + return true; + } + if (object instanceof EObject) + { + return ((EObject)object).eClass().getEPackage() == modelPackage; + } + return false; + } + + /** + * The switch that delegates to the <code>createXXX</code> methods. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + protected Model1Switch<Adapter> modelSwitch = new Model1Switch<Adapter>() + { + @Override + public Adapter caseAddress(Address object) + { + return createAddressAdapter(); + } + + @Override + public Adapter caseCompany(Company object) + { + return createCompanyAdapter(); + } + + @Override + public Adapter caseSupplier(Supplier object) + { + return createSupplierAdapter(); + } + + @Override + public Adapter caseCustomer(Customer object) + { + return createCustomerAdapter(); + } + + @Override + public Adapter caseOrder(Order object) + { + return createOrderAdapter(); + } + + @Override + public Adapter caseOrderDetail(OrderDetail object) + { + return createOrderDetailAdapter(); + } + + @Override + public Adapter casePurchaseOrder(PurchaseOrder object) + { + return createPurchaseOrderAdapter(); + } + + @Override + public Adapter caseSalesOrder(SalesOrder object) + { + return createSalesOrderAdapter(); + } + + @Override + public Adapter caseCategory(Category object) + { + return createCategoryAdapter(); + } + + @Override + public Adapter caseProduct1(Product1 object) + { + return createProduct1Adapter(); + } + + @Override + public Adapter caseOrderAddress(OrderAddress object) + { + return createOrderAddressAdapter(); + } + + @Override + public Adapter caseProductToOrder(Map.Entry<Product1, SalesOrder> object) + { + return createProductToOrderAdapter(); + } + + @Override + public Adapter defaultCase(EObject object) + { + return createEObjectAdapter(); + } + }; + + /** + * 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 + */ + @Override + public Adapter createAdapter(Notifier target) + { + return modelSwitch.doSwitch((EObject)target); + } + + /** + * 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 + */ + public Adapter createAddressAdapter() + { + return null; + } + + /** + * 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 + */ + public Adapter createCompanyAdapter() + { + return null; + } + + /** + * 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 + */ + public Adapter createSupplierAdapter() + { + return null; + } + + /** + * 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 + */ + public Adapter createCustomerAdapter() + { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model1.Order <em>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.Order + * @generated + */ + public Adapter createOrderAdapter() + { + return null; + } + + /** + * 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 + */ + public Adapter createOrderDetailAdapter() + { + return null; + } + + /** + * 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 + */ + public Adapter createPurchaseOrderAdapter() + { + return null; + } + + /** + * 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 + */ + public Adapter createSalesOrderAdapter() + { + return null; + } + + /** + * 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 + */ + public Adapter createCategoryAdapter() + { + return null; + } + + /** + * 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 + */ + public Adapter createProduct1Adapter() + { + return null; + } + + /** + * 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 + */ + public Adapter createOrderAddressAdapter() + { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link java.util.Map.Entry <em>Product To 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 java.util.Map.Entry + * @generated + */ + public Adapter createProductToOrderAdapter() + { + return 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 + */ + public Adapter createEObjectAdapter() + { + return null; + } + +} // Model1AdapterFactory diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/util/Model1Switch.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/util/Model1Switch.java new file mode 100644 index 0000000000..1de06fa7b9 --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/legacy/util/Model1Switch.java @@ -0,0 +1,447 @@ +/** + * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Eike Stepper - initial API and implementation + */ +package org.eclipse.emf.cdo.tests.model1.legacy.util; + +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; +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.ecore.EClass; +import org.eclipse.emf.ecore.EObject; + +import java.util.List; +import java.util.Map; + +//import org.eclipse.emf.cdo.tests.model1.*; + +/** + * <!-- begin-user-doc --> + * The <b>Switch</b> for the model's inheritance hierarchy. + * It supports the call {@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.legacy.Model1Package + * @generated + */ +public class Model1Switch<T> +{ + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public static final String copyright = "Copyright (c) 2004 - 2012 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 --> + * @generated + */ + protected static Model1Package modelPackage; + + /** + * Creates an instance of the switch. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public Model1Switch() + { + if (modelPackage == null) + { + modelPackage = Model1Package.eINSTANCE; + } + } + + /** + * 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 + */ + public T doSwitch(EObject theEObject) + { + return doSwitch(theEObject.eClass(), theEObject); + } + + /** + * 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 + */ + protected T doSwitch(EClass theEClass, EObject theEObject) + { + if (theEClass.eContainer() == modelPackage) + { + return doSwitch(theEClass.getClassifierID(), theEObject); + } + else + { + List<EClass> eSuperTypes = theEClass.getESuperTypes(); + return eSuperTypes.isEmpty() ? defaultCase(theEObject) : doSwitch(eSuperTypes.get(0), theEObject); + } + } + + /** + * 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 + */ + protected T doSwitch(int classifierID, EObject theEObject) + { + switch (classifierID) + { + case Model1Package.ADDRESS: + { + Address address = (Address)theEObject; + T result = caseAddress(address); + if (result == null) + result = defaultCase(theEObject); + return result; + } + case Model1Package.COMPANY: + { + 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: + { + 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: + { + 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: + { + Order order = (Order)theEObject; + T result = caseOrder(order); + if (result == null) + result = defaultCase(theEObject); + return result; + } + case Model1Package.ORDER_DETAIL: + { + OrderDetail orderDetail = (OrderDetail)theEObject; + T result = caseOrderDetail(orderDetail); + if (result == null) + result = defaultCase(theEObject); + return result; + } + case Model1Package.PURCHASE_ORDER: + { + 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: + { + 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: + { + Category category = (Category)theEObject; + T result = caseCategory(category); + if (result == null) + result = defaultCase(theEObject); + return result; + } + case Model1Package.PRODUCT1: + { + Product1 product1 = (Product1)theEObject; + T result = caseProduct1(product1); + if (result == null) + result = defaultCase(theEObject); + return result; + } + case Model1Package.ORDER_ADDRESS: + { + 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: + { + @SuppressWarnings("unchecked") + Map.Entry<Product1, SalesOrder> productToOrder = (Map.Entry<Product1, SalesOrder>)theEObject; + T result = caseProductToOrder(productToOrder); + if (result == null) + result = defaultCase(theEObject); + return result; + } + default: + return defaultCase(theEObject); + } + } + + /** + * 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. + * @return the result of interpreting the object as an instance of '<em>Address</em>'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseAddress(Address object) + { + return null; + } + + /** + * 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. + * @return the result of interpreting the object as an instance of '<em>Company</em>'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseCompany(Company object) + { + return null; + } + + /** + * 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. + * @return the result of interpreting the object as an instance of '<em>Supplier</em>'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseSupplier(Supplier object) + { + return null; + } + + /** + * 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. + * @return the result of interpreting the object as an instance of '<em>Customer</em>'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseCustomer(Customer object) + { + return null; + } + + /** + * 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. + * @return the result of interpreting the object as an instance of '<em>Order</em>'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseOrder(Order object) + { + return null; + } + + /** + * 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. + * @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 + */ + public T caseOrderDetail(OrderDetail object) + { + return null; + } + + /** + * 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. + * @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 + */ + public T casePurchaseOrder(PurchaseOrder object) + { + return null; + } + + /** + * 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. + * @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 + */ + public T caseSalesOrder(SalesOrder object) + { + return null; + } + + /** + * 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. + * @return the result of interpreting the object as an instance of '<em>Category</em>'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseCategory(Category object) + { + return null; + } + + /** + * 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. + * @return the result of interpreting the object as an instance of '<em>Product1</em>'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseProduct1(Product1 object) + { + return null; + } + + /** + * 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. + * @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 + */ + public T caseOrderAddress(OrderAddress object) + { + return null; + } + + /** + * 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. + * @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 + */ + public T caseProductToOrder(Map.Entry<Product1, SalesOrder> object) + { + return null; + } + + /** + * 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. + * @return the result of interpreting the object as an instance of '<em>EObject</em>'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) + * @generated + */ + public T defaultCase(EObject object) + { + return null; + } + +} // Model1Switch 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 0d6ec676a5..1af8dbe263 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 @@ -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 */ @@ -30,6 +30,8 @@ import org.eclipse.emf.ecore.EObject; import java.util.Map; +//import org.eclipse.emf.cdo.tests.model1.*; + /** * <!-- 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 --> @@ -248,7 +250,7 @@ public class Model1AdapterFactory extends AdapterFactoryImpl * Creates a new adapter for an object of class '{@link java.util.Map.Entry <em>Product To 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 java.util.Map.Entry * @generated @@ -314,7 +316,7 @@ public class Model1AdapterFactory extends AdapterFactoryImpl * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model1.Order <em>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.Order * @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 b4050c710e..134636c835 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 @@ -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 */ @@ -29,6 +29,8 @@ import org.eclipse.emf.ecore.util.Switch; import java.util.Map; +//import org.eclipse.emf.cdo.tests.model1.*; + /** * <!-- begin-user-doc --> The <b>Switch</b> for the model's inheritance hierarchy. It supports the call * {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model, diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/AddressValidator.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/AddressValidator.java deleted file mode 100644 index b8106b13e0..0000000000 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/AddressValidator.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Eike Stepper - initial API and implementation - */ -package org.eclipse.emf.cdo.tests.model1.validation; - -/** - * A sample validator interface for {@link org.eclipse.emf.cdo.tests.model1.Address}. This doesn't really do anything, - * and it's not a real EMF artifact. It was generated by the org.eclipse.emf.examples.generator.validator plug-in to - * illustrate how EMF's code generator can be extended. This can be disabled with -vmargs - * -Dorg.eclipse.emf.examples.generator.validator=false. - * - * @since 2.0 - */ -public interface AddressValidator -{ - boolean validate(); - - boolean validateName(String value); - - boolean validateStreet(String value); - - boolean validateCity(String value); -} diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/CategoryValidator.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/CategoryValidator.java deleted file mode 100644 index d89773790f..0000000000 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/CategoryValidator.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Eike Stepper - initial API and implementation - */ -package org.eclipse.emf.cdo.tests.model1.validation; - -import org.eclipse.emf.cdo.tests.model1.Category; -import org.eclipse.emf.cdo.tests.model1.Product1; - -import org.eclipse.emf.common.util.EList; - -/** - * A sample validator interface for {@link org.eclipse.emf.cdo.tests.model1.Category}. This doesn't really do anything, - * and it's not a real EMF artifact. It was generated by the org.eclipse.emf.examples.generator.validator plug-in to - * illustrate how EMF's code generator can be extended. This can be disabled with -vmargs - * -Dorg.eclipse.emf.examples.generator.validator=false. - * - * @since 2.0 - */ -public interface CategoryValidator -{ - boolean validate(); - - boolean validateName(String value); - - boolean validateCategories(EList<Category> value); - - boolean validateProducts(EList<Product1> value); -} diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/CompanyValidator.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/CompanyValidator.java deleted file mode 100644 index 9d9f67d39c..0000000000 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/CompanyValidator.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Eike Stepper - initial API and implementation - */ -package org.eclipse.emf.cdo.tests.model1.validation; - -import org.eclipse.emf.cdo.tests.model1.Category; -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.Supplier; - -import org.eclipse.emf.common.util.EList; - -/** - * A sample validator interface for {@link org.eclipse.emf.cdo.tests.model1.Company}. This doesn't really do anything, - * and it's not a real EMF artifact. It was generated by the org.eclipse.emf.examples.generator.validator plug-in to - * illustrate how EMF's code generator can be extended. This can be disabled with -vmargs - * -Dorg.eclipse.emf.examples.generator.validator=false. - * - * @since 2.0 - */ -public interface CompanyValidator -{ - boolean validate(); - - boolean validateCategories(EList<Category> value); - - boolean validateSuppliers(EList<Supplier> value); - - boolean validatePurchaseOrders(EList<PurchaseOrder> value); - - boolean validateCustomers(EList<Customer> value); - - boolean validateSalesOrders(EList<SalesOrder> value); -} diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/CustomerValidator.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/CustomerValidator.java deleted file mode 100644 index 9e31b80c92..0000000000 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/CustomerValidator.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Eike Stepper - initial API and implementation - */ -package org.eclipse.emf.cdo.tests.model1.validation; - -import org.eclipse.emf.cdo.tests.model1.SalesOrder; - -import org.eclipse.emf.common.util.EList; - -/** - * A sample validator interface for {@link org.eclipse.emf.cdo.tests.model1.Customer}. This doesn't really do anything, - * and it's not a real EMF artifact. It was generated by the org.eclipse.emf.examples.generator.validator plug-in to - * illustrate how EMF's code generator can be extended. This can be disabled with -vmargs - * -Dorg.eclipse.emf.examples.generator.validator=false. - * - * @since 2.0 - */ -public interface CustomerValidator -{ - boolean validate(); - - boolean validateName(String value); - - boolean validateSalesOrders(EList<SalesOrder> value); -} diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/OrderAddressValidator.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/OrderAddressValidator.java deleted file mode 100644 index 52efc90ae6..0000000000 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/OrderAddressValidator.java +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Eike Stepper - initial API and implementation - */ -package org.eclipse.emf.cdo.tests.model1.validation; - -/** - * A sample validator interface for {@link org.eclipse.emf.cdo.tests.model1.OrderAddress}. This doesn't really do - * anything, and it's not a real EMF artifact. It was generated by the org.eclipse.emf.examples.generator.validator - * plug-in to illustrate how EMF's code generator can be extended. This can be disabled with -vmargs - * -Dorg.eclipse.emf.examples.generator.validator=false. - */ -public interface OrderAddressValidator -{ - boolean validate(); - - boolean validateTestAttribute(boolean value); -} diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/OrderDetailValidator.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/OrderDetailValidator.java deleted file mode 100644 index 4310bb84f1..0000000000 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/OrderDetailValidator.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Eike Stepper - initial API and implementation - */ -package org.eclipse.emf.cdo.tests.model1.validation; - -import org.eclipse.emf.cdo.tests.model1.Order; -import org.eclipse.emf.cdo.tests.model1.Product1; - -/** - * A sample validator interface for {@link org.eclipse.emf.cdo.tests.model1.OrderDetail}. This doesn't really do - * anything, and it's not a real EMF artifact. It was generated by the org.eclipse.emf.examples.generator.validator - * plug-in to illustrate how EMF's code generator can be extended. This can be disabled with -vmargs - * -Dorg.eclipse.emf.examples.generator.validator=false. - * - * @since 2.0 - */ -public interface OrderDetailValidator -{ - boolean validate(); - - boolean validateOrder(Order value); - - boolean validateProduct(Product1 value); - - boolean validatePrice(float value); -} diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/OrderValidator.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/OrderValidator.java deleted file mode 100644 index 445dcca68e..0000000000 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/OrderValidator.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Eike Stepper - initial API and implementation - */ -package org.eclipse.emf.cdo.tests.model1.validation; - -import org.eclipse.emf.cdo.tests.model1.OrderDetail; - -import org.eclipse.emf.common.util.EList; - -/** - * A sample validator interface for {@link org.eclipse.emf.cdo.tests.model1.Order}. This doesn't really do anything, and - * it's not a real EMF artifact. It was generated by the org.eclipse.emf.examples.generator.validator plug-in to - * illustrate how EMF's code generator can be extended. This can be disabled with -vmargs - * -Dorg.eclipse.emf.examples.generator.validator=false. - * - * @since 2.0 - */ -public interface OrderValidator -{ - boolean validate(); - - boolean validateOrderDetails(EList<OrderDetail> value); -} diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/Product1Validator.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/Product1Validator.java deleted file mode 100644 index 3cda49f9e9..0000000000 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/Product1Validator.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Eike Stepper - initial API and implementation - */ -package org.eclipse.emf.cdo.tests.model1.validation; - -import org.eclipse.emf.cdo.tests.model1.OrderDetail; -import org.eclipse.emf.cdo.tests.model1.VAT; - -import org.eclipse.emf.common.util.EList; - -/** - * A sample validator interface for {@link org.eclipse.emf.cdo.tests.model1.Product1}. This doesn't really do anything, - * and it's not a real EMF artifact. It was generated by the org.eclipse.emf.examples.generator.validator plug-in to - * illustrate how EMF's code generator can be extended. This can be disabled with -vmargs - * -Dorg.eclipse.emf.examples.generator.validator=false. - */ -public interface Product1Validator -{ - boolean validate(); - - boolean validateName(String value); - - boolean validateOrderDetails(EList<OrderDetail> value); - - boolean validateVat(VAT value); - - boolean validateDescription(String value); -} diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/PurchaseOrderValidator.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/PurchaseOrderValidator.java deleted file mode 100644 index ef522cbcf0..0000000000 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/PurchaseOrderValidator.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Eike Stepper - initial API and implementation - */ -package org.eclipse.emf.cdo.tests.model1.validation; - -import org.eclipse.emf.cdo.tests.model1.Supplier; - -import java.util.Date; - -/** - * A sample validator interface for {@link org.eclipse.emf.cdo.tests.model1.PurchaseOrder}. This doesn't really do - * anything, and it's not a real EMF artifact. It was generated by the org.eclipse.emf.examples.generator.validator - * plug-in to illustrate how EMF's code generator can be extended. This can be disabled with -vmargs - * -Dorg.eclipse.emf.examples.generator.validator=false. - * - * @since 2.0 - */ -public interface PurchaseOrderValidator -{ - boolean validate(); - - boolean validateDate(Date value); - - boolean validateSupplier(Supplier value); -} diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/SalesOrderValidator.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/SalesOrderValidator.java deleted file mode 100644 index 7fa3bea866..0000000000 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/SalesOrderValidator.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Eike Stepper - initial API and implementation - */ -package org.eclipse.emf.cdo.tests.model1.validation; - -import org.eclipse.emf.cdo.tests.model1.Customer; - -/** - * A sample validator interface for {@link org.eclipse.emf.cdo.tests.model1.SalesOrder}. This doesn't really do - * anything, and it's not a real EMF artifact. It was generated by the org.eclipse.emf.examples.generator.validator - * plug-in to illustrate how EMF's code generator can be extended. This can be disabled with -vmargs - * -Dorg.eclipse.emf.examples.generator.validator=false. - * - * @since 2.0 - */ -public interface SalesOrderValidator -{ - boolean validate(); - - boolean validateId(int value); - - boolean validateCustomer(Customer value); -} diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/SupplierValidator.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/SupplierValidator.java deleted file mode 100644 index 7e10d44921..0000000000 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/SupplierValidator.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Eike Stepper - initial API and implementation - */ -package org.eclipse.emf.cdo.tests.model1.validation; - -import org.eclipse.emf.cdo.tests.model1.PurchaseOrder; - -import org.eclipse.emf.common.util.EList; - -/** - * A sample validator interface for {@link org.eclipse.emf.cdo.tests.model1.Supplier}. This doesn't really do anything, - * and it's not a real EMF artifact. It was generated by the org.eclipse.emf.examples.generator.validator plug-in to - * illustrate how EMF's code generator can be extended. This can be disabled with -vmargs - * -Dorg.eclipse.emf.examples.generator.validator=false. - * - * @since 2.0 - */ -public interface SupplierValidator -{ - boolean validate(); - - boolean validatePurchaseOrders(EList<PurchaseOrder> value); - - boolean validatePreferred(boolean value); - - boolean validateName(String value); -} |