1 files changed, 24 insertions, 32 deletions
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 8f6985d145..7196781be3 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
@@ -13,36 +13,34 @@ 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#getPurchaseOrders <em>Purchase Orders</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#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
- * @extends CDOObject
  * @generated
  */
-public interface Company extends CDOObject
+public interface Company extends Address
 {
   /**
-   * 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.
+   * @return the value of the '<em>Categories</em>' containment reference list.
    * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getCompany_Categories()
    * @model containment="true"
    * @generated
@@ -50,17 +48,15 @@ public interface Company extends CDOObject
   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.
+   * @return the value of the '<em>Suppliers</em>' containment reference list.
    * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getCompany_Suppliers()
    * @model containment="true"
    * @generated
@@ -88,17 +84,15 @@ public interface Company extends CDOObject
   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.
+   * @return the value of the '<em>Customers</em>' containment reference list.
    * @see org.eclipse.emf.cdo.tests.model1.Model1Package#getCompany_Customers()
    * @model containment="true"
    * @generated
@@ -106,18 +100,16 @@ public interface Company extends CDOObject
   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.
+   * @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"
    * @generated