model5

47 files changed, 1471 insertions, 395 deletions

diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.tests.model5/META-INF/MANIFEST.MF
index 9099ffae37..1644edb043 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/META-INF/MANIFEST.MF
@@ -10,8 +10,9 @@ Bundle-ClassPath: .
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.emf.cdo;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
  org.junit;bundle-version="[4.0.0,5.0.0)";visibility:=reexport
-Export-Package: org.eclipse.emf.cdo.tests.legacy.model5;version="3.0.200",
- org.eclipse.emf.cdo.tests.legacy.model5.impl;version="3.0.200",
- org.eclipse.emf.cdo.tests.model5;version="3.0.300",
+Export-Package: org.eclipse.emf.cdo.tests.model5;version="3.0.300",
  org.eclipse.emf.cdo.tests.model5.impl;version="3.0.300",
+ org.eclipse.emf.cdo.tests.model5.legacy;version="3.0.300",
+ org.eclipse.emf.cdo.tests.model5.legacy.impl;version="3.0.300",
+ org.eclipse.emf.cdo.tests.model5.legacy.util;version="3.0.300",
  org.eclipse.emf.cdo.tests.model5.util;version="3.0.300"
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
index 87db3c25ed..a95f31eb03 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/model/model5-legacy.genmodel
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/model/model5.legacy.genmodel
@@ -8,7 +8,8 @@
   <foreignModel>model5.ecore</foreignModel>
   <modelPluginVariables>CDO=org.eclipse.emf.cdo</modelPluginVariables>
   <modelPluginVariables>JUNIT=org.junit</modelPluginVariables>
-  <genPackages prefix="Model5" basePackage="org.eclipse.emf.cdo.tests.legacy" disposableProviderFactory="true"
+  <genPackages prefix="Model5" basePackage="org.eclipse.emf.cdo.tests" disposableProviderFactory="true"
+      metaDataPackageSuffix="legacy" classPackageSuffix="legacy.impl" utilityPackageSuffix="legacy.util"
       literalsInterface="false" extensibleProviderFactory="true" childCreationExtenders="true"
       ecorePackage="model5.ecore#/">
     <genDataTypes ecoreDataType="model5.ecore#//IntArray"/>
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
index c294f3b5ab..525b6dd751 100644
--- 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
@@ -26,13 +26,20 @@ import org.eclipse.emf.ecore.EObject;
  * </ul>
  * </p>
  *
- * @see org.eclipse.emf.cdo.tests.model5.Model5Package#getChild()
+ * @see org.eclipse.emf.cdo.tests.model5.legacy.Model5Package#getChild()
  * @model
  * @generated
  */
 public interface Child 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>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 -->
@@ -43,7 +50,7 @@ public interface Child extends EObject
    * <!-- 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.legacy.Model5Package#getChild_Parent()
    * @see org.eclipse.emf.cdo.tests.model5.Parent#getChildren
    * @model opposite="children" transient="false"
    * @generated
@@ -71,7 +78,7 @@ public interface Child extends EObject
    * <!-- 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.legacy.Model5Package#getChild_PreferredBy()
    * @see org.eclipse.emf.cdo.tests.model5.Parent#getFavourite
    * @model opposite="favourite"
    * @generated
@@ -89,29 +96,29 @@ public interface Child extends EObject
   void setPreferredBy(Parent value);
 
   /**
-  	 * Returns the value of the '<em><b>Name</b></em>' attribute.
-  	 * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Name</b></em>' attribute.
+   * <!-- begin-user-doc -->
   	 * <p>
   	 * If the meaning of the '<em>Name</em>' attribute isn't clear,
   	 * there really should be more of a description here...
   	 * </p>
   	 * <!-- end-user-doc -->
-  	 * @return the value of the '<em>Name</em>' attribute.
-  	 * @see #setName(String)
-  	 * @see org.eclipse.emf.cdo.tests.model5.Model5Package#getChild_Name()
-  	 * @model
-  	 * @generated
-  	 */
+   * @return the value of the '<em>Name</em>' attribute.
+   * @see #setName(String)
+   * @see org.eclipse.emf.cdo.tests.model5.legacy.Model5Package#getChild_Name()
+   * @model
+   * @generated
+   */
   String getName();
 
   /**
-  	 * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model5.Child#getName <em>Name</em>}' attribute.
-  	 * <!-- begin-user-doc -->
+   * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model5.Child#getName <em>Name</em>}' attribute.
+   * <!-- begin-user-doc -->
   	 * <!-- end-user-doc -->
-  	 * @param value the new value of the '<em>Name</em>' attribute.
-  	 * @see #getName()
-  	 * @generated
-  	 */
+   * @param value the new value of the '<em>Name</em>' attribute.
+   * @see #getName()
+   * @generated
+   */
   void setName(String 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 e82a119252..30a4d7f217 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
@@ -16,10 +16,17 @@ 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()
+ * @see org.eclipse.emf.cdo.tests.model5.legacy.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 e9b86dc65c..0e09711bb6 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,6 +30,13 @@ 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 -->
@@ -39,7 +46,7 @@ public interface GenListOfBoolean extends EObject
    * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Elements</em>' attribute list.
-   * @see org.eclipse.emf.cdo.tests.model5.Model5Package#getGenListOfBoolean_Elements()
+   * @see org.eclipse.emf.cdo.tests.model5.legacy.Model5Package#getGenListOfBoolean_Elements()
    * @model unique="false"
    * @generated
    */
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 223d74a08f..c0b472caa5 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,6 +30,13 @@ 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 -->
@@ -39,7 +46,7 @@ public interface GenListOfChar extends EObject
    * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Elements</em>' attribute list.
-   * @see org.eclipse.emf.cdo.tests.model5.Model5Package#getGenListOfChar_Elements()
+   * @see org.eclipse.emf.cdo.tests.model5.legacy.Model5Package#getGenListOfChar_Elements()
    * @model
    * @generated
    */
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 2defe86830..6c8982c711 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,6 +32,13 @@ 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 -->
@@ -41,7 +48,7 @@ public interface GenListOfDate extends EObject
    * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Elements</em>' attribute list.
-   * @see org.eclipse.emf.cdo.tests.model5.Model5Package#getGenListOfDate_Elements()
+   * @see org.eclipse.emf.cdo.tests.model5.legacy.Model5Package#getGenListOfDate_Elements()
    * @model
    * @generated
    */
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 772df24f06..85af224855 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,6 +30,13 @@ 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 -->
@@ -39,7 +46,7 @@ public interface GenListOfDouble extends EObject
    * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Elements</em>' attribute list.
-   * @see org.eclipse.emf.cdo.tests.model5.Model5Package#getGenListOfDouble_Elements()
+   * @see org.eclipse.emf.cdo.tests.model5.legacy.Model5Package#getGenListOfDouble_Elements()
    * @model
    * @generated
    */
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 884e9b54c9..19be601eab 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,6 +30,13 @@ 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 -->
@@ -39,7 +46,7 @@ public interface GenListOfFloat extends EObject
    * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Elements</em>' attribute list.
-   * @see org.eclipse.emf.cdo.tests.model5.Model5Package#getGenListOfFloat_Elements()
+   * @see org.eclipse.emf.cdo.tests.model5.legacy.Model5Package#getGenListOfFloat_Elements()
    * @model
    * @generated
    */
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 9d703f0d9b..f45d4a0928 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
@@ -23,13 +23,20 @@ import org.eclipse.emf.ecore.EObject;
  * </ul>
  * </p>
  *
- * @see org.eclipse.emf.cdo.tests.model5.Model5Package#getGenListOfInt()
+ * @see org.eclipse.emf.cdo.tests.model5.legacy.Model5Package#getGenListOfInt()
  * @model
  * @generated
  */
 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 -->
@@ -39,7 +46,7 @@ public interface GenListOfInt extends EObject
    * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Elements</em>' attribute list.
-   * @see org.eclipse.emf.cdo.tests.model5.Model5Package#getGenListOfInt_Elements()
+   * @see org.eclipse.emf.cdo.tests.model5.legacy.Model5Package#getGenListOfInt_Elements()
    * @model
    * @generated
    */
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 ac32a27e79..1fd17579f1 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
@@ -24,13 +24,20 @@ import org.eclipse.emf.ecore.EObject;
  * </ul>
  * </p>
  *
- * @see org.eclipse.emf.cdo.tests.model5.Model5Package#getGenListOfIntArray()
+ * @see org.eclipse.emf.cdo.tests.model5.legacy.Model5Package#getGenListOfIntArray()
  * @model
  * @generated
  */
 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}[].
    * <!-- begin-user-doc -->
@@ -40,7 +47,7 @@ public interface GenListOfIntArray extends EObject
    * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Elements</em>' attribute list.
-   * @see org.eclipse.emf.cdo.tests.model5.Model5Package#getGenListOfIntArray_Elements()
+   * @see org.eclipse.emf.cdo.tests.model5.legacy.Model5Package#getGenListOfIntArray_Elements()
    * @model dataType="org.eclipse.emf.cdo.tests.model5.IntArray"
    * @generated
    */
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 4061fa2f26..42751ab4ec 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,6 +30,13 @@ 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 -->
@@ -39,7 +46,7 @@ public interface GenListOfInteger extends EObject
    * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Elements</em>' attribute list.
-   * @see org.eclipse.emf.cdo.tests.model5.Model5Package#getGenListOfInteger_Elements()
+   * @see org.eclipse.emf.cdo.tests.model5.legacy.Model5Package#getGenListOfInteger_Elements()
    * @model
    * @generated
    */
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 529cb6f6a8..c57c5b0c44 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,6 +30,13 @@ 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 -->
@@ -39,7 +46,7 @@ public interface GenListOfLong extends EObject
    * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Elements</em>' attribute list.
-   * @see org.eclipse.emf.cdo.tests.model5.Model5Package#getGenListOfLong_Elements()
+   * @see org.eclipse.emf.cdo.tests.model5.legacy.Model5Package#getGenListOfLong_Elements()
    * @model
    * @generated
    */
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 da070672d8..eb3ccbe00d 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,6 +30,13 @@ 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 -->
@@ -39,7 +46,7 @@ public interface GenListOfShort extends EObject
    * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Elements</em>' attribute list.
-   * @see org.eclipse.emf.cdo.tests.model5.Model5Package#getGenListOfShort_Elements()
+   * @see org.eclipse.emf.cdo.tests.model5.legacy.Model5Package#getGenListOfShort_Elements()
    * @model
    * @generated
    */
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 45f324babc..a0a9b0d529 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,6 +30,13 @@ 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 -->
@@ -39,7 +46,7 @@ public interface GenListOfString extends EObject
    * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Elements</em>' attribute list.
-   * @see org.eclipse.emf.cdo.tests.model5.Model5Package#getGenListOfString_Elements()
+   * @see org.eclipse.emf.cdo.tests.model5.legacy.Model5Package#getGenListOfString_Elements()
    * @model
    * @generated
    */
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 d7da9b126a..a662ed074e 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
@@ -16,10 +16,17 @@ 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()
+ * @see org.eclipse.emf.cdo.tests.model5.legacy.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/Model5Package.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/Model5Package.java
index 798abc6572..e9cc5003f2 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
@@ -461,12 +461,12 @@ public interface Model5Package extends EPackage
   int PARENT__NAME = 2;
 
   /**
-  	 * The number of structural features of the '<em>Parent</em>' class.
-  	 * <!-- begin-user-doc -->
+   * The number of structural features of the '<em>Parent</em>' class.
+   * <!-- begin-user-doc -->
     	 * <!-- end-user-doc -->
-  	 * @generated
-  	 * @ordered
-  	 */
+   * @generated
+   * @ordered
+   */
   int PARENT_FEATURE_COUNT = 3;
 
   /**
@@ -507,12 +507,12 @@ public interface Model5Package extends EPackage
   int CHILD__NAME = 2;
 
   /**
-  	 * The number of structural features of the '<em>Child</em>' class.
-  	 * <!-- begin-user-doc -->
+   * The number of structural features of the '<em>Child</em>' class.
+   * <!-- begin-user-doc -->
     	 * <!-- end-user-doc -->
-  	 * @generated
-  	 * @ordered
-  	 */
+   * @generated
+   * @ordered
+   */
   int CHILD_FEATURE_COUNT = 3;
 
   /**
@@ -820,13 +820,13 @@ public interface Model5Package extends EPackage
   EAttribute getParent_Name();
 
   /**
-  	 * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model5.Child <em>Child</em>}'.
-  	 * <!-- begin-user-doc -->
+   * 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
-  	 */
+   * @return the meta object for class '<em>Child</em>'.
+   * @see org.eclipse.emf.cdo.tests.model5.Child
+   * @generated
+   */
   EClass getChild();
 
   /**
@@ -863,12 +863,12 @@ public interface Model5Package extends EPackage
   EAttribute getChild_Name();
 
   /**
-  	 * 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 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();
 
   /**
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
index b799c56b01..efa5bb6aca 100644
--- 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
@@ -27,13 +27,20 @@ import org.eclipse.emf.ecore.EObject;
  * </ul>
  * </p>
  *
- * @see org.eclipse.emf.cdo.tests.model5.Model5Package#getParent()
+ * @see org.eclipse.emf.cdo.tests.model5.legacy.Model5Package#getParent()
  * @model
  * @generated
  */
 public interface Parent 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>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>}'.
@@ -44,7 +51,7 @@ public interface Parent extends EObject
    * </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.legacy.Model5Package#getParent_Children()
    * @see org.eclipse.emf.cdo.tests.model5.Child#getParent
    * @model opposite="parent" containment="true"
    * @generated
@@ -62,7 +69,7 @@ public interface Parent extends EObject
    * <!-- 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.legacy.Model5Package#getParent_Favourite()
    * @see org.eclipse.emf.cdo.tests.model5.Child#getPreferredBy
    * @model opposite="preferredBy"
    * @generated
@@ -80,29 +87,29 @@ public interface Parent extends EObject
   void setFavourite(Child value);
 
   /**
-  	 * Returns the value of the '<em><b>Name</b></em>' attribute.
-  	 * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Name</b></em>' attribute.
+   * <!-- begin-user-doc -->
   	 * <p>
   	 * If the meaning of the '<em>Name</em>' attribute isn't clear,
   	 * there really should be more of a description here...
   	 * </p>
   	 * <!-- end-user-doc -->
-  	 * @return the value of the '<em>Name</em>' attribute.
-  	 * @see #setName(String)
-  	 * @see org.eclipse.emf.cdo.tests.model5.Model5Package#getParent_Name()
-  	 * @model
-  	 * @generated
-  	 */
+   * @return the value of the '<em>Name</em>' attribute.
+   * @see #setName(String)
+   * @see org.eclipse.emf.cdo.tests.model5.legacy.Model5Package#getParent_Name()
+   * @model
+   * @generated
+   */
   String getName();
 
   /**
-  	 * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model5.Parent#getName <em>Name</em>}' attribute.
-  	 * <!-- begin-user-doc -->
+   * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model5.Parent#getName <em>Name</em>}' attribute.
+   * <!-- begin-user-doc -->
   	 * <!-- end-user-doc -->
-  	 * @param value the new value of the '<em>Name</em>' attribute.
-  	 * @see #getName()
-  	 * @generated
-  	 */
+   * @param value the new value of the '<em>Name</em>' attribute.
+   * @see #getName()
+   * @generated
+   */
   void setName(String 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 2f0c5d81c3..fcae78991c 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,6 +33,13 @@ 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 -->
@@ -42,7 +49,7 @@ public interface TestFeatureMap extends EObject
    * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Managers</em>' reference list.
-   * @see org.eclipse.emf.cdo.tests.model5.Model5Package#getTestFeatureMap_Managers()
+   * @see org.eclipse.emf.cdo.tests.model5.legacy.Model5Package#getTestFeatureMap_Managers()
    * @model transient="true"
    *        extendedMetaData="group='#people'"
    * @generated
@@ -59,7 +66,7 @@ public interface TestFeatureMap extends EObject
    * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>Doctors</em>' reference list.
-   * @see org.eclipse.emf.cdo.tests.model5.Model5Package#getTestFeatureMap_Doctors()
+   * @see org.eclipse.emf.cdo.tests.model5.legacy.Model5Package#getTestFeatureMap_Doctors()
    * @model transient="true"
    *        extendedMetaData="group='#people'"
    * @generated
@@ -76,7 +83,7 @@ public interface TestFeatureMap extends EObject
    * </p>
    * <!-- end-user-doc -->
    * @return the value of the '<em>People</em>' attribute list.
-   * @see org.eclipse.emf.cdo.tests.model5.Model5Package#getTestFeatureMap_People()
+   * @see org.eclipse.emf.cdo.tests.model5.legacy.Model5Package#getTestFeatureMap_People()
    * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true"
    *        extendedMetaData="kind='group'"
    * @generated
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
index aaa6be398d..7f92b3d8f6 100644
--- 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
@@ -109,10 +109,10 @@ public class ChildImpl extends CDOObjectImpl implements Child
   }
 
   /**
-  	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
   	 * <!-- end-user-doc -->
-  	 * @generated
-  	 */
+   * @generated
+   */
   public String getName()
   {
     return (String)eGet(Model5Package.eINSTANCE.getChild_Name(), true);
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 3c17843d35..e53ee5ceb3 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
@@ -4,12 +4,13 @@
  * 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:
  *    Eike Stepper - initial API and implementation
  */
 package org.eclipse.emf.cdo.tests.model5.impl;
 
+//import org.eclipse.emf.cdo.tests.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;
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 ff855c69b4..510a3ca697 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
@@ -482,10 +482,10 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
   }
 
   /**
-  	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
     	 * <!-- end-user-doc -->
-  	 * @generated
-  	 */
+   * @generated
+   */
   public EClass getChild()
   {
     return childEClass;
@@ -522,9 +522,9 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
   }
 
   /**
-  	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-  	 * @generated
-  	 */
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @generated
+   */
   public EDataType getIntArray()
   {
     return intArrayEDataType;
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
index c02be9ec4f..fc7148b2f2 100644
--- 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
@@ -101,20 +101,20 @@ public class ParentImpl extends CDOObjectImpl implements Parent
   }
 
   /**
-  	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
   	 * <!-- end-user-doc -->
-  	 * @generated
-  	 */
+   * @generated
+   */
   public String getName()
   {
     return (String)eGet(Model5Package.eINSTANCE.getParent_Name(), true);
   }
 
   /**
-  	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
   	 * <!-- end-user-doc -->
-  	 * @generated
-  	 */
+   * @generated
+   */
   public void setNameGen(String newName)
   {
     eSet(Model5Package.eINSTANCE.getParent_Name(), newName);
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/model5/legacy/Model5Factory.java
index 2a47bc28dd..7d6e4b101b 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/model5/legacy/Model5Factory.java
@@ -8,7 +8,7 @@
  * Contributors:
  *    Eike Stepper - initial API and implementation
  */
-package org.eclipse.emf.cdo.tests.legacy.model5;
+package org.eclipse.emf.cdo.tests.model5.legacy;
 
 import org.eclipse.emf.cdo.tests.model5.Child;
 import org.eclipse.emf.cdo.tests.model5.Doctor;
@@ -26,14 +26,17 @@ 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.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.legacy.model5.Model5Package
- * @generated NOT
+ * <!-- begin-user-doc -->
+ * The <b>Factory</b> for the model. It provides a create method for each non-abstract class of the model.
+ * @extends org.eclipse.emf.cdo.tests.model5.Model5Factory
+ * <!-- end-user-doc -->
+ * @see org.eclipse.emf.cdo.tests.model5.legacy.Model5Package
+ * @generated
  */
-public interface Model5Factory extends org.eclipse.emf.cdo.tests.model5.Model5Factory
+public interface Model5Factory extends EFactory, org.eclipse.emf.cdo.tests.model5.Model5Factory
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -46,7 +49,7 @@ public interface Model5Factory extends org.eclipse.emf.cdo.tests.model5.Model5Fa
    * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
-  Model5Factory eINSTANCE = org.eclipse.emf.cdo.tests.legacy.model5.impl.Model5FactoryImpl.init();
+  Model5Factory eINSTANCE = org.eclipse.emf.cdo.tests.model5.legacy.impl.Model5FactoryImpl.init();
 
   /**
    * Returns a new object of class '<em>Test Feature Map</em>'.
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/model5/legacy/Model5Package.java
index f4afddf53e..82f7fb7ca4 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/model5/legacy/Model5Package.java
@@ -8,11 +8,12 @@
  * Contributors:
  *    Eike Stepper - initial API and implementation
  */
-package org.eclipse.emf.cdo.tests.legacy.model5;
+package org.eclipse.emf.cdo.tests.model5.legacy;
 
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EDataType;
+import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EReference;
 
 /**
@@ -23,12 +24,13 @@ import org.eclipse.emf.ecore.EReference;
  * <li>each enum,</li>
  * <li>and each data type</li>
  * </ul>
+ * @extends org.eclipse.emf.cdo.tests.model5.Model5Package
  * <!-- end-user-doc -->
- * @see org.eclipse.emf.cdo.tests.legacy.model5.Model5Factory
+ * @see org.eclipse.emf.cdo.tests.model5.legacy.Model5Factory
  * @model kind="package"
- * @generated NOT
+ * @generated
  */
-public interface Model5Package extends org.eclipse.emf.cdo.tests.model5.Model5Package
+public interface Model5Package extends EPackage, org.eclipse.emf.cdo.tests.model5.Model5Package
 {
   /**
    * <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -45,7 +47,7 @@ public interface Model5Package extends org.eclipse.emf.cdo.tests.model5.Model5Pa
 
   /**
    * The package namespace URI. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated NOT
    */
   String eNS_URI = "http://www.eclipse.org/emf/CDO/tests/legacy/model5/1.0.0";
@@ -62,13 +64,13 @@ public interface Model5Package extends org.eclipse.emf.cdo.tests.model5.Model5Pa
    * <!-- begin-user-doc --> <!-- end-user-doc -->
    * @generated
    */
-  Model5Package eINSTANCE = org.eclipse.emf.cdo.tests.legacy.model5.impl.Model5PackageImpl.init();
+  Model5Package eINSTANCE = org.eclipse.emf.cdo.tests.model5.legacy.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.
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model5.legacy.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()
+   * @see org.eclipse.emf.cdo.tests.model5.legacy.impl.TestFeatureMapImpl
+   * @see org.eclipse.emf.cdo.tests.model5.legacy.impl.Model5PackageImpl#getTestFeatureMap()
    * @generated
    */
   int TEST_FEATURE_MAP = 0;
@@ -107,10 +109,10 @@ public interface Model5Package extends org.eclipse.emf.cdo.tests.model5.Model5Pa
   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.
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model5.legacy.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()
+   * @see org.eclipse.emf.cdo.tests.model5.legacy.impl.ManagerImpl
+   * @see org.eclipse.emf.cdo.tests.model5.legacy.impl.Model5PackageImpl#getManager()
    * @generated
    */
   int MANAGER = 1;
@@ -124,10 +126,10 @@ public interface Model5Package extends org.eclipse.emf.cdo.tests.model5.Model5Pa
   int MANAGER_FEATURE_COUNT = 0;
 
   /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model5.impl.DoctorImpl <em>Doctor</em>}' class.
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model5.legacy.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()
+   * @see org.eclipse.emf.cdo.tests.model5.legacy.impl.DoctorImpl
+   * @see org.eclipse.emf.cdo.tests.model5.legacy.impl.Model5PackageImpl#getDoctor()
    * @generated
    */
   int DOCTOR = 2;
@@ -141,10 +143,10 @@ public interface Model5Package extends org.eclipse.emf.cdo.tests.model5.Model5Pa
   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.
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model5.legacy.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()
+   * @see org.eclipse.emf.cdo.tests.model5.legacy.impl.GenListOfStringImpl
+   * @see org.eclipse.emf.cdo.tests.model5.legacy.impl.Model5PackageImpl#getGenListOfString()
    * @generated
    */
   int GEN_LIST_OF_STRING = 3;
@@ -167,10 +169,10 @@ public interface Model5Package extends org.eclipse.emf.cdo.tests.model5.Model5Pa
   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.
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model5.legacy.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()
+   * @see org.eclipse.emf.cdo.tests.model5.legacy.impl.GenListOfIntImpl
+   * @see org.eclipse.emf.cdo.tests.model5.legacy.impl.Model5PackageImpl#getGenListOfInt()
    * @generated
    */
   int GEN_LIST_OF_INT = 4;
@@ -193,10 +195,10 @@ public interface Model5Package extends org.eclipse.emf.cdo.tests.model5.Model5Pa
   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.
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model5.legacy.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()
+   * @see org.eclipse.emf.cdo.tests.model5.legacy.impl.GenListOfIntegerImpl
+   * @see org.eclipse.emf.cdo.tests.model5.legacy.impl.Model5PackageImpl#getGenListOfInteger()
    * @generated
    */
   int GEN_LIST_OF_INTEGER = 5;
@@ -219,10 +221,10 @@ public interface Model5Package extends org.eclipse.emf.cdo.tests.model5.Model5Pa
   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.
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model5.legacy.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()
+   * @see org.eclipse.emf.cdo.tests.model5.legacy.impl.GenListOfLongImpl
+   * @see org.eclipse.emf.cdo.tests.model5.legacy.impl.Model5PackageImpl#getGenListOfLong()
    * @generated
    */
   int GEN_LIST_OF_LONG = 6;
@@ -245,10 +247,10 @@ public interface Model5Package extends org.eclipse.emf.cdo.tests.model5.Model5Pa
   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.
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model5.legacy.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()
+   * @see org.eclipse.emf.cdo.tests.model5.legacy.impl.GenListOfBooleanImpl
+   * @see org.eclipse.emf.cdo.tests.model5.legacy.impl.Model5PackageImpl#getGenListOfBoolean()
    * @generated
    */
   int GEN_LIST_OF_BOOLEAN = 7;
@@ -271,10 +273,10 @@ public interface Model5Package extends org.eclipse.emf.cdo.tests.model5.Model5Pa
   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.
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model5.legacy.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()
+   * @see org.eclipse.emf.cdo.tests.model5.legacy.impl.GenListOfShortImpl
+   * @see org.eclipse.emf.cdo.tests.model5.legacy.impl.Model5PackageImpl#getGenListOfShort()
    * @generated
    */
   int GEN_LIST_OF_SHORT = 8;
@@ -297,10 +299,10 @@ public interface Model5Package extends org.eclipse.emf.cdo.tests.model5.Model5Pa
   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.
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model5.legacy.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()
+   * @see org.eclipse.emf.cdo.tests.model5.legacy.impl.GenListOfFloatImpl
+   * @see org.eclipse.emf.cdo.tests.model5.legacy.impl.Model5PackageImpl#getGenListOfFloat()
    * @generated
    */
   int GEN_LIST_OF_FLOAT = 9;
@@ -323,10 +325,10 @@ public interface Model5Package extends org.eclipse.emf.cdo.tests.model5.Model5Pa
   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.
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model5.legacy.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()
+   * @see org.eclipse.emf.cdo.tests.model5.legacy.impl.GenListOfDoubleImpl
+   * @see org.eclipse.emf.cdo.tests.model5.legacy.impl.Model5PackageImpl#getGenListOfDouble()
    * @generated
    */
   int GEN_LIST_OF_DOUBLE = 10;
@@ -349,10 +351,10 @@ public interface Model5Package extends org.eclipse.emf.cdo.tests.model5.Model5Pa
   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.
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model5.legacy.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()
+   * @see org.eclipse.emf.cdo.tests.model5.legacy.impl.GenListOfDateImpl
+   * @see org.eclipse.emf.cdo.tests.model5.legacy.impl.Model5PackageImpl#getGenListOfDate()
    * @generated
    */
   int GEN_LIST_OF_DATE = 11;
@@ -375,10 +377,10 @@ public interface Model5Package extends org.eclipse.emf.cdo.tests.model5.Model5Pa
   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.
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model5.legacy.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()
+   * @see org.eclipse.emf.cdo.tests.model5.legacy.impl.GenListOfCharImpl
+   * @see org.eclipse.emf.cdo.tests.model5.legacy.impl.Model5PackageImpl#getGenListOfChar()
    * @generated
    */
   int GEN_LIST_OF_CHAR = 12;
@@ -401,10 +403,10 @@ public interface Model5Package extends org.eclipse.emf.cdo.tests.model5.Model5Pa
   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.
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model5.legacy.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()
+   * @see org.eclipse.emf.cdo.tests.model5.legacy.impl.GenListOfIntArrayImpl
+   * @see org.eclipse.emf.cdo.tests.model5.legacy.impl.Model5PackageImpl#getGenListOfIntArray()
    * @generated
    */
   int GEN_LIST_OF_INT_ARRAY = 13;
@@ -427,11 +429,11 @@ public interface Model5Package extends org.eclipse.emf.cdo.tests.model5.Model5Pa
   int GEN_LIST_OF_INT_ARRAY_FEATURE_COUNT = 1;
 
   /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model5.impl.ParentImpl <em>Parent</em>}' class.
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model5.legacy.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()
+   * @see org.eclipse.emf.cdo.tests.model5.legacy.impl.ParentImpl
+   * @see org.eclipse.emf.cdo.tests.model5.legacy.impl.Model5PackageImpl#getParent()
    * @generated
    */
   int PARENT = 14;
@@ -464,20 +466,20 @@ public interface Model5Package extends org.eclipse.emf.cdo.tests.model5.Model5Pa
   int PARENT__NAME = 2;
 
   /**
-  	 * The number of structural features of the '<em>Parent</em>' class.
-  	 * <!-- begin-user-doc -->
+   * The number of structural features of the '<em>Parent</em>' class.
+   * <!-- begin-user-doc -->
     	 * <!-- end-user-doc -->
-  	 * @generated
-  	 * @ordered
-  	 */
+   * @generated
+   * @ordered
+   */
   int PARENT_FEATURE_COUNT = 3;
 
   /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.legacy.model5.impl.ChildImpl <em>Child</em>}' class.
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model5.legacy.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()
+   * @see org.eclipse.emf.cdo.tests.model5.legacy.impl.ChildImpl
+   * @see org.eclipse.emf.cdo.tests.model5.legacy.impl.Model5PackageImpl#getChild()
    * @generated
    */
   int CHILD = 15;
@@ -510,59 +512,59 @@ public interface Model5Package extends org.eclipse.emf.cdo.tests.model5.Model5Pa
   int CHILD__NAME = 2;
 
   /**
-  	 * The number of structural features of the '<em>Child</em>' class.
-  	 * <!-- begin-user-doc -->
+   * The number of structural features of the '<em>Child</em>' class.
+   * <!-- begin-user-doc -->
     	 * <!-- end-user-doc -->
-  	 * @generated
-  	 * @ordered
-  	 */
+   * @generated
+   * @ordered
+   */
   int CHILD_FEATURE_COUNT = 3;
 
   /**
    * 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()
+   * @see org.eclipse.emf.cdo.tests.model5.legacy.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>}'.
+   * 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.legacy.model5.TestFeatureMap
+   * @see org.eclipse.emf.cdo.tests.model5.TestFeatureMap
    * @generated
    */
   EClass getTestFeatureMap();
 
   /**
-   * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.tests.legacy.model5.TestFeatureMap#getManagers <em>Managers</em>}'.
+   * 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.legacy.model5.TestFeatureMap#getManagers()
+   * @see org.eclipse.emf.cdo.tests.model5.TestFeatureMap#getManagers()
    * @see #getTestFeatureMap()
    * @generated
    */
   EReference getTestFeatureMap_Managers();
 
   /**
-   * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.tests.legacy.model5.TestFeatureMap#getDoctors <em>Doctors</em>}'.
+   * 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.legacy.model5.TestFeatureMap#getDoctors()
+   * @see org.eclipse.emf.cdo.tests.model5.TestFeatureMap#getDoctors()
    * @see #getTestFeatureMap()
    * @generated
    */
   EReference getTestFeatureMap_Doctors();
 
   /**
-   * Returns the meta object for the attribute list '{@link org.eclipse.emf.cdo.tests.legacy.model5.TestFeatureMap#getPeople <em>People</em>}'.
+   * 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.legacy.model5.TestFeatureMap#getPeople()
+   * @see org.eclipse.emf.cdo.tests.model5.TestFeatureMap#getPeople()
    * @see #getTestFeatureMap()
    * @generated
    */
@@ -571,7 +573,7 @@ public interface Model5Package extends org.eclipse.emf.cdo.tests.model5.Model5Pa
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model5.Manager <em>Manager</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Manager</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model5.Manager
    * @generated
@@ -581,7 +583,7 @@ public interface Model5Package extends org.eclipse.emf.cdo.tests.model5.Model5Pa
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model5.Doctor <em>Doctor</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Doctor</em>'.
    * @see org.eclipse.emf.cdo.tests.legacy.model5.Doctor
    * @generated
@@ -589,50 +591,50 @@ 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>}'.
+   * 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.legacy.model5.GenListOfString
+   * @see org.eclipse.emf.cdo.tests.model5.GenListOfString
    * @generated
    */
   EClass getGenListOfString();
 
   /**
-   * Returns the meta object for the attribute list '{@link org.eclipse.emf.cdo.tests.legacy.model5.GenListOfString#getElements <em>Elements</em>}'.
+   * 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.legacy.model5.GenListOfString#getElements()
+   * @see org.eclipse.emf.cdo.tests.model5.GenListOfString#getElements()
    * @see #getGenListOfString()
    * @generated
    */
   EAttribute getGenListOfString_Elements();
 
   /**
-   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model5.GenListOfInt <em>Gen List Of Int</em>}'.
+   * 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.legacy.model5.GenListOfInt
+   * @see org.eclipse.emf.cdo.tests.model5.GenListOfInt
    * @generated
    */
   EClass getGenListOfInt();
 
   /**
-   * Returns the meta object for the attribute list '{@link org.eclipse.emf.cdo.tests.legacy.model5.GenListOfInt#getElements <em>Elements</em>}'.
+   * 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.legacy.model5.GenListOfInt#getElements()
+   * @see org.eclipse.emf.cdo.tests.model5.GenListOfInt#getElements()
    * @see #getGenListOfInt()
    * @generated
    */
   EAttribute getGenListOfInt_Elements();
 
   /**
-   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model5.GenListOfInteger <em>Gen List Of Integer</em>}'.
+   * 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.legacy.model5.GenListOfInteger
+   * @see org.eclipse.emf.cdo.tests.model5.GenListOfInteger
    * @generated
    */
   EClass getGenListOfInteger();
@@ -641,7 +643,7 @@ public interface Model5Package extends org.eclipse.emf.cdo.tests.model5.Model5Pa
    * Returns the meta object for the attribute list '
    * {@link org.eclipse.emf.cdo.tests.legacy.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.legacy.model5.GenListOfInteger#getElements()
    * @see #getGenListOfInteger()
@@ -650,30 +652,30 @@ 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>}'.
+   * 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.legacy.model5.GenListOfLong
+   * @see org.eclipse.emf.cdo.tests.model5.GenListOfLong
    * @generated
    */
   EClass getGenListOfLong();
 
   /**
-   * Returns the meta object for the attribute list '{@link org.eclipse.emf.cdo.tests.legacy.model5.GenListOfLong#getElements <em>Elements</em>}'.
+   * 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.legacy.model5.GenListOfLong#getElements()
+   * @see org.eclipse.emf.cdo.tests.model5.GenListOfLong#getElements()
    * @see #getGenListOfLong()
    * @generated
    */
   EAttribute getGenListOfLong_Elements();
 
   /**
-   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model5.GenListOfBoolean <em>Gen List Of Boolean</em>}'.
+   * 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.legacy.model5.GenListOfBoolean
+   * @see org.eclipse.emf.cdo.tests.model5.GenListOfBoolean
    * @generated
    */
   EClass getGenListOfBoolean();
@@ -682,7 +684,7 @@ public interface Model5Package extends org.eclipse.emf.cdo.tests.model5.Model5Pa
    * Returns the meta object for the attribute list '
    * {@link org.eclipse.emf.cdo.tests.legacy.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.legacy.model5.GenListOfBoolean#getElements()
    * @see #getGenListOfBoolean()
@@ -691,110 +693,110 @@ 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>}'.
+   * 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.legacy.model5.GenListOfShort
+   * @see org.eclipse.emf.cdo.tests.model5.GenListOfShort
    * @generated
    */
   EClass getGenListOfShort();
 
   /**
-   * Returns the meta object for the attribute list '{@link org.eclipse.emf.cdo.tests.legacy.model5.GenListOfShort#getElements <em>Elements</em>}'.
+   * 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.legacy.model5.GenListOfShort#getElements()
+   * @see org.eclipse.emf.cdo.tests.model5.GenListOfShort#getElements()
    * @see #getGenListOfShort()
    * @generated
    */
   EAttribute getGenListOfShort_Elements();
 
   /**
-   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model5.GenListOfFloat <em>Gen List Of Float</em>}'.
+   * 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.legacy.model5.GenListOfFloat
+   * @see org.eclipse.emf.cdo.tests.model5.GenListOfFloat
    * @generated
    */
   EClass getGenListOfFloat();
 
   /**
-   * Returns the meta object for the attribute list '{@link org.eclipse.emf.cdo.tests.legacy.model5.GenListOfFloat#getElements <em>Elements</em>}'.
+   * 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.legacy.model5.GenListOfFloat#getElements()
+   * @see org.eclipse.emf.cdo.tests.model5.GenListOfFloat#getElements()
    * @see #getGenListOfFloat()
    * @generated
    */
   EAttribute getGenListOfFloat_Elements();
 
   /**
-   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model5.GenListOfDouble <em>Gen List Of Double</em>}'.
+   * 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.legacy.model5.GenListOfDouble
+   * @see org.eclipse.emf.cdo.tests.model5.GenListOfDouble
    * @generated
    */
   EClass getGenListOfDouble();
 
   /**
-   * Returns the meta object for the attribute list '{@link org.eclipse.emf.cdo.tests.legacy.model5.GenListOfDouble#getElements <em>Elements</em>}'.
+   * 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.legacy.model5.GenListOfDouble#getElements()
+   * @see org.eclipse.emf.cdo.tests.model5.GenListOfDouble#getElements()
    * @see #getGenListOfDouble()
    * @generated
    */
   EAttribute getGenListOfDouble_Elements();
 
   /**
-   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model5.GenListOfDate <em>Gen List Of Date</em>}'.
+   * 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.legacy.model5.GenListOfDate
+   * @see org.eclipse.emf.cdo.tests.model5.GenListOfDate
    * @generated
    */
   EClass getGenListOfDate();
 
   /**
-   * Returns the meta object for the attribute list '{@link org.eclipse.emf.cdo.tests.legacy.model5.GenListOfDate#getElements <em>Elements</em>}'.
+   * 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.legacy.model5.GenListOfDate#getElements()
+   * @see org.eclipse.emf.cdo.tests.model5.GenListOfDate#getElements()
    * @see #getGenListOfDate()
    * @generated
    */
   EAttribute getGenListOfDate_Elements();
 
   /**
-   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model5.GenListOfChar <em>Gen List Of Char</em>}'.
+   * 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.legacy.model5.GenListOfChar
+   * @see org.eclipse.emf.cdo.tests.model5.GenListOfChar
    * @generated
    */
   EClass getGenListOfChar();
 
   /**
-   * Returns the meta object for the attribute list '{@link org.eclipse.emf.cdo.tests.legacy.model5.GenListOfChar#getElements <em>Elements</em>}'.
+   * 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.legacy.model5.GenListOfChar#getElements()
+   * @see org.eclipse.emf.cdo.tests.model5.GenListOfChar#getElements()
    * @see #getGenListOfChar()
    * @generated
    */
   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>}'.
+   * 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.legacy.model5.GenListOfIntArray
+   * @see org.eclipse.emf.cdo.tests.model5.GenListOfIntArray
    * @generated
    */
   EClass getGenListOfIntArray();
@@ -803,7 +805,7 @@ public interface Model5Package extends org.eclipse.emf.cdo.tests.model5.Model5Pa
    * Returns the meta object for the attribute list '
    * {@link org.eclipse.emf.cdo.tests.legacy.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.legacy.model5.GenListOfIntArray#getElements()
    * @see #getGenListOfIntArray()
@@ -812,98 +814,98 @@ public interface Model5Package extends org.eclipse.emf.cdo.tests.model5.Model5Pa
   EAttribute getGenListOfIntArray_Elements();
 
   /**
-   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model5.Parent <em>Parent</em>}'.
+   * 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.legacy.model5.Parent
+   * @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.legacy.model5.Parent#getChildren <em>Children</em>}'.
+   * 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.legacy.model5.Parent#getChildren()
+   * @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.legacy.model5.Parent#getFavourite <em>Favourite</em>}'.
+   * 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.legacy.model5.Parent#getFavourite()
+   * @see org.eclipse.emf.cdo.tests.model5.Parent#getFavourite()
    * @see #getParent()
    * @generated
    */
   EReference getParent_Favourite();
 
   /**
-   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model5.Parent#getName <em>Name</em>}'.
+   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model5.Parent#getName <em>Name</em>}'.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @return the meta object for the attribute '<em>Name</em>'.
-   * @see org.eclipse.emf.cdo.tests.legacy.model5.Parent#getName()
+   * @see org.eclipse.emf.cdo.tests.model5.Parent#getName()
    * @see #getParent()
    * @generated
    */
   EAttribute getParent_Name();
 
   /**
-  	 * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.legacy.model5.Child <em>Child</em>}'.
-  	 * <!-- begin-user-doc -->
+   * 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.legacy.model5.Child
-  	 * @generated
-  	 */
+   * @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.legacy.model5.Child#getParent <em>Parent</em>}'.
+   * 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.legacy.model5.Child#getParent()
+   * @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.legacy.model5.Child#getPreferredBy <em>Preferred By</em>}'.
+   * 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.legacy.model5.Child#getPreferredBy()
+   * @see org.eclipse.emf.cdo.tests.model5.Child#getPreferredBy()
    * @see #getChild()
    * @generated
    */
   EReference getChild_PreferredBy();
 
   /**
-   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.legacy.model5.Child#getName <em>Name</em>}'.
+   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model5.Child#getName <em>Name</em>}'.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @return the meta object for the attribute '<em>Name</em>'.
-   * @see org.eclipse.emf.cdo.tests.legacy.model5.Child#getName()
+   * @see org.eclipse.emf.cdo.tests.model5.Child#getName()
    * @see #getChild()
    * @generated
    */
   EAttribute getChild_Name();
 
   /**
-  	 * 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 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();
 
   /**
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/model5/legacy/impl/ChildImpl.java
index 9f4364a6dc..2b550e7206 100644
--- 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/model5/legacy/impl/ChildImpl.java
@@ -8,11 +8,11 @@
  * Contributors:
  *    Christian W. Damus (CEA) - initial API and implementation
  */
-package org.eclipse.emf.cdo.tests.legacy.model5.impl;
+package org.eclipse.emf.cdo.tests.model5.legacy.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.cdo.tests.model5.legacy.Model5Package;
 import org.eclipse.emf.cdo.tests.model5.util.IsLoadingTestFixture;
 
 import org.eclipse.emf.common.notify.Notification;
@@ -30,9 +30,9 @@ import org.eclipse.emf.ecore.util.EcoreUtil;
  * <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>
- *   <li>{@link org.eclipse.emf.cdo.tests.legacy.model5.impl.ChildImpl#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.emf.cdo.tests.model5.legacy.impl.ChildImpl#getParent <em>Parent</em>}</li>
+ *   <li>{@link org.eclipse.emf.cdo.tests.model5.legacy.impl.ChildImpl#getPreferredBy <em>Preferred By</em>}</li>
+ *   <li>{@link org.eclipse.emf.cdo.tests.model5.legacy.impl.ChildImpl#getName <em>Name</em>}</li>
  * </ul>
  * </p>
  *
@@ -68,20 +68,20 @@ public class ChildImpl extends EObjectImpl implements Child
   protected static final String NAME_EDEFAULT = null;
 
   /**
-  	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-  	 * <!-- begin-user-doc -->
+   * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
+   * <!-- begin-user-doc -->
   	 * <!-- end-user-doc -->
-  	 * @see #getName()
-  	 * @generated
-  	 * @ordered
-  	 */
+   * @see #getName()
+   * @generated
+   * @ordered
+   */
   protected String name = NAME_EDEFAULT;
 
   /**
-  	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-  	 * @generated
-  	 */
+   * @generated
+   */
   protected ChildImpl()
   {
     super();
@@ -106,9 +106,7 @@ public class ChildImpl extends EObjectImpl implements Child
   public Parent getParent()
   {
     if (eContainerFeatureID() != Model5Package.CHILD__PARENT)
-    {
       return null;
-    }
     return (Parent)eContainer();
   }
 
@@ -130,31 +128,22 @@ public class ChildImpl extends EObjectImpl implements Child
    */
   public void setParent(Parent newParent)
   {
-    if (newParent != eInternalContainer() || eContainerFeatureID() != Model5Package.CHILD__PARENT && newParent != null)
+    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));
-    }
   }
 
   /**
@@ -171,10 +160,8 @@ public class ChildImpl extends EObjectImpl implements Child
       if (preferredBy != oldPreferredBy)
       {
         if (eNotificationRequired())
-        {
           eNotify(new ENotificationImpl(this, Notification.RESOLVE, Model5Package.CHILD__PREFERRED_BY, oldPreferredBy,
               preferredBy));
-        }
       }
     }
     return preferredBy;
@@ -204,13 +191,9 @@ public class ChildImpl extends EObjectImpl implements Child
       ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, Model5Package.CHILD__PREFERRED_BY,
           oldPreferredBy, newPreferredBy);
       if (msgs == null)
-      {
         msgs = notification;
-      }
       else
-      {
         msgs.add(notification);
-      }
     }
     return msgs;
   }
@@ -226,24 +209,16 @@ public class ChildImpl extends EObjectImpl implements Child
     {
       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));
-    }
   }
 
   /**
@@ -257,18 +232,16 @@ public class ChildImpl extends EObjectImpl implements Child
   }
 
   /**
-  	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
   	 * <!-- end-user-doc -->
-  	 * @generated
-  	 */
+   * @generated
+   */
   public void setNameGen(String newName)
   {
     String oldName = name;
     name = newName;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model5Package.CHILD__NAME, oldName, name));
-    }
   }
 
   public void setName(String newName)
@@ -278,10 +251,10 @@ public class ChildImpl extends EObjectImpl implements Child
   }
 
   /**
-  	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-  	 * @generated
-  	 */
+   * @generated
+   */
   @Override
   public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs)
   {
@@ -289,15 +262,11 @@ public class ChildImpl extends EObjectImpl implements Child
     {
     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);
@@ -351,9 +320,7 @@ public class ChildImpl extends EObjectImpl implements Child
       return getParent();
     case Model5Package.CHILD__PREFERRED_BY:
       if (resolve)
-      {
         return getPreferredBy();
-      }
       return basicGetPreferredBy();
     case Model5Package.CHILD__NAME:
       return getName();
@@ -428,17 +395,15 @@ public class ChildImpl extends EObjectImpl implements Child
   }
 
   /**
-  	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
   	 * <!-- end-user-doc -->
-  	 * @generated
-  	 */
+   * @generated
+   */
   @Override
   public String toString()
   {
     if (eIsProxy())
-    {
       return super.toString();
-    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (name: ");
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/model5/legacy/impl/DoctorImpl.java
index b1c4d3ea38..b9c9a2eb0d 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/model5/legacy/impl/DoctorImpl.java
@@ -8,10 +8,10 @@
  * Contributors:
  *    Eike Stepper - initial API and implementation
  */
-package org.eclipse.emf.cdo.tests.legacy.model5.impl;
+package org.eclipse.emf.cdo.tests.model5.legacy.impl;
 
-import org.eclipse.emf.cdo.tests.legacy.model5.Model5Package;
 import org.eclipse.emf.cdo.tests.model5.Doctor;
+import org.eclipse.emf.cdo.tests.model5.legacy.Model5Package;
 
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.impl.EObjectImpl;
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/model5/legacy/impl/GenListOfBooleanImpl.java
index 2cf32adaec..f68ad70524 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/model5/legacy/impl/GenListOfBooleanImpl.java
@@ -8,10 +8,10 @@
  * Contributors:
  *    Eike Stepper - initial API and implementation
  */
-package org.eclipse.emf.cdo.tests.legacy.model5.impl;
+package org.eclipse.emf.cdo.tests.model5.legacy.impl;
 
-import org.eclipse.emf.cdo.tests.legacy.model5.Model5Package;
 import org.eclipse.emf.cdo.tests.model5.GenListOfBoolean;
+import org.eclipse.emf.cdo.tests.model5.legacy.Model5Package;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
@@ -26,7 +26,7 @@ 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.model5.legacy.impl.GenListOfBooleanImpl#getElements <em>Elements</em>}</li>
  * </ul>
  * </p>
  *
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/model5/legacy/impl/GenListOfCharImpl.java
index cea79ff832..b3066ceb6f 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/model5/legacy/impl/GenListOfCharImpl.java
@@ -8,10 +8,10 @@
  * Contributors:
  *    Eike Stepper - initial API and implementation
  */
-package org.eclipse.emf.cdo.tests.legacy.model5.impl;
+package org.eclipse.emf.cdo.tests.model5.legacy.impl;
 
-import org.eclipse.emf.cdo.tests.legacy.model5.Model5Package;
 import org.eclipse.emf.cdo.tests.model5.GenListOfChar;
+import org.eclipse.emf.cdo.tests.model5.legacy.Model5Package;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
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/model5/legacy/impl/GenListOfDateImpl.java
index bfeb22716a..c857b8727f 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/model5/legacy/impl/GenListOfDateImpl.java
@@ -8,10 +8,10 @@
  * Contributors:
  *    Eike Stepper - initial API and implementation
  */
-package org.eclipse.emf.cdo.tests.legacy.model5.impl;
+package org.eclipse.emf.cdo.tests.model5.legacy.impl;
 
-import org.eclipse.emf.cdo.tests.legacy.model5.Model5Package;
 import org.eclipse.emf.cdo.tests.model5.GenListOfDate;
+import org.eclipse.emf.cdo.tests.model5.legacy.Model5Package;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
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/model5/legacy/impl/GenListOfDoubleImpl.java
index 3f5bd88ee1..df1889e15e 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/model5/legacy/impl/GenListOfDoubleImpl.java
@@ -8,10 +8,10 @@
  * Contributors:
  *    Eike Stepper - initial API and implementation
  */
-package org.eclipse.emf.cdo.tests.legacy.model5.impl;
+package org.eclipse.emf.cdo.tests.model5.legacy.impl;
 
-import org.eclipse.emf.cdo.tests.legacy.model5.Model5Package;
 import org.eclipse.emf.cdo.tests.model5.GenListOfDouble;
+import org.eclipse.emf.cdo.tests.model5.legacy.Model5Package;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
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/model5/legacy/impl/GenListOfFloatImpl.java
index 4d16a1f14f..41d23377bd 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/model5/legacy/impl/GenListOfFloatImpl.java
@@ -8,10 +8,10 @@
  * Contributors:
  *    Eike Stepper - initial API and implementation
  */
-package org.eclipse.emf.cdo.tests.legacy.model5.impl;
+package org.eclipse.emf.cdo.tests.model5.legacy.impl;
 
-import org.eclipse.emf.cdo.tests.legacy.model5.Model5Package;
 import org.eclipse.emf.cdo.tests.model5.GenListOfFloat;
+import org.eclipse.emf.cdo.tests.model5.legacy.Model5Package;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
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/model5/legacy/impl/GenListOfIntArrayImpl.java
index 353f756d92..c9cd031e61 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/model5/legacy/impl/GenListOfIntArrayImpl.java
@@ -8,10 +8,10 @@
  * Contributors:
  *    Eike Stepper - initial API and implementation
  */
-package org.eclipse.emf.cdo.tests.legacy.model5.impl;
+package org.eclipse.emf.cdo.tests.model5.legacy.impl;
 
-import org.eclipse.emf.cdo.tests.legacy.model5.Model5Package;
 import org.eclipse.emf.cdo.tests.model5.GenListOfIntArray;
+import org.eclipse.emf.cdo.tests.model5.legacy.Model5Package;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
@@ -26,7 +26,7 @@ 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.model5.legacy.impl.GenListOfIntArrayImpl#getElements <em>Elements</em>}</li>
  * </ul>
  * </p>
  *
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/model5/legacy/impl/GenListOfIntImpl.java
index fc671f4e83..1cdb145ed0 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/model5/legacy/impl/GenListOfIntImpl.java
@@ -8,10 +8,10 @@
  * Contributors:
  *    Eike Stepper - initial API and implementation
  */
-package org.eclipse.emf.cdo.tests.legacy.model5.impl;
+package org.eclipse.emf.cdo.tests.model5.legacy.impl;
 
-import org.eclipse.emf.cdo.tests.legacy.model5.Model5Package;
 import org.eclipse.emf.cdo.tests.model5.GenListOfInt;
+import org.eclipse.emf.cdo.tests.model5.legacy.Model5Package;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
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/model5/legacy/impl/GenListOfIntegerImpl.java
index a8ca96e4c4..6d7e140643 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/model5/legacy/impl/GenListOfIntegerImpl.java
@@ -8,10 +8,10 @@
  * Contributors:
  *    Eike Stepper - initial API and implementation
  */
-package org.eclipse.emf.cdo.tests.legacy.model5.impl;
+package org.eclipse.emf.cdo.tests.model5.legacy.impl;
 
-import org.eclipse.emf.cdo.tests.legacy.model5.Model5Package;
 import org.eclipse.emf.cdo.tests.model5.GenListOfInteger;
+import org.eclipse.emf.cdo.tests.model5.legacy.Model5Package;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
@@ -26,7 +26,7 @@ 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.model5.legacy.impl.GenListOfIntegerImpl#getElements <em>Elements</em>}</li>
  * </ul>
  * </p>
  *
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/model5/legacy/impl/GenListOfLongImpl.java
index 33d680fe77..568f60fe05 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/model5/legacy/impl/GenListOfLongImpl.java
@@ -8,10 +8,10 @@
  * Contributors:
  *    Eike Stepper - initial API and implementation
  */
-package org.eclipse.emf.cdo.tests.legacy.model5.impl;
+package org.eclipse.emf.cdo.tests.model5.legacy.impl;
 
-import org.eclipse.emf.cdo.tests.legacy.model5.Model5Package;
 import org.eclipse.emf.cdo.tests.model5.GenListOfLong;
+import org.eclipse.emf.cdo.tests.model5.legacy.Model5Package;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
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/model5/legacy/impl/GenListOfShortImpl.java
index 2ade28f973..2f71793da4 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/model5/legacy/impl/GenListOfShortImpl.java
@@ -8,10 +8,10 @@
  * Contributors:
  *    Eike Stepper - initial API and implementation
  */
-package org.eclipse.emf.cdo.tests.legacy.model5.impl;
+package org.eclipse.emf.cdo.tests.model5.legacy.impl;
 
-import org.eclipse.emf.cdo.tests.legacy.model5.Model5Package;
 import org.eclipse.emf.cdo.tests.model5.GenListOfShort;
+import org.eclipse.emf.cdo.tests.model5.legacy.Model5Package;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
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/model5/legacy/impl/GenListOfStringImpl.java
index e5d0e46e19..c47b40ac58 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/model5/legacy/impl/GenListOfStringImpl.java
@@ -8,10 +8,10 @@
  * Contributors:
  *    Eike Stepper - initial API and implementation
  */
-package org.eclipse.emf.cdo.tests.legacy.model5.impl;
+package org.eclipse.emf.cdo.tests.model5.legacy.impl;
 
-import org.eclipse.emf.cdo.tests.legacy.model5.Model5Package;
 import org.eclipse.emf.cdo.tests.model5.GenListOfString;
+import org.eclipse.emf.cdo.tests.model5.legacy.Model5Package;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
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/model5/legacy/impl/ManagerImpl.java
index 456c5138f2..6b052d293f 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/model5/legacy/impl/ManagerImpl.java
@@ -8,10 +8,10 @@
  * Contributors:
  *    Eike Stepper - initial API and implementation
  */
-package org.eclipse.emf.cdo.tests.legacy.model5.impl;
+package org.eclipse.emf.cdo.tests.model5.legacy.impl;
 
-import org.eclipse.emf.cdo.tests.legacy.model5.Model5Package;
 import org.eclipse.emf.cdo.tests.model5.Manager;
+import org.eclipse.emf.cdo.tests.model5.legacy.Model5Package;
 
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.impl.EObjectImpl;
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/model5/legacy/impl/Model5FactoryImpl.java
index 3beaf21c38..8b8d863da3 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/model5/legacy/impl/Model5FactoryImpl.java
@@ -8,10 +8,9 @@
  * Contributors:
  *    Eike Stepper - initial API and implementation
  */
-package org.eclipse.emf.cdo.tests.legacy.model5.impl;
+package org.eclipse.emf.cdo.tests.model5.legacy.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.*;
 import org.eclipse.emf.cdo.tests.model5.Child;
 import org.eclipse.emf.cdo.tests.model5.Doctor;
 import org.eclipse.emf.cdo.tests.model5.GenListOfBoolean;
@@ -28,6 +27,8 @@ 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.cdo.tests.model5.legacy.Model5Factory;
+import org.eclipse.emf.cdo.tests.model5.legacy.Model5Package;
 
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EDataType;
@@ -50,7 +51,7 @@ public class Model5FactoryImpl extends EFactoryImpl implements Model5Factory
 
   /**
    * Creates the default factory implementation. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated NOT
    */
   public static Model5Factory init()
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/model5/legacy/impl/Model5PackageImpl.java
index 2d6e2ce9ae..61b380a1b4 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/model5/legacy/impl/Model5PackageImpl.java
@@ -8,10 +8,8 @@
  * Contributors:
  *    Eike Stepper - initial API and implementation
  */
-package org.eclipse.emf.cdo.tests.legacy.model5.impl;
+package org.eclipse.emf.cdo.tests.model5.legacy.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;
@@ -28,6 +26,8 @@ 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.cdo.tests.model5.legacy.Model5Factory;
+import org.eclipse.emf.cdo.tests.model5.legacy.Model5Package;
 
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
@@ -506,10 +506,10 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
   }
 
   /**
-  	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
     	 * <!-- end-user-doc -->
-  	 * @generated
-  	 */
+   * @generated
+   */
   public EClass getChild()
   {
     return childEClass;
@@ -546,9 +546,9 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
   }
 
   /**
-  	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-  	 * @generated
-  	 */
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * @generated
+   */
   public EDataType getIntArray()
   {
     return intArrayEDataType;
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/model5/legacy/impl/ParentImpl.java
index 2c06232b3c..04ac655d06 100644
--- 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/model5/legacy/impl/ParentImpl.java
@@ -8,11 +8,11 @@
  * Contributors:
  *    Christian W. Damus (CEA) - initial API and implementation
  */
-package org.eclipse.emf.cdo.tests.legacy.model5.impl;
+package org.eclipse.emf.cdo.tests.model5.legacy.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.cdo.tests.model5.legacy.Model5Package;
 import org.eclipse.emf.cdo.tests.model5.util.IsLoadingTestFixture;
 
 import org.eclipse.emf.common.notify.Notification;
@@ -34,9 +34,9 @@ import java.util.Collection;
  * <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>
- *   <li>{@link org.eclipse.emf.cdo.tests.legacy.model5.impl.ParentImpl#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.emf.cdo.tests.model5.legacy.impl.ParentImpl#getChildren <em>Children</em>}</li>
+ *   <li>{@link org.eclipse.emf.cdo.tests.model5.legacy.impl.ParentImpl#getFavourite <em>Favourite</em>}</li>
+ *   <li>{@link org.eclipse.emf.cdo.tests.model5.legacy.impl.ParentImpl#getName <em>Name</em>}</li>
  * </ul>
  * </p>
  *
@@ -82,20 +82,20 @@ public class ParentImpl extends EObjectImpl implements Parent
   protected static final String NAME_EDEFAULT = null;
 
   /**
-  	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-  	 * <!-- begin-user-doc -->
+   * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
+   * <!-- begin-user-doc -->
   	 * <!-- end-user-doc -->
-  	 * @see #getName()
-  	 * @generated
-  	 * @ordered
-  	 */
+   * @see #getName()
+   * @generated
+   * @ordered
+   */
   protected String name = NAME_EDEFAULT;
 
   /**
-  	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-  	 * @generated
-  	 */
+   * @generated
+   */
   protected ParentImpl()
   {
     super();
@@ -141,10 +141,8 @@ public class ParentImpl extends EObjectImpl implements Parent
       if (favourite != oldFavourite)
       {
         if (eNotificationRequired())
-        {
           eNotify(new ENotificationImpl(this, Notification.RESOLVE, Model5Package.PARENT__FAVOURITE, oldFavourite,
               favourite));
-        }
       }
     }
     return favourite;
@@ -174,13 +172,9 @@ public class ParentImpl extends EObjectImpl implements Parent
       ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, Model5Package.PARENT__FAVOURITE,
           oldFavourite, newFavourite);
       if (msgs == null)
-      {
         msgs = notification;
-      }
       else
-      {
         msgs.add(notification);
-      }
     }
     return msgs;
   }
@@ -196,23 +190,15 @@ public class ParentImpl extends EObjectImpl implements Parent
     {
       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));
-    }
   }
 
   /**
@@ -226,18 +212,16 @@ public class ParentImpl extends EObjectImpl implements Parent
   }
 
   /**
-     * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-     * @generated
-     */
+   * @generated
+   */
   public void setNameGen(String newName)
   {
     String oldName = name;
     name = newName;
     if (eNotificationRequired())
-    {
       eNotify(new ENotificationImpl(this, Notification.SET, Model5Package.PARENT__NAME, oldName, name));
-    }
   }
 
   public void setName(String newName)
@@ -247,10 +231,10 @@ public class ParentImpl extends EObjectImpl implements Parent
   }
 
   /**
-  	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
-  	 * @generated
-  	 */
+   * @generated
+   */
   @SuppressWarnings("unchecked")
   @Override
   public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs)
@@ -261,9 +245,7 @@ public class ParentImpl extends EObjectImpl implements Parent
       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);
@@ -301,9 +283,7 @@ public class ParentImpl extends EObjectImpl implements Parent
       return getChildren();
     case Model5Package.PARENT__FAVOURITE:
       if (resolve)
-      {
         return getFavourite();
-      }
       return basicGetFavourite();
     case Model5Package.PARENT__NAME:
       return getName();
@@ -380,17 +360,15 @@ public class ParentImpl extends EObjectImpl implements Parent
   }
 
   /**
-  	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
   	 * <!-- end-user-doc -->
-  	 * @generated
-  	 */
+   * @generated
+   */
   @Override
   public String toString()
   {
     if (eIsProxy())
-    {
       return super.toString();
-    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (name: ");
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/model5/legacy/impl/TestFeatureMapImpl.java
index e327968e32..9f43ea28bc 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/model5/legacy/impl/TestFeatureMapImpl.java
@@ -8,12 +8,12 @@
  * Contributors:
  *    Eike Stepper - initial API and implementation
  */
-package org.eclipse.emf.cdo.tests.legacy.model5.impl;
+package org.eclipse.emf.cdo.tests.model5.legacy.impl;
 
-import org.eclipse.emf.cdo.tests.legacy.model5.Model5Package;
 import org.eclipse.emf.cdo.tests.model5.Doctor;
 import org.eclipse.emf.cdo.tests.model5.Manager;
 import org.eclipse.emf.cdo.tests.model5.TestFeatureMap;
+import org.eclipse.emf.cdo.tests.model5.legacy.Model5Package;
 
 import org.eclipse.emf.common.notify.NotificationChain;
 import org.eclipse.emf.common.util.EList;
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/legacy/util/Model5AdapterFactory.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/legacy/util/Model5AdapterFactory.java
new file mode 100644
index 0000000000..643020688c
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/legacy/util/Model5AdapterFactory.java
@@ -0,0 +1,463 @@
+/**
+ * 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:
+ *    Eike Stepper - initial API and implementation
+ */
+package org.eclipse.emf.cdo.tests.model5.legacy.util;
+
+import org.eclipse.emf.cdo.tests.model5.*;
+
+import org.eclipse.emf.cdo.tests.model5.legacy.Model5Package;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notifier;
+
+import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
+
+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.legacy.Model5Package
+ * @generated
+ */
+public class Model5AdapterFactory extends AdapterFactoryImpl
+{
+  /**
+   * <!-- 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 -->
+   * @generated
+   */
+  public Model5AdapterFactory()
+  {
+    if (modelPackage == null)
+    {
+      modelPackage = Model5Package.eINSTANCE;
+    }
+  }
+
+  /**
+   * 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
+   */
+  @Override
+  public boolean isFactoryForType(Object object)
+  {
+    if (object == modelPackage)
+    {
+      return true;
+    }
+    if (object instanceof EObject)
+    {
+      return ((EObject)object).eClass().getEPackage() == modelPackage;
+    }
+    return false;
+  }
+
+  /**
+   * The switch that delegates to the <code>createXXX</code> methods.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected Model5Switch<Adapter> modelSwitch = new Model5Switch<Adapter>()
+  {
+    @Override
+    public Adapter caseTestFeatureMap(TestFeatureMap object)
+    {
+      return createTestFeatureMapAdapter();
+    }
+
+    @Override
+    public Adapter caseManager(Manager object)
+    {
+      return createManagerAdapter();
+    }
+
+    @Override
+    public Adapter caseDoctor(Doctor object)
+    {
+      return createDoctorAdapter();
+    }
+
+    @Override
+    public Adapter caseGenListOfString(GenListOfString object)
+    {
+      return createGenListOfStringAdapter();
+    }
+
+    @Override
+    public Adapter caseGenListOfInt(GenListOfInt object)
+    {
+      return createGenListOfIntAdapter();
+    }
+
+    @Override
+    public Adapter caseGenListOfInteger(GenListOfInteger object)
+    {
+      return createGenListOfIntegerAdapter();
+    }
+
+    @Override
+    public Adapter caseGenListOfLong(GenListOfLong object)
+    {
+      return createGenListOfLongAdapter();
+    }
+
+    @Override
+    public Adapter caseGenListOfBoolean(GenListOfBoolean object)
+    {
+      return createGenListOfBooleanAdapter();
+    }
+
+    @Override
+    public Adapter caseGenListOfShort(GenListOfShort object)
+    {
+      return createGenListOfShortAdapter();
+    }
+
+    @Override
+    public Adapter caseGenListOfFloat(GenListOfFloat object)
+    {
+      return createGenListOfFloatAdapter();
+    }
+
+    @Override
+    public Adapter caseGenListOfDouble(GenListOfDouble object)
+    {
+      return createGenListOfDoubleAdapter();
+    }
+
+    @Override
+    public Adapter caseGenListOfDate(GenListOfDate object)
+    {
+      return createGenListOfDateAdapter();
+    }
+
+    @Override
+    public Adapter caseGenListOfChar(GenListOfChar object)
+    {
+      return createGenListOfCharAdapter();
+    }
+
+    @Override
+    public Adapter caseGenListOfIntArray(GenListOfIntArray object)
+    {
+      return createGenListOfIntArrayAdapter();
+    }
+
+    @Override
+    public Adapter caseParent(Parent object)
+    {
+      return createParentAdapter();
+    }
+
+    @Override
+    public Adapter caseChild(Child object)
+    {
+      return createChildAdapter();
+    }
+
+    @Override
+    public Adapter defaultCase(EObject object)
+    {
+      return createEObjectAdapter();
+    }
+  };
+
+  /**
+   * 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
+   */
+  @Override
+  public Adapter createAdapter(Notifier target)
+  {
+    return modelSwitch.doSwitch((EObject)target);
+  }
+
+  /**
+   * 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
+   */
+  public Adapter createTestFeatureMapAdapter()
+  {
+    return null;
+  }
+
+  /**
+   * 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
+   */
+  public Adapter createManagerAdapter()
+  {
+    return null;
+  }
+
+  /**
+   * 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
+   */
+  public Adapter createDoctorAdapter()
+  {
+    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 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
+   */
+  public Adapter createGenListOfIntAdapter()
+  {
+    return null;
+  }
+
+  /**
+   * 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
+   */
+  public Adapter createGenListOfIntegerAdapter()
+  {
+    return null;
+  }
+
+  /**
+   * 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
+   */
+  public Adapter createGenListOfLongAdapter()
+  {
+    return null;
+  }
+
+  /**
+   * 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
+   */
+  public Adapter createGenListOfBooleanAdapter()
+  {
+    return null;
+  }
+
+  /**
+   * 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
+   */
+  public Adapter createGenListOfShortAdapter()
+  {
+    return null;
+  }
+
+  /**
+   * 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
+   */
+  public Adapter createGenListOfFloatAdapter()
+  {
+    return null;
+  }
+
+  /**
+   * 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
+   */
+  public Adapter createGenListOfDoubleAdapter()
+  {
+    return null;
+  }
+
+  /**
+   * 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
+   */
+  public Adapter createGenListOfDateAdapter()
+  {
+    return null;
+  }
+
+  /**
+   * 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
+   */
+  public Adapter createGenListOfCharAdapter()
+  {
+    return null;
+  }
+
+  /**
+   * 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
+   */
+  public Adapter createGenListOfIntArrayAdapter()
+  {
+    return null;
+  }
+
+  /**
+   * 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.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 the default case.
+   * <!-- begin-user-doc -->
+   * This default implementation returns null.
+   * <!-- end-user-doc -->
+   * @return the new adapter.
+   * @generated
+   */
+  public Adapter createEObjectAdapter()
+  {
+    return null;
+  }
+
+} //Model5AdapterFactory
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/legacy/util/Model5Switch.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/legacy/util/Model5Switch.java
new file mode 100644
index 0000000000..fa28488069
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/legacy/util/Model5Switch.java
@@ -0,0 +1,514 @@
+/**
+ * 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:
+ *    Eike Stepper - initial API and implementation
+ */
+package org.eclipse.emf.cdo.tests.model5.legacy.util;
+
+import java.util.List;
+
+import org.eclipse.emf.cdo.tests.model5.*;
+
+import org.eclipse.emf.cdo.tests.model5.legacy.Model5Package;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Switch</b> for the model's inheritance hierarchy.
+ * It supports the call {@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.legacy.Model5Package
+ * @generated
+ */
+public class Model5Switch<T>
+{
+  /**
+   * <!-- 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 -->
+   * @generated
+   */
+  public Model5Switch()
+  {
+    if (modelPackage == null)
+    {
+      modelPackage = Model5Package.eINSTANCE;
+    }
+  }
+
+  /**
+   * 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
+   */
+  public T doSwitch(EObject theEObject)
+  {
+    return doSwitch(theEObject.eClass(), theEObject);
+  }
+
+  /**
+   * 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
+   */
+  protected T doSwitch(EClass theEClass, EObject theEObject)
+  {
+    if (theEClass.eContainer() == modelPackage)
+    {
+      return doSwitch(theEClass.getClassifierID(), theEObject);
+    }
+    else
+    {
+      List<EClass> eSuperTypes = theEClass.getESuperTypes();
+      return eSuperTypes.isEmpty() ? defaultCase(theEObject) : doSwitch(eSuperTypes.get(0), theEObject);
+    }
+  }
+
+  /**
+   * 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
+   */
+  protected T doSwitch(int classifierID, EObject theEObject)
+  {
+    switch (classifierID)
+    {
+    case Model5Package.TEST_FEATURE_MAP:
+    {
+      TestFeatureMap testFeatureMap = (TestFeatureMap)theEObject;
+      T result = caseTestFeatureMap(testFeatureMap);
+      if (result == null)
+        result = defaultCase(theEObject);
+      return result;
+    }
+    case Model5Package.MANAGER:
+    {
+      Manager manager = (Manager)theEObject;
+      T result = caseManager(manager);
+      if (result == null)
+        result = defaultCase(theEObject);
+      return result;
+    }
+    case Model5Package.DOCTOR:
+    {
+      Doctor doctor = (Doctor)theEObject;
+      T result = caseDoctor(doctor);
+      if (result == null)
+        result = defaultCase(theEObject);
+      return result;
+    }
+    case Model5Package.GEN_LIST_OF_STRING:
+    {
+      GenListOfString genListOfString = (GenListOfString)theEObject;
+      T result = caseGenListOfString(genListOfString);
+      if (result == null)
+        result = defaultCase(theEObject);
+      return result;
+    }
+    case Model5Package.GEN_LIST_OF_INT:
+    {
+      GenListOfInt genListOfInt = (GenListOfInt)theEObject;
+      T result = caseGenListOfInt(genListOfInt);
+      if (result == null)
+        result = defaultCase(theEObject);
+      return result;
+    }
+    case Model5Package.GEN_LIST_OF_INTEGER:
+    {
+      GenListOfInteger genListOfInteger = (GenListOfInteger)theEObject;
+      T result = caseGenListOfInteger(genListOfInteger);
+      if (result == null)
+        result = defaultCase(theEObject);
+      return result;
+    }
+    case Model5Package.GEN_LIST_OF_LONG:
+    {
+      GenListOfLong genListOfLong = (GenListOfLong)theEObject;
+      T result = caseGenListOfLong(genListOfLong);
+      if (result == null)
+        result = defaultCase(theEObject);
+      return result;
+    }
+    case Model5Package.GEN_LIST_OF_BOOLEAN:
+    {
+      GenListOfBoolean genListOfBoolean = (GenListOfBoolean)theEObject;
+      T result = caseGenListOfBoolean(genListOfBoolean);
+      if (result == null)
+        result = defaultCase(theEObject);
+      return result;
+    }
+    case Model5Package.GEN_LIST_OF_SHORT:
+    {
+      GenListOfShort genListOfShort = (GenListOfShort)theEObject;
+      T result = caseGenListOfShort(genListOfShort);
+      if (result == null)
+        result = defaultCase(theEObject);
+      return result;
+    }
+    case Model5Package.GEN_LIST_OF_FLOAT:
+    {
+      GenListOfFloat genListOfFloat = (GenListOfFloat)theEObject;
+      T result = caseGenListOfFloat(genListOfFloat);
+      if (result == null)
+        result = defaultCase(theEObject);
+      return result;
+    }
+    case Model5Package.GEN_LIST_OF_DOUBLE:
+    {
+      GenListOfDouble genListOfDouble = (GenListOfDouble)theEObject;
+      T result = caseGenListOfDouble(genListOfDouble);
+      if (result == null)
+        result = defaultCase(theEObject);
+      return result;
+    }
+    case Model5Package.GEN_LIST_OF_DATE:
+    {
+      GenListOfDate genListOfDate = (GenListOfDate)theEObject;
+      T result = caseGenListOfDate(genListOfDate);
+      if (result == null)
+        result = defaultCase(theEObject);
+      return result;
+    }
+    case Model5Package.GEN_LIST_OF_CHAR:
+    {
+      GenListOfChar genListOfChar = (GenListOfChar)theEObject;
+      T result = caseGenListOfChar(genListOfChar);
+      if (result == null)
+        result = defaultCase(theEObject);
+      return result;
+    }
+    case Model5Package.GEN_LIST_OF_INT_ARRAY:
+    {
+      GenListOfIntArray genListOfIntArray = (GenListOfIntArray)theEObject;
+      T result = caseGenListOfIntArray(genListOfIntArray);
+      if (result == null)
+        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 -->
+   * 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>Test Feature Map</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
+  public T caseTestFeatureMap(TestFeatureMap object)
+  {
+    return null;
+  }
+
+  /**
+   * 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.
+   * @return the result of interpreting the object as an instance of '<em>Manager</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
+  public T caseManager(Manager object)
+  {
+    return null;
+  }
+
+  /**
+   * 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.
+   * @return the result of interpreting the object as an instance of '<em>Doctor</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
+  public T caseDoctor(Doctor 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>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.
+   * @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
+   */
+  public T caseGenListOfInt(GenListOfInt object)
+  {
+    return null;
+  }
+
+  /**
+   * 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.
+   * @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
+   */
+  public T caseGenListOfInteger(GenListOfInteger object)
+  {
+    return null;
+  }
+
+  /**
+   * 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.
+   * @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
+   */
+  public T caseGenListOfLong(GenListOfLong object)
+  {
+    return null;
+  }
+
+  /**
+   * 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.
+   * @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
+   */
+  public T caseGenListOfBoolean(GenListOfBoolean object)
+  {
+    return null;
+  }
+
+  /**
+   * 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.
+   * @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
+   */
+  public T caseGenListOfShort(GenListOfShort object)
+  {
+    return null;
+  }
+
+  /**
+   * 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.
+   * @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
+   */
+  public T caseGenListOfFloat(GenListOfFloat object)
+  {
+    return null;
+  }
+
+  /**
+   * 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.
+   * @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
+   */
+  public T caseGenListOfDouble(GenListOfDouble object)
+  {
+    return null;
+  }
+
+  /**
+   * 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.
+   * @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
+   */
+  public T caseGenListOfDate(GenListOfDate object)
+  {
+    return null;
+  }
+
+  /**
+   * 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.
+   * @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
+   */
+  public T caseGenListOfChar(GenListOfChar object)
+  {
+    return null;
+  }
+
+  /**
+   * Returns the result of interpreting the object as an instance of '<em>Gen List Of Int Array</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 Int Array</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
+  public T caseGenListOfIntArray(GenListOfIntArray object)
+  {
+    return null;
+  }
+
+  /**
+   * 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>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.
+   * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject)
+   * @generated
+   */
+  public T defaultCase(EObject object)
+  {
+    return null;
+  }
+
+} //Model5Switch
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 f76ddb0637..27e7e9e1b8 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
@@ -4,12 +4,13 @@
  * 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:
  *    Eike Stepper - initial API and implementation
  */
 package org.eclipse.emf.cdo.tests.model5.util;
 
+//import org.eclipse.emf.cdo.tests.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;
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 8cbd014f6a..ce5848c55a 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
@@ -4,7 +4,7 @@
  * 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:
  *    Eike Stepper - initial API and implementation
  */
@@ -33,6 +33,8 @@ import org.eclipse.emf.ecore.EObject;
 
 import java.util.List;
 
+//import org.eclipse.emf.cdo.tests.model5.*;
+
 /**
  * <!-- begin-user-doc --> The <b>Switch</b> for the model's inheritance hierarchy. It supports the call
  * {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,
@@ -108,7 +110,9 @@ public class Model5Switch<T>
       TestFeatureMap testFeatureMap = (TestFeatureMap)theEObject;
       T result = caseTestFeatureMap(testFeatureMap);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model5Package.MANAGER:
@@ -116,7 +120,9 @@ public class Model5Switch<T>
       Manager manager = (Manager)theEObject;
       T result = caseManager(manager);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model5Package.DOCTOR:
@@ -124,7 +130,9 @@ public class Model5Switch<T>
       Doctor doctor = (Doctor)theEObject;
       T result = caseDoctor(doctor);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model5Package.GEN_LIST_OF_STRING:
@@ -132,7 +140,9 @@ public class Model5Switch<T>
       GenListOfString genListOfString = (GenListOfString)theEObject;
       T result = caseGenListOfString(genListOfString);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model5Package.GEN_LIST_OF_INT:
@@ -140,7 +150,9 @@ public class Model5Switch<T>
       GenListOfInt genListOfInt = (GenListOfInt)theEObject;
       T result = caseGenListOfInt(genListOfInt);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model5Package.GEN_LIST_OF_INTEGER:
@@ -148,7 +160,9 @@ public class Model5Switch<T>
       GenListOfInteger genListOfInteger = (GenListOfInteger)theEObject;
       T result = caseGenListOfInteger(genListOfInteger);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model5Package.GEN_LIST_OF_LONG:
@@ -156,7 +170,9 @@ public class Model5Switch<T>
       GenListOfLong genListOfLong = (GenListOfLong)theEObject;
       T result = caseGenListOfLong(genListOfLong);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model5Package.GEN_LIST_OF_BOOLEAN:
@@ -164,7 +180,9 @@ public class Model5Switch<T>
       GenListOfBoolean genListOfBoolean = (GenListOfBoolean)theEObject;
       T result = caseGenListOfBoolean(genListOfBoolean);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model5Package.GEN_LIST_OF_SHORT:
@@ -172,7 +190,9 @@ public class Model5Switch<T>
       GenListOfShort genListOfShort = (GenListOfShort)theEObject;
       T result = caseGenListOfShort(genListOfShort);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model5Package.GEN_LIST_OF_FLOAT:
@@ -180,7 +200,9 @@ public class Model5Switch<T>
       GenListOfFloat genListOfFloat = (GenListOfFloat)theEObject;
       T result = caseGenListOfFloat(genListOfFloat);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model5Package.GEN_LIST_OF_DOUBLE:
@@ -188,7 +210,9 @@ public class Model5Switch<T>
       GenListOfDouble genListOfDouble = (GenListOfDouble)theEObject;
       T result = caseGenListOfDouble(genListOfDouble);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model5Package.GEN_LIST_OF_DATE:
@@ -196,7 +220,9 @@ public class Model5Switch<T>
       GenListOfDate genListOfDate = (GenListOfDate)theEObject;
       T result = caseGenListOfDate(genListOfDate);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model5Package.GEN_LIST_OF_CHAR:
@@ -204,7 +230,9 @@ public class Model5Switch<T>
       GenListOfChar genListOfChar = (GenListOfChar)theEObject;
       T result = caseGenListOfChar(genListOfChar);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model5Package.GEN_LIST_OF_INT_ARRAY:
@@ -212,7 +240,9 @@ public class Model5Switch<T>
       GenListOfIntArray genListOfIntArray = (GenListOfIntArray)theEObject;
       T result = caseGenListOfIntArray(genListOfIntArray);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model5Package.PARENT:
@@ -220,7 +250,9 @@ public class Model5Switch<T>
       Parent parent = (Parent)theEObject;
       T result = caseParent(parent);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model5Package.CHILD:
@@ -228,7 +260,9 @@ public class Model5Switch<T>
       Child child = (Child)theEObject;
       T result = caseChild(child);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     default:
@@ -408,7 +442,7 @@ public class Model5Switch<T>
    * Returns the result of interpreting the object as an instance of '<em>Gen List Of Int Array</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 Int Array</em>'.