[335669] Remove LITERALS constant from CDO test models

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

15 files changed, 28 insertions, 304 deletions

diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/Model5Package.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/Model5Package.java
index 61d8f92b1a..d3a95c770f 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/Model5Package.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/Model5Package.java
@@ -767,280 +767,4 @@ public interface Model5Package extends EPackage
    */
   Model5Factory getModel5Factory();
 
-  /**
-   * <!-- begin-user-doc --> Defines literals for the meta objects that represent
-   * <ul>
-   * <li>each class,</li>
-   * <li>each feature of each class,</li>
-   * <li>each enum,</li>
-   * <li>and each data type</li>
-   * </ul>
-   * <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  interface Literals
-  {
-    /**
-     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model5.impl.TestFeatureMapImpl
-     * <em>Test Feature Map</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @see org.eclipse.emf.cdo.tests.model5.impl.TestFeatureMapImpl
-     * @see org.eclipse.emf.cdo.tests.model5.impl.Model5PackageImpl#getTestFeatureMap()
-     * @generated
-     */
-    EClass TEST_FEATURE_MAP = eINSTANCE.getTestFeatureMap();
-
-    /**
-     * The meta object literal for the '<em><b>Managers</b></em>' reference list feature. <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * 
-     * @generated
-     */
-    EReference TEST_FEATURE_MAP__MANAGERS = eINSTANCE.getTestFeatureMap_Managers();
-
-    /**
-     * The meta object literal for the '<em><b>Doctors</b></em>' reference list feature. <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * 
-     * @generated
-     */
-    EReference TEST_FEATURE_MAP__DOCTORS = eINSTANCE.getTestFeatureMap_Doctors();
-
-    /**
-     * The meta object literal for the '<em><b>People</b></em>' attribute list feature. <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * 
-     * @generated
-     */
-    EAttribute TEST_FEATURE_MAP__PEOPLE = eINSTANCE.getTestFeatureMap_People();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model5.impl.ManagerImpl <em>Manager</em>}'
-     * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @see org.eclipse.emf.cdo.tests.model5.impl.ManagerImpl
-     * @see org.eclipse.emf.cdo.tests.model5.impl.Model5PackageImpl#getManager()
-     * @generated
-     */
-    EClass MANAGER = eINSTANCE.getManager();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model5.impl.DoctorImpl <em>Doctor</em>}' class.
-     * <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @see org.eclipse.emf.cdo.tests.model5.impl.DoctorImpl
-     * @see org.eclipse.emf.cdo.tests.model5.impl.Model5PackageImpl#getDoctor()
-     * @generated
-     */
-    EClass DOCTOR = eINSTANCE.getDoctor();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model5.impl.GenListOfIntImpl
-     * <em>Gen List Of Int</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @see org.eclipse.emf.cdo.tests.model5.impl.GenListOfIntImpl
-     * @see org.eclipse.emf.cdo.tests.model5.impl.Model5PackageImpl#getGenListOfInt()
-     * @generated
-     */
-    EClass GEN_LIST_OF_INT = eINSTANCE.getGenListOfInt();
-
-    /**
-     * The meta object literal for the '<em><b>Elements</b></em>' attribute list feature. <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * 
-     * @generated
-     */
-    EAttribute GEN_LIST_OF_INT__ELEMENTS = eINSTANCE.getGenListOfInt_Elements();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model5.impl.GenListOfIntegerImpl
-     * <em>Gen List Of Integer</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @see org.eclipse.emf.cdo.tests.model5.impl.GenListOfIntegerImpl
-     * @see org.eclipse.emf.cdo.tests.model5.impl.Model5PackageImpl#getGenListOfInteger()
-     * @generated
-     */
-    EClass GEN_LIST_OF_INTEGER = eINSTANCE.getGenListOfInteger();
-
-    /**
-     * The meta object literal for the '<em><b>Elements</b></em>' attribute list feature. <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * 
-     * @generated
-     */
-    EAttribute GEN_LIST_OF_INTEGER__ELEMENTS = eINSTANCE.getGenListOfInteger_Elements();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model5.impl.GenListOfLongImpl
-     * <em>Gen List Of Long</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @see org.eclipse.emf.cdo.tests.model5.impl.GenListOfLongImpl
-     * @see org.eclipse.emf.cdo.tests.model5.impl.Model5PackageImpl#getGenListOfLong()
-     * @generated
-     */
-    EClass GEN_LIST_OF_LONG = eINSTANCE.getGenListOfLong();
-
-    /**
-     * The meta object literal for the '<em><b>Elements</b></em>' attribute list feature. <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * 
-     * @generated
-     */
-    EAttribute GEN_LIST_OF_LONG__ELEMENTS = eINSTANCE.getGenListOfLong_Elements();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model5.impl.GenListOfBooleanImpl
-     * <em>Gen List Of Boolean</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @see org.eclipse.emf.cdo.tests.model5.impl.GenListOfBooleanImpl
-     * @see org.eclipse.emf.cdo.tests.model5.impl.Model5PackageImpl#getGenListOfBoolean()
-     * @generated
-     */
-    EClass GEN_LIST_OF_BOOLEAN = eINSTANCE.getGenListOfBoolean();
-
-    /**
-     * The meta object literal for the '<em><b>Elements</b></em>' attribute list feature. <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * 
-     * @generated
-     */
-    EAttribute GEN_LIST_OF_BOOLEAN__ELEMENTS = eINSTANCE.getGenListOfBoolean_Elements();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model5.impl.GenListOfShortImpl
-     * <em>Gen List Of Short</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @see org.eclipse.emf.cdo.tests.model5.impl.GenListOfShortImpl
-     * @see org.eclipse.emf.cdo.tests.model5.impl.Model5PackageImpl#getGenListOfShort()
-     * @generated
-     */
-    EClass GEN_LIST_OF_SHORT = eINSTANCE.getGenListOfShort();
-
-    /**
-     * The meta object literal for the '<em><b>Elements</b></em>' attribute list feature. <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * 
-     * @generated
-     */
-    EAttribute GEN_LIST_OF_SHORT__ELEMENTS = eINSTANCE.getGenListOfShort_Elements();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model5.impl.GenListOfFloatImpl
-     * <em>Gen List Of Float</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @see org.eclipse.emf.cdo.tests.model5.impl.GenListOfFloatImpl
-     * @see org.eclipse.emf.cdo.tests.model5.impl.Model5PackageImpl#getGenListOfFloat()
-     * @generated
-     */
-    EClass GEN_LIST_OF_FLOAT = eINSTANCE.getGenListOfFloat();
-
-    /**
-     * The meta object literal for the '<em><b>Elements</b></em>' attribute list feature. <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * 
-     * @generated
-     */
-    EAttribute GEN_LIST_OF_FLOAT__ELEMENTS = eINSTANCE.getGenListOfFloat_Elements();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model5.impl.GenListOfDoubleImpl
-     * <em>Gen List Of Double</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @see org.eclipse.emf.cdo.tests.model5.impl.GenListOfDoubleImpl
-     * @see org.eclipse.emf.cdo.tests.model5.impl.Model5PackageImpl#getGenListOfDouble()
-     * @generated
-     */
-    EClass GEN_LIST_OF_DOUBLE = eINSTANCE.getGenListOfDouble();
-
-    /**
-     * The meta object literal for the '<em><b>Elements</b></em>' attribute list feature. <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * 
-     * @generated
-     */
-    EAttribute GEN_LIST_OF_DOUBLE__ELEMENTS = eINSTANCE.getGenListOfDouble_Elements();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model5.impl.GenListOfDateImpl
-     * <em>Gen List Of Date</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @see org.eclipse.emf.cdo.tests.model5.impl.GenListOfDateImpl
-     * @see org.eclipse.emf.cdo.tests.model5.impl.Model5PackageImpl#getGenListOfDate()
-     * @generated
-     */
-    EClass GEN_LIST_OF_DATE = eINSTANCE.getGenListOfDate();
-
-    /**
-     * The meta object literal for the '<em><b>Elements</b></em>' attribute list feature. <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * 
-     * @generated
-     */
-    EAttribute GEN_LIST_OF_DATE__ELEMENTS = eINSTANCE.getGenListOfDate_Elements();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model5.impl.GenListOfCharImpl
-     * <em>Gen List Of Char</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @see org.eclipse.emf.cdo.tests.model5.impl.GenListOfCharImpl
-     * @see org.eclipse.emf.cdo.tests.model5.impl.Model5PackageImpl#getGenListOfChar()
-     * @generated
-     */
-    EClass GEN_LIST_OF_CHAR = eINSTANCE.getGenListOfChar();
-
-    /**
-     * The meta object literal for the '<em><b>Elements</b></em>' attribute list feature. <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * 
-     * @generated
-     */
-    EAttribute GEN_LIST_OF_CHAR__ELEMENTS = eINSTANCE.getGenListOfChar_Elements();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model5.impl.GenListOfIntArrayImpl
-     * <em>Gen List Of Int Array</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @see org.eclipse.emf.cdo.tests.model5.impl.GenListOfIntArrayImpl
-     * @see org.eclipse.emf.cdo.tests.model5.impl.Model5PackageImpl#getGenListOfIntArray()
-     * @generated
-     */
-    EClass GEN_LIST_OF_INT_ARRAY = eINSTANCE.getGenListOfIntArray();
-
-    /**
-     * The meta object literal for the '<em><b>Elements</b></em>' attribute list feature. <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * 
-     * @generated
-     */
-    EAttribute GEN_LIST_OF_INT_ARRAY__ELEMENTS = eINSTANCE.getGenListOfIntArray_Elements();
-
-    /**
-     * The meta object literal for the '<em>Int Array</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @see org.eclipse.emf.cdo.tests.model5.impl.Model5PackageImpl#getIntArray()
-     * @generated
-     */
-    EDataType INT_ARRAY = eINSTANCE.getIntArray();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model5.impl.GenListOfStringImpl
-     * <em>Gen List Of String</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-     * 
-     * @see org.eclipse.emf.cdo.tests.model5.impl.GenListOfStringImpl
-     * @see org.eclipse.emf.cdo.tests.model5.impl.Model5PackageImpl#getGenListOfString()
-     * @generated
-     */
-    EClass GEN_LIST_OF_STRING = eINSTANCE.getGenListOfString();
-
-    /**
-     * The meta object literal for the '<em><b>Elements</b></em>' attribute list feature. <!-- begin-user-doc --> <!--
-     * end-user-doc -->
-     * 
-     * @generated
-     */
-    EAttribute GEN_LIST_OF_STRING__ELEMENTS = eINSTANCE.getGenListOfString_Elements();
-
-  }
-
 } // Model5Package
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/DoctorImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/DoctorImpl.java
index 95796066e9..606c479042 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/DoctorImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/DoctorImpl.java
@@ -51,7 +51,7 @@ public class DoctorImpl extends CDOObjectImpl implements Doctor
   @Override
   protected EClass eStaticClass()
   {
-    return Model5Package.Literals.DOCTOR;
+    return Model5Package.eINSTANCE.getDoctor();
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfBooleanImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfBooleanImpl.java
index aa94ebad61..f739e0af69 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfBooleanImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfBooleanImpl.java
@@ -57,7 +57,7 @@ public class GenListOfBooleanImpl extends CDOObjectImpl implements GenListOfBool
   @Override
   protected EClass eStaticClass()
   {
-    return Model5Package.Literals.GEN_LIST_OF_BOOLEAN;
+    return Model5Package.eINSTANCE.getGenListOfBoolean();
   }
 
   /**
@@ -79,7 +79,7 @@ public class GenListOfBooleanImpl extends CDOObjectImpl implements GenListOfBool
   @SuppressWarnings("unchecked")
   public EList<Boolean> getElements()
   {
-    return (EList<Boolean>)eGet(Model5Package.Literals.GEN_LIST_OF_BOOLEAN__ELEMENTS, true);
+    return (EList<Boolean>)eGet(Model5Package.eINSTANCE.getGenListOfBoolean_Elements(), true);
   }
 
 } // GenListOfBooleanImpl
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfCharImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfCharImpl.java
index c6406f6356..f6b27457b3 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfCharImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfCharImpl.java
@@ -57,7 +57,7 @@ public class GenListOfCharImpl extends CDOObjectImpl implements GenListOfChar
   @Override
   protected EClass eStaticClass()
   {
-    return Model5Package.Literals.GEN_LIST_OF_CHAR;
+    return Model5Package.eINSTANCE.getGenListOfChar();
   }
 
   /**
@@ -79,7 +79,7 @@ public class GenListOfCharImpl extends CDOObjectImpl implements GenListOfChar
   @SuppressWarnings("unchecked")
   public EList<Character> getElements()
   {
-    return (EList<Character>)eGet(Model5Package.Literals.GEN_LIST_OF_CHAR__ELEMENTS, true);
+    return (EList<Character>)eGet(Model5Package.eINSTANCE.getGenListOfChar_Elements(), true);
   }
 
 } // GenListOfCharImpl
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfDateImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfDateImpl.java
index 6131d95566..2486ce2808 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfDateImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfDateImpl.java
@@ -59,7 +59,7 @@ public class GenListOfDateImpl extends CDOObjectImpl implements GenListOfDate
   @Override
   protected EClass eStaticClass()
   {
-    return Model5Package.Literals.GEN_LIST_OF_DATE;
+    return Model5Package.eINSTANCE.getGenListOfDate();
   }
 
   /**
@@ -81,7 +81,7 @@ public class GenListOfDateImpl extends CDOObjectImpl implements GenListOfDate
   @SuppressWarnings("unchecked")
   public EList<Date> getElements()
   {
-    return (EList<Date>)eGet(Model5Package.Literals.GEN_LIST_OF_DATE__ELEMENTS, true);
+    return (EList<Date>)eGet(Model5Package.eINSTANCE.getGenListOfDate_Elements(), true);
   }
 
 } // GenListOfDateImpl
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfDoubleImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfDoubleImpl.java
index 70a84357b4..bb0a1c119a 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfDoubleImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfDoubleImpl.java
@@ -57,7 +57,7 @@ public class GenListOfDoubleImpl extends CDOObjectImpl implements GenListOfDoubl
   @Override
   protected EClass eStaticClass()
   {
-    return Model5Package.Literals.GEN_LIST_OF_DOUBLE;
+    return Model5Package.eINSTANCE.getGenListOfDouble();
   }
 
   /**
@@ -79,7 +79,7 @@ public class GenListOfDoubleImpl extends CDOObjectImpl implements GenListOfDoubl
   @SuppressWarnings("unchecked")
   public EList<Double> getElements()
   {
-    return (EList<Double>)eGet(Model5Package.Literals.GEN_LIST_OF_DOUBLE__ELEMENTS, true);
+    return (EList<Double>)eGet(Model5Package.eINSTANCE.getGenListOfDouble_Elements(), true);
   }
 
 } // GenListOfDoubleImpl
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfFloatImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfFloatImpl.java
index 1a68da6d62..11cc10b53f 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfFloatImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfFloatImpl.java
@@ -57,7 +57,7 @@ public class GenListOfFloatImpl extends CDOObjectImpl implements GenListOfFloat
   @Override
   protected EClass eStaticClass()
   {
-    return Model5Package.Literals.GEN_LIST_OF_FLOAT;
+    return Model5Package.eINSTANCE.getGenListOfFloat();
   }
 
   /**
@@ -79,7 +79,7 @@ public class GenListOfFloatImpl extends CDOObjectImpl implements GenListOfFloat
   @SuppressWarnings("unchecked")
   public EList<Float> getElements()
   {
-    return (EList<Float>)eGet(Model5Package.Literals.GEN_LIST_OF_FLOAT__ELEMENTS, true);
+    return (EList<Float>)eGet(Model5Package.eINSTANCE.getGenListOfFloat_Elements(), true);
   }
 
 } // GenListOfFloatImpl
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfIntArrayImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfIntArrayImpl.java
index 64d6cf7fc2..205469caf0 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfIntArrayImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfIntArrayImpl.java
@@ -57,7 +57,7 @@ public class GenListOfIntArrayImpl extends CDOObjectImpl implements GenListOfInt
   @Override
   protected EClass eStaticClass()
   {
-    return Model5Package.Literals.GEN_LIST_OF_INT_ARRAY;
+    return Model5Package.eINSTANCE.getGenListOfIntArray();
   }
 
   /**
@@ -79,7 +79,7 @@ public class GenListOfIntArrayImpl extends CDOObjectImpl implements GenListOfInt
   @SuppressWarnings("unchecked")
   public EList<int[]> getElements()
   {
-    return (EList<int[]>)eGet(Model5Package.Literals.GEN_LIST_OF_INT_ARRAY__ELEMENTS, true);
+    return (EList<int[]>)eGet(Model5Package.eINSTANCE.getGenListOfIntArray_Elements(), true);
   }
 
 } // GenListOfIntArrayImpl
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfIntImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfIntImpl.java
index 31a8fab94b..2fe9cc5879 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfIntImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfIntImpl.java
@@ -57,7 +57,7 @@ public class GenListOfIntImpl extends CDOObjectImpl implements GenListOfInt
   @Override
   protected EClass eStaticClass()
   {
-    return Model5Package.Literals.GEN_LIST_OF_INT;
+    return Model5Package.eINSTANCE.getGenListOfInt();
   }
 
   /**
@@ -79,7 +79,7 @@ public class GenListOfIntImpl extends CDOObjectImpl implements GenListOfInt
   @SuppressWarnings("unchecked")
   public EList<Integer> getElements()
   {
-    return (EList<Integer>)eGet(Model5Package.Literals.GEN_LIST_OF_INT__ELEMENTS, true);
+    return (EList<Integer>)eGet(Model5Package.eINSTANCE.getGenListOfInt_Elements(), true);
   }
 
 } // GenListOfIntImpl
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfIntegerImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfIntegerImpl.java
index 7f431993d8..a99d1b190f 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfIntegerImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfIntegerImpl.java
@@ -57,7 +57,7 @@ public class GenListOfIntegerImpl extends CDOObjectImpl implements GenListOfInte
   @Override
   protected EClass eStaticClass()
   {
-    return Model5Package.Literals.GEN_LIST_OF_INTEGER;
+    return Model5Package.eINSTANCE.getGenListOfInteger();
   }
 
   /**
@@ -79,7 +79,7 @@ public class GenListOfIntegerImpl extends CDOObjectImpl implements GenListOfInte
   @SuppressWarnings("unchecked")
   public EList<Integer> getElements()
   {
-    return (EList<Integer>)eGet(Model5Package.Literals.GEN_LIST_OF_INTEGER__ELEMENTS, true);
+    return (EList<Integer>)eGet(Model5Package.eINSTANCE.getGenListOfInteger_Elements(), true);
   }
 
 } // GenListOfIntegerImpl
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfLongImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfLongImpl.java
index a8bda3c331..b5905ebdd3 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfLongImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfLongImpl.java
@@ -57,7 +57,7 @@ public class GenListOfLongImpl extends CDOObjectImpl implements GenListOfLong
   @Override
   protected EClass eStaticClass()
   {
-    return Model5Package.Literals.GEN_LIST_OF_LONG;
+    return Model5Package.eINSTANCE.getGenListOfLong();
   }
 
   /**
@@ -79,7 +79,7 @@ public class GenListOfLongImpl extends CDOObjectImpl implements GenListOfLong
   @SuppressWarnings("unchecked")
   public EList<Long> getElements()
   {
-    return (EList<Long>)eGet(Model5Package.Literals.GEN_LIST_OF_LONG__ELEMENTS, true);
+    return (EList<Long>)eGet(Model5Package.eINSTANCE.getGenListOfLong_Elements(), true);
   }
 
 } // GenListOfLongImpl
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfShortImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfShortImpl.java
index d8ee089aef..289a55e00f 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfShortImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfShortImpl.java
@@ -57,7 +57,7 @@ public class GenListOfShortImpl extends CDOObjectImpl implements GenListOfShort
   @Override
   protected EClass eStaticClass()
   {
-    return Model5Package.Literals.GEN_LIST_OF_SHORT;
+    return Model5Package.eINSTANCE.getGenListOfShort();
   }
 
   /**
@@ -79,7 +79,7 @@ public class GenListOfShortImpl extends CDOObjectImpl implements GenListOfShort
   @SuppressWarnings("unchecked")
   public EList<Short> getElements()
   {
-    return (EList<Short>)eGet(Model5Package.Literals.GEN_LIST_OF_SHORT__ELEMENTS, true);
+    return (EList<Short>)eGet(Model5Package.eINSTANCE.getGenListOfShort_Elements(), true);
   }
 
 } // GenListOfShortImpl
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfStringImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfStringImpl.java
index 27bb9b7705..ec434b6c6b 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfStringImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/GenListOfStringImpl.java
@@ -57,7 +57,7 @@ public class GenListOfStringImpl extends CDOObjectImpl implements GenListOfStrin
   @Override
   protected EClass eStaticClass()
   {
-    return Model5Package.Literals.GEN_LIST_OF_STRING;
+    return Model5Package.eINSTANCE.getGenListOfString();
   }
 
   /**
@@ -79,7 +79,7 @@ public class GenListOfStringImpl extends CDOObjectImpl implements GenListOfStrin
   @SuppressWarnings("unchecked")
   public EList<String> getElements()
   {
-    return (EList<String>)eGet(Model5Package.Literals.GEN_LIST_OF_STRING__ELEMENTS, true);
+    return (EList<String>)eGet(Model5Package.eINSTANCE.getGenListOfString_Elements(), true);
   }
 
 } // GenListOfStringImpl
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/ManagerImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/ManagerImpl.java
index 81b70518a1..209848d364 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/ManagerImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/ManagerImpl.java
@@ -51,7 +51,7 @@ public class ManagerImpl extends CDOObjectImpl implements Manager
   @Override
   protected EClass eStaticClass()
   {
-    return Model5Package.Literals.MANAGER;
+    return Model5Package.eINSTANCE.getManager();
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/TestFeatureMapImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/TestFeatureMapImpl.java
index 35df960171..99126521e0 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/TestFeatureMapImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/TestFeatureMapImpl.java
@@ -62,7 +62,7 @@ public class TestFeatureMapImpl extends CDOObjectImpl implements TestFeatureMap
   @Override
   protected EClass eStaticClass()
   {
-    return Model5Package.Literals.TEST_FEATURE_MAP;
+    return Model5Package.eINSTANCE.getTestFeatureMap();
   }
 
   /**
@@ -84,7 +84,7 @@ public class TestFeatureMapImpl extends CDOObjectImpl implements TestFeatureMap
   @SuppressWarnings("unchecked")
   public EList<Manager> getManagers()
   {
-    return (EList<Manager>)eGet(Model5Package.Literals.TEST_FEATURE_MAP__MANAGERS, true);
+    return (EList<Manager>)eGet(Model5Package.eINSTANCE.getTestFeatureMap_Managers(), true);
   }
 
   /**
@@ -95,7 +95,7 @@ public class TestFeatureMapImpl extends CDOObjectImpl implements TestFeatureMap
   @SuppressWarnings("unchecked")
   public EList<Doctor> getDoctors()
   {
-    return (EList<Doctor>)eGet(Model5Package.Literals.TEST_FEATURE_MAP__DOCTORS, true);
+    return (EList<Doctor>)eGet(Model5Package.eINSTANCE.getTestFeatureMap_Doctors(), true);
   }
 
   /**
@@ -105,7 +105,7 @@ public class TestFeatureMapImpl extends CDOObjectImpl implements TestFeatureMap
    */
   public FeatureMap getPeople()
   {
-    return (FeatureMap)eGet(Model5Package.Literals.TEST_FEATURE_MAP__PEOPLE, true);
+    return (FeatureMap)eGet(Model5Package.eINSTANCE.getTestFeatureMap_People(), true);
   }
 
 } // TestFeatureMapImpl