reformat

31 files changed, 861 insertions, 618 deletions

diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Address.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Address.java
index 7d834ed1e0..b5c46f7a80 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Address.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Address.java
@@ -16,16 +16,15 @@ import org.eclipse.emf.ecore.EObject;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>Address</b></em>'. <!-- end-user-doc -->
- *
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.emf.cdo.tests.model1.Address#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.emf.cdo.tests.model1.Address#getStreet <em>Street</em>}</li>
- *   <li>{@link org.eclipse.emf.cdo.tests.model1.Address#getCity <em>City</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.Address#getName <em>Name</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.Address#getStreet <em>Street</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.Address#getCity <em>City</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getAddress()
  * @model
  * @generated
@@ -33,19 +32,19 @@ import org.eclipse.emf.ecore.EObject;
 public interface Address extends EObject
 {
   /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   String copyright = "Copyright (c) 2004 - 2008 Eike Stepper, Germany.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n   Eike Stepper - initial API and implementation";
 
   /**
-   * Returns the value of the '<em><b>Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
+   * 
    * @return the value of the '<em>Name</em>' attribute.
    * @see #setName(String)
    * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getAddress_Name()
@@ -66,12 +65,12 @@ public interface Address extends EObject
   void setName(String value);
 
   /**
-   * Returns the value of the '<em><b>Street</b></em>' attribute.
-   * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Street</b></em>' attribute. <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Street</em>' attribute isn't clear, there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
+   * 
    * @return the value of the '<em>Street</em>' attribute.
    * @see #setStreet(String)
    * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getAddress_Street()
@@ -92,12 +91,12 @@ public interface Address extends EObject
   void setStreet(String value);
 
   /**
-   * Returns the value of the '<em><b>City</b></em>' attribute.
-   * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>City</b></em>' attribute. <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>City</em>' attribute isn't clear, there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
+   * 
    * @return the value of the '<em>City</em>' attribute.
    * @see #setCity(String)
    * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getAddress_City()
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Category.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Category.java
index 4178c28b4a..db3be57b03 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Category.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Category.java
@@ -17,16 +17,15 @@ import org.eclipse.emf.ecore.EObject;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>Category</b></em>'. <!-- end-user-doc -->
- *
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.emf.cdo.tests.model1.Category#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.emf.cdo.tests.model1.Category#getCategories <em>Categories</em>}</li>
- *   <li>{@link org.eclipse.emf.cdo.tests.model1.Category#getProducts <em>Products</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.Category#getName <em>Name</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.Category#getCategories <em>Categories</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.Category#getProducts <em>Products</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getCategory()
  * @model
  * @generated
@@ -34,19 +33,19 @@ import org.eclipse.emf.ecore.EObject;
 public interface Category extends EObject
 {
   /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   String copyright = "Copyright (c) 2004 - 2008 Eike Stepper, Germany.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n   Eike Stepper - initial API and implementation";
 
   /**
-   * Returns the value of the '<em><b>Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
+   * 
    * @return the value of the '<em>Name</em>' attribute.
    * @see #setName(String)
    * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getCategory_Name()
@@ -67,14 +66,14 @@ public interface Category extends EObject
   void setName(String value);
 
   /**
-   * Returns the value of the '<em><b>Categories</b></em>' containment reference list.
-   * The list contents are of type {@link org.eclipse.emf.cdo.tests.model1.Category}.
-   * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Categories</b></em>' containment reference list. The list contents are of type
+   * {@link org.eclipse.emf.cdo.tests.model1.Category}. <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Categories</em>' containment reference list isn't clear, there really should be more of
    * a description here...
    * </p>
    * <!-- end-user-doc -->
+   * 
    * @return the value of the '<em>Categories</em>' containment reference list.
    * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getCategory_Categories()
    * @model containment="true"
@@ -83,14 +82,14 @@ public interface Category extends EObject
   EList<Category> getCategories();
 
   /**
-   * Returns the value of the '<em><b>Products</b></em>' containment reference list.
-   * The list contents are of type {@link org.eclipse.emf.cdo.tests.model1.Product1}.
-   * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Products</b></em>' containment reference list. The list contents are of type
+   * {@link org.eclipse.emf.cdo.tests.model1.Product1}. <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Products</em>' containment reference list isn't clear, there really should be more of a
    * description here...
    * </p>
    * <!-- end-user-doc -->
+   * 
    * @return the value of the '<em>Products</em>' containment reference list.
    * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getCategory_Products()
    * @model containment="true"
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Company.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Company.java
index 548380e27e..e442ceb0ea 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Company.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Company.java
@@ -16,18 +16,17 @@ import org.eclipse.emf.common.util.EList;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>Company</b></em>'. <!-- end-user-doc -->
- *
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.emf.cdo.tests.model1.Company#getCategories <em>Categories</em>}</li>
- *   <li>{@link org.eclipse.emf.cdo.tests.model1.Company#getSuppliers <em>Suppliers</em>}</li>
- *   <li>{@link org.eclipse.emf.cdo.tests.model1.Company#getCustomers <em>Customers</em>}</li>
- *   <li>{@link org.eclipse.emf.cdo.tests.model1.Company#getPurchaseOrders <em>Purchase Orders</em>}</li>
- *   <li>{@link org.eclipse.emf.cdo.tests.model1.Company#getSalesOrders <em>Sales Orders</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.Company#getCategories <em>Categories</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.Company#getSuppliers <em>Suppliers</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.Company#getCustomers <em>Customers</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.Company#getPurchaseOrders <em>Purchase Orders</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.Company#getSalesOrders <em>Sales Orders</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getCompany()
  * @model
  * @generated
@@ -35,21 +34,21 @@ import org.eclipse.emf.common.util.EList;
 public interface Company extends Address
 {
   /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   String copyright = "Copyright (c) 2004 - 2008 Eike Stepper, Germany.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n   Eike Stepper - initial API and implementation";
 
   /**
-   * Returns the value of the '<em><b>Categories</b></em>' containment reference list.
-   * The list contents are of type {@link org.eclipse.emf.cdo.tests.model1.Category}.
-   * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Categories</b></em>' containment reference list. The list contents are of type
+   * {@link org.eclipse.emf.cdo.tests.model1.Category}. <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Categories</em>' containment reference list isn't clear, there really should be more of
    * a description here...
    * </p>
    * <!-- end-user-doc -->
+   * 
    * @return the value of the '<em>Categories</em>' containment reference list.
    * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getCompany_Categories()
    * @model containment="true"
@@ -58,14 +57,14 @@ public interface Company extends Address
   EList<Category> getCategories();
 
   /**
-   * Returns the value of the '<em><b>Suppliers</b></em>' containment reference list.
-   * The list contents are of type {@link org.eclipse.emf.cdo.tests.model1.Supplier}.
-   * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Suppliers</b></em>' containment reference list. The list contents are of type
+   * {@link org.eclipse.emf.cdo.tests.model1.Supplier}. <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Suppliers</em>' containment reference list isn't clear, there really should be more of a
    * description here...
    * </p>
    * <!-- end-user-doc -->
+   * 
    * @return the value of the '<em>Suppliers</em>' containment reference list.
    * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getCompany_Suppliers()
    * @model containment="true"
@@ -74,14 +73,14 @@ public interface Company extends Address
   EList<Supplier> getSuppliers();
 
   /**
-   * Returns the value of the '<em><b>Purchase Orders</b></em>' containment reference list.
-   * The list contents are of type {@link org.eclipse.emf.cdo.tests.model1.PurchaseOrder}.
-   * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Purchase Orders</b></em>' containment reference list. The list contents are of
+   * type {@link org.eclipse.emf.cdo.tests.model1.PurchaseOrder}. <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Purchase Orders</em>' containment reference list isn't clear, there really should be
    * more of a description here...
    * </p>
    * <!-- end-user-doc -->
+   * 
    * @return the value of the '<em>Purchase Orders</em>' containment reference list.
    * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getCompany_PurchaseOrders()
    * @model containment="true"
@@ -90,14 +89,14 @@ public interface Company extends Address
   EList<PurchaseOrder> getPurchaseOrders();
 
   /**
-   * Returns the value of the '<em><b>Customers</b></em>' containment reference list.
-   * The list contents are of type {@link org.eclipse.emf.cdo.tests.model1.Customer}.
-   * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Customers</b></em>' containment reference list. The list contents are of type
+   * {@link org.eclipse.emf.cdo.tests.model1.Customer}. <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Customers</em>' containment reference list isn't clear, there really should be more of a
    * description here...
    * </p>
    * <!-- end-user-doc -->
+   * 
    * @return the value of the '<em>Customers</em>' containment reference list.
    * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getCompany_Customers()
    * @model containment="true"
@@ -106,14 +105,14 @@ public interface Company extends Address
   EList<Customer> getCustomers();
 
   /**
-   * Returns the value of the '<em><b>Sales Orders</b></em>' containment reference list.
-   * The list contents are of type {@link org.eclipse.emf.cdo.tests.model1.SalesOrder}.
-   * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Sales Orders</b></em>' containment reference list. The list contents are of type
+   * {@link org.eclipse.emf.cdo.tests.model1.SalesOrder}. <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Sales Orders</em>' containment reference list isn't clear, there really should be more
    * of a description here...
    * </p>
    * <!-- end-user-doc -->
+   * 
    * @return the value of the '<em>Sales Orders</em>' containment reference list.
    * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getCompany_SalesOrders()
    * @model containment="true"
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Customer.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Customer.java
index 5395c30b68..14b5f557db 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Customer.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Customer.java
@@ -16,14 +16,13 @@ import org.eclipse.emf.common.util.EList;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>Customer</b></em>'. <!-- end-user-doc -->
- *
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.emf.cdo.tests.model1.Customer#getSalesOrders <em>Sales Orders</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.Customer#getSalesOrders <em>Sales Orders</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getCustomer()
  * @model
  * @generated
@@ -31,22 +30,22 @@ import org.eclipse.emf.common.util.EList;
 public interface Customer extends Address
 {
   /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   String copyright = "Copyright (c) 2004 - 2008 Eike Stepper, Germany.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n   Eike Stepper - initial API and implementation";
 
   /**
-   * Returns the value of the '<em><b>Sales Orders</b></em>' reference list.
-   * The list contents are of type {@link org.eclipse.emf.cdo.tests.model1.SalesOrder}.
-   * It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.model1.SalesOrder#getCustomer <em>Customer</em>}'.
-   * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Sales Orders</b></em>' reference list. The list contents are of type
+   * {@link org.eclipse.emf.cdo.tests.model1.SalesOrder}. It is bidirectional and its opposite is '
+   * {@link org.eclipse.emf.cdo.tests.model1.SalesOrder#getCustomer <em>Customer</em>}'. <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Sales Orders</em>' reference list isn't clear, there really should be more of a
    * description here...
    * </p>
    * <!-- end-user-doc -->
+   * 
    * @return the value of the '<em>Sales Orders</em>' reference list.
    * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getCustomer_SalesOrders()
    * @see org.eclipse.emf.cdo.tests.model1.SalesOrder#getCustomer
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Model1Factory.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Model1Factory.java
index dfcd45e845..51858adb59 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Model1Factory.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Model1Factory.java
@@ -17,116 +17,117 @@ import org.eclipse.emf.ecore.EFactory;
 /**
  * <!-- begin-user-doc --> The <b>Factory</b> for the model. It provides a create method for each non-abstract class of
  * the model. <!-- end-user-doc -->
+ * 
  * @see org.eclipse.emf.cdo.tests.model1.Model1Package
  * @generated
  */
 public interface Model1Factory extends EFactory
 {
   /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   String copyright = "Copyright (c) 2004 - 2008 Eike Stepper, Germany.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n   Eike Stepper - initial API and implementation";
 
   /**
-   * The singleton instance of the factory.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The singleton instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   Model1Factory eINSTANCE = org.eclipse.emf.cdo.tests.model1.impl.Model1FactoryImpl.init();
 
   /**
-   * Returns a new object of class '<em>Address</em>'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Returns a new object of class '<em>Address</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @return a new object of class '<em>Address</em>'.
    * @generated
    */
   Address createAddress();
 
   /**
-   * Returns a new object of class '<em>Supplier</em>'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Returns a new object of class '<em>Supplier</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @return a new object of class '<em>Supplier</em>'.
    * @generated
    */
   Supplier createSupplier();
 
   /**
-   * Returns a new object of class '<em>Purchase Order</em>'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Returns a new object of class '<em>Purchase Order</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @return a new object of class '<em>Purchase Order</em>'.
    * @generated
    */
   PurchaseOrder createPurchaseOrder();
 
   /**
-   * Returns a new object of class '<em>Order Detail</em>'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Returns a new object of class '<em>Order Detail</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @return a new object of class '<em>Order Detail</em>'.
    * @generated
    */
   OrderDetail createOrderDetail();
 
   /**
-   * Returns a new object of class '<em>Order Address</em>'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Returns a new object of class '<em>Order Address</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @return a new object of class '<em>Order Address</em>'.
    * @generated
    */
   OrderAddress createOrderAddress();
 
   /**
-   * Returns a new object of class '<em>Category</em>'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Returns a new object of class '<em>Category</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @return a new object of class '<em>Category</em>'.
    * @generated
    */
   Category createCategory();
 
   /**
-   * Returns a new object of class '<em>Product1</em>'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Returns a new object of class '<em>Product1</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @return a new object of class '<em>Product1</em>'.
    * @generated
    */
   Product1 createProduct1();
 
   /**
-   * Returns a new object of class '<em>Company</em>'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Returns a new object of class '<em>Company</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @return a new object of class '<em>Company</em>'.
    * @generated
    */
   Company createCompany();
 
   /**
-   * Returns a new object of class '<em>Customer</em>'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Returns a new object of class '<em>Customer</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @return a new object of class '<em>Customer</em>'.
    * @generated
    */
   Customer createCustomer();
 
   /**
-   * Returns a new object of class '<em>Order</em>'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Returns a new object of class '<em>Order</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @return a new object of class '<em>Order</em>'.
    * @generated
    */
   Order createOrder();
 
   /**
-   * Returns a new object of class '<em>Sales Order</em>'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Returns a new object of class '<em>Sales Order</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @return a new object of class '<em>Sales Order</em>'.
    * @generated
    */
   SalesOrder createSalesOrder();
 
   /**
-   * Returns the package supported by this factory.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Returns the package supported by this factory. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @return the package supported by this factory.
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Model1Package.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Model1Package.java
index 4604e3d2fe..3eae5a1816 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Model1Package.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Model1Package.java
@@ -27,6 +27,7 @@ import org.eclipse.emf.ecore.EReference;
  * <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.emf.cdo.tests.model1.Model1Factory
  * @model kind="package"
  * @generated
@@ -34,36 +35,36 @@ import org.eclipse.emf.ecore.EReference;
 public interface Model1Package extends EPackage
 {
   /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   String copyright = "Copyright (c) 2004 - 2008 Eike Stepper, Germany.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n   Eike Stepper - initial API and implementation";
 
   /**
-   * The package name.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The package name. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   String eNAME = "model1";
 
   /**
-   * The package namespace URI.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The package namespace URI. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   String eNS_URI = "http://www.eclipse.org/emf/CDO/tests/model1/1.0.0";
 
   /**
-   * The package namespace name.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   String eNS_PREFIX = "model1";
 
   /**
-   * The singleton instance of the package.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The singleton instance of the package. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   Model1Package eINSTANCE = org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl.init();
@@ -79,32 +80,32 @@ public interface Model1Package extends EPackage
   int ADDRESS = 0;
 
   /**
-   * The feature id for the '<em><b>Name</b></em>' attribute.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
   int ADDRESS__NAME = 0;
 
   /**
-   * The feature id for the '<em><b>Street</b></em>' attribute.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The feature id for the '<em><b>Street</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
   int ADDRESS__STREET = 1;
 
   /**
-   * The feature id for the '<em><b>City</b></em>' attribute.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The feature id for the '<em><b>City</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
   int ADDRESS__CITY = 2;
 
   /**
-   * The number of structural features of the '<em>Address</em>' class.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The number of structural features of the '<em>Address</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
@@ -113,6 +114,7 @@ public interface Model1Package extends EPackage
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model1.impl.SupplierImpl <em>Supplier</em>}' class.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @see org.eclipse.emf.cdo.tests.model1.impl.SupplierImpl
    * @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getSupplier()
    * @generated
@@ -120,8 +122,9 @@ public interface Model1Package extends EPackage
   int SUPPLIER = 2;
 
   /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model1.impl.PurchaseOrderImpl <em>Purchase Order</em>}' class.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model1.impl.PurchaseOrderImpl <em>Purchase Order</em>}
+   * ' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @see org.eclipse.emf.cdo.tests.model1.impl.PurchaseOrderImpl
    * @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getPurchaseOrder()
    * @generated
@@ -129,8 +132,9 @@ public interface Model1Package extends EPackage
   int PURCHASE_ORDER = 6;
 
   /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model1.impl.OrderDetailImpl <em>Order Detail</em>}' class.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model1.impl.OrderDetailImpl <em>Order Detail</em>}'
+   * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @see org.eclipse.emf.cdo.tests.model1.impl.OrderDetailImpl
    * @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getOrderDetail()
    * @generated
@@ -150,6 +154,7 @@ public interface Model1Package extends EPackage
   /**
    * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model1.Address#getName <em>Name</em>}'.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @return the meta object for the attribute '<em>Name</em>'.
    * @see org.eclipse.emf.cdo.tests.model1.Address#getName()
    * @see #getAddress()
@@ -158,8 +163,9 @@ public interface Model1Package extends EPackage
   EAttribute getAddress_Name();
 
   /**
-   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model1.Address#getStreet <em>Street</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model1.Address#getStreet
+   * <em>Street</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @return the meta object for the attribute '<em>Street</em>'.
    * @see org.eclipse.emf.cdo.tests.model1.Address#getStreet()
    * @see #getAddress()
@@ -170,6 +176,7 @@ public interface Model1Package extends EPackage
   /**
    * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model1.Address#getCity <em>City</em>}'.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @return the meta object for the attribute '<em>City</em>'.
    * @see org.eclipse.emf.cdo.tests.model1.Address#getCity()
    * @see #getAddress()
@@ -180,6 +187,7 @@ public interface Model1Package extends EPackage
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model1.impl.CategoryImpl <em>Category</em>}' class.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @see org.eclipse.emf.cdo.tests.model1.impl.CategoryImpl
    * @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getCategory()
    * @generated
@@ -197,101 +205,101 @@ public interface Model1Package extends EPackage
   int COMPANY = 1;
 
   /**
-   * The feature id for the '<em><b>Name</b></em>' attribute.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
   int COMPANY__NAME = ADDRESS__NAME;
 
   /**
-   * The feature id for the '<em><b>Street</b></em>' attribute.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The feature id for the '<em><b>Street</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
   int COMPANY__STREET = ADDRESS__STREET;
 
   /**
-   * The feature id for the '<em><b>City</b></em>' attribute.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The feature id for the '<em><b>City</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
   int COMPANY__CITY = ADDRESS__CITY;
 
   /**
-   * The feature id for the '<em><b>Categories</b></em>' containment reference list.
-   * <!-- begin-user-doc --> <!--
+   * The feature id for the '<em><b>Categories</b></em>' containment reference list. <!-- begin-user-doc --> <!--
    * end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
   int COMPANY__CATEGORIES = ADDRESS_FEATURE_COUNT + 0;
 
   /**
-   * The feature id for the '<em><b>Suppliers</b></em>' containment reference list.
-   * <!-- begin-user-doc --> <!--
+   * The feature id for the '<em><b>Suppliers</b></em>' containment reference list. <!-- begin-user-doc --> <!--
    * end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
   int COMPANY__SUPPLIERS = ADDRESS_FEATURE_COUNT + 1;
 
   /**
-   * The feature id for the '<em><b>Customers</b></em>' containment reference list.
-   * <!-- begin-user-doc --> <!--
+   * The feature id for the '<em><b>Customers</b></em>' containment reference list. <!-- begin-user-doc --> <!--
    * end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
   int COMPANY__CUSTOMERS = ADDRESS_FEATURE_COUNT + 2;
 
   /**
-   * The feature id for the '<em><b>Purchase Orders</b></em>' containment reference list.
-   * <!-- begin-user-doc --> <!--
+   * The feature id for the '<em><b>Purchase Orders</b></em>' containment reference list. <!-- begin-user-doc --> <!--
    * end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
   int COMPANY__PURCHASE_ORDERS = ADDRESS_FEATURE_COUNT + 3;
 
   /**
-   * The feature id for the '<em><b>Sales Orders</b></em>' containment reference list.
-   * <!-- begin-user-doc --> <!--
+   * The feature id for the '<em><b>Sales Orders</b></em>' containment reference list. <!-- begin-user-doc --> <!--
    * end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
   int COMPANY__SALES_ORDERS = ADDRESS_FEATURE_COUNT + 4;
 
   /**
-   * The number of structural features of the '<em>Company</em>' class.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The number of structural features of the '<em>Company</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
   int COMPANY_FEATURE_COUNT = ADDRESS_FEATURE_COUNT + 5;
 
   /**
-   * The feature id for the '<em><b>Name</b></em>' attribute.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
   int SUPPLIER__NAME = ADDRESS__NAME;
 
   /**
-   * The feature id for the '<em><b>Street</b></em>' attribute.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The feature id for the '<em><b>Street</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
   int SUPPLIER__STREET = ADDRESS__STREET;
 
   /**
-   * The feature id for the '<em><b>City</b></em>' attribute.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The feature id for the '<em><b>City</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
@@ -307,16 +315,16 @@ public interface Model1Package extends EPackage
   int SUPPLIER__PURCHASE_ORDERS = ADDRESS_FEATURE_COUNT + 0;
 
   /**
-   * The feature id for the '<em><b>Preferred</b></em>' attribute.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The feature id for the '<em><b>Preferred</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
   int SUPPLIER__PREFERRED = ADDRESS_FEATURE_COUNT + 1;
 
   /**
-   * The number of structural features of the '<em>Supplier</em>' class.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The number of structural features of the '<em>Supplier</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
@@ -325,6 +333,7 @@ public interface Model1Package extends EPackage
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model1.impl.CustomerImpl <em>Customer</em>}' class.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @see org.eclipse.emf.cdo.tests.model1.impl.CustomerImpl
    * @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getCustomer()
    * @generated
@@ -332,40 +341,40 @@ public interface Model1Package extends EPackage
   int CUSTOMER = 3;
 
   /**
-   * The feature id for the '<em><b>Name</b></em>' attribute.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
   int CUSTOMER__NAME = ADDRESS__NAME;
 
   /**
-   * The feature id for the '<em><b>Street</b></em>' attribute.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The feature id for the '<em><b>Street</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
   int CUSTOMER__STREET = ADDRESS__STREET;
 
   /**
-   * The feature id for the '<em><b>City</b></em>' attribute.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The feature id for the '<em><b>City</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
   int CUSTOMER__CITY = ADDRESS__CITY;
 
   /**
-   * The feature id for the '<em><b>Sales Orders</b></em>' reference list.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The feature id for the '<em><b>Sales Orders</b></em>' reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
   int CUSTOMER__SALES_ORDERS = ADDRESS_FEATURE_COUNT + 0;
 
   /**
-   * The number of structural features of the '<em>Customer</em>' class.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The number of structural features of the '<em>Customer</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
@@ -382,41 +391,41 @@ public interface Model1Package extends EPackage
   int ORDER = 4;
 
   /**
-   * The feature id for the '<em><b>Order Details</b></em>' containment reference list.
-   * <!-- begin-user-doc --> <!--
+   * The feature id for the '<em><b>Order Details</b></em>' containment reference list. <!-- begin-user-doc --> <!--
    * end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
   int ORDER__ORDER_DETAILS = 0;
 
   /**
-   * The number of structural features of the '<em>Order</em>' class.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The number of structural features of the '<em>Order</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
   int ORDER_FEATURE_COUNT = 1;
 
   /**
-   * The feature id for the '<em><b>Order</b></em>' container reference.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The feature id for the '<em><b>Order</b></em>' container reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
   int ORDER_DETAIL__ORDER = 0;
 
   /**
-   * The feature id for the '<em><b>Product</b></em>' reference.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The feature id for the '<em><b>Product</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
   int ORDER_DETAIL__PRODUCT = 1;
 
   /**
-   * The feature id for the '<em><b>Price</b></em>' attribute.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The feature id for the '<em><b>Price</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
@@ -432,25 +441,25 @@ public interface Model1Package extends EPackage
   int ORDER_DETAIL_FEATURE_COUNT = 3;
 
   /**
-   * The feature id for the '<em><b>Order Details</b></em>' containment reference list.
-   * <!-- begin-user-doc --> <!--
+   * The feature id for the '<em><b>Order Details</b></em>' containment reference list. <!-- begin-user-doc --> <!--
    * end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
   int PURCHASE_ORDER__ORDER_DETAILS = ORDER__ORDER_DETAILS;
 
   /**
-   * The feature id for the '<em><b>Date</b></em>' attribute.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The feature id for the '<em><b>Date</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
   int PURCHASE_ORDER__DATE = ORDER_FEATURE_COUNT + 0;
 
   /**
-   * The feature id for the '<em><b>Supplier</b></em>' reference.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The feature id for the '<em><b>Supplier</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
@@ -466,8 +475,9 @@ public interface Model1Package extends EPackage
   int PURCHASE_ORDER_FEATURE_COUNT = ORDER_FEATURE_COUNT + 2;
 
   /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model1.impl.SalesOrderImpl <em>Sales Order</em>}' class.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model1.impl.SalesOrderImpl <em>Sales Order</em>}'
+   * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @see org.eclipse.emf.cdo.tests.model1.impl.SalesOrderImpl
    * @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getSalesOrder()
    * @generated
@@ -475,25 +485,25 @@ public interface Model1Package extends EPackage
   int SALES_ORDER = 7;
 
   /**
-   * The feature id for the '<em><b>Order Details</b></em>' containment reference list.
-   * <!-- begin-user-doc --> <!--
+   * The feature id for the '<em><b>Order Details</b></em>' containment reference list. <!-- begin-user-doc --> <!--
    * end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
   int SALES_ORDER__ORDER_DETAILS = ORDER__ORDER_DETAILS;
 
   /**
-   * The feature id for the '<em><b>Id</b></em>' attribute.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The feature id for the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
   int SALES_ORDER__ID = ORDER_FEATURE_COUNT + 0;
 
   /**
-   * The feature id for the '<em><b>Customer</b></em>' reference.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The feature id for the '<em><b>Customer</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
@@ -509,34 +519,34 @@ public interface Model1Package extends EPackage
   int SALES_ORDER_FEATURE_COUNT = ORDER_FEATURE_COUNT + 2;
 
   /**
-   * The feature id for the '<em><b>Name</b></em>' attribute.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
   int CATEGORY__NAME = 0;
 
   /**
-   * The feature id for the '<em><b>Categories</b></em>' containment reference list.
-   * <!-- begin-user-doc --> <!--
+   * The feature id for the '<em><b>Categories</b></em>' containment reference list. <!-- begin-user-doc --> <!--
    * end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
   int CATEGORY__CATEGORIES = 1;
 
   /**
-   * The feature id for the '<em><b>Products</b></em>' containment reference list.
-   * <!-- begin-user-doc --> <!--
+   * The feature id for the '<em><b>Products</b></em>' containment reference list. <!-- begin-user-doc --> <!--
    * end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
   int CATEGORY__PRODUCTS = 2;
 
   /**
-   * The number of structural features of the '<em>Category</em>' class.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The number of structural features of the '<em>Category</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
@@ -545,6 +555,7 @@ public interface Model1Package extends EPackage
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model1.impl.Product1Impl <em>Product1</em>}' class.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @see org.eclipse.emf.cdo.tests.model1.impl.Product1Impl
    * @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getProduct1()
    * @generated
@@ -552,8 +563,8 @@ public interface Model1Package extends EPackage
   int PRODUCT1 = 9;
 
   /**
-   * The feature id for the '<em><b>Name</b></em>' attribute.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
@@ -569,32 +580,33 @@ public interface Model1Package extends EPackage
   int PRODUCT1__ORDER_DETAILS = 1;
 
   /**
-   * The feature id for the '<em><b>Vat</b></em>' attribute.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The feature id for the '<em><b>Vat</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
   int PRODUCT1__VAT = 2;
 
   /**
-   * The feature id for the '<em><b>Description</b></em>' attribute.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The feature id for the '<em><b>Description</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
   int PRODUCT1__DESCRIPTION = 3;
 
   /**
-   * The number of structural features of the '<em>Product1</em>' class.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The number of structural features of the '<em>Product1</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
   int PRODUCT1_FEATURE_COUNT = 4;
 
   /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model1.impl.OrderAddressImpl <em>Order Address</em>}' class.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model1.impl.OrderAddressImpl <em>Order Address</em>}'
+   * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @see org.eclipse.emf.cdo.tests.model1.impl.OrderAddressImpl
    * @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getOrderAddress()
    * @generated
@@ -602,65 +614,65 @@ public interface Model1Package extends EPackage
   int ORDER_ADDRESS = 10;
 
   /**
-   * The feature id for the '<em><b>Name</b></em>' attribute.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The feature id for the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
   int ORDER_ADDRESS__NAME = ADDRESS__NAME;
 
   /**
-   * The feature id for the '<em><b>Street</b></em>' attribute.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The feature id for the '<em><b>Street</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
   int ORDER_ADDRESS__STREET = ADDRESS__STREET;
 
   /**
-   * The feature id for the '<em><b>City</b></em>' attribute.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The feature id for the '<em><b>City</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
   int ORDER_ADDRESS__CITY = ADDRESS__CITY;
 
   /**
-   * The feature id for the '<em><b>Order Details</b></em>' containment reference list.
-   * <!-- begin-user-doc --> <!--
+   * The feature id for the '<em><b>Order Details</b></em>' containment reference list. <!-- begin-user-doc --> <!--
    * end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
   int ORDER_ADDRESS__ORDER_DETAILS = ADDRESS_FEATURE_COUNT + 0;
 
   /**
-   * The feature id for the '<em><b>Order</b></em>' container reference.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The feature id for the '<em><b>Order</b></em>' container reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
   int ORDER_ADDRESS__ORDER = ADDRESS_FEATURE_COUNT + 1;
 
   /**
-   * The feature id for the '<em><b>Product</b></em>' reference.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The feature id for the '<em><b>Product</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
   int ORDER_ADDRESS__PRODUCT = ADDRESS_FEATURE_COUNT + 2;
 
   /**
-   * The feature id for the '<em><b>Price</b></em>' attribute.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The feature id for the '<em><b>Price</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
   int ORDER_ADDRESS__PRICE = ADDRESS_FEATURE_COUNT + 3;
 
   /**
-   * The feature id for the '<em><b>Test Attribute</b></em>' attribute.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The feature id for the '<em><b>Test Attribute</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    * @ordered
    */
@@ -676,9 +688,9 @@ public interface Model1Package extends EPackage
   int ORDER_ADDRESS_FEATURE_COUNT = ADDRESS_FEATURE_COUNT + 5;
 
   /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model1.VAT <em>VAT</em>}' enum.
-   * <!-- begin-user-doc
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model1.VAT <em>VAT</em>}' enum. <!-- begin-user-doc
    * --> <!-- end-user-doc -->
+   * 
    * @see org.eclipse.emf.cdo.tests.model1.VAT
    * @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getVAT()
    * @generated
@@ -696,8 +708,9 @@ public interface Model1Package extends EPackage
   EClass getSupplier();
 
   /**
-   * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.tests.model1.Supplier#getPurchaseOrders <em>Purchase Orders</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.tests.model1.Supplier#getPurchaseOrders
+   * <em>Purchase Orders</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @return the meta object for the reference list '<em>Purchase Orders</em>'.
    * @see org.eclipse.emf.cdo.tests.model1.Supplier#getPurchaseOrders()
    * @see #getSupplier()
@@ -706,8 +719,9 @@ public interface Model1Package extends EPackage
   EReference getSupplier_PurchaseOrders();
 
   /**
-   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model1.Supplier#isPreferred <em>Preferred</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model1.Supplier#isPreferred
+   * <em>Preferred</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @return the meta object for the attribute '<em>Preferred</em>'.
    * @see org.eclipse.emf.cdo.tests.model1.Supplier#isPreferred()
    * @see #getSupplier()
@@ -718,6 +732,7 @@ public interface Model1Package extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model1.PurchaseOrder <em>Purchase Order</em>}'.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @return the meta object for class '<em>Purchase Order</em>'.
    * @see org.eclipse.emf.cdo.tests.model1.PurchaseOrder
    * @generated
@@ -725,8 +740,9 @@ public interface Model1Package extends EPackage
   EClass getPurchaseOrder();
 
   /**
-   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model1.PurchaseOrder#getDate <em>Date</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model1.PurchaseOrder#getDate
+   * <em>Date</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @return the meta object for the attribute '<em>Date</em>'.
    * @see org.eclipse.emf.cdo.tests.model1.PurchaseOrder#getDate()
    * @see #getPurchaseOrder()
@@ -735,8 +751,9 @@ public interface Model1Package extends EPackage
   EAttribute getPurchaseOrder_Date();
 
   /**
-   * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.tests.model1.PurchaseOrder#getSupplier <em>Supplier</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.tests.model1.PurchaseOrder#getSupplier
+   * <em>Supplier</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @return the meta object for the reference '<em>Supplier</em>'.
    * @see org.eclipse.emf.cdo.tests.model1.PurchaseOrder#getSupplier()
    * @see #getPurchaseOrder()
@@ -747,6 +764,7 @@ public interface Model1Package extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model1.OrderDetail <em>Order Detail</em>}'.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @return the meta object for class '<em>Order Detail</em>'.
    * @see org.eclipse.emf.cdo.tests.model1.OrderDetail
    * @generated
@@ -754,8 +772,9 @@ public interface Model1Package extends EPackage
   EClass getOrderDetail();
 
   /**
-   * Returns the meta object for the container reference '{@link org.eclipse.emf.cdo.tests.model1.OrderDetail#getOrder <em>Order</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Returns the meta object for the container reference '{@link org.eclipse.emf.cdo.tests.model1.OrderDetail#getOrder
+   * <em>Order</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @return the meta object for the container reference '<em>Order</em>'.
    * @see org.eclipse.emf.cdo.tests.model1.OrderDetail#getOrder()
    * @see #getOrderDetail()
@@ -764,8 +783,9 @@ public interface Model1Package extends EPackage
   EReference getOrderDetail_Order();
 
   /**
-   * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.tests.model1.OrderDetail#getProduct <em>Product</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.tests.model1.OrderDetail#getProduct
+   * <em>Product</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @return the meta object for the reference '<em>Product</em>'.
    * @see org.eclipse.emf.cdo.tests.model1.OrderDetail#getProduct()
    * @see #getOrderDetail()
@@ -774,8 +794,9 @@ public interface Model1Package extends EPackage
   EReference getOrderDetail_Product();
 
   /**
-   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model1.OrderDetail#getPrice <em>Price</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model1.OrderDetail#getPrice
+   * <em>Price</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @return the meta object for the attribute '<em>Price</em>'.
    * @see org.eclipse.emf.cdo.tests.model1.OrderDetail#getPrice()
    * @see #getOrderDetail()
@@ -786,6 +807,7 @@ public interface Model1Package extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model1.OrderAddress <em>Order Address</em>}'.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @return the meta object for class '<em>Order Address</em>'.
    * @see org.eclipse.emf.cdo.tests.model1.OrderAddress
    * @generated
@@ -793,8 +815,9 @@ public interface Model1Package extends EPackage
   EClass getOrderAddress();
 
   /**
-   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model1.OrderAddress#isTestAttribute <em>Test Attribute</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model1.OrderAddress#isTestAttribute
+   * <em>Test Attribute</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @return the meta object for the attribute '<em>Test Attribute</em>'.
    * @see org.eclipse.emf.cdo.tests.model1.OrderAddress#isTestAttribute()
    * @see #getOrderAddress()
@@ -803,9 +826,9 @@ public interface Model1Package extends EPackage
   EAttribute getOrderAddress_TestAttribute();
 
   /**
-   * Returns the meta object for enum '{@link org.eclipse.emf.cdo.tests.model1.VAT <em>VAT</em>}'.
-   * <!-- begin-user-doc
+   * Returns the meta object for enum '{@link org.eclipse.emf.cdo.tests.model1.VAT <em>VAT</em>}'. <!-- begin-user-doc
    * --> <!-- end-user-doc -->
+   * 
    * @return the meta object for enum '<em>VAT</em>'.
    * @see org.eclipse.emf.cdo.tests.model1.VAT
    * @generated
@@ -823,8 +846,9 @@ public interface Model1Package extends EPackage
   EClass getCategory();
 
   /**
-   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model1.Category#getName <em>Name</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model1.Category#getName <em>Name</em>}
+   * '. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @return the meta object for the attribute '<em>Name</em>'.
    * @see org.eclipse.emf.cdo.tests.model1.Category#getName()
    * @see #getCategory()
@@ -833,9 +857,10 @@ public interface Model1Package extends EPackage
   EAttribute getCategory_Name();
 
   /**
-   * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.model1.Category#getCategories <em>Categories</em>}'.
-   * <!-- begin-user-doc --> <!--
+   * Returns the meta object for the containment reference list '
+   * {@link org.eclipse.emf.cdo.tests.model1.Category#getCategories <em>Categories</em>}'. <!-- begin-user-doc --> <!--
    * end-user-doc -->
+   * 
    * @return the meta object for the containment reference list '<em>Categories</em>'.
    * @see org.eclipse.emf.cdo.tests.model1.Category#getCategories()
    * @see #getCategory()
@@ -844,9 +869,10 @@ public interface Model1Package extends EPackage
   EReference getCategory_Categories();
 
   /**
-   * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.model1.Category#getProducts <em>Products</em>}'.
-   * <!-- begin-user-doc --> <!--
+   * Returns the meta object for the containment reference list '
+   * {@link org.eclipse.emf.cdo.tests.model1.Category#getProducts <em>Products</em>}'. <!-- begin-user-doc --> <!--
    * end-user-doc -->
+   * 
    * @return the meta object for the containment reference list '<em>Products</em>'.
    * @see org.eclipse.emf.cdo.tests.model1.Category#getProducts()
    * @see #getCategory()
@@ -865,8 +891,9 @@ public interface Model1Package extends EPackage
   EClass getProduct1();
 
   /**
-   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model1.Product1#getName <em>Name</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model1.Product1#getName <em>Name</em>}
+   * '. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @return the meta object for the attribute '<em>Name</em>'.
    * @see org.eclipse.emf.cdo.tests.model1.Product1#getName()
    * @see #getProduct1()
@@ -875,8 +902,9 @@ public interface Model1Package extends EPackage
   EAttribute getProduct1_Name();
 
   /**
-   * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.tests.model1.Product1#getOrderDetails <em>Order Details</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.tests.model1.Product1#getOrderDetails
+   * <em>Order Details</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @return the meta object for the reference list '<em>Order Details</em>'.
    * @see org.eclipse.emf.cdo.tests.model1.Product1#getOrderDetails()
    * @see #getProduct1()
@@ -887,6 +915,7 @@ public interface Model1Package extends EPackage
   /**
    * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model1.Product1#getVat <em>Vat</em>}'.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @return the meta object for the attribute '<em>Vat</em>'.
    * @see org.eclipse.emf.cdo.tests.model1.Product1#getVat()
    * @see #getProduct1()
@@ -895,8 +924,9 @@ public interface Model1Package extends EPackage
   EAttribute getProduct1_Vat();
 
   /**
-   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model1.Product1#getDescription <em>Description</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model1.Product1#getDescription
+   * <em>Description</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @return the meta object for the attribute '<em>Description</em>'.
    * @see org.eclipse.emf.cdo.tests.model1.Product1#getDescription()
    * @see #getProduct1()
@@ -915,9 +945,10 @@ public interface Model1Package extends EPackage
   EClass getCompany();
 
   /**
-   * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.model1.Company#getCategories <em>Categories</em>}'.
-   * <!-- begin-user-doc --> <!--
+   * Returns the meta object for the containment reference list '
+   * {@link org.eclipse.emf.cdo.tests.model1.Company#getCategories <em>Categories</em>}'. <!-- begin-user-doc --> <!--
    * end-user-doc -->
+   * 
    * @return the meta object for the containment reference list '<em>Categories</em>'.
    * @see org.eclipse.emf.cdo.tests.model1.Company#getCategories()
    * @see #getCompany()
@@ -926,9 +957,10 @@ public interface Model1Package extends EPackage
   EReference getCompany_Categories();
 
   /**
-   * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.model1.Company#getSuppliers <em>Suppliers</em>}'.
-   * <!-- begin-user-doc --> <!--
+   * Returns the meta object for the containment reference list '
+   * {@link org.eclipse.emf.cdo.tests.model1.Company#getSuppliers <em>Suppliers</em>}'. <!-- begin-user-doc --> <!--
    * end-user-doc -->
+   * 
    * @return the meta object for the containment reference list '<em>Suppliers</em>'.
    * @see org.eclipse.emf.cdo.tests.model1.Company#getSuppliers()
    * @see #getCompany()
@@ -937,9 +969,10 @@ public interface Model1Package extends EPackage
   EReference getCompany_Suppliers();
 
   /**
-   * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.model1.Company#getPurchaseOrders <em>Purchase Orders</em>}'.
-   * <!-- begin-user-doc
+   * Returns the meta object for the containment reference list '
+   * {@link org.eclipse.emf.cdo.tests.model1.Company#getPurchaseOrders <em>Purchase Orders</em>}'. <!-- begin-user-doc
    * --> <!-- end-user-doc -->
+   * 
    * @return the meta object for the containment reference list '<em>Purchase Orders</em>'.
    * @see org.eclipse.emf.cdo.tests.model1.Company#getPurchaseOrders()
    * @see #getCompany()
@@ -948,9 +981,10 @@ public interface Model1Package extends EPackage
   EReference getCompany_PurchaseOrders();
 
   /**
-   * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.model1.Company#getCustomers <em>Customers</em>}'.
-   * <!-- begin-user-doc --> <!--
+   * Returns the meta object for the containment reference list '
+   * {@link org.eclipse.emf.cdo.tests.model1.Company#getCustomers <em>Customers</em>}'. <!-- begin-user-doc --> <!--
    * end-user-doc -->
+   * 
    * @return the meta object for the containment reference list '<em>Customers</em>'.
    * @see org.eclipse.emf.cdo.tests.model1.Company#getCustomers()
    * @see #getCompany()
@@ -959,9 +993,10 @@ public interface Model1Package extends EPackage
   EReference getCompany_Customers();
 
   /**
-   * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.model1.Company#getSalesOrders <em>Sales Orders</em>}'.
-   * <!-- begin-user-doc -->
+   * Returns the meta object for the containment reference list '
+   * {@link org.eclipse.emf.cdo.tests.model1.Company#getSalesOrders <em>Sales Orders</em>}'. <!-- begin-user-doc -->
    * <!-- end-user-doc -->
+   * 
    * @return the meta object for the containment reference list '<em>Sales Orders</em>'.
    * @see org.eclipse.emf.cdo.tests.model1.Company#getSalesOrders()
    * @see #getCompany()
@@ -980,8 +1015,9 @@ public interface Model1Package extends EPackage
   EClass getCustomer();
 
   /**
-   * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.tests.model1.Customer#getSalesOrders <em>Sales Orders</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.tests.model1.Customer#getSalesOrders
+   * <em>Sales Orders</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @return the meta object for the reference list '<em>Sales Orders</em>'.
    * @see org.eclipse.emf.cdo.tests.model1.Customer#getSalesOrders()
    * @see #getCustomer()
@@ -1000,9 +1036,10 @@ public interface Model1Package extends EPackage
   EClass getOrder();
 
   /**
-   * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.model1.Order#getOrderDetails <em>Order Details</em>}'.
-   * <!-- begin-user-doc -->
+   * Returns the meta object for the containment reference list '
+   * {@link org.eclipse.emf.cdo.tests.model1.Order#getOrderDetails <em>Order Details</em>}'. <!-- begin-user-doc -->
    * <!-- end-user-doc -->
+   * 
    * @return the meta object for the containment reference list '<em>Order Details</em>'.
    * @see org.eclipse.emf.cdo.tests.model1.Order#getOrderDetails()
    * @see #getOrder()
@@ -1023,6 +1060,7 @@ public interface Model1Package extends EPackage
   /**
    * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model1.SalesOrder#getId <em>Id</em>}'.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @return the meta object for the attribute '<em>Id</em>'.
    * @see org.eclipse.emf.cdo.tests.model1.SalesOrder#getId()
    * @see #getSalesOrder()
@@ -1031,8 +1069,9 @@ public interface Model1Package extends EPackage
   EAttribute getSalesOrder_Id();
 
   /**
-   * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.tests.model1.SalesOrder#getCustomer <em>Customer</em>}'.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.tests.model1.SalesOrder#getCustomer
+   * <em>Customer</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @return the meta object for the reference '<em>Customer</em>'.
    * @see org.eclipse.emf.cdo.tests.model1.SalesOrder#getCustomer()
    * @see #getSalesOrder()
@@ -1041,8 +1080,8 @@ public interface Model1Package extends EPackage
   EReference getSalesOrder_Customer();
 
   /**
-   * Returns the factory that creates the instances of the model.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Returns the factory that creates the instances of the model. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @return the factory that creates the instances of the model.
    * @generated
    */
@@ -1057,13 +1096,15 @@ public interface Model1Package extends EPackage
    * <li>and each data type</li>
    * </ul>
    * <!-- end-user-doc -->
+   * 
    * @generated
    */
   interface Literals
   {
     /**
-     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model1.impl.AddressImpl <em>Address</em>}' class.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model1.impl.AddressImpl <em>Address</em>}'
+     * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @see org.eclipse.emf.cdo.tests.model1.impl.AddressImpl
      * @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getAddress()
      * @generated
@@ -1071,32 +1112,33 @@ public interface Model1Package extends EPackage
     EClass ADDRESS = eINSTANCE.getAddress();
 
     /**
-     * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-     * <!-- begin-user-doc --> <!--
+     * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
+     * 
      * @generated
      */
     EAttribute ADDRESS__NAME = eINSTANCE.getAddress_Name();
 
     /**
-     * The meta object literal for the '<em><b>Street</b></em>' attribute feature.
-     * <!-- begin-user-doc --> <!--
+     * The meta object literal for the '<em><b>Street</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
+     * 
      * @generated
      */
     EAttribute ADDRESS__STREET = eINSTANCE.getAddress_Street();
 
     /**
-     * The meta object literal for the '<em><b>City</b></em>' attribute feature.
-     * <!-- begin-user-doc --> <!--
+     * The meta object literal for the '<em><b>City</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
+     * 
      * @generated
      */
     EAttribute ADDRESS__CITY = eINSTANCE.getAddress_City();
 
     /**
-     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model1.impl.SupplierImpl <em>Supplier</em>}' class.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model1.impl.SupplierImpl <em>Supplier</em>}'
+     * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @see org.eclipse.emf.cdo.tests.model1.impl.SupplierImpl
      * @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getSupplier()
      * @generated
@@ -1104,24 +1146,25 @@ public interface Model1Package extends EPackage
     EClass SUPPLIER = eINSTANCE.getSupplier();
 
     /**
-     * The meta object literal for the '<em><b>Purchase Orders</b></em>' reference list feature.
-     * <!-- begin-user-doc -->
+     * The meta object literal for the '<em><b>Purchase Orders</b></em>' reference list feature. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
+     * 
      * @generated
      */
     EReference SUPPLIER__PURCHASE_ORDERS = eINSTANCE.getSupplier_PurchaseOrders();
 
     /**
-     * The meta object literal for the '<em><b>Preferred</b></em>' attribute feature.
-     * <!-- begin-user-doc --> <!--
+     * The meta object literal for the '<em><b>Preferred</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
+     * 
      * @generated
      */
     EAttribute SUPPLIER__PREFERRED = eINSTANCE.getSupplier_Preferred();
 
     /**
-     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model1.impl.PurchaseOrderImpl <em>Purchase Order</em>}' class.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model1.impl.PurchaseOrderImpl
+     * <em>Purchase Order</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @see org.eclipse.emf.cdo.tests.model1.impl.PurchaseOrderImpl
      * @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getPurchaseOrder()
      * @generated
@@ -1129,24 +1172,25 @@ public interface Model1Package extends EPackage
     EClass PURCHASE_ORDER = eINSTANCE.getPurchaseOrder();
 
     /**
-     * The meta object literal for the '<em><b>Date</b></em>' attribute feature.
-     * <!-- begin-user-doc --> <!--
+     * The meta object literal for the '<em><b>Date</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
+     * 
      * @generated
      */
     EAttribute PURCHASE_ORDER__DATE = eINSTANCE.getPurchaseOrder_Date();
 
     /**
-     * The meta object literal for the '<em><b>Supplier</b></em>' reference feature.
-     * <!-- begin-user-doc --> <!--
+     * The meta object literal for the '<em><b>Supplier</b></em>' reference feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
+     * 
      * @generated
      */
     EReference PURCHASE_ORDER__SUPPLIER = eINSTANCE.getPurchaseOrder_Supplier();
 
     /**
-     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model1.impl.OrderDetailImpl <em>Order Detail</em>}' class.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model1.impl.OrderDetailImpl
+     * <em>Order Detail</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @see org.eclipse.emf.cdo.tests.model1.impl.OrderDetailImpl
      * @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getOrderDetail()
      * @generated
@@ -1154,32 +1198,33 @@ public interface Model1Package extends EPackage
     EClass ORDER_DETAIL = eINSTANCE.getOrderDetail();
 
     /**
-     * The meta object literal for the '<em><b>Order</b></em>' container reference feature.
-     * <!-- begin-user-doc --> <!--
+     * The meta object literal for the '<em><b>Order</b></em>' container reference feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
+     * 
      * @generated
      */
     EReference ORDER_DETAIL__ORDER = eINSTANCE.getOrderDetail_Order();
 
     /**
-     * The meta object literal for the '<em><b>Product</b></em>' reference feature.
-     * <!-- begin-user-doc --> <!--
+     * The meta object literal for the '<em><b>Product</b></em>' reference feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
+     * 
      * @generated
      */
     EReference ORDER_DETAIL__PRODUCT = eINSTANCE.getOrderDetail_Product();
 
     /**
-     * The meta object literal for the '<em><b>Price</b></em>' attribute feature.
-     * <!-- begin-user-doc --> <!--
+     * The meta object literal for the '<em><b>Price</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
+     * 
      * @generated
      */
     EAttribute ORDER_DETAIL__PRICE = eINSTANCE.getOrderDetail_Price();
 
     /**
-     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model1.impl.OrderAddressImpl <em>Order Address</em>}' class.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model1.impl.OrderAddressImpl
+     * <em>Order Address</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @see org.eclipse.emf.cdo.tests.model1.impl.OrderAddressImpl
      * @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getOrderAddress()
      * @generated
@@ -1187,9 +1232,9 @@ public interface Model1Package extends EPackage
     EClass ORDER_ADDRESS = eINSTANCE.getOrderAddress();
 
     /**
-     * The meta object literal for the '<em><b>Test Attribute</b></em>' attribute feature.
-     * <!-- begin-user-doc --> <!--
+     * The meta object literal for the '<em><b>Test Attribute</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
+     * 
      * @generated
      */
     EAttribute ORDER_ADDRESS__TEST_ATTRIBUTE = eINSTANCE.getOrderAddress_TestAttribute();
@@ -1205,8 +1250,9 @@ public interface Model1Package extends EPackage
     EEnum VAT = eINSTANCE.getVAT();
 
     /**
-     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model1.impl.CategoryImpl <em>Category</em>}' class.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model1.impl.CategoryImpl <em>Category</em>}'
+     * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @see org.eclipse.emf.cdo.tests.model1.impl.CategoryImpl
      * @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getCategory()
      * @generated
@@ -1214,9 +1260,9 @@ public interface Model1Package extends EPackage
     EClass CATEGORY = eINSTANCE.getCategory();
 
     /**
-     * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-     * <!-- begin-user-doc --> <!--
+     * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
+     * 
      * @generated
      */
     EAttribute CATEGORY__NAME = eINSTANCE.getCategory_Name();
@@ -1238,8 +1284,9 @@ public interface Model1Package extends EPackage
     EReference CATEGORY__PRODUCTS = eINSTANCE.getCategory_Products();
 
     /**
-     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model1.impl.Product1Impl <em>Product1</em>}' class.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model1.impl.Product1Impl <em>Product1</em>}'
+     * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @see org.eclipse.emf.cdo.tests.model1.impl.Product1Impl
      * @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getProduct1()
      * @generated
@@ -1247,40 +1294,41 @@ public interface Model1Package extends EPackage
     EClass PRODUCT1 = eINSTANCE.getProduct1();
 
     /**
-     * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-     * <!-- begin-user-doc --> <!--
+     * The meta object literal for the '<em><b>Name</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
+     * 
      * @generated
      */
     EAttribute PRODUCT1__NAME = eINSTANCE.getProduct1_Name();
 
     /**
-     * The meta object literal for the '<em><b>Order Details</b></em>' reference list feature.
-     * <!-- begin-user-doc -->
+     * The meta object literal for the '<em><b>Order Details</b></em>' reference list feature. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
+     * 
      * @generated
      */
     EReference PRODUCT1__ORDER_DETAILS = eINSTANCE.getProduct1_OrderDetails();
 
     /**
-     * The meta object literal for the '<em><b>Vat</b></em>' attribute feature.
-     * <!-- begin-user-doc --> <!--
+     * The meta object literal for the '<em><b>Vat</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
+     * 
      * @generated
      */
     EAttribute PRODUCT1__VAT = eINSTANCE.getProduct1_Vat();
 
     /**
-     * The meta object literal for the '<em><b>Description</b></em>' attribute feature.
-     * <!-- begin-user-doc --> <!--
+     * The meta object literal for the '<em><b>Description</b></em>' attribute feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
+     * 
      * @generated
      */
     EAttribute PRODUCT1__DESCRIPTION = eINSTANCE.getProduct1_Description();
 
     /**
-     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model1.impl.CompanyImpl <em>Company</em>}' class.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model1.impl.CompanyImpl <em>Company</em>}'
+     * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @see org.eclipse.emf.cdo.tests.model1.impl.CompanyImpl
      * @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getCompany()
      * @generated
@@ -1328,8 +1376,9 @@ public interface Model1Package extends EPackage
     EReference COMPANY__SALES_ORDERS = eINSTANCE.getCompany_SalesOrders();
 
     /**
-     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model1.impl.CustomerImpl <em>Customer</em>}' class.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model1.impl.CustomerImpl <em>Customer</em>}'
+     * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @see org.eclipse.emf.cdo.tests.model1.impl.CustomerImpl
      * @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getCustomer()
      * @generated
@@ -1337,9 +1386,9 @@ public interface Model1Package extends EPackage
     EClass CUSTOMER = eINSTANCE.getCustomer();
 
     /**
-     * The meta object literal for the '<em><b>Sales Orders</b></em>' reference list feature.
-     * <!-- begin-user-doc -->
+     * The meta object literal for the '<em><b>Sales Orders</b></em>' reference list feature. <!-- begin-user-doc -->
      * <!-- end-user-doc -->
+     * 
      * @generated
      */
     EReference CUSTOMER__SALES_ORDERS = eINSTANCE.getCustomer_SalesOrders();
@@ -1347,6 +1396,7 @@ public interface Model1Package extends EPackage
     /**
      * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model1.impl.OrderImpl <em>Order</em>}' class.
      * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @see org.eclipse.emf.cdo.tests.model1.impl.OrderImpl
      * @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getOrder()
      * @generated
@@ -1362,8 +1412,9 @@ public interface Model1Package extends EPackage
     EReference ORDER__ORDER_DETAILS = eINSTANCE.getOrder_OrderDetails();
 
     /**
-     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model1.impl.SalesOrderImpl <em>Sales Order</em>}' class.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model1.impl.SalesOrderImpl
+     * <em>Sales Order</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
      * @see org.eclipse.emf.cdo.tests.model1.impl.SalesOrderImpl
      * @see org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl#getSalesOrder()
      * @generated
@@ -1379,9 +1430,9 @@ public interface Model1Package extends EPackage
     EAttribute SALES_ORDER__ID = eINSTANCE.getSalesOrder_Id();
 
     /**
-     * The meta object literal for the '<em><b>Customer</b></em>' reference feature.
-     * <!-- begin-user-doc --> <!--
+     * The meta object literal for the '<em><b>Customer</b></em>' reference feature. <!-- begin-user-doc --> <!--
      * end-user-doc -->
+     * 
      * @generated
      */
     EReference SALES_ORDER__CUSTOMER = eINSTANCE.getSalesOrder_Customer();
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Order.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Order.java
index 9a967a37ea..fc08028d86 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Order.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Order.java
@@ -17,14 +17,13 @@ import org.eclipse.emf.ecore.EObject;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>Order</b></em>'. <!-- end-user-doc -->
- *
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.emf.cdo.tests.model1.Order#getOrderDetails <em>Order Details</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.Order#getOrderDetails <em>Order Details</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getOrder()
  * @model
  * @generated
@@ -32,22 +31,22 @@ import org.eclipse.emf.ecore.EObject;
 public interface Order extends EObject
 {
   /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   String copyright = "Copyright (c) 2004 - 2008 Eike Stepper, Germany.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n   Eike Stepper - initial API and implementation";
 
   /**
-   * Returns the value of the '<em><b>Order Details</b></em>' containment reference list.
-   * The list contents are of type {@link org.eclipse.emf.cdo.tests.model1.OrderDetail}.
-   * It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.model1.OrderDetail#getOrder <em>Order</em>}'.
-   * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Order Details</b></em>' containment reference list. The list contents are of type
+   * {@link org.eclipse.emf.cdo.tests.model1.OrderDetail}. It is bidirectional and its opposite is '
+   * {@link org.eclipse.emf.cdo.tests.model1.OrderDetail#getOrder <em>Order</em>}'. <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Order Details</em>' containment reference list isn't clear, there really should be more
    * of a description here...
    * </p>
    * <!-- end-user-doc -->
+   * 
    * @return the value of the '<em>Order Details</em>' containment reference list.
    * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getOrder_OrderDetails()
    * @see org.eclipse.emf.cdo.tests.model1.OrderDetail#getOrder
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/OrderAddress.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/OrderAddress.java
index a34f49ce14..461f223bfa 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/OrderAddress.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/OrderAddress.java
@@ -8,20 +8,19 @@
  * Contributors:
  *    Eike Stepper - initial API and implementation
  *
- * $Id: OrderAddress.java,v 1.4 2008-12-28 17:56:46 estepper Exp $
+ * $Id: OrderAddress.java,v 1.5 2009-01-10 13:55:59 estepper Exp $
  */
 package org.eclipse.emf.cdo.tests.model1;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>Order Address</b></em>'. <!-- end-user-doc -->
- *
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.emf.cdo.tests.model1.OrderAddress#isTestAttribute <em>Test Attribute</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.OrderAddress#isTestAttribute <em>Test Attribute</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getOrderAddress()
  * @model
  * @generated
@@ -29,20 +28,20 @@ package org.eclipse.emf.cdo.tests.model1;
 public interface OrderAddress extends Address, Order, OrderDetail
 {
   /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   String copyright = "Copyright (c) 2004 - 2008 Eike Stepper, Germany.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n   Eike Stepper - initial API and implementation";
 
   /**
-   * Returns the value of the '<em><b>Test Attribute</b></em>' attribute.
-   * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Test Attribute</b></em>' attribute. <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Test Attribute</em>' attribute isn't clear, there really should be more of a description
    * here...
    * </p>
    * <!-- end-user-doc -->
+   * 
    * @return the value of the '<em>Test Attribute</em>' attribute.
    * @see #setTestAttribute(boolean)
    * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getOrderAddress_TestAttribute()
@@ -52,9 +51,11 @@ public interface OrderAddress extends Address, Order, OrderDetail
   boolean isTestAttribute();
 
   /**
-   * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model1.OrderAddress#isTestAttribute <em>Test Attribute</em>}' attribute.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @param value the new value of the '<em>Test Attribute</em>' attribute.
+   * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model1.OrderAddress#isTestAttribute
+   * <em>Test Attribute</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @param value
+   *          the new value of the '<em>Test Attribute</em>' attribute.
    * @see #isTestAttribute()
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/OrderDetail.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/OrderDetail.java
index cced12b4e8..0e04569e0c 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/OrderDetail.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/OrderDetail.java
@@ -16,16 +16,15 @@ import org.eclipse.emf.ecore.EObject;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>Order Detail</b></em>'. <!-- end-user-doc -->
- *
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.emf.cdo.tests.model1.OrderDetail#getOrder <em>Order</em>}</li>
- *   <li>{@link org.eclipse.emf.cdo.tests.model1.OrderDetail#getProduct <em>Product</em>}</li>
- *   <li>{@link org.eclipse.emf.cdo.tests.model1.OrderDetail#getPrice <em>Price</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.OrderDetail#getOrder <em>Order</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.OrderDetail#getProduct <em>Product</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.OrderDetail#getPrice <em>Price</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getOrderDetail()
  * @model
  * @generated
@@ -33,21 +32,21 @@ import org.eclipse.emf.ecore.EObject;
 public interface OrderDetail extends EObject
 {
   /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   String copyright = "Copyright (c) 2004 - 2008 Eike Stepper, Germany.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n   Eike Stepper - initial API and implementation";
 
   /**
-   * Returns the value of the '<em><b>Order</b></em>' container reference.
-   * It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.model1.Order#getOrderDetails <em>Order Details</em>}'.
-   * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Order</b></em>' container reference. It is bidirectional and its opposite is '
+   * {@link org.eclipse.emf.cdo.tests.model1.Order#getOrderDetails <em>Order Details</em>}'. <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Order</em>' container reference isn't clear, there really should be more of a
    * description here...
    * </p>
    * <!-- end-user-doc -->
+   * 
    * @return the value of the '<em>Order</em>' container reference.
    * @see #setOrder(Order)
    * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getOrderDetail_Order()
@@ -58,23 +57,25 @@ public interface OrderDetail extends EObject
   Order getOrder();
 
   /**
-   * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model1.OrderDetail#getOrder <em>Order</em>}' container reference.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @param value the new value of the '<em>Order</em>' container reference.
+   * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model1.OrderDetail#getOrder <em>Order</em>}' container
+   * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @param value
+   *          the new value of the '<em>Order</em>' container reference.
    * @see #getOrder()
    * @generated
    */
   void setOrder(Order value);
 
   /**
-   * Returns the value of the '<em><b>Product</b></em>' reference.
-   * It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.model1.Product1#getOrderDetails <em>Order Details</em>}'.
-   * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Product</b></em>' reference. It is bidirectional and its opposite is '
+   * {@link org.eclipse.emf.cdo.tests.model1.Product1#getOrderDetails <em>Order Details</em>}'. <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Product</em>' reference isn't clear, there really should be more of a description
    * here...
    * </p>
    * <!-- end-user-doc -->
+   * 
    * @return the value of the '<em>Product</em>' reference.
    * @see #setProduct(Product1)
    * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getOrderDetail_Product()
@@ -87,19 +88,21 @@ public interface OrderDetail extends EObject
   /**
    * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model1.OrderDetail#getProduct <em>Product</em>}' reference.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @param value the new value of the '<em>Product</em>' reference.
+   * 
+   * @param value
+   *          the new value of the '<em>Product</em>' reference.
    * @see #getProduct()
    * @generated
    */
   void setProduct(Product1 value);
 
   /**
-   * Returns the value of the '<em><b>Price</b></em>' attribute.
-   * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Price</b></em>' attribute. <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Price</em>' attribute isn't clear, there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
+   * 
    * @return the value of the '<em>Price</em>' attribute.
    * @see #setPrice(float)
    * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getOrderDetail_Price()
@@ -111,7 +114,9 @@ public interface OrderDetail extends EObject
   /**
    * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model1.OrderDetail#getPrice <em>Price</em>}' attribute.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @param value the new value of the '<em>Price</em>' attribute.
+   * 
+   * @param value
+   *          the new value of the '<em>Price</em>' attribute.
    * @see #getPrice()
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Product1.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Product1.java
index 114698ac3d..8346f1c0d4 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Product1.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Product1.java
@@ -8,7 +8,7 @@
  * Contributors:
  *    Eike Stepper - initial API and implementation
  *
- * $Id: Product1.java,v 1.4 2008-12-28 17:56:46 estepper Exp $
+ * $Id: Product1.java,v 1.5 2009-01-10 13:55:59 estepper Exp $
  */
 package org.eclipse.emf.cdo.tests.model1;
 
@@ -17,17 +17,16 @@ import org.eclipse.emf.ecore.EObject;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>Product</b></em>'. <!-- end-user-doc -->
- *
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.emf.cdo.tests.model1.Product1#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.emf.cdo.tests.model1.Product1#getOrderDetails <em>Order Details</em>}</li>
- *   <li>{@link org.eclipse.emf.cdo.tests.model1.Product1#getVat <em>Vat</em>}</li>
- *   <li>{@link org.eclipse.emf.cdo.tests.model1.Product1#getDescription <em>Description</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.Product1#getName <em>Name</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.Product1#getOrderDetails <em>Order Details</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.Product1#getVat <em>Vat</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.Product1#getDescription <em>Description</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getProduct1()
  * @model
  * @generated
@@ -35,19 +34,19 @@ import org.eclipse.emf.ecore.EObject;
 public interface Product1 extends EObject
 {
   /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   String copyright = "Copyright (c) 2004 - 2008 Eike Stepper, Germany.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n   Eike Stepper - initial API and implementation";
 
   /**
-   * Returns the value of the '<em><b>Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Name</b></em>' attribute. <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
+   * 
    * @return the value of the '<em>Name</em>' attribute.
    * @see #setName(String)
    * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getProduct1_Name()
@@ -68,15 +67,15 @@ public interface Product1 extends EObject
   void setName(String value);
 
   /**
-   * Returns the value of the '<em><b>Order Details</b></em>' reference list.
-   * The list contents are of type {@link org.eclipse.emf.cdo.tests.model1.OrderDetail}.
-   * It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.model1.OrderDetail#getProduct <em>Product</em>}'.
-   * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Order Details</b></em>' reference list. The list contents are of type
+   * {@link org.eclipse.emf.cdo.tests.model1.OrderDetail}. It is bidirectional and its opposite is '
+   * {@link org.eclipse.emf.cdo.tests.model1.OrderDetail#getProduct <em>Product</em>}'. <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Order Details</em>' reference list isn't clear, there really should be more of a
    * description here...
    * </p>
    * <!-- end-user-doc -->
+   * 
    * @return the value of the '<em>Order Details</em>' reference list.
    * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getProduct1_OrderDetails()
    * @see org.eclipse.emf.cdo.tests.model1.OrderDetail#getProduct
@@ -86,14 +85,13 @@ public interface Product1 extends EObject
   EList<OrderDetail> getOrderDetails();
 
   /**
-   * Returns the value of the '<em><b>Vat</b></em>' attribute.
-   * The default value is <code>"vat15"</code>.
-   * The literals are from the enumeration {@link org.eclipse.emf.cdo.tests.model1.VAT}.
-   * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Vat</b></em>' attribute. The default value is <code>"vat15"</code>. The literals
+   * are from the enumeration {@link org.eclipse.emf.cdo.tests.model1.VAT}. <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Vat</em>' attribute isn't clear, there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
+   * 
    * @return the value of the '<em>Vat</em>' attribute.
    * @see org.eclipse.emf.cdo.tests.model1.VAT
    * @see #setVat(VAT)
@@ -116,13 +114,13 @@ public interface Product1 extends EObject
   void setVat(VAT value);
 
   /**
-   * Returns the value of the '<em><b>Description</b></em>' attribute.
-   * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Description</b></em>' attribute. <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Description</em>' attribute isn't clear, there really should be more of a description
    * here...
    * </p>
    * <!-- end-user-doc -->
+   * 
    * @return the value of the '<em>Description</em>' attribute.
    * @see #setDescription(String)
    * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getProduct1_Description()
@@ -132,9 +130,11 @@ public interface Product1 extends EObject
   String getDescription();
 
   /**
-   * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model1.Product1#getDescription <em>Description</em>}' attribute.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @param value the new value of the '<em>Description</em>' attribute.
+   * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model1.Product1#getDescription <em>Description</em>}'
+   * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @param value
+   *          the new value of the '<em>Description</em>' attribute.
    * @see #getDescription()
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/PurchaseOrder.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/PurchaseOrder.java
index ca2729d0d9..fc5326e136 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/PurchaseOrder.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/PurchaseOrder.java
@@ -16,15 +16,14 @@ import java.util.Date;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>Purchase Order</b></em>'. <!-- end-user-doc -->
- *
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.emf.cdo.tests.model1.PurchaseOrder#getDate <em>Date</em>}</li>
- *   <li>{@link org.eclipse.emf.cdo.tests.model1.PurchaseOrder#getSupplier <em>Supplier</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.PurchaseOrder#getDate <em>Date</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.PurchaseOrder#getSupplier <em>Supplier</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getPurchaseOrder()
  * @model
  * @generated
@@ -32,19 +31,19 @@ import java.util.Date;
 public interface PurchaseOrder extends Order
 {
   /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   String copyright = "Copyright (c) 2004 - 2008 Eike Stepper, Germany.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n   Eike Stepper - initial API and implementation";
 
   /**
-   * Returns the value of the '<em><b>Date</b></em>' attribute.
-   * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Date</b></em>' attribute. <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Date</em>' attribute isn't clear, there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
+   * 
    * @return the value of the '<em>Date</em>' attribute.
    * @see #setDate(Date)
    * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getPurchaseOrder_Date()
@@ -56,22 +55,24 @@ public interface PurchaseOrder extends Order
   /**
    * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model1.PurchaseOrder#getDate <em>Date</em>}' attribute.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @param value the new value of the '<em>Date</em>' attribute.
+   * 
+   * @param value
+   *          the new value of the '<em>Date</em>' attribute.
    * @see #getDate()
    * @generated
    */
   void setDate(Date value);
 
   /**
-   * Returns the value of the '<em><b>Supplier</b></em>' reference.
-   * It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.model1.Supplier#getPurchaseOrders <em>Purchase Orders</em>}'.
-   * <!-- begin-user-doc
+   * Returns the value of the '<em><b>Supplier</b></em>' reference. It is bidirectional and its opposite is '
+   * {@link org.eclipse.emf.cdo.tests.model1.Supplier#getPurchaseOrders <em>Purchase Orders</em>}'. <!-- begin-user-doc
    * -->
    * <p>
    * If the meaning of the '<em>Supplier</em>' reference isn't clear, there really should be more of a description
    * here...
    * </p>
    * <!-- end-user-doc -->
+   * 
    * @return the value of the '<em>Supplier</em>' reference.
    * @see #setSupplier(Supplier)
    * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getPurchaseOrder_Supplier()
@@ -82,9 +83,11 @@ public interface PurchaseOrder extends Order
   Supplier getSupplier();
 
   /**
-   * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model1.PurchaseOrder#getSupplier <em>Supplier</em>}' reference.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @param value the new value of the '<em>Supplier</em>' reference.
+   * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model1.PurchaseOrder#getSupplier <em>Supplier</em>}'
+   * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @param value
+   *          the new value of the '<em>Supplier</em>' reference.
    * @see #getSupplier()
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/SalesOrder.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/SalesOrder.java
index 7b10968751..9e83686f4a 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/SalesOrder.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/SalesOrder.java
@@ -14,15 +14,14 @@ package org.eclipse.emf.cdo.tests.model1;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>Sales Order</b></em>'. <!-- end-user-doc -->
- *
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.emf.cdo.tests.model1.SalesOrder#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.emf.cdo.tests.model1.SalesOrder#getCustomer <em>Customer</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.SalesOrder#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.SalesOrder#getCustomer <em>Customer</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getSalesOrder()
  * @model
  * @generated
@@ -30,19 +29,19 @@ package org.eclipse.emf.cdo.tests.model1;
 public interface SalesOrder extends Order
 {
   /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   String copyright = "Copyright (c) 2004 - 2008 Eike Stepper, Germany.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n   Eike Stepper - initial API and implementation";
 
   /**
-   * Returns the value of the '<em><b>Id</b></em>' attribute.
-   * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Id</em>' attribute isn't clear, there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
+   * 
    * @return the value of the '<em>Id</em>' attribute.
    * @see #setId(int)
    * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getSalesOrder_Id()
@@ -63,14 +62,14 @@ public interface SalesOrder extends Order
   void setId(int value);
 
   /**
-   * Returns the value of the '<em><b>Customer</b></em>' reference.
-   * It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.model1.Customer#getSalesOrders <em>Sales Orders</em>}'.
-   * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Customer</b></em>' reference. It is bidirectional and its opposite is '
+   * {@link org.eclipse.emf.cdo.tests.model1.Customer#getSalesOrders <em>Sales Orders</em>}'. <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Customer</em>' reference isn't clear, there really should be more of a description
    * here...
    * </p>
    * <!-- end-user-doc -->
+   * 
    * @return the value of the '<em>Customer</em>' reference.
    * @see #setCustomer(Customer)
    * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getSalesOrder_Customer()
@@ -81,9 +80,11 @@ public interface SalesOrder extends Order
   Customer getCustomer();
 
   /**
-   * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model1.SalesOrder#getCustomer <em>Customer</em>}' reference.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @param value the new value of the '<em>Customer</em>' reference.
+   * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model1.SalesOrder#getCustomer <em>Customer</em>}'
+   * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @param value
+   *          the new value of the '<em>Customer</em>' reference.
    * @see #getCustomer()
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Supplier.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Supplier.java
index 13fdce70d5..ddf40f0dec 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Supplier.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Supplier.java
@@ -16,15 +16,14 @@ import org.eclipse.emf.common.util.EList;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>Supplier</b></em>'. <!-- end-user-doc -->
- *
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.emf.cdo.tests.model1.Supplier#getPurchaseOrders <em>Purchase Orders</em>}</li>
- *   <li>{@link org.eclipse.emf.cdo.tests.model1.Supplier#isPreferred <em>Preferred</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.Supplier#getPurchaseOrders <em>Purchase Orders</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.Supplier#isPreferred <em>Preferred</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getSupplier()
  * @model
  * @generated
@@ -32,22 +31,22 @@ import org.eclipse.emf.common.util.EList;
 public interface Supplier extends Address
 {
   /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   String copyright = "Copyright (c) 2004 - 2008 Eike Stepper, Germany.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n   Eike Stepper - initial API and implementation";
 
   /**
-   * Returns the value of the '<em><b>Purchase Orders</b></em>' reference list.
-   * The list contents are of type {@link org.eclipse.emf.cdo.tests.model1.PurchaseOrder}.
-   * It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.model1.PurchaseOrder#getSupplier <em>Supplier</em>}'.
-   * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Purchase Orders</b></em>' reference list. The list contents are of type
+   * {@link org.eclipse.emf.cdo.tests.model1.PurchaseOrder}. It is bidirectional and its opposite is '
+   * {@link org.eclipse.emf.cdo.tests.model1.PurchaseOrder#getSupplier <em>Supplier</em>}'. <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Purchase Orders</em>' reference list isn't clear, there really should be more of a
    * description here...
    * </p>
    * <!-- end-user-doc -->
+   * 
    * @return the value of the '<em>Purchase Orders</em>' reference list.
    * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getSupplier_PurchaseOrders()
    * @see org.eclipse.emf.cdo.tests.model1.PurchaseOrder#getSupplier
@@ -76,7 +75,9 @@ public interface Supplier extends Address
   /**
    * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model1.Supplier#isPreferred <em>Preferred</em>}' attribute.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @param value the new value of the '<em>Preferred</em>' attribute.
+   * 
+   * @param value
+   *          the new value of the '<em>Preferred</em>' attribute.
    * @see #isPreferred()
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/VAT.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/VAT.java
index 92d3a353bd..7f497d5150 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/VAT.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/VAT.java
@@ -8,7 +8,7 @@
  * Contributors:
  *    Eike Stepper - initial API and implementation
  *
- * $Id: VAT.java,v 1.5 2008-12-28 17:56:46 estepper Exp $
+ * $Id: VAT.java,v 1.6 2009-01-10 13:55:59 estepper Exp $
  */
 package org.eclipse.emf.cdo.tests.model1;
 
@@ -21,6 +21,7 @@ import java.util.List;
 /**
  * <!-- begin-user-doc --> A representation of the literals of the enumeration '<em><b>VAT</b></em>', and utility
  * methods for working with them. <!-- end-user-doc -->
+ * 
  * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getVAT()
  * @model
  * @generated
@@ -28,8 +29,8 @@ import java.util.List;
 public enum VAT implements Enumerator
 {
   /**
-   * The '<em><b>Vat0</b></em>' literal object.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The '<em><b>Vat0</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @see #VAT0_VALUE
    * @generated
    * @ordered
@@ -37,8 +38,8 @@ public enum VAT implements Enumerator
   VAT0(0, "vat0", "vat0"),
 
   /**
-   * The '<em><b>Vat7</b></em>' literal object.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The '<em><b>Vat7</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @see #VAT7_VALUE
    * @generated
    * @ordered
@@ -46,8 +47,8 @@ public enum VAT implements Enumerator
   VAT7(7, "vat7", "vat7"),
 
   /**
-   * The '<em><b>Vat15</b></em>' literal object.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The '<em><b>Vat15</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @see #VAT15_VALUE
    * @generated
    * @ordered
@@ -55,20 +56,20 @@ public enum VAT implements Enumerator
   VAT15(15, "vat15", "vat15");
 
   /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public static final String copyright = "Copyright (c) 2004 - 2008 Eike Stepper, Germany.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n   Eike Stepper - initial API and implementation";
 
   /**
-   * The '<em><b>Vat0</b></em>' literal value.
-   * <!-- begin-user-doc -->
+   * The '<em><b>Vat0</b></em>' literal value. <!-- begin-user-doc -->
    * <p>
    * If the meaning of '<em><b>Vat0</b></em>' literal object isn't clear, there really should be more of a description
    * here...
    * </p>
    * <!-- end-user-doc -->
+   * 
    * @see #VAT0
    * @model name="vat0"
    * @generated
@@ -77,13 +78,13 @@ public enum VAT implements Enumerator
   public static final int VAT0_VALUE = 0;
 
   /**
-   * The '<em><b>Vat7</b></em>' literal value.
-   * <!-- begin-user-doc -->
+   * The '<em><b>Vat7</b></em>' literal value. <!-- begin-user-doc -->
    * <p>
    * If the meaning of '<em><b>Vat7</b></em>' literal object isn't clear, there really should be more of a description
    * here...
    * </p>
    * <!-- end-user-doc -->
+   * 
    * @see #VAT7
    * @model name="vat7"
    * @generated
@@ -92,13 +93,13 @@ public enum VAT implements Enumerator
   public static final int VAT7_VALUE = 7;
 
   /**
-   * The '<em><b>Vat15</b></em>' literal value.
-   * <!-- begin-user-doc -->
+   * The '<em><b>Vat15</b></em>' literal value. <!-- begin-user-doc -->
    * <p>
    * If the meaning of '<em><b>Vat15</b></em>' literal object isn't clear, there really should be more of a description
    * here...
    * </p>
    * <!-- end-user-doc -->
+   * 
    * @see #VAT15
    * @model name="vat15"
    * @generated
@@ -107,23 +108,23 @@ public enum VAT implements Enumerator
   public static final int VAT15_VALUE = 15;
 
   /**
-   * An array of all the '<em><b>VAT</b></em>' enumerators.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * An array of all the '<em><b>VAT</b></em>' enumerators. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   private static final VAT[] VALUES_ARRAY = new VAT[] { VAT0, VAT7, VAT15, };
 
   /**
-   * A public read-only list of all the '<em><b>VAT</b></em>' enumerators.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * A public read-only list of all the '<em><b>VAT</b></em>' enumerators. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public static final List<VAT> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
 
   /**
-   * Returns the '<em><b>VAT</b></em>' literal with the specified literal value.
-   * <!-- begin-user-doc --> <!--
+   * Returns the '<em><b>VAT</b></em>' literal with the specified literal value. <!-- begin-user-doc --> <!--
    * end-user-doc -->
+   * 
    * @generated
    */
   public static VAT get(String literal)
@@ -140,8 +141,8 @@ public enum VAT implements Enumerator
   }
 
   /**
-   * Returns the '<em><b>VAT</b></em>' literal with the specified name.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Returns the '<em><b>VAT</b></em>' literal with the specified name. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public static VAT getByName(String name)
@@ -158,9 +159,9 @@ public enum VAT implements Enumerator
   }
 
   /**
-   * Returns the '<em><b>VAT</b></em>' literal with the specified integer value.
-   * <!-- begin-user-doc --> <!--
+   * Returns the '<em><b>VAT</b></em>' literal with the specified integer value. <!-- begin-user-doc --> <!--
    * end-user-doc -->
+   * 
    * @generated
    */
   public static VAT get(int value)
@@ -179,25 +180,28 @@ public enum VAT implements Enumerator
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   private final int value;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   private final String name;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   private final String literal;
 
   /**
-   * Only this class can construct instances.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Only this class can construct instances. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   private VAT(int value, String name, String literal)
@@ -209,6 +213,7 @@ public enum VAT implements Enumerator
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public int getValue()
@@ -218,6 +223,7 @@ public enum VAT implements Enumerator
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public String getName()
@@ -227,6 +233,7 @@ public enum VAT implements Enumerator
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public String getLiteral()
@@ -235,9 +242,9 @@ public enum VAT implements Enumerator
   }
 
   /**
-   * Returns the literal value of the enumerator, which is its string representation.
-   * <!-- begin-user-doc --> <!--
+   * Returns the literal value of the enumerator, which is its string representation. <!-- begin-user-doc --> <!--
    * end-user-doc -->
+   * 
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/AddressImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/AddressImpl.java
index fd90bce867..c4c36a77ad 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/AddressImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/AddressImpl.java
@@ -24,25 +24,26 @@ import org.eclipse.emf.ecore.EClass;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.emf.cdo.tests.model1.impl.AddressImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.emf.cdo.tests.model1.impl.AddressImpl#getStreet <em>Street</em>}</li>
- *   <li>{@link org.eclipse.emf.cdo.tests.model1.impl.AddressImpl#getCity <em>City</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.AddressImpl#getName <em>Name</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.AddressImpl#getStreet <em>Street</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.AddressImpl#getCity <em>City</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class AddressImpl extends CDOObjectImpl implements Address
 {
   /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public static final String copyright = "Copyright (c) 2004 - 2008 Eike Stepper, Germany.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n   Eike Stepper - initial API and implementation";
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   protected AddressImpl()
@@ -52,6 +53,7 @@ public class AddressImpl extends CDOObjectImpl implements Address
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   @Override
@@ -62,6 +64,7 @@ public class AddressImpl extends CDOObjectImpl implements Address
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   @Override
@@ -72,6 +75,7 @@ public class AddressImpl extends CDOObjectImpl implements Address
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public String getName()
@@ -81,6 +85,7 @@ public class AddressImpl extends CDOObjectImpl implements Address
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public void setName(String newName)
@@ -90,6 +95,7 @@ public class AddressImpl extends CDOObjectImpl implements Address
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public String getStreet()
@@ -99,6 +105,7 @@ public class AddressImpl extends CDOObjectImpl implements Address
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public void setStreet(String newStreet)
@@ -108,6 +115,7 @@ public class AddressImpl extends CDOObjectImpl implements Address
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public String getCity()
@@ -117,6 +125,7 @@ public class AddressImpl extends CDOObjectImpl implements Address
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public void setCity(String newCity)
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/CategoryImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/CategoryImpl.java
index 890e5dace3..947c936331 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/CategoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/CategoryImpl.java
@@ -26,25 +26,26 @@ import org.eclipse.emf.ecore.EClass;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.emf.cdo.tests.model1.impl.CategoryImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.emf.cdo.tests.model1.impl.CategoryImpl#getCategories <em>Categories</em>}</li>
- *   <li>{@link org.eclipse.emf.cdo.tests.model1.impl.CategoryImpl#getProducts <em>Products</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.CategoryImpl#getName <em>Name</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.CategoryImpl#getCategories <em>Categories</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.CategoryImpl#getProducts <em>Products</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class CategoryImpl extends CDOObjectImpl implements Category
 {
   /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public static final String copyright = "Copyright (c) 2004 - 2008 Eike Stepper, Germany.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n   Eike Stepper - initial API and implementation";
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   protected CategoryImpl()
@@ -54,6 +55,7 @@ public class CategoryImpl extends CDOObjectImpl implements Category
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   @Override
@@ -64,6 +66,7 @@ public class CategoryImpl extends CDOObjectImpl implements Category
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   @Override
@@ -74,6 +77,7 @@ public class CategoryImpl extends CDOObjectImpl implements Category
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public String getName()
@@ -83,6 +87,7 @@ public class CategoryImpl extends CDOObjectImpl implements Category
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public void setName(String newName)
@@ -92,6 +97,7 @@ public class CategoryImpl extends CDOObjectImpl implements Category
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   @SuppressWarnings("unchecked")
@@ -102,6 +108,7 @@ public class CategoryImpl extends CDOObjectImpl implements Category
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   @SuppressWarnings("unchecked")
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/CompanyImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/CompanyImpl.java
index d04a097a73..1a72650305 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/CompanyImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/CompanyImpl.java
@@ -28,27 +28,28 @@ import org.eclipse.emf.ecore.EClass;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.emf.cdo.tests.model1.impl.CompanyImpl#getCategories <em>Categories</em>}</li>
- *   <li>{@link org.eclipse.emf.cdo.tests.model1.impl.CompanyImpl#getSuppliers <em>Suppliers</em>}</li>
- *   <li>{@link org.eclipse.emf.cdo.tests.model1.impl.CompanyImpl#getCustomers <em>Customers</em>}</li>
- *   <li>{@link org.eclipse.emf.cdo.tests.model1.impl.CompanyImpl#getPurchaseOrders <em>Purchase Orders</em>}</li>
- *   <li>{@link org.eclipse.emf.cdo.tests.model1.impl.CompanyImpl#getSalesOrders <em>Sales Orders</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.CompanyImpl#getCategories <em>Categories</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.CompanyImpl#getSuppliers <em>Suppliers</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.CompanyImpl#getCustomers <em>Customers</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.CompanyImpl#getPurchaseOrders <em>Purchase Orders</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.CompanyImpl#getSalesOrders <em>Sales Orders</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class CompanyImpl extends AddressImpl implements Company
 {
   /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public static final String copyright = "Copyright (c) 2004 - 2008 Eike Stepper, Germany.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n   Eike Stepper - initial API and implementation";
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   protected CompanyImpl()
@@ -58,6 +59,7 @@ public class CompanyImpl extends AddressImpl implements Company
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   @Override
@@ -68,6 +70,7 @@ public class CompanyImpl extends AddressImpl implements Company
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   @SuppressWarnings("unchecked")
@@ -78,6 +81,7 @@ public class CompanyImpl extends AddressImpl implements Company
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   @SuppressWarnings("unchecked")
@@ -88,6 +92,7 @@ public class CompanyImpl extends AddressImpl implements Company
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   @SuppressWarnings("unchecked")
@@ -98,6 +103,7 @@ public class CompanyImpl extends AddressImpl implements Company
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   @SuppressWarnings("unchecked")
@@ -108,6 +114,7 @@ public class CompanyImpl extends AddressImpl implements Company
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   @SuppressWarnings("unchecked")
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/CustomerImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/CustomerImpl.java
index fd5f2acdd4..3380dbe836 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/CustomerImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/CustomerImpl.java
@@ -24,23 +24,24 @@ import org.eclipse.emf.ecore.EClass;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.emf.cdo.tests.model1.impl.CustomerImpl#getSalesOrders <em>Sales Orders</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.CustomerImpl#getSalesOrders <em>Sales Orders</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class CustomerImpl extends AddressImpl implements Customer
 {
   /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public static final String copyright = "Copyright (c) 2004 - 2008 Eike Stepper, Germany.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n   Eike Stepper - initial API and implementation";
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   protected CustomerImpl()
@@ -50,6 +51,7 @@ public class CustomerImpl extends AddressImpl implements Customer
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   @Override
@@ -60,6 +62,7 @@ public class CustomerImpl extends AddressImpl implements Customer
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   @SuppressWarnings("unchecked")
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/Model1FactoryImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/Model1FactoryImpl.java
index 17be1b5ff8..6b528ba839 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/Model1FactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/Model1FactoryImpl.java
@@ -36,20 +36,21 @@ 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
 {
   /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public static final String copyright = "Copyright (c) 2004 - 2008 Eike Stepper, Germany.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n   Eike Stepper - initial API and implementation";
 
   /**
-   * Creates the default factory implementation.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Creates the default factory implementation. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public static Model1Factory init()
@@ -71,8 +72,8 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory
   }
 
   /**
-   * Creates an instance of the factory.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Creates an instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public Model1FactoryImpl()
@@ -82,6 +83,7 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   @Override
@@ -118,6 +120,7 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   @Override
@@ -134,6 +137,7 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   @Override
@@ -150,6 +154,7 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public Address createAddress()
@@ -160,6 +165,7 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public Supplier createSupplier()
@@ -170,6 +176,7 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public PurchaseOrder createPurchaseOrder()
@@ -180,6 +187,7 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public OrderDetail createOrderDetail()
@@ -190,6 +198,7 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public OrderAddress createOrderAddress()
@@ -200,6 +209,7 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public VAT createVATFromString(EDataType eDataType, String initialValue)
@@ -213,6 +223,7 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public String convertVATToString(EDataType eDataType, Object instanceValue)
@@ -222,6 +233,7 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public Category createCategory()
@@ -232,6 +244,7 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public Product1 createProduct1()
@@ -242,6 +255,7 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public Company createCompany()
@@ -252,6 +266,7 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public Customer createCustomer()
@@ -262,6 +277,7 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public Order createOrder()
@@ -272,6 +288,7 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public SalesOrder createSalesOrder()
@@ -282,6 +299,7 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public Model1Package getModel1Package()
@@ -291,6 +309,7 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @deprecated
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/Model1PackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/Model1PackageImpl.java
index d87daf12a7..1c0904e0b2 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/Model1PackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/Model1PackageImpl.java
@@ -35,85 +35,98 @@ 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 -->
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public static final String copyright = "Copyright (c) 2004 - 2008 Eike Stepper, Germany.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n   Eike Stepper - initial API and implementation";
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   private EClass addressEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   private EClass supplierEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   private EClass purchaseOrderEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   private EClass orderDetailEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   private EClass orderAddressEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   private EEnum vatEEnum = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   private EClass categoryEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   private EClass product1EClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   private EClass companyEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   private EClass customerEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   private EClass orderEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   private EClass salesOrderEClass = null;
@@ -138,27 +151,24 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   private static boolean isInited = false;
 
   /**
-   * Creates, registers, and initializes the <b>Package</b> for this
-   * model, and for any others upon which it depends.  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 -->
+   * 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()
@@ -190,6 +200,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EClass getAddress()
@@ -199,6 +210,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EAttribute getAddress_Name()
@@ -208,6 +220,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EAttribute getAddress_Street()
@@ -217,6 +230,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EAttribute getAddress_City()
@@ -226,6 +240,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EClass getSupplier()
@@ -235,6 +250,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EReference getSupplier_PurchaseOrders()
@@ -244,6 +260,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EAttribute getSupplier_Preferred()
@@ -253,6 +270,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EClass getPurchaseOrder()
@@ -262,6 +280,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EAttribute getPurchaseOrder_Date()
@@ -271,6 +290,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EReference getPurchaseOrder_Supplier()
@@ -280,6 +300,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EClass getOrderDetail()
@@ -289,6 +310,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EReference getOrderDetail_Order()
@@ -298,6 +320,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EReference getOrderDetail_Product()
@@ -307,6 +330,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EAttribute getOrderDetail_Price()
@@ -316,6 +340,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EClass getOrderAddress()
@@ -325,6 +350,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EAttribute getOrderAddress_TestAttribute()
@@ -334,6 +360,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EEnum getVAT()
@@ -343,6 +370,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EClass getCategory()
@@ -352,6 +380,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EAttribute getCategory_Name()
@@ -361,6 +390,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EReference getCategory_Categories()
@@ -370,6 +400,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EReference getCategory_Products()
@@ -379,6 +410,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EClass getProduct1()
@@ -388,6 +420,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EAttribute getProduct1_Name()
@@ -397,6 +430,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EReference getProduct1_OrderDetails()
@@ -406,6 +440,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EAttribute getProduct1_Vat()
@@ -415,6 +450,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EAttribute getProduct1_Description()
@@ -424,6 +460,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EClass getCompany()
@@ -433,6 +470,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EReference getCompany_Categories()
@@ -442,6 +480,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EReference getCompany_Suppliers()
@@ -451,6 +490,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EReference getCompany_PurchaseOrders()
@@ -460,6 +500,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EReference getCompany_Customers()
@@ -469,6 +510,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EReference getCompany_SalesOrders()
@@ -478,6 +520,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EClass getCustomer()
@@ -487,6 +530,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EReference getCustomer_SalesOrders()
@@ -496,6 +540,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EClass getOrder()
@@ -505,6 +550,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EReference getOrder_OrderDetails()
@@ -514,6 +560,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EClass getSalesOrder()
@@ -523,6 +570,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EAttribute getSalesOrder_Id()
@@ -532,6 +580,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public EReference getSalesOrder_Customer()
@@ -541,6 +590,7 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public Model1Factory getModel1Factory()
@@ -550,14 +600,15 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   private boolean isCreated = false;
 
   /**
-   * Creates the meta-model objects for the package.  This method is
-   * guarded to have no affect on any invocation but its first.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Creates the meta-model objects for the package. This method is guarded to have no affect on any invocation but its
+   * first. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public void createPackageContents()
@@ -622,14 +673,15 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   private boolean isInitialized = false;
 
   /**
-   * Complete the initialization of the package and its meta-model.  This
-   * method is guarded to have no affect on any invocation but its first.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Complete the initialization of the package and its meta-model. This method is guarded to have no affect on any
+   * invocation but its first. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public void initializePackageContents()
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/OrderAddressImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/OrderAddressImpl.java
index afb36934a6..28b784bd8d 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/OrderAddressImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/OrderAddressImpl.java
@@ -8,7 +8,7 @@
  * Contributors:
  *    Eike Stepper - initial API and implementation
  *
- * $Id: OrderAddressImpl.java,v 1.5 2008-12-29 15:06:22 estepper Exp $
+ * $Id: OrderAddressImpl.java,v 1.6 2009-01-10 13:55:58 estepper Exp $
  */
 package org.eclipse.emf.cdo.tests.model1.impl;
 
@@ -26,27 +26,28 @@ import org.eclipse.emf.ecore.EClass;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.emf.cdo.tests.model1.impl.OrderAddressImpl#getOrderDetails <em>Order Details</em>}</li>
- *   <li>{@link org.eclipse.emf.cdo.tests.model1.impl.OrderAddressImpl#getOrder <em>Order</em>}</li>
- *   <li>{@link org.eclipse.emf.cdo.tests.model1.impl.OrderAddressImpl#getProduct <em>Product</em>}</li>
- *   <li>{@link org.eclipse.emf.cdo.tests.model1.impl.OrderAddressImpl#getPrice <em>Price</em>}</li>
- *   <li>{@link org.eclipse.emf.cdo.tests.model1.impl.OrderAddressImpl#isTestAttribute <em>Test Attribute</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.OrderAddressImpl#getOrderDetails <em>Order Details</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.OrderAddressImpl#getOrder <em>Order</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.OrderAddressImpl#getProduct <em>Product</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.OrderAddressImpl#getPrice <em>Price</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.OrderAddressImpl#isTestAttribute <em>Test Attribute</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class OrderAddressImpl extends AddressImpl implements OrderAddress
 {
   /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public static final String copyright = "Copyright (c) 2004 - 2008 Eike Stepper, Germany.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n   Eike Stepper - initial API and implementation";
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   protected OrderAddressImpl()
@@ -56,6 +57,7 @@ public class OrderAddressImpl extends AddressImpl implements OrderAddress
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   @Override
@@ -66,6 +68,7 @@ public class OrderAddressImpl extends AddressImpl implements OrderAddress
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   @SuppressWarnings("unchecked")
@@ -76,6 +79,7 @@ public class OrderAddressImpl extends AddressImpl implements OrderAddress
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public Order getOrder()
@@ -85,6 +89,7 @@ public class OrderAddressImpl extends AddressImpl implements OrderAddress
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public void setOrder(Order newOrder)
@@ -94,6 +99,7 @@ public class OrderAddressImpl extends AddressImpl implements OrderAddress
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public Product1 getProduct()
@@ -103,6 +109,7 @@ public class OrderAddressImpl extends AddressImpl implements OrderAddress
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public void setProduct(Product1 newProduct)
@@ -112,6 +119,7 @@ public class OrderAddressImpl extends AddressImpl implements OrderAddress
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public float getPrice()
@@ -121,6 +129,7 @@ public class OrderAddressImpl extends AddressImpl implements OrderAddress
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public void setPrice(float newPrice)
@@ -130,6 +139,7 @@ public class OrderAddressImpl extends AddressImpl implements OrderAddress
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public boolean isTestAttribute()
@@ -139,6 +149,7 @@ public class OrderAddressImpl extends AddressImpl implements OrderAddress
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public void setTestAttribute(boolean newTestAttribute)
@@ -148,6 +159,7 @@ public class OrderAddressImpl extends AddressImpl implements OrderAddress
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   @Override
@@ -182,6 +194,7 @@ public class OrderAddressImpl extends AddressImpl implements OrderAddress
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/OrderDetailImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/OrderDetailImpl.java
index 289ff187ad..c40fff1a8c 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/OrderDetailImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/OrderDetailImpl.java
@@ -26,25 +26,26 @@ import org.eclipse.emf.ecore.EClass;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.emf.cdo.tests.model1.impl.OrderDetailImpl#getOrder <em>Order</em>}</li>
- *   <li>{@link org.eclipse.emf.cdo.tests.model1.impl.OrderDetailImpl#getProduct <em>Product</em>}</li>
- *   <li>{@link org.eclipse.emf.cdo.tests.model1.impl.OrderDetailImpl#getPrice <em>Price</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.OrderDetailImpl#getOrder <em>Order</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.OrderDetailImpl#getProduct <em>Product</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.OrderDetailImpl#getPrice <em>Price</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class OrderDetailImpl extends CDOObjectImpl implements OrderDetail
 {
   /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public static final String copyright = "Copyright (c) 2004 - 2008 Eike Stepper, Germany.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n   Eike Stepper - initial API and implementation";
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   protected OrderDetailImpl()
@@ -54,6 +55,7 @@ public class OrderDetailImpl extends CDOObjectImpl implements OrderDetail
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   @Override
@@ -64,6 +66,7 @@ public class OrderDetailImpl extends CDOObjectImpl implements OrderDetail
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   @Override
@@ -74,6 +77,7 @@ public class OrderDetailImpl extends CDOObjectImpl implements OrderDetail
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public Order getOrder()
@@ -83,6 +87,7 @@ public class OrderDetailImpl extends CDOObjectImpl implements OrderDetail
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public void setOrder(Order newOrder)
@@ -92,6 +97,7 @@ public class OrderDetailImpl extends CDOObjectImpl implements OrderDetail
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public Product1 getProduct()
@@ -101,6 +107,7 @@ public class OrderDetailImpl extends CDOObjectImpl implements OrderDetail
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public void setProduct(Product1 newProduct)
@@ -110,6 +117,7 @@ public class OrderDetailImpl extends CDOObjectImpl implements OrderDetail
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public float getPrice()
@@ -119,6 +127,7 @@ public class OrderDetailImpl extends CDOObjectImpl implements OrderDetail
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public void setPrice(float newPrice)
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/OrderImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/OrderImpl.java
index d39b91f937..3ebff7f249 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/OrderImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/OrderImpl.java
@@ -26,23 +26,24 @@ import org.eclipse.emf.ecore.EClass;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.emf.cdo.tests.model1.impl.OrderImpl#getOrderDetails <em>Order Details</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.OrderImpl#getOrderDetails <em>Order Details</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class OrderImpl extends CDOObjectImpl implements Order
 {
   /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public static final String copyright = "Copyright (c) 2004 - 2008 Eike Stepper, Germany.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n   Eike Stepper - initial API and implementation";
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   protected OrderImpl()
@@ -52,6 +53,7 @@ public class OrderImpl extends CDOObjectImpl implements Order
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   @Override
@@ -62,6 +64,7 @@ public class OrderImpl extends CDOObjectImpl implements Order
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   @Override
@@ -72,6 +75,7 @@ public class OrderImpl extends CDOObjectImpl implements Order
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   @SuppressWarnings("unchecked")
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/Product1Impl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/Product1Impl.java
index 99396c86f7..2f9d76d7ff 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/Product1Impl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/Product1Impl.java
@@ -8,7 +8,7 @@
  * Contributors:
  *    Eike Stepper - initial API and implementation
  *
- * $Id: Product1Impl.java,v 1.4 2008-12-28 17:56:46 estepper Exp $
+ * $Id: Product1Impl.java,v 1.5 2009-01-10 13:55:59 estepper Exp $
  */
 package org.eclipse.emf.cdo.tests.model1.impl;
 
@@ -27,26 +27,27 @@ import org.eclipse.emf.ecore.EClass;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.emf.cdo.tests.model1.impl.Product1Impl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.emf.cdo.tests.model1.impl.Product1Impl#getOrderDetails <em>Order Details</em>}</li>
- *   <li>{@link org.eclipse.emf.cdo.tests.model1.impl.Product1Impl#getVat <em>Vat</em>}</li>
- *   <li>{@link org.eclipse.emf.cdo.tests.model1.impl.Product1Impl#getDescription <em>Description</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.Product1Impl#getName <em>Name</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.Product1Impl#getOrderDetails <em>Order Details</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.Product1Impl#getVat <em>Vat</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.Product1Impl#getDescription <em>Description</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class Product1Impl extends CDOObjectImpl implements Product1
 {
   /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public static final String copyright = "Copyright (c) 2004 - 2008 Eike Stepper, Germany.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n   Eike Stepper - initial API and implementation";
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   protected Product1Impl()
@@ -56,6 +57,7 @@ public class Product1Impl extends CDOObjectImpl implements Product1
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   @Override
@@ -66,6 +68,7 @@ public class Product1Impl extends CDOObjectImpl implements Product1
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   @Override
@@ -76,6 +79,7 @@ public class Product1Impl extends CDOObjectImpl implements Product1
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public String getName()
@@ -85,6 +89,7 @@ public class Product1Impl extends CDOObjectImpl implements Product1
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public void setName(String newName)
@@ -94,6 +99,7 @@ public class Product1Impl extends CDOObjectImpl implements Product1
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   @SuppressWarnings("unchecked")
@@ -104,6 +110,7 @@ public class Product1Impl extends CDOObjectImpl implements Product1
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public VAT getVat()
@@ -113,6 +120,7 @@ public class Product1Impl extends CDOObjectImpl implements Product1
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public void setVat(VAT newVat)
@@ -122,6 +130,7 @@ public class Product1Impl extends CDOObjectImpl implements Product1
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public String getDescription()
@@ -131,6 +140,7 @@ public class Product1Impl extends CDOObjectImpl implements Product1
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public void setDescription(String newDescription)
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/PurchaseOrderImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/PurchaseOrderImpl.java
index 7f31127d46..429ceaed55 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/PurchaseOrderImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/PurchaseOrderImpl.java
@@ -25,24 +25,25 @@ import java.util.Date;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.emf.cdo.tests.model1.impl.PurchaseOrderImpl#getDate <em>Date</em>}</li>
- *   <li>{@link org.eclipse.emf.cdo.tests.model1.impl.PurchaseOrderImpl#getSupplier <em>Supplier</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.PurchaseOrderImpl#getDate <em>Date</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.PurchaseOrderImpl#getSupplier <em>Supplier</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class PurchaseOrderImpl extends OrderImpl implements PurchaseOrder
 {
   /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public static final String copyright = "Copyright (c) 2004 - 2008 Eike Stepper, Germany.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n   Eike Stepper - initial API and implementation";
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   protected PurchaseOrderImpl()
@@ -52,6 +53,7 @@ public class PurchaseOrderImpl extends OrderImpl implements PurchaseOrder
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   @Override
@@ -62,6 +64,7 @@ public class PurchaseOrderImpl extends OrderImpl implements PurchaseOrder
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public Date getDate()
@@ -71,6 +74,7 @@ public class PurchaseOrderImpl extends OrderImpl implements PurchaseOrder
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public void setDate(Date newDate)
@@ -80,6 +84,7 @@ public class PurchaseOrderImpl extends OrderImpl implements PurchaseOrder
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public Supplier getSupplier()
@@ -89,6 +94,7 @@ public class PurchaseOrderImpl extends OrderImpl implements PurchaseOrder
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public void setSupplier(Supplier newSupplier)
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/SalesOrderImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/SalesOrderImpl.java
index 4a2291896e..a29f0f2335 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/SalesOrderImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/SalesOrderImpl.java
@@ -23,24 +23,25 @@ import org.eclipse.emf.ecore.EClass;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.emf.cdo.tests.model1.impl.SalesOrderImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.emf.cdo.tests.model1.impl.SalesOrderImpl#getCustomer <em>Customer</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.SalesOrderImpl#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.SalesOrderImpl#getCustomer <em>Customer</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class SalesOrderImpl extends OrderImpl implements SalesOrder
 {
   /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public static final String copyright = "Copyright (c) 2004 - 2008 Eike Stepper, Germany.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n   Eike Stepper - initial API and implementation";
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   protected SalesOrderImpl()
@@ -50,6 +51,7 @@ public class SalesOrderImpl extends OrderImpl implements SalesOrder
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   @Override
@@ -60,6 +62,7 @@ public class SalesOrderImpl extends OrderImpl implements SalesOrder
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public int getId()
@@ -69,6 +72,7 @@ public class SalesOrderImpl extends OrderImpl implements SalesOrder
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public void setId(int newId)
@@ -78,6 +82,7 @@ public class SalesOrderImpl extends OrderImpl implements SalesOrder
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public Customer getCustomer()
@@ -87,6 +92,7 @@ public class SalesOrderImpl extends OrderImpl implements SalesOrder
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public void setCustomer(Customer newCustomer)
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/SupplierImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/SupplierImpl.java
index 9ae1334138..eb1e3b3cbf 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/SupplierImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/SupplierImpl.java
@@ -24,24 +24,25 @@ import org.eclipse.emf.ecore.EClass;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.emf.cdo.tests.model1.impl.SupplierImpl#getPurchaseOrders <em>Purchase Orders</em>}</li>
- *   <li>{@link org.eclipse.emf.cdo.tests.model1.impl.SupplierImpl#isPreferred <em>Preferred</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.SupplierImpl#getPurchaseOrders <em>Purchase Orders</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.model1.impl.SupplierImpl#isPreferred <em>Preferred</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class SupplierImpl extends AddressImpl implements Supplier
 {
   /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public static final String copyright = "Copyright (c) 2004 - 2008 Eike Stepper, Germany.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n   Eike Stepper - initial API and implementation";
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   protected SupplierImpl()
@@ -51,6 +52,7 @@ public class SupplierImpl extends AddressImpl implements Supplier
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   @Override
@@ -61,6 +63,7 @@ public class SupplierImpl extends AddressImpl implements Supplier
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   @SuppressWarnings("unchecked")
@@ -71,6 +74,7 @@ public class SupplierImpl extends AddressImpl implements Supplier
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public boolean isPreferred()
@@ -80,6 +84,7 @@ public class SupplierImpl extends AddressImpl implements Supplier
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public void setPreferred(boolean newPreferred)
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/util/Model1AdapterFactory.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/util/Model1AdapterFactory.java
index ad5b5ac088..18262f305e 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/util/Model1AdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/util/Model1AdapterFactory.java
@@ -33,28 +33,29 @@ 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.model1.Model1Package
  * @generated
  */
 public class Model1AdapterFactory extends AdapterFactoryImpl
 {
   /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public static final String copyright = "Copyright (c) 2004 - 2008 Eike Stepper, Germany.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n   Eike Stepper - initial API and implementation";
 
   /**
-   * The cached model package.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The cached model package. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   protected static Model1Package modelPackage;
 
   /**
-   * Creates an instance of the adapter factory.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Creates an instance of the adapter factory. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public Model1AdapterFactory()
@@ -66,10 +67,10 @@ public class Model1AdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Returns whether this factory is applicable for the type of the object.
-   * <!-- begin-user-doc --> This implementation
+   * Returns whether this factory is applicable for the type of the object. <!-- begin-user-doc --> This implementation
    * returns <code>true</code> if the object is either the model's package or is an instance object of the model. <!--
    * end-user-doc -->
+   * 
    * @return whether this factory is applicable for the type of the object.
    * @generated
    */
@@ -88,8 +89,8 @@ public class Model1AdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * The switch that delegates to the <code>createXXX</code> methods.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The switch that delegates to the <code>createXXX</code> methods. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   protected Model1Switch<Adapter> modelSwitch = new Model1Switch<Adapter>()
@@ -168,9 +169,10 @@ public class Model1AdapterFactory extends AdapterFactoryImpl
   };
 
   /**
-   * Creates an adapter for the <code>target</code>.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * @param target the object to adapt.
+   * Creates an adapter for the <code>target</code>. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @param target
+   *          the object to adapt.
    * @return the adapter for the <code>target</code>.
    * @generated
    */
@@ -184,6 +186,7 @@ public class Model1AdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model1.Address <em>Address</em>}'.
    * <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful to
    * ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
+   * 
    * @return the new adapter.
    * @see org.eclipse.emf.cdo.tests.model1.Address
    * @generated
@@ -197,6 +200,7 @@ public class Model1AdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model1.Supplier <em>Supplier</em>}'.
    * <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful to
    * ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
+   * 
    * @return the new adapter.
    * @see org.eclipse.emf.cdo.tests.model1.Supplier
    * @generated
@@ -207,9 +211,10 @@ public class Model1AdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model1.PurchaseOrder <em>Purchase Order</em>}'.
-   * <!-- begin-user-doc --> This default implementation returns null so that we can easily
+   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model1.PurchaseOrder
+   * <em>Purchase Order</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily
    * ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
+   * 
    * @return the new adapter.
    * @see org.eclipse.emf.cdo.tests.model1.PurchaseOrder
    * @generated
@@ -220,9 +225,10 @@ public class Model1AdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model1.OrderDetail <em>Order Detail</em>}'.
-   * <!-- begin-user-doc --> This default implementation returns null so that we can easily
+   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model1.OrderDetail
+   * <em>Order Detail</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily
    * ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
+   * 
    * @return the new adapter.
    * @see org.eclipse.emf.cdo.tests.model1.OrderDetail
    * @generated
@@ -233,9 +239,10 @@ public class Model1AdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model1.OrderAddress <em>Order Address</em>}'.
-   * <!-- begin-user-doc --> This default implementation returns null so that we can easily
+   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model1.OrderAddress
+   * <em>Order Address</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily
    * ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
+   * 
    * @return the new adapter.
    * @see org.eclipse.emf.cdo.tests.model1.OrderAddress
    * @generated
@@ -249,6 +256,7 @@ public class Model1AdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model1.Category <em>Category</em>}'.
    * <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful to
    * ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
+   * 
    * @return the new adapter.
    * @see org.eclipse.emf.cdo.tests.model1.Category
    * @generated
@@ -262,6 +270,7 @@ public class Model1AdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model1.Product1 <em>Product1</em>}'.
    * <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful to
    * ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
+   * 
    * @return the new adapter.
    * @see org.eclipse.emf.cdo.tests.model1.Product1
    * @generated
@@ -275,6 +284,7 @@ public class Model1AdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model1.Company <em>Company</em>}'.
    * <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful to
    * ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
+   * 
    * @return the new adapter.
    * @see org.eclipse.emf.cdo.tests.model1.Company
    * @generated
@@ -288,6 +298,7 @@ public class Model1AdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model1.Customer <em>Customer</em>}'.
    * <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful to
    * ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
+   * 
    * @return the new adapter.
    * @see org.eclipse.emf.cdo.tests.model1.Customer
    * @generated
@@ -312,9 +323,10 @@ public class Model1AdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model1.SalesOrder <em>Sales Order</em>}'.
-   * <!-- begin-user-doc --> This default implementation returns null so that we can easily
+   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model1.SalesOrder
+   * <em>Sales Order</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can easily
    * ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
+   * 
    * @return the new adapter.
    * @see org.eclipse.emf.cdo.tests.model1.SalesOrder
    * @generated
@@ -325,9 +337,9 @@ public class Model1AdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for the default case.
-   * <!-- begin-user-doc --> This default implementation returns null. <!--
+   * Creates a new adapter for the default case. <!-- begin-user-doc --> This default implementation returns null. <!--
    * end-user-doc -->
+   * 
    * @return the new adapter.
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/util/Model1Switch.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/util/Model1Switch.java
index 14b43e1d01..416b8d6960 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/util/Model1Switch.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/util/Model1Switch.java
@@ -35,28 +35,29 @@ import java.util.List;
  * {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,
  * starting with the actual class of the object and proceeding up the inheritance hierarchy until a non-null result is
  * returned, which is the result of the switch. <!-- end-user-doc -->
+ * 
  * @see org.eclipse.emf.cdo.tests.model1.Model1Package
  * @generated
  */
 public class Model1Switch<T>
 {
   /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public static final String copyright = "Copyright (c) 2004 - 2008 Eike Stepper, Germany.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n   Eike Stepper - initial API and implementation";
 
   /**
-   * The cached model package
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * The cached model package <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   protected static Model1Package modelPackage;
 
   /**
-   * Creates an instance of the switch.
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * Creates an instance of the switch. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public Model1Switch()
@@ -70,6 +71,7 @@ public class Model1Switch<T>
   /**
    * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @return the first non-null result returned by a <code>caseXXX</code> call.
    * @generated
    */
@@ -81,6 +83,7 @@ public class Model1Switch<T>
   /**
    * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @return the first non-null result returned by a <code>caseXXX</code> call.
    * @generated
    */
@@ -100,6 +103,7 @@ public class Model1Switch<T>
   /**
    * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @return the first non-null result returned by a <code>caseXXX</code> call.
    * @generated
    */
@@ -217,10 +221,11 @@ public class Model1Switch<T>
   }
 
   /**
-   * Returns the result of interpreting the object as an instance of '<em>Address</em>'.
-   * <!-- begin-user-doc --> This
+   * Returns the result of interpreting the object as an instance of '<em>Address</em>'. <!-- begin-user-doc --> This
    * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * @param object the target of the switch.
+   * 
+   * @param object
+   *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Address</em>'.
    * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
    * @generated
@@ -231,10 +236,11 @@ public class Model1Switch<T>
   }
 
   /**
-   * Returns the result of interpreting the object as an instance of '<em>Supplier</em>'.
-   * <!-- begin-user-doc --> This
+   * Returns the result of interpreting the object as an instance of '<em>Supplier</em>'. <!-- begin-user-doc --> This
    * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * @param object the target of the switch.
+   * 
+   * @param object
+   *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Supplier</em>'.
    * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
    * @generated
@@ -245,10 +251,11 @@ public class Model1Switch<T>
   }
 
   /**
-   * Returns the result of interpreting the object as an instance of '<em>Purchase Order</em>'.
-   * <!-- begin-user-doc -->
+   * Returns the result of interpreting the object as an instance of '<em>Purchase Order</em>'. <!-- begin-user-doc -->
    * This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * @param object the target of the switch.
+   * 
+   * @param object
+   *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Purchase Order</em>'.
    * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
    * @generated
@@ -259,10 +266,11 @@ public class Model1Switch<T>
   }
 
   /**
-   * Returns the result of interpreting the object as an instance of '<em>Order Detail</em>'.
-   * <!-- begin-user-doc -->
+   * Returns the result of interpreting the object as an instance of '<em>Order Detail</em>'. <!-- begin-user-doc -->
    * This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * @param object the target of the switch.
+   * 
+   * @param object
+   *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Order Detail</em>'.
    * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
    * @generated
@@ -273,10 +281,11 @@ public class Model1Switch<T>
   }
 
   /**
-   * Returns the result of interpreting the object as an instance of '<em>Order Address</em>'.
-   * <!-- begin-user-doc -->
+   * Returns the result of interpreting the object as an instance of '<em>Order Address</em>'. <!-- begin-user-doc -->
    * This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * @param object the target of the switch.
+   * 
+   * @param object
+   *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Order Address</em>'.
    * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
    * @generated
@@ -287,10 +296,11 @@ public class Model1Switch<T>
   }
 
   /**
-   * Returns the result of interpreting the object as an instance of '<em>Category</em>'.
-   * <!-- begin-user-doc --> This
+   * Returns the result of interpreting the object as an instance of '<em>Category</em>'. <!-- begin-user-doc --> This
    * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * @param object the target of the switch.
+   * 
+   * @param object
+   *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Category</em>'.
    * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
    * @generated
@@ -301,10 +311,11 @@ public class Model1Switch<T>
   }
 
   /**
-   * Returns the result of interpreting the object as an instance of '<em>Product1</em>'.
-   * <!-- begin-user-doc --> This
+   * Returns the result of interpreting the object as an instance of '<em>Product1</em>'. <!-- begin-user-doc --> This
    * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * @param object the target of the switch.
+   * 
+   * @param object
+   *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Product1</em>'.
    * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
    * @generated
@@ -315,10 +326,11 @@ public class Model1Switch<T>
   }
 
   /**
-   * Returns the result of interpreting the object as an instance of '<em>Company</em>'.
-   * <!-- begin-user-doc --> This
+   * Returns the result of interpreting the object as an instance of '<em>Company</em>'. <!-- begin-user-doc --> This
    * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * @param object the target of the switch.
+   * 
+   * @param object
+   *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Company</em>'.
    * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
    * @generated
@@ -329,10 +341,11 @@ public class Model1Switch<T>
   }
 
   /**
-   * Returns the result of interpreting the object as an instance of '<em>Customer</em>'.
-   * <!-- begin-user-doc --> This
+   * Returns the result of interpreting the object as an instance of '<em>Customer</em>'. <!-- begin-user-doc --> This
    * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * @param object the target of the switch.
+   * 
+   * @param object
+   *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Customer</em>'.
    * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
    * @generated
@@ -343,10 +356,11 @@ public class Model1Switch<T>
   }
 
   /**
-   * Returns the result of interpreting the object as an instance of '<em>Order</em>'.
-   * <!-- begin-user-doc --> This
+   * Returns the result of interpreting the object as an instance of '<em>Order</em>'. <!-- begin-user-doc --> This
    * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * @param object the target of the switch.
+   * 
+   * @param object
+   *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Order</em>'.
    * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
    * @generated
@@ -357,10 +371,11 @@ public class Model1Switch<T>
   }
 
   /**
-   * Returns the result of interpreting the object as an instance of '<em>Sales Order</em>'.
-   * <!-- begin-user-doc -->
+   * Returns the result of interpreting the object as an instance of '<em>Sales Order</em>'. <!-- begin-user-doc -->
    * This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * @param object the target of the switch.
+   * 
+   * @param object
+   *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Sales Order</em>'.
    * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
    * @generated
@@ -371,11 +386,12 @@ public class Model1Switch<T>
   }
 
   /**
-   * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
-   * <!-- begin-user-doc --> This
+   * Returns the result of interpreting the object as an instance of '<em>EObject</em>'. <!-- begin-user-doc --> This
    * implementation returns null; returning a non-null result will terminate the switch, but this is the last case
    * anyway. <!-- end-user-doc -->
-   * @param object the target of the switch.
+   * 
+   * @param object
+   *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
    * @see #doSwitch(org.eclipse.emf.ecore.EObject)
    * @generated
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/OrderAddressValidator.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/OrderAddressValidator.java
index ce555a9621..38b756e1d9 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/OrderAddressValidator.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/OrderAddressValidator.java
@@ -2,15 +2,15 @@
  * <copyright>
  * </copyright>
  *
- * $Id: OrderAddressValidator.java,v 1.1 2008-12-29 15:06:22 estepper Exp $
+ * $Id: OrderAddressValidator.java,v 1.2 2009-01-10 13:55:59 estepper Exp $
  */
 package org.eclipse.emf.cdo.tests.model1.validation;
 
 /**
- * A sample validator interface for {@link org.eclipse.emf.cdo.tests.model1.OrderAddress}.
- * This doesn't really do anything, and it's not a real EMF artifact.
- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
+ * A sample validator interface for {@link org.eclipse.emf.cdo.tests.model1.OrderAddress}. This doesn't really do
+ * anything, and it's not a real EMF artifact. It was generated by the org.eclipse.emf.examples.generator.validator
+ * plug-in to illustrate how EMF's code generator can be extended. This can be disabled with -vmargs
+ * -Dorg.eclipse.emf.examples.generator.validator=false.
  */
 public interface OrderAddressValidator
 {
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/Product1Validator.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/Product1Validator.java
index 865d625787..bb62dd2072 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/Product1Validator.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/validation/Product1Validator.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: Product1Validator.java,v 1.1 2008-12-29 15:06:22 estepper Exp $
+ * $Id: Product1Validator.java,v 1.2 2009-01-10 13:55:59 estepper Exp $
  */
 package org.eclipse.emf.cdo.tests.model1.validation;
 
@@ -12,10 +12,10 @@ import org.eclipse.emf.cdo.tests.model1.VAT;
 import org.eclipse.emf.common.util.EList;
 
 /**
- * A sample validator interface for {@link org.eclipse.emf.cdo.tests.model1.Product1}.
- * This doesn't really do anything, and it's not a real EMF artifact.
- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
+ * A sample validator interface for {@link org.eclipse.emf.cdo.tests.model1.Product1}. This doesn't really do anything,
+ * and it's not a real EMF artifact. It was generated by the org.eclipse.emf.examples.generator.validator plug-in to
+ * illustrate how EMF's code generator can be extended. This can be disabled with -vmargs
+ * -Dorg.eclipse.emf.examples.generator.validator=false.
  */
 public interface Product1Validator
 {