[369253] [Legacy] Issues with non-containment opposite references in

legacy mode 
https://bugs.eclipse.org/bugs/show_bug.cgi?id=369253

61 files changed, 2389 insertions, 1346 deletions

diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/model/model5-legacy.genmodel b/plugins/org.eclipse.emf.cdo.tests.model5/model/model5-legacy.genmodel
new file mode 100644
index 0000000000..5aab5044b9
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/model/model5-legacy.genmodel
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others.&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA;   Eike Stepper - initial API and implementation"
+    modelDirectory="/org.eclipse.emf.cdo.tests.model5/src" editDirectory="" editorDirectory=""
+    modelPluginID="org.eclipse.emf.cdo.tests.model5" modelName="Model5" updateClasspath="false"
+    codeFormatting="true" testsDirectory="" importerID="org.eclipse.emf.importer.ecore"
+    complianceLevel="5.0" providerRootExtendsClass="" runtimeVersion="2.6">
+  <foreignModel>model5.ecore</foreignModel>
+  <modelPluginVariables>CDO=org.eclipse.emf.cdo</modelPluginVariables>
+  <genPackages prefix="Model5" basePackage="org.eclipse.emf.cdo.tests.legacy" disposableProviderFactory="true"
+      literalsInterface="false" extensibleProviderFactory="true" childCreationExtenders="true"
+      ecorePackage="model5.ecore#/">
+    <genDataTypes ecoreDataType="model5.ecore#//IntArray"/>
+    <genClasses ecoreClass="model5.ecore#//TestFeatureMap">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model5.ecore#//TestFeatureMap/managers"/>
+      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference model5.ecore#//TestFeatureMap/doctors"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EAttribute model5.ecore#//TestFeatureMap/people"/>
+    </genClasses>
+    <genClasses ecoreClass="model5.ecore#//Manager"/>
+    <genClasses ecoreClass="model5.ecore#//Doctor"/>
+    <genClasses ecoreClass="model5.ecore#//GenListOfString">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model5.ecore#//GenListOfString/elements"/>
+    </genClasses>
+    <genClasses ecoreClass="model5.ecore#//GenListOfInt">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model5.ecore#//GenListOfInt/elements"/>
+    </genClasses>
+    <genClasses ecoreClass="model5.ecore#//GenListOfInteger">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model5.ecore#//GenListOfInteger/elements"/>
+    </genClasses>
+    <genClasses ecoreClass="model5.ecore#//GenListOfLong">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model5.ecore#//GenListOfLong/elements"/>
+    </genClasses>
+    <genClasses ecoreClass="model5.ecore#//GenListOfBoolean">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model5.ecore#//GenListOfBoolean/elements"/>
+    </genClasses>
+    <genClasses ecoreClass="model5.ecore#//GenListOfShort">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model5.ecore#//GenListOfShort/elements"/>
+    </genClasses>
+    <genClasses ecoreClass="model5.ecore#//GenListOfFloat">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model5.ecore#//GenListOfFloat/elements"/>
+    </genClasses>
+    <genClasses ecoreClass="model5.ecore#//GenListOfDouble">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model5.ecore#//GenListOfDouble/elements"/>
+    </genClasses>
+    <genClasses ecoreClass="model5.ecore#//GenListOfDate">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model5.ecore#//GenListOfDate/elements"/>
+    </genClasses>
+    <genClasses ecoreClass="model5.ecore#//GenListOfChar">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model5.ecore#//GenListOfChar/elements"/>
+    </genClasses>
+    <genClasses ecoreClass="model5.ecore#//GenListOfIntArray">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model5.ecore#//GenListOfIntArray/elements"/>
+    </genClasses>
+    <genClasses ecoreClass="model5.ecore#//Parent">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference model5.ecore#//Parent/children"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model5.ecore#//Parent/favourite"/>
+    </genClasses>
+    <genClasses ecoreClass="model5.ecore#//Child">
+      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference model5.ecore#//Child/parent"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model5.ecore#//Child/preferredBy"/>
+    </genClasses>
+  </genPackages>
+</genmodel:GenModel>
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/model/model5.genmodel b/plugins/org.eclipse.emf.cdo.tests.model5/model/model5.genmodel
index 168f6c7e67..f310b91caa 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/model/model5.genmodel
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/model/model5.genmodel
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel"
-    modelDirectory="/org.eclipse.emf.cdo.tests.model5/src" editDirectory="" editorDirectory=""
-    modelPluginID="org.eclipse.emf.cdo.tests.model5" modelName="Model5" updateClasspath="false"
-    rootExtendsClass="org.eclipse.emf.internal.cdo.CDOObjectImpl" reflectiveDelegation="true"
-    codeFormatting="true" testsDirectory="" importerID="org.eclipse.emf.importer.ecore"
+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.emf.cdo.tests.model5/src" editDirectory=""
+    editorDirectory="" modelPluginID="org.eclipse.emf.cdo.tests.model5" modelName="Model5"
+    updateClasspath="false" rootExtendsClass="org.eclipse.emf.internal.cdo.CDOObjectImpl"
+    reflectiveDelegation="true" codeFormatting="true" testsDirectory="" importerID="org.eclipse.emf.importer.cdo"
     featureDelegation="Reflective" complianceLevel="5.0" providerRootExtendsClass="org.eclipse.emf.cdo.edit.CDOItemProviderAdapter"
     runtimeVersion="2.6">
   <foreignModel>model5.ecore</foreignModel>
@@ -54,5 +52,13 @@
     <genClasses ecoreClass="model5.ecore#//GenListOfIntArray">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model5.ecore#//GenListOfIntArray/elements"/>
     </genClasses>
+    <genClasses ecoreClass="model5.ecore#//Parent">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference model5.ecore#//Parent/children"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model5.ecore#//Parent/favourite"/>
+    </genClasses>
+    <genClasses ecoreClass="model5.ecore#//Child">
+      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference model5.ecore#//Child/parent"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model5.ecore#//Child/preferredBy"/>
+    </genClasses>
   </genPackages>
 </genmodel:GenModel>
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/model/model5.legacy-genmodel b/plugins/org.eclipse.emf.cdo.tests.model5/model/model5.legacy-genmodel
deleted file mode 100644
index f9c7d2118e..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.model5/model/model5.legacy-genmodel
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others.&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA;   Eike Stepper - initial API and implementation" modelDirectory="/org.eclipse.emf.cdo.tests.model5/src" editDirectory="" editorDirectory="" modelPluginID="org.eclipse.emf.cdo.tests.model5" modelName="Model5" updateClasspath="false" codeFormatting="true" testsDirectory="" importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0" providerRootExtendsClass="" runtimeVersion="2.6">
-  <foreignModel>model5.ecore</foreignModel>
-  <modelPluginVariables>CDO=org.eclipse.emf.cdo</modelPluginVariables>
-  <genPackages prefix="Model5" basePackage="org.eclipse.emf.cdo.tests.legacy" disposableProviderFactory="true" literalsInterface="false" extensibleProviderFactory="true" childCreationExtenders="true">
-    <ecorePackage href="model5.ecore#/"/>
-    <genDataTypes>
-      <ecoreDataType href="model5.ecore#//IntArray"/>
-    </genDataTypes>
-    <genClasses>
-      <ecoreClass href="model5.ecore#//TestFeatureMap"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true">
-        <ecoreFeature xsi:type="ecore:EReference" href="model5.ecore#//TestFeatureMap/managers"/>
-      </genFeatures>
-      <genFeatures property="None" notify="false" createChild="false">
-        <ecoreFeature xsi:type="ecore:EReference" href="model5.ecore#//TestFeatureMap/doctors"/>
-      </genFeatures>
-      <genFeatures property="None" children="true" createChild="true">
-        <ecoreFeature xsi:type="ecore:EAttribute" href="model5.ecore#//TestFeatureMap/people"/>
-      </genFeatures>
-    </genClasses>
-    <genClasses>
-      <ecoreClass href="model5.ecore#//Manager"/>
-    </genClasses>
-    <genClasses>
-      <ecoreClass href="model5.ecore#//Doctor"/>
-    </genClasses>
-    <genClasses>
-      <ecoreClass href="model5.ecore#//GenListOfString"/>
-      <genFeatures createChild="false">
-        <ecoreFeature xsi:type="ecore:EAttribute" href="model5.ecore#//GenListOfString/elements"/>
-      </genFeatures>
-    </genClasses>
-    <genClasses>
-      <ecoreClass href="model5.ecore#//GenListOfInt"/>
-      <genFeatures createChild="false">
-        <ecoreFeature xsi:type="ecore:EAttribute" href="model5.ecore#//GenListOfInt/elements"/>
-      </genFeatures>
-    </genClasses>
-    <genClasses>
-      <ecoreClass href="model5.ecore#//GenListOfInteger"/>
-      <genFeatures createChild="false">
-        <ecoreFeature xsi:type="ecore:EAttribute" href="model5.ecore#//GenListOfInteger/elements"/>
-      </genFeatures>
-    </genClasses>
-    <genClasses>
-      <ecoreClass href="model5.ecore#//GenListOfLong"/>
-      <genFeatures createChild="false">
-        <ecoreFeature xsi:type="ecore:EAttribute" href="model5.ecore#//GenListOfLong/elements"/>
-      </genFeatures>
-    </genClasses>
-    <genClasses>
-      <ecoreClass href="model5.ecore#//GenListOfBoolean"/>
-      <genFeatures createChild="false">
-        <ecoreFeature xsi:type="ecore:EAttribute" href="model5.ecore#//GenListOfBoolean/elements"/>
-      </genFeatures>
-    </genClasses>
-    <genClasses>
-      <ecoreClass href="model5.ecore#//GenListOfShort"/>
-      <genFeatures createChild="false">
-        <ecoreFeature xsi:type="ecore:EAttribute" href="model5.ecore#//GenListOfShort/elements"/>
-      </genFeatures>
-    </genClasses>
-    <genClasses>
-      <ecoreClass href="model5.ecore#//GenListOfFloat"/>
-      <genFeatures createChild="false">
-        <ecoreFeature xsi:type="ecore:EAttribute" href="model5.ecore#//GenListOfFloat/elements"/>
-      </genFeatures>
-    </genClasses>
-    <genClasses>
-      <ecoreClass href="model5.ecore#//GenListOfDouble"/>
-      <genFeatures createChild="false">
-        <ecoreFeature xsi:type="ecore:EAttribute" href="model5.ecore#//GenListOfDouble/elements"/>
-      </genFeatures>
-    </genClasses>
-    <genClasses>
-      <ecoreClass href="model5.ecore#//GenListOfDate"/>
-      <genFeatures createChild="false">
-        <ecoreFeature xsi:type="ecore:EAttribute" href="model5.ecore#//GenListOfDate/elements"/>
-      </genFeatures>
-    </genClasses>
-    <genClasses>
-      <ecoreClass href="model5.ecore#//GenListOfChar"/>
-      <genFeatures createChild="false">
-        <ecoreFeature xsi:type="ecore:EAttribute" href="model5.ecore#//GenListOfChar/elements"/>
-      </genFeatures>
-    </genClasses>
-    <genClasses>
-      <ecoreClass href="model5.ecore#//GenListOfIntArray"/>
-      <genFeatures createChild="false">
-        <ecoreFeature xsi:type="ecore:EAttribute" href="model5.ecore#//GenListOfIntArray/elements"/>
-      </genFeatures>
-    </genClasses>
-  </genPackages>
-</genmodel:GenModel>
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/Model5Factory.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/Model5Factory.java
index 514e530f83..d78e6acc79 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/Model5Factory.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/Model5Factory.java
@@ -10,6 +10,7 @@
  */
 package org.eclipse.emf.cdo.tests.legacy.model5;
 
+import org.eclipse.emf.cdo.tests.model5.Child;
 import org.eclipse.emf.cdo.tests.model5.Doctor;
 import org.eclipse.emf.cdo.tests.model5.GenListOfBoolean;
 import org.eclipse.emf.cdo.tests.model5.GenListOfChar;
@@ -23,12 +24,12 @@ import org.eclipse.emf.cdo.tests.model5.GenListOfLong;
 import org.eclipse.emf.cdo.tests.model5.GenListOfShort;
 import org.eclipse.emf.cdo.tests.model5.GenListOfString;
 import org.eclipse.emf.cdo.tests.model5.Manager;
+import org.eclipse.emf.cdo.tests.model5.Parent;
 import org.eclipse.emf.cdo.tests.model5.TestFeatureMap;
 
 /**
  * <!-- begin-user-doc --> The <b>Factory</b> for the model. It provides a create method for each non-abstract class of
  * the model. <!-- end-user-doc -->
- * 
  * @see org.eclipse.emf.cdo.tests.legacy.model5.Model5Package
  * @generated
  */
@@ -36,136 +37,153 @@ public interface Model5Factory extends org.eclipse.emf.cdo.tests.model5.Model5Fa
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   String copyright = "Copyright (c) 2004 - 2012 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";
 
   /**
-   * 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
    */
   Model5Factory eINSTANCE = org.eclipse.emf.cdo.tests.legacy.model5.impl.Model5FactoryImpl.init();
 
   /**
-   * Returns a new object of class '<em>Test Feature Map</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns a new object of class '<em>Test Feature Map</em>'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return a new object of class '<em>Test Feature Map</em>'.
    * @generated
    */
   TestFeatureMap createTestFeatureMap();
 
   /**
-   * Returns a new object of class '<em>Manager</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns a new object of class '<em>Manager</em>'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return a new object of class '<em>Manager</em>'.
    * @generated
    */
   Manager createManager();
 
   /**
-   * Returns a new object of class '<em>Doctor</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns a new object of class '<em>Doctor</em>'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return a new object of class '<em>Doctor</em>'.
    * @generated
    */
   Doctor createDoctor();
 
   /**
-   * Returns a new object of class '<em>Gen List Of String</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns a new object of class '<em>Gen List Of String</em>'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return a new object of class '<em>Gen List Of String</em>'.
    * @generated
    */
   GenListOfString createGenListOfString();
 
   /**
-   * Returns a new object of class '<em>Gen List Of Int</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns a new object of class '<em>Gen List Of Int</em>'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return a new object of class '<em>Gen List Of Int</em>'.
    * @generated
    */
   GenListOfInt createGenListOfInt();
 
   /**
-   * Returns a new object of class '<em>Gen List Of Integer</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns a new object of class '<em>Gen List Of Integer</em>'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return a new object of class '<em>Gen List Of Integer</em>'.
    * @generated
    */
   GenListOfInteger createGenListOfInteger();
 
   /**
-   * Returns a new object of class '<em>Gen List Of Long</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns a new object of class '<em>Gen List Of Long</em>'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return a new object of class '<em>Gen List Of Long</em>'.
    * @generated
    */
   GenListOfLong createGenListOfLong();
 
   /**
-   * Returns a new object of class '<em>Gen List Of Boolean</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns a new object of class '<em>Gen List Of Boolean</em>'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return a new object of class '<em>Gen List Of Boolean</em>'.
    * @generated
    */
   GenListOfBoolean createGenListOfBoolean();
 
   /**
-   * Returns a new object of class '<em>Gen List Of Short</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns a new object of class '<em>Gen List Of Short</em>'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return a new object of class '<em>Gen List Of Short</em>'.
    * @generated
    */
   GenListOfShort createGenListOfShort();
 
   /**
-   * Returns a new object of class '<em>Gen List Of Float</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns a new object of class '<em>Gen List Of Float</em>'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return a new object of class '<em>Gen List Of Float</em>'.
    * @generated
    */
   GenListOfFloat createGenListOfFloat();
 
   /**
-   * Returns a new object of class '<em>Gen List Of Double</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns a new object of class '<em>Gen List Of Double</em>'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return a new object of class '<em>Gen List Of Double</em>'.
    * @generated
    */
   GenListOfDouble createGenListOfDouble();
 
   /**
-   * Returns a new object of class '<em>Gen List Of Date</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns a new object of class '<em>Gen List Of Date</em>'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return a new object of class '<em>Gen List Of Date</em>'.
    * @generated
    */
   GenListOfDate createGenListOfDate();
 
   /**
-   * Returns a new object of class '<em>Gen List Of Char</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns a new object of class '<em>Gen List Of Char</em>'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return a new object of class '<em>Gen List Of Char</em>'.
    * @generated
    */
   GenListOfChar createGenListOfChar();
 
   /**
-   * Returns a new object of class '<em>Gen List Of Int Array</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns a new object of class '<em>Gen List Of Int Array</em>'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return a new object of class '<em>Gen List Of Int Array</em>'.
    * @generated
    */
   GenListOfIntArray createGenListOfIntArray();
 
   /**
-   * Returns the package supported by this factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @return the package supported by this factory.
+   * Returns a new object of class '<em>Parent</em>'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return a new object of class '<em>Parent</em>'.
    * @generated
    */
+  Parent createParent();
+
+  /**
+  	 * Returns a new object of class '<em>Child</em>'.
+  	 * <!-- begin-user-doc -->
+  	 * <!-- end-user-doc -->
+  	 * @return a new object of class '<em>Child</em>'.
+  	 * @generated
+  	 */
+  Child createChild();
+
+  /**
+  	 * Returns the package supported by this factory.
+  	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+  	 * @return the package supported by this factory.
+  	 * @generated
+  	 */
   Model5Package getModel5Package();
 
 } // Model5Factory
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/Model5Package.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/Model5Package.java
index b7c0dfd525..0e56d471b1 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/Model5Package.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/Model5Package.java
@@ -24,7 +24,6 @@ import org.eclipse.emf.ecore.EReference;
  * <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
- * 
  * @see org.eclipse.emf.cdo.tests.legacy.model5.Model5Factory
  * @model kind="package"
  * @generated
@@ -33,14 +32,13 @@ public interface Model5Package extends org.eclipse.emf.cdo.tests.model5.Model5Pa
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   String copyright = "Copyright (c) 2004 - 2012 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";
 
   /**
-   * The package name. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The package name.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
   String eNAME = "model5";
@@ -53,23 +51,22 @@ public interface Model5Package extends org.eclipse.emf.cdo.tests.model5.Model5Pa
   String eNS_URI = "http://www.eclipse.org/emf/CDO/tests/legacy/model5/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 = "model5";
 
   /**
-   * 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
    */
   Model5Package eINSTANCE = org.eclipse.emf.cdo.tests.legacy.model5.impl.Model5PackageImpl.init();
 
   /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model5.impl.TestFeatureMapImpl
-   * <em>Test Feature Map</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model5.impl.TestFeatureMapImpl <em>Test Feature Map</em>}' class.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.TestFeatureMapImpl
    * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.Model5PackageImpl#getTestFeatureMap()
    * @generated
@@ -77,42 +74,41 @@ public interface Model5Package extends org.eclipse.emf.cdo.tests.model5.Model5Pa
   int TEST_FEATURE_MAP = 0;
 
   /**
-   * The feature id for the '<em><b>Managers</b></em>' reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>Managers</b></em>' reference list.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int TEST_FEATURE_MAP__MANAGERS = 0;
 
   /**
-   * The feature id for the '<em><b>Doctors</b></em>' reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>Doctors</b></em>' reference list.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int TEST_FEATURE_MAP__DOCTORS = 1;
 
   /**
-   * The feature id for the '<em><b>People</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>People</b></em>' attribute list.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int TEST_FEATURE_MAP__PEOPLE = 2;
 
   /**
-   * The number of structural features of the '<em>Test Feature Map</em>' class. <!-- begin-user-doc --> <!--
+   * The number of structural features of the '<em>Test Feature Map</em>' class.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @generated
    * @ordered
    */
   int TEST_FEATURE_MAP_FEATURE_COUNT = 3;
 
   /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model5.impl.ManagerImpl <em>Manager</em>}'
-   * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model5.impl.ManagerImpl <em>Manager</em>}' class.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.ManagerImpl
    * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.Model5PackageImpl#getManager()
    * @generated
@@ -120,8 +116,8 @@ public interface Model5Package extends org.eclipse.emf.cdo.tests.model5.Model5Pa
   int MANAGER = 1;
 
   /**
-   * The number of structural features of the '<em>Manager</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The number of structural features of the '<em>Manager</em>' class.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
@@ -130,7 +126,6 @@ public interface Model5Package extends org.eclipse.emf.cdo.tests.model5.Model5Pa
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model5.impl.DoctorImpl <em>Doctor</em>}' class.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.DoctorImpl
    * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.Model5PackageImpl#getDoctor()
    * @generated
@@ -138,17 +133,16 @@ public interface Model5Package extends org.eclipse.emf.cdo.tests.model5.Model5Pa
   int DOCTOR = 2;
 
   /**
-   * The number of structural features of the '<em>Doctor</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The number of structural features of the '<em>Doctor</em>' class.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int DOCTOR_FEATURE_COUNT = 0;
 
   /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfStringImpl
-   * <em>Gen List Of String</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfStringImpl <em>Gen List Of String</em>}' class.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfStringImpl
    * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.Model5PackageImpl#getGenListOfString()
    * @generated
@@ -156,26 +150,25 @@ public interface Model5Package extends org.eclipse.emf.cdo.tests.model5.Model5Pa
   int GEN_LIST_OF_STRING = 3;
 
   /**
-   * The feature id for the '<em><b>Elements</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>Elements</b></em>' attribute list.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int GEN_LIST_OF_STRING__ELEMENTS = 0;
 
   /**
-   * The number of structural features of the '<em>Gen List Of String</em>' class. <!-- begin-user-doc --> <!--
+   * The number of structural features of the '<em>Gen List Of String</em>' class.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @generated
    * @ordered
    */
   int GEN_LIST_OF_STRING_FEATURE_COUNT = 1;
 
   /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfIntImpl
-   * <em>Gen List Of Int</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfIntImpl <em>Gen List Of Int</em>}' class.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfIntImpl
    * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.Model5PackageImpl#getGenListOfInt()
    * @generated
@@ -183,26 +176,25 @@ public interface Model5Package extends org.eclipse.emf.cdo.tests.model5.Model5Pa
   int GEN_LIST_OF_INT = 4;
 
   /**
-   * The feature id for the '<em><b>Elements</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>Elements</b></em>' attribute list.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int GEN_LIST_OF_INT__ELEMENTS = 0;
 
   /**
-   * The number of structural features of the '<em>Gen List Of Int</em>' class. <!-- begin-user-doc --> <!--
+   * The number of structural features of the '<em>Gen List Of Int</em>' class.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @generated
    * @ordered
    */
   int GEN_LIST_OF_INT_FEATURE_COUNT = 1;
 
   /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfIntegerImpl
-   * <em>Gen List Of Integer</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfIntegerImpl <em>Gen List Of Integer</em>}' class.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfIntegerImpl
    * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.Model5PackageImpl#getGenListOfInteger()
    * @generated
@@ -210,26 +202,25 @@ public interface Model5Package extends org.eclipse.emf.cdo.tests.model5.Model5Pa
   int GEN_LIST_OF_INTEGER = 5;
 
   /**
-   * The feature id for the '<em><b>Elements</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>Elements</b></em>' attribute list.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int GEN_LIST_OF_INTEGER__ELEMENTS = 0;
 
   /**
-   * The number of structural features of the '<em>Gen List Of Integer</em>' class. <!-- begin-user-doc --> <!--
+   * The number of structural features of the '<em>Gen List Of Integer</em>' class.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @generated
    * @ordered
    */
   int GEN_LIST_OF_INTEGER_FEATURE_COUNT = 1;
 
   /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfLongImpl
-   * <em>Gen List Of Long</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfLongImpl <em>Gen List Of Long</em>}' class.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfLongImpl
    * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.Model5PackageImpl#getGenListOfLong()
    * @generated
@@ -237,26 +228,25 @@ public interface Model5Package extends org.eclipse.emf.cdo.tests.model5.Model5Pa
   int GEN_LIST_OF_LONG = 6;
 
   /**
-   * The feature id for the '<em><b>Elements</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>Elements</b></em>' attribute list.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int GEN_LIST_OF_LONG__ELEMENTS = 0;
 
   /**
-   * The number of structural features of the '<em>Gen List Of Long</em>' class. <!-- begin-user-doc --> <!--
+   * The number of structural features of the '<em>Gen List Of Long</em>' class.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @generated
    * @ordered
    */
   int GEN_LIST_OF_LONG_FEATURE_COUNT = 1;
 
   /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfBooleanImpl
-   * <em>Gen List Of Boolean</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfBooleanImpl <em>Gen List Of Boolean</em>}' class.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfBooleanImpl
    * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.Model5PackageImpl#getGenListOfBoolean()
    * @generated
@@ -264,26 +254,25 @@ public interface Model5Package extends org.eclipse.emf.cdo.tests.model5.Model5Pa
   int GEN_LIST_OF_BOOLEAN = 7;
 
   /**
-   * The feature id for the '<em><b>Elements</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>Elements</b></em>' attribute list.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int GEN_LIST_OF_BOOLEAN__ELEMENTS = 0;
 
   /**
-   * The number of structural features of the '<em>Gen List Of Boolean</em>' class. <!-- begin-user-doc --> <!--
+   * The number of structural features of the '<em>Gen List Of Boolean</em>' class.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @generated
    * @ordered
    */
   int GEN_LIST_OF_BOOLEAN_FEATURE_COUNT = 1;
 
   /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfShortImpl
-   * <em>Gen List Of Short</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfShortImpl <em>Gen List Of Short</em>}' class.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfShortImpl
    * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.Model5PackageImpl#getGenListOfShort()
    * @generated
@@ -291,26 +280,25 @@ public interface Model5Package extends org.eclipse.emf.cdo.tests.model5.Model5Pa
   int GEN_LIST_OF_SHORT = 8;
 
   /**
-   * The feature id for the '<em><b>Elements</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>Elements</b></em>' attribute list.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int GEN_LIST_OF_SHORT__ELEMENTS = 0;
 
   /**
-   * The number of structural features of the '<em>Gen List Of Short</em>' class. <!-- begin-user-doc --> <!--
+   * The number of structural features of the '<em>Gen List Of Short</em>' class.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @generated
    * @ordered
    */
   int GEN_LIST_OF_SHORT_FEATURE_COUNT = 1;
 
   /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfFloatImpl
-   * <em>Gen List Of Float</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfFloatImpl <em>Gen List Of Float</em>}' class.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfFloatImpl
    * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.Model5PackageImpl#getGenListOfFloat()
    * @generated
@@ -318,26 +306,25 @@ public interface Model5Package extends org.eclipse.emf.cdo.tests.model5.Model5Pa
   int GEN_LIST_OF_FLOAT = 9;
 
   /**
-   * The feature id for the '<em><b>Elements</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>Elements</b></em>' attribute list.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int GEN_LIST_OF_FLOAT__ELEMENTS = 0;
 
   /**
-   * The number of structural features of the '<em>Gen List Of Float</em>' class. <!-- begin-user-doc --> <!--
+   * The number of structural features of the '<em>Gen List Of Float</em>' class.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @generated
    * @ordered
    */
   int GEN_LIST_OF_FLOAT_FEATURE_COUNT = 1;
 
   /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfDoubleImpl
-   * <em>Gen List Of Double</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfDoubleImpl <em>Gen List Of Double</em>}' class.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfDoubleImpl
    * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.Model5PackageImpl#getGenListOfDouble()
    * @generated
@@ -345,26 +332,25 @@ public interface Model5Package extends org.eclipse.emf.cdo.tests.model5.Model5Pa
   int GEN_LIST_OF_DOUBLE = 10;
 
   /**
-   * The feature id for the '<em><b>Elements</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>Elements</b></em>' attribute list.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int GEN_LIST_OF_DOUBLE__ELEMENTS = 0;
 
   /**
-   * The number of structural features of the '<em>Gen List Of Double</em>' class. <!-- begin-user-doc --> <!--
+   * The number of structural features of the '<em>Gen List Of Double</em>' class.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @generated
    * @ordered
    */
   int GEN_LIST_OF_DOUBLE_FEATURE_COUNT = 1;
 
   /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfDateImpl
-   * <em>Gen List Of Date</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfDateImpl <em>Gen List Of Date</em>}' class.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfDateImpl
    * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.Model5PackageImpl#getGenListOfDate()
    * @generated
@@ -372,26 +358,25 @@ public interface Model5Package extends org.eclipse.emf.cdo.tests.model5.Model5Pa
   int GEN_LIST_OF_DATE = 11;
 
   /**
-   * The feature id for the '<em><b>Elements</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>Elements</b></em>' attribute list.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int GEN_LIST_OF_DATE__ELEMENTS = 0;
 
   /**
-   * The number of structural features of the '<em>Gen List Of Date</em>' class. <!-- begin-user-doc --> <!--
+   * The number of structural features of the '<em>Gen List Of Date</em>' class.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @generated
    * @ordered
    */
   int GEN_LIST_OF_DATE_FEATURE_COUNT = 1;
 
   /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfCharImpl
-   * <em>Gen List Of Char</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfCharImpl <em>Gen List Of Char</em>}' class.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfCharImpl
    * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.Model5PackageImpl#getGenListOfChar()
    * @generated
@@ -399,26 +384,25 @@ public interface Model5Package extends org.eclipse.emf.cdo.tests.model5.Model5Pa
   int GEN_LIST_OF_CHAR = 12;
 
   /**
-   * The feature id for the '<em><b>Elements</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>Elements</b></em>' attribute list.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int GEN_LIST_OF_CHAR__ELEMENTS = 0;
 
   /**
-   * The number of structural features of the '<em>Gen List Of Char</em>' class. <!-- begin-user-doc --> <!--
+   * The number of structural features of the '<em>Gen List Of Char</em>' class.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @generated
    * @ordered
    */
   int GEN_LIST_OF_CHAR_FEATURE_COUNT = 1;
 
   /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfIntArrayImpl
-   * <em>Gen List Of Int Array</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfIntArrayImpl <em>Gen List Of Int Array</em>}' class.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfIntArrayImpl
    * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.Model5PackageImpl#getGenListOfIntArray()
    * @generated
@@ -426,34 +410,107 @@ public interface Model5Package extends org.eclipse.emf.cdo.tests.model5.Model5Pa
   int GEN_LIST_OF_INT_ARRAY = 13;
 
   /**
-   * The feature id for the '<em><b>Elements</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>Elements</b></em>' attribute list.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int GEN_LIST_OF_INT_ARRAY__ELEMENTS = 0;
 
   /**
-   * The number of structural features of the '<em>Gen List Of Int Array</em>' class. <!-- begin-user-doc --> <!--
+   * The number of structural features of the '<em>Gen List Of Int Array</em>' class.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @generated
    * @ordered
    */
   int GEN_LIST_OF_INT_ARRAY_FEATURE_COUNT = 1;
 
   /**
-   * The meta object id for the '<em>Int Array</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.Model5PackageImpl#getIntArray()
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model5.impl.ParentImpl <em>Parent</em>}' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.ParentImpl
+   * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.Model5PackageImpl#getParent()
    * @generated
    */
-  int INT_ARRAY = 14;
+  int PARENT = 14;
 
   /**
-   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model5.TestFeatureMap
-   * <em>Test Feature Map</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+  	 * The feature id for the '<em><b>Children</b></em>' containment reference list.
+  	 * <!-- begin-user-doc -->
+  	 * <!-- end-user-doc -->
+  	 * @generated
+  	 * @ordered
+  	 */
+  int PARENT__CHILDREN = 0;
+
+  /**
+  	 * The feature id for the '<em><b>Favourite</b></em>' reference.
+  	 * <!-- begin-user-doc -->
+  	 * <!-- end-user-doc -->
+  	 * @generated
+  	 * @ordered
+  	 */
+  int PARENT__FAVOURITE = 1;
+
+  /**
+  	 * The number of structural features of the '<em>Parent</em>' class.
+  	 * <!-- begin-user-doc -->
+  	 * <!-- end-user-doc -->
+  	 * @generated
+  	 * @ordered
+  	 */
+  int PARENT_FEATURE_COUNT = 2;
+
+  /**
+  	 * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model5.impl.ChildImpl <em>Child</em>}' class.
+  	 * <!-- begin-user-doc -->
+  	 * <!-- end-user-doc -->
+  	 * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.ChildImpl
+  	 * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.Model5PackageImpl#getChild()
+  	 * @generated
+  	 */
+  int CHILD = 15;
+
+  /**
+  	 * The feature id for the '<em><b>Parent</b></em>' container reference.
+  	 * <!-- begin-user-doc -->
+  	 * <!-- end-user-doc -->
+  	 * @generated
+  	 * @ordered
+  	 */
+  int CHILD__PARENT = 0;
+
+  /**
+  	 * The feature id for the '<em><b>Preferred By</b></em>' reference.
+  	 * <!-- begin-user-doc -->
+  	 * <!-- end-user-doc -->
+  	 * @generated
+  	 * @ordered
+  	 */
+  int CHILD__PREFERRED_BY = 1;
+
+  /**
+  	 * The number of structural features of the '<em>Child</em>' class.
+  	 * <!-- begin-user-doc -->
+  	 * <!-- end-user-doc -->
+  	 * @generated
+  	 * @ordered
+  	 */
+  int CHILD_FEATURE_COUNT = 2;
+
+  /**
+  	 * The meta object id for the '<em>Int Array</em>' data type.
+  	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+  	 * @see org.eclipse.emf.cdo.tests.legacy.model5.impl.Model5PackageImpl#getIntArray()
+  	 * @generated
+  	 */
+  int INT_ARRAY = 16;
+
+  /**
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model5.TestFeatureMap <em>Test Feature Map</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return the meta object for class '<em>Test Feature Map</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model5.TestFeatureMap
    * @generated
@@ -461,10 +518,9 @@ public interface Model5Package extends org.eclipse.emf.cdo.tests.model5.Model5Pa
   EClass getTestFeatureMap();
 
   /**
-   * Returns the meta object for the reference list '
-   * {@link org.eclipse.emf.cdo.tests.legacy.model5.TestFeatureMap#getManagers <em>Managers</em>}'. <!-- begin-user-doc
+   * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.tests.legacy.model5.TestFeatureMap#getManagers <em>Managers</em>}'.
+   * <!-- begin-user-doc
    * --> <!-- end-user-doc -->
-   * 
    * @return the meta object for the reference list '<em>Managers</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model5.TestFeatureMap#getManagers()
    * @see #getTestFeatureMap()
@@ -473,10 +529,9 @@ public interface Model5Package extends org.eclipse.emf.cdo.tests.model5.Model5Pa
   EReference getTestFeatureMap_Managers();
 
   /**
-   * Returns the meta object for the reference list '
-   * {@link org.eclipse.emf.cdo.tests.legacy.model5.TestFeatureMap#getDoctors <em>Doctors</em>}'. <!-- begin-user-doc
+   * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.tests.legacy.model5.TestFeatureMap#getDoctors <em>Doctors</em>}'.
+   * <!-- begin-user-doc
    * --> <!-- end-user-doc -->
-   * 
    * @return the meta object for the reference list '<em>Doctors</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model5.TestFeatureMap#getDoctors()
    * @see #getTestFeatureMap()
@@ -485,10 +540,9 @@ public interface Model5Package extends org.eclipse.emf.cdo.tests.model5.Model5Pa
   EReference getTestFeatureMap_Doctors();
 
   /**
-   * Returns the meta object for the attribute list '
-   * {@link org.eclipse.emf.cdo.tests.legacy.model5.TestFeatureMap#getPeople <em>People</em>}'. <!-- begin-user-doc -->
+   * Returns the meta object for the attribute list '{@link org.eclipse.emf.cdo.tests.legacy.model5.TestFeatureMap#getPeople <em>People</em>}'.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * 
    * @return the meta object for the attribute list '<em>People</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model5.TestFeatureMap#getPeople()
    * @see #getTestFeatureMap()
@@ -517,9 +571,8 @@ public interface Model5Package extends org.eclipse.emf.cdo.tests.model5.Model5Pa
   EClass getDoctor();
 
   /**
-   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model5.GenListOfString
-   * <em>Gen List Of String</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model5.GenListOfString <em>Gen List Of String</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return the meta object for class '<em>Gen List Of String</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model5.GenListOfString
    * @generated
@@ -527,10 +580,9 @@ public interface Model5Package extends org.eclipse.emf.cdo.tests.model5.Model5Pa
   EClass getGenListOfString();
 
   /**
-   * Returns the meta object for the attribute list '
-   * {@link org.eclipse.emf.cdo.tests.legacy.model5.GenListOfString#getElements <em>Elements</em>}'. <!-- begin-user-doc
+   * Returns the meta object for the attribute list '{@link org.eclipse.emf.cdo.tests.legacy.model5.GenListOfString#getElements <em>Elements</em>}'.
+   * <!-- begin-user-doc
    * --> <!-- end-user-doc -->
-   * 
    * @return the meta object for the attribute list '<em>Elements</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model5.GenListOfString#getElements()
    * @see #getGenListOfString()
@@ -539,9 +591,8 @@ public interface Model5Package extends org.eclipse.emf.cdo.tests.model5.Model5Pa
   EAttribute getGenListOfString_Elements();
 
   /**
-   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model5.GenListOfInt
-   * <em>Gen List Of Int</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model5.GenListOfInt <em>Gen List Of Int</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return the meta object for class '<em>Gen List Of Int</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model5.GenListOfInt
    * @generated
@@ -549,10 +600,9 @@ public interface Model5Package extends org.eclipse.emf.cdo.tests.model5.Model5Pa
   EClass getGenListOfInt();
 
   /**
-   * Returns the meta object for the attribute list '
-   * {@link org.eclipse.emf.cdo.tests.legacy.model5.GenListOfInt#getElements <em>Elements</em>}'. <!-- begin-user-doc
+   * Returns the meta object for the attribute list '{@link org.eclipse.emf.cdo.tests.legacy.model5.GenListOfInt#getElements <em>Elements</em>}'.
+   * <!-- begin-user-doc
    * --> <!-- end-user-doc -->
-   * 
    * @return the meta object for the attribute list '<em>Elements</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model5.GenListOfInt#getElements()
    * @see #getGenListOfInt()
@@ -561,9 +611,8 @@ public interface Model5Package extends org.eclipse.emf.cdo.tests.model5.Model5Pa
   EAttribute getGenListOfInt_Elements();
 
   /**
-   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model5.GenListOfInteger
-   * <em>Gen List Of Integer</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model5.GenListOfInteger <em>Gen List Of Integer</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return the meta object for class '<em>Gen List Of Integer</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model5.GenListOfInteger
    * @generated
@@ -583,9 +632,8 @@ public interface Model5Package extends org.eclipse.emf.cdo.tests.model5.Model5Pa
   EAttribute getGenListOfInteger_Elements();
 
   /**
-   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model5.GenListOfLong
-   * <em>Gen List Of Long</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model5.GenListOfLong <em>Gen List Of Long</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return the meta object for class '<em>Gen List Of Long</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model5.GenListOfLong
    * @generated
@@ -593,10 +641,9 @@ public interface Model5Package extends org.eclipse.emf.cdo.tests.model5.Model5Pa
   EClass getGenListOfLong();
 
   /**
-   * Returns the meta object for the attribute list '
-   * {@link org.eclipse.emf.cdo.tests.legacy.model5.GenListOfLong#getElements <em>Elements</em>}'. <!-- begin-user-doc
+   * Returns the meta object for the attribute list '{@link org.eclipse.emf.cdo.tests.legacy.model5.GenListOfLong#getElements <em>Elements</em>}'.
+   * <!-- begin-user-doc
    * --> <!-- end-user-doc -->
-   * 
    * @return the meta object for the attribute list '<em>Elements</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model5.GenListOfLong#getElements()
    * @see #getGenListOfLong()
@@ -605,9 +652,8 @@ public interface Model5Package extends org.eclipse.emf.cdo.tests.model5.Model5Pa
   EAttribute getGenListOfLong_Elements();
 
   /**
-   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model5.GenListOfBoolean
-   * <em>Gen List Of Boolean</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model5.GenListOfBoolean <em>Gen List Of Boolean</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return the meta object for class '<em>Gen List Of Boolean</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model5.GenListOfBoolean
    * @generated
@@ -627,9 +673,8 @@ public interface Model5Package extends org.eclipse.emf.cdo.tests.model5.Model5Pa
   EAttribute getGenListOfBoolean_Elements();
 
   /**
-   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model5.GenListOfShort
-   * <em>Gen List Of Short</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model5.GenListOfShort <em>Gen List Of Short</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return the meta object for class '<em>Gen List Of Short</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model5.GenListOfShort
    * @generated
@@ -637,10 +682,9 @@ public interface Model5Package extends org.eclipse.emf.cdo.tests.model5.Model5Pa
   EClass getGenListOfShort();
 
   /**
-   * Returns the meta object for the attribute list '
-   * {@link org.eclipse.emf.cdo.tests.legacy.model5.GenListOfShort#getElements <em>Elements</em>}'. <!-- begin-user-doc
+   * Returns the meta object for the attribute list '{@link org.eclipse.emf.cdo.tests.legacy.model5.GenListOfShort#getElements <em>Elements</em>}'.
+   * <!-- begin-user-doc
    * --> <!-- end-user-doc -->
-   * 
    * @return the meta object for the attribute list '<em>Elements</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model5.GenListOfShort#getElements()
    * @see #getGenListOfShort()
@@ -649,9 +693,8 @@ public interface Model5Package extends org.eclipse.emf.cdo.tests.model5.Model5Pa
   EAttribute getGenListOfShort_Elements();
 
   /**
-   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model5.GenListOfFloat
-   * <em>Gen List Of Float</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model5.GenListOfFloat <em>Gen List Of Float</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return the meta object for class '<em>Gen List Of Float</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model5.GenListOfFloat
    * @generated
@@ -659,10 +702,9 @@ public interface Model5Package extends org.eclipse.emf.cdo.tests.model5.Model5Pa
   EClass getGenListOfFloat();
 
   /**
-   * Returns the meta object for the attribute list '
-   * {@link org.eclipse.emf.cdo.tests.legacy.model5.GenListOfFloat#getElements <em>Elements</em>}'. <!-- begin-user-doc
+   * Returns the meta object for the attribute list '{@link org.eclipse.emf.cdo.tests.legacy.model5.GenListOfFloat#getElements <em>Elements</em>}'.
+   * <!-- begin-user-doc
    * --> <!-- end-user-doc -->
-   * 
    * @return the meta object for the attribute list '<em>Elements</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model5.GenListOfFloat#getElements()
    * @see #getGenListOfFloat()
@@ -671,9 +713,8 @@ public interface Model5Package extends org.eclipse.emf.cdo.tests.model5.Model5Pa
   EAttribute getGenListOfFloat_Elements();
 
   /**
-   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model5.GenListOfDouble
-   * <em>Gen List Of Double</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model5.GenListOfDouble <em>Gen List Of Double</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return the meta object for class '<em>Gen List Of Double</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model5.GenListOfDouble
    * @generated
@@ -681,10 +722,9 @@ public interface Model5Package extends org.eclipse.emf.cdo.tests.model5.Model5Pa
   EClass getGenListOfDouble();
 
   /**
-   * Returns the meta object for the attribute list '
-   * {@link org.eclipse.emf.cdo.tests.legacy.model5.GenListOfDouble#getElements <em>Elements</em>}'. <!-- begin-user-doc
+   * Returns the meta object for the attribute list '{@link org.eclipse.emf.cdo.tests.legacy.model5.GenListOfDouble#getElements <em>Elements</em>}'.
+   * <!-- begin-user-doc
    * --> <!-- end-user-doc -->
-   * 
    * @return the meta object for the attribute list '<em>Elements</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model5.GenListOfDouble#getElements()
    * @see #getGenListOfDouble()
@@ -693,9 +733,8 @@ public interface Model5Package extends org.eclipse.emf.cdo.tests.model5.Model5Pa
   EAttribute getGenListOfDouble_Elements();
 
   /**
-   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model5.GenListOfDate
-   * <em>Gen List Of Date</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model5.GenListOfDate <em>Gen List Of Date</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return the meta object for class '<em>Gen List Of Date</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model5.GenListOfDate
    * @generated
@@ -703,10 +742,9 @@ public interface Model5Package extends org.eclipse.emf.cdo.tests.model5.Model5Pa
   EClass getGenListOfDate();
 
   /**
-   * Returns the meta object for the attribute list '
-   * {@link org.eclipse.emf.cdo.tests.legacy.model5.GenListOfDate#getElements <em>Elements</em>}'. <!-- begin-user-doc
+   * Returns the meta object for the attribute list '{@link org.eclipse.emf.cdo.tests.legacy.model5.GenListOfDate#getElements <em>Elements</em>}'.
+   * <!-- begin-user-doc
    * --> <!-- end-user-doc -->
-   * 
    * @return the meta object for the attribute list '<em>Elements</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model5.GenListOfDate#getElements()
    * @see #getGenListOfDate()
@@ -715,9 +753,8 @@ public interface Model5Package extends org.eclipse.emf.cdo.tests.model5.Model5Pa
   EAttribute getGenListOfDate_Elements();
 
   /**
-   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model5.GenListOfChar
-   * <em>Gen List Of Char</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model5.GenListOfChar <em>Gen List Of Char</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return the meta object for class '<em>Gen List Of Char</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model5.GenListOfChar
    * @generated
@@ -725,10 +762,9 @@ public interface Model5Package extends org.eclipse.emf.cdo.tests.model5.Model5Pa
   EClass getGenListOfChar();
 
   /**
-   * Returns the meta object for the attribute list '
-   * {@link org.eclipse.emf.cdo.tests.legacy.model5.GenListOfChar#getElements <em>Elements</em>}'. <!-- begin-user-doc
+   * Returns the meta object for the attribute list '{@link org.eclipse.emf.cdo.tests.legacy.model5.GenListOfChar#getElements <em>Elements</em>}'.
+   * <!-- begin-user-doc
    * --> <!-- end-user-doc -->
-   * 
    * @return the meta object for the attribute list '<em>Elements</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model5.GenListOfChar#getElements()
    * @see #getGenListOfChar()
@@ -737,9 +773,8 @@ public interface Model5Package extends org.eclipse.emf.cdo.tests.model5.Model5Pa
   EAttribute getGenListOfChar_Elements();
 
   /**
-   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model5.GenListOfIntArray
-   * <em>Gen List Of Int Array</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model5.GenListOfIntArray <em>Gen List Of Int Array</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return the meta object for class '<em>Gen List Of Int Array</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model5.GenListOfIntArray
    * @generated
@@ -759,17 +794,81 @@ public interface Model5Package extends org.eclipse.emf.cdo.tests.model5.Model5Pa
   EAttribute getGenListOfIntArray_Elements();
 
   /**
-   * Returns the meta object for data type '<em>Int Array</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @return the meta object for data type '<em>Int Array</em>'.
-   * @model instanceClass="int[]"
-   * @generated
-   */
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model5.Parent <em>Parent</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for class '<em>Parent</em>'.
+   * @see org.eclipse.emf.cdo.tests.legacy.model5.Parent
+   * @generated
+   */
+  EClass getParent();
+
+  /**
+  	 * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.legacy.model5.Parent#getChildren <em>Children</em>}'.
+  	 * <!-- begin-user-doc -->
+  	 * <!-- end-user-doc -->
+  	 * @return the meta object for the containment reference list '<em>Children</em>'.
+  	 * @see org.eclipse.emf.cdo.tests.legacy.model5.Parent#getChildren()
+  	 * @see #getParent()
+  	 * @generated
+  	 */
+  EReference getParent_Children();
+
+  /**
+  	 * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.tests.legacy.model5.Parent#getFavourite <em>Favourite</em>}'.
+  	 * <!-- begin-user-doc -->
+  	 * <!-- end-user-doc -->
+  	 * @return the meta object for the reference '<em>Favourite</em>'.
+  	 * @see org.eclipse.emf.cdo.tests.legacy.model5.Parent#getFavourite()
+  	 * @see #getParent()
+  	 * @generated
+  	 */
+  EReference getParent_Favourite();
+
+  /**
+  	 * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model5.Child <em>Child</em>}'.
+  	 * <!-- begin-user-doc -->
+  	 * <!-- end-user-doc -->
+  	 * @return the meta object for class '<em>Child</em>'.
+  	 * @see org.eclipse.emf.cdo.tests.legacy.model5.Child
+  	 * @generated
+  	 */
+  EClass getChild();
+
+  /**
+  	 * Returns the meta object for the container reference '{@link org.eclipse.emf.cdo.tests.legacy.model5.Child#getParent <em>Parent</em>}'.
+  	 * <!-- begin-user-doc -->
+  	 * <!-- end-user-doc -->
+  	 * @return the meta object for the container reference '<em>Parent</em>'.
+  	 * @see org.eclipse.emf.cdo.tests.legacy.model5.Child#getParent()
+  	 * @see #getChild()
+  	 * @generated
+  	 */
+  EReference getChild_Parent();
+
+  /**
+  	 * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.tests.legacy.model5.Child#getPreferredBy <em>Preferred By</em>}'.
+  	 * <!-- begin-user-doc -->
+  	 * <!-- end-user-doc -->
+  	 * @return the meta object for the reference '<em>Preferred By</em>'.
+  	 * @see org.eclipse.emf.cdo.tests.legacy.model5.Child#getPreferredBy()
+  	 * @see #getChild()
+  	 * @generated
+  	 */
+  EReference getChild_PreferredBy();
+
+  /**
+  	 * Returns the meta object for data type '<em>Int Array</em>'.
+  	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+  	 * @return the meta object for data type '<em>Int Array</em>'.
+  	 * @model instanceClass="int[]"
+  	 * @generated
+  	 */
   EDataType getIntArray();
 
   /**
-   * 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
    */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/ChildImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/ChildImpl.java
new file mode 100644
index 0000000000..2637b5003f
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/ChildImpl.java
@@ -0,0 +1,367 @@
+/*
+ * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Christian W. Damus (CEA) - initial API and implementation
+ */
+package org.eclipse.emf.cdo.tests.legacy.model5.impl;
+
+import org.eclipse.emf.cdo.tests.legacy.model5.Model5Package;
+import org.eclipse.emf.cdo.tests.model5.Child;
+import org.eclipse.emf.cdo.tests.model5.Parent;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.EObjectImpl;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Child</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.eclipse.emf.cdo.tests.legacy.model5.impl.ChildImpl#getParent <em>Parent</em>}</li>
+ *   <li>{@link org.eclipse.emf.cdo.tests.legacy.model5.impl.ChildImpl#getPreferredBy <em>Preferred By</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class ChildImpl extends EObjectImpl implements Child
+{
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public static final String copyright = "Copyright (c) 2004 - 2012 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";
+
+  /**
+   * The cached value of the '{@link #getPreferredBy() <em>Preferred By</em>}' reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getPreferredBy()
+   * @generated
+   * @ordered
+   */
+  protected Parent preferredBy;
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected ChildImpl()
+  {
+    super();
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return Model5Package.eINSTANCE.getChild();
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public Parent getParent()
+  {
+    if (eContainerFeatureID() != Model5Package.CHILD__PARENT)
+    {
+      return null;
+    }
+    return (Parent)eContainer();
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public NotificationChain basicSetParent(Parent newParent, NotificationChain msgs)
+  {
+    msgs = eBasicSetContainer((InternalEObject)newParent, Model5Package.CHILD__PARENT, msgs);
+    return msgs;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public void setParent(Parent newParent)
+  {
+    if (newParent != eInternalContainer() || eContainerFeatureID() != Model5Package.CHILD__PARENT && newParent != null)
+    {
+      if (EcoreUtil.isAncestor(this, newParent))
+      {
+        throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+      }
+      NotificationChain msgs = null;
+      if (eInternalContainer() != null)
+      {
+        msgs = eBasicRemoveFromContainer(msgs);
+      }
+      if (newParent != null)
+      {
+        msgs = ((InternalEObject)newParent).eInverseAdd(this, Model5Package.PARENT__CHILDREN, Parent.class, msgs);
+      }
+      msgs = basicSetParent(newParent, msgs);
+      if (msgs != null)
+      {
+        msgs.dispatch();
+      }
+    }
+    else if (eNotificationRequired())
+    {
+      eNotify(new ENotificationImpl(this, Notification.SET, Model5Package.CHILD__PARENT, newParent, newParent));
+    }
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public Parent getPreferredBy()
+  {
+    if (preferredBy != null && preferredBy.eIsProxy())
+    {
+      InternalEObject oldPreferredBy = (InternalEObject)preferredBy;
+      preferredBy = (Parent)eResolveProxy(oldPreferredBy);
+      if (preferredBy != oldPreferredBy)
+      {
+        if (eNotificationRequired())
+        {
+          eNotify(new ENotificationImpl(this, Notification.RESOLVE, Model5Package.CHILD__PREFERRED_BY, oldPreferredBy,
+              preferredBy));
+        }
+      }
+    }
+    return preferredBy;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public Parent basicGetPreferredBy()
+  {
+    return preferredBy;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public NotificationChain basicSetPreferredBy(Parent newPreferredBy, NotificationChain msgs)
+  {
+    Parent oldPreferredBy = preferredBy;
+    preferredBy = newPreferredBy;
+    if (eNotificationRequired())
+    {
+      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, Model5Package.CHILD__PREFERRED_BY,
+          oldPreferredBy, newPreferredBy);
+      if (msgs == null)
+      {
+        msgs = notification;
+      }
+      else
+      {
+        msgs.add(notification);
+      }
+    }
+    return msgs;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public void setPreferredBy(Parent newPreferredBy)
+  {
+    if (newPreferredBy != preferredBy)
+    {
+      NotificationChain msgs = null;
+      if (preferredBy != null)
+      {
+        msgs = ((InternalEObject)preferredBy).eInverseRemove(this, Model5Package.PARENT__FAVOURITE, Parent.class, msgs);
+      }
+      if (newPreferredBy != null)
+      {
+        msgs = ((InternalEObject)newPreferredBy).eInverseAdd(this, Model5Package.PARENT__FAVOURITE, Parent.class, msgs);
+      }
+      msgs = basicSetPreferredBy(newPreferredBy, msgs);
+      if (msgs != null)
+      {
+        msgs.dispatch();
+      }
+    }
+    else if (eNotificationRequired())
+    {
+      eNotify(new ENotificationImpl(this, Notification.SET, Model5Package.CHILD__PREFERRED_BY, newPreferredBy,
+          newPreferredBy));
+    }
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs)
+  {
+    switch (featureID)
+    {
+    case Model5Package.CHILD__PARENT:
+      if (eInternalContainer() != null)
+      {
+        msgs = eBasicRemoveFromContainer(msgs);
+      }
+      return basicSetParent((Parent)otherEnd, msgs);
+    case Model5Package.CHILD__PREFERRED_BY:
+      if (preferredBy != null)
+      {
+        msgs = ((InternalEObject)preferredBy).eInverseRemove(this, Model5Package.PARENT__FAVOURITE, Parent.class, msgs);
+      }
+      return basicSetPreferredBy((Parent)otherEnd, msgs);
+    }
+    return super.eInverseAdd(otherEnd, featureID, msgs);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
+  {
+    switch (featureID)
+    {
+    case Model5Package.CHILD__PARENT:
+      return basicSetParent(null, msgs);
+    case Model5Package.CHILD__PREFERRED_BY:
+      return basicSetPreferredBy(null, msgs);
+    }
+    return super.eInverseRemove(otherEnd, featureID, msgs);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs)
+  {
+    switch (eContainerFeatureID())
+    {
+    case Model5Package.CHILD__PARENT:
+      return eInternalContainer().eInverseRemove(this, Model5Package.PARENT__CHILDREN, Parent.class, msgs);
+    }
+    return super.eBasicRemoveFromContainerFeature(msgs);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public Object eGet(int featureID, boolean resolve, boolean coreType)
+  {
+    switch (featureID)
+    {
+    case Model5Package.CHILD__PARENT:
+      return getParent();
+    case Model5Package.CHILD__PREFERRED_BY:
+      if (resolve)
+      {
+        return getPreferredBy();
+      }
+      return basicGetPreferredBy();
+    }
+    return super.eGet(featureID, resolve, coreType);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void eSet(int featureID, Object newValue)
+  {
+    switch (featureID)
+    {
+    case Model5Package.CHILD__PARENT:
+      setParent((Parent)newValue);
+      return;
+    case Model5Package.CHILD__PREFERRED_BY:
+      setPreferredBy((Parent)newValue);
+      return;
+    }
+    super.eSet(featureID, newValue);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void eUnset(int featureID)
+  {
+    switch (featureID)
+    {
+    case Model5Package.CHILD__PARENT:
+      setParent((Parent)null);
+      return;
+    case Model5Package.CHILD__PREFERRED_BY:
+      setPreferredBy((Parent)null);
+      return;
+    }
+    super.eUnset(featureID);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public boolean eIsSet(int featureID)
+  {
+    switch (featureID)
+    {
+    case Model5Package.CHILD__PARENT:
+      return getParent() != null;
+    case Model5Package.CHILD__PREFERRED_BY:
+      return preferredBy != null;
+    }
+    return super.eIsSet(featureID);
+  }
+
+} // ChildImpl
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/DoctorImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/DoctorImpl.java
index 6bc9e51e4e..b1c4d3ea38 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/DoctorImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/DoctorImpl.java
@@ -20,21 +20,19 @@ import org.eclipse.emf.ecore.impl.EObjectImpl;
  * <!-- begin-user-doc --> An implementation of the model object '<em><b>Doctor</b></em>'. <!-- end-user-doc -->
  * <p>
  * </p>
- * 
+ *
  * @generated
  */
 public class DoctorImpl extends EObjectImpl implements Doctor
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public static final String copyright = "Copyright (c) 2004 - 2012 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 DoctorImpl()
@@ -44,7 +42,6 @@ public class DoctorImpl extends EObjectImpl implements Doctor
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfBooleanImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfBooleanImpl.java
index 6e488dc349..2cf32adaec 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfBooleanImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfBooleanImpl.java
@@ -26,25 +26,24 @@ import java.util.Collection;
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfBooleanImpl#getElements <em>Elements</em>}</li>
+ *   <li>{@link org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfBooleanImpl#getElements <em>Elements</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class GenListOfBooleanImpl extends EObjectImpl implements GenListOfBoolean
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public static final String copyright = "Copyright (c) 2004 - 2012 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";
 
   /**
-   * The cached value of the '{@link #getElements() <em>Elements</em>}' attribute list. <!-- begin-user-doc --> <!--
+   * The cached value of the '{@link #getElements() <em>Elements</em>}' attribute list.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @see #getElements()
    * @generated
    * @ordered
@@ -53,7 +52,6 @@ public class GenListOfBooleanImpl extends EObjectImpl implements GenListOfBoolea
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   protected GenListOfBooleanImpl()
@@ -63,7 +61,6 @@ public class GenListOfBooleanImpl extends EObjectImpl implements GenListOfBoolea
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -74,7 +71,6 @@ public class GenListOfBooleanImpl extends EObjectImpl implements GenListOfBoolea
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EList<Boolean> getElements()
@@ -88,7 +84,6 @@ public class GenListOfBooleanImpl extends EObjectImpl implements GenListOfBoolea
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -104,7 +99,6 @@ public class GenListOfBooleanImpl extends EObjectImpl implements GenListOfBoolea
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @SuppressWarnings("unchecked")
@@ -123,7 +117,6 @@ public class GenListOfBooleanImpl extends EObjectImpl implements GenListOfBoolea
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -140,7 +133,6 @@ public class GenListOfBooleanImpl extends EObjectImpl implements GenListOfBoolea
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -156,7 +148,6 @@ public class GenListOfBooleanImpl extends EObjectImpl implements GenListOfBoolea
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfCharImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfCharImpl.java
index 5ea25c21fe..cea79ff832 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfCharImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfCharImpl.java
@@ -36,15 +36,14 @@ public class GenListOfCharImpl extends EObjectImpl implements GenListOfChar
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public static final String copyright = "Copyright (c) 2004 - 2012 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";
 
   /**
-   * The cached value of the '{@link #getElements() <em>Elements</em>}' attribute list. <!-- begin-user-doc --> <!--
+   * The cached value of the '{@link #getElements() <em>Elements</em>}' attribute list.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @see #getElements()
    * @generated
    * @ordered
@@ -53,7 +52,6 @@ public class GenListOfCharImpl extends EObjectImpl implements GenListOfChar
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   protected GenListOfCharImpl()
@@ -63,7 +61,6 @@ public class GenListOfCharImpl extends EObjectImpl implements GenListOfChar
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -74,7 +71,6 @@ public class GenListOfCharImpl extends EObjectImpl implements GenListOfChar
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EList<Character> getElements()
@@ -88,7 +84,6 @@ public class GenListOfCharImpl extends EObjectImpl implements GenListOfChar
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -104,7 +99,6 @@ public class GenListOfCharImpl extends EObjectImpl implements GenListOfChar
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @SuppressWarnings("unchecked")
@@ -123,7 +117,6 @@ public class GenListOfCharImpl extends EObjectImpl implements GenListOfChar
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -140,7 +133,6 @@ public class GenListOfCharImpl extends EObjectImpl implements GenListOfChar
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -156,7 +148,6 @@ public class GenListOfCharImpl extends EObjectImpl implements GenListOfChar
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfDateImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfDateImpl.java
index dde960d6c7..bfeb22716a 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfDateImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfDateImpl.java
@@ -37,15 +37,14 @@ public class GenListOfDateImpl extends EObjectImpl implements GenListOfDate
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public static final String copyright = "Copyright (c) 2004 - 2012 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";
 
   /**
-   * The cached value of the '{@link #getElements() <em>Elements</em>}' attribute list. <!-- begin-user-doc --> <!--
+   * The cached value of the '{@link #getElements() <em>Elements</em>}' attribute list.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @see #getElements()
    * @generated
    * @ordered
@@ -54,7 +53,6 @@ public class GenListOfDateImpl extends EObjectImpl implements GenListOfDate
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   protected GenListOfDateImpl()
@@ -64,7 +62,6 @@ public class GenListOfDateImpl extends EObjectImpl implements GenListOfDate
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -75,7 +72,6 @@ public class GenListOfDateImpl extends EObjectImpl implements GenListOfDate
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EList<Date> getElements()
@@ -89,7 +85,6 @@ public class GenListOfDateImpl extends EObjectImpl implements GenListOfDate
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -105,7 +100,6 @@ public class GenListOfDateImpl extends EObjectImpl implements GenListOfDate
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @SuppressWarnings("unchecked")
@@ -124,7 +118,6 @@ public class GenListOfDateImpl extends EObjectImpl implements GenListOfDate
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -141,7 +134,6 @@ public class GenListOfDateImpl extends EObjectImpl implements GenListOfDate
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -157,7 +149,6 @@ public class GenListOfDateImpl extends EObjectImpl implements GenListOfDate
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfDoubleImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfDoubleImpl.java
index 2e6eb255ec..3f5bd88ee1 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfDoubleImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfDoubleImpl.java
@@ -36,15 +36,14 @@ public class GenListOfDoubleImpl extends EObjectImpl implements GenListOfDouble
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public static final String copyright = "Copyright (c) 2004 - 2012 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";
 
   /**
-   * The cached value of the '{@link #getElements() <em>Elements</em>}' attribute list. <!-- begin-user-doc --> <!--
+   * The cached value of the '{@link #getElements() <em>Elements</em>}' attribute list.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @see #getElements()
    * @generated
    * @ordered
@@ -53,7 +52,6 @@ public class GenListOfDoubleImpl extends EObjectImpl implements GenListOfDouble
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   protected GenListOfDoubleImpl()
@@ -63,7 +61,6 @@ public class GenListOfDoubleImpl extends EObjectImpl implements GenListOfDouble
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -74,7 +71,6 @@ public class GenListOfDoubleImpl extends EObjectImpl implements GenListOfDouble
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EList<Double> getElements()
@@ -88,7 +84,6 @@ public class GenListOfDoubleImpl extends EObjectImpl implements GenListOfDouble
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -104,7 +99,6 @@ public class GenListOfDoubleImpl extends EObjectImpl implements GenListOfDouble
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @SuppressWarnings("unchecked")
@@ -123,7 +117,6 @@ public class GenListOfDoubleImpl extends EObjectImpl implements GenListOfDouble
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -140,7 +133,6 @@ public class GenListOfDoubleImpl extends EObjectImpl implements GenListOfDouble
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -156,7 +148,6 @@ public class GenListOfDoubleImpl extends EObjectImpl implements GenListOfDouble
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfFloatImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfFloatImpl.java
index 34b1819ccf..4d16a1f14f 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfFloatImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfFloatImpl.java
@@ -36,15 +36,14 @@ public class GenListOfFloatImpl extends EObjectImpl implements GenListOfFloat
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public static final String copyright = "Copyright (c) 2004 - 2012 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";
 
   /**
-   * The cached value of the '{@link #getElements() <em>Elements</em>}' attribute list. <!-- begin-user-doc --> <!--
+   * The cached value of the '{@link #getElements() <em>Elements</em>}' attribute list.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @see #getElements()
    * @generated
    * @ordered
@@ -53,7 +52,6 @@ public class GenListOfFloatImpl extends EObjectImpl implements GenListOfFloat
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   protected GenListOfFloatImpl()
@@ -63,7 +61,6 @@ public class GenListOfFloatImpl extends EObjectImpl implements GenListOfFloat
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -74,7 +71,6 @@ public class GenListOfFloatImpl extends EObjectImpl implements GenListOfFloat
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EList<Float> getElements()
@@ -88,7 +84,6 @@ public class GenListOfFloatImpl extends EObjectImpl implements GenListOfFloat
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -104,7 +99,6 @@ public class GenListOfFloatImpl extends EObjectImpl implements GenListOfFloat
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @SuppressWarnings("unchecked")
@@ -123,7 +117,6 @@ public class GenListOfFloatImpl extends EObjectImpl implements GenListOfFloat
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -140,7 +133,6 @@ public class GenListOfFloatImpl extends EObjectImpl implements GenListOfFloat
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -156,7 +148,6 @@ public class GenListOfFloatImpl extends EObjectImpl implements GenListOfFloat
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfIntArrayImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfIntArrayImpl.java
index 28ee7b537a..353f756d92 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfIntArrayImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfIntArrayImpl.java
@@ -26,25 +26,24 @@ import java.util.Collection;
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfIntArrayImpl#getElements <em>Elements</em>}</li>
+ *   <li>{@link org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfIntArrayImpl#getElements <em>Elements</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class GenListOfIntArrayImpl extends EObjectImpl implements GenListOfIntArray
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public static final String copyright = "Copyright (c) 2004 - 2012 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";
 
   /**
-   * The cached value of the '{@link #getElements() <em>Elements</em>}' attribute list. <!-- begin-user-doc --> <!--
+   * The cached value of the '{@link #getElements() <em>Elements</em>}' attribute list.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @see #getElements()
    * @generated
    * @ordered
@@ -53,7 +52,6 @@ public class GenListOfIntArrayImpl extends EObjectImpl implements GenListOfIntAr
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   protected GenListOfIntArrayImpl()
@@ -63,7 +61,6 @@ public class GenListOfIntArrayImpl extends EObjectImpl implements GenListOfIntAr
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -74,7 +71,6 @@ public class GenListOfIntArrayImpl extends EObjectImpl implements GenListOfIntAr
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EList<int[]> getElements()
@@ -88,7 +84,6 @@ public class GenListOfIntArrayImpl extends EObjectImpl implements GenListOfIntAr
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -104,7 +99,6 @@ public class GenListOfIntArrayImpl extends EObjectImpl implements GenListOfIntAr
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @SuppressWarnings("unchecked")
@@ -123,7 +117,6 @@ public class GenListOfIntArrayImpl extends EObjectImpl implements GenListOfIntAr
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -140,7 +133,6 @@ public class GenListOfIntArrayImpl extends EObjectImpl implements GenListOfIntAr
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -156,7 +148,6 @@ public class GenListOfIntArrayImpl extends EObjectImpl implements GenListOfIntAr
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfIntImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfIntImpl.java
index 983962d82f..fc671f4e83 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfIntImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfIntImpl.java
@@ -36,15 +36,14 @@ public class GenListOfIntImpl extends EObjectImpl implements GenListOfInt
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public static final String copyright = "Copyright (c) 2004 - 2012 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";
 
   /**
-   * The cached value of the '{@link #getElements() <em>Elements</em>}' attribute list. <!-- begin-user-doc --> <!--
+   * The cached value of the '{@link #getElements() <em>Elements</em>}' attribute list.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @see #getElements()
    * @generated
    * @ordered
@@ -53,7 +52,6 @@ public class GenListOfIntImpl extends EObjectImpl implements GenListOfInt
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   protected GenListOfIntImpl()
@@ -63,7 +61,6 @@ public class GenListOfIntImpl extends EObjectImpl implements GenListOfInt
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -74,7 +71,6 @@ public class GenListOfIntImpl extends EObjectImpl implements GenListOfInt
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EList<Integer> getElements()
@@ -88,7 +84,6 @@ public class GenListOfIntImpl extends EObjectImpl implements GenListOfInt
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -104,7 +99,6 @@ public class GenListOfIntImpl extends EObjectImpl implements GenListOfInt
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @SuppressWarnings("unchecked")
@@ -123,7 +117,6 @@ public class GenListOfIntImpl extends EObjectImpl implements GenListOfInt
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -140,7 +133,6 @@ public class GenListOfIntImpl extends EObjectImpl implements GenListOfInt
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -156,7 +148,6 @@ public class GenListOfIntImpl extends EObjectImpl implements GenListOfInt
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfIntegerImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfIntegerImpl.java
index 5c35b49af2..a8ca96e4c4 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfIntegerImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfIntegerImpl.java
@@ -26,25 +26,24 @@ import java.util.Collection;
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfIntegerImpl#getElements <em>Elements</em>}</li>
+ *   <li>{@link org.eclipse.emf.cdo.tests.legacy.model5.impl.GenListOfIntegerImpl#getElements <em>Elements</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class GenListOfIntegerImpl extends EObjectImpl implements GenListOfInteger
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public static final String copyright = "Copyright (c) 2004 - 2012 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";
 
   /**
-   * The cached value of the '{@link #getElements() <em>Elements</em>}' attribute list. <!-- begin-user-doc --> <!--
+   * The cached value of the '{@link #getElements() <em>Elements</em>}' attribute list.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @see #getElements()
    * @generated
    * @ordered
@@ -53,7 +52,6 @@ public class GenListOfIntegerImpl extends EObjectImpl implements GenListOfIntege
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   protected GenListOfIntegerImpl()
@@ -63,7 +61,6 @@ public class GenListOfIntegerImpl extends EObjectImpl implements GenListOfIntege
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -74,7 +71,6 @@ public class GenListOfIntegerImpl extends EObjectImpl implements GenListOfIntege
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EList<Integer> getElements()
@@ -88,7 +84,6 @@ public class GenListOfIntegerImpl extends EObjectImpl implements GenListOfIntege
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -104,7 +99,6 @@ public class GenListOfIntegerImpl extends EObjectImpl implements GenListOfIntege
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @SuppressWarnings("unchecked")
@@ -123,7 +117,6 @@ public class GenListOfIntegerImpl extends EObjectImpl implements GenListOfIntege
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -140,7 +133,6 @@ public class GenListOfIntegerImpl extends EObjectImpl implements GenListOfIntege
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -156,7 +148,6 @@ public class GenListOfIntegerImpl extends EObjectImpl implements GenListOfIntege
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfLongImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfLongImpl.java
index 1491935252..33d680fe77 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfLongImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfLongImpl.java
@@ -36,15 +36,14 @@ public class GenListOfLongImpl extends EObjectImpl implements GenListOfLong
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public static final String copyright = "Copyright (c) 2004 - 2012 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";
 
   /**
-   * The cached value of the '{@link #getElements() <em>Elements</em>}' attribute list. <!-- begin-user-doc --> <!--
+   * The cached value of the '{@link #getElements() <em>Elements</em>}' attribute list.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @see #getElements()
    * @generated
    * @ordered
@@ -53,7 +52,6 @@ public class GenListOfLongImpl extends EObjectImpl implements GenListOfLong
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   protected GenListOfLongImpl()
@@ -63,7 +61,6 @@ public class GenListOfLongImpl extends EObjectImpl implements GenListOfLong
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -74,7 +71,6 @@ public class GenListOfLongImpl extends EObjectImpl implements GenListOfLong
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EList<Long> getElements()
@@ -88,7 +84,6 @@ public class GenListOfLongImpl extends EObjectImpl implements GenListOfLong
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -104,7 +99,6 @@ public class GenListOfLongImpl extends EObjectImpl implements GenListOfLong
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @SuppressWarnings("unchecked")
@@ -123,7 +117,6 @@ public class GenListOfLongImpl extends EObjectImpl implements GenListOfLong
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -140,7 +133,6 @@ public class GenListOfLongImpl extends EObjectImpl implements GenListOfLong
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -156,7 +148,6 @@ public class GenListOfLongImpl extends EObjectImpl implements GenListOfLong
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfShortImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfShortImpl.java
index 185a969718..2ade28f973 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfShortImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfShortImpl.java
@@ -36,15 +36,14 @@ public class GenListOfShortImpl extends EObjectImpl implements GenListOfShort
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public static final String copyright = "Copyright (c) 2004 - 2012 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";
 
   /**
-   * The cached value of the '{@link #getElements() <em>Elements</em>}' attribute list. <!-- begin-user-doc --> <!--
+   * The cached value of the '{@link #getElements() <em>Elements</em>}' attribute list.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @see #getElements()
    * @generated
    * @ordered
@@ -53,7 +52,6 @@ public class GenListOfShortImpl extends EObjectImpl implements GenListOfShort
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   protected GenListOfShortImpl()
@@ -63,7 +61,6 @@ public class GenListOfShortImpl extends EObjectImpl implements GenListOfShort
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -74,7 +71,6 @@ public class GenListOfShortImpl extends EObjectImpl implements GenListOfShort
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EList<Short> getElements()
@@ -88,7 +84,6 @@ public class GenListOfShortImpl extends EObjectImpl implements GenListOfShort
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -104,7 +99,6 @@ public class GenListOfShortImpl extends EObjectImpl implements GenListOfShort
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @SuppressWarnings("unchecked")
@@ -123,7 +117,6 @@ public class GenListOfShortImpl extends EObjectImpl implements GenListOfShort
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -140,7 +133,6 @@ public class GenListOfShortImpl extends EObjectImpl implements GenListOfShort
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -156,7 +148,6 @@ public class GenListOfShortImpl extends EObjectImpl implements GenListOfShort
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfStringImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfStringImpl.java
index 6a8bc20f02..e5d0e46e19 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfStringImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfStringImpl.java
@@ -36,15 +36,14 @@ public class GenListOfStringImpl extends EObjectImpl implements GenListOfString
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public static final String copyright = "Copyright (c) 2004 - 2012 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";
 
   /**
-   * The cached value of the '{@link #getElements() <em>Elements</em>}' attribute list. <!-- begin-user-doc --> <!--
+   * The cached value of the '{@link #getElements() <em>Elements</em>}' attribute list.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @see #getElements()
    * @generated
    * @ordered
@@ -53,7 +52,6 @@ public class GenListOfStringImpl extends EObjectImpl implements GenListOfString
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   protected GenListOfStringImpl()
@@ -63,7 +61,6 @@ public class GenListOfStringImpl extends EObjectImpl implements GenListOfString
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -74,7 +71,6 @@ public class GenListOfStringImpl extends EObjectImpl implements GenListOfString
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EList<String> getElements()
@@ -88,7 +84,6 @@ public class GenListOfStringImpl extends EObjectImpl implements GenListOfString
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -104,7 +99,6 @@ public class GenListOfStringImpl extends EObjectImpl implements GenListOfString
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @SuppressWarnings("unchecked")
@@ -123,7 +117,6 @@ public class GenListOfStringImpl extends EObjectImpl implements GenListOfString
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -140,7 +133,6 @@ public class GenListOfStringImpl extends EObjectImpl implements GenListOfString
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -156,7 +148,6 @@ public class GenListOfStringImpl extends EObjectImpl implements GenListOfString
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/ManagerImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/ManagerImpl.java
index 012bcf19ea..456c5138f2 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/ManagerImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/ManagerImpl.java
@@ -20,21 +20,19 @@ import org.eclipse.emf.ecore.impl.EObjectImpl;
  * <!-- begin-user-doc --> An implementation of the model object '<em><b>Manager</b></em>'. <!-- end-user-doc -->
  * <p>
  * </p>
- * 
+ *
  * @generated
  */
 public class ManagerImpl extends EObjectImpl implements Manager
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public static final String copyright = "Copyright (c) 2004 - 2012 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 ManagerImpl()
@@ -44,7 +42,6 @@ public class ManagerImpl extends EObjectImpl implements Manager
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/Model5FactoryImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/Model5FactoryImpl.java
index c7b5b29028..be030fda7a 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/Model5FactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/Model5FactoryImpl.java
@@ -12,6 +12,7 @@ package org.eclipse.emf.cdo.tests.legacy.model5.impl;
 
 import org.eclipse.emf.cdo.tests.legacy.model5.Model5Factory;
 import org.eclipse.emf.cdo.tests.legacy.model5.Model5Package;
+import org.eclipse.emf.cdo.tests.model5.Child;
 import org.eclipse.emf.cdo.tests.model5.Doctor;
 import org.eclipse.emf.cdo.tests.model5.GenListOfBoolean;
 import org.eclipse.emf.cdo.tests.model5.GenListOfChar;
@@ -25,6 +26,7 @@ import org.eclipse.emf.cdo.tests.model5.GenListOfLong;
 import org.eclipse.emf.cdo.tests.model5.GenListOfShort;
 import org.eclipse.emf.cdo.tests.model5.GenListOfString;
 import org.eclipse.emf.cdo.tests.model5.Manager;
+import org.eclipse.emf.cdo.tests.model5.Parent;
 import org.eclipse.emf.cdo.tests.model5.TestFeatureMap;
 
 import org.eclipse.emf.ecore.EClass;
@@ -36,14 +38,12 @@ import org.eclipse.emf.ecore.plugin.EcorePlugin;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!-- end-user-doc -->
- * 
  * @generated
  */
 public class Model5FactoryImpl extends EFactoryImpl implements Model5Factory
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public static final String copyright = "Copyright (c) 2004 - 2012 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";
@@ -72,8 +72,8 @@ public class Model5FactoryImpl extends EFactoryImpl implements Model5Factory
   }
 
   /**
-   * 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 Model5FactoryImpl()
@@ -83,7 +83,6 @@ public class Model5FactoryImpl extends EFactoryImpl implements Model5Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -119,6 +118,10 @@ public class Model5FactoryImpl extends EFactoryImpl implements Model5Factory
       return createGenListOfChar();
     case Model5Package.GEN_LIST_OF_INT_ARRAY:
       return createGenListOfIntArray();
+    case Model5Package.PARENT:
+      return createParent();
+    case Model5Package.CHILD:
+      return createChild();
     default:
       throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
     }
@@ -126,7 +129,6 @@ public class Model5FactoryImpl extends EFactoryImpl implements Model5Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -143,7 +145,6 @@ public class Model5FactoryImpl extends EFactoryImpl implements Model5Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -160,7 +161,6 @@ public class Model5FactoryImpl extends EFactoryImpl implements Model5Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public TestFeatureMap createTestFeatureMap()
@@ -171,7 +171,6 @@ public class Model5FactoryImpl extends EFactoryImpl implements Model5Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public Manager createManager()
@@ -182,7 +181,6 @@ public class Model5FactoryImpl extends EFactoryImpl implements Model5Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public Doctor createDoctor()
@@ -193,7 +191,6 @@ public class Model5FactoryImpl extends EFactoryImpl implements Model5Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public GenListOfString createGenListOfString()
@@ -204,7 +201,6 @@ public class Model5FactoryImpl extends EFactoryImpl implements Model5Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public GenListOfInt createGenListOfInt()
@@ -215,7 +211,6 @@ public class Model5FactoryImpl extends EFactoryImpl implements Model5Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public GenListOfInteger createGenListOfInteger()
@@ -226,7 +221,6 @@ public class Model5FactoryImpl extends EFactoryImpl implements Model5Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public GenListOfLong createGenListOfLong()
@@ -237,7 +231,6 @@ public class Model5FactoryImpl extends EFactoryImpl implements Model5Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public GenListOfBoolean createGenListOfBoolean()
@@ -248,7 +241,6 @@ public class Model5FactoryImpl extends EFactoryImpl implements Model5Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public GenListOfShort createGenListOfShort()
@@ -259,7 +251,6 @@ public class Model5FactoryImpl extends EFactoryImpl implements Model5Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public GenListOfFloat createGenListOfFloat()
@@ -270,7 +261,6 @@ public class Model5FactoryImpl extends EFactoryImpl implements Model5Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public GenListOfDouble createGenListOfDouble()
@@ -281,7 +271,6 @@ public class Model5FactoryImpl extends EFactoryImpl implements Model5Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public GenListOfDate createGenListOfDate()
@@ -292,7 +281,6 @@ public class Model5FactoryImpl extends EFactoryImpl implements Model5Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public GenListOfChar createGenListOfChar()
@@ -303,7 +291,6 @@ public class Model5FactoryImpl extends EFactoryImpl implements Model5Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public GenListOfIntArray createGenListOfIntArray()
@@ -313,10 +300,31 @@ public class Model5FactoryImpl extends EFactoryImpl implements Model5Factory
   }
 
   /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
    * @generated
    */
+  public Parent createParent()
+  {
+    ParentImpl parent = new ParentImpl();
+    return parent;
+  }
+
+  /**
+  	 * <!-- begin-user-doc -->
+  	 * <!-- end-user-doc -->
+  	 * @generated
+  	 */
+  public Child createChild()
+  {
+    ChildImpl child = new ChildImpl();
+    return child;
+  }
+
+  /**
+  	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+  	 * @generated
+  	 */
   public int[] createIntArrayFromString(EDataType eDataType, String initialValue)
   {
     return (int[])super.createFromString(initialValue);
@@ -324,7 +332,6 @@ public class Model5FactoryImpl extends EFactoryImpl implements Model5Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public String convertIntArrayToString(EDataType eDataType, Object instanceValue)
@@ -334,7 +341,6 @@ public class Model5FactoryImpl extends EFactoryImpl implements Model5Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public Model5Package getModel5Package()
@@ -344,7 +350,6 @@ public class Model5FactoryImpl extends EFactoryImpl implements Model5Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @deprecated
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/Model5PackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/Model5PackageImpl.java
index 2490f3ee9d..b1b94089d2 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/Model5PackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/Model5PackageImpl.java
@@ -12,6 +12,7 @@ package org.eclipse.emf.cdo.tests.legacy.model5.impl;
 
 import org.eclipse.emf.cdo.tests.legacy.model5.Model5Factory;
 import org.eclipse.emf.cdo.tests.legacy.model5.Model5Package;
+import org.eclipse.emf.cdo.tests.model5.Child;
 import org.eclipse.emf.cdo.tests.model5.Doctor;
 import org.eclipse.emf.cdo.tests.model5.GenListOfBoolean;
 import org.eclipse.emf.cdo.tests.model5.GenListOfChar;
@@ -25,6 +26,7 @@ import org.eclipse.emf.cdo.tests.model5.GenListOfLong;
 import org.eclipse.emf.cdo.tests.model5.GenListOfShort;
 import org.eclipse.emf.cdo.tests.model5.GenListOfString;
 import org.eclipse.emf.cdo.tests.model5.Manager;
+import org.eclipse.emf.cdo.tests.model5.Parent;
 import org.eclipse.emf.cdo.tests.model5.TestFeatureMap;
 
 import org.eclipse.emf.ecore.EAttribute;
@@ -36,121 +38,118 @@ import org.eclipse.emf.ecore.impl.EPackageImpl;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!-- end-user-doc -->
- * 
  * @generated
  */
 public class Model5PackageImpl extends EPackageImpl implements Model5Package
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public static final String copyright = "Copyright (c) 2004 - 2012 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
    */
   private EClass testFeatureMapEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private EClass managerEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private EClass doctorEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private EClass genListOfStringEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private EClass genListOfIntEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private EClass genListOfIntegerEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private EClass genListOfLongEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private EClass genListOfBooleanEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private EClass genListOfShortEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private EClass genListOfFloatEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private EClass genListOfDoubleEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private EClass genListOfDateEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private EClass genListOfCharEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private EClass genListOfIntArrayEClass = null;
 
   /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
    * @generated
    */
+  private EClass parentEClass = null;
+
+  /**
+  	 * <!-- begin-user-doc -->
+  	 * <!-- end-user-doc -->
+  	 * @generated
+  	 */
+  private EClass childEClass = null;
+
+  /**
+  	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+  	 * @generated
+  	 */
   private EDataType intArrayEDataType = null;
 
   /**
@@ -173,18 +172,17 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
 
   /**
    * <!-- 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.
-   * <p>
-   * This method is used to initialize {@link Model5Package#eINSTANCE} when that field is accessed. Clients should not
-   * invoke it directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
    * 
+   * <p>This method is used to initialize {@link Model5Package#eINSTANCE} when that field is accessed.
+   * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
    * @see #eNS_URI
    * @see #createPackageContents()
    * @see #initializePackageContents()
@@ -217,7 +215,6 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EClass getTestFeatureMap()
@@ -227,7 +224,6 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EReference getTestFeatureMap_Managers()
@@ -237,7 +233,6 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EReference getTestFeatureMap_Doctors()
@@ -247,7 +242,6 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EAttribute getTestFeatureMap_People()
@@ -257,7 +251,6 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EClass getManager()
@@ -267,7 +260,6 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EClass getDoctor()
@@ -277,7 +269,6 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EClass getGenListOfString()
@@ -287,7 +278,6 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EAttribute getGenListOfString_Elements()
@@ -297,7 +287,6 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EClass getGenListOfInt()
@@ -307,7 +296,6 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EAttribute getGenListOfInt_Elements()
@@ -317,7 +305,6 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EClass getGenListOfInteger()
@@ -327,7 +314,6 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EAttribute getGenListOfInteger_Elements()
@@ -337,7 +323,6 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EClass getGenListOfLong()
@@ -347,7 +332,6 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EAttribute getGenListOfLong_Elements()
@@ -357,7 +341,6 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EClass getGenListOfBoolean()
@@ -367,7 +350,6 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EAttribute getGenListOfBoolean_Elements()
@@ -377,7 +359,6 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EClass getGenListOfShort()
@@ -387,7 +368,6 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EAttribute getGenListOfShort_Elements()
@@ -397,7 +377,6 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EClass getGenListOfFloat()
@@ -407,7 +386,6 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EAttribute getGenListOfFloat_Elements()
@@ -417,7 +395,6 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EClass getGenListOfDouble()
@@ -427,7 +404,6 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EAttribute getGenListOfDouble_Elements()
@@ -437,7 +413,6 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EClass getGenListOfDate()
@@ -447,7 +422,6 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EAttribute getGenListOfDate_Elements()
@@ -457,7 +431,6 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EClass getGenListOfChar()
@@ -467,7 +440,6 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EAttribute getGenListOfChar_Elements()
@@ -477,7 +449,6 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EClass getGenListOfIntArray()
@@ -487,7 +458,6 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EAttribute getGenListOfIntArray_Elements()
@@ -496,10 +466,69 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
   }
 
   /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
    * @generated
    */
+  public EClass getParent()
+  {
+    return parentEClass;
+  }
+
+  /**
+  	 * <!-- begin-user-doc -->
+  	 * <!-- end-user-doc -->
+  	 * @generated
+  	 */
+  public EReference getParent_Children()
+  {
+    return (EReference)parentEClass.getEStructuralFeatures().get(0);
+  }
+
+  /**
+  	 * <!-- begin-user-doc -->
+  	 * <!-- end-user-doc -->
+  	 * @generated
+  	 */
+  public EReference getParent_Favourite()
+  {
+    return (EReference)parentEClass.getEStructuralFeatures().get(1);
+  }
+
+  /**
+  	 * <!-- begin-user-doc -->
+  	 * <!-- end-user-doc -->
+  	 * @generated
+  	 */
+  public EClass getChild()
+  {
+    return childEClass;
+  }
+
+  /**
+  	 * <!-- begin-user-doc -->
+  	 * <!-- end-user-doc -->
+  	 * @generated
+  	 */
+  public EReference getChild_Parent()
+  {
+    return (EReference)childEClass.getEStructuralFeatures().get(0);
+  }
+
+  /**
+  	 * <!-- begin-user-doc -->
+  	 * <!-- end-user-doc -->
+  	 * @generated
+  	 */
+  public EReference getChild_PreferredBy()
+  {
+    return (EReference)childEClass.getEStructuralFeatures().get(1);
+  }
+
+  /**
+  	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+  	 * @generated
+  	 */
   public EDataType getIntArray()
   {
     return intArrayEDataType;
@@ -507,7 +536,6 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public Model5Factory getModel5Factory()
@@ -517,15 +545,14 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
 
   /**
    * <!-- 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()
@@ -577,21 +604,28 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
     genListOfIntArrayEClass = createEClass(GEN_LIST_OF_INT_ARRAY);
     createEAttribute(genListOfIntArrayEClass, GEN_LIST_OF_INT_ARRAY__ELEMENTS);
 
+    parentEClass = createEClass(PARENT);
+    createEReference(parentEClass, PARENT__CHILDREN);
+    createEReference(parentEClass, PARENT__FAVOURITE);
+
+    childEClass = createEClass(CHILD);
+    createEReference(childEClass, CHILD__PARENT);
+    createEReference(childEClass, CHILD__PREFERRED_BY);
+
     // Create data types
     intArrayEDataType = createEDataType(INT_ARRAY);
   }
 
   /**
    * <!-- 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()
@@ -690,6 +724,22 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
         GenListOfIntArray.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
         !IS_DERIVED, IS_ORDERED);
 
+    initEClass(parentEClass, Parent.class, "Parent", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getParent_Children(), this.getChild(), this.getChild_Parent(), "children", null, 0, -1,
+        Parent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getParent_Favourite(), this.getChild(), this.getChild_PreferredBy(), "favourite", null, 0, 1,
+        Parent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(childEClass, Child.class, "Child", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getChild_Parent(), this.getParent(), this.getParent_Children(), "parent", null, 0, 1, Child.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+        !IS_DERIVED, IS_ORDERED);
+    initEReference(getChild_PreferredBy(), this.getParent(), this.getParent_Favourite(), "preferredBy", null, 0, 1,
+        Child.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
     // Initialize data types
     initEDataType(intArrayEDataType, int[].class, "IntArray", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
 
@@ -702,9 +752,9 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
   }
 
   /**
-   * Initializes the annotations for <b>http:///org/eclipse/emf/ecore/util/ExtendedMetaData</b>. <!-- begin-user-doc -->
+   * Initializes the annotations for <b>http:///org/eclipse/emf/ecore/util/ExtendedMetaData</b>.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * 
    * @generated
    */
   protected void createExtendedMetaDataAnnotations()
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/ParentImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/ParentImpl.java
new file mode 100644
index 0000000000..1c356e0773
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/ParentImpl.java
@@ -0,0 +1,319 @@
+/*
+ * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Christian W. Damus (CEA) - initial API and implementation
+ */
+package org.eclipse.emf.cdo.tests.legacy.model5.impl;
+
+import org.eclipse.emf.cdo.tests.legacy.model5.Model5Package;
+import org.eclipse.emf.cdo.tests.model5.Child;
+import org.eclipse.emf.cdo.tests.model5.Parent;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.EObjectImpl;
+import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+
+import java.util.Collection;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Parent</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.eclipse.emf.cdo.tests.legacy.model5.impl.ParentImpl#getChildren <em>Children</em>}</li>
+ *   <li>{@link org.eclipse.emf.cdo.tests.legacy.model5.impl.ParentImpl#getFavourite <em>Favourite</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class ParentImpl extends EObjectImpl implements Parent
+{
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public static final String copyright = "Copyright (c) 2004 - 2012 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";
+
+  /**
+   * The cached value of the '{@link #getChildren() <em>Children</em>}' containment reference list.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getChildren()
+   * @generated
+   * @ordered
+   */
+  protected EList<Child> children;
+
+  /**
+   * The cached value of the '{@link #getFavourite() <em>Favourite</em>}' reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getFavourite()
+   * @generated
+   * @ordered
+   */
+  protected Child favourite;
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected ParentImpl()
+  {
+    super();
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return Model5Package.eINSTANCE.getParent();
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public EList<Child> getChildren()
+  {
+    if (children == null)
+    {
+      children = new EObjectContainmentWithInverseEList<Child>(Child.class, this, Model5Package.PARENT__CHILDREN,
+          Model5Package.CHILD__PARENT);
+    }
+    return children;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public Child getFavourite()
+  {
+    if (favourite != null && favourite.eIsProxy())
+    {
+      InternalEObject oldFavourite = (InternalEObject)favourite;
+      favourite = (Child)eResolveProxy(oldFavourite);
+      if (favourite != oldFavourite)
+      {
+        if (eNotificationRequired())
+        {
+          eNotify(new ENotificationImpl(this, Notification.RESOLVE, Model5Package.PARENT__FAVOURITE, oldFavourite,
+              favourite));
+        }
+      }
+    }
+    return favourite;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public Child basicGetFavourite()
+  {
+    return favourite;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public NotificationChain basicSetFavourite(Child newFavourite, NotificationChain msgs)
+  {
+    Child oldFavourite = favourite;
+    favourite = newFavourite;
+    if (eNotificationRequired())
+    {
+      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, Model5Package.PARENT__FAVOURITE,
+          oldFavourite, newFavourite);
+      if (msgs == null)
+      {
+        msgs = notification;
+      }
+      else
+      {
+        msgs.add(notification);
+      }
+    }
+    return msgs;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public void setFavourite(Child newFavourite)
+  {
+    if (newFavourite != favourite)
+    {
+      NotificationChain msgs = null;
+      if (favourite != null)
+      {
+        msgs = ((InternalEObject)favourite).eInverseRemove(this, Model5Package.CHILD__PREFERRED_BY, Child.class, msgs);
+      }
+      if (newFavourite != null)
+      {
+        msgs = ((InternalEObject)newFavourite).eInverseAdd(this, Model5Package.CHILD__PREFERRED_BY, Child.class, msgs);
+      }
+      msgs = basicSetFavourite(newFavourite, msgs);
+      if (msgs != null)
+      {
+        msgs.dispatch();
+      }
+    }
+    else if (eNotificationRequired())
+    {
+      eNotify(new ENotificationImpl(this, Notification.SET, Model5Package.PARENT__FAVOURITE, newFavourite, newFavourite));
+    }
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @SuppressWarnings("unchecked")
+  @Override
+  public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs)
+  {
+    switch (featureID)
+    {
+    case Model5Package.PARENT__CHILDREN:
+      return ((InternalEList<InternalEObject>)(InternalEList<?>)getChildren()).basicAdd(otherEnd, msgs);
+    case Model5Package.PARENT__FAVOURITE:
+      if (favourite != null)
+      {
+        msgs = ((InternalEObject)favourite).eInverseRemove(this, Model5Package.CHILD__PREFERRED_BY, Child.class, msgs);
+      }
+      return basicSetFavourite((Child)otherEnd, msgs);
+    }
+    return super.eInverseAdd(otherEnd, featureID, msgs);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
+  {
+    switch (featureID)
+    {
+    case Model5Package.PARENT__CHILDREN:
+      return ((InternalEList<?>)getChildren()).basicRemove(otherEnd, msgs);
+    case Model5Package.PARENT__FAVOURITE:
+      return basicSetFavourite(null, msgs);
+    }
+    return super.eInverseRemove(otherEnd, featureID, msgs);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public Object eGet(int featureID, boolean resolve, boolean coreType)
+  {
+    switch (featureID)
+    {
+    case Model5Package.PARENT__CHILDREN:
+      return getChildren();
+    case Model5Package.PARENT__FAVOURITE:
+      if (resolve)
+      {
+        return getFavourite();
+      }
+      return basicGetFavourite();
+    }
+    return super.eGet(featureID, resolve, coreType);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @SuppressWarnings("unchecked")
+  @Override
+  public void eSet(int featureID, Object newValue)
+  {
+    switch (featureID)
+    {
+    case Model5Package.PARENT__CHILDREN:
+      getChildren().clear();
+      getChildren().addAll((Collection<? extends Child>)newValue);
+      return;
+    case Model5Package.PARENT__FAVOURITE:
+      setFavourite((Child)newValue);
+      return;
+    }
+    super.eSet(featureID, newValue);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void eUnset(int featureID)
+  {
+    switch (featureID)
+    {
+    case Model5Package.PARENT__CHILDREN:
+      getChildren().clear();
+      return;
+    case Model5Package.PARENT__FAVOURITE:
+      setFavourite((Child)null);
+      return;
+    }
+    super.eUnset(featureID);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public boolean eIsSet(int featureID)
+  {
+    switch (featureID)
+    {
+    case Model5Package.PARENT__CHILDREN:
+      return children != null && !children.isEmpty();
+    case Model5Package.PARENT__FAVOURITE:
+      return favourite != null;
+    }
+    return super.eIsSet(featureID);
+  }
+
+} // ParentImpl
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/TestFeatureMapImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/TestFeatureMapImpl.java
index e5d7ff14d8..e327968e32 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/TestFeatureMapImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/TestFeatureMapImpl.java
@@ -45,15 +45,14 @@ public class TestFeatureMapImpl extends EObjectImpl implements TestFeatureMap
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public static final String copyright = "Copyright (c) 2004 - 2012 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";
 
   /**
-   * The cached value of the '{@link #getManagers() <em>Managers</em>}' reference list. <!-- begin-user-doc --> <!--
+   * The cached value of the '{@link #getManagers() <em>Managers</em>}' reference list.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @see #getManagers()
    * @generated
    * @ordered
@@ -61,9 +60,9 @@ public class TestFeatureMapImpl extends EObjectImpl implements TestFeatureMap
   protected EList<Manager> managers;
 
   /**
-   * The cached value of the '{@link #getDoctors() <em>Doctors</em>}' reference list. <!-- begin-user-doc --> <!--
+   * The cached value of the '{@link #getDoctors() <em>Doctors</em>}' reference list.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @see #getDoctors()
    * @generated
    * @ordered
@@ -71,9 +70,9 @@ public class TestFeatureMapImpl extends EObjectImpl implements TestFeatureMap
   protected EList<Doctor> doctors;
 
   /**
-   * The cached value of the '{@link #getPeople() <em>People</em>}' attribute list. <!-- begin-user-doc --> <!--
+   * The cached value of the '{@link #getPeople() <em>People</em>}' attribute list.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @see #getPeople()
    * @generated
    * @ordered
@@ -82,7 +81,6 @@ public class TestFeatureMapImpl extends EObjectImpl implements TestFeatureMap
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   protected TestFeatureMapImpl()
@@ -92,7 +90,6 @@ public class TestFeatureMapImpl extends EObjectImpl implements TestFeatureMap
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -103,7 +100,6 @@ public class TestFeatureMapImpl extends EObjectImpl implements TestFeatureMap
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EList<Manager> getManagers()
@@ -117,7 +113,6 @@ public class TestFeatureMapImpl extends EObjectImpl implements TestFeatureMap
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EList<Doctor> getDoctors()
@@ -131,7 +126,6 @@ public class TestFeatureMapImpl extends EObjectImpl implements TestFeatureMap
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public FeatureMap getPeople()
@@ -145,7 +139,6 @@ public class TestFeatureMapImpl extends EObjectImpl implements TestFeatureMap
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -161,7 +154,6 @@ public class TestFeatureMapImpl extends EObjectImpl implements TestFeatureMap
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -183,7 +175,6 @@ public class TestFeatureMapImpl extends EObjectImpl implements TestFeatureMap
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @SuppressWarnings("unchecked")
@@ -209,7 +200,6 @@ public class TestFeatureMapImpl extends EObjectImpl implements TestFeatureMap
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -232,7 +222,6 @@ public class TestFeatureMapImpl extends EObjectImpl implements TestFeatureMap
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -252,7 +241,6 @@ public class TestFeatureMapImpl extends EObjectImpl implements TestFeatureMap
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/Child.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/Child.java
new file mode 100644
index 0000000000..7f594ff83d
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/Child.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *    Christian W. Damus (CEA) - initial API and implementation
+ */
+package org.eclipse.emf.cdo.tests.model5;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Child</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.eclipse.emf.cdo.tests.model5.Child#getParent <em>Parent</em>}</li>
+ *   <li>{@link org.eclipse.emf.cdo.tests.model5.Child#getPreferredBy <em>Preferred By</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.emf.cdo.tests.model5.Model5Package#getChild()
+ * @model
+ * @generated
+ */
+public interface Child extends EObject
+{
+  /**
+   * Returns the value of the '<em><b>Parent</b></em>' container reference.
+   * It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.model5.Parent#getChildren <em>Children</em>}'.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Parent</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>Parent</em>' container reference.
+   * @see #setParent(Parent)
+   * @see org.eclipse.emf.cdo.tests.model5.Model5Package#getChild_Parent()
+   * @see org.eclipse.emf.cdo.tests.model5.Parent#getChildren
+   * @model opposite="children" transient="false"
+   * @generated
+   */
+  Parent getParent();
+
+  /**
+   * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model5.Child#getParent <em>Parent</em>}' container reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Parent</em>' container reference.
+   * @see #getParent()
+   * @generated
+   */
+  void setParent(Parent value);
+
+  /**
+   * Returns the value of the '<em><b>Preferred By</b></em>' reference.
+   * It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.model5.Parent#getFavourite <em>Favourite</em>}'.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Preferred By</em>' reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Preferred By</em>' reference.
+   * @see #setPreferredBy(Parent)
+   * @see org.eclipse.emf.cdo.tests.model5.Model5Package#getChild_PreferredBy()
+   * @see org.eclipse.emf.cdo.tests.model5.Parent#getFavourite
+   * @model opposite="favourite"
+   * @generated
+   */
+  Parent getPreferredBy();
+
+  /**
+   * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model5.Child#getPreferredBy <em>Preferred By</em>}' reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Preferred By</em>' reference.
+   * @see #getPreferredBy()
+   * @generated
+   */
+  void setPreferredBy(Parent value);
+
+} // Child
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/Doctor.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/Doctor.java
index 7372b79e64..e82a119252 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/Doctor.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/Doctor.java
@@ -14,18 +14,12 @@ import org.eclipse.emf.ecore.EObject;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>Doctor</b></em>'. <!-- end-user-doc -->
- * 
+ *
+ *
  * @see org.eclipse.emf.cdo.tests.model5.Model5Package#getDoctor()
  * @model
  * @generated
  */
 public interface Doctor extends EObject
 {
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  String copyright = "Copyright (c) 2004 - 2012 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";
 } // Doctor
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfBoolean.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfBoolean.java
index 39ce2c28c9..e9b86dc65c 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfBoolean.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfBoolean.java
@@ -30,21 +30,14 @@ import org.eclipse.emf.ecore.EObject;
 public interface GenListOfBoolean extends EObject
 {
   /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  String copyright = "Copyright (c) 2004 - 2012 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";
-
-  /**
-   * Returns the value of the '<em><b>Elements</b></em>' attribute list. The list contents are of type
-   * {@link java.lang.Boolean}. <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Elements</b></em>' attribute list.
+   * The list contents are of type {@link java.lang.Boolean}.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Elements</em>' attribute list isn't clear, there really should be more of a description
    * here...
    * </p>
    * <!-- end-user-doc -->
-   * 
    * @return the value of the '<em>Elements</em>' attribute list.
    * @see org.eclipse.emf.cdo.tests.model5.Model5Package#getGenListOfBoolean_Elements()
    * @model unique="false"
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfChar.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfChar.java
index 6613bae12e..223d74a08f 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfChar.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfChar.java
@@ -30,21 +30,14 @@ import org.eclipse.emf.ecore.EObject;
 public interface GenListOfChar extends EObject
 {
   /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  String copyright = "Copyright (c) 2004 - 2012 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";
-
-  /**
-   * Returns the value of the '<em><b>Elements</b></em>' attribute list. The list contents are of type
-   * {@link java.lang.Character}. <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Elements</b></em>' attribute list.
+   * The list contents are of type {@link java.lang.Character}.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Elements</em>' attribute list isn't clear, there really should be more of a description
    * here...
    * </p>
    * <!-- end-user-doc -->
-   * 
    * @return the value of the '<em>Elements</em>' attribute list.
    * @see org.eclipse.emf.cdo.tests.model5.Model5Package#getGenListOfChar_Elements()
    * @model
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfDate.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfDate.java
index a3cb44cf10..2defe86830 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfDate.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfDate.java
@@ -32,21 +32,14 @@ import java.util.Date;
 public interface GenListOfDate extends EObject
 {
   /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  String copyright = "Copyright (c) 2004 - 2012 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";
-
-  /**
-   * Returns the value of the '<em><b>Elements</b></em>' attribute list. The list contents are of type
-   * {@link java.util.Date}. <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Elements</b></em>' attribute list.
+   * The list contents are of type {@link java.util.Date}.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Elements</em>' attribute list isn't clear, there really should be more of a description
    * here...
    * </p>
    * <!-- end-user-doc -->
-   * 
    * @return the value of the '<em>Elements</em>' attribute list.
    * @see org.eclipse.emf.cdo.tests.model5.Model5Package#getGenListOfDate_Elements()
    * @model
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfDouble.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfDouble.java
index 414aaed6a5..772df24f06 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfDouble.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfDouble.java
@@ -30,21 +30,14 @@ import org.eclipse.emf.ecore.EObject;
 public interface GenListOfDouble extends EObject
 {
   /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  String copyright = "Copyright (c) 2004 - 2012 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";
-
-  /**
-   * Returns the value of the '<em><b>Elements</b></em>' attribute list. The list contents are of type
-   * {@link java.lang.Double}. <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Elements</b></em>' attribute list.
+   * The list contents are of type {@link java.lang.Double}.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Elements</em>' attribute list isn't clear, there really should be more of a description
    * here...
    * </p>
    * <!-- end-user-doc -->
-   * 
    * @return the value of the '<em>Elements</em>' attribute list.
    * @see org.eclipse.emf.cdo.tests.model5.Model5Package#getGenListOfDouble_Elements()
    * @model
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfFloat.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfFloat.java
index e3fa5e9e41..884e9b54c9 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfFloat.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfFloat.java
@@ -30,21 +30,14 @@ import org.eclipse.emf.ecore.EObject;
 public interface GenListOfFloat extends EObject
 {
   /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  String copyright = "Copyright (c) 2004 - 2012 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";
-
-  /**
-   * Returns the value of the '<em><b>Elements</b></em>' attribute list. The list contents are of type
-   * {@link java.lang.Float}. <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Elements</b></em>' attribute list.
+   * The list contents are of type {@link java.lang.Float}.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Elements</em>' attribute list isn't clear, there really should be more of a description
    * here...
    * </p>
    * <!-- end-user-doc -->
-   * 
    * @return the value of the '<em>Elements</em>' attribute list.
    * @see org.eclipse.emf.cdo.tests.model5.Model5Package#getGenListOfFloat_Elements()
    * @model
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfInt.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfInt.java
index ea040831a2..9d703f0d9b 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfInt.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfInt.java
@@ -15,13 +15,14 @@ import org.eclipse.emf.ecore.EObject;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>Gen List Of Int</b></em>'. <!-- end-user-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.eclipse.emf.cdo.tests.model5.GenListOfInt#getElements <em>Elements</em>}</li>
+ *   <li>{@link org.eclipse.emf.cdo.tests.model5.GenListOfInt#getElements <em>Elements</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.emf.cdo.tests.model5.Model5Package#getGenListOfInt()
  * @model
  * @generated
@@ -29,21 +30,14 @@ import org.eclipse.emf.ecore.EObject;
 public interface GenListOfInt extends EObject
 {
   /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  String copyright = "Copyright (c) 2004 - 2012 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";
-
-  /**
-   * Returns the value of the '<em><b>Elements</b></em>' attribute list. The list contents are of type
-   * {@link java.lang.Integer}. <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Elements</b></em>' attribute list.
+   * The list contents are of type {@link java.lang.Integer}.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Elements</em>' attribute list isn't clear, there really should be more of a description
    * here...
    * </p>
    * <!-- end-user-doc -->
-   * 
    * @return the value of the '<em>Elements</em>' attribute list.
    * @see org.eclipse.emf.cdo.tests.model5.Model5Package#getGenListOfInt_Elements()
    * @model
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfIntArray.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfIntArray.java
index 2ab19fd81c..ac32a27e79 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfIntArray.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfIntArray.java
@@ -16,13 +16,14 @@ import org.eclipse.emf.ecore.EObject;
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>Gen List Of Int Array</b></em>'. <!--
  * end-user-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.eclipse.emf.cdo.tests.model5.GenListOfIntArray#getElements <em>Elements</em>}</li>
+ *   <li>{@link org.eclipse.emf.cdo.tests.model5.GenListOfIntArray#getElements <em>Elements</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.emf.cdo.tests.model5.Model5Package#getGenListOfIntArray()
  * @model
  * @generated
@@ -30,21 +31,14 @@ import org.eclipse.emf.ecore.EObject;
 public interface GenListOfIntArray extends EObject
 {
   /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  String copyright = "Copyright (c) 2004 - 2012 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";
-
-  /**
-   * Returns the value of the '<em><b>Elements</b></em>' attribute list. The list contents are of type {@link int}[].
+   * Returns the value of the '<em><b>Elements</b></em>' attribute list.
+   * The list contents are of type {@link int}[].
    * <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Elements</em>' attribute list isn't clear, there really should be more of a description
    * here...
    * </p>
    * <!-- end-user-doc -->
-   * 
    * @return the value of the '<em>Elements</em>' attribute list.
    * @see org.eclipse.emf.cdo.tests.model5.Model5Package#getGenListOfIntArray_Elements()
    * @model dataType="org.eclipse.emf.cdo.tests.model5.IntArray"
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfInteger.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfInteger.java
index 141faf69d1..4061fa2f26 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfInteger.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfInteger.java
@@ -30,21 +30,14 @@ import org.eclipse.emf.ecore.EObject;
 public interface GenListOfInteger extends EObject
 {
   /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  String copyright = "Copyright (c) 2004 - 2012 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";
-
-  /**
-   * Returns the value of the '<em><b>Elements</b></em>' attribute list. The list contents are of type
-   * {@link java.lang.Integer}. <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Elements</b></em>' attribute list.
+   * The list contents are of type {@link java.lang.Integer}.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Elements</em>' attribute list isn't clear, there really should be more of a description
    * here...
    * </p>
    * <!-- end-user-doc -->
-   * 
    * @return the value of the '<em>Elements</em>' attribute list.
    * @see org.eclipse.emf.cdo.tests.model5.Model5Package#getGenListOfInteger_Elements()
    * @model
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfLong.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfLong.java
index e6852a6080..529cb6f6a8 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfLong.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfLong.java
@@ -30,21 +30,14 @@ import org.eclipse.emf.ecore.EObject;
 public interface GenListOfLong extends EObject
 {
   /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  String copyright = "Copyright (c) 2004 - 2012 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";
-
-  /**
-   * Returns the value of the '<em><b>Elements</b></em>' attribute list. The list contents are of type
-   * {@link java.lang.Long}. <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Elements</b></em>' attribute list.
+   * The list contents are of type {@link java.lang.Long}.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Elements</em>' attribute list isn't clear, there really should be more of a description
    * here...
    * </p>
    * <!-- end-user-doc -->
-   * 
    * @return the value of the '<em>Elements</em>' attribute list.
    * @see org.eclipse.emf.cdo.tests.model5.Model5Package#getGenListOfLong_Elements()
    * @model
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfShort.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfShort.java
index 7465048e7a..da070672d8 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfShort.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfShort.java
@@ -30,21 +30,14 @@ import org.eclipse.emf.ecore.EObject;
 public interface GenListOfShort extends EObject
 {
   /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  String copyright = "Copyright (c) 2004 - 2012 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";
-
-  /**
-   * Returns the value of the '<em><b>Elements</b></em>' attribute list. The list contents are of type
-   * {@link java.lang.Short}. <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Elements</b></em>' attribute list.
+   * The list contents are of type {@link java.lang.Short}.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Elements</em>' attribute list isn't clear, there really should be more of a description
    * here...
    * </p>
    * <!-- end-user-doc -->
-   * 
    * @return the value of the '<em>Elements</em>' attribute list.
    * @see org.eclipse.emf.cdo.tests.model5.Model5Package#getGenListOfShort_Elements()
    * @model
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfString.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfString.java
index e61196d9db..45f324babc 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfString.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/GenListOfString.java
@@ -30,21 +30,14 @@ import org.eclipse.emf.ecore.EObject;
 public interface GenListOfString extends EObject
 {
   /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  String copyright = "Copyright (c) 2004 - 2012 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";
-
-  /**
-   * Returns the value of the '<em><b>Elements</b></em>' attribute list. The list contents are of type
-   * {@link java.lang.String}. <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Elements</b></em>' attribute list.
+   * The list contents are of type {@link java.lang.String}.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Elements</em>' attribute list isn't clear, there really should be more of a description
    * here...
    * </p>
    * <!-- end-user-doc -->
-   * 
    * @return the value of the '<em>Elements</em>' attribute list.
    * @see org.eclipse.emf.cdo.tests.model5.Model5Package#getGenListOfString_Elements()
    * @model
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/Manager.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/Manager.java
index 8fac8afd93..d7da9b126a 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/Manager.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/Manager.java
@@ -14,18 +14,12 @@ import org.eclipse.emf.ecore.EObject;
 
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>Manager</b></em>'. <!-- end-user-doc -->
- * 
+ *
+ *
  * @see org.eclipse.emf.cdo.tests.model5.Model5Package#getManager()
  * @model
  * @generated
  */
 public interface Manager extends EObject
 {
-
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  String copyright = "Copyright (c) 2004 - 2012 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";
 } // Manager
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/Model5Factory.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/Model5Factory.java
index b0c74c554d..26ff41fcc2 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/Model5Factory.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/Model5Factory.java
@@ -15,141 +15,151 @@ 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.model5.Model5Package
  * @generated
  */
 public interface Model5Factory extends EFactory
 {
   /**
+   * The singleton instance of the factory.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  String copyright = "Copyright (c) 2004 - 2012 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";
-
-  /**
-   * The singleton instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   Model5Factory eINSTANCE = org.eclipse.emf.cdo.tests.model5.impl.Model5FactoryImpl.init();
 
   /**
-   * Returns a new object of class '<em>Test Feature Map</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns a new object of class '<em>Test Feature Map</em>'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return a new object of class '<em>Test Feature Map</em>'.
    * @generated
    */
   TestFeatureMap createTestFeatureMap();
 
   /**
-   * Returns a new object of class '<em>Manager</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns a new object of class '<em>Manager</em>'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return a new object of class '<em>Manager</em>'.
    * @generated
    */
   Manager createManager();
 
   /**
-   * Returns a new object of class '<em>Doctor</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns a new object of class '<em>Doctor</em>'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return a new object of class '<em>Doctor</em>'.
    * @generated
    */
   Doctor createDoctor();
 
   /**
-   * Returns a new object of class '<em>Gen List Of Int</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns a new object of class '<em>Gen List Of Int</em>'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return a new object of class '<em>Gen List Of Int</em>'.
    * @generated
    */
   GenListOfInt createGenListOfInt();
 
   /**
-   * Returns a new object of class '<em>Gen List Of Integer</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns a new object of class '<em>Gen List Of Integer</em>'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return a new object of class '<em>Gen List Of Integer</em>'.
    * @generated
    */
   GenListOfInteger createGenListOfInteger();
 
   /**
-   * Returns a new object of class '<em>Gen List Of Long</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns a new object of class '<em>Gen List Of Long</em>'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return a new object of class '<em>Gen List Of Long</em>'.
    * @generated
    */
   GenListOfLong createGenListOfLong();
 
   /**
-   * Returns a new object of class '<em>Gen List Of Boolean</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns a new object of class '<em>Gen List Of Boolean</em>'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return a new object of class '<em>Gen List Of Boolean</em>'.
    * @generated
    */
   GenListOfBoolean createGenListOfBoolean();
 
   /**
-   * Returns a new object of class '<em>Gen List Of Short</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns a new object of class '<em>Gen List Of Short</em>'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return a new object of class '<em>Gen List Of Short</em>'.
    * @generated
    */
   GenListOfShort createGenListOfShort();
 
   /**
-   * Returns a new object of class '<em>Gen List Of Float</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns a new object of class '<em>Gen List Of Float</em>'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return a new object of class '<em>Gen List Of Float</em>'.
    * @generated
    */
   GenListOfFloat createGenListOfFloat();
 
   /**
-   * Returns a new object of class '<em>Gen List Of Double</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns a new object of class '<em>Gen List Of Double</em>'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return a new object of class '<em>Gen List Of Double</em>'.
    * @generated
    */
   GenListOfDouble createGenListOfDouble();
 
   /**
-   * Returns a new object of class '<em>Gen List Of Date</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns a new object of class '<em>Gen List Of Date</em>'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return a new object of class '<em>Gen List Of Date</em>'.
    * @generated
    */
   GenListOfDate createGenListOfDate();
 
   /**
-   * Returns a new object of class '<em>Gen List Of Char</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns a new object of class '<em>Gen List Of Char</em>'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return a new object of class '<em>Gen List Of Char</em>'.
    * @generated
    */
   GenListOfChar createGenListOfChar();
 
   /**
-   * Returns a new object of class '<em>Gen List Of Int Array</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns a new object of class '<em>Gen List Of Int Array</em>'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return a new object of class '<em>Gen List Of Int Array</em>'.
    * @generated
    */
   GenListOfIntArray createGenListOfIntArray();
 
   /**
-   * Returns a new object of class '<em>Gen List Of String</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @return a new object of class '<em>Gen List Of String</em>'.
+   * Returns a new object of class '<em>Parent</em>'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return a new object of class '<em>Parent</em>'.
    * @generated
    */
+  Parent createParent();
+
+  /**
+  	 * Returns a new object of class '<em>Child</em>'.
+  	 * <!-- begin-user-doc -->
+  	 * <!-- end-user-doc -->
+  	 * @return a new object of class '<em>Child</em>'.
+  	 * @generated
+  	 */
+  Child createChild();
+
+  /**
+  	 * Returns a new object of class '<em>Gen List Of String</em>'.
+  	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+  	 * @return a new object of class '<em>Gen List Of String</em>'.
+  	 * @generated
+  	 */
   GenListOfString createGenListOfString();
 
   /**
-   * 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.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 1f8144cca8..2be4d1a52e 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
@@ -25,7 +25,6 @@ import org.eclipse.emf.ecore.EReference;
  * <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
- * 
  * @see org.eclipse.emf.cdo.tests.model5.Model5Factory
  * @model kind="package"
  * @generated
@@ -33,44 +32,36 @@ import org.eclipse.emf.ecore.EReference;
 public interface Model5Package extends EPackage
 {
   /**
+   * The package name.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  String copyright = "Copyright (c) 2004 - 2012 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";
-
-  /**
-   * The package name. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   String eNAME = "model5";
 
   /**
-   * 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/model5/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 = "model5";
 
   /**
-   * 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
    */
   Model5Package eINSTANCE = org.eclipse.emf.cdo.tests.model5.impl.Model5PackageImpl.init();
 
   /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model5.impl.TestFeatureMapImpl
-   * <em>Test Feature Map</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The meta object id 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
@@ -78,33 +69,33 @@ public interface Model5Package extends EPackage
   int TEST_FEATURE_MAP = 0;
 
   /**
-   * The feature id for the '<em><b>Managers</b></em>' reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>Managers</b></em>' reference list.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int TEST_FEATURE_MAP__MANAGERS = 0;
 
   /**
-   * The feature id for the '<em><b>Doctors</b></em>' reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>Doctors</b></em>' reference list.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int TEST_FEATURE_MAP__DOCTORS = 1;
 
   /**
-   * The feature id for the '<em><b>People</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>People</b></em>' attribute list.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int TEST_FEATURE_MAP__PEOPLE = 2;
 
   /**
-   * The number of structural features of the '<em>Test Feature Map</em>' class. <!-- begin-user-doc --> <!--
+   * The number of structural features of the '<em>Test Feature Map</em>' class.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @generated
    * @ordered
    */
@@ -121,8 +112,8 @@ public interface Model5Package extends EPackage
   int MANAGER = 1;
 
   /**
-   * The number of structural features of the '<em>Manager</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The number of structural features of the '<em>Manager</em>' class.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
@@ -139,17 +130,16 @@ public interface Model5Package extends EPackage
   int DOCTOR = 2;
 
   /**
-   * The number of structural features of the '<em>Doctor</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The number of structural features of the '<em>Doctor</em>' class.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int DOCTOR_FEATURE_COUNT = 0;
 
   /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model5.impl.GenListOfIntImpl <em>Gen List Of Int</em>}
-   * ' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The meta object id 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
@@ -157,9 +147,8 @@ public interface Model5Package extends EPackage
   int GEN_LIST_OF_INT = 4;
 
   /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model5.impl.GenListOfIntegerImpl
-   * <em>Gen List Of Integer</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The meta object id 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
@@ -167,9 +156,8 @@ public interface Model5Package extends EPackage
   int GEN_LIST_OF_INTEGER = 5;
 
   /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model5.impl.GenListOfLongImpl
-   * <em>Gen List Of Long</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The meta object id 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
@@ -177,9 +165,8 @@ public interface Model5Package extends EPackage
   int GEN_LIST_OF_LONG = 6;
 
   /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model5.impl.GenListOfBooleanImpl
-   * <em>Gen List Of Boolean</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The meta object id 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
@@ -187,9 +174,8 @@ public interface Model5Package extends EPackage
   int GEN_LIST_OF_BOOLEAN = 7;
 
   /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model5.impl.GenListOfStringImpl
-   * <em>Gen List Of String</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The meta object id 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
@@ -197,94 +183,93 @@ public interface Model5Package extends EPackage
   int GEN_LIST_OF_STRING = 3;
 
   /**
-   * The feature id for the '<em><b>Elements</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>Elements</b></em>' attribute list.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int GEN_LIST_OF_STRING__ELEMENTS = 0;
 
   /**
-   * The number of structural features of the '<em>Gen List Of String</em>' class. <!-- begin-user-doc --> <!--
+   * The number of structural features of the '<em>Gen List Of String</em>' class.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @generated
    * @ordered
    */
   int GEN_LIST_OF_STRING_FEATURE_COUNT = 1;
 
   /**
-   * The feature id for the '<em><b>Elements</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>Elements</b></em>' attribute list.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int GEN_LIST_OF_INT__ELEMENTS = 0;
 
   /**
-   * The number of structural features of the '<em>Gen List Of Int</em>' class. <!-- begin-user-doc --> <!--
+   * The number of structural features of the '<em>Gen List Of Int</em>' class.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @generated
    * @ordered
    */
   int GEN_LIST_OF_INT_FEATURE_COUNT = 1;
 
   /**
-   * The feature id for the '<em><b>Elements</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>Elements</b></em>' attribute list.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int GEN_LIST_OF_INTEGER__ELEMENTS = 0;
 
   /**
-   * The number of structural features of the '<em>Gen List Of Integer</em>' class. <!-- begin-user-doc --> <!--
+   * The number of structural features of the '<em>Gen List Of Integer</em>' class.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @generated
    * @ordered
    */
   int GEN_LIST_OF_INTEGER_FEATURE_COUNT = 1;
 
   /**
-   * The feature id for the '<em><b>Elements</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>Elements</b></em>' attribute list.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int GEN_LIST_OF_LONG__ELEMENTS = 0;
 
   /**
-   * The number of structural features of the '<em>Gen List Of Long</em>' class. <!-- begin-user-doc --> <!--
+   * The number of structural features of the '<em>Gen List Of Long</em>' class.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @generated
    * @ordered
    */
   int GEN_LIST_OF_LONG_FEATURE_COUNT = 1;
 
   /**
-   * The feature id for the '<em><b>Elements</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>Elements</b></em>' attribute list.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int GEN_LIST_OF_BOOLEAN__ELEMENTS = 0;
 
   /**
-   * The number of structural features of the '<em>Gen List Of Boolean</em>' class. <!-- begin-user-doc --> <!--
+   * The number of structural features of the '<em>Gen List Of Boolean</em>' class.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @generated
    * @ordered
    */
   int GEN_LIST_OF_BOOLEAN_FEATURE_COUNT = 1;
 
   /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model5.impl.GenListOfShortImpl
-   * <em>Gen List Of Short</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The meta object id 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
@@ -292,26 +277,25 @@ public interface Model5Package extends EPackage
   int GEN_LIST_OF_SHORT = 8;
 
   /**
-   * The feature id for the '<em><b>Elements</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>Elements</b></em>' attribute list.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int GEN_LIST_OF_SHORT__ELEMENTS = 0;
 
   /**
-   * The number of structural features of the '<em>Gen List Of Short</em>' class. <!-- begin-user-doc --> <!--
+   * The number of structural features of the '<em>Gen List Of Short</em>' class.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @generated
    * @ordered
    */
   int GEN_LIST_OF_SHORT_FEATURE_COUNT = 1;
 
   /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model5.impl.GenListOfFloatImpl
-   * <em>Gen List Of Float</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The meta object id 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
@@ -319,26 +303,25 @@ public interface Model5Package extends EPackage
   int GEN_LIST_OF_FLOAT = 9;
 
   /**
-   * The feature id for the '<em><b>Elements</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>Elements</b></em>' attribute list.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int GEN_LIST_OF_FLOAT__ELEMENTS = 0;
 
   /**
-   * The number of structural features of the '<em>Gen List Of Float</em>' class. <!-- begin-user-doc --> <!--
+   * The number of structural features of the '<em>Gen List Of Float</em>' class.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @generated
    * @ordered
    */
   int GEN_LIST_OF_FLOAT_FEATURE_COUNT = 1;
 
   /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model5.impl.GenListOfDoubleImpl
-   * <em>Gen List Of Double</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The meta object id 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
@@ -346,26 +329,25 @@ public interface Model5Package extends EPackage
   int GEN_LIST_OF_DOUBLE = 10;
 
   /**
-   * The feature id for the '<em><b>Elements</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>Elements</b></em>' attribute list.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int GEN_LIST_OF_DOUBLE__ELEMENTS = 0;
 
   /**
-   * The number of structural features of the '<em>Gen List Of Double</em>' class. <!-- begin-user-doc --> <!--
+   * The number of structural features of the '<em>Gen List Of Double</em>' class.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @generated
    * @ordered
    */
   int GEN_LIST_OF_DOUBLE_FEATURE_COUNT = 1;
 
   /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model5.impl.GenListOfDateImpl
-   * <em>Gen List Of Date</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The meta object id 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
@@ -373,26 +355,25 @@ public interface Model5Package extends EPackage
   int GEN_LIST_OF_DATE = 11;
 
   /**
-   * The feature id for the '<em><b>Elements</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>Elements</b></em>' attribute list.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int GEN_LIST_OF_DATE__ELEMENTS = 0;
 
   /**
-   * The number of structural features of the '<em>Gen List Of Date</em>' class. <!-- begin-user-doc --> <!--
+   * The number of structural features of the '<em>Gen List Of Date</em>' class.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @generated
    * @ordered
    */
   int GEN_LIST_OF_DATE_FEATURE_COUNT = 1;
 
   /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model5.impl.GenListOfCharImpl
-   * <em>Gen List Of Char</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The meta object id 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
@@ -400,26 +381,25 @@ public interface Model5Package extends EPackage
   int GEN_LIST_OF_CHAR = 12;
 
   /**
-   * The feature id for the '<em><b>Elements</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>Elements</b></em>' attribute list.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int GEN_LIST_OF_CHAR__ELEMENTS = 0;
 
   /**
-   * The number of structural features of the '<em>Gen List Of Char</em>' class. <!-- begin-user-doc --> <!--
+   * The number of structural features of the '<em>Gen List Of Char</em>' class.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @generated
    * @ordered
    */
   int GEN_LIST_OF_CHAR_FEATURE_COUNT = 1;
 
   /**
-   * The meta object id 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 -->
-   * 
+   * The meta object id 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
@@ -427,34 +407,107 @@ public interface Model5Package extends EPackage
   int GEN_LIST_OF_INT_ARRAY = 13;
 
   /**
-   * The feature id for the '<em><b>Elements</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * The feature id for the '<em><b>Elements</b></em>' attribute list.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    * @ordered
    */
   int GEN_LIST_OF_INT_ARRAY__ELEMENTS = 0;
 
   /**
-   * The number of structural features of the '<em>Gen List Of Int Array</em>' class. <!-- begin-user-doc --> <!--
+   * The number of structural features of the '<em>Gen List Of Int Array</em>' class.
+   * <!-- begin-user-doc --> <!--
    * end-user-doc -->
-   * 
    * @generated
    * @ordered
    */
   int GEN_LIST_OF_INT_ARRAY_FEATURE_COUNT = 1;
 
   /**
-   * The meta object id for the '<em>Int Array</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @see org.eclipse.emf.cdo.tests.model5.impl.Model5PackageImpl#getIntArray()
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model5.impl.ParentImpl <em>Parent</em>}' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see org.eclipse.emf.cdo.tests.model5.impl.ParentImpl
+   * @see org.eclipse.emf.cdo.tests.model5.impl.Model5PackageImpl#getParent()
    * @generated
    */
-  int INT_ARRAY = 14;
+  int PARENT = 14;
 
   /**
-   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model5.TestFeatureMap
-   * <em>Test Feature Map</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+  	 * The feature id for the '<em><b>Children</b></em>' containment reference list.
+  	 * <!-- begin-user-doc -->
+  	 * <!-- end-user-doc -->
+  	 * @generated
+  	 * @ordered
+  	 */
+  int PARENT__CHILDREN = 0;
+
+  /**
+  	 * The feature id for the '<em><b>Favourite</b></em>' reference.
+  	 * <!-- begin-user-doc -->
+  	 * <!-- end-user-doc -->
+  	 * @generated
+  	 * @ordered
+  	 */
+  int PARENT__FAVOURITE = 1;
+
+  /**
+  	 * The number of structural features of the '<em>Parent</em>' class.
+  	 * <!-- begin-user-doc -->
+  	 * <!-- end-user-doc -->
+  	 * @generated
+  	 * @ordered
+  	 */
+  int PARENT_FEATURE_COUNT = 2;
+
+  /**
+  	 * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model5.impl.ChildImpl <em>Child</em>}' class.
+  	 * <!-- begin-user-doc -->
+  	 * <!-- end-user-doc -->
+  	 * @see org.eclipse.emf.cdo.tests.model5.impl.ChildImpl
+  	 * @see org.eclipse.emf.cdo.tests.model5.impl.Model5PackageImpl#getChild()
+  	 * @generated
+  	 */
+  int CHILD = 15;
+
+  /**
+  	 * The feature id for the '<em><b>Parent</b></em>' container reference.
+  	 * <!-- begin-user-doc -->
+  	 * <!-- end-user-doc -->
+  	 * @generated
+  	 * @ordered
+  	 */
+  int CHILD__PARENT = 0;
+
+  /**
+  	 * The feature id for the '<em><b>Preferred By</b></em>' reference.
+  	 * <!-- begin-user-doc -->
+  	 * <!-- end-user-doc -->
+  	 * @generated
+  	 * @ordered
+  	 */
+  int CHILD__PREFERRED_BY = 1;
+
+  /**
+  	 * The number of structural features of the '<em>Child</em>' class.
+  	 * <!-- begin-user-doc -->
+  	 * <!-- end-user-doc -->
+  	 * @generated
+  	 * @ordered
+  	 */
+  int CHILD_FEATURE_COUNT = 2;
+
+  /**
+  	 * The meta object id 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
+  	 */
+  int INT_ARRAY = 16;
+
+  /**
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model5.TestFeatureMap <em>Test Feature Map</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return the meta object for class '<em>Test Feature Map</em>'.
    * @see org.eclipse.emf.cdo.tests.model5.TestFeatureMap
    * @generated
@@ -462,9 +515,8 @@ public interface Model5Package extends EPackage
   EClass getTestFeatureMap();
 
   /**
-   * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.tests.model5.TestFeatureMap#getManagers
-   * <em>Managers</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.tests.model5.TestFeatureMap#getManagers <em>Managers</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return the meta object for the reference list '<em>Managers</em>'.
    * @see org.eclipse.emf.cdo.tests.model5.TestFeatureMap#getManagers()
    * @see #getTestFeatureMap()
@@ -473,9 +525,8 @@ public interface Model5Package extends EPackage
   EReference getTestFeatureMap_Managers();
 
   /**
-   * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.tests.model5.TestFeatureMap#getDoctors
-   * <em>Doctors</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.tests.model5.TestFeatureMap#getDoctors <em>Doctors</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return the meta object for the reference list '<em>Doctors</em>'.
    * @see org.eclipse.emf.cdo.tests.model5.TestFeatureMap#getDoctors()
    * @see #getTestFeatureMap()
@@ -484,9 +535,8 @@ public interface Model5Package extends EPackage
   EReference getTestFeatureMap_Doctors();
 
   /**
-   * Returns the meta object for the attribute list '{@link org.eclipse.emf.cdo.tests.model5.TestFeatureMap#getPeople
-   * <em>People</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns the meta object for the attribute list '{@link org.eclipse.emf.cdo.tests.model5.TestFeatureMap#getPeople <em>People</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return the meta object for the attribute list '<em>People</em>'.
    * @see org.eclipse.emf.cdo.tests.model5.TestFeatureMap#getPeople()
    * @see #getTestFeatureMap()
@@ -517,7 +567,6 @@ public interface Model5Package extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model5.GenListOfInt <em>Gen List Of Int</em>}'.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @return the meta object for class '<em>Gen List Of Int</em>'.
    * @see org.eclipse.emf.cdo.tests.model5.GenListOfInt
    * @generated
@@ -525,9 +574,8 @@ public interface Model5Package extends EPackage
   EClass getGenListOfInt();
 
   /**
-   * Returns the meta object for the attribute list '{@link org.eclipse.emf.cdo.tests.model5.GenListOfInt#getElements
-   * <em>Elements</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns the meta object for the attribute list '{@link org.eclipse.emf.cdo.tests.model5.GenListOfInt#getElements <em>Elements</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return the meta object for the attribute list '<em>Elements</em>'.
    * @see org.eclipse.emf.cdo.tests.model5.GenListOfInt#getElements()
    * @see #getGenListOfInt()
@@ -536,9 +584,8 @@ public interface Model5Package extends EPackage
   EAttribute getGenListOfInt_Elements();
 
   /**
-   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model5.GenListOfInteger
-   * <em>Gen List Of Integer</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model5.GenListOfInteger <em>Gen List Of Integer</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return the meta object for class '<em>Gen List Of Integer</em>'.
    * @see org.eclipse.emf.cdo.tests.model5.GenListOfInteger
    * @generated
@@ -546,10 +593,9 @@ public interface Model5Package extends EPackage
   EClass getGenListOfInteger();
 
   /**
-   * Returns the meta object for the attribute list '
-   * {@link org.eclipse.emf.cdo.tests.model5.GenListOfInteger#getElements <em>Elements</em>}'. <!-- begin-user-doc -->
+   * Returns the meta object for the attribute list '{@link org.eclipse.emf.cdo.tests.model5.GenListOfInteger#getElements <em>Elements</em>}'.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * 
    * @return the meta object for the attribute list '<em>Elements</em>'.
    * @see org.eclipse.emf.cdo.tests.model5.GenListOfInteger#getElements()
    * @see #getGenListOfInteger()
@@ -558,9 +604,8 @@ public interface Model5Package extends EPackage
   EAttribute getGenListOfInteger_Elements();
 
   /**
-   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model5.GenListOfLong <em>Gen List Of Long</em>}
-   * '. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model5.GenListOfLong <em>Gen List Of Long</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return the meta object for class '<em>Gen List Of Long</em>'.
    * @see org.eclipse.emf.cdo.tests.model5.GenListOfLong
    * @generated
@@ -568,9 +613,8 @@ public interface Model5Package extends EPackage
   EClass getGenListOfLong();
 
   /**
-   * Returns the meta object for the attribute list '{@link org.eclipse.emf.cdo.tests.model5.GenListOfLong#getElements
-   * <em>Elements</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns the meta object for the attribute list '{@link org.eclipse.emf.cdo.tests.model5.GenListOfLong#getElements <em>Elements</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return the meta object for the attribute list '<em>Elements</em>'.
    * @see org.eclipse.emf.cdo.tests.model5.GenListOfLong#getElements()
    * @see #getGenListOfLong()
@@ -579,9 +623,8 @@ public interface Model5Package extends EPackage
   EAttribute getGenListOfLong_Elements();
 
   /**
-   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model5.GenListOfBoolean
-   * <em>Gen List Of Boolean</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model5.GenListOfBoolean <em>Gen List Of Boolean</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return the meta object for class '<em>Gen List Of Boolean</em>'.
    * @see org.eclipse.emf.cdo.tests.model5.GenListOfBoolean
    * @generated
@@ -589,10 +632,9 @@ public interface Model5Package extends EPackage
   EClass getGenListOfBoolean();
 
   /**
-   * Returns the meta object for the attribute list '
-   * {@link org.eclipse.emf.cdo.tests.model5.GenListOfBoolean#getElements <em>Elements</em>}'. <!-- begin-user-doc -->
+   * Returns the meta object for the attribute list '{@link org.eclipse.emf.cdo.tests.model5.GenListOfBoolean#getElements <em>Elements</em>}'.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * 
    * @return the meta object for the attribute list '<em>Elements</em>'.
    * @see org.eclipse.emf.cdo.tests.model5.GenListOfBoolean#getElements()
    * @see #getGenListOfBoolean()
@@ -601,9 +643,8 @@ public interface Model5Package extends EPackage
   EAttribute getGenListOfBoolean_Elements();
 
   /**
-   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model5.GenListOfShort
-   * <em>Gen List Of Short</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model5.GenListOfShort <em>Gen List Of Short</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return the meta object for class '<em>Gen List Of Short</em>'.
    * @see org.eclipse.emf.cdo.tests.model5.GenListOfShort
    * @generated
@@ -611,9 +652,8 @@ public interface Model5Package extends EPackage
   EClass getGenListOfShort();
 
   /**
-   * Returns the meta object for the attribute list '{@link org.eclipse.emf.cdo.tests.model5.GenListOfShort#getElements
-   * <em>Elements</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns the meta object for the attribute list '{@link org.eclipse.emf.cdo.tests.model5.GenListOfShort#getElements <em>Elements</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return the meta object for the attribute list '<em>Elements</em>'.
    * @see org.eclipse.emf.cdo.tests.model5.GenListOfShort#getElements()
    * @see #getGenListOfShort()
@@ -622,9 +662,8 @@ public interface Model5Package extends EPackage
   EAttribute getGenListOfShort_Elements();
 
   /**
-   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model5.GenListOfFloat
-   * <em>Gen List Of Float</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model5.GenListOfFloat <em>Gen List Of Float</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return the meta object for class '<em>Gen List Of Float</em>'.
    * @see org.eclipse.emf.cdo.tests.model5.GenListOfFloat
    * @generated
@@ -632,9 +671,8 @@ public interface Model5Package extends EPackage
   EClass getGenListOfFloat();
 
   /**
-   * Returns the meta object for the attribute list '{@link org.eclipse.emf.cdo.tests.model5.GenListOfFloat#getElements
-   * <em>Elements</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns the meta object for the attribute list '{@link org.eclipse.emf.cdo.tests.model5.GenListOfFloat#getElements <em>Elements</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return the meta object for the attribute list '<em>Elements</em>'.
    * @see org.eclipse.emf.cdo.tests.model5.GenListOfFloat#getElements()
    * @see #getGenListOfFloat()
@@ -643,9 +681,8 @@ public interface Model5Package extends EPackage
   EAttribute getGenListOfFloat_Elements();
 
   /**
-   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model5.GenListOfDouble
-   * <em>Gen List Of Double</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model5.GenListOfDouble <em>Gen List Of Double</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return the meta object for class '<em>Gen List Of Double</em>'.
    * @see org.eclipse.emf.cdo.tests.model5.GenListOfDouble
    * @generated
@@ -653,10 +690,9 @@ public interface Model5Package extends EPackage
   EClass getGenListOfDouble();
 
   /**
-   * Returns the meta object for the attribute list '
-   * {@link org.eclipse.emf.cdo.tests.model5.GenListOfDouble#getElements <em>Elements</em>}'. <!-- begin-user-doc -->
+   * Returns the meta object for the attribute list '{@link org.eclipse.emf.cdo.tests.model5.GenListOfDouble#getElements <em>Elements</em>}'.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * 
    * @return the meta object for the attribute list '<em>Elements</em>'.
    * @see org.eclipse.emf.cdo.tests.model5.GenListOfDouble#getElements()
    * @see #getGenListOfDouble()
@@ -665,9 +701,8 @@ public interface Model5Package extends EPackage
   EAttribute getGenListOfDouble_Elements();
 
   /**
-   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model5.GenListOfDate <em>Gen List Of Date</em>}
-   * '. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model5.GenListOfDate <em>Gen List Of Date</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return the meta object for class '<em>Gen List Of Date</em>'.
    * @see org.eclipse.emf.cdo.tests.model5.GenListOfDate
    * @generated
@@ -675,9 +710,8 @@ public interface Model5Package extends EPackage
   EClass getGenListOfDate();
 
   /**
-   * Returns the meta object for the attribute list '{@link org.eclipse.emf.cdo.tests.model5.GenListOfDate#getElements
-   * <em>Elements</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns the meta object for the attribute list '{@link org.eclipse.emf.cdo.tests.model5.GenListOfDate#getElements <em>Elements</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return the meta object for the attribute list '<em>Elements</em>'.
    * @see org.eclipse.emf.cdo.tests.model5.GenListOfDate#getElements()
    * @see #getGenListOfDate()
@@ -686,9 +720,8 @@ public interface Model5Package extends EPackage
   EAttribute getGenListOfDate_Elements();
 
   /**
-   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model5.GenListOfChar <em>Gen List Of Char</em>}
-   * '. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model5.GenListOfChar <em>Gen List Of Char</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return the meta object for class '<em>Gen List Of Char</em>'.
    * @see org.eclipse.emf.cdo.tests.model5.GenListOfChar
    * @generated
@@ -696,9 +729,8 @@ public interface Model5Package extends EPackage
   EClass getGenListOfChar();
 
   /**
-   * Returns the meta object for the attribute list '{@link org.eclipse.emf.cdo.tests.model5.GenListOfChar#getElements
-   * <em>Elements</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns the meta object for the attribute list '{@link org.eclipse.emf.cdo.tests.model5.GenListOfChar#getElements <em>Elements</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return the meta object for the attribute list '<em>Elements</em>'.
    * @see org.eclipse.emf.cdo.tests.model5.GenListOfChar#getElements()
    * @see #getGenListOfChar()
@@ -707,9 +739,8 @@ public interface Model5Package extends EPackage
   EAttribute getGenListOfChar_Elements();
 
   /**
-   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model5.GenListOfIntArray
-   * <em>Gen List Of Int Array</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model5.GenListOfIntArray <em>Gen List Of Int Array</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return the meta object for class '<em>Gen List Of Int Array</em>'.
    * @see org.eclipse.emf.cdo.tests.model5.GenListOfIntArray
    * @generated
@@ -717,10 +748,9 @@ public interface Model5Package extends EPackage
   EClass getGenListOfIntArray();
 
   /**
-   * Returns the meta object for the attribute list '
-   * {@link org.eclipse.emf.cdo.tests.model5.GenListOfIntArray#getElements <em>Elements</em>}'. <!-- begin-user-doc -->
+   * Returns the meta object for the attribute list '{@link org.eclipse.emf.cdo.tests.model5.GenListOfIntArray#getElements <em>Elements</em>}'.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * 
    * @return the meta object for the attribute list '<em>Elements</em>'.
    * @see org.eclipse.emf.cdo.tests.model5.GenListOfIntArray#getElements()
    * @see #getGenListOfIntArray()
@@ -729,18 +759,81 @@ public interface Model5Package extends EPackage
   EAttribute getGenListOfIntArray_Elements();
 
   /**
-   * Returns the meta object for data type '<em>Int Array</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @return the meta object for data type '<em>Int Array</em>'.
-   * @model instanceClass="int[]"
-   * @generated
-   */
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model5.Parent <em>Parent</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for class '<em>Parent</em>'.
+   * @see org.eclipse.emf.cdo.tests.model5.Parent
+   * @generated
+   */
+  EClass getParent();
+
+  /**
+  	 * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.model5.Parent#getChildren <em>Children</em>}'.
+  	 * <!-- begin-user-doc -->
+  	 * <!-- end-user-doc -->
+  	 * @return the meta object for the containment reference list '<em>Children</em>'.
+  	 * @see org.eclipse.emf.cdo.tests.model5.Parent#getChildren()
+  	 * @see #getParent()
+  	 * @generated
+  	 */
+  EReference getParent_Children();
+
+  /**
+  	 * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.tests.model5.Parent#getFavourite <em>Favourite</em>}'.
+  	 * <!-- begin-user-doc -->
+  	 * <!-- end-user-doc -->
+  	 * @return the meta object for the reference '<em>Favourite</em>'.
+  	 * @see org.eclipse.emf.cdo.tests.model5.Parent#getFavourite()
+  	 * @see #getParent()
+  	 * @generated
+  	 */
+  EReference getParent_Favourite();
+
+  /**
+  	 * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model5.Child <em>Child</em>}'.
+  	 * <!-- begin-user-doc -->
+  	 * <!-- end-user-doc -->
+  	 * @return the meta object for class '<em>Child</em>'.
+  	 * @see org.eclipse.emf.cdo.tests.model5.Child
+  	 * @generated
+  	 */
+  EClass getChild();
+
+  /**
+  	 * Returns the meta object for the container reference '{@link org.eclipse.emf.cdo.tests.model5.Child#getParent <em>Parent</em>}'.
+  	 * <!-- begin-user-doc -->
+  	 * <!-- end-user-doc -->
+  	 * @return the meta object for the container reference '<em>Parent</em>'.
+  	 * @see org.eclipse.emf.cdo.tests.model5.Child#getParent()
+  	 * @see #getChild()
+  	 * @generated
+  	 */
+  EReference getChild_Parent();
+
+  /**
+  	 * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.tests.model5.Child#getPreferredBy <em>Preferred By</em>}'.
+  	 * <!-- begin-user-doc -->
+  	 * <!-- end-user-doc -->
+  	 * @return the meta object for the reference '<em>Preferred By</em>'.
+  	 * @see org.eclipse.emf.cdo.tests.model5.Child#getPreferredBy()
+  	 * @see #getChild()
+  	 * @generated
+  	 */
+  EReference getChild_PreferredBy();
+
+  /**
+  	 * Returns the meta object for data type '<em>Int Array</em>'.
+  	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+  	 * @return the meta object for data type '<em>Int Array</em>'.
+  	 * @model instanceClass="int[]"
+  	 * @generated
+  	 */
   EDataType getIntArray();
 
   /**
-   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model5.GenListOfString
-   * <em>Gen List Of String</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model5.GenListOfString <em>Gen List Of String</em>}'.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @return the meta object for class '<em>Gen List Of String</em>'.
    * @see org.eclipse.emf.cdo.tests.model5.GenListOfString
    * @generated
@@ -748,10 +841,9 @@ public interface Model5Package extends EPackage
   EClass getGenListOfString();
 
   /**
-   * Returns the meta object for the attribute list '
-   * {@link org.eclipse.emf.cdo.tests.model5.GenListOfString#getElements <em>Elements</em>}'. <!-- begin-user-doc -->
+   * Returns the meta object for the attribute list '{@link org.eclipse.emf.cdo.tests.model5.GenListOfString#getElements <em>Elements</em>}'.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * 
    * @return the meta object for the attribute list '<em>Elements</em>'.
    * @see org.eclipse.emf.cdo.tests.model5.GenListOfString#getElements()
    * @see #getGenListOfString()
@@ -760,8 +852,8 @@ public interface Model5Package extends EPackage
   EAttribute getGenListOfString_Elements();
 
   /**
-   * 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
    */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/Parent.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/Parent.java
new file mode 100644
index 0000000000..f46d8ab9f4
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/Parent.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *    Christian W. Damus (CEA) - initial API and implementation
+ */
+package org.eclipse.emf.cdo.tests.model5;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Parent</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.eclipse.emf.cdo.tests.model5.Parent#getChildren <em>Children</em>}</li>
+ *   <li>{@link org.eclipse.emf.cdo.tests.model5.Parent#getFavourite <em>Favourite</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.emf.cdo.tests.model5.Model5Package#getParent()
+ * @model
+ * @generated
+ */
+public interface Parent extends EObject
+{
+  /**
+   * Returns the value of the '<em><b>Children</b></em>' containment reference list.
+   * The list contents are of type {@link org.eclipse.emf.cdo.tests.model5.Child}.
+   * It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.model5.Child#getParent <em>Parent</em>}'.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Children</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>Children</em>' containment reference list.
+   * @see org.eclipse.emf.cdo.tests.model5.Model5Package#getParent_Children()
+   * @see org.eclipse.emf.cdo.tests.model5.Child#getParent
+   * @model opposite="parent" containment="true"
+   * @generated
+   */
+  EList<Child> getChildren();
+
+  /**
+   * Returns the value of the '<em><b>Favourite</b></em>' reference.
+   * It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.model5.Child#getPreferredBy <em>Preferred By</em>}'.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Favourite</em>' reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Favourite</em>' reference.
+   * @see #setFavourite(Child)
+   * @see org.eclipse.emf.cdo.tests.model5.Model5Package#getParent_Favourite()
+   * @see org.eclipse.emf.cdo.tests.model5.Child#getPreferredBy
+   * @model opposite="preferredBy"
+   * @generated
+   */
+  Child getFavourite();
+
+  /**
+   * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model5.Parent#getFavourite <em>Favourite</em>}' reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Favourite</em>' reference.
+   * @see #getFavourite()
+   * @generated
+   */
+  void setFavourite(Child value);
+
+} // Parent
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/TestFeatureMap.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/TestFeatureMap.java
index 4c9f5d0025..2f0c5d81c3 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/TestFeatureMap.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/TestFeatureMap.java
@@ -33,56 +33,52 @@ import org.eclipse.emf.ecore.util.FeatureMap;
 public interface TestFeatureMap extends EObject
 {
   /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  String copyright = "Copyright (c) 2004 - 2012 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";
-
-  /**
-   * Returns the value of the '<em><b>Managers</b></em>' reference list. The list contents are of type
-   * {@link org.eclipse.emf.cdo.tests.model5.Manager}. <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Managers</b></em>' reference list.
+   * The list contents are of type {@link org.eclipse.emf.cdo.tests.model5.Manager}.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Managers</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>Managers</em>' reference list.
    * @see org.eclipse.emf.cdo.tests.model5.Model5Package#getTestFeatureMap_Managers()
-   * @model transient="true" extendedMetaData="group='#people'"
+   * @model transient="true"
+   *        extendedMetaData="group='#people'"
    * @generated
    */
   EList<Manager> getManagers();
 
   /**
-   * Returns the value of the '<em><b>Doctors</b></em>' reference list. The list contents are of type
-   * {@link org.eclipse.emf.cdo.tests.model5.Doctor}. <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Doctors</b></em>' reference list.
+   * The list contents are of type {@link org.eclipse.emf.cdo.tests.model5.Doctor}.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Doctors</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>Doctors</em>' reference list.
    * @see org.eclipse.emf.cdo.tests.model5.Model5Package#getTestFeatureMap_Doctors()
-   * @model transient="true" extendedMetaData="group='#people'"
+   * @model transient="true"
+   *        extendedMetaData="group='#people'"
    * @generated
    */
   EList<Doctor> getDoctors();
 
   /**
-   * Returns the value of the '<em><b>People</b></em>' attribute list. The list contents are of type
-   * {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}. <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>People</b></em>' attribute list.
+   * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
+   * <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>People</em>' attribute list isn't clear, there really should be more of a description
    * here...
    * </p>
    * <!-- end-user-doc -->
-   * 
    * @return the value of the '<em>People</em>' attribute list.
    * @see org.eclipse.emf.cdo.tests.model5.Model5Package#getTestFeatureMap_People()
-   * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true" extendedMetaData="kind='group'"
+   * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true"
+   *        extendedMetaData="kind='group'"
    * @generated
    */
   FeatureMap getPeople();
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/ChildImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/ChildImpl.java
new file mode 100644
index 0000000000..cc3bcb75d7
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/ChildImpl.java
@@ -0,0 +1,109 @@
+/*
+ * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *    Christian W. Damus (CEA) - initial API and implementation
+ */
+package org.eclipse.emf.cdo.tests.model5.impl;
+
+import org.eclipse.emf.cdo.tests.model5.Child;
+import org.eclipse.emf.cdo.tests.model5.Model5Package;
+import org.eclipse.emf.cdo.tests.model5.Parent;
+
+import org.eclipse.emf.internal.cdo.CDOObjectImpl;
+
+import org.eclipse.emf.ecore.EClass;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Child</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.eclipse.emf.cdo.tests.model5.impl.ChildImpl#getParent <em>Parent</em>}</li>
+ *   <li>{@link org.eclipse.emf.cdo.tests.model5.impl.ChildImpl#getPreferredBy <em>Preferred By</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class ChildImpl extends CDOObjectImpl implements Child
+{
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected ChildImpl()
+  {
+    super();
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return Model5Package.eINSTANCE.getChild();
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  protected int eStaticFeatureCount()
+  {
+    return 0;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public Parent getParent()
+  {
+    return (Parent)eGet(Model5Package.eINSTANCE.getChild_Parent(), true);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public void setParent(Parent newParent)
+  {
+    eSet(Model5Package.eINSTANCE.getChild_Parent(), newParent);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public Parent getPreferredBy()
+  {
+    return (Parent)eGet(Model5Package.eINSTANCE.getChild_PreferredBy(), true);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public void setPreferredBy(Parent newPreferredBy)
+  {
+    eSet(Model5Package.eINSTANCE.getChild_PreferredBy(), newPreferredBy);
+  }
+
+} // ChildImpl
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 1f8ed5c0f7..96343ecdf1 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
@@ -21,21 +21,13 @@ import org.eclipse.emf.ecore.EClass;
  * <!-- begin-user-doc --> An implementation of the model object '<em><b>Doctor</b></em>'. <!-- end-user-doc -->
  * <p>
  * </p>
- * 
+ *
  * @generated
  */
 public class DoctorImpl extends CDOObjectImpl implements Doctor
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public static final String copyright = "Copyright (c) 2004 - 2012 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 DoctorImpl()
@@ -45,7 +37,6 @@ public class DoctorImpl extends CDOObjectImpl implements Doctor
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -56,7 +47,6 @@ public class DoctorImpl extends CDOObjectImpl implements Doctor
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
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 0a10ef0929..1538b97715 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
@@ -24,24 +24,16 @@ import org.eclipse.emf.ecore.EClass;
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.emf.cdo.tests.model5.impl.GenListOfBooleanImpl#getElements <em>Elements</em>}</li>
+ *   <li>{@link org.eclipse.emf.cdo.tests.model5.impl.GenListOfBooleanImpl#getElements <em>Elements</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class GenListOfBooleanImpl extends CDOObjectImpl implements GenListOfBoolean
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public static final String copyright = "Copyright (c) 2004 - 2012 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 GenListOfBooleanImpl()
@@ -51,7 +43,6 @@ public class GenListOfBooleanImpl extends CDOObjectImpl implements GenListOfBool
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -62,7 +53,6 @@ public class GenListOfBooleanImpl extends CDOObjectImpl implements GenListOfBool
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -73,7 +63,6 @@ public class GenListOfBooleanImpl extends CDOObjectImpl implements GenListOfBool
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @SuppressWarnings("unchecked")
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 d81e9cf3a1..7e9279e7f6 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
@@ -34,14 +34,6 @@ public class GenListOfCharImpl extends CDOObjectImpl implements GenListOfChar
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public static final String copyright = "Copyright (c) 2004 - 2012 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 GenListOfCharImpl()
@@ -51,7 +43,6 @@ public class GenListOfCharImpl extends CDOObjectImpl implements GenListOfChar
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -62,7 +53,6 @@ public class GenListOfCharImpl extends CDOObjectImpl implements GenListOfChar
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -73,7 +63,6 @@ public class GenListOfCharImpl extends CDOObjectImpl implements GenListOfChar
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @SuppressWarnings("unchecked")
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 9b5d388ce9..bcfbc4965b 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
@@ -36,14 +36,6 @@ public class GenListOfDateImpl extends CDOObjectImpl implements GenListOfDate
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public static final String copyright = "Copyright (c) 2004 - 2012 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 GenListOfDateImpl()
@@ -53,7 +45,6 @@ public class GenListOfDateImpl extends CDOObjectImpl implements GenListOfDate
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -64,7 +55,6 @@ public class GenListOfDateImpl extends CDOObjectImpl implements GenListOfDate
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -75,7 +65,6 @@ public class GenListOfDateImpl extends CDOObjectImpl implements GenListOfDate
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @SuppressWarnings("unchecked")
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 276aa1a372..314d5fcad7 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
@@ -34,14 +34,6 @@ public class GenListOfDoubleImpl extends CDOObjectImpl implements GenListOfDoubl
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public static final String copyright = "Copyright (c) 2004 - 2012 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 GenListOfDoubleImpl()
@@ -51,7 +43,6 @@ public class GenListOfDoubleImpl extends CDOObjectImpl implements GenListOfDoubl
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -62,7 +53,6 @@ public class GenListOfDoubleImpl extends CDOObjectImpl implements GenListOfDoubl
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -73,7 +63,6 @@ public class GenListOfDoubleImpl extends CDOObjectImpl implements GenListOfDoubl
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @SuppressWarnings("unchecked")
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 f1d32ccf02..bfdd36658c 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
@@ -34,14 +34,6 @@ public class GenListOfFloatImpl extends CDOObjectImpl implements GenListOfFloat
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public static final String copyright = "Copyright (c) 2004 - 2012 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 GenListOfFloatImpl()
@@ -51,7 +43,6 @@ public class GenListOfFloatImpl extends CDOObjectImpl implements GenListOfFloat
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -62,7 +53,6 @@ public class GenListOfFloatImpl extends CDOObjectImpl implements GenListOfFloat
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -73,7 +63,6 @@ public class GenListOfFloatImpl extends CDOObjectImpl implements GenListOfFloat
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @SuppressWarnings("unchecked")
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 86629a6118..8900f1914a 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
@@ -24,24 +24,16 @@ import org.eclipse.emf.ecore.EClass;
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.emf.cdo.tests.model5.impl.GenListOfIntArrayImpl#getElements <em>Elements</em>}</li>
+ *   <li>{@link org.eclipse.emf.cdo.tests.model5.impl.GenListOfIntArrayImpl#getElements <em>Elements</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class GenListOfIntArrayImpl extends CDOObjectImpl implements GenListOfIntArray
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public static final String copyright = "Copyright (c) 2004 - 2012 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 GenListOfIntArrayImpl()
@@ -51,7 +43,6 @@ public class GenListOfIntArrayImpl extends CDOObjectImpl implements GenListOfInt
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -62,7 +53,6 @@ public class GenListOfIntArrayImpl extends CDOObjectImpl implements GenListOfInt
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -73,7 +63,6 @@ public class GenListOfIntArrayImpl extends CDOObjectImpl implements GenListOfInt
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @SuppressWarnings("unchecked")
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 fd2af7a916..63195519d7 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
@@ -34,14 +34,6 @@ public class GenListOfIntImpl extends CDOObjectImpl implements GenListOfInt
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public static final String copyright = "Copyright (c) 2004 - 2012 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 GenListOfIntImpl()
@@ -51,7 +43,6 @@ public class GenListOfIntImpl extends CDOObjectImpl implements GenListOfInt
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -62,7 +53,6 @@ public class GenListOfIntImpl extends CDOObjectImpl implements GenListOfInt
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -73,7 +63,6 @@ public class GenListOfIntImpl extends CDOObjectImpl implements GenListOfInt
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @SuppressWarnings("unchecked")
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 711943be3e..5b36e46ed4 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
@@ -24,24 +24,16 @@ import org.eclipse.emf.ecore.EClass;
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.emf.cdo.tests.model5.impl.GenListOfIntegerImpl#getElements <em>Elements</em>}</li>
+ *   <li>{@link org.eclipse.emf.cdo.tests.model5.impl.GenListOfIntegerImpl#getElements <em>Elements</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class GenListOfIntegerImpl extends CDOObjectImpl implements GenListOfInteger
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public static final String copyright = "Copyright (c) 2004 - 2012 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 GenListOfIntegerImpl()
@@ -51,7 +43,6 @@ public class GenListOfIntegerImpl extends CDOObjectImpl implements GenListOfInte
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -62,7 +53,6 @@ public class GenListOfIntegerImpl extends CDOObjectImpl implements GenListOfInte
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -73,7 +63,6 @@ public class GenListOfIntegerImpl extends CDOObjectImpl implements GenListOfInte
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @SuppressWarnings("unchecked")
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 16ef76c4c3..1a37b6b90f 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
@@ -34,14 +34,6 @@ public class GenListOfLongImpl extends CDOObjectImpl implements GenListOfLong
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public static final String copyright = "Copyright (c) 2004 - 2012 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 GenListOfLongImpl()
@@ -51,7 +43,6 @@ public class GenListOfLongImpl extends CDOObjectImpl implements GenListOfLong
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -62,7 +53,6 @@ public class GenListOfLongImpl extends CDOObjectImpl implements GenListOfLong
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -73,7 +63,6 @@ public class GenListOfLongImpl extends CDOObjectImpl implements GenListOfLong
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @SuppressWarnings("unchecked")
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 aa06554655..859c59047b 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
@@ -34,14 +34,6 @@ public class GenListOfShortImpl extends CDOObjectImpl implements GenListOfShort
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public static final String copyright = "Copyright (c) 2004 - 2012 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 GenListOfShortImpl()
@@ -51,7 +43,6 @@ public class GenListOfShortImpl extends CDOObjectImpl implements GenListOfShort
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -62,7 +53,6 @@ public class GenListOfShortImpl extends CDOObjectImpl implements GenListOfShort
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -73,7 +63,6 @@ public class GenListOfShortImpl extends CDOObjectImpl implements GenListOfShort
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @SuppressWarnings("unchecked")
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 c866fbbef7..bba295066c 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
@@ -34,14 +34,6 @@ public class GenListOfStringImpl extends CDOObjectImpl implements GenListOfStrin
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public static final String copyright = "Copyright (c) 2004 - 2012 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 GenListOfStringImpl()
@@ -51,7 +43,6 @@ public class GenListOfStringImpl extends CDOObjectImpl implements GenListOfStrin
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -62,7 +53,6 @@ public class GenListOfStringImpl extends CDOObjectImpl implements GenListOfStrin
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -73,7 +63,6 @@ public class GenListOfStringImpl extends CDOObjectImpl implements GenListOfStrin
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @SuppressWarnings("unchecked")
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 df4604b2ba..cd71fb8914 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
@@ -21,21 +21,13 @@ import org.eclipse.emf.ecore.EClass;
  * <!-- begin-user-doc --> An implementation of the model object '<em><b>Manager</b></em>'. <!-- end-user-doc -->
  * <p>
  * </p>
- * 
+ *
  * @generated
  */
 public class ManagerImpl extends CDOObjectImpl implements Manager
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public static final String copyright = "Copyright (c) 2004 - 2012 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 ManagerImpl()
@@ -45,7 +37,6 @@ public class ManagerImpl extends CDOObjectImpl implements Manager
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -56,7 +47,6 @@ public class ManagerImpl extends CDOObjectImpl implements Manager
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/Model5FactoryImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/Model5FactoryImpl.java
index ea65e35c78..75407ffb39 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/Model5FactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/Model5FactoryImpl.java
@@ -10,6 +10,7 @@
  */
 package org.eclipse.emf.cdo.tests.model5.impl;
 
+import org.eclipse.emf.cdo.tests.model5.Child;
 import org.eclipse.emf.cdo.tests.model5.Doctor;
 import org.eclipse.emf.cdo.tests.model5.GenListOfBoolean;
 import org.eclipse.emf.cdo.tests.model5.GenListOfChar;
@@ -25,6 +26,7 @@ import org.eclipse.emf.cdo.tests.model5.GenListOfString;
 import org.eclipse.emf.cdo.tests.model5.Manager;
 import org.eclipse.emf.cdo.tests.model5.Model5Factory;
 import org.eclipse.emf.cdo.tests.model5.Model5Package;
+import org.eclipse.emf.cdo.tests.model5.Parent;
 import org.eclipse.emf.cdo.tests.model5.TestFeatureMap;
 
 import org.eclipse.emf.ecore.EClass;
@@ -36,21 +38,13 @@ import org.eclipse.emf.ecore.plugin.EcorePlugin;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!-- end-user-doc -->
- * 
  * @generated
  */
 public class Model5FactoryImpl extends EFactoryImpl implements Model5Factory
 {
   /**
+   * Creates the default factory implementation.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public static final String copyright = "Copyright (c) 2004 - 2012 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";
-
-  /**
-   * Creates the default factory implementation. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public static Model5Factory init()
@@ -72,8 +66,8 @@ public class Model5FactoryImpl extends EFactoryImpl implements Model5Factory
   }
 
   /**
-   * 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 Model5FactoryImpl()
@@ -83,7 +77,6 @@ public class Model5FactoryImpl extends EFactoryImpl implements Model5Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -119,6 +112,10 @@ public class Model5FactoryImpl extends EFactoryImpl implements Model5Factory
       return createGenListOfChar();
     case Model5Package.GEN_LIST_OF_INT_ARRAY:
       return createGenListOfIntArray();
+    case Model5Package.PARENT:
+      return createParent();
+    case Model5Package.CHILD:
+      return createChild();
     default:
       throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
     }
@@ -126,7 +123,6 @@ public class Model5FactoryImpl extends EFactoryImpl implements Model5Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -143,7 +139,6 @@ public class Model5FactoryImpl extends EFactoryImpl implements Model5Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -160,7 +155,6 @@ public class Model5FactoryImpl extends EFactoryImpl implements Model5Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public TestFeatureMap createTestFeatureMap()
@@ -171,7 +165,6 @@ public class Model5FactoryImpl extends EFactoryImpl implements Model5Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public Manager createManager()
@@ -182,7 +175,6 @@ public class Model5FactoryImpl extends EFactoryImpl implements Model5Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public Doctor createDoctor()
@@ -193,7 +185,6 @@ public class Model5FactoryImpl extends EFactoryImpl implements Model5Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public GenListOfInt createGenListOfInt()
@@ -204,7 +195,6 @@ public class Model5FactoryImpl extends EFactoryImpl implements Model5Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public GenListOfInteger createGenListOfInteger()
@@ -215,7 +205,6 @@ public class Model5FactoryImpl extends EFactoryImpl implements Model5Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public GenListOfLong createGenListOfLong()
@@ -226,7 +215,6 @@ public class Model5FactoryImpl extends EFactoryImpl implements Model5Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public GenListOfBoolean createGenListOfBoolean()
@@ -237,7 +225,6 @@ public class Model5FactoryImpl extends EFactoryImpl implements Model5Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public GenListOfShort createGenListOfShort()
@@ -248,7 +235,6 @@ public class Model5FactoryImpl extends EFactoryImpl implements Model5Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public GenListOfFloat createGenListOfFloat()
@@ -259,7 +245,6 @@ public class Model5FactoryImpl extends EFactoryImpl implements Model5Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public GenListOfDouble createGenListOfDouble()
@@ -270,7 +255,6 @@ public class Model5FactoryImpl extends EFactoryImpl implements Model5Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public GenListOfDate createGenListOfDate()
@@ -281,7 +265,6 @@ public class Model5FactoryImpl extends EFactoryImpl implements Model5Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public GenListOfChar createGenListOfChar()
@@ -292,7 +275,6 @@ public class Model5FactoryImpl extends EFactoryImpl implements Model5Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public GenListOfIntArray createGenListOfIntArray()
@@ -302,10 +284,31 @@ public class Model5FactoryImpl extends EFactoryImpl implements Model5Factory
   }
 
   /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
    * @generated
    */
+  public Parent createParent()
+  {
+    ParentImpl parent = new ParentImpl();
+    return parent;
+  }
+
+  /**
+  	 * <!-- begin-user-doc -->
+  	 * <!-- end-user-doc -->
+  	 * @generated
+  	 */
+  public Child createChild()
+  {
+    ChildImpl child = new ChildImpl();
+    return child;
+  }
+
+  /**
+  	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+  	 * @generated
+  	 */
   public int[] createIntArrayFromString(EDataType eDataType, String initialValue)
   {
     return (int[])super.createFromString(initialValue);
@@ -313,7 +316,6 @@ public class Model5FactoryImpl extends EFactoryImpl implements Model5Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public String convertIntArrayToString(EDataType eDataType, Object instanceValue)
@@ -323,7 +325,6 @@ public class Model5FactoryImpl extends EFactoryImpl implements Model5Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public GenListOfString createGenListOfString()
@@ -334,7 +335,6 @@ public class Model5FactoryImpl extends EFactoryImpl implements Model5Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public Model5Package getModel5Package()
@@ -344,7 +344,6 @@ public class Model5FactoryImpl extends EFactoryImpl implements Model5Factory
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @deprecated
    * @generated
    */
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/Model5PackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/Model5PackageImpl.java
index c229919bd9..fcc1553641 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/Model5PackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/Model5PackageImpl.java
@@ -10,6 +10,7 @@
  */
 package org.eclipse.emf.cdo.tests.model5.impl;
 
+import org.eclipse.emf.cdo.tests.model5.Child;
 import org.eclipse.emf.cdo.tests.model5.Doctor;
 import org.eclipse.emf.cdo.tests.model5.GenListOfBoolean;
 import org.eclipse.emf.cdo.tests.model5.GenListOfChar;
@@ -25,6 +26,7 @@ import org.eclipse.emf.cdo.tests.model5.GenListOfString;
 import org.eclipse.emf.cdo.tests.model5.Manager;
 import org.eclipse.emf.cdo.tests.model5.Model5Factory;
 import org.eclipse.emf.cdo.tests.model5.Model5Package;
+import org.eclipse.emf.cdo.tests.model5.Parent;
 import org.eclipse.emf.cdo.tests.model5.TestFeatureMap;
 
 import org.eclipse.emf.ecore.EAttribute;
@@ -36,119 +38,110 @@ import org.eclipse.emf.ecore.impl.EPackageImpl;
 
 /**
  * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!-- end-user-doc -->
- * 
  * @generated
  */
 public class Model5PackageImpl extends EPackageImpl implements Model5Package
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public static final String copyright = "Copyright (c) 2004 - 2012 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
    */
   private EClass testFeatureMapEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private EClass managerEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private EClass doctorEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private EClass genListOfIntEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private EClass genListOfIntegerEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private EClass genListOfLongEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private EClass genListOfBooleanEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private EClass genListOfShortEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private EClass genListOfFloatEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private EClass genListOfDoubleEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private EClass genListOfDateEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private EClass genListOfCharEClass = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private EClass genListOfIntArrayEClass = null;
 
   /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
    * @generated
    */
+  private EClass parentEClass = null;
+
+  /**
+  	 * <!-- begin-user-doc -->
+  	 * <!-- end-user-doc -->
+  	 * @generated
+  	 */
+  private EClass childEClass = null;
+
+  /**
+  	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+  	 * @generated
+  	 */
   private EDataType intArrayEDataType = null;
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   private EClass genListOfStringEClass = null;
@@ -173,18 +166,17 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
 
   /**
    * <!-- 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.
-   * <p>
-   * This method is used to initialize {@link Model5Package#eINSTANCE} when that field is accessed. Clients should not
-   * invoke it directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
    * 
+   * <p>This method is used to initialize {@link Model5Package#eINSTANCE} when that field is accessed.
+   * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
    * @see #eNS_URI
    * @see #createPackageContents()
    * @see #initializePackageContents()
@@ -217,7 +209,6 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EClass getTestFeatureMap()
@@ -227,7 +218,6 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EReference getTestFeatureMap_Managers()
@@ -237,7 +227,6 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EReference getTestFeatureMap_Doctors()
@@ -247,7 +236,6 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EAttribute getTestFeatureMap_People()
@@ -257,7 +245,6 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EClass getManager()
@@ -267,7 +254,6 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EClass getDoctor()
@@ -277,7 +263,6 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EClass getGenListOfInt()
@@ -287,7 +272,6 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EAttribute getGenListOfInt_Elements()
@@ -297,7 +281,6 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EClass getGenListOfInteger()
@@ -307,7 +290,6 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EAttribute getGenListOfInteger_Elements()
@@ -317,7 +299,6 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EClass getGenListOfLong()
@@ -327,7 +308,6 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EAttribute getGenListOfLong_Elements()
@@ -337,7 +317,6 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EClass getGenListOfBoolean()
@@ -347,7 +326,6 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EAttribute getGenListOfBoolean_Elements()
@@ -357,7 +335,6 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EClass getGenListOfShort()
@@ -367,7 +344,6 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EAttribute getGenListOfShort_Elements()
@@ -377,7 +353,6 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EClass getGenListOfFloat()
@@ -387,7 +362,6 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EAttribute getGenListOfFloat_Elements()
@@ -397,7 +371,6 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EClass getGenListOfDouble()
@@ -407,7 +380,6 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EAttribute getGenListOfDouble_Elements()
@@ -417,7 +389,6 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EClass getGenListOfDate()
@@ -427,7 +398,6 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EAttribute getGenListOfDate_Elements()
@@ -437,7 +407,6 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EClass getGenListOfChar()
@@ -447,7 +416,6 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EAttribute getGenListOfChar_Elements()
@@ -457,7 +425,6 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EClass getGenListOfIntArray()
@@ -467,7 +434,6 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EAttribute getGenListOfIntArray_Elements()
@@ -476,10 +442,69 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
   }
 
   /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
    * @generated
    */
+  public EClass getParent()
+  {
+    return parentEClass;
+  }
+
+  /**
+  	 * <!-- begin-user-doc -->
+  	 * <!-- end-user-doc -->
+  	 * @generated
+  	 */
+  public EReference getParent_Children()
+  {
+    return (EReference)parentEClass.getEStructuralFeatures().get(0);
+  }
+
+  /**
+  	 * <!-- begin-user-doc -->
+  	 * <!-- end-user-doc -->
+  	 * @generated
+  	 */
+  public EReference getParent_Favourite()
+  {
+    return (EReference)parentEClass.getEStructuralFeatures().get(1);
+  }
+
+  /**
+  	 * <!-- begin-user-doc -->
+  	 * <!-- end-user-doc -->
+  	 * @generated
+  	 */
+  public EClass getChild()
+  {
+    return childEClass;
+  }
+
+  /**
+  	 * <!-- begin-user-doc -->
+  	 * <!-- end-user-doc -->
+  	 * @generated
+  	 */
+  public EReference getChild_Parent()
+  {
+    return (EReference)childEClass.getEStructuralFeatures().get(0);
+  }
+
+  /**
+  	 * <!-- begin-user-doc -->
+  	 * <!-- end-user-doc -->
+  	 * @generated
+  	 */
+  public EReference getChild_PreferredBy()
+  {
+    return (EReference)childEClass.getEStructuralFeatures().get(1);
+  }
+
+  /**
+  	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+  	 * @generated
+  	 */
   public EDataType getIntArray()
   {
     return intArrayEDataType;
@@ -487,7 +512,6 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EClass getGenListOfString()
@@ -497,7 +521,6 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public EAttribute getGenListOfString_Elements()
@@ -507,7 +530,6 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   public Model5Factory getModel5Factory()
@@ -517,15 +539,14 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
 
   /**
    * <!-- 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()
@@ -577,21 +598,28 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
     genListOfIntArrayEClass = createEClass(GEN_LIST_OF_INT_ARRAY);
     createEAttribute(genListOfIntArrayEClass, GEN_LIST_OF_INT_ARRAY__ELEMENTS);
 
+    parentEClass = createEClass(PARENT);
+    createEReference(parentEClass, PARENT__CHILDREN);
+    createEReference(parentEClass, PARENT__FAVOURITE);
+
+    childEClass = createEClass(CHILD);
+    createEReference(childEClass, CHILD__PARENT);
+    createEReference(childEClass, CHILD__PREFERRED_BY);
+
     // Create data types
     intArrayEDataType = createEDataType(INT_ARRAY);
   }
 
   /**
    * <!-- 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()
@@ -690,6 +718,22 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
         GenListOfIntArray.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
         !IS_DERIVED, IS_ORDERED);
 
+    initEClass(parentEClass, Parent.class, "Parent", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getParent_Children(), this.getChild(), this.getChild_Parent(), "children", null, 0, -1,
+        Parent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getParent_Favourite(), this.getChild(), this.getChild_PreferredBy(), "favourite", null, 0, 1,
+        Parent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(childEClass, Child.class, "Child", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getChild_Parent(), this.getParent(), this.getParent_Children(), "parent", null, 0, 1, Child.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+        !IS_DERIVED, IS_ORDERED);
+    initEReference(getChild_PreferredBy(), this.getParent(), this.getParent_Favourite(), "preferredBy", null, 0, 1,
+        Child.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
     // Initialize data types
     initEDataType(intArrayEDataType, int[].class, "IntArray", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
 
@@ -702,9 +746,9 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
   }
 
   /**
-   * Initializes the annotations for <b>http:///org/eclipse/emf/ecore/util/ExtendedMetaData</b>. <!-- begin-user-doc -->
+   * Initializes the annotations for <b>http:///org/eclipse/emf/ecore/util/ExtendedMetaData</b>.
+   * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * 
    * @generated
    */
   protected void createExtendedMetaDataAnnotations()
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/ParentImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/ParentImpl.java
new file mode 100644
index 0000000000..c825d8f386
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/ParentImpl.java
@@ -0,0 +1,101 @@
+/*
+ * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *    Christian W. Damus (CEA) - initial API and implementation
+ */
+package org.eclipse.emf.cdo.tests.model5.impl;
+
+import org.eclipse.emf.cdo.tests.model5.Child;
+import org.eclipse.emf.cdo.tests.model5.Model5Package;
+import org.eclipse.emf.cdo.tests.model5.Parent;
+
+import org.eclipse.emf.internal.cdo.CDOObjectImpl;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Parent</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.eclipse.emf.cdo.tests.model5.impl.ParentImpl#getChildren <em>Children</em>}</li>
+ *   <li>{@link org.eclipse.emf.cdo.tests.model5.impl.ParentImpl#getFavourite <em>Favourite</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class ParentImpl extends CDOObjectImpl implements Parent
+{
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected ParentImpl()
+  {
+    super();
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return Model5Package.eINSTANCE.getParent();
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  protected int eStaticFeatureCount()
+  {
+    return 0;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @SuppressWarnings("unchecked")
+  public EList<Child> getChildren()
+  {
+    return (EList<Child>)eGet(Model5Package.eINSTANCE.getParent_Children(), true);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public Child getFavourite()
+  {
+    return (Child)eGet(Model5Package.eINSTANCE.getParent_Favourite(), true);
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public void setFavourite(Child newFavourite)
+  {
+    eSet(Model5Package.eINSTANCE.getParent_Favourite(), newFavourite);
+  }
+
+} // ParentImpl
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 b3aed4a68c..f2e688cfb3 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
@@ -39,14 +39,6 @@ public class TestFeatureMapImpl extends CDOObjectImpl implements TestFeatureMap
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public static final String copyright = "Copyright (c) 2004 - 2012 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 TestFeatureMapImpl()
@@ -56,7 +48,6 @@ public class TestFeatureMapImpl extends CDOObjectImpl implements TestFeatureMap
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -67,7 +58,6 @@ public class TestFeatureMapImpl extends CDOObjectImpl implements TestFeatureMap
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @Override
@@ -78,7 +68,6 @@ public class TestFeatureMapImpl extends CDOObjectImpl implements TestFeatureMap
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @SuppressWarnings("unchecked")
@@ -89,7 +78,6 @@ public class TestFeatureMapImpl extends CDOObjectImpl implements TestFeatureMap
 
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   @SuppressWarnings("unchecked")
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/util/Model5AdapterFactory.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/util/Model5AdapterFactory.java
index 5448f5e113..6c8e14f324 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/util/Model5AdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/util/Model5AdapterFactory.java
@@ -10,6 +10,7 @@
  */
 package org.eclipse.emf.cdo.tests.model5.util;
 
+import org.eclipse.emf.cdo.tests.model5.Child;
 import org.eclipse.emf.cdo.tests.model5.Doctor;
 import org.eclipse.emf.cdo.tests.model5.GenListOfBoolean;
 import org.eclipse.emf.cdo.tests.model5.GenListOfChar;
@@ -24,6 +25,7 @@ import org.eclipse.emf.cdo.tests.model5.GenListOfShort;
 import org.eclipse.emf.cdo.tests.model5.GenListOfString;
 import org.eclipse.emf.cdo.tests.model5.Manager;
 import org.eclipse.emf.cdo.tests.model5.Model5Package;
+import org.eclipse.emf.cdo.tests.model5.Parent;
 import org.eclipse.emf.cdo.tests.model5.TestFeatureMap;
 
 import org.eclipse.emf.common.notify.Adapter;
@@ -34,29 +36,21 @@ 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.model5.Model5Package
  * @generated
  */
 public class Model5AdapterFactory extends AdapterFactoryImpl
 {
   /**
+   * The cached model package.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public static final String copyright = "Copyright (c) 2004 - 2012 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";
-
-  /**
-   * The cached model package. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   protected static Model5Package 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 Model5AdapterFactory()
@@ -68,10 +62,10 @@ public class Model5AdapterFactory 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
    */
@@ -90,8 +84,8 @@ public class Model5AdapterFactory 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 Model5Switch<Adapter> modelSwitch = new Model5Switch<Adapter>()
@@ -181,6 +175,18 @@ public class Model5AdapterFactory extends AdapterFactoryImpl
     }
 
     @Override
+    public Adapter caseParent(Parent object)
+    {
+      return createParentAdapter();
+    }
+
+    @Override
+    public Adapter caseChild(Child object)
+    {
+      return createChildAdapter();
+    }
+
+    @Override
     public Adapter defaultCase(EObject object)
     {
       return createEObjectAdapter();
@@ -188,10 +194,9 @@ public class Model5AdapterFactory 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
    */
@@ -202,10 +207,9 @@ public class Model5AdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model5.TestFeatureMap
-   * <em>Test Feature Map</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.model5.TestFeatureMap <em>Test Feature Map</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.model5.TestFeatureMap
    * @generated
@@ -219,7 +223,6 @@ public class Model5AdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model5.Manager <em>Manager</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.model5.Manager
    * @generated
@@ -233,7 +236,6 @@ public class Model5AdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model5.Doctor <em>Doctor</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.model5.Doctor
    * @generated
@@ -244,10 +246,9 @@ public class Model5AdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model5.GenListOfInt
-   * <em>Gen List Of Int</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.model5.GenListOfInt <em>Gen List Of Int</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.model5.GenListOfInt
    * @generated
@@ -258,11 +259,10 @@ public class Model5AdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model5.GenListOfInteger
-   * <em>Gen List Of Integer</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can
+   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model5.GenListOfInteger <em>Gen List Of Integer</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.model5.GenListOfInteger
    * @generated
@@ -273,10 +273,9 @@ public class Model5AdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model5.GenListOfLong
-   * <em>Gen List Of Long</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.model5.GenListOfLong <em>Gen List Of Long</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.model5.GenListOfLong
    * @generated
@@ -287,11 +286,10 @@ public class Model5AdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model5.GenListOfBoolean
-   * <em>Gen List Of Boolean</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can
+   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model5.GenListOfBoolean <em>Gen List Of Boolean</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.model5.GenListOfBoolean
    * @generated
@@ -302,11 +300,10 @@ public class Model5AdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model5.GenListOfShort
-   * <em>Gen List Of Short</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can
+   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model5.GenListOfShort <em>Gen List Of Short</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.model5.GenListOfShort
    * @generated
@@ -317,11 +314,10 @@ public class Model5AdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model5.GenListOfFloat
-   * <em>Gen List Of Float</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can
+   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model5.GenListOfFloat <em>Gen List Of Float</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.model5.GenListOfFloat
    * @generated
@@ -332,11 +328,10 @@ public class Model5AdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model5.GenListOfDouble
-   * <em>Gen List Of Double</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can
+   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model5.GenListOfDouble <em>Gen List Of Double</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.model5.GenListOfDouble
    * @generated
@@ -347,10 +342,9 @@ public class Model5AdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model5.GenListOfDate
-   * <em>Gen List Of Date</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.model5.GenListOfDate <em>Gen List Of Date</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.model5.GenListOfDate
    * @generated
@@ -361,10 +355,9 @@ public class Model5AdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model5.GenListOfChar
-   * <em>Gen List Of Char</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.model5.GenListOfChar <em>Gen List Of Char</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.model5.GenListOfChar
    * @generated
@@ -375,11 +368,10 @@ public class Model5AdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model5.GenListOfIntArray
-   * <em>Gen List Of Int Array</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can
+   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model5.GenListOfIntArray <em>Gen List Of Int Array</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.model5.GenListOfIntArray
    * @generated
@@ -390,24 +382,53 @@ public class Model5AdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model5.GenListOfString
-   * <em>Gen List Of String</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 -->
-   * 
+   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model5.Parent <em>Parent</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.model5.GenListOfString
+   * @see org.eclipse.emf.cdo.tests.model5.Parent
    * @generated
    */
+  public Adapter createParentAdapter()
+  {
+    return null;
+  }
+
+  /**
+  	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model5.Child <em>Child</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.model5.Child
+  	 * @generated
+  	 */
+  public Adapter createChildAdapter()
+  {
+    return null;
+  }
+
+  /**
+  	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model5.GenListOfString <em>Gen List Of String</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.model5.GenListOfString
+  	 * @generated
+  	 */
   public Adapter createGenListOfStringAdapter()
   {
     return null;
   }
 
   /**
-   * 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.model5/src/org/eclipse/emf/cdo/tests/model5/util/Model5Switch.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/util/Model5Switch.java
index 4d9590c9c2..cf592de6a1 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/util/Model5Switch.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/util/Model5Switch.java
@@ -10,6 +10,7 @@
  */
 package org.eclipse.emf.cdo.tests.model5.util;
 
+import org.eclipse.emf.cdo.tests.model5.Child;
 import org.eclipse.emf.cdo.tests.model5.Doctor;
 import org.eclipse.emf.cdo.tests.model5.GenListOfBoolean;
 import org.eclipse.emf.cdo.tests.model5.GenListOfChar;
@@ -24,6 +25,7 @@ import org.eclipse.emf.cdo.tests.model5.GenListOfShort;
 import org.eclipse.emf.cdo.tests.model5.GenListOfString;
 import org.eclipse.emf.cdo.tests.model5.Manager;
 import org.eclipse.emf.cdo.tests.model5.Model5Package;
+import org.eclipse.emf.cdo.tests.model5.Parent;
 import org.eclipse.emf.cdo.tests.model5.TestFeatureMap;
 
 import org.eclipse.emf.ecore.EClass;
@@ -36,29 +38,21 @@ 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.model5.Model5Package
  * @generated
  */
 public class Model5Switch<T>
 {
   /**
+   * The cached model package
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public static final String copyright = "Copyright (c) 2004 - 2012 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";
-
-  /**
-   * The cached model package <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
    * @generated
    */
   protected static Model5Package 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 Model5Switch()
@@ -72,7 +66,6 @@ public class Model5Switch<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
    */
@@ -84,7 +77,6 @@ public class Model5Switch<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
    */
@@ -104,7 +96,6 @@ public class Model5Switch<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
    */
@@ -224,17 +215,32 @@ public class Model5Switch<T>
         result = defaultCase(theEObject);
       return result;
     }
+    case Model5Package.PARENT:
+    {
+      Parent parent = (Parent)theEObject;
+      T result = caseParent(parent);
+      if (result == null)
+        result = defaultCase(theEObject);
+      return result;
+    }
+    case Model5Package.CHILD:
+    {
+      Child child = (Child)theEObject;
+      T result = caseChild(child);
+      if (result == null)
+        result = defaultCase(theEObject);
+      return result;
+    }
     default:
       return defaultCase(theEObject);
     }
   }
 
   /**
-   * Returns the result of interpreting the object as an instance of '<em>Test Feature Map</em>'. <!-- begin-user-doc
+   * Returns the result of interpreting the object as an instance of '<em>Test Feature Map</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>Test Feature Map</em>'.
    * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
    * @generated
@@ -245,11 +251,10 @@ public class Model5Switch<T>
   }
 
   /**
-   * Returns the result of interpreting the object as an instance of '<em>Manager</em>'. <!-- begin-user-doc --> This
+   * Returns the result of interpreting the object as an instance of '<em>Manager</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>Manager</em>'.
    * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
    * @generated
@@ -260,11 +265,10 @@ public class Model5Switch<T>
   }
 
   /**
-   * Returns the result of interpreting the object as an instance of '<em>Doctor</em>'. <!-- begin-user-doc --> This
+   * Returns the result of interpreting the object as an instance of '<em>Doctor</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>Doctor</em>'.
    * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
    * @generated
@@ -275,11 +279,10 @@ public class Model5Switch<T>
   }
 
   /**
-   * Returns the result of interpreting the object as an instance of '<em>Gen List Of Int</em>'. <!-- begin-user-doc -->
+   * Returns the result of interpreting the object as an instance of '<em>Gen List Of Int</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>Gen List Of Int</em>'.
    * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
    * @generated
@@ -290,11 +293,10 @@ public class Model5Switch<T>
   }
 
   /**
-   * Returns the result of interpreting the object as an instance of '<em>Gen List Of Integer</em>'. <!-- begin-user-doc
+   * Returns the result of interpreting the object as an instance of '<em>Gen List Of Integer</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>Gen List Of Integer</em>'.
    * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
    * @generated
@@ -305,11 +307,10 @@ public class Model5Switch<T>
   }
 
   /**
-   * Returns the result of interpreting the object as an instance of '<em>Gen List Of Long</em>'. <!-- begin-user-doc
+   * Returns the result of interpreting the object as an instance of '<em>Gen List Of Long</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>Gen List Of Long</em>'.
    * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
    * @generated
@@ -320,11 +321,10 @@ public class Model5Switch<T>
   }
 
   /**
-   * Returns the result of interpreting the object as an instance of '<em>Gen List Of Boolean</em>'. <!-- begin-user-doc
+   * Returns the result of interpreting the object as an instance of '<em>Gen List Of Boolean</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>Gen List Of Boolean</em>'.
    * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
    * @generated
@@ -335,11 +335,10 @@ public class Model5Switch<T>
   }
 
   /**
-   * Returns the result of interpreting the object as an instance of '<em>Gen List Of Short</em>'. <!-- begin-user-doc
+   * Returns the result of interpreting the object as an instance of '<em>Gen List Of Short</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>Gen List Of Short</em>'.
    * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
    * @generated
@@ -350,11 +349,10 @@ public class Model5Switch<T>
   }
 
   /**
-   * Returns the result of interpreting the object as an instance of '<em>Gen List Of Float</em>'. <!-- begin-user-doc
+   * Returns the result of interpreting the object as an instance of '<em>Gen List Of Float</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>Gen List Of Float</em>'.
    * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
    * @generated
@@ -365,11 +363,10 @@ public class Model5Switch<T>
   }
 
   /**
-   * Returns the result of interpreting the object as an instance of '<em>Gen List Of Double</em>'. <!-- begin-user-doc
+   * Returns the result of interpreting the object as an instance of '<em>Gen List Of Double</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>Gen List Of Double</em>'.
    * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
    * @generated
@@ -380,11 +377,10 @@ public class Model5Switch<T>
   }
 
   /**
-   * Returns the result of interpreting the object as an instance of '<em>Gen List Of Date</em>'. <!-- begin-user-doc
+   * Returns the result of interpreting the object as an instance of '<em>Gen List Of Date</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>Gen List Of Date</em>'.
    * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
    * @generated
@@ -395,11 +391,10 @@ public class Model5Switch<T>
   }
 
   /**
-   * Returns the result of interpreting the object as an instance of '<em>Gen List Of Char</em>'. <!-- begin-user-doc
+   * Returns the result of interpreting the object as an instance of '<em>Gen List Of Char</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>Gen List Of Char</em>'.
    * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
    * @generated
@@ -426,27 +421,57 @@ public class Model5Switch<T>
   }
 
   /**
-   * Returns the result of interpreting the object as an instance of '<em>Gen List Of String</em>'. <!-- begin-user-doc
-   * --> This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
-   * @param object
-   *          the target of the switch.
-   * @return the result of interpreting the object as an instance of '<em>Gen List Of String</em>'.
+   * Returns the result of interpreting the object as an instance of '<em>Parent</em>'.
+   * <!-- begin-user-doc -->
+   * This implementation returns null;
+   * returning a non-null result will terminate the switch.
+   * <!-- end-user-doc -->
+   * @param object the target of the switch.
+   * @return the result of interpreting the object as an instance of '<em>Parent</em>'.
    * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
    * @generated
    */
+  public T caseParent(Parent object)
+  {
+    return null;
+  }
+
+  /**
+  	 * Returns the result of interpreting the object as an instance of '<em>Child</em>'.
+  	 * <!-- begin-user-doc -->
+  	 * This implementation returns null;
+  	 * returning a non-null result will terminate the switch.
+  	 * <!-- end-user-doc -->
+  	 * @param object the target of the switch.
+  	 * @return the result of interpreting the object as an instance of '<em>Child</em>'.
+  	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+  	 * @generated
+  	 */
+  public T caseChild(Child object)
+  {
+    return null;
+  }
+
+  /**
+  	 * Returns the result of interpreting the object as an instance of '<em>Gen List Of String</em>'.
+  	 * <!-- begin-user-doc
+     * --> This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
+  	 * @param object the target of the switch.
+  	 * @return the result of interpreting the object as an instance of '<em>Gen List Of String</em>'.
+  	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+  	 * @generated
+  	 */
   public T caseGenListOfString(GenListOfString object)
   {
     return null;
   }
 
   /**
-   * 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