[247226] Transparently support legacy models

https://bugs.eclipse.org/bugs/show_bug.cgi?id=247226

19 files changed, 1 insertions, 7034 deletions

diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.tests.model1/META-INF/MANIFEST.MF
index 54564335f4..d67ba767a2 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/META-INF/MANIFEST.MF
@@ -9,10 +9,7 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ClassPath: .
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.emf.cdo;bundle-version="[2.0.0,3.0.0)";visibility:=reexport
-Export-Package: org.eclipse.emf.cdo.tests.legacy.model1;version="2.0.0",
- org.eclipse.emf.cdo.tests.legacy.model1.impl;version="2.0.0",
- org.eclipse.emf.cdo.tests.legacy.model1.util;version="2.0.0",
- org.eclipse.emf.cdo.tests.model1;version="2.0.0",
+Export-Package: org.eclipse.emf.cdo.tests.model1;version="2.0.0",
  org.eclipse.emf.cdo.tests.model1.impl;version="2.0.0",
  org.eclipse.emf.cdo.tests.model1.util;version="2.0.0",
  org.eclipse.emf.cdo.tests.model1.validation;version="2.0.0"
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/model/legacy-sources.zip b/plugins/org.eclipse.emf.cdo.tests.model1/model/legacy-sources.zip
new file mode 100644
index 0000000000..141901569f
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/model/legacy-sources.zip
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/Model1Factory.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/Model1Factory.java
deleted file mode 100644
index 5a971221d6..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/Model1Factory.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Model1Factory.java,v 1.2 2008-09-18 12:57:08 estepper Exp $
- */
-package org.eclipse.emf.cdo.tests.legacy.model1;
-
-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.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
- * @generated NOT
- */
-public interface Model1Factory extends EFactory, org.eclipse.emf.cdo.tests.model1.Model1Factory
-{
-  /**
-   * The singleton instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  Model1Factory eINSTANCE = org.eclipse.emf.cdo.tests.legacy.model1.impl.Model1FactoryImpl.init();
-
-  /**
-   * Returns a new object of class '<em>Address</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @return a new object of class '<em>Address</em>'.
-   * @generated
-   */
-  Address createAddress();
-
-  /**
-   * Returns a new object of class '<em>Company</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @return a new object of class '<em>Company</em>'.
-   * @generated
-   */
-  Company createCompany();
-
-  /**
-   * Returns a new object of class '<em>Supplier</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @return a new object of class '<em>Supplier</em>'.
-   * @generated
-   */
-  Supplier createSupplier();
-
-  /**
-   * Returns a new object of class '<em>Customer</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @return a new object of class '<em>Customer</em>'.
-   * @generated
-   */
-  Customer createCustomer();
-
-  /**
-   * Returns a new object of class '<em>Order</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @return a new object of class '<em>Order</em>'.
-   * @generated
-   */
-  Order createOrder();
-
-  /**
-   * Returns a new object of class '<em>Order Detail</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @return a new object of class '<em>Order Detail</em>'.
-   * @generated
-   */
-  OrderDetail createOrderDetail();
-
-  /**
-   * Returns a new object of class '<em>Purchase Order</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @return a new object of class '<em>Purchase Order</em>'.
-   * @generated
-   */
-  PurchaseOrder createPurchaseOrder();
-
-  /**
-   * Returns a new object of class '<em>Sales Order</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @return a new object of class '<em>Sales Order</em>'.
-   * @generated
-   */
-  SalesOrder createSalesOrder();
-
-  /**
-   * Returns a new object of class '<em>Category</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @return a new object of class '<em>Category</em>'.
-   * @generated
-   */
-  Category createCategory();
-
-  /**
-   * Returns a new object of class '<em>Product1</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @return a new object of class '<em>Product1</em>'.
-   * @generated
-   */
-  Product1 createProduct1();
-
-  /**
-   * Returns a new object of class '<em>Order Address</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @return a new object of class '<em>Order Address</em>'.
-   * @generated
-   */
-  OrderAddress createOrderAddress();
-
-  /**
-   * Returns the package supported by this factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @return the package supported by this factory.
-   * @generated
-   */
-  Model1Package getModel1Package();
-
-} // Model1Factory
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/Model1Package.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/Model1Package.java
deleted file mode 100644
index ad1fbe467d..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/Model1Package.java
+++ /dev/null
@@ -1,1408 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Model1Package.java,v 1.2 2008-09-18 12:57:08 estepper Exp $
- */
-package org.eclipse.emf.cdo.tests.legacy.model1;
-
-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;
-
-/**
- * <!-- begin-user-doc --> The <b>Package</b> for the model. It contains accessors for the meta objects to represent
- * <ul>
- * <li>each class,</li>
- * <li>each feature of each class,</li>
- * <li>each enum,</li>
- * <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- * 
- * @see org.eclipse.emf.cdo.tests.legacy.model1.Model1Factory
- * @model kind="package"
- * @generated NOT
- */
-public interface Model1Package extends EPackage, org.eclipse.emf.cdo.tests.model1.Model1Package
-{
-  /**
-   * The package name. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  String eNAME = "model1";
-
-  /**
-   * The package namespace URI. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  String eNS_URI = "http://www.eclipse.org/emf/CDO/tests/model1/1.0.0";
-
-  /**
-   * The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  String eNS_PREFIX = "model1";
-
-  /**
-   * The singleton instance of the package. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  Model1Package eINSTANCE = org.eclipse.emf.cdo.tests.legacy.model1.impl.Model1PackageImpl.init();
-
-  /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.AddressImpl <em>Address</em>}'
-   * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.AddressImpl
-   * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.Model1PackageImpl#getAddress()
-   * @generated
-   */
-  int ADDRESS = 0;
-
-  /**
-   * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int ADDRESS__NAME = 0;
-
-  /**
-   * The feature id for the '<em><b>Street</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int ADDRESS__STREET = 1;
-
-  /**
-   * The feature id for the '<em><b>City</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int ADDRESS__CITY = 2;
-
-  /**
-   * The number of structural features of the '<em>Address</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int ADDRESS_FEATURE_COUNT = 3;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.CompanyImpl <em>Company</em>}'
-   * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.CompanyImpl
-   * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.Model1PackageImpl#getCompany()
-   * @generated
-   */
-  int COMPANY = 1;
-
-  /**
-   * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int COMPANY__NAME = ADDRESS__NAME;
-
-  /**
-   * The feature id for the '<em><b>Street</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int COMPANY__STREET = ADDRESS__STREET;
-
-  /**
-   * The feature id for the '<em><b>City</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int COMPANY__CITY = ADDRESS__CITY;
-
-  /**
-   * The feature id for the '<em><b>Categories</b></em>' containment reference list. <!-- begin-user-doc --> <!--
-   * end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int COMPANY__CATEGORIES = ADDRESS_FEATURE_COUNT + 0;
-
-  /**
-   * The feature id for the '<em><b>Suppliers</b></em>' containment reference list. <!-- begin-user-doc --> <!--
-   * end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int COMPANY__SUPPLIERS = ADDRESS_FEATURE_COUNT + 1;
-
-  /**
-   * The feature id for the '<em><b>Customers</b></em>' containment reference list. <!-- begin-user-doc --> <!--
-   * end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int COMPANY__CUSTOMERS = ADDRESS_FEATURE_COUNT + 2;
-
-  /**
-   * The feature id for the '<em><b>Purchase Orders</b></em>' containment reference list. <!-- begin-user-doc --> <!--
-   * end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int COMPANY__PURCHASE_ORDERS = ADDRESS_FEATURE_COUNT + 3;
-
-  /**
-   * The feature id for the '<em><b>Sales Orders</b></em>' containment reference list. <!-- begin-user-doc --> <!--
-   * end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int COMPANY__SALES_ORDERS = ADDRESS_FEATURE_COUNT + 4;
-
-  /**
-   * The number of structural features of the '<em>Company</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int COMPANY_FEATURE_COUNT = ADDRESS_FEATURE_COUNT + 5;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.SupplierImpl <em>Supplier</em>}'
-   * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.SupplierImpl
-   * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.Model1PackageImpl#getSupplier()
-   * @generated
-   */
-  int SUPPLIER = 2;
-
-  /**
-   * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int SUPPLIER__NAME = ADDRESS__NAME;
-
-  /**
-   * The feature id for the '<em><b>Street</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int SUPPLIER__STREET = ADDRESS__STREET;
-
-  /**
-   * The feature id for the '<em><b>City</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int SUPPLIER__CITY = ADDRESS__CITY;
-
-  /**
-   * The feature id for the '<em><b>Purchase Orders</b></em>' reference list. <!-- begin-user-doc --> <!-- end-user-doc
-   * -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int SUPPLIER__PURCHASE_ORDERS = ADDRESS_FEATURE_COUNT + 0;
-
-  /**
-   * The feature id for the '<em><b>Preferred</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int SUPPLIER__PREFERRED = ADDRESS_FEATURE_COUNT + 1;
-
-  /**
-   * The number of structural features of the '<em>Supplier</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int SUPPLIER_FEATURE_COUNT = ADDRESS_FEATURE_COUNT + 2;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.CustomerImpl <em>Customer</em>}'
-   * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.CustomerImpl
-   * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.Model1PackageImpl#getCustomer()
-   * @generated
-   */
-  int CUSTOMER = 3;
-
-  /**
-   * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int CUSTOMER__NAME = ADDRESS__NAME;
-
-  /**
-   * The feature id for the '<em><b>Street</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int CUSTOMER__STREET = ADDRESS__STREET;
-
-  /**
-   * The feature id for the '<em><b>City</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int CUSTOMER__CITY = ADDRESS__CITY;
-
-  /**
-   * The feature id for the '<em><b>Sales Orders</b></em>' reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int CUSTOMER__SALES_ORDERS = ADDRESS_FEATURE_COUNT + 0;
-
-  /**
-   * The number of structural features of the '<em>Customer</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int CUSTOMER_FEATURE_COUNT = ADDRESS_FEATURE_COUNT + 1;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.OrderImpl <em>Order</em>}' class.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.OrderImpl
-   * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.Model1PackageImpl#getOrder()
-   * @generated
-   */
-  int ORDER = 4;
-
-  /**
-   * The feature id for the '<em><b>Order Details</b></em>' containment reference list. <!-- begin-user-doc --> <!--
-   * end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int ORDER__ORDER_DETAILS = 0;
-
-  /**
-   * The number of structural features of the '<em>Order</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int ORDER_FEATURE_COUNT = 1;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.OrderDetailImpl
-   * <em>Order Detail</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.OrderDetailImpl
-   * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.Model1PackageImpl#getOrderDetail()
-   * @generated
-   */
-  int ORDER_DETAIL = 5;
-
-  /**
-   * The feature id for the '<em><b>Order</b></em>' container reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int ORDER_DETAIL__ORDER = 0;
-
-  /**
-   * The feature id for the '<em><b>Product</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int ORDER_DETAIL__PRODUCT = 1;
-
-  /**
-   * The feature id for the '<em><b>Price</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int ORDER_DETAIL__PRICE = 2;
-
-  /**
-   * 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. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.PurchaseOrderImpl
-   * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.Model1PackageImpl#getPurchaseOrder()
-   * @generated
-   */
-  int PURCHASE_ORDER = 6;
-
-  /**
-   * The feature id for the '<em><b>Order Details</b></em>' containment reference list. <!-- begin-user-doc --> <!--
-   * end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int PURCHASE_ORDER__ORDER_DETAILS = ORDER__ORDER_DETAILS;
-
-  /**
-   * The feature id for the '<em><b>Date</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int PURCHASE_ORDER__DATE = ORDER_FEATURE_COUNT + 0;
-
-  /**
-   * The feature id for the '<em><b>Supplier</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int PURCHASE_ORDER__SUPPLIER = ORDER_FEATURE_COUNT + 1;
-
-  /**
-   * 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. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.SalesOrderImpl
-   * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.Model1PackageImpl#getSalesOrder()
-   * @generated
-   */
-  int SALES_ORDER = 7;
-
-  /**
-   * The feature id for the '<em><b>Order Details</b></em>' containment reference list. <!-- begin-user-doc --> <!--
-   * end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int SALES_ORDER__ORDER_DETAILS = ORDER__ORDER_DETAILS;
-
-  /**
-   * The feature id for the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int SALES_ORDER__ID = ORDER_FEATURE_COUNT + 0;
-
-  /**
-   * The feature id for the '<em><b>Customer</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int SALES_ORDER__CUSTOMER = ORDER_FEATURE_COUNT + 1;
-
-  /**
-   * 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. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.CategoryImpl
-   * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.Model1PackageImpl#getCategory()
-   * @generated
-   */
-  int CATEGORY = 8;
-
-  /**
-   * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int CATEGORY__NAME = 0;
-
-  /**
-   * The feature id for the '<em><b>Categories</b></em>' containment reference list. <!-- begin-user-doc --> <!--
-   * end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int CATEGORY__CATEGORIES = 1;
-
-  /**
-   * The feature id for the '<em><b>Products</b></em>' containment reference list. <!-- begin-user-doc --> <!--
-   * end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int CATEGORY__PRODUCTS = 2;
-
-  /**
-   * The number of structural features of the '<em>Category</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int CATEGORY_FEATURE_COUNT = 3;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.Product1Impl <em>Product1</em>}'
-   * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.Product1Impl
-   * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.Model1PackageImpl#getProduct1()
-   * @generated
-   */
-  int PRODUCT1 = 9;
-
-  /**
-   * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int PRODUCT1__NAME = 0;
-
-  /**
-   * The feature id for the '<em><b>Order Details</b></em>' reference list. <!-- begin-user-doc --> <!-- end-user-doc
-   * -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int PRODUCT1__ORDER_DETAILS = 1;
-
-  /**
-   * The feature id for the '<em><b>Vat</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int PRODUCT1__VAT = 2;
-
-  /**
-   * The number of structural features of the '<em>Product1</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int PRODUCT1_FEATURE_COUNT = 3;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.OrderAddressImpl
-   * <em>Order Address</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.OrderAddressImpl
-   * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.Model1PackageImpl#getOrderAddress()
-   * @generated
-   */
-  int ORDER_ADDRESS = 10;
-
-  /**
-   * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int ORDER_ADDRESS__NAME = ADDRESS__NAME;
-
-  /**
-   * The feature id for the '<em><b>Street</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int ORDER_ADDRESS__STREET = ADDRESS__STREET;
-
-  /**
-   * The feature id for the '<em><b>City</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int ORDER_ADDRESS__CITY = ADDRESS__CITY;
-
-  /**
-   * The feature id for the '<em><b>Order Details</b></em>' containment reference list. <!-- begin-user-doc --> <!--
-   * end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int ORDER_ADDRESS__ORDER_DETAILS = ADDRESS_FEATURE_COUNT + 0;
-
-  /**
-   * The feature id for the '<em><b>Order</b></em>' container reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int ORDER_ADDRESS__ORDER = ADDRESS_FEATURE_COUNT + 1;
-
-  /**
-   * The feature id for the '<em><b>Product</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int ORDER_ADDRESS__PRODUCT = ADDRESS_FEATURE_COUNT + 2;
-
-  /**
-   * The feature id for the '<em><b>Price</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int ORDER_ADDRESS__PRICE = ADDRESS_FEATURE_COUNT + 3;
-
-  /**
-   * The feature id for the '<em><b>Test Attribute</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   * @ordered
-   */
-  int ORDER_ADDRESS__TEST_ATTRIBUTE = ADDRESS_FEATURE_COUNT + 4;
-
-  /**
-   * 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.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
-   */
-  int VAT = 11;
-
-  /**
-   * 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
-   */
-  EClass getAddress();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model1.Address#getName
-   * <em>Name</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @return the meta object for the attribute '<em>Name</em>'.
-   * @see org.eclipse.emf.cdo.tests.legacy.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>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @return the meta object for the attribute '<em>Street</em>'.
-   * @see org.eclipse.emf.cdo.tests.legacy.model1.Address#getStreet()
-   * @see #getAddress()
-   * @generated
-   */
-  EAttribute getAddress_Street();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model1.Address#getCity
-   * <em>City</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @return the meta object for the attribute '<em>City</em>'.
-   * @see org.eclipse.emf.cdo.tests.legacy.model1.Address#getCity()
-   * @see #getAddress()
-   * @generated
-   */
-  EAttribute getAddress_City();
-
-  /**
-   * 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
-   */
-  EClass getCompany();
-
-  /**
-   * Returns the meta object for the containment reference list '
-   * {@link org.eclipse.emf.cdo.tests.legacy.model1.Company#getCategories <em>Categories</em>}'. <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * 
-   * @return the meta object for the containment reference list '<em>Categories</em>'.
-   * @see org.eclipse.emf.cdo.tests.legacy.model1.Company#getCategories()
-   * @see #getCompany()
-   * @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>}'. <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * 
-   * @return the meta object for the containment reference list '<em>Suppliers</em>'.
-   * @see org.eclipse.emf.cdo.tests.legacy.model1.Company#getSuppliers()
-   * @see #getCompany()
-   * @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>}'. <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * 
-   * @return the meta object for the containment reference list '<em>Customers</em>'.
-   * @see org.eclipse.emf.cdo.tests.legacy.model1.Company#getCustomers()
-   * @see #getCompany()
-   * @generated
-   */
-  EReference getCompany_Customers();
-
-  /**
-   * 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()
-   * @generated
-   */
-  EReference getCompany_PurchaseOrders();
-
-  /**
-   * Returns the meta object for the containment reference list '
-   * {@link org.eclipse.emf.cdo.tests.legacy.model1.Company#getSalesOrders <em>Sales Orders</em>}'. <!-- begin-user-doc
-   * --> <!-- end-user-doc -->
-   * 
-   * @return the meta object for the containment reference list '<em>Sales Orders</em>'.
-   * @see org.eclipse.emf.cdo.tests.legacy.model1.Company#getSalesOrders()
-   * @see #getCompany()
-   * @generated
-   */
-  EReference getCompany_SalesOrders();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model1.Supplier <em>Supplier</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @return the meta object for class '<em>Supplier</em>'.
-   * @see org.eclipse.emf.cdo.tests.legacy.model1.Supplier
-   * @generated
-   */
-  EClass getSupplier();
-
-  /**
-   * 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()
-   * @generated
-   */
-  EReference getSupplier_PurchaseOrders();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model1.Supplier#isPreferred
-   * <em>Preferred</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @return the meta object for the attribute '<em>Preferred</em>'.
-   * @see org.eclipse.emf.cdo.tests.legacy.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>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @return the meta object for class '<em>Customer</em>'.
-   * @see org.eclipse.emf.cdo.tests.legacy.model1.Customer
-   * @generated
-   */
-  EClass getCustomer();
-
-  /**
-   * Returns the meta object for the reference list '
-   * {@link org.eclipse.emf.cdo.tests.legacy.model1.Customer#getSalesOrders <em>Sales Orders</em>}'. <!-- begin-user-doc
-   * --> <!-- end-user-doc -->
-   * 
-   * @return the meta object for the reference list '<em>Sales Orders</em>'.
-   * @see org.eclipse.emf.cdo.tests.legacy.model1.Customer#getSalesOrders()
-   * @see #getCustomer()
-   * @generated
-   */
-  EReference getCustomer_SalesOrders();
-
-  /**
-   * 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
-   */
-  EClass getOrder();
-
-  /**
-   * Returns the meta object for the containment reference list '
-   * {@link org.eclipse.emf.cdo.tests.legacy.model1.Order#getOrderDetails <em>Order Details</em>}'. <!-- begin-user-doc
-   * --> <!-- end-user-doc -->
-   * 
-   * @return the meta object for the containment reference list '<em>Order Details</em>'.
-   * @see org.eclipse.emf.cdo.tests.legacy.model1.Order#getOrderDetails()
-   * @see #getOrder()
-   * @generated
-   */
-  EReference getOrder_OrderDetails();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model1.OrderDetail
-   * <em>Order Detail</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @return the meta object for class '<em>Order Detail</em>'.
-   * @see org.eclipse.emf.cdo.tests.legacy.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>}'. <!-- begin-user-doc --> <!--
-   * end-user-doc -->
-   * 
-   * @return the meta object for the container reference '<em>Order</em>'.
-   * @see org.eclipse.emf.cdo.tests.legacy.model1.OrderDetail#getOrder()
-   * @see #getOrderDetail()
-   * @generated
-   */
-  EReference getOrderDetail_Order();
-
-  /**
-   * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.tests.legacy.model1.OrderDetail#getProduct
-   * <em>Product</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @return the meta object for the reference '<em>Product</em>'.
-   * @see org.eclipse.emf.cdo.tests.legacy.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>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @return the meta object for the attribute '<em>Price</em>'.
-   * @see org.eclipse.emf.cdo.tests.legacy.model1.OrderDetail#getPrice()
-   * @see #getOrderDetail()
-   * @generated
-   */
-  EAttribute getOrderDetail_Price();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model1.PurchaseOrder
-   * <em>Purchase Order</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @return the meta object for class '<em>Purchase Order</em>'.
-   * @see org.eclipse.emf.cdo.tests.legacy.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>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @return the meta object for the attribute '<em>Date</em>'.
-   * @see org.eclipse.emf.cdo.tests.legacy.model1.PurchaseOrder#getDate()
-   * @see #getPurchaseOrder()
-   * @generated
-   */
-  EAttribute getPurchaseOrder_Date();
-
-  /**
-   * Returns the meta object for the reference '
-   * {@link org.eclipse.emf.cdo.tests.legacy.model1.PurchaseOrder#getSupplier <em>Supplier</em>}'. <!-- begin-user-doc
-   * --> <!-- end-user-doc -->
-   * 
-   * @return the meta object for the reference '<em>Supplier</em>'.
-   * @see org.eclipse.emf.cdo.tests.legacy.model1.PurchaseOrder#getSupplier()
-   * @see #getPurchaseOrder()
-   * @generated
-   */
-  EReference getPurchaseOrder_Supplier();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model1.SalesOrder <em>Sales Order</em>}
-   * '. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @return the meta object for class '<em>Sales Order</em>'.
-   * @see org.eclipse.emf.cdo.tests.legacy.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>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @return the meta object for the attribute '<em>Id</em>'.
-   * @see org.eclipse.emf.cdo.tests.legacy.model1.SalesOrder#getId()
-   * @see #getSalesOrder()
-   * @generated
-   */
-  EAttribute getSalesOrder_Id();
-
-  /**
-   * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.tests.legacy.model1.SalesOrder#getCustomer
-   * <em>Customer</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @return the meta object for the reference '<em>Customer</em>'.
-   * @see org.eclipse.emf.cdo.tests.legacy.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>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @return the meta object for class '<em>Category</em>'.
-   * @see org.eclipse.emf.cdo.tests.legacy.model1.Category
-   * @generated
-   */
-  EClass getCategory();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model1.Category#getName
-   * <em>Name</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @return the meta object for the attribute '<em>Name</em>'.
-   * @see org.eclipse.emf.cdo.tests.legacy.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>}'. <!-- begin-user-doc
-   * --> <!-- end-user-doc -->
-   * 
-   * @return the meta object for the containment reference list '<em>Categories</em>'.
-   * @see org.eclipse.emf.cdo.tests.legacy.model1.Category#getCategories()
-   * @see #getCategory()
-   * @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>}'. <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * 
-   * @return the meta object for the containment reference list '<em>Products</em>'.
-   * @see org.eclipse.emf.cdo.tests.legacy.model1.Category#getProducts()
-   * @see #getCategory()
-   * @generated
-   */
-  EReference getCategory_Products();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model1.Product1 <em>Product1</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @return the meta object for class '<em>Product1</em>'.
-   * @see org.eclipse.emf.cdo.tests.legacy.model1.Product1
-   * @generated
-   */
-  EClass getProduct1();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model1.Product1#getName
-   * <em>Name</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @return the meta object for the attribute '<em>Name</em>'.
-   * @see org.eclipse.emf.cdo.tests.legacy.model1.Product1#getName()
-   * @see #getProduct1()
-   * @generated
-   */
-  EAttribute getProduct1_Name();
-
-  /**
-   * 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()
-   * @generated
-   */
-  EReference getProduct1_OrderDetails();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model1.Product1#getVat
-   * <em>Vat</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @return the meta object for the attribute '<em>Vat</em>'.
-   * @see org.eclipse.emf.cdo.tests.legacy.model1.Product1#getVat()
-   * @see #getProduct1()
-   * @generated
-   */
-  EAttribute getProduct1_Vat();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model1.OrderAddress
-   * <em>Order Address</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @return the meta object for class '<em>Order Address</em>'.
-   * @see org.eclipse.emf.cdo.tests.legacy.model1.OrderAddress
-   * @generated
-   */
-  EClass getOrderAddress();
-
-  /**
-   * 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()
-   * @generated
-   */
-  EAttribute getOrderAddress_TestAttribute();
-
-  /**
-   * 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
-   */
-  EEnum getVAT();
-
-  /**
-   * Returns the factory that creates the instances of the model. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @return the factory that creates the instances of the model.
-   * @generated
-   */
-  Model1Factory getModel1Factory();
-
-  /**
-   * <!-- begin-user-doc --> Defines literals for the meta objects that represent
-   * <ul>
-   * <li>each class,</li>
-   * <li>each feature of each class,</li>
-   * <li>each enum,</li>
-   * <li>and each data type</li>
-   * </ul>
-   * <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  interface Literals
-  {
-    /**
-     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.AddressImpl
-     * <em>Address</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.AddressImpl
-     * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.Model1PackageImpl#getAddress()
-     * @generated
-     */
-    EClass ADDRESS = eINSTANCE.getAddress();
-
-    /**
-     * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * 
-     * @generated
-     */
-    EAttribute ADDRESS__NAME = eINSTANCE.getAddress_Name();
-
-    /**
-     * The meta object literal for the '<em><b>Street</b></em>' attribute feature. <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * 
-     * @generated
-     */
-    EAttribute ADDRESS__STREET = eINSTANCE.getAddress_Street();
-
-    /**
-     * The meta object literal for the '<em><b>City</b></em>' attribute feature. <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * 
-     * @generated
-     */
-    EAttribute ADDRESS__CITY = eINSTANCE.getAddress_City();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.CompanyImpl
-     * <em>Company</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.CompanyImpl
-     * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.Model1PackageImpl#getCompany()
-     * @generated
-     */
-    EClass COMPANY = eINSTANCE.getCompany();
-
-    /**
-     * The meta object literal for the '<em><b>Categories</b></em>' containment reference list feature. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    EReference COMPANY__CATEGORIES = eINSTANCE.getCompany_Categories();
-
-    /**
-     * The meta object literal for the '<em><b>Suppliers</b></em>' containment reference list feature. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    EReference COMPANY__SUPPLIERS = eINSTANCE.getCompany_Suppliers();
-
-    /**
-     * The meta object literal for the '<em><b>Customers</b></em>' containment reference list feature. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    EReference COMPANY__CUSTOMERS = eINSTANCE.getCompany_Customers();
-
-    /**
-     * The meta object literal for the '<em><b>Purchase Orders</b></em>' containment reference list feature. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    EReference COMPANY__PURCHASE_ORDERS = eINSTANCE.getCompany_PurchaseOrders();
-
-    /**
-     * The meta object literal for the '<em><b>Sales Orders</b></em>' containment reference list feature. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    EReference COMPANY__SALES_ORDERS = eINSTANCE.getCompany_SalesOrders();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.SupplierImpl
-     * <em>Supplier</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.SupplierImpl
-     * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.Model1PackageImpl#getSupplier()
-     * @generated
-     */
-    EClass SUPPLIER = eINSTANCE.getSupplier();
-
-    /**
-     * The meta object literal for the '<em><b>Purchase Orders</b></em>' reference list feature. <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    EReference SUPPLIER__PURCHASE_ORDERS = eINSTANCE.getSupplier_PurchaseOrders();
-
-    /**
-     * The meta object literal for the '<em><b>Preferred</b></em>' attribute feature. <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * 
-     * @generated
-     */
-    EAttribute SUPPLIER__PREFERRED = eINSTANCE.getSupplier_Preferred();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.CustomerImpl
-     * <em>Customer</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.CustomerImpl
-     * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.Model1PackageImpl#getCustomer()
-     * @generated
-     */
-    EClass CUSTOMER = eINSTANCE.getCustomer();
-
-    /**
-     * The meta object literal for the '<em><b>Sales Orders</b></em>' reference list feature. <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    EReference CUSTOMER__SALES_ORDERS = eINSTANCE.getCustomer_SalesOrders();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.OrderImpl <em>Order</em>}'
-     * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.OrderImpl
-     * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.Model1PackageImpl#getOrder()
-     * @generated
-     */
-    EClass ORDER = eINSTANCE.getOrder();
-
-    /**
-     * The meta object literal for the '<em><b>Order Details</b></em>' containment reference list feature. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    EReference ORDER__ORDER_DETAILS = eINSTANCE.getOrder_OrderDetails();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.OrderDetailImpl
-     * <em>Order Detail</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.OrderDetailImpl
-     * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.Model1PackageImpl#getOrderDetail()
-     * @generated
-     */
-    EClass ORDER_DETAIL = eINSTANCE.getOrderDetail();
-
-    /**
-     * The meta object literal for the '<em><b>Order</b></em>' container reference feature. <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * 
-     * @generated
-     */
-    EReference ORDER_DETAIL__ORDER = eINSTANCE.getOrderDetail_Order();
-
-    /**
-     * The meta object literal for the '<em><b>Product</b></em>' reference feature. <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * 
-     * @generated
-     */
-    EReference ORDER_DETAIL__PRODUCT = eINSTANCE.getOrderDetail_Product();
-
-    /**
-     * The meta object literal for the '<em><b>Price</b></em>' attribute feature. <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * 
-     * @generated
-     */
-    EAttribute ORDER_DETAIL__PRICE = eINSTANCE.getOrderDetail_Price();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.PurchaseOrderImpl
-     * <em>Purchase Order</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.PurchaseOrderImpl
-     * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.Model1PackageImpl#getPurchaseOrder()
-     * @generated
-     */
-    EClass PURCHASE_ORDER = eINSTANCE.getPurchaseOrder();
-
-    /**
-     * The meta object literal for the '<em><b>Date</b></em>' attribute feature. <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * 
-     * @generated
-     */
-    EAttribute PURCHASE_ORDER__DATE = eINSTANCE.getPurchaseOrder_Date();
-
-    /**
-     * The meta object literal for the '<em><b>Supplier</b></em>' reference feature. <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * 
-     * @generated
-     */
-    EReference PURCHASE_ORDER__SUPPLIER = eINSTANCE.getPurchaseOrder_Supplier();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.SalesOrderImpl
-     * <em>Sales Order</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.SalesOrderImpl
-     * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.Model1PackageImpl#getSalesOrder()
-     * @generated
-     */
-    EClass SALES_ORDER = eINSTANCE.getSalesOrder();
-
-    /**
-     * The meta object literal for the '<em><b>Id</b></em>' attribute feature. <!-- begin-user-doc --> <!-- end-user-doc
-     * -->
-     * 
-     * @generated
-     */
-    EAttribute SALES_ORDER__ID = eINSTANCE.getSalesOrder_Id();
-
-    /**
-     * The meta object literal for the '<em><b>Customer</b></em>' reference feature. <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * 
-     * @generated
-     */
-    EReference SALES_ORDER__CUSTOMER = eINSTANCE.getSalesOrder_Customer();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.CategoryImpl
-     * <em>Category</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.CategoryImpl
-     * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.Model1PackageImpl#getCategory()
-     * @generated
-     */
-    EClass CATEGORY = eINSTANCE.getCategory();
-
-    /**
-     * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * 
-     * @generated
-     */
-    EAttribute CATEGORY__NAME = eINSTANCE.getCategory_Name();
-
-    /**
-     * The meta object literal for the '<em><b>Categories</b></em>' containment reference list feature. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    EReference CATEGORY__CATEGORIES = eINSTANCE.getCategory_Categories();
-
-    /**
-     * The meta object literal for the '<em><b>Products</b></em>' containment reference list feature. <!--
-     * begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    EReference CATEGORY__PRODUCTS = eINSTANCE.getCategory_Products();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.Product1Impl
-     * <em>Product1</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.Product1Impl
-     * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.Model1PackageImpl#getProduct1()
-     * @generated
-     */
-    EClass PRODUCT1 = eINSTANCE.getProduct1();
-
-    /**
-     * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * 
-     * @generated
-     */
-    EAttribute PRODUCT1__NAME = eINSTANCE.getProduct1_Name();
-
-    /**
-     * The meta object literal for the '<em><b>Order Details</b></em>' reference list feature. <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * 
-     * @generated
-     */
-    EReference PRODUCT1__ORDER_DETAILS = eINSTANCE.getProduct1_OrderDetails();
-
-    /**
-     * The meta object literal for the '<em><b>Vat</b></em>' attribute feature. <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * 
-     * @generated
-     */
-    EAttribute PRODUCT1__VAT = eINSTANCE.getProduct1_Vat();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.OrderAddressImpl
-     * <em>Order Address</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.OrderAddressImpl
-     * @see org.eclipse.emf.cdo.tests.legacy.model1.impl.Model1PackageImpl#getOrderAddress()
-     * @generated
-     */
-    EClass ORDER_ADDRESS = eINSTANCE.getOrderAddress();
-
-    /**
-     * The meta object literal for the '<em><b>Test Attribute</b></em>' attribute feature. <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * 
-     * @generated
-     */
-    EAttribute ORDER_ADDRESS__TEST_ATTRIBUTE = eINSTANCE.getOrderAddress_TestAttribute();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.legacy.model1.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
-     */
-    EEnum VAT = eINSTANCE.getVAT();
-
-  }
-
-} // Model1Package
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/AddressImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/AddressImpl.java
deleted file mode 100644
index 3e07c4cf7f..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/AddressImpl.java
+++ /dev/null
@@ -1,302 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: AddressImpl.java,v 1.2 2008-09-18 12:57:08 estepper Exp $
- */
-package org.eclipse.emf.cdo.tests.legacy.model1.impl;
-
-import org.eclipse.emf.cdo.tests.legacy.model1.Model1Package;
-import org.eclipse.emf.cdo.tests.model1.Address;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
-/**
- * <!-- begin-user-doc --> An implementation of the model object '<em><b>Address</b></em>'. <!-- end-user-doc -->
- * <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>
- * </ul>
- * </p>
- * 
- * @generated
- */
-public class AddressImpl extends EObjectImpl implements Address
-{
-  /**
-   * The default value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
-   * -->
-   * 
-   * @see #getName()
-   * @generated
-   * @ordered
-   */
-  protected static final String NAME_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @see #getName()
-   * @generated
-   * @ordered
-   */
-  protected String name = NAME_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #getStreet() <em>Street</em>}' attribute. <!-- begin-user-doc --> <!--
-   * end-user-doc -->
-   * 
-   * @see #getStreet()
-   * @generated
-   * @ordered
-   */
-  protected static final String STREET_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getStreet() <em>Street</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
-   * -->
-   * 
-   * @see #getStreet()
-   * @generated
-   * @ordered
-   */
-  protected String street = STREET_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #getCity() <em>City</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
-   * -->
-   * 
-   * @see #getCity()
-   * @generated
-   * @ordered
-   */
-  protected static final String CITY_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getCity() <em>City</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @see #getCity()
-   * @generated
-   * @ordered
-   */
-  protected String city = CITY_EDEFAULT;
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  protected AddressImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return Model1Package.Literals.ADDRESS;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public String getName()
-  {
-    eFireRead(Model1Package.ADDRESS__NAME);
-    return name;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public void setName(String newName)
-  {
-    eFireWrite(Model1Package.ADDRESS__NAME);
-    String oldName = name;
-    name = newName;
-    if (eNotificationRequired())
-    {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model1Package.ADDRESS__NAME, oldName, name));
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public String getStreet()
-  {
-    eFireRead(Model1Package.ADDRESS__STREET);
-    return street;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public void setStreet(String newStreet)
-  {
-    eFireWrite(Model1Package.ADDRESS__STREET);
-    String oldStreet = street;
-    street = newStreet;
-    if (eNotificationRequired())
-    {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model1Package.ADDRESS__STREET, oldStreet, street));
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public String getCity()
-  {
-    eFireRead(Model1Package.ADDRESS__CITY);
-    return city;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public void setCity(String newCity)
-  {
-    eFireWrite(Model1Package.ADDRESS__CITY);
-    String oldCity = city;
-    city = newCity;
-    if (eNotificationRequired())
-    {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model1Package.ADDRESS__CITY, oldCity, city));
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-    case Model1Package.ADDRESS__NAME:
-      return getName();
-    case Model1Package.ADDRESS__STREET:
-      return getStreet();
-    case Model1Package.ADDRESS__CITY:
-      return getCity();
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-    case Model1Package.ADDRESS__NAME:
-      setName((String)newValue);
-      return;
-    case Model1Package.ADDRESS__STREET:
-      setStreet((String)newValue);
-      return;
-    case Model1Package.ADDRESS__CITY:
-      setCity((String)newValue);
-      return;
-    }
-    super.eSet(featureID, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-    case Model1Package.ADDRESS__NAME:
-      setName(NAME_EDEFAULT);
-      return;
-    case Model1Package.ADDRESS__STREET:
-      setStreet(STREET_EDEFAULT);
-      return;
-    case Model1Package.ADDRESS__CITY:
-      setCity(CITY_EDEFAULT);
-      return;
-    }
-    super.eUnset(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-    case Model1Package.ADDRESS__NAME:
-      return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-    case Model1Package.ADDRESS__STREET:
-      return STREET_EDEFAULT == null ? street != null : !STREET_EDEFAULT.equals(street);
-    case Model1Package.ADDRESS__CITY:
-      return CITY_EDEFAULT == null ? city != null : !CITY_EDEFAULT.equals(city);
-    }
-    return super.eIsSet(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  public String toString()
-  {
-    if (eIsProxy())
-    {
-      return super.toString();
-    }
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (name: ");
-    result.append(name);
-    result.append(", street: ");
-    result.append(street);
-    result.append(", city: ");
-    result.append(city);
-    result.append(')');
-    return result.toString();
-  }
-
-} // AddressImpl
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/CategoryImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/CategoryImpl.java
deleted file mode 100644
index dc7f8688f3..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/CategoryImpl.java
+++ /dev/null
@@ -1,284 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: CategoryImpl.java,v 1.2 2008-09-18 12:57:08 estepper Exp $
- */
-package org.eclipse.emf.cdo.tests.legacy.model1.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.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import java.util.Collection;
-
-/**
- * <!-- begin-user-doc --> An implementation of the model object '<em><b>Category</b></em>'. <!-- end-user-doc -->
- * <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>
- * </ul>
- * </p>
- * 
- * @generated
- */
-public class CategoryImpl extends EObjectImpl implements Category
-{
-  /**
-   * The default value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
-   * -->
-   * 
-   * @see #getName()
-   * @generated
-   * @ordered
-   */
-  protected static final String NAME_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @see #getName()
-   * @generated
-   * @ordered
-   */
-  protected String name = NAME_EDEFAULT;
-
-  /**
-   * The cached value of the '{@link #getCategories() <em>Categories</em>}' containment reference list. <!--
-   * begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @see #getCategories()
-   * @generated
-   * @ordered
-   */
-  protected EList<Category> categories;
-
-  /**
-   * The cached value of the '{@link #getProducts() <em>Products</em>}' containment reference list. <!-- begin-user-doc
-   * --> <!-- end-user-doc -->
-   * 
-   * @see #getProducts()
-   * @generated
-   * @ordered
-   */
-  protected EList<Product1> products;
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  protected CategoryImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return Model1Package.Literals.CATEGORY;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public String getName()
-  {
-    eFireRead(Model1Package.CATEGORY__NAME);
-    return name;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public void setName(String newName)
-  {
-    eFireWrite(Model1Package.CATEGORY__NAME);
-    String oldName = name;
-    name = newName;
-    if (eNotificationRequired())
-    {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model1Package.CATEGORY__NAME, oldName, name));
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public EList<Category> getCategories()
-  {
-    if (categories == null)
-    {
-      categories = new EObjectContainmentEList<Category>(Category.class, this, Model1Package.CATEGORY__CATEGORIES)
-          .readWriteFiringList();
-    }
-    return categories;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public EList<Product1> getProducts()
-  {
-    if (products == null)
-    {
-      products = new EObjectContainmentEList<Product1>(Product1.class, this, Model1Package.CATEGORY__PRODUCTS)
-          .readWriteFiringList();
-    }
-    return products;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-  {
-    switch (featureID)
-    {
-    case Model1Package.CATEGORY__CATEGORIES:
-      return ((InternalEList<?>)getCategories()).basicRemove(otherEnd, msgs);
-    case Model1Package.CATEGORY__PRODUCTS:
-      return ((InternalEList<?>)getProducts()).basicRemove(otherEnd, msgs);
-    }
-    return super.eInverseRemove(otherEnd, featureID, msgs);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-    case Model1Package.CATEGORY__NAME:
-      return getName();
-    case Model1Package.CATEGORY__CATEGORIES:
-      return getCategories();
-    case Model1Package.CATEGORY__PRODUCTS:
-      return getProducts();
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @SuppressWarnings("unchecked")
-  @Override
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-    case Model1Package.CATEGORY__NAME:
-      setName((String)newValue);
-      return;
-    case Model1Package.CATEGORY__CATEGORIES:
-      getCategories().clear();
-      getCategories().addAll((Collection<? extends Category>)newValue);
-      return;
-    case Model1Package.CATEGORY__PRODUCTS:
-      getProducts().clear();
-      getProducts().addAll((Collection<? extends Product1>)newValue);
-      return;
-    }
-    super.eSet(featureID, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-    case Model1Package.CATEGORY__NAME:
-      setName(NAME_EDEFAULT);
-      return;
-    case Model1Package.CATEGORY__CATEGORIES:
-      getCategories().clear();
-      return;
-    case Model1Package.CATEGORY__PRODUCTS:
-      getProducts().clear();
-      return;
-    }
-    super.eUnset(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-    case Model1Package.CATEGORY__NAME:
-      return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-    case Model1Package.CATEGORY__CATEGORIES:
-      return categories != null && !categories.isEmpty();
-    case Model1Package.CATEGORY__PRODUCTS:
-      return products != null && !products.isEmpty();
-    }
-    return super.eIsSet(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  public String toString()
-  {
-    if (eIsProxy())
-    {
-      return super.toString();
-    }
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (name: ");
-    result.append(name);
-    result.append(')');
-    return result.toString();
-  }
-
-} // CategoryImpl
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/CompanyImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/CompanyImpl.java
deleted file mode 100644
index 9c9510568f..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/CompanyImpl.java
+++ /dev/null
@@ -1,325 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: CompanyImpl.java,v 1.2 2008-09-18 12:57:08 estepper Exp $
- */
-package org.eclipse.emf.cdo.tests.legacy.model1.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.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import java.util.Collection;
-
-/**
- * <!-- begin-user-doc --> An implementation of the model object '<em><b>Company</b></em>'. <!-- end-user-doc -->
- * <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>
- * </ul>
- * </p>
- * 
- * @generated
- */
-public class CompanyImpl extends AddressImpl implements Company
-{
-  /**
-   * The cached value of the '{@link #getCategories() <em>Categories</em>}' containment reference list. <!--
-   * begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @see #getCategories()
-   * @generated
-   * @ordered
-   */
-  protected EList<Category> categories;
-
-  /**
-   * The cached value of the '{@link #getSuppliers() <em>Suppliers</em>}' containment reference list. <!--
-   * begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @see #getSuppliers()
-   * @generated
-   * @ordered
-   */
-  protected EList<Supplier> suppliers;
-
-  /**
-   * The cached value of the '{@link #getCustomers() <em>Customers</em>}' containment reference list. <!--
-   * begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @see #getCustomers()
-   * @generated
-   * @ordered
-   */
-  protected EList<Customer> customers;
-
-  /**
-   * The cached value of the '{@link #getPurchaseOrders() <em>Purchase Orders</em>}' containment reference list. <!--
-   * begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @see #getPurchaseOrders()
-   * @generated
-   * @ordered
-   */
-  protected EList<PurchaseOrder> purchaseOrders;
-
-  /**
-   * The cached value of the '{@link #getSalesOrders() <em>Sales Orders</em>}' containment reference list. <!--
-   * begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @see #getSalesOrders()
-   * @generated
-   * @ordered
-   */
-  protected EList<SalesOrder> salesOrders;
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  protected CompanyImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return Model1Package.Literals.COMPANY;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public EList<Category> getCategories()
-  {
-    if (categories == null)
-    {
-      categories = new EObjectContainmentEList<Category>(Category.class, this, Model1Package.COMPANY__CATEGORIES)
-          .readWriteFiringList();
-    }
-    return categories;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public EList<Supplier> getSuppliers()
-  {
-    if (suppliers == null)
-    {
-      suppliers = new EObjectContainmentEList<Supplier>(Supplier.class, this, Model1Package.COMPANY__SUPPLIERS)
-          .readWriteFiringList();
-    }
-    return suppliers;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public EList<Customer> getCustomers()
-  {
-    if (customers == null)
-    {
-      customers = new EObjectContainmentEList<Customer>(Customer.class, this, Model1Package.COMPANY__CUSTOMERS)
-          .readWriteFiringList();
-    }
-    return customers;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public EList<PurchaseOrder> getPurchaseOrders()
-  {
-    if (purchaseOrders == null)
-    {
-      purchaseOrders = new EObjectContainmentEList<PurchaseOrder>(PurchaseOrder.class, this,
-          Model1Package.COMPANY__PURCHASE_ORDERS).readWriteFiringList();
-    }
-    return purchaseOrders;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public EList<SalesOrder> getSalesOrders()
-  {
-    if (salesOrders == null)
-    {
-      salesOrders = new EObjectContainmentEList<SalesOrder>(SalesOrder.class, this, Model1Package.COMPANY__SALES_ORDERS)
-          .readWriteFiringList();
-    }
-    return salesOrders;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-  {
-    switch (featureID)
-    {
-    case Model1Package.COMPANY__CATEGORIES:
-      return ((InternalEList<?>)getCategories()).basicRemove(otherEnd, msgs);
-    case Model1Package.COMPANY__SUPPLIERS:
-      return ((InternalEList<?>)getSuppliers()).basicRemove(otherEnd, msgs);
-    case Model1Package.COMPANY__CUSTOMERS:
-      return ((InternalEList<?>)getCustomers()).basicRemove(otherEnd, msgs);
-    case Model1Package.COMPANY__PURCHASE_ORDERS:
-      return ((InternalEList<?>)getPurchaseOrders()).basicRemove(otherEnd, msgs);
-    case Model1Package.COMPANY__SALES_ORDERS:
-      return ((InternalEList<?>)getSalesOrders()).basicRemove(otherEnd, msgs);
-    }
-    return super.eInverseRemove(otherEnd, featureID, msgs);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-    case Model1Package.COMPANY__CATEGORIES:
-      return getCategories();
-    case Model1Package.COMPANY__SUPPLIERS:
-      return getSuppliers();
-    case Model1Package.COMPANY__CUSTOMERS:
-      return getCustomers();
-    case Model1Package.COMPANY__PURCHASE_ORDERS:
-      return getPurchaseOrders();
-    case Model1Package.COMPANY__SALES_ORDERS:
-      return getSalesOrders();
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @SuppressWarnings("unchecked")
-  @Override
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-    case Model1Package.COMPANY__CATEGORIES:
-      getCategories().clear();
-      getCategories().addAll((Collection<? extends Category>)newValue);
-      return;
-    case Model1Package.COMPANY__SUPPLIERS:
-      getSuppliers().clear();
-      getSuppliers().addAll((Collection<? extends Supplier>)newValue);
-      return;
-    case Model1Package.COMPANY__CUSTOMERS:
-      getCustomers().clear();
-      getCustomers().addAll((Collection<? extends Customer>)newValue);
-      return;
-    case Model1Package.COMPANY__PURCHASE_ORDERS:
-      getPurchaseOrders().clear();
-      getPurchaseOrders().addAll((Collection<? extends PurchaseOrder>)newValue);
-      return;
-    case Model1Package.COMPANY__SALES_ORDERS:
-      getSalesOrders().clear();
-      getSalesOrders().addAll((Collection<? extends SalesOrder>)newValue);
-      return;
-    }
-    super.eSet(featureID, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-    case Model1Package.COMPANY__CATEGORIES:
-      getCategories().clear();
-      return;
-    case Model1Package.COMPANY__SUPPLIERS:
-      getSuppliers().clear();
-      return;
-    case Model1Package.COMPANY__CUSTOMERS:
-      getCustomers().clear();
-      return;
-    case Model1Package.COMPANY__PURCHASE_ORDERS:
-      getPurchaseOrders().clear();
-      return;
-    case Model1Package.COMPANY__SALES_ORDERS:
-      getSalesOrders().clear();
-      return;
-    }
-    super.eUnset(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-    case Model1Package.COMPANY__CATEGORIES:
-      return categories != null && !categories.isEmpty();
-    case Model1Package.COMPANY__SUPPLIERS:
-      return suppliers != null && !suppliers.isEmpty();
-    case Model1Package.COMPANY__CUSTOMERS:
-      return customers != null && !customers.isEmpty();
-    case Model1Package.COMPANY__PURCHASE_ORDERS:
-      return purchaseOrders != null && !purchaseOrders.isEmpty();
-    case Model1Package.COMPANY__SALES_ORDERS:
-      return salesOrders != null && !salesOrders.isEmpty();
-    }
-    return super.eIsSet(featureID);
-  }
-
-} // CompanyImpl
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/CustomerImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/CustomerImpl.java
deleted file mode 100644
index 9103850918..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/CustomerImpl.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: CustomerImpl.java,v 1.2 2008-09-18 12:57:08 estepper Exp $
- */
-package org.eclipse.emf.cdo.tests.legacy.model1.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.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import java.util.Collection;
-
-/**
- * <!-- begin-user-doc --> An implementation of the model object '<em><b>Customer</b></em>'. <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.CustomerImpl#getSalesOrders <em>Sales Orders</em>}</li>
- * </ul>
- * </p>
- * 
- * @generated
- */
-public class CustomerImpl extends AddressImpl implements Customer
-{
-  /**
-   * The cached value of the '{@link #getSalesOrders() <em>Sales Orders</em>}' reference list. <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * 
-   * @see #getSalesOrders()
-   * @generated
-   * @ordered
-   */
-  protected EList<SalesOrder> salesOrders;
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  protected CustomerImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return Model1Package.Literals.CUSTOMER;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public EList<SalesOrder> getSalesOrders()
-  {
-    if (salesOrders == null)
-    {
-      salesOrders = new EObjectWithInverseResolvingEList<SalesOrder>(SalesOrder.class, this,
-          Model1Package.CUSTOMER__SALES_ORDERS, Model1Package.SALES_ORDER__CUSTOMER).readWriteFiringList();
-    }
-    return salesOrders;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @SuppressWarnings("unchecked")
-  @Override
-  public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-  {
-    switch (featureID)
-    {
-    case Model1Package.CUSTOMER__SALES_ORDERS:
-      return ((InternalEList<InternalEObject>)(InternalEList<?>)getSalesOrders()).basicAdd(otherEnd, msgs);
-    }
-    return super.eInverseAdd(otherEnd, featureID, msgs);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-  {
-    switch (featureID)
-    {
-    case Model1Package.CUSTOMER__SALES_ORDERS:
-      return ((InternalEList<?>)getSalesOrders()).basicRemove(otherEnd, msgs);
-    }
-    return super.eInverseRemove(otherEnd, featureID, msgs);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-    case Model1Package.CUSTOMER__SALES_ORDERS:
-      return getSalesOrders();
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @SuppressWarnings("unchecked")
-  @Override
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-    case Model1Package.CUSTOMER__SALES_ORDERS:
-      getSalesOrders().clear();
-      getSalesOrders().addAll((Collection<? extends SalesOrder>)newValue);
-      return;
-    }
-    super.eSet(featureID, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-    case Model1Package.CUSTOMER__SALES_ORDERS:
-      getSalesOrders().clear();
-      return;
-    }
-    super.eUnset(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-    case Model1Package.CUSTOMER__SALES_ORDERS:
-      return salesOrders != null && !salesOrders.isEmpty();
-    }
-    return super.eIsSet(featureID);
-  }
-
-} // CustomerImpl
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/Model1FactoryImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/Model1FactoryImpl.java
deleted file mode 100644
index 05cdd88a1c..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/Model1FactoryImpl.java
+++ /dev/null
@@ -1,311 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Model1FactoryImpl.java,v 1.2 2008-09-18 12:57:08 estepper Exp $
- */
-package org.eclipse.emf.cdo.tests.legacy.model1.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;
-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.VAT;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-/**
- * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!-- end-user-doc -->
- * 
- * @generated
- */
-public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory
-{
-  /**
-   * Creates the default factory implementation. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public static Model1Factory init()
-  {
-    try
-    {
-      Model1Factory theModel1Factory = (Model1Factory)EPackage.Registry.INSTANCE
-          .getEFactory("http://www.eclipse.org/emf/CDO/tests/model1/1.0.0");
-      if (theModel1Factory != null)
-      {
-        return theModel1Factory;
-      }
-    }
-    catch (Exception exception)
-    {
-      EcorePlugin.INSTANCE.log(exception);
-    }
-    return new Model1FactoryImpl();
-  }
-
-  /**
-   * Creates an instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public Model1FactoryImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  public EObject create(EClass eClass)
-  {
-    switch (eClass.getClassifierID())
-    {
-    case Model1Package.ADDRESS:
-      return createAddress();
-    case Model1Package.COMPANY:
-      return createCompany();
-    case Model1Package.SUPPLIER:
-      return createSupplier();
-    case Model1Package.CUSTOMER:
-      return createCustomer();
-    case Model1Package.ORDER:
-      return createOrder();
-    case Model1Package.ORDER_DETAIL:
-      return createOrderDetail();
-    case Model1Package.PURCHASE_ORDER:
-      return createPurchaseOrder();
-    case Model1Package.SALES_ORDER:
-      return createSalesOrder();
-    case Model1Package.CATEGORY:
-      return createCategory();
-    case Model1Package.PRODUCT1:
-      return createProduct1();
-    case Model1Package.ORDER_ADDRESS:
-      return createOrderAddress();
-    default:
-      throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  public Object createFromString(EDataType eDataType, String initialValue)
-  {
-    switch (eDataType.getClassifierID())
-    {
-    case Model1Package.VAT:
-      return createVATFromString(eDataType, initialValue);
-    default:
-      throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  public String convertToString(EDataType eDataType, Object instanceValue)
-  {
-    switch (eDataType.getClassifierID())
-    {
-    case Model1Package.VAT:
-      return convertVATToString(eDataType, instanceValue);
-    default:
-      throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public Address createAddress()
-  {
-    AddressImpl address = new AddressImpl();
-    return address;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public Company createCompany()
-  {
-    CompanyImpl company = new CompanyImpl();
-    return company;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public Supplier createSupplier()
-  {
-    SupplierImpl supplier = new SupplierImpl();
-    return supplier;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public Customer createCustomer()
-  {
-    CustomerImpl customer = new CustomerImpl();
-    return customer;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public Order createOrder()
-  {
-    OrderImpl order = new OrderImpl();
-    return order;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public OrderDetail createOrderDetail()
-  {
-    OrderDetailImpl orderDetail = new OrderDetailImpl();
-    return orderDetail;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public PurchaseOrder createPurchaseOrder()
-  {
-    PurchaseOrderImpl purchaseOrder = new PurchaseOrderImpl();
-    return purchaseOrder;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public SalesOrder createSalesOrder()
-  {
-    SalesOrderImpl salesOrder = new SalesOrderImpl();
-    return salesOrder;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public Category createCategory()
-  {
-    CategoryImpl category = new CategoryImpl();
-    return category;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public Product1 createProduct1()
-  {
-    Product1Impl product1 = new Product1Impl();
-    return product1;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public OrderAddress createOrderAddress()
-  {
-    OrderAddressImpl orderAddress = new OrderAddressImpl();
-    return orderAddress;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public VAT createVATFromString(EDataType eDataType, String initialValue)
-  {
-    VAT result = VAT.get(initialValue);
-    if (result == null)
-    {
-      throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '"
-          + eDataType.getName() + "'");
-    }
-    return result;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public String convertVATToString(EDataType eDataType, Object instanceValue)
-  {
-    return instanceValue == null ? null : instanceValue.toString();
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public Model1Package getModel1Package()
-  {
-    return (Model1Package)getEPackage();
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @deprecated
-   * @generated
-   */
-  @Deprecated
-  public static Model1Package getPackage()
-  {
-    return Model1Package.eINSTANCE;
-  }
-
-} // Model1FactoryImpl
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/Model1PackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/Model1PackageImpl.java
deleted file mode 100644
index be7409f448..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/Model1PackageImpl.java
+++ /dev/null
@@ -1,799 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Model1PackageImpl.java,v 1.2 2008-09-18 12:57:08 estepper Exp $
- */
-package org.eclipse.emf.cdo.tests.legacy.model1.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;
-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.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;
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-
-/**
- * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!-- end-user-doc -->
- * 
- * @generated
- */
-public class Model1PackageImpl extends EPackageImpl implements Model1Package
-{
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  private EClass addressEClass = null;
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  private EClass companyEClass = null;
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  private EClass supplierEClass = null;
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  private EClass customerEClass = null;
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  private EClass orderEClass = null;
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  private EClass orderDetailEClass = null;
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  private EClass purchaseOrderEClass = null;
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  private EClass salesOrderEClass = null;
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  private EClass categoryEClass = null;
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  private EClass product1EClass = null;
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  private EClass orderAddressEClass = null;
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  private EEnum vatEEnum = null;
-
-  /**
-   * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry
-   * EPackage.Registry} by the package package URI value.
-   * <p>
-   * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also
-   * performs initialization of the package, or returns the registered package, if one already exists. <!--
-   * begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @see org.eclipse.emf.ecore.EPackage.Registry
-   * @see org.eclipse.emf.cdo.tests.legacy.model1.Model1Package#eNS_URI
-   * @see #init()
-   * @generated
-   */
-  private Model1PackageImpl()
-  {
-    super(eNS_URI, Model1Factory.eINSTANCE);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  private static boolean isInited = false;
-
-  /**
-   * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-   * Simple dependencies are satisfied by calling this method on all dependent packages before doing anything else. This
-   * method drives initialization for interdependent packages directly, in parallel with this package, itself.
-   * <p>
-   * Of this package and its interdependencies, all packages which have not yet been registered by their URI values are
-   * first created and registered. The packages are then initialized in two steps: meta-model objects for all of the
-   * packages are created before any are initialized, since one package's meta-model objects may refer to those of
-   * another.
-   * <p>
-   * Invocation of this method will not affect any packages that have already been initialized. <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * 
-   * @see #eNS_URI
-   * @see #createPackageContents()
-   * @see #initializePackageContents()
-   * @generated
-   */
-  public static Model1Package init()
-  {
-    if (isInited)
-    {
-      return (Model1Package)EPackage.Registry.INSTANCE.getEPackage(Model1Package.eNS_URI);
-    }
-
-    // Obtain or create and register package
-    Model1PackageImpl theModel1Package = (Model1PackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof Model1PackageImpl ? EPackage.Registry.INSTANCE
-        .getEPackage(eNS_URI)
-        : new Model1PackageImpl());
-
-    isInited = true;
-
-    // Create package meta-data objects
-    theModel1Package.createPackageContents();
-
-    // Initialize created meta-data
-    theModel1Package.initializePackageContents();
-
-    // Mark meta-data to indicate it can't be changed
-    theModel1Package.freeze();
-
-    return theModel1Package;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public EClass getAddress()
-  {
-    return addressEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public EAttribute getAddress_Name()
-  {
-    return (EAttribute)addressEClass.getEStructuralFeatures().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public EAttribute getAddress_Street()
-  {
-    return (EAttribute)addressEClass.getEStructuralFeatures().get(1);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public EAttribute getAddress_City()
-  {
-    return (EAttribute)addressEClass.getEStructuralFeatures().get(2);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public EClass getCompany()
-  {
-    return companyEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public EReference getCompany_Categories()
-  {
-    return (EReference)companyEClass.getEStructuralFeatures().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public EReference getCompany_Suppliers()
-  {
-    return (EReference)companyEClass.getEStructuralFeatures().get(1);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public EReference getCompany_Customers()
-  {
-    return (EReference)companyEClass.getEStructuralFeatures().get(2);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public EReference getCompany_PurchaseOrders()
-  {
-    return (EReference)companyEClass.getEStructuralFeatures().get(3);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public EReference getCompany_SalesOrders()
-  {
-    return (EReference)companyEClass.getEStructuralFeatures().get(4);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public EClass getSupplier()
-  {
-    return supplierEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public EReference getSupplier_PurchaseOrders()
-  {
-    return (EReference)supplierEClass.getEStructuralFeatures().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public EAttribute getSupplier_Preferred()
-  {
-    return (EAttribute)supplierEClass.getEStructuralFeatures().get(1);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public EClass getCustomer()
-  {
-    return customerEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public EReference getCustomer_SalesOrders()
-  {
-    return (EReference)customerEClass.getEStructuralFeatures().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public EClass getOrder()
-  {
-    return orderEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public EReference getOrder_OrderDetails()
-  {
-    return (EReference)orderEClass.getEStructuralFeatures().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public EClass getOrderDetail()
-  {
-    return orderDetailEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public EReference getOrderDetail_Order()
-  {
-    return (EReference)orderDetailEClass.getEStructuralFeatures().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public EReference getOrderDetail_Product()
-  {
-    return (EReference)orderDetailEClass.getEStructuralFeatures().get(1);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public EAttribute getOrderDetail_Price()
-  {
-    return (EAttribute)orderDetailEClass.getEStructuralFeatures().get(2);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public EClass getPurchaseOrder()
-  {
-    return purchaseOrderEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public EAttribute getPurchaseOrder_Date()
-  {
-    return (EAttribute)purchaseOrderEClass.getEStructuralFeatures().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public EReference getPurchaseOrder_Supplier()
-  {
-    return (EReference)purchaseOrderEClass.getEStructuralFeatures().get(1);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public EClass getSalesOrder()
-  {
-    return salesOrderEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public EAttribute getSalesOrder_Id()
-  {
-    return (EAttribute)salesOrderEClass.getEStructuralFeatures().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public EReference getSalesOrder_Customer()
-  {
-    return (EReference)salesOrderEClass.getEStructuralFeatures().get(1);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public EClass getCategory()
-  {
-    return categoryEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public EAttribute getCategory_Name()
-  {
-    return (EAttribute)categoryEClass.getEStructuralFeatures().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public EReference getCategory_Categories()
-  {
-    return (EReference)categoryEClass.getEStructuralFeatures().get(1);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public EReference getCategory_Products()
-  {
-    return (EReference)categoryEClass.getEStructuralFeatures().get(2);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public EClass getProduct1()
-  {
-    return product1EClass;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public EAttribute getProduct1_Name()
-  {
-    return (EAttribute)product1EClass.getEStructuralFeatures().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public EReference getProduct1_OrderDetails()
-  {
-    return (EReference)product1EClass.getEStructuralFeatures().get(1);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public EAttribute getProduct1_Vat()
-  {
-    return (EAttribute)product1EClass.getEStructuralFeatures().get(2);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public EClass getOrderAddress()
-  {
-    return orderAddressEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public EAttribute getOrderAddress_TestAttribute()
-  {
-    return (EAttribute)orderAddressEClass.getEStructuralFeatures().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public EEnum getVAT()
-  {
-    return vatEEnum;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public Model1Factory getModel1Factory()
-  {
-    return (Model1Factory)getEFactoryInstance();
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  private boolean isCreated = false;
-
-  /**
-   * Creates the meta-model objects for the package. This method is guarded to have no affect on any invocation but its
-   * first. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public void createPackageContents()
-  {
-    if (isCreated)
-    {
-      return;
-    }
-    isCreated = true;
-
-    // Create classes and their features
-    addressEClass = createEClass(ADDRESS);
-    createEAttribute(addressEClass, ADDRESS__NAME);
-    createEAttribute(addressEClass, ADDRESS__STREET);
-    createEAttribute(addressEClass, ADDRESS__CITY);
-
-    companyEClass = createEClass(COMPANY);
-    createEReference(companyEClass, COMPANY__CATEGORIES);
-    createEReference(companyEClass, COMPANY__SUPPLIERS);
-    createEReference(companyEClass, COMPANY__CUSTOMERS);
-    createEReference(companyEClass, COMPANY__PURCHASE_ORDERS);
-    createEReference(companyEClass, COMPANY__SALES_ORDERS);
-
-    supplierEClass = createEClass(SUPPLIER);
-    createEReference(supplierEClass, SUPPLIER__PURCHASE_ORDERS);
-    createEAttribute(supplierEClass, SUPPLIER__PREFERRED);
-
-    customerEClass = createEClass(CUSTOMER);
-    createEReference(customerEClass, CUSTOMER__SALES_ORDERS);
-
-    orderEClass = createEClass(ORDER);
-    createEReference(orderEClass, ORDER__ORDER_DETAILS);
-
-    orderDetailEClass = createEClass(ORDER_DETAIL);
-    createEReference(orderDetailEClass, ORDER_DETAIL__ORDER);
-    createEReference(orderDetailEClass, ORDER_DETAIL__PRODUCT);
-    createEAttribute(orderDetailEClass, ORDER_DETAIL__PRICE);
-
-    purchaseOrderEClass = createEClass(PURCHASE_ORDER);
-    createEAttribute(purchaseOrderEClass, PURCHASE_ORDER__DATE);
-    createEReference(purchaseOrderEClass, PURCHASE_ORDER__SUPPLIER);
-
-    salesOrderEClass = createEClass(SALES_ORDER);
-    createEAttribute(salesOrderEClass, SALES_ORDER__ID);
-    createEReference(salesOrderEClass, SALES_ORDER__CUSTOMER);
-
-    categoryEClass = createEClass(CATEGORY);
-    createEAttribute(categoryEClass, CATEGORY__NAME);
-    createEReference(categoryEClass, CATEGORY__CATEGORIES);
-    createEReference(categoryEClass, CATEGORY__PRODUCTS);
-
-    product1EClass = createEClass(PRODUCT1);
-    createEAttribute(product1EClass, PRODUCT1__NAME);
-    createEReference(product1EClass, PRODUCT1__ORDER_DETAILS);
-    createEAttribute(product1EClass, PRODUCT1__VAT);
-
-    orderAddressEClass = createEClass(ORDER_ADDRESS);
-    createEAttribute(orderAddressEClass, ORDER_ADDRESS__TEST_ATTRIBUTE);
-
-    // Create enums
-    vatEEnum = createEEnum(VAT);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  private boolean isInitialized = false;
-
-  /**
-   * Complete the initialization of the package and its meta-model. This method is guarded to have no affect on any
-   * invocation but its first. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public void initializePackageContents()
-  {
-    if (isInitialized)
-    {
-      return;
-    }
-    isInitialized = true;
-
-    // Initialize package
-    setName(eNAME);
-    setNsPrefix(eNS_PREFIX);
-    setNsURI(eNS_URI);
-
-    // Create type parameters
-
-    // 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());
-
-    // Initialize classes and features; add operations and parameters
-    initEClass(addressEClass, Address.class, "Address", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getAddress_Name(), ecorePackage.getEString(), "name", null, 0, 1, Address.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getAddress_Street(), ecorePackage.getEString(), "street", null, 0, 1, Address.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getAddress_City(), ecorePackage.getEString(), "city", null, 0, 1, Address.class, !IS_TRANSIENT,
-        !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,
-        !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,
-        !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,
-        !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);
-    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);
-
-    initEClass(orderEClass, Order.class, "Order", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getOrder_OrderDetails(), getOrderDetail(), getOrderDetail_Order(), "orderDetails", null, 0, -1,
-        Order.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(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,
-        !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);
-
-    initEClass(purchaseOrderEClass, PurchaseOrder.class, "PurchaseOrder", !IS_ABSTRACT, !IS_INTERFACE,
-        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,
-        !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,
-        !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,
-        !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,
-        IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    initEClass(orderAddressEClass, OrderAddress.class, "OrderAddress", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getOrderAddress_TestAttribute(), ecorePackage.getEBoolean(), "testAttribute", null, 0, 1,
-        OrderAddress.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
-
-    // Initialize enums and add enum literals
-    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);
-
-    // Create resource
-    createResource(eNS_URI);
-  }
-
-} // Model1PackageImpl
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/OrderAddressImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/OrderAddressImpl.java
deleted file mode 100644
index 7ad467d360..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/OrderAddressImpl.java
+++ /dev/null
@@ -1,623 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: OrderAddressImpl.java,v 1.2 2008-09-18 12:57:08 estepper Exp $
- */
-package org.eclipse.emf.cdo.tests.legacy.model1.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.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import java.util.Collection;
-
-/**
- * <!-- begin-user-doc --> An implementation of the model object '<em><b>Order Address</b></em>'. <!-- end-user-doc -->
- * <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>
- * </ul>
- * </p>
- * 
- * @generated
- */
-public class OrderAddressImpl extends AddressImpl implements OrderAddress
-{
-  /**
-   * The cached value of the '{@link #getOrderDetails() <em>Order Details</em>}' containment reference list. <!--
-   * begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @see #getOrderDetails()
-   * @generated
-   * @ordered
-   */
-  protected EList<OrderDetail> orderDetails;
-
-  /**
-   * The cached value of the '{@link #getProduct() <em>Product</em>}' reference. <!-- begin-user-doc --> <!--
-   * end-user-doc -->
-   * 
-   * @see #getProduct()
-   * @generated
-   * @ordered
-   */
-  protected Product1 product;
-
-  /**
-   * The default value of the '{@link #getPrice() <em>Price</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
-   * -->
-   * 
-   * @see #getPrice()
-   * @generated
-   * @ordered
-   */
-  protected static final float PRICE_EDEFAULT = 0.0F;
-
-  /**
-   * The cached value of the '{@link #getPrice() <em>Price</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
-   * -->
-   * 
-   * @see #getPrice()
-   * @generated
-   * @ordered
-   */
-  protected float price = PRICE_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #isTestAttribute() <em>Test Attribute</em>}' attribute. <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * 
-   * @see #isTestAttribute()
-   * @generated
-   * @ordered
-   */
-  protected static final boolean TEST_ATTRIBUTE_EDEFAULT = false;
-
-  /**
-   * The cached value of the '{@link #isTestAttribute() <em>Test Attribute</em>}' attribute. <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * 
-   * @see #isTestAttribute()
-   * @generated
-   * @ordered
-   */
-  protected boolean testAttribute = TEST_ATTRIBUTE_EDEFAULT;
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  protected OrderAddressImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return Model1Package.Literals.ORDER_ADDRESS;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public EList<OrderDetail> getOrderDetails()
-  {
-    if (orderDetails == null)
-    {
-      orderDetails = new EObjectContainmentWithInverseEList<OrderDetail>(OrderDetail.class, this,
-          Model1Package.ORDER_ADDRESS__ORDER_DETAILS, Model1Package.ORDER_DETAIL__ORDER).readWriteFiringList();
-    }
-    return orderDetails;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public Order getOrder()
-  {
-    eFireRead(Model1Package.ORDER_ADDRESS__ORDER);
-    if (eContainerFeatureID != Model1Package.ORDER_ADDRESS__ORDER)
-    {
-      return null;
-    }
-    return (Order)eContainer();
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public NotificationChain basicSetOrder(Order newOrder, NotificationChain msgs)
-  {
-    eFireWrite(Model1Package.ORDER_ADDRESS__ORDER);
-    msgs = eBasicSetContainer((InternalEObject)newOrder, Model1Package.ORDER_ADDRESS__ORDER, msgs);
-    return msgs;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public void setOrder(Order newOrder)
-  {
-    eFireWrite(Model1Package.ORDER_ADDRESS__ORDER);
-    if (newOrder != eInternalContainer() || eContainerFeatureID != Model1Package.ORDER_ADDRESS__ORDER
-        && newOrder != null)
-    {
-      if (EcoreUtil.isAncestor(this, newOrder))
-      {
-        throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
-      }
-      NotificationChain msgs = null;
-      if (eInternalContainer() != null)
-      {
-        msgs = eBasicRemoveFromContainer(msgs);
-      }
-      if (newOrder != null)
-      {
-        msgs = ((InternalEObject)newOrder).eInverseAdd(this, Model1Package.ORDER__ORDER_DETAILS, Order.class, msgs);
-      }
-      msgs = basicSetOrder(newOrder, msgs);
-      if (msgs != null)
-      {
-        msgs.dispatch();
-      }
-    }
-    else if (eNotificationRequired())
-    {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model1Package.ORDER_ADDRESS__ORDER, newOrder, newOrder));
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public Product1 getProduct()
-  {
-    eFireRead(Model1Package.ORDER_ADDRESS__PRODUCT);
-    if (product != null && product.eIsProxy())
-    {
-      InternalEObject oldProduct = (InternalEObject)product;
-      product = (Product1)eResolveProxy(oldProduct);
-      if (product != oldProduct)
-      {
-        if (eNotificationRequired())
-        {
-          eNotify(new ENotificationImpl(this, Notification.RESOLVE, Model1Package.ORDER_ADDRESS__PRODUCT, oldProduct,
-              product));
-        }
-      }
-    }
-    return product;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public Product1 basicGetProduct()
-  {
-    eFireRead(Model1Package.ORDER_ADDRESS__PRODUCT);
-    return product;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public NotificationChain basicSetProduct(Product1 newProduct, NotificationChain msgs)
-  {
-    eFireWrite(Model1Package.ORDER_ADDRESS__PRODUCT);
-    Product1 oldProduct = product;
-    product = newProduct;
-    if (eNotificationRequired())
-    {
-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
-          Model1Package.ORDER_ADDRESS__PRODUCT, oldProduct, newProduct);
-      if (msgs == null)
-      {
-        msgs = notification;
-      }
-      else
-      {
-        msgs.add(notification);
-      }
-    }
-    return msgs;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public void setProduct(Product1 newProduct)
-  {
-    eFireWrite(Model1Package.ORDER_ADDRESS__PRODUCT);
-    if (newProduct != product)
-    {
-      NotificationChain msgs = null;
-      if (product != null)
-      {
-        msgs = ((InternalEObject)product).eInverseRemove(this, Model1Package.PRODUCT1__ORDER_DETAILS, Product1.class,
-            msgs);
-      }
-      if (newProduct != null)
-      {
-        msgs = ((InternalEObject)newProduct).eInverseAdd(this, Model1Package.PRODUCT1__ORDER_DETAILS, Product1.class,
-            msgs);
-      }
-      msgs = basicSetProduct(newProduct, msgs);
-      if (msgs != null)
-      {
-        msgs.dispatch();
-      }
-    }
-    else if (eNotificationRequired())
-    {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model1Package.ORDER_ADDRESS__PRODUCT, newProduct,
-          newProduct));
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public float getPrice()
-  {
-    eFireRead(Model1Package.ORDER_ADDRESS__PRICE);
-    return price;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public void setPrice(float newPrice)
-  {
-    eFireWrite(Model1Package.ORDER_ADDRESS__PRICE);
-    float oldPrice = price;
-    price = newPrice;
-    if (eNotificationRequired())
-    {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model1Package.ORDER_ADDRESS__PRICE, oldPrice, price));
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public boolean isTestAttribute()
-  {
-    eFireRead(Model1Package.ORDER_ADDRESS__TEST_ATTRIBUTE);
-    return testAttribute;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public void setTestAttribute(boolean newTestAttribute)
-  {
-    eFireWrite(Model1Package.ORDER_ADDRESS__TEST_ATTRIBUTE);
-    boolean oldTestAttribute = testAttribute;
-    testAttribute = newTestAttribute;
-    if (eNotificationRequired())
-    {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model1Package.ORDER_ADDRESS__TEST_ATTRIBUTE,
-          oldTestAttribute, testAttribute));
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @SuppressWarnings("unchecked")
-  @Override
-  public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-  {
-    switch (featureID)
-    {
-    case Model1Package.ORDER_ADDRESS__ORDER_DETAILS:
-      return ((InternalEList<InternalEObject>)(InternalEList<?>)getOrderDetails()).basicAdd(otherEnd, msgs);
-    case Model1Package.ORDER_ADDRESS__ORDER:
-      if (eInternalContainer() != null)
-      {
-        msgs = eBasicRemoveFromContainer(msgs);
-      }
-      return basicSetOrder((Order)otherEnd, msgs);
-    case Model1Package.ORDER_ADDRESS__PRODUCT:
-      if (product != null)
-      {
-        msgs = ((InternalEObject)product).eInverseRemove(this, Model1Package.PRODUCT1__ORDER_DETAILS, Product1.class,
-            msgs);
-      }
-      return basicSetProduct((Product1)otherEnd, msgs);
-    }
-    return super.eInverseAdd(otherEnd, featureID, msgs);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-  {
-    switch (featureID)
-    {
-    case Model1Package.ORDER_ADDRESS__ORDER_DETAILS:
-      return ((InternalEList<?>)getOrderDetails()).basicRemove(otherEnd, msgs);
-    case Model1Package.ORDER_ADDRESS__ORDER:
-      return basicSetOrder(null, msgs);
-    case Model1Package.ORDER_ADDRESS__PRODUCT:
-      return basicSetProduct(null, msgs);
-    }
-    return super.eInverseRemove(otherEnd, featureID, msgs);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs)
-  {
-    switch (eContainerFeatureID)
-    {
-    case Model1Package.ORDER_ADDRESS__ORDER:
-      return eInternalContainer().eInverseRemove(this, Model1Package.ORDER__ORDER_DETAILS, Order.class, msgs);
-    }
-    return super.eBasicRemoveFromContainerFeature(msgs);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-    case Model1Package.ORDER_ADDRESS__ORDER_DETAILS:
-      return getOrderDetails();
-    case Model1Package.ORDER_ADDRESS__ORDER:
-      return getOrder();
-    case Model1Package.ORDER_ADDRESS__PRODUCT:
-      if (resolve)
-      {
-        return getProduct();
-      }
-      return basicGetProduct();
-    case Model1Package.ORDER_ADDRESS__PRICE:
-      return new Float(getPrice());
-    case Model1Package.ORDER_ADDRESS__TEST_ATTRIBUTE:
-      return isTestAttribute() ? Boolean.TRUE : Boolean.FALSE;
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @SuppressWarnings("unchecked")
-  @Override
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-    case Model1Package.ORDER_ADDRESS__ORDER_DETAILS:
-      getOrderDetails().clear();
-      getOrderDetails().addAll((Collection<? extends OrderDetail>)newValue);
-      return;
-    case Model1Package.ORDER_ADDRESS__ORDER:
-      setOrder((Order)newValue);
-      return;
-    case Model1Package.ORDER_ADDRESS__PRODUCT:
-      setProduct((Product1)newValue);
-      return;
-    case Model1Package.ORDER_ADDRESS__PRICE:
-      setPrice(((Float)newValue).floatValue());
-      return;
-    case Model1Package.ORDER_ADDRESS__TEST_ATTRIBUTE:
-      setTestAttribute(((Boolean)newValue).booleanValue());
-      return;
-    }
-    super.eSet(featureID, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-    case Model1Package.ORDER_ADDRESS__ORDER_DETAILS:
-      getOrderDetails().clear();
-      return;
-    case Model1Package.ORDER_ADDRESS__ORDER:
-      setOrder((Order)null);
-      return;
-    case Model1Package.ORDER_ADDRESS__PRODUCT:
-      setProduct((Product1)null);
-      return;
-    case Model1Package.ORDER_ADDRESS__PRICE:
-      setPrice(PRICE_EDEFAULT);
-      return;
-    case Model1Package.ORDER_ADDRESS__TEST_ATTRIBUTE:
-      setTestAttribute(TEST_ATTRIBUTE_EDEFAULT);
-      return;
-    }
-    super.eUnset(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-    case Model1Package.ORDER_ADDRESS__ORDER_DETAILS:
-      return orderDetails != null && !orderDetails.isEmpty();
-    case Model1Package.ORDER_ADDRESS__ORDER:
-      return getOrder() != null;
-    case Model1Package.ORDER_ADDRESS__PRODUCT:
-      return product != null;
-    case Model1Package.ORDER_ADDRESS__PRICE:
-      return price != PRICE_EDEFAULT;
-    case Model1Package.ORDER_ADDRESS__TEST_ATTRIBUTE:
-      return testAttribute != TEST_ATTRIBUTE_EDEFAULT;
-    }
-    return super.eIsSet(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass)
-  {
-    if (baseClass == Order.class)
-    {
-      switch (derivedFeatureID)
-      {
-      case Model1Package.ORDER_ADDRESS__ORDER_DETAILS:
-        return Model1Package.ORDER__ORDER_DETAILS;
-      default:
-        return -1;
-      }
-    }
-    if (baseClass == OrderDetail.class)
-    {
-      switch (derivedFeatureID)
-      {
-      case Model1Package.ORDER_ADDRESS__ORDER:
-        return Model1Package.ORDER_DETAIL__ORDER;
-      case Model1Package.ORDER_ADDRESS__PRODUCT:
-        return Model1Package.ORDER_DETAIL__PRODUCT;
-      case Model1Package.ORDER_ADDRESS__PRICE:
-        return Model1Package.ORDER_DETAIL__PRICE;
-      default:
-        return -1;
-      }
-    }
-    return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass)
-  {
-    if (baseClass == Order.class)
-    {
-      switch (baseFeatureID)
-      {
-      case Model1Package.ORDER__ORDER_DETAILS:
-        return Model1Package.ORDER_ADDRESS__ORDER_DETAILS;
-      default:
-        return -1;
-      }
-    }
-    if (baseClass == OrderDetail.class)
-    {
-      switch (baseFeatureID)
-      {
-      case Model1Package.ORDER_DETAIL__ORDER:
-        return Model1Package.ORDER_ADDRESS__ORDER;
-      case Model1Package.ORDER_DETAIL__PRODUCT:
-        return Model1Package.ORDER_ADDRESS__PRODUCT;
-      case Model1Package.ORDER_DETAIL__PRICE:
-        return Model1Package.ORDER_ADDRESS__PRICE;
-      default:
-        return -1;
-      }
-    }
-    return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  public String toString()
-  {
-    if (eIsProxy())
-    {
-      return super.toString();
-    }
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (price: ");
-    result.append(price);
-    result.append(", testAttribute: ");
-    result.append(testAttribute);
-    result.append(')');
-    return result.toString();
-  }
-
-} // OrderAddressImpl
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/OrderDetailImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/OrderDetailImpl.java
deleted file mode 100644
index db84e2c184..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/OrderDetailImpl.java
+++ /dev/null
@@ -1,443 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: OrderDetailImpl.java,v 1.2 2008-09-18 12:57:08 estepper Exp $
- */
-package org.eclipse.emf.cdo.tests.legacy.model1.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.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-
-/**
- * <!-- begin-user-doc --> An implementation of the model object '<em><b>Order Detail</b></em>'. <!-- end-user-doc -->
- * <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>
- * </ul>
- * </p>
- * 
- * @generated
- */
-public class OrderDetailImpl extends EObjectImpl implements OrderDetail
-{
-  /**
-   * The cached value of the '{@link #getProduct() <em>Product</em>}' reference. <!-- begin-user-doc --> <!--
-   * end-user-doc -->
-   * 
-   * @see #getProduct()
-   * @generated
-   * @ordered
-   */
-  protected Product1 product;
-
-  /**
-   * The default value of the '{@link #getPrice() <em>Price</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
-   * -->
-   * 
-   * @see #getPrice()
-   * @generated
-   * @ordered
-   */
-  protected static final float PRICE_EDEFAULT = 0.0F;
-
-  /**
-   * The cached value of the '{@link #getPrice() <em>Price</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
-   * -->
-   * 
-   * @see #getPrice()
-   * @generated
-   * @ordered
-   */
-  protected float price = PRICE_EDEFAULT;
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  protected OrderDetailImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return Model1Package.Literals.ORDER_DETAIL;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public Order getOrder()
-  {
-    eFireRead(Model1Package.ORDER_DETAIL__ORDER);
-    if (eContainerFeatureID != Model1Package.ORDER_DETAIL__ORDER)
-    {
-      return null;
-    }
-    return (Order)eContainer();
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public NotificationChain basicSetOrder(Order newOrder, NotificationChain msgs)
-  {
-    eFireWrite(Model1Package.ORDER_DETAIL__ORDER);
-    msgs = eBasicSetContainer((InternalEObject)newOrder, Model1Package.ORDER_DETAIL__ORDER, msgs);
-    return msgs;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public void setOrder(Order newOrder)
-  {
-    eFireWrite(Model1Package.ORDER_DETAIL__ORDER);
-    if (newOrder != eInternalContainer() || eContainerFeatureID != Model1Package.ORDER_DETAIL__ORDER
-        && newOrder != null)
-    {
-      if (EcoreUtil.isAncestor(this, newOrder))
-      {
-        throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
-      }
-      NotificationChain msgs = null;
-      if (eInternalContainer() != null)
-      {
-        msgs = eBasicRemoveFromContainer(msgs);
-      }
-      if (newOrder != null)
-      {
-        msgs = ((InternalEObject)newOrder).eInverseAdd(this, Model1Package.ORDER__ORDER_DETAILS, Order.class, msgs);
-      }
-      msgs = basicSetOrder(newOrder, msgs);
-      if (msgs != null)
-      {
-        msgs.dispatch();
-      }
-    }
-    else if (eNotificationRequired())
-    {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model1Package.ORDER_DETAIL__ORDER, newOrder, newOrder));
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public Product1 getProduct()
-  {
-    eFireRead(Model1Package.ORDER_DETAIL__PRODUCT);
-    if (product != null && product.eIsProxy())
-    {
-      InternalEObject oldProduct = (InternalEObject)product;
-      product = (Product1)eResolveProxy(oldProduct);
-      if (product != oldProduct)
-      {
-        if (eNotificationRequired())
-        {
-          eNotify(new ENotificationImpl(this, Notification.RESOLVE, Model1Package.ORDER_DETAIL__PRODUCT, oldProduct,
-              product));
-        }
-      }
-    }
-    return product;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public Product1 basicGetProduct()
-  {
-    eFireRead(Model1Package.ORDER_DETAIL__PRODUCT);
-    return product;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public NotificationChain basicSetProduct(Product1 newProduct, NotificationChain msgs)
-  {
-    eFireWrite(Model1Package.ORDER_DETAIL__PRODUCT);
-    Product1 oldProduct = product;
-    product = newProduct;
-    if (eNotificationRequired())
-    {
-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
-          Model1Package.ORDER_DETAIL__PRODUCT, oldProduct, newProduct);
-      if (msgs == null)
-      {
-        msgs = notification;
-      }
-      else
-      {
-        msgs.add(notification);
-      }
-    }
-    return msgs;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public void setProduct(Product1 newProduct)
-  {
-    eFireWrite(Model1Package.ORDER_DETAIL__PRODUCT);
-    if (newProduct != product)
-    {
-      NotificationChain msgs = null;
-      if (product != null)
-      {
-        msgs = ((InternalEObject)product).eInverseRemove(this, Model1Package.PRODUCT1__ORDER_DETAILS, Product1.class,
-            msgs);
-      }
-      if (newProduct != null)
-      {
-        msgs = ((InternalEObject)newProduct).eInverseAdd(this, Model1Package.PRODUCT1__ORDER_DETAILS, Product1.class,
-            msgs);
-      }
-      msgs = basicSetProduct(newProduct, msgs);
-      if (msgs != null)
-      {
-        msgs.dispatch();
-      }
-    }
-    else if (eNotificationRequired())
-    {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model1Package.ORDER_DETAIL__PRODUCT, newProduct, newProduct));
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public float getPrice()
-  {
-    eFireRead(Model1Package.ORDER_DETAIL__PRICE);
-    return price;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public void setPrice(float newPrice)
-  {
-    eFireWrite(Model1Package.ORDER_DETAIL__PRICE);
-    float oldPrice = price;
-    price = newPrice;
-    if (eNotificationRequired())
-    {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model1Package.ORDER_DETAIL__PRICE, oldPrice, price));
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-  {
-    switch (featureID)
-    {
-    case Model1Package.ORDER_DETAIL__ORDER:
-      if (eInternalContainer() != null)
-      {
-        msgs = eBasicRemoveFromContainer(msgs);
-      }
-      return basicSetOrder((Order)otherEnd, msgs);
-    case Model1Package.ORDER_DETAIL__PRODUCT:
-      if (product != null)
-      {
-        msgs = ((InternalEObject)product).eInverseRemove(this, Model1Package.PRODUCT1__ORDER_DETAILS, Product1.class,
-            msgs);
-      }
-      return basicSetProduct((Product1)otherEnd, msgs);
-    }
-    return super.eInverseAdd(otherEnd, featureID, msgs);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-  {
-    switch (featureID)
-    {
-    case Model1Package.ORDER_DETAIL__ORDER:
-      return basicSetOrder(null, msgs);
-    case Model1Package.ORDER_DETAIL__PRODUCT:
-      return basicSetProduct(null, msgs);
-    }
-    return super.eInverseRemove(otherEnd, featureID, msgs);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs)
-  {
-    switch (eContainerFeatureID)
-    {
-    case Model1Package.ORDER_DETAIL__ORDER:
-      return eInternalContainer().eInverseRemove(this, Model1Package.ORDER__ORDER_DETAILS, Order.class, msgs);
-    }
-    return super.eBasicRemoveFromContainerFeature(msgs);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-    case Model1Package.ORDER_DETAIL__ORDER:
-      return getOrder();
-    case Model1Package.ORDER_DETAIL__PRODUCT:
-      if (resolve)
-      {
-        return getProduct();
-      }
-      return basicGetProduct();
-    case Model1Package.ORDER_DETAIL__PRICE:
-      return new Float(getPrice());
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-    case Model1Package.ORDER_DETAIL__ORDER:
-      setOrder((Order)newValue);
-      return;
-    case Model1Package.ORDER_DETAIL__PRODUCT:
-      setProduct((Product1)newValue);
-      return;
-    case Model1Package.ORDER_DETAIL__PRICE:
-      setPrice(((Float)newValue).floatValue());
-      return;
-    }
-    super.eSet(featureID, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-    case Model1Package.ORDER_DETAIL__ORDER:
-      setOrder((Order)null);
-      return;
-    case Model1Package.ORDER_DETAIL__PRODUCT:
-      setProduct((Product1)null);
-      return;
-    case Model1Package.ORDER_DETAIL__PRICE:
-      setPrice(PRICE_EDEFAULT);
-      return;
-    }
-    super.eUnset(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-    case Model1Package.ORDER_DETAIL__ORDER:
-      return getOrder() != null;
-    case Model1Package.ORDER_DETAIL__PRODUCT:
-      return product != null;
-    case Model1Package.ORDER_DETAIL__PRICE:
-      return price != PRICE_EDEFAULT;
-    }
-    return super.eIsSet(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  public String toString()
-  {
-    if (eIsProxy())
-    {
-      return super.toString();
-    }
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (price: ");
-    result.append(price);
-    result.append(')');
-    return result.toString();
-  }
-
-} // OrderDetailImpl
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/OrderImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/OrderImpl.java
deleted file mode 100644
index 278b6a9b97..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/OrderImpl.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: OrderImpl.java,v 1.2 2008-09-18 12:57:08 estepper Exp $
- */
-package org.eclipse.emf.cdo.tests.legacy.model1.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.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import java.util.Collection;
-
-/**
- * <!-- begin-user-doc --> An implementation of the model object '<em><b>Order</b></em>'. <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.OrderImpl#getOrderDetails <em>Order Details</em>}</li>
- * </ul>
- * </p>
- * 
- * @generated
- */
-public class OrderImpl extends EObjectImpl implements Order
-{
-  /**
-   * The cached value of the '{@link #getOrderDetails() <em>Order Details</em>}' containment reference list. <!--
-   * begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @see #getOrderDetails()
-   * @generated
-   * @ordered
-   */
-  protected EList<OrderDetail> orderDetails;
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  protected OrderImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return Model1Package.Literals.ORDER;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public EList<OrderDetail> getOrderDetails()
-  {
-    if (orderDetails == null)
-    {
-      orderDetails = new EObjectContainmentWithInverseEList<OrderDetail>(OrderDetail.class, this,
-          Model1Package.ORDER__ORDER_DETAILS, Model1Package.ORDER_DETAIL__ORDER).readWriteFiringList();
-    }
-    return orderDetails;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @SuppressWarnings("unchecked")
-  @Override
-  public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-  {
-    switch (featureID)
-    {
-    case Model1Package.ORDER__ORDER_DETAILS:
-      return ((InternalEList<InternalEObject>)(InternalEList<?>)getOrderDetails()).basicAdd(otherEnd, msgs);
-    }
-    return super.eInverseAdd(otherEnd, featureID, msgs);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-  {
-    switch (featureID)
-    {
-    case Model1Package.ORDER__ORDER_DETAILS:
-      return ((InternalEList<?>)getOrderDetails()).basicRemove(otherEnd, msgs);
-    }
-    return super.eInverseRemove(otherEnd, featureID, msgs);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-    case Model1Package.ORDER__ORDER_DETAILS:
-      return getOrderDetails();
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @SuppressWarnings("unchecked")
-  @Override
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-    case Model1Package.ORDER__ORDER_DETAILS:
-      getOrderDetails().clear();
-      getOrderDetails().addAll((Collection<? extends OrderDetail>)newValue);
-      return;
-    }
-    super.eSet(featureID, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-    case Model1Package.ORDER__ORDER_DETAILS:
-      getOrderDetails().clear();
-      return;
-    }
-    super.eUnset(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-    case Model1Package.ORDER__ORDER_DETAILS:
-      return orderDetails != null && !orderDetails.isEmpty();
-    }
-    return super.eIsSet(featureID);
-  }
-
-} // OrderImpl
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/Product1Impl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/Product1Impl.java
deleted file mode 100644
index 7c246423b4..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/Product1Impl.java
+++ /dev/null
@@ -1,321 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Product1Impl.java,v 1.2 2008-09-18 12:57:08 estepper Exp $
- */
-package org.eclipse.emf.cdo.tests.legacy.model1.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.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import java.util.Collection;
-
-/**
- * <!-- begin-user-doc --> An implementation of the model object '<em><b>Product1</b></em>'. <!-- end-user-doc -->
- * <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>
- * </ul>
- * </p>
- * 
- * @generated
- */
-public class Product1Impl extends EObjectImpl implements Product1
-{
-  /**
-   * The default value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
-   * -->
-   * 
-   * @see #getName()
-   * @generated
-   * @ordered
-   */
-  protected static final String NAME_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @see #getName()
-   * @generated
-   * @ordered
-   */
-  protected String name = NAME_EDEFAULT;
-
-  /**
-   * The cached value of the '{@link #getOrderDetails() <em>Order Details</em>}' reference list. <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * 
-   * @see #getOrderDetails()
-   * @generated
-   * @ordered
-   */
-  protected EList<OrderDetail> orderDetails;
-
-  /**
-   * The default value of the '{@link #getVat() <em>Vat</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @see #getVat()
-   * @generated
-   * @ordered
-   */
-  protected static final VAT VAT_EDEFAULT = VAT.VAT15;
-
-  /**
-   * The cached value of the '{@link #getVat() <em>Vat</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @see #getVat()
-   * @generated
-   * @ordered
-   */
-  protected VAT vat = VAT_EDEFAULT;
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  protected Product1Impl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return Model1Package.Literals.PRODUCT1;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public String getName()
-  {
-    eFireRead(Model1Package.PRODUCT1__NAME);
-    return name;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public void setName(String newName)
-  {
-    eFireWrite(Model1Package.PRODUCT1__NAME);
-    String oldName = name;
-    name = newName;
-    if (eNotificationRequired())
-    {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model1Package.PRODUCT1__NAME, oldName, name));
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public EList<OrderDetail> getOrderDetails()
-  {
-    if (orderDetails == null)
-    {
-      orderDetails = new EObjectWithInverseResolvingEList<OrderDetail>(OrderDetail.class, this,
-          Model1Package.PRODUCT1__ORDER_DETAILS, Model1Package.ORDER_DETAIL__PRODUCT).readWriteFiringList();
-    }
-    return orderDetails;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public VAT getVat()
-  {
-    eFireRead(Model1Package.PRODUCT1__VAT);
-    return vat;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public void setVat(VAT newVat)
-  {
-    eFireWrite(Model1Package.PRODUCT1__VAT);
-    VAT oldVat = vat;
-    vat = newVat == null ? VAT_EDEFAULT : newVat;
-    if (eNotificationRequired())
-    {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model1Package.PRODUCT1__VAT, oldVat, vat));
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @SuppressWarnings("unchecked")
-  @Override
-  public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-  {
-    switch (featureID)
-    {
-    case Model1Package.PRODUCT1__ORDER_DETAILS:
-      return ((InternalEList<InternalEObject>)(InternalEList<?>)getOrderDetails()).basicAdd(otherEnd, msgs);
-    }
-    return super.eInverseAdd(otherEnd, featureID, msgs);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-  {
-    switch (featureID)
-    {
-    case Model1Package.PRODUCT1__ORDER_DETAILS:
-      return ((InternalEList<?>)getOrderDetails()).basicRemove(otherEnd, msgs);
-    }
-    return super.eInverseRemove(otherEnd, featureID, msgs);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-    case Model1Package.PRODUCT1__NAME:
-      return getName();
-    case Model1Package.PRODUCT1__ORDER_DETAILS:
-      return getOrderDetails();
-    case Model1Package.PRODUCT1__VAT:
-      return getVat();
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @SuppressWarnings("unchecked")
-  @Override
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-    case Model1Package.PRODUCT1__NAME:
-      setName((String)newValue);
-      return;
-    case Model1Package.PRODUCT1__ORDER_DETAILS:
-      getOrderDetails().clear();
-      getOrderDetails().addAll((Collection<? extends OrderDetail>)newValue);
-      return;
-    case Model1Package.PRODUCT1__VAT:
-      setVat((VAT)newValue);
-      return;
-    }
-    super.eSet(featureID, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-    case Model1Package.PRODUCT1__NAME:
-      setName(NAME_EDEFAULT);
-      return;
-    case Model1Package.PRODUCT1__ORDER_DETAILS:
-      getOrderDetails().clear();
-      return;
-    case Model1Package.PRODUCT1__VAT:
-      setVat(VAT_EDEFAULT);
-      return;
-    }
-    super.eUnset(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-    case Model1Package.PRODUCT1__NAME:
-      return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-    case Model1Package.PRODUCT1__ORDER_DETAILS:
-      return orderDetails != null && !orderDetails.isEmpty();
-    case Model1Package.PRODUCT1__VAT:
-      return vat != VAT_EDEFAULT;
-    }
-    return super.eIsSet(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  public String toString()
-  {
-    if (eIsProxy())
-    {
-      return super.toString();
-    }
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (name: ");
-    result.append(name);
-    result.append(", vat: ");
-    result.append(vat);
-    result.append(')');
-    return result.toString();
-  }
-
-} // Product1Impl
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/PurchaseOrderImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/PurchaseOrderImpl.java
deleted file mode 100644
index 75a8684479..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/PurchaseOrderImpl.java
+++ /dev/null
@@ -1,344 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: PurchaseOrderImpl.java,v 1.2 2008-09-18 12:57:07 estepper Exp $
- */
-package org.eclipse.emf.cdo.tests.legacy.model1.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.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import java.util.Date;
-
-/**
- * <!-- begin-user-doc --> An implementation of the model object '<em><b>Purchase Order</b></em>'. <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.PurchaseOrderImpl#getDate <em>Date</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model1.impl.PurchaseOrderImpl#getSupplier <em>Supplier</em>}</li>
- * </ul>
- * </p>
- * 
- * @generated
- */
-public class PurchaseOrderImpl extends OrderImpl implements PurchaseOrder
-{
-  /**
-   * The default value of the '{@link #getDate() <em>Date</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
-   * -->
-   * 
-   * @see #getDate()
-   * @generated
-   * @ordered
-   */
-  protected static final Date DATE_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getDate() <em>Date</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @see #getDate()
-   * @generated
-   * @ordered
-   */
-  protected Date date = DATE_EDEFAULT;
-
-  /**
-   * The cached value of the '{@link #getSupplier() <em>Supplier</em>}' reference. <!-- begin-user-doc --> <!--
-   * end-user-doc -->
-   * 
-   * @see #getSupplier()
-   * @generated
-   * @ordered
-   */
-  protected Supplier supplier;
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  protected PurchaseOrderImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return Model1Package.Literals.PURCHASE_ORDER;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public Date getDate()
-  {
-    eFireRead(Model1Package.PURCHASE_ORDER__DATE);
-    return date;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public void setDate(Date newDate)
-  {
-    eFireWrite(Model1Package.PURCHASE_ORDER__DATE);
-    Date oldDate = date;
-    date = newDate;
-    if (eNotificationRequired())
-    {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model1Package.PURCHASE_ORDER__DATE, oldDate, date));
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public Supplier getSupplier()
-  {
-    eFireRead(Model1Package.PURCHASE_ORDER__SUPPLIER);
-    if (supplier != null && supplier.eIsProxy())
-    {
-      InternalEObject oldSupplier = (InternalEObject)supplier;
-      supplier = (Supplier)eResolveProxy(oldSupplier);
-      if (supplier != oldSupplier)
-      {
-        if (eNotificationRequired())
-        {
-          eNotify(new ENotificationImpl(this, Notification.RESOLVE, Model1Package.PURCHASE_ORDER__SUPPLIER,
-              oldSupplier, supplier));
-        }
-      }
-    }
-    return supplier;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public Supplier basicGetSupplier()
-  {
-    eFireRead(Model1Package.PURCHASE_ORDER__SUPPLIER);
-    return supplier;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public NotificationChain basicSetSupplier(Supplier newSupplier, NotificationChain msgs)
-  {
-    eFireWrite(Model1Package.PURCHASE_ORDER__SUPPLIER);
-    Supplier oldSupplier = supplier;
-    supplier = newSupplier;
-    if (eNotificationRequired())
-    {
-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
-          Model1Package.PURCHASE_ORDER__SUPPLIER, oldSupplier, newSupplier);
-      if (msgs == null)
-      {
-        msgs = notification;
-      }
-      else
-      {
-        msgs.add(notification);
-      }
-    }
-    return msgs;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public void setSupplier(Supplier newSupplier)
-  {
-    eFireWrite(Model1Package.PURCHASE_ORDER__SUPPLIER);
-    if (newSupplier != supplier)
-    {
-      NotificationChain msgs = null;
-      if (supplier != null)
-      {
-        msgs = ((InternalEObject)supplier).eInverseRemove(this, Model1Package.SUPPLIER__PURCHASE_ORDERS,
-            Supplier.class, msgs);
-      }
-      if (newSupplier != null)
-      {
-        msgs = ((InternalEObject)newSupplier).eInverseAdd(this, Model1Package.SUPPLIER__PURCHASE_ORDERS,
-            Supplier.class, msgs);
-      }
-      msgs = basicSetSupplier(newSupplier, msgs);
-      if (msgs != null)
-      {
-        msgs.dispatch();
-      }
-    }
-    else if (eNotificationRequired())
-    {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model1Package.PURCHASE_ORDER__SUPPLIER, newSupplier,
-          newSupplier));
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-  {
-    switch (featureID)
-    {
-    case Model1Package.PURCHASE_ORDER__SUPPLIER:
-      if (supplier != null)
-      {
-        msgs = ((InternalEObject)supplier).eInverseRemove(this, Model1Package.SUPPLIER__PURCHASE_ORDERS,
-            Supplier.class, msgs);
-      }
-      return basicSetSupplier((Supplier)otherEnd, msgs);
-    }
-    return super.eInverseAdd(otherEnd, featureID, msgs);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-  {
-    switch (featureID)
-    {
-    case Model1Package.PURCHASE_ORDER__SUPPLIER:
-      return basicSetSupplier(null, msgs);
-    }
-    return super.eInverseRemove(otherEnd, featureID, msgs);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-    case Model1Package.PURCHASE_ORDER__DATE:
-      return getDate();
-    case Model1Package.PURCHASE_ORDER__SUPPLIER:
-      if (resolve)
-      {
-        return getSupplier();
-      }
-      return basicGetSupplier();
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-    case Model1Package.PURCHASE_ORDER__DATE:
-      setDate((Date)newValue);
-      return;
-    case Model1Package.PURCHASE_ORDER__SUPPLIER:
-      setSupplier((Supplier)newValue);
-      return;
-    }
-    super.eSet(featureID, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-    case Model1Package.PURCHASE_ORDER__DATE:
-      setDate(DATE_EDEFAULT);
-      return;
-    case Model1Package.PURCHASE_ORDER__SUPPLIER:
-      setSupplier((Supplier)null);
-      return;
-    }
-    super.eUnset(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-    case Model1Package.PURCHASE_ORDER__DATE:
-      return DATE_EDEFAULT == null ? date != null : !DATE_EDEFAULT.equals(date);
-    case Model1Package.PURCHASE_ORDER__SUPPLIER:
-      return supplier != null;
-    }
-    return super.eIsSet(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  public String toString()
-  {
-    if (eIsProxy())
-    {
-      return super.toString();
-    }
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (date: ");
-    result.append(date);
-    result.append(')');
-    return result.toString();
-  }
-
-} // PurchaseOrderImpl
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/SalesOrderImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/SalesOrderImpl.java
deleted file mode 100644
index 942501525b..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/SalesOrderImpl.java
+++ /dev/null
@@ -1,341 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: SalesOrderImpl.java,v 1.2 2008-09-18 12:57:08 estepper Exp $
- */
-package org.eclipse.emf.cdo.tests.legacy.model1.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.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-/**
- * <!-- begin-user-doc --> An implementation of the model object '<em><b>Sales Order</b></em>'. <!-- end-user-doc -->
- * <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>
- * </ul>
- * </p>
- * 
- * @generated
- */
-public class SalesOrderImpl extends OrderImpl implements SalesOrder
-{
-  /**
-   * The default value of the '{@link #getId() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @see #getId()
-   * @generated
-   * @ordered
-   */
-  protected static final int ID_EDEFAULT = 0;
-
-  /**
-   * The cached value of the '{@link #getId() <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @see #getId()
-   * @generated
-   * @ordered
-   */
-  protected int id = ID_EDEFAULT;
-
-  /**
-   * The cached value of the '{@link #getCustomer() <em>Customer</em>}' reference. <!-- begin-user-doc --> <!--
-   * end-user-doc -->
-   * 
-   * @see #getCustomer()
-   * @generated
-   * @ordered
-   */
-  protected Customer customer;
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  protected SalesOrderImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return Model1Package.Literals.SALES_ORDER;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public int getId()
-  {
-    eFireRead(Model1Package.SALES_ORDER__ID);
-    return id;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public void setId(int newId)
-  {
-    eFireWrite(Model1Package.SALES_ORDER__ID);
-    int oldId = id;
-    id = newId;
-    if (eNotificationRequired())
-    {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model1Package.SALES_ORDER__ID, oldId, id));
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public Customer getCustomer()
-  {
-    eFireRead(Model1Package.SALES_ORDER__CUSTOMER);
-    if (customer != null && customer.eIsProxy())
-    {
-      InternalEObject oldCustomer = (InternalEObject)customer;
-      customer = (Customer)eResolveProxy(oldCustomer);
-      if (customer != oldCustomer)
-      {
-        if (eNotificationRequired())
-        {
-          eNotify(new ENotificationImpl(this, Notification.RESOLVE, Model1Package.SALES_ORDER__CUSTOMER, oldCustomer,
-              customer));
-        }
-      }
-    }
-    return customer;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public Customer basicGetCustomer()
-  {
-    eFireRead(Model1Package.SALES_ORDER__CUSTOMER);
-    return customer;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public NotificationChain basicSetCustomer(Customer newCustomer, NotificationChain msgs)
-  {
-    eFireWrite(Model1Package.SALES_ORDER__CUSTOMER);
-    Customer oldCustomer = customer;
-    customer = newCustomer;
-    if (eNotificationRequired())
-    {
-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
-          Model1Package.SALES_ORDER__CUSTOMER, oldCustomer, newCustomer);
-      if (msgs == null)
-      {
-        msgs = notification;
-      }
-      else
-      {
-        msgs.add(notification);
-      }
-    }
-    return msgs;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public void setCustomer(Customer newCustomer)
-  {
-    eFireWrite(Model1Package.SALES_ORDER__CUSTOMER);
-    if (newCustomer != customer)
-    {
-      NotificationChain msgs = null;
-      if (customer != null)
-      {
-        msgs = ((InternalEObject)customer).eInverseRemove(this, Model1Package.CUSTOMER__SALES_ORDERS, Customer.class,
-            msgs);
-      }
-      if (newCustomer != null)
-      {
-        msgs = ((InternalEObject)newCustomer).eInverseAdd(this, Model1Package.CUSTOMER__SALES_ORDERS, Customer.class,
-            msgs);
-      }
-      msgs = basicSetCustomer(newCustomer, msgs);
-      if (msgs != null)
-      {
-        msgs.dispatch();
-      }
-    }
-    else if (eNotificationRequired())
-    {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model1Package.SALES_ORDER__CUSTOMER, newCustomer,
-          newCustomer));
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-  {
-    switch (featureID)
-    {
-    case Model1Package.SALES_ORDER__CUSTOMER:
-      if (customer != null)
-      {
-        msgs = ((InternalEObject)customer).eInverseRemove(this, Model1Package.CUSTOMER__SALES_ORDERS, Customer.class,
-            msgs);
-      }
-      return basicSetCustomer((Customer)otherEnd, msgs);
-    }
-    return super.eInverseAdd(otherEnd, featureID, msgs);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-  {
-    switch (featureID)
-    {
-    case Model1Package.SALES_ORDER__CUSTOMER:
-      return basicSetCustomer(null, msgs);
-    }
-    return super.eInverseRemove(otherEnd, featureID, msgs);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-    case Model1Package.SALES_ORDER__ID:
-      return new Integer(getId());
-    case Model1Package.SALES_ORDER__CUSTOMER:
-      if (resolve)
-      {
-        return getCustomer();
-      }
-      return basicGetCustomer();
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-    case Model1Package.SALES_ORDER__ID:
-      setId(((Integer)newValue).intValue());
-      return;
-    case Model1Package.SALES_ORDER__CUSTOMER:
-      setCustomer((Customer)newValue);
-      return;
-    }
-    super.eSet(featureID, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-    case Model1Package.SALES_ORDER__ID:
-      setId(ID_EDEFAULT);
-      return;
-    case Model1Package.SALES_ORDER__CUSTOMER:
-      setCustomer((Customer)null);
-      return;
-    }
-    super.eUnset(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-    case Model1Package.SALES_ORDER__ID:
-      return id != ID_EDEFAULT;
-    case Model1Package.SALES_ORDER__CUSTOMER:
-      return customer != null;
-    }
-    return super.eIsSet(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  public String toString()
-  {
-    if (eIsProxy())
-    {
-      return super.toString();
-    }
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (id: ");
-    result.append(id);
-    result.append(')');
-    return result.toString();
-  }
-
-} // SalesOrderImpl
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/SupplierImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/SupplierImpl.java
deleted file mode 100644
index 6538d4b41a..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/impl/SupplierImpl.java
+++ /dev/null
@@ -1,262 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: SupplierImpl.java,v 1.2 2008-09-18 12:57:08 estepper Exp $
- */
-package org.eclipse.emf.cdo.tests.legacy.model1.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.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import java.util.Collection;
-
-/**
- * <!-- begin-user-doc --> An implementation of the model object '<em><b>Supplier</b></em>'. <!-- end-user-doc -->
- * <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>
- * </ul>
- * </p>
- * 
- * @generated
- */
-public class SupplierImpl extends AddressImpl implements Supplier
-{
-  /**
-   * The cached value of the '{@link #getPurchaseOrders() <em>Purchase Orders</em>}' reference list. <!-- begin-user-doc
-   * --> <!-- end-user-doc -->
-   * 
-   * @see #getPurchaseOrders()
-   * @generated
-   * @ordered
-   */
-  protected EList<PurchaseOrder> purchaseOrders;
-
-  /**
-   * The default value of the '{@link #isPreferred() <em>Preferred</em>}' attribute. <!-- begin-user-doc --> <!--
-   * end-user-doc -->
-   * 
-   * @see #isPreferred()
-   * @generated
-   * @ordered
-   */
-  protected static final boolean PREFERRED_EDEFAULT = true;
-
-  /**
-   * The cached value of the '{@link #isPreferred() <em>Preferred</em>}' attribute. <!-- begin-user-doc --> <!--
-   * end-user-doc -->
-   * 
-   * @see #isPreferred()
-   * @generated
-   * @ordered
-   */
-  protected boolean preferred = PREFERRED_EDEFAULT;
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  protected SupplierImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return Model1Package.Literals.SUPPLIER;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public EList<PurchaseOrder> getPurchaseOrders()
-  {
-    if (purchaseOrders == null)
-    {
-      purchaseOrders = new EObjectWithInverseResolvingEList<PurchaseOrder>(PurchaseOrder.class, this,
-          Model1Package.SUPPLIER__PURCHASE_ORDERS, Model1Package.PURCHASE_ORDER__SUPPLIER).readWriteFiringList();
-    }
-    return purchaseOrders;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public boolean isPreferred()
-  {
-    eFireRead(Model1Package.SUPPLIER__PREFERRED);
-    return preferred;
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public void setPreferred(boolean newPreferred)
-  {
-    eFireWrite(Model1Package.SUPPLIER__PREFERRED);
-    boolean oldPreferred = preferred;
-    preferred = newPreferred;
-    if (eNotificationRequired())
-    {
-      eNotify(new ENotificationImpl(this, Notification.SET, Model1Package.SUPPLIER__PREFERRED, oldPreferred, preferred));
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @SuppressWarnings("unchecked")
-  @Override
-  public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-  {
-    switch (featureID)
-    {
-    case Model1Package.SUPPLIER__PURCHASE_ORDERS:
-      return ((InternalEList<InternalEObject>)(InternalEList<?>)getPurchaseOrders()).basicAdd(otherEnd, msgs);
-    }
-    return super.eInverseAdd(otherEnd, featureID, msgs);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-  {
-    switch (featureID)
-    {
-    case Model1Package.SUPPLIER__PURCHASE_ORDERS:
-      return ((InternalEList<?>)getPurchaseOrders()).basicRemove(otherEnd, msgs);
-    }
-    return super.eInverseRemove(otherEnd, featureID, msgs);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-    case Model1Package.SUPPLIER__PURCHASE_ORDERS:
-      return getPurchaseOrders();
-    case Model1Package.SUPPLIER__PREFERRED:
-      return isPreferred() ? Boolean.TRUE : Boolean.FALSE;
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @SuppressWarnings("unchecked")
-  @Override
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-    case Model1Package.SUPPLIER__PURCHASE_ORDERS:
-      getPurchaseOrders().clear();
-      getPurchaseOrders().addAll((Collection<? extends PurchaseOrder>)newValue);
-      return;
-    case Model1Package.SUPPLIER__PREFERRED:
-      setPreferred(((Boolean)newValue).booleanValue());
-      return;
-    }
-    super.eSet(featureID, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-    case Model1Package.SUPPLIER__PURCHASE_ORDERS:
-      getPurchaseOrders().clear();
-      return;
-    case Model1Package.SUPPLIER__PREFERRED:
-      setPreferred(PREFERRED_EDEFAULT);
-      return;
-    }
-    super.eUnset(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-    case Model1Package.SUPPLIER__PURCHASE_ORDERS:
-      return purchaseOrders != null && !purchaseOrders.isEmpty();
-    case Model1Package.SUPPLIER__PREFERRED:
-      return preferred != PREFERRED_EDEFAULT;
-    }
-    return super.eIsSet(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  @Override
-  public String toString()
-  {
-    if (eIsProxy())
-    {
-      return super.toString();
-    }
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (preferred: ");
-    result.append(preferred);
-    result.append(')');
-    return result.toString();
-  }
-
-} // SupplierImpl
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/util/Model1AdapterFactory.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/util/Model1AdapterFactory.java
deleted file mode 100644
index 6063bc77f3..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/util/Model1AdapterFactory.java
+++ /dev/null
@@ -1,338 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Model1AdapterFactory.java,v 1.2 2008-09-18 12:57:07 estepper Exp $
- */
-package org.eclipse.emf.cdo.tests.legacy.model1.util;
-
-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;
-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.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- 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.legacy.model1.Model1Package
- * @generated
- */
-public class Model1AdapterFactory extends AdapterFactoryImpl
-{
-  /**
-   * 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 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.legacy.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.legacy.model1.Address
-   * @generated
-   */
-  public Adapter createAddressAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.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.legacy.model1.Company
-   * @generated
-   */
-  public Adapter createCompanyAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.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.legacy.model1.Supplier
-   * @generated
-   */
-  public Adapter createSupplierAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.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.legacy.model1.Customer
-   * @generated
-   */
-  public Adapter createCustomerAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.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.legacy.model1.Order
-   * @generated
-   */
-  public Adapter createOrderAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.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.legacy.model1.OrderDetail
-   * @generated
-   */
-  public Adapter createOrderDetailAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.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.legacy.model1.PurchaseOrder
-   * @generated
-   */
-  public Adapter createPurchaseOrderAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.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.legacy.model1.SalesOrder
-   * @generated
-   */
-  public Adapter createSalesOrderAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.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.legacy.model1.Category
-   * @generated
-   */
-  public Adapter createCategoryAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.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.legacy.model1.Product1
-   * @generated
-   */
-  public Adapter createProduct1Adapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.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.legacy.model1.OrderAddress
-   * @generated
-   */
-  public Adapter createOrderAddressAdapter()
-  {
-    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/legacy/model1/util/Model1Switch.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/util/Model1Switch.java
deleted file mode 100644
index 275a2f6e71..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/legacy/model1/util/Model1Switch.java
+++ /dev/null
@@ -1,429 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Model1Switch.java,v 1.2 2008-09-18 12:57:07 estepper Exp $
- */
-package org.eclipse.emf.cdo.tests.legacy.model1.util;
-
-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;
-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.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-
-import java.util.List;
-
-/**
- * <!-- 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.legacy.model1.Model1Package
- * @generated
- */
-public class Model1Switch<T>
-{
-  /**
-   * 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;
-    }
-    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>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