1 files changed, 30 insertions, 16 deletions

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 f9973c9cac..a9faa062f7 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
@@ -24,26 +24,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 -->
+   * 
    * @generated
    */
   public static final String copyright = "Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n   Eike Stepper - initial API and implementation";
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   protected OrderAddressImpl()
@@ -53,98 +55,109 @@ public class OrderAddressImpl extends AddressImpl implements OrderAddress
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   @Override
   protected EClass eStaticClass()
   {
-    return Model1Package.Literals.ORDER_ADDRESS;
+    return Model1Package.eINSTANCE.getOrderAddress();
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   @SuppressWarnings("unchecked")
   public EList<OrderDetail> getOrderDetails()
   {
-    return (EList<OrderDetail>)eGet(Model1Package.Literals.ORDER__ORDER_DETAILS, true);
+    return (EList<OrderDetail>)eGet(Model1Package.eINSTANCE.getOrder_OrderDetails(), true);
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public Order getOrder()
   {
-    return (Order)eGet(Model1Package.Literals.ORDER_DETAIL__ORDER, true);
+    return (Order)eGet(Model1Package.eINSTANCE.getOrderDetail_Order(), true);
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public void setOrder(Order newOrder)
   {
-    eSet(Model1Package.Literals.ORDER_DETAIL__ORDER, newOrder);
+    eSet(Model1Package.eINSTANCE.getOrderDetail_Order(), newOrder);
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public Product1 getProduct()
   {
-    return (Product1)eGet(Model1Package.Literals.ORDER_DETAIL__PRODUCT, true);
+    return (Product1)eGet(Model1Package.eINSTANCE.getOrderDetail_Product(), true);
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public void setProduct(Product1 newProduct)
   {
-    eSet(Model1Package.Literals.ORDER_DETAIL__PRODUCT, newProduct);
+    eSet(Model1Package.eINSTANCE.getOrderDetail_Product(), newProduct);
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public float getPrice()
   {
-    return (Float)eGet(Model1Package.Literals.ORDER_DETAIL__PRICE, true);
+    return (Float)eGet(Model1Package.eINSTANCE.getOrderDetail_Price(), true);
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public void setPrice(float newPrice)
   {
-    eSet(Model1Package.Literals.ORDER_DETAIL__PRICE, newPrice);
+    eSet(Model1Package.eINSTANCE.getOrderDetail_Price(), newPrice);
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public boolean isTestAttribute()
   {
-    return (Boolean)eGet(Model1Package.Literals.ORDER_ADDRESS__TEST_ATTRIBUTE, true);
+    return (Boolean)eGet(Model1Package.eINSTANCE.getOrderAddress_TestAttribute(), true);
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   public void setTestAttribute(boolean newTestAttribute)
   {
-    eSet(Model1Package.Literals.ORDER_ADDRESS__TEST_ATTRIBUTE, newTestAttribute);
+    eSet(Model1Package.eINSTANCE.getOrderAddress_TestAttribute(), newTestAttribute);
   }
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   @Override
@@ -179,6 +192,7 @@ public class OrderAddressImpl extends AddressImpl implements OrderAddress
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
    * @generated
    */
   @Override