[349599] [CDO Tests] EMF runtime compatibility issue and duplicate code in test models

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

61 files changed, 3651 insertions, 10364 deletions

diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.tests.mango/META-INF/MANIFEST.MF
index 639db63da8..e075e1d024 100644
--- a/plugins/org.eclipse.emf.cdo.tests.mango/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.tests.mango/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.emf.cdo.tests.mango; singleton:=true
-Bundle-Version: 3.0.100.qualifier
+Bundle-Version: 3.0.200.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -12,7 +12,7 @@ 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
 Export-Package: org.eclipse.emf.cdo.tests.legacy.mango;version="3.0.100",
  org.eclipse.emf.cdo.tests.legacy.mango.impl;version="3.0.100",
- org.eclipse.emf.cdo.tests.mango;version="3.0.100",
- org.eclipse.emf.cdo.tests.mango.impl;version="3.0.100",
- org.eclipse.emf.cdo.tests.mango.util;version="3.0.100"
+ org.eclipse.emf.cdo.tests.mango;version="3.0.200",
+ org.eclipse.emf.cdo.tests.mango.impl;version="3.0.200",
+ org.eclipse.emf.cdo.tests.mango.util;version="3.0.200"
 
diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/model/mango.genmodel b/plugins/org.eclipse.emf.cdo.tests.mango/model/mango.genmodel
index 4da5e67c35..31781b1234 100644
--- a/plugins/org.eclipse.emf.cdo.tests.mango/model/mango.genmodel
+++ b/plugins/org.eclipse.emf.cdo.tests.mango/model/mango.genmodel
@@ -6,7 +6,8 @@
     modelPluginID="org.eclipse.emf.cdo.tests.mango" modelName="Mango" modelPluginClass=""
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.internal.cdo.CDOObjectImpl"
     reflectiveDelegation="true" codeFormatting="true" testsDirectory="" importerID="org.eclipse.emf.importer.cdo"
-    featureDelegation="Reflective" complianceLevel="5.0" copyrightFields="false" providerRootExtendsClass="org.eclipse.emf.cdo.edit.CDOItemProviderAdapter">
+    featureDelegation="Reflective" complianceLevel="5.0" copyrightFields="false" providerRootExtendsClass="org.eclipse.emf.cdo.edit.CDOItemProviderAdapter"
+    runtimeVersion="2.6">
   <foreignModel>mango.ecore</foreignModel>
   <modelPluginVariables>CDO=org.eclipse.emf.cdo</modelPluginVariables>
   <genPackages prefix="Mango" basePackage="org.eclipse.emf.cdo.tests" disposableProviderFactory="true"
diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/model/mango.legacy-genmodel b/plugins/org.eclipse.emf.cdo.tests.mango/model/mango.legacy-genmodel
index 5ff722d4a4..55e81f45e6 100644
--- a/plugins/org.eclipse.emf.cdo.tests.mango/model/mango.legacy-genmodel
+++ b/plugins/org.eclipse.emf.cdo.tests.mango/model/mango.legacy-genmodel
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA;   Eike Stepper - initial API and implementation" modelDirectory="/org.eclipse.emf.cdo.tests.mango/src" editDirectory="" editorDirectory="" modelPluginID="org.eclipse.emf.cdo.tests.mango" modelName="Mango" modelPluginClass="" updateClasspath="false" codeFormatting="true" testsDirectory="" importerID="org.eclipse.emf.importer.cdo" complianceLevel="5.0" copyrightFields="false" providerRootExtendsClass="">
+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA;   Eike Stepper - initial API and implementation" modelDirectory="/org.eclipse.emf.cdo.tests.mango/src" editDirectory="" editorDirectory="" modelPluginID="org.eclipse.emf.cdo.tests.mango" modelName="Mango" modelPluginClass="" updateClasspath="false" codeFormatting="true" testsDirectory="" importerID="org.eclipse.emf.importer.cdo" complianceLevel="5.0" copyrightFields="false" providerRootExtendsClass="" runtimeVersion="2.6">
   <foreignModel>mango.ecore</foreignModel>
   <modelPluginVariables>CDO=org.eclipse.emf.cdo</modelPluginVariables>
   <genPackages prefix="Mango" basePackage="org.eclipse.emf.cdo.tests.legacy" disposableProviderFactory="true" literalsInterface="false">
diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/util/MangoSwitch.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/util/MangoSwitch.java
index bd315a5435..40961959a9 100644
--- a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/util/MangoSwitch.java
+++ b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/util/MangoSwitch.java
@@ -15,9 +15,10 @@ import org.eclipse.emf.cdo.tests.mango.MangoParameter;
 import org.eclipse.emf.cdo.tests.mango.MangoValue;
 import org.eclipse.emf.cdo.tests.mango.MangoValueList;
 
+import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.util.Switch;
+
+import java.util.List;
 
 /**
  * <!-- begin-user-doc --> The <b>Switch</b> for the model's inheritance hierarchy. It supports the call
@@ -28,7 +29,7 @@ import org.eclipse.emf.ecore.util.Switch;
  * @see org.eclipse.emf.cdo.tests.mango.MangoPackage
  * @generated
  */
-public class MangoSwitch<T> extends Switch<T>
+public class MangoSwitch<T>
 {
   /**
    * The cached model package <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -51,16 +52,35 @@ public class MangoSwitch<T> extends Switch<T>
   }
 
   /**
-   * Checks whether this is a switch for the given package. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 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 -->
    * 
-   * @parameter ePackage the package in question.
-   * @return whether this is a switch for the given package.
+   * @return the first non-null result returned by a <code>caseXXX</code> call.
    * @generated
    */
-  @Override
-  protected boolean isSwitchFor(EPackage ePackage)
+  protected T doSwitch(EClass theEClass, EObject theEObject)
   {
-    return ePackage == modelPackage;
+    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);
+    }
   }
 
   /**
@@ -70,7 +90,6 @@ public class MangoSwitch<T> extends Switch<T>
    * @return the first non-null result returned by a <code>caseXXX</code> call.
    * @generated
    */
-  @Override
   protected T doSwitch(int classifierID, EObject theEObject)
   {
     switch (classifierID)
@@ -80,7 +99,9 @@ public class MangoSwitch<T> extends Switch<T>
       MangoValueList mangoValueList = (MangoValueList)theEObject;
       T result = caseMangoValueList(mangoValueList);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case MangoPackage.MANGO_VALUE:
@@ -88,7 +109,9 @@ public class MangoSwitch<T> extends Switch<T>
       MangoValue mangoValue = (MangoValue)theEObject;
       T result = caseMangoValue(mangoValue);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case MangoPackage.MANGO_PARAMETER:
@@ -96,7 +119,9 @@ public class MangoSwitch<T> extends Switch<T>
       MangoParameter mangoParameter = (MangoParameter)theEObject;
       T result = caseMangoParameter(mangoParameter);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     default:
@@ -160,7 +185,6 @@ public class MangoSwitch<T> extends Switch<T>
    * @see #doSwitch(org.eclipse.emf.ecore.EObject)
    * @generated
    */
-  @Override
   public T defaultCase(EObject object)
   {
     return null;
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.tests.model1/META-INF/MANIFEST.MF
index ac6ac28f48..eef2dcb9cb 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.emf.cdo.tests.model1; singleton:=true
-Bundle-Version: 3.0.100.qualifier
+Bundle-Version: 3.0.200.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -11,7 +11,7 @@ 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
 Export-Package: org.eclipse.emf.cdo.tests.legacy.model1;version="3.0.100",
  org.eclipse.emf.cdo.tests.legacy.model1.impl;version="3.0.100",
- org.eclipse.emf.cdo.tests.model1;version="3.0.100",
- org.eclipse.emf.cdo.tests.model1.impl;version="3.0.100",
- org.eclipse.emf.cdo.tests.model1.util;version="3.0.100",
- org.eclipse.emf.cdo.tests.model1.validation;version="3.0.100"
+ org.eclipse.emf.cdo.tests.model1;version="3.0.200",
+ org.eclipse.emf.cdo.tests.model1.impl;version="3.0.200",
+ org.eclipse.emf.cdo.tests.model1.util;version="3.0.200",
+ org.eclipse.emf.cdo.tests.model1.validation;version="3.0.200"
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/model/model1.legacy-genmodel b/plugins/org.eclipse.emf.cdo.tests.model1/model/model1.legacy-genmodel
index c146e0e7a3..26da68daf9 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/model/model1.legacy-genmodel
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/model/model1.legacy-genmodel
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA;   Eike Stepper - initial API and implementation" modelDirectory="/org.eclipse.emf.cdo.tests.model1/src" editDirectory="" editorDirectory="" modelPluginID="org.eclipse.emf.cdo.tests.model1" modelName="Model1" updateClasspath="false" codeFormatting="true" testsDirectory="" importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0">
+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA;   Eike Stepper - initial API and implementation" modelDirectory="/org.eclipse.emf.cdo.tests.model1/src" editDirectory="" editorDirectory="" modelPluginID="org.eclipse.emf.cdo.tests.model1" modelName="Model1" updateClasspath="false" codeFormatting="true" testsDirectory="" importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0" runtimeVersion="2.6">
   <foreignModel>model1.ecore</foreignModel>
   <modelPluginVariables>CDO=org.eclipse.emf.cdo</modelPluginVariables>
   <genPackages prefix="Model1" basePackage="org.eclipse.emf.cdo.tests.legacy" disposableProviderFactory="true" literalsInterface="false" extensibleProviderFactory="true" childCreationExtenders="true">
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/model/model1.martin.legacy.genmodel b/plugins/org.eclipse.emf.cdo.tests.model1/model/model1.martin.legacy.genmodel
index b20eb22dbf..0ccb645950 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/model/model1.martin.legacy.genmodel
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/model/model1.martin.legacy.genmodel
@@ -3,7 +3,7 @@
     xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.emf.cdo.tests.model1/src"
     modelPluginID="org.eclipse.emf.cdo.tests.model1" modelName="Model1.martin" importerID="org.eclipse.emf.importer.ecore"
-    complianceLevel="5.0" copyrightFields="false">
+    complianceLevel="5.0" copyrightFields="false" runtimeVersion="2.6">
   <foreignModel>model1.ecore</foreignModel>
   <genPackages prefix="Model1" disposableProviderFactory="true" ecorePackage="model1.ecore#/">
     <genEnums typeSafeEnumCompatible="false" ecoreEnum="model1.ecore#//VAT">
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.tests.model2/META-INF/MANIFEST.MF
index 8ef39c20ce..603c191806 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model2/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.tests.model2/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.emf.cdo.tests.model2; singleton:=true
-Bundle-Version: 3.0.100.qualifier
+Bundle-Version: 3.0.200.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -13,7 +13,6 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.emf.cdo.tests.model1;bundle-version="[3.0.0,4.0.0)";visibility:=reexport
 Export-Package: org.eclipse.emf.cdo.tests.legacy.model2;version="3.0.100",
  org.eclipse.emf.cdo.tests.legacy.model2.impl;version="3.0.100",
- org.eclipse.emf.cdo.tests.legacy.model2.util;version="3.0.100",
- org.eclipse.emf.cdo.tests.model2;version="3.0.100",
- org.eclipse.emf.cdo.tests.model2.impl;version="3.0.100",
- org.eclipse.emf.cdo.tests.model2.util;version="3.0.100"
+ org.eclipse.emf.cdo.tests.model2;version="3.0.200",
+ org.eclipse.emf.cdo.tests.model2.impl;version="3.0.200",
+ org.eclipse.emf.cdo.tests.model2.util;version="3.0.200"
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/util/Model2AdapterFactory.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/util/Model2AdapterFactory.java
deleted file mode 100644
index 57df908520..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/util/Model2AdapterFactory.java
+++ /dev/null
@@ -1,577 +0,0 @@
-/**
- * Copyright (c) 2004 - 2011 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.legacy.model2.util;
-
-import org.eclipse.emf.cdo.tests.legacy.model2.Model2Package;
-import org.eclipse.emf.cdo.tests.model1.Address;
-import org.eclipse.emf.cdo.tests.model1.Order;
-import org.eclipse.emf.cdo.tests.model1.PurchaseOrder;
-import org.eclipse.emf.cdo.tests.model1.VAT;
-import org.eclipse.emf.cdo.tests.model2.EnumListHolder;
-import org.eclipse.emf.cdo.tests.model2.MapHolder;
-import org.eclipse.emf.cdo.tests.model2.NotUnsettable;
-import org.eclipse.emf.cdo.tests.model2.NotUnsettableWithDefault;
-import org.eclipse.emf.cdo.tests.model2.PersistentContainment;
-import org.eclipse.emf.cdo.tests.model2.SpecialPurchaseOrder;
-import org.eclipse.emf.cdo.tests.model2.Task;
-import org.eclipse.emf.cdo.tests.model2.TaskContainer;
-import org.eclipse.emf.cdo.tests.model2.TransientContainer;
-import org.eclipse.emf.cdo.tests.model2.Unsettable1;
-import org.eclipse.emf.cdo.tests.model2.Unsettable2WithDefault;
-
-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;
-
-import java.util.Map;
-
-/**
- * <!-- 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.legacy.model2.Model2Package
- * @generated
- */
-public class Model2AdapterFactory extends AdapterFactoryImpl
-{
-  /**
-   * The cached model package. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  protected static Model2Package modelPackage;
-
-  /**
-   * Creates an instance of the adapter factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public Model2AdapterFactory()
-  {
-    if (modelPackage == null)
-    {
-      modelPackage = Model2Package.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 Model2Switch<Adapter> modelSwitch = new Model2Switch<Adapter>()
-  {
-    @Override
-    public Adapter caseSpecialPurchaseOrder(SpecialPurchaseOrder object)
-    {
-      return createSpecialPurchaseOrderAdapter();
-    }
-
-    @Override
-    public Adapter caseTaskContainer(TaskContainer object)
-    {
-      return createTaskContainerAdapter();
-    }
-
-    @Override
-    public Adapter caseTask(Task object)
-    {
-      return createTaskAdapter();
-    }
-
-    @Override
-    public Adapter caseUnsettable1(Unsettable1 object)
-    {
-      return createUnsettable1Adapter();
-    }
-
-    @Override
-    public Adapter caseUnsettable2WithDefault(Unsettable2WithDefault object)
-    {
-      return createUnsettable2WithDefaultAdapter();
-    }
-
-    @Override
-    public Adapter casePersistentContainment(PersistentContainment object)
-    {
-      return createPersistentContainmentAdapter();
-    }
-
-    @Override
-    public Adapter caseTransientContainer(TransientContainer object)
-    {
-      return createTransientContainerAdapter();
-    }
-
-    @Override
-    public Adapter caseNotUnsettable(NotUnsettable object)
-    {
-      return createNotUnsettableAdapter();
-    }
-
-    @Override
-    public Adapter caseNotUnsettableWithDefault(NotUnsettableWithDefault object)
-    {
-      return createNotUnsettableWithDefaultAdapter();
-    }
-
-    @Override
-    public Adapter caseMapHolder(MapHolder object)
-    {
-      return createMapHolderAdapter();
-    }
-
-    @Override
-    public Adapter caseStringToStringMap(Map.Entry<String, String> object)
-    {
-      return createStringToStringMapAdapter();
-    }
-
-    @Override
-    public Adapter caseIntegerToStringMap(Map.Entry<Integer, String> object)
-    {
-      return createIntegerToStringMapAdapter();
-    }
-
-    @Override
-    public Adapter caseStringToVATMap(Map.Entry<String, VAT> object)
-    {
-      return createStringToVATMapAdapter();
-    }
-
-    @Override
-    public Adapter caseStringToAddressContainmentMap(Map.Entry<String, Address> object)
-    {
-      return createStringToAddressContainmentMapAdapter();
-    }
-
-    @Override
-    public Adapter caseStringToAddressReferenceMap(Map.Entry<String, Address> object)
-    {
-      return createStringToAddressReferenceMapAdapter();
-    }
-
-    @Override
-    public Adapter caseEObjectToEObjectMap(Map.Entry<EObject, EObject> object)
-    {
-      return createEObjectToEObjectMapAdapter();
-    }
-
-    @Override
-    public Adapter caseEObjectToEObjectKeyContainedMap(Map.Entry<EObject, EObject> object)
-    {
-      return createEObjectToEObjectKeyContainedMapAdapter();
-    }
-
-    @Override
-    public Adapter caseEObjectToEObjectBothContainedMap(Map.Entry<EObject, EObject> object)
-    {
-      return createEObjectToEObjectBothContainedMapAdapter();
-    }
-
-    @Override
-    public Adapter caseEObjectToEObjectValueContainedMap(Map.Entry<EObject, EObject> object)
-    {
-      return createEObjectToEObjectValueContainedMapAdapter();
-    }
-
-    @Override
-    public Adapter caseEnumListHolder(EnumListHolder object)
-    {
-      return createEnumListHolderAdapter();
-    }
-
-    @Override
-    public Adapter caseOrder(Order object)
-    {
-      return createOrderAdapter();
-    }
-
-    @Override
-    public Adapter casePurchaseOrder(PurchaseOrder object)
-    {
-      return createPurchaseOrderAdapter();
-    }
-
-    @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.legacy.model2.SpecialPurchaseOrder
-   * <em>Special Purchase Order</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.legacy.model2.SpecialPurchaseOrder
-   * @generated
-   */
-  public Adapter createSpecialPurchaseOrderAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model2.TaskContainer
-   * <em>Task Container</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.legacy.model2.TaskContainer
-   * @generated
-   */
-  public Adapter createTaskContainerAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model2.Task <em>Task</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.legacy.model2.Task
-   * @generated
-   */
-  public Adapter createTaskAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model2.Unsettable1
-   * <em>Unsettable1</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.legacy.model2.Unsettable1
-   * @generated
-   */
-  public Adapter createUnsettable1Adapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '
-   * {@link org.eclipse.emf.cdo.tests.legacy.model2.Unsettable2WithDefault <em>Unsettable2 With Default</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.legacy.model2.Unsettable2WithDefault
-   * @generated
-   */
-  public Adapter createUnsettable2WithDefaultAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model2.PersistentContainment
-   * <em>Persistent Containment</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.legacy.model2.PersistentContainment
-   * @generated
-   */
-  public Adapter createPersistentContainmentAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model2.TransientContainer
-   * <em>Transient Container</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.legacy.model2.TransientContainer
-   * @generated
-   */
-  public Adapter createTransientContainerAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model2.NotUnsettable
-   * <em>Not Unsettable</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.legacy.model2.NotUnsettable
-   * @generated
-   */
-  public Adapter createNotUnsettableAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '
-   * {@link org.eclipse.emf.cdo.tests.legacy.model2.NotUnsettableWithDefault <em>Not Unsettable With Default</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.legacy.model2.NotUnsettableWithDefault
-   * @generated
-   */
-  public Adapter createNotUnsettableWithDefaultAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model2.MapHolder
-   * <em>Map Holder</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.legacy.model2.MapHolder
-   * @generated
-   */
-  public Adapter createMapHolderAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link java.util.Map.Entry <em>String To String 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 java.util.Map.Entry
-   * @generated
-   */
-  public Adapter createStringToStringMapAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link java.util.Map.Entry <em>Integer To String 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 java.util.Map.Entry
-   * @generated
-   */
-  public Adapter createIntegerToStringMapAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link java.util.Map.Entry <em>String To VAT 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 java.util.Map.Entry
-   * @generated
-   */
-  public Adapter createStringToVATMapAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link java.util.Map.Entry
-   * <em>String To Address Containment 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 java.util.Map.Entry
-   * @generated
-   */
-  public Adapter createStringToAddressContainmentMapAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link java.util.Map.Entry <em>String To Address Reference 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 java.util.Map.Entry
-   * @generated
-   */
-  public Adapter createStringToAddressReferenceMapAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link java.util.Map.Entry <em>EObject To EObject 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 java.util.Map.Entry
-   * @generated
-   */
-  public Adapter createEObjectToEObjectMapAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link java.util.Map.Entry
-   * <em>EObject To EObject Key Contained 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 java.util.Map.Entry
-   * @generated
-   */
-  public Adapter createEObjectToEObjectKeyContainedMapAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link java.util.Map.Entry
-   * <em>EObject To EObject Both Contained 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 java.util.Map.Entry
-   * @generated
-   */
-  public Adapter createEObjectToEObjectBothContainedMapAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link java.util.Map.Entry
-   * <em>EObject To EObject Value Contained 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 java.util.Map.Entry
-   * @generated
-   */
-  public Adapter createEObjectToEObjectValueContainedMapAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model2.EnumListHolder
-   * <em>Enum List Holder</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.legacy.model2.EnumListHolder
-   * @generated
-   */
-  public Adapter createEnumListHolderAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model1.Order <em>Order</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.legacy.model1.Order
-   * @generated
-   */
-  public Adapter createOrderAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model1.PurchaseOrder
-   * <em>Purchase Order</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.legacy.model1.PurchaseOrder
-   * @generated
-   */
-  public Adapter createPurchaseOrderAdapter()
-  {
-    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;
-  }
-
-} // Model2AdapterFactory
diff --git a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/util/Model2Switch.java b/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/util/Model2Switch.java
deleted file mode 100644
index 940dd3abaf..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.model2/src/org/eclipse/emf/cdo/tests/legacy/model2/util/Model2Switch.java
+++ /dev/null
@@ -1,646 +0,0 @@
-/**
- * Copyright (c) 2004 - 2011 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.legacy.model2.util;
-
-import org.eclipse.emf.cdo.tests.legacy.model2.Model2Package;
-import org.eclipse.emf.cdo.tests.model1.Address;
-import org.eclipse.emf.cdo.tests.model1.Order;
-import org.eclipse.emf.cdo.tests.model1.PurchaseOrder;
-import org.eclipse.emf.cdo.tests.model1.VAT;
-import org.eclipse.emf.cdo.tests.model2.EnumListHolder;
-import org.eclipse.emf.cdo.tests.model2.MapHolder;
-import org.eclipse.emf.cdo.tests.model2.NotUnsettable;
-import org.eclipse.emf.cdo.tests.model2.NotUnsettableWithDefault;
-import org.eclipse.emf.cdo.tests.model2.PersistentContainment;
-import org.eclipse.emf.cdo.tests.model2.SpecialPurchaseOrder;
-import org.eclipse.emf.cdo.tests.model2.Task;
-import org.eclipse.emf.cdo.tests.model2.TaskContainer;
-import org.eclipse.emf.cdo.tests.model2.TransientContainer;
-import org.eclipse.emf.cdo.tests.model2.Unsettable1;
-import org.eclipse.emf.cdo.tests.model2.Unsettable2WithDefault;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * <!-- 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.legacy.model2.Model2Package
- * @generated
- */
-public class Model2Switch<T>
-{
-  /**
-   * The cached model package <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  protected static Model2Package modelPackage;
-
-  /**
-   * Creates an instance of the switch. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public Model2Switch()
-  {
-    if (modelPackage == null)
-    {
-      modelPackage = Model2Package.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 Model2Package.SPECIAL_PURCHASE_ORDER:
-    {
-      SpecialPurchaseOrder specialPurchaseOrder = (SpecialPurchaseOrder)theEObject;
-      T result = caseSpecialPurchaseOrder(specialPurchaseOrder);
-      if (result == null)
-        result = casePurchaseOrder(specialPurchaseOrder);
-      if (result == null)
-        result = caseOrder(specialPurchaseOrder);
-      if (result == null)
-        result = defaultCase(theEObject);
-      return result;
-    }
-    case Model2Package.TASK_CONTAINER:
-    {
-      TaskContainer taskContainer = (TaskContainer)theEObject;
-      T result = caseTaskContainer(taskContainer);
-      if (result == null)
-        result = defaultCase(theEObject);
-      return result;
-    }
-    case Model2Package.TASK:
-    {
-      Task task = (Task)theEObject;
-      T result = caseTask(task);
-      if (result == null)
-        result = defaultCase(theEObject);
-      return result;
-    }
-    case Model2Package.UNSETTABLE1:
-    {
-      Unsettable1 unsettable1 = (Unsettable1)theEObject;
-      T result = caseUnsettable1(unsettable1);
-      if (result == null)
-        result = defaultCase(theEObject);
-      return result;
-    }
-    case Model2Package.UNSETTABLE2_WITH_DEFAULT:
-    {
-      Unsettable2WithDefault unsettable2WithDefault = (Unsettable2WithDefault)theEObject;
-      T result = caseUnsettable2WithDefault(unsettable2WithDefault);
-      if (result == null)
-        result = defaultCase(theEObject);
-      return result;
-    }
-    case Model2Package.PERSISTENT_CONTAINMENT:
-    {
-      PersistentContainment persistentContainment = (PersistentContainment)theEObject;
-      T result = casePersistentContainment(persistentContainment);
-      if (result == null)
-        result = defaultCase(theEObject);
-      return result;
-    }
-    case Model2Package.TRANSIENT_CONTAINER:
-    {
-      TransientContainer transientContainer = (TransientContainer)theEObject;
-      T result = caseTransientContainer(transientContainer);
-      if (result == null)
-        result = defaultCase(theEObject);
-      return result;
-    }
-    case Model2Package.NOT_UNSETTABLE:
-    {
-      NotUnsettable notUnsettable = (NotUnsettable)theEObject;
-      T result = caseNotUnsettable(notUnsettable);
-      if (result == null)
-        result = defaultCase(theEObject);
-      return result;
-    }
-    case Model2Package.NOT_UNSETTABLE_WITH_DEFAULT:
-    {
-      NotUnsettableWithDefault notUnsettableWithDefault = (NotUnsettableWithDefault)theEObject;
-      T result = caseNotUnsettableWithDefault(notUnsettableWithDefault);
-      if (result == null)
-        result = defaultCase(theEObject);
-      return result;
-    }
-    case Model2Package.MAP_HOLDER:
-    {
-      MapHolder mapHolder = (MapHolder)theEObject;
-      T result = caseMapHolder(mapHolder);
-      if (result == null)
-        result = defaultCase(theEObject);
-      return result;
-    }
-    case Model2Package.STRING_TO_STRING_MAP:
-    {
-      @SuppressWarnings("unchecked")
-      Map.Entry<String, String> stringToStringMap = (Map.Entry<String, String>)theEObject;
-      T result = caseStringToStringMap(stringToStringMap);
-      if (result == null)
-        result = defaultCase(theEObject);
-      return result;
-    }
-    case Model2Package.INTEGER_TO_STRING_MAP:
-    {
-      @SuppressWarnings("unchecked")
-      Map.Entry<Integer, String> integerToStringMap = (Map.Entry<Integer, String>)theEObject;
-      T result = caseIntegerToStringMap(integerToStringMap);
-      if (result == null)
-        result = defaultCase(theEObject);
-      return result;
-    }
-    case Model2Package.STRING_TO_VAT_MAP:
-    {
-      @SuppressWarnings("unchecked")
-      Map.Entry<String, VAT> stringToVATMap = (Map.Entry<String, VAT>)theEObject;
-      T result = caseStringToVATMap(stringToVATMap);
-      if (result == null)
-        result = defaultCase(theEObject);
-      return result;
-    }
-    case Model2Package.STRING_TO_ADDRESS_CONTAINMENT_MAP:
-    {
-      @SuppressWarnings("unchecked")
-      Map.Entry<String, Address> stringToAddressContainmentMap = (Map.Entry<String, Address>)theEObject;
-      T result = caseStringToAddressContainmentMap(stringToAddressContainmentMap);
-      if (result == null)
-        result = defaultCase(theEObject);
-      return result;
-    }
-    case Model2Package.STRING_TO_ADDRESS_REFERENCE_MAP:
-    {
-      @SuppressWarnings("unchecked")
-      Map.Entry<String, Address> stringToAddressReferenceMap = (Map.Entry<String, Address>)theEObject;
-      T result = caseStringToAddressReferenceMap(stringToAddressReferenceMap);
-      if (result == null)
-        result = defaultCase(theEObject);
-      return result;
-    }
-    case Model2Package.EOBJECT_TO_EOBJECT_MAP:
-    {
-      @SuppressWarnings("unchecked")
-      Map.Entry<EObject, EObject> eObjectToEObjectMap = (Map.Entry<EObject, EObject>)theEObject;
-      T result = caseEObjectToEObjectMap(eObjectToEObjectMap);
-      if (result == null)
-        result = defaultCase(theEObject);
-      return result;
-    }
-    case Model2Package.EOBJECT_TO_EOBJECT_KEY_CONTAINED_MAP:
-    {
-      @SuppressWarnings("unchecked")
-      Map.Entry<EObject, EObject> eObjectToEObjectKeyContainedMap = (Map.Entry<EObject, EObject>)theEObject;
-      T result = caseEObjectToEObjectKeyContainedMap(eObjectToEObjectKeyContainedMap);
-      if (result == null)
-        result = defaultCase(theEObject);
-      return result;
-    }
-    case Model2Package.EOBJECT_TO_EOBJECT_BOTH_CONTAINED_MAP:
-    {
-      @SuppressWarnings("unchecked")
-      Map.Entry<EObject, EObject> eObjectToEObjectBothContainedMap = (Map.Entry<EObject, EObject>)theEObject;
-      T result = caseEObjectToEObjectBothContainedMap(eObjectToEObjectBothContainedMap);
-      if (result == null)
-        result = defaultCase(theEObject);
-      return result;
-    }
-    case Model2Package.EOBJECT_TO_EOBJECT_VALUE_CONTAINED_MAP:
-    {
-      @SuppressWarnings("unchecked")
-      Map.Entry<EObject, EObject> eObjectToEObjectValueContainedMap = (Map.Entry<EObject, EObject>)theEObject;
-      T result = caseEObjectToEObjectValueContainedMap(eObjectToEObjectValueContainedMap);
-      if (result == null)
-        result = defaultCase(theEObject);
-      return result;
-    }
-    case Model2Package.ENUM_LIST_HOLDER:
-    {
-      EnumListHolder enumListHolder = (EnumListHolder)theEObject;
-      T result = caseEnumListHolder(enumListHolder);
-      if (result == null)
-        result = defaultCase(theEObject);
-      return result;
-    }
-    default:
-      return defaultCase(theEObject);
-    }
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Special Purchase Order</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>Special Purchase Order</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseSpecialPurchaseOrder(SpecialPurchaseOrder object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Task Container</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>Task Container</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseTaskContainer(TaskContainer object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Task</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>Task</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseTask(Task object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Unsettable1</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>Unsettable1</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseUnsettable1(Unsettable1 object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Unsettable2 With Default</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>Unsettable2 With Default</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseUnsettable2WithDefault(Unsettable2WithDefault object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Persistent Containment</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>Persistent Containment</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T casePersistentContainment(PersistentContainment object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Transient Container</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>Transient Container</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseTransientContainer(TransientContainer object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Not Unsettable</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>Not Unsettable</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseNotUnsettable(NotUnsettable object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Not Unsettable With Default</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>Not Unsettable With Default</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseNotUnsettableWithDefault(NotUnsettableWithDefault object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Map Holder</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>Map Holder</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseMapHolder(MapHolder object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>String To String 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>String To String Map</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseStringToStringMap(Map.Entry<String, String> object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Integer To String 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>Integer To String Map</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseIntegerToStringMap(Map.Entry<Integer, String> object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>String To VAT 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>String To VAT Map</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseStringToVATMap(Map.Entry<String, VAT> object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>String To Address Containment 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>String To Address Containment Map</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseStringToAddressContainmentMap(Map.Entry<String, Address> object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>String To Address Reference 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>String To Address Reference Map</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseStringToAddressReferenceMap(Map.Entry<String, Address> object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>EObject To EObject 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>EObject To EObject Map</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseEObjectToEObjectMap(Map.Entry<EObject, EObject> object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>EObject To EObject Key Contained 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>EObject To EObject Key Contained Map</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseEObjectToEObjectKeyContainedMap(Map.Entry<EObject, EObject> object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>EObject To EObject Both Contained 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>EObject To EObject Both Contained Map</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseEObjectToEObjectBothContainedMap(Map.Entry<EObject, EObject> object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>EObject To EObject Value Contained 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>EObject To EObject Value Contained Map</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseEObjectToEObjectValueContainedMap(Map.Entry<EObject, EObject> object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Enum List Holder</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>Enum List Holder</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseEnumListHolder(EnumListHolder object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Order</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>Order</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseOrder(Order object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Purchase Order</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>Purchase Order</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T casePurchaseOrder(PurchaseOrder 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;
-  }
-
-} // Model2Switch
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.tests.model3/META-INF/MANIFEST.MF
index f55df1a4ff..1554f2a24c 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.emf.cdo.tests.model3; singleton:=true
-Bundle-Version: 3.0.100.qualifier
+Bundle-Version: 3.0.200.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -14,11 +14,9 @@ Export-Package: org.eclipse.emf.cdo.tests.legacy.model3;version="3.0.100",
  org.eclipse.emf.cdo.tests.legacy.model3.impl;version="3.0.100",
  org.eclipse.emf.cdo.tests.legacy.model3.subpackage;version="3.0.100",
  org.eclipse.emf.cdo.tests.legacy.model3.subpackage.impl;version="3.0.100",
- org.eclipse.emf.cdo.tests.legacy.model3.subpackage.util;version="3.0.100",
- org.eclipse.emf.cdo.tests.legacy.model3.util;version="3.0.100",
- org.eclipse.emf.cdo.tests.model3;version="3.0.100",
- org.eclipse.emf.cdo.tests.model3.impl;version="3.0.100",
- org.eclipse.emf.cdo.tests.model3.subpackage;version="3.0.100",
- org.eclipse.emf.cdo.tests.model3.subpackage.impl;version="3.0.100",
- org.eclipse.emf.cdo.tests.model3.subpackage.util;version="3.0.100",
- org.eclipse.emf.cdo.tests.model3.util;version="3.0.100"
+ org.eclipse.emf.cdo.tests.model3;version="3.0.200",
+ org.eclipse.emf.cdo.tests.model3.impl;version="3.0.200",
+ org.eclipse.emf.cdo.tests.model3.subpackage;version="3.0.200",
+ org.eclipse.emf.cdo.tests.model3.subpackage.impl;version="3.0.200",
+ org.eclipse.emf.cdo.tests.model3.subpackage.util;version="3.0.200",
+ org.eclipse.emf.cdo.tests.model3.util;version="3.0.200"
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/model/model3-legacy.genmodel b/plugins/org.eclipse.emf.cdo.tests.model3/model/model3-legacy.genmodel
index b829d2af7b..a7028964c1 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/model/model3-legacy.genmodel
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/model/model3-legacy.genmodel
@@ -5,7 +5,7 @@
     modelDirectory="/org.eclipse.emf.cdo.tests.model3/src" editDirectory="" editorDirectory=""
     modelPluginID="org.eclipse.emf.cdo.tests.model3" modelName="Model3" updateClasspath="false"
     codeFormatting="true" testsDirectory="" importerID="org.eclipse.emf.importer.ecore"
-    complianceLevel="5.0" copyrightFields="false" usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../org.eclipse.emf.cdo/model/etypes.genmodel#//etypes">
+    complianceLevel="5.0" copyrightFields="false" runtimeVersion="2.6" usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../org.eclipse.emf.cdo/model/etypes.genmodel#//etypes">
   <foreignModel>model3.ecore</foreignModel>
   <modelPluginVariables>CDO=org.eclipse.emf.cdo</modelPluginVariables>
   <genPackages prefix="Model3" basePackage="org.eclipse.emf.cdo.tests.legacy" disposableProviderFactory="true"
@@ -58,6 +58,9 @@
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model3.ecore#//File/name"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model3.ecore#//File/data"/>
     </genClasses>
+    <genClasses ecoreClass="model3.ecore#//ClassWithIDAttribute">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model3.ecore#//ClassWithIDAttribute/id"/>
+    </genClasses>
     <nestedGenPackages prefix="Subpackage" basePackage="org.eclipse.emf.cdo.tests.legacy.model3"
         disposableProviderFactory="true" ecorePackage="model3.ecore#//subpackage">
       <genClasses ecoreClass="model3.ecore#//subpackage/Class2">
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/model/model3.genmodel b/plugins/org.eclipse.emf.cdo.tests.model3/model/model3.genmodel
index 2e539ba97c..6a68ccf8df 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/model/model3.genmodel
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/model/model3.genmodel
@@ -6,7 +6,8 @@
     modelPluginID="org.eclipse.emf.cdo.tests.model3" modelName="Model3" updateClasspath="false"
     rootExtendsClass="org.eclipse.emf.internal.cdo.CDOObjectImpl" reflectiveDelegation="true"
     codeFormatting="true" testsDirectory="" importerID="org.eclipse.emf.importer.ecore"
-    featureDelegation="Reflective" complianceLevel="5.0" copyrightFields="false" usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../org.eclipse.emf.cdo/model/etypes.genmodel#//etypes">
+    featureDelegation="Reflective" complianceLevel="5.0" copyrightFields="false" runtimeVersion="2.6"
+    usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../org.eclipse.emf.cdo/model/etypes.genmodel#//etypes">
   <foreignModel>model3.ecore</foreignModel>
   <modelPluginVariables>CDO=org.eclipse.emf.cdo</modelPluginVariables>
   <genPackages prefix="Model3" basePackage="org.eclipse.emf.cdo.tests" disposableProviderFactory="true"
@@ -59,6 +60,9 @@
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model3.ecore#//File/name"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model3.ecore#//File/data"/>
     </genClasses>
+    <genClasses ecoreClass="model3.ecore#//ClassWithIDAttribute">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model3.ecore#//ClassWithIDAttribute/id"/>
+    </genClasses>
     <nestedGenPackages prefix="Subpackage" basePackage="org.eclipse.emf.cdo.tests.model3"
         disposableProviderFactory="true" ecorePackage="model3.ecore#//subpackage">
       <genClasses ecoreClass="model3.ecore#//subpackage/Class2">
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/Model3PackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/Model3PackageImpl.java
index cc8cf9aa87..f8bdc29606 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/Model3PackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/impl/Model3PackageImpl.java
@@ -167,7 +167,9 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package
   public static Model3Package init()
   {
     if (isInited)
+    {
       return (Model3Package)EPackage.Registry.INSTANCE.getEPackage(Model3Package.eNS_URI);
+    }
 
     // Obtain or create and register package
     Model3PackageImpl theModel3Package = (Model3PackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof Model3PackageImpl ? EPackage.Registry.INSTANCE
@@ -625,7 +627,9 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package
   public void createPackageContents()
   {
     if (isCreated)
+    {
       return;
+    }
     isCreated = true;
 
     // Create classes and their features
@@ -699,7 +703,9 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package
   public void initializePackageContents()
   {
     if (isInitialized)
+    {
       return;
+    }
     isInitialized = true;
 
     // Initialize package
@@ -740,66 +746,65 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package
         IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(polygonEClass, Polygon.class, "Polygon", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getPolygon_Points(), this.getPoint(), "points", null, 1, -1, Polygon.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getPolygon_Points(), getPoint(), "points", null, 1, -1, Polygon.class, !IS_TRANSIENT, !IS_VOLATILE,
+        IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(polygonWithDuplicatesEClass, PolygonWithDuplicates.class, "PolygonWithDuplicates", !IS_ABSTRACT,
         !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getPolygonWithDuplicates_Points(), this.getPoint(), "points", null, 1, -1,
-        PolygonWithDuplicates.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getPolygonWithDuplicates_Points(), getPoint(), "points", null, 1, -1, PolygonWithDuplicates.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(nodeAEClass, NodeA.class, "NodeA", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getNodeA_Children(), this.getNodeA(), null, "children", null, 0, -1, NodeA.class, !IS_TRANSIENT,
+    initEReference(getNodeA_Children(), getNodeA(), null, "children", null, 0, -1, NodeA.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
         IS_ORDERED);
     initEAttribute(getNodeA_Name(), theEcorePackage.getEString(), "name", null, 0, 1, NodeA.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getNodeA_OtherNodes(), this.getNodeA(), null, "otherNodes", null, 0, -1, NodeA.class, !IS_TRANSIENT,
+    initEReference(getNodeA_OtherNodes(), getNodeA(), null, "otherNodes", null, 0, -1, NodeA.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
         IS_ORDERED);
 
     initEClass(nodeBEClass, NodeB.class, "NodeB", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getNodeB_Children(), this.getNodeB(), this.getNodeB_Parent(), "children", null, 0, -1, NodeB.class,
+    initEReference(getNodeB_Children(), getNodeB(), getNodeB_Parent(), "children", null, 0, -1, NodeB.class,
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
         !IS_DERIVED, IS_ORDERED);
-    initEReference(getNodeB_Parent(), this.getNodeB(), this.getNodeB_Children(), "parent", null, 0, 1, NodeB.class,
+    initEReference(getNodeB_Parent(), getNodeB(), getNodeB_Children(), "parent", null, 0, 1, NodeB.class,
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
         !IS_DERIVED, IS_ORDERED);
     initEAttribute(getNodeB_Name(), theEcorePackage.getEString(), "name", null, 0, 1, NodeB.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(nodeCEClass, NodeC.class, "NodeC", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getNodeC_Children(), this.getNodeC(), this.getNodeC_Parent(), "children", null, 0, -1, NodeC.class,
+    initEReference(getNodeC_Children(), getNodeC(), getNodeC_Parent(), "children", null, 0, -1, NodeC.class,
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
         !IS_DERIVED, IS_ORDERED);
-    initEReference(getNodeC_Parent(), this.getNodeC(), this.getNodeC_Children(), "parent", null, 0, 1, NodeC.class,
+    initEReference(getNodeC_Parent(), getNodeC(), getNodeC_Children(), "parent", null, 0, 1, NodeC.class,
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
         !IS_DERIVED, IS_ORDERED);
     initEAttribute(getNodeC_Name(), theEcorePackage.getEString(), "name", null, 0, 1, NodeC.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getNodeC_OtherNodes(), this.getNodeC(), this.getNodeC_OppositeNodes(), "otherNodes", null, 0, -1,
-        NodeC.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getNodeC_OppositeNodes(), this.getNodeC(), this.getNodeC_OtherNodes(), "oppositeNodes", null, 0, -1,
+    initEReference(getNodeC_OtherNodes(), getNodeC(), getNodeC_OppositeNodes(), "otherNodes", null, 0, -1, NodeC.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+        !IS_DERIVED, IS_ORDERED);
+    initEReference(getNodeC_OppositeNodes(), getNodeC(), getNodeC_OtherNodes(), "oppositeNodes", null, 0, -1,
         NodeC.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
         IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(nodeDEClass, NodeD.class, "NodeD", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getNodeD_Children(), this.getNodeD(), this.getNodeD_Parent(), "children", null, 0, -1, NodeD.class,
+    initEReference(getNodeD_Children(), getNodeD(), getNodeD_Parent(), "children", null, 0, -1, NodeD.class,
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
         !IS_DERIVED, IS_ORDERED);
-    initEReference(getNodeD_Parent(), this.getNodeD(), this.getNodeD_Children(), "parent", null, 0, 1, NodeD.class,
+    initEReference(getNodeD_Parent(), getNodeD(), getNodeD_Children(), "parent", null, 0, 1, NodeD.class,
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
         !IS_DERIVED, IS_ORDERED);
     initEAttribute(getNodeD_Name(), theEcorePackage.getEString(), "name", null, 0, 1, NodeD.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getNodeD_OtherNodes(), this.getNodeD(), this.getNodeD_OppositeNode(), "otherNodes", null, 0, -1,
-        NodeD.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getNodeD_OppositeNode(), this.getNodeD(), this.getNodeD_OtherNodes(), "oppositeNode", null, 0, 1,
-        NodeD.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-        IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getNodeD_OtherNodes(), getNodeD(), getNodeD_OppositeNode(), "otherNodes", null, 0, -1, NodeD.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+        !IS_DERIVED, IS_ORDERED);
+    initEReference(getNodeD_OppositeNode(), getNodeD(), getNodeD_OtherNodes(), "oppositeNode", null, 0, 1, NodeD.class,
+        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+        !IS_DERIVED, IS_ORDERED);
 
     initEClass(imageEClass, Image.class, "Image", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
     initEAttribute(getImage_Width(), theEcorePackage.getEInt(), "width", null, 0, 1, Image.class, !IS_TRANSIENT,
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/subpackage/util/SubpackageAdapterFactory.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/subpackage/util/SubpackageAdapterFactory.java
deleted file mode 100644
index 3b7549386e..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/subpackage/util/SubpackageAdapterFactory.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/**
- * Copyright (c) 2004 - 2011 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.legacy.model3.subpackage.util;
-
-import org.eclipse.emf.cdo.tests.legacy.model3.subpackage.SubpackagePackage;
-import org.eclipse.emf.cdo.tests.model3.subpackage.Class2;
-
-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.legacy.model3.subpackage.SubpackagePackage
- * @generated
- */
-public class SubpackageAdapterFactory extends AdapterFactoryImpl
-{
-  /**
-   * The cached model package. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  protected static SubpackagePackage modelPackage;
-
-  /**
-   * Creates an instance of the adapter factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public SubpackageAdapterFactory()
-  {
-    if (modelPackage == null)
-    {
-      modelPackage = SubpackagePackage.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 SubpackageSwitch<Adapter> modelSwitch = new SubpackageSwitch<Adapter>()
-  {
-    @Override
-    public Adapter caseClass2(Class2 object)
-    {
-      return createClass2Adapter();
-    }
-
-    @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.legacy.model3.subpackage.Class2
-   * <em>Class2</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.legacy.model3.subpackage.Class2
-   * @generated
-   */
-  public Adapter createClass2Adapter()
-  {
-    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;
-  }
-
-} // SubpackageAdapterFactory
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/subpackage/util/SubpackageSwitch.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/subpackage/util/SubpackageSwitch.java
deleted file mode 100644
index 12f2284e20..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/subpackage/util/SubpackageSwitch.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/**
- * Copyright (c) 2004 - 2011 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.legacy.model3.subpackage.util;
-
-import org.eclipse.emf.cdo.tests.legacy.model3.subpackage.SubpackagePackage;
-import org.eclipse.emf.cdo.tests.model3.subpackage.Class2;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.util.Switch;
-
-/**
- * <!-- 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.legacy.model3.subpackage.SubpackagePackage
- * @generated
- */
-public class SubpackageSwitch<T> extends Switch<T>
-{
-  /**
-   * The cached model package <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  protected static SubpackagePackage modelPackage;
-
-  /**
-   * Creates an instance of the switch. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public SubpackageSwitch()
-  {
-    if (modelPackage == null)
-    {
-      modelPackage = SubpackagePackage.eINSTANCE;
-    }
-  }
-
-  /**
-   * Checks whether this is a switch for the given package. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @parameter ePackage the package in question.
-   * @return whether this is a switch for the given package.
-   * @generated
-   */
-  @Override
-  protected boolean isSwitchFor(EPackage ePackage)
-  {
-    return ePackage == modelPackage;
-  }
-
-  /**
-   * 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
-   */
-  @Override
-  protected T doSwitch(int classifierID, EObject theEObject)
-  {
-    switch (classifierID)
-    {
-    case SubpackagePackage.CLASS2:
-    {
-      Class2 class2 = (Class2)theEObject;
-      T result = caseClass2(class2);
-      if (result == null)
-        result = defaultCase(theEObject);
-      return result;
-    }
-    default:
-      return defaultCase(theEObject);
-    }
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Class2</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>Class2</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseClass2(Class2 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
-   */
-  @Override
-  public T defaultCase(EObject object)
-  {
-    return null;
-  }
-
-} // SubpackageSwitch
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/util/Model3AdapterFactory.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/util/Model3AdapterFactory.java
deleted file mode 100644
index 4b01541434..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/util/Model3AdapterFactory.java
+++ /dev/null
@@ -1,344 +0,0 @@
-/**
- * Copyright (c) 2004 - 2011 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.legacy.model3.util;
-
-import org.eclipse.emf.cdo.tests.legacy.model3.Model3Package;
-import org.eclipse.emf.cdo.tests.model3.Class1;
-import org.eclipse.emf.cdo.tests.model3.ClassWithIDAttribute;
-import org.eclipse.emf.cdo.tests.model3.File;
-import org.eclipse.emf.cdo.tests.model3.Image;
-import org.eclipse.emf.cdo.tests.model3.MetaRef;
-import org.eclipse.emf.cdo.tests.model3.NodeA;
-import org.eclipse.emf.cdo.tests.model3.NodeB;
-import org.eclipse.emf.cdo.tests.model3.NodeC;
-import org.eclipse.emf.cdo.tests.model3.NodeD;
-import org.eclipse.emf.cdo.tests.model3.Polygon;
-import org.eclipse.emf.cdo.tests.model3.PolygonWithDuplicates;
-
-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.legacy.model3.Model3Package
- * @generated
- */
-public class Model3AdapterFactory extends AdapterFactoryImpl
-{
-  /**
-   * The cached model package. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  protected static Model3Package modelPackage;
-
-  /**
-   * Creates an instance of the adapter factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public Model3AdapterFactory()
-  {
-    if (modelPackage == null)
-    {
-      modelPackage = Model3Package.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 Model3Switch<Adapter> modelSwitch = new Model3Switch<Adapter>()
-  {
-    @Override
-    public Adapter caseClass1(Class1 object)
-    {
-      return createClass1Adapter();
-    }
-
-    @Override
-    public Adapter caseMetaRef(MetaRef object)
-    {
-      return createMetaRefAdapter();
-    }
-
-    @Override
-    public Adapter casePolygon(Polygon object)
-    {
-      return createPolygonAdapter();
-    }
-
-    @Override
-    public Adapter casePolygonWithDuplicates(PolygonWithDuplicates object)
-    {
-      return createPolygonWithDuplicatesAdapter();
-    }
-
-    @Override
-    public Adapter caseNodeA(NodeA object)
-    {
-      return createNodeAAdapter();
-    }
-
-    @Override
-    public Adapter caseNodeB(NodeB object)
-    {
-      return createNodeBAdapter();
-    }
-
-    @Override
-    public Adapter caseNodeC(NodeC object)
-    {
-      return createNodeCAdapter();
-    }
-
-    @Override
-    public Adapter caseNodeD(NodeD object)
-    {
-      return createNodeDAdapter();
-    }
-
-    @Override
-    public Adapter caseImage(Image object)
-    {
-      return createImageAdapter();
-    }
-
-    @Override
-    public Adapter caseFile(File object)
-    {
-      return createFileAdapter();
-    }
-
-    @Override
-    public Adapter caseClassWithIDAttribute(ClassWithIDAttribute object)
-    {
-      return createClassWithIDAttributeAdapter();
-    }
-
-    @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.legacy.model3.Class1
-   * <em>Class1</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.legacy.model3.Class1
-   * @generated
-   */
-  public Adapter createClass1Adapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model3.MetaRef
-   * <em>Meta Ref</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.legacy.model3.MetaRef
-   * @generated
-   */
-  public Adapter createMetaRefAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model3.Polygon
-   * <em>Polygon</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.legacy.model3.Polygon
-   * @generated
-   */
-  public Adapter createPolygonAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model3.PolygonWithDuplicates
-   * <em>Polygon With Duplicates</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.legacy.model3.PolygonWithDuplicates
-   * @generated
-   */
-  public Adapter createPolygonWithDuplicatesAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model3.NodeA <em>Node A</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.legacy.model3.NodeA
-   * @generated
-   */
-  public Adapter createNodeAAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model3.NodeB <em>Node B</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.legacy.model3.NodeB
-   * @generated
-   */
-  public Adapter createNodeBAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model3.NodeC <em>Node C</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.legacy.model3.NodeC
-   * @generated
-   */
-  public Adapter createNodeCAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model3.NodeD <em>Node D</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.legacy.model3.NodeD
-   * @generated
-   */
-  public Adapter createNodeDAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model3.Image <em>Image</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.legacy.model3.Image
-   * @generated
-   */
-  public Adapter createImageAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model3.File <em>File</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.legacy.model3.File
-   * @generated
-   */
-  public Adapter createFileAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model3.ClassWithIDAttribute
-   * <em>Class With ID Attribute</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.legacy.model3.ClassWithIDAttribute
-   * @generated
-   */
-  public Adapter createClassWithIDAttributeAdapter()
-  {
-    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;
-  }
-
-} // Model3AdapterFactory
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/util/Model3Switch.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/util/Model3Switch.java
deleted file mode 100644
index 6c8eced6a3..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/legacy/model3/util/Model3Switch.java
+++ /dev/null
@@ -1,363 +0,0 @@
-/**
- * Copyright (c) 2004 - 2011 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.legacy.model3.util;
-
-import org.eclipse.emf.cdo.tests.legacy.model3.Model3Package;
-import org.eclipse.emf.cdo.tests.model3.Class1;
-import org.eclipse.emf.cdo.tests.model3.ClassWithIDAttribute;
-import org.eclipse.emf.cdo.tests.model3.File;
-import org.eclipse.emf.cdo.tests.model3.Image;
-import org.eclipse.emf.cdo.tests.model3.MetaRef;
-import org.eclipse.emf.cdo.tests.model3.NodeA;
-import org.eclipse.emf.cdo.tests.model3.NodeB;
-import org.eclipse.emf.cdo.tests.model3.NodeC;
-import org.eclipse.emf.cdo.tests.model3.NodeD;
-import org.eclipse.emf.cdo.tests.model3.Polygon;
-import org.eclipse.emf.cdo.tests.model3.PolygonWithDuplicates;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.util.Switch;
-
-/**
- * <!-- 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.legacy.model3.Model3Package
- * @generated
- */
-public class Model3Switch<T> extends Switch<T>
-{
-  /**
-   * The cached model package <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  protected static Model3Package modelPackage;
-
-  /**
-   * Creates an instance of the switch. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public Model3Switch()
-  {
-    if (modelPackage == null)
-    {
-      modelPackage = Model3Package.eINSTANCE;
-    }
-  }
-
-  /**
-   * Checks whether this is a switch for the given package. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @parameter ePackage the package in question.
-   * @return whether this is a switch for the given package.
-   * @generated
-   */
-  @Override
-  protected boolean isSwitchFor(EPackage ePackage)
-  {
-    return ePackage == modelPackage;
-  }
-
-  /**
-   * 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
-   */
-  @Override
-  protected T doSwitch(int classifierID, EObject theEObject)
-  {
-    switch (classifierID)
-    {
-    case Model3Package.CLASS1:
-    {
-      Class1 class1 = (Class1)theEObject;
-      T result = caseClass1(class1);
-      if (result == null)
-        result = defaultCase(theEObject);
-      return result;
-    }
-    case Model3Package.META_REF:
-    {
-      MetaRef metaRef = (MetaRef)theEObject;
-      T result = caseMetaRef(metaRef);
-      if (result == null)
-        result = defaultCase(theEObject);
-      return result;
-    }
-    case Model3Package.POLYGON:
-    {
-      Polygon polygon = (Polygon)theEObject;
-      T result = casePolygon(polygon);
-      if (result == null)
-        result = defaultCase(theEObject);
-      return result;
-    }
-    case Model3Package.POLYGON_WITH_DUPLICATES:
-    {
-      PolygonWithDuplicates polygonWithDuplicates = (PolygonWithDuplicates)theEObject;
-      T result = casePolygonWithDuplicates(polygonWithDuplicates);
-      if (result == null)
-        result = defaultCase(theEObject);
-      return result;
-    }
-    case Model3Package.NODE_A:
-    {
-      NodeA nodeA = (NodeA)theEObject;
-      T result = caseNodeA(nodeA);
-      if (result == null)
-        result = defaultCase(theEObject);
-      return result;
-    }
-    case Model3Package.NODE_B:
-    {
-      NodeB nodeB = (NodeB)theEObject;
-      T result = caseNodeB(nodeB);
-      if (result == null)
-        result = defaultCase(theEObject);
-      return result;
-    }
-    case Model3Package.NODE_C:
-    {
-      NodeC nodeC = (NodeC)theEObject;
-      T result = caseNodeC(nodeC);
-      if (result == null)
-        result = defaultCase(theEObject);
-      return result;
-    }
-    case Model3Package.NODE_D:
-    {
-      NodeD nodeD = (NodeD)theEObject;
-      T result = caseNodeD(nodeD);
-      if (result == null)
-        result = defaultCase(theEObject);
-      return result;
-    }
-    case Model3Package.IMAGE:
-    {
-      Image image = (Image)theEObject;
-      T result = caseImage(image);
-      if (result == null)
-        result = defaultCase(theEObject);
-      return result;
-    }
-    case Model3Package.FILE:
-    {
-      File file = (File)theEObject;
-      T result = caseFile(file);
-      if (result == null)
-        result = defaultCase(theEObject);
-      return result;
-    }
-    case Model3Package.CLASS_WITH_ID_ATTRIBUTE:
-    {
-      ClassWithIDAttribute classWithIDAttribute = (ClassWithIDAttribute)theEObject;
-      T result = caseClassWithIDAttribute(classWithIDAttribute);
-      if (result == null)
-        result = defaultCase(theEObject);
-      return result;
-    }
-    default:
-      return defaultCase(theEObject);
-    }
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Class1</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>Class1</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseClass1(Class1 object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Meta Ref</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>Meta Ref</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseMetaRef(MetaRef object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Polygon</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>Polygon</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T casePolygon(Polygon object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Polygon With Duplicates</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>Polygon With Duplicates</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T casePolygonWithDuplicates(PolygonWithDuplicates object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Node A</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>Node A</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseNodeA(NodeA object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Node B</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>Node B</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseNodeB(NodeB object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Node C</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>Node C</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseNodeC(NodeC object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Node D</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>Node D</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseNodeD(NodeD object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Image</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>Image</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseImage(Image object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>File</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>File</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseFile(File object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Class With ID Attribute</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>Class With ID Attribute</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseClassWithIDAttribute(ClassWithIDAttribute 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
-   */
-  @Override
-  public T defaultCase(EObject object)
-  {
-    return null;
-  }
-
-} // Model3Switch
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/util/SubpackageSwitch.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/util/SubpackageSwitch.java
index bd7f35e003..7f411a2997 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/util/SubpackageSwitch.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/util/SubpackageSwitch.java
@@ -13,9 +13,10 @@ package org.eclipse.emf.cdo.tests.model3.subpackage.util;
 import org.eclipse.emf.cdo.tests.model3.subpackage.Class2;
 import org.eclipse.emf.cdo.tests.model3.subpackage.SubpackagePackage;
 
+import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.util.Switch;
+
+import java.util.List;
 
 /**
  * <!-- begin-user-doc --> The <b>Switch</b> for the model's inheritance hierarchy. It supports the call
@@ -26,7 +27,7 @@ import org.eclipse.emf.ecore.util.Switch;
  * @see org.eclipse.emf.cdo.tests.model3.subpackage.SubpackagePackage
  * @generated
  */
-public class SubpackageSwitch<T> extends Switch<T>
+public class SubpackageSwitch<T>
 {
   /**
    * The cached model package <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -49,16 +50,35 @@ public class SubpackageSwitch<T> extends Switch<T>
   }
 
   /**
-   * Checks whether this is a switch for the given package. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 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 -->
    * 
-   * @parameter ePackage the package in question.
-   * @return whether this is a switch for the given package.
+   * @return the first non-null result returned by a <code>caseXXX</code> call.
    * @generated
    */
-  @Override
-  protected boolean isSwitchFor(EPackage ePackage)
+  protected T doSwitch(EClass theEClass, EObject theEObject)
   {
-    return ePackage == modelPackage;
+    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);
+    }
   }
 
   /**
@@ -68,7 +88,6 @@ public class SubpackageSwitch<T> extends Switch<T>
    * @return the first non-null result returned by a <code>caseXXX</code> call.
    * @generated
    */
-  @Override
   protected T doSwitch(int classifierID, EObject theEObject)
   {
     switch (classifierID)
@@ -78,7 +97,9 @@ public class SubpackageSwitch<T> extends Switch<T>
       Class2 class2 = (Class2)theEObject;
       T result = caseClass2(class2);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     default:
@@ -112,7 +133,6 @@ public class SubpackageSwitch<T> extends Switch<T>
    * @see #doSwitch(org.eclipse.emf.ecore.EObject)
    * @generated
    */
-  @Override
   public T defaultCase(EObject object)
   {
     return null;
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/util/Model3Switch.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/util/Model3Switch.java
index 32c274234f..e48cdf7b5f 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/util/Model3Switch.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/util/Model3Switch.java
@@ -23,9 +23,10 @@ import org.eclipse.emf.cdo.tests.model3.NodeD;
 import org.eclipse.emf.cdo.tests.model3.Polygon;
 import org.eclipse.emf.cdo.tests.model3.PolygonWithDuplicates;
 
+import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.util.Switch;
+
+import java.util.List;
 
 /**
  * <!-- begin-user-doc --> The <b>Switch</b> for the model's inheritance hierarchy. It supports the call
@@ -36,7 +37,7 @@ import org.eclipse.emf.ecore.util.Switch;
  * @see org.eclipse.emf.cdo.tests.model3.Model3Package
  * @generated
  */
-public class Model3Switch<T> extends Switch<T>
+public class Model3Switch<T>
 {
   /**
    * The cached model package <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -59,16 +60,35 @@ public class Model3Switch<T> extends Switch<T>
   }
 
   /**
-   * Checks whether this is a switch for the given package. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 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 -->
    * 
-   * @parameter ePackage the package in question.
-   * @return whether this is a switch for the given package.
+   * @return the first non-null result returned by a <code>caseXXX</code> call.
    * @generated
    */
-  @Override
-  protected boolean isSwitchFor(EPackage ePackage)
+  protected T doSwitch(EClass theEClass, EObject theEObject)
   {
-    return ePackage == modelPackage;
+    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);
+    }
   }
 
   /**
@@ -78,7 +98,6 @@ public class Model3Switch<T> extends Switch<T>
    * @return the first non-null result returned by a <code>caseXXX</code> call.
    * @generated
    */
-  @Override
   protected T doSwitch(int classifierID, EObject theEObject)
   {
     switch (classifierID)
@@ -88,7 +107,9 @@ public class Model3Switch<T> extends Switch<T>
       Class1 class1 = (Class1)theEObject;
       T result = caseClass1(class1);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model3Package.META_REF:
@@ -96,7 +117,9 @@ public class Model3Switch<T> extends Switch<T>
       MetaRef metaRef = (MetaRef)theEObject;
       T result = caseMetaRef(metaRef);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model3Package.POLYGON:
@@ -104,7 +127,9 @@ public class Model3Switch<T> extends Switch<T>
       Polygon polygon = (Polygon)theEObject;
       T result = casePolygon(polygon);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model3Package.POLYGON_WITH_DUPLICATES:
@@ -112,7 +137,9 @@ public class Model3Switch<T> extends Switch<T>
       PolygonWithDuplicates polygonWithDuplicates = (PolygonWithDuplicates)theEObject;
       T result = casePolygonWithDuplicates(polygonWithDuplicates);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model3Package.NODE_A:
@@ -120,7 +147,9 @@ public class Model3Switch<T> extends Switch<T>
       NodeA nodeA = (NodeA)theEObject;
       T result = caseNodeA(nodeA);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model3Package.NODE_B:
@@ -128,7 +157,9 @@ public class Model3Switch<T> extends Switch<T>
       NodeB nodeB = (NodeB)theEObject;
       T result = caseNodeB(nodeB);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model3Package.NODE_C:
@@ -136,7 +167,9 @@ public class Model3Switch<T> extends Switch<T>
       NodeC nodeC = (NodeC)theEObject;
       T result = caseNodeC(nodeC);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model3Package.NODE_D:
@@ -144,7 +177,9 @@ public class Model3Switch<T> extends Switch<T>
       NodeD nodeD = (NodeD)theEObject;
       T result = caseNodeD(nodeD);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model3Package.IMAGE:
@@ -152,7 +187,9 @@ public class Model3Switch<T> extends Switch<T>
       Image image = (Image)theEObject;
       T result = caseImage(image);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model3Package.FILE:
@@ -160,7 +197,9 @@ public class Model3Switch<T> extends Switch<T>
       File file = (File)theEObject;
       T result = caseFile(file);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model3Package.CLASS_WITH_ID_ATTRIBUTE:
@@ -168,7 +207,9 @@ public class Model3Switch<T> extends Switch<T>
       ClassWithIDAttribute classWithIDAttribute = (ClassWithIDAttribute)theEObject;
       T result = caseClassWithIDAttribute(classWithIDAttribute);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     default:
@@ -354,7 +395,6 @@ public class Model3Switch<T> extends Switch<T>
    * @see #doSwitch(org.eclipse.emf.ecore.EObject)
    * @generated
    */
-  @Override
   public T defaultCase(EObject object)
   {
     return null;
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.tests.model4/META-INF/MANIFEST.MF
index af1392978d..0987ec71ad 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/META-INF/MANIFEST.MF
@@ -2,18 +2,17 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.cdo.tests.model4;singleton:=true
-Bundle-Version: 3.0.100.qualifier
+Bundle-Version: 3.0.200.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Export-Package: org.eclipse.emf.cdo.tests.legacy.model4;version="3.0.100",
  org.eclipse.emf.cdo.tests.legacy.model4.impl;version="3.0.100",
- org.eclipse.emf.cdo.tests.legacy.model4.util;version="3.0.100",
- org.eclipse.emf.cdo.tests.model4;version="3.0.100",
- org.eclipse.emf.cdo.tests.model4.impl;version="3.0.100",
- org.eclipse.emf.cdo.tests.model4.util;version="3.0.100",
- org.eclipse.emf.cdo.tests.model4.validation;version="3.0.100"
+ org.eclipse.emf.cdo.tests.model4;version="3.0.200",
+ org.eclipse.emf.cdo.tests.model4.impl;version="3.0.200",
+ org.eclipse.emf.cdo.tests.model4.util;version="3.0.200",
+ org.eclipse.emf.cdo.tests.model4.validation;version="3.0.200"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.4.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.cdo;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/model/model4.genmodel b/plugins/org.eclipse.emf.cdo.tests.model4/model/model4.genmodel
index 6af534ae6b..83843cd788 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/model/model4.genmodel
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/model/model4.genmodel
@@ -7,7 +7,7 @@
     rootExtendsClass="org.eclipse.emf.internal.cdo.CDOObjectImpl" reflectiveDelegation="true"
     codeFormatting="true" testsDirectory="" importerID="org.eclipse.emf.importer.cdo"
     featureDelegation="Reflective" complianceLevel="5.0" copyrightFields="false" editPluginID="org.eclipse.emf.cdo.tests.model4.edit"
-    usedGenPackages="../../org.eclipse.emf.cdo.tests.model4interfaces/model/interfaces.genmodel#//model4interfaces">
+    runtimeVersion="2.6" usedGenPackages="../../org.eclipse.emf.cdo.tests.model4interfaces/model/interfaces.genmodel#//model4interfaces">
   <foreignModel>model4.ecore</foreignModel>
   <modelPluginVariables>CDO=org.eclipse.emf.cdo</modelPluginVariables>
   <genPackages prefix="model4" basePackage="org.eclipse.emf.cdo.tests" disposableProviderFactory="true"
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/model/model4.legacy-genmodel b/plugins/org.eclipse.emf.cdo.tests.model4/model/model4.legacy-genmodel
index 3d08fac773..004bbd71f0 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/model/model4.legacy-genmodel
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/model/model4.legacy-genmodel
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA;   Eike Stepper - initial API and implementation" modelDirectory="/org.eclipse.emf.cdo.tests.model4/src" editDirectory="" editorDirectory="" modelPluginID="org.eclipse.emf.cdo.tests.model4" modelName="Model4" updateClasspath="false" codeFormatting="true" testsDirectory="" importerID="org.eclipse.emf.importer.cdo" complianceLevel="5.0" copyrightFields="false" editPluginID="org.eclipse.emf.cdo.tests.model4.edit">
+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA;   Eike Stepper - initial API and implementation" modelDirectory="/org.eclipse.emf.cdo.tests.model4/src" editDirectory="" editorDirectory="" modelPluginID="org.eclipse.emf.cdo.tests.model4" modelName="Model4" updateClasspath="false" codeFormatting="true" testsDirectory="" importerID="org.eclipse.emf.importer.cdo" complianceLevel="5.0" copyrightFields="false" editPluginID="org.eclipse.emf.cdo.tests.model4.edit" runtimeVersion="2.6">
   <foreignModel>model4.ecore</foreignModel>
   <modelPluginVariables>CDO=org.eclipse.emf.cdo</modelPluginVariables>
   <genPackages prefix="model4" basePackage="org.eclipse.emf.cdo.tests.legacy" disposableProviderFactory="true" literalsInterface="false">
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/util/model4AdapterFactory.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/util/model4AdapterFactory.java
deleted file mode 100644
index 1dad8da3fc..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/util/model4AdapterFactory.java
+++ /dev/null
@@ -1,1204 +0,0 @@
-/**
- * Copyright (c) 2004 - 2011 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.legacy.model4.util;
-
-import org.eclipse.emf.cdo.tests.legacy.model4.model4Package;
-import org.eclipse.emf.cdo.tests.model4.ContainedElementNoOpposite;
-import org.eclipse.emf.cdo.tests.model4.GenRefMapNonContained;
-import org.eclipse.emf.cdo.tests.model4.GenRefMultiContained;
-import org.eclipse.emf.cdo.tests.model4.GenRefMultiNUNonContained;
-import org.eclipse.emf.cdo.tests.model4.GenRefMultiNonContained;
-import org.eclipse.emf.cdo.tests.model4.GenRefSingleContained;
-import org.eclipse.emf.cdo.tests.model4.GenRefSingleNonContained;
-import org.eclipse.emf.cdo.tests.model4.ImplContainedElementNPL;
-import org.eclipse.emf.cdo.tests.model4.ImplMultiRefContainedElement;
-import org.eclipse.emf.cdo.tests.model4.ImplMultiRefContainer;
-import org.eclipse.emf.cdo.tests.model4.ImplMultiRefContainerNPL;
-import org.eclipse.emf.cdo.tests.model4.ImplMultiRefNonContainedElement;
-import org.eclipse.emf.cdo.tests.model4.ImplMultiRefNonContainer;
-import org.eclipse.emf.cdo.tests.model4.ImplMultiRefNonContainerNPL;
-import org.eclipse.emf.cdo.tests.model4.ImplSingleRefContainedElement;
-import org.eclipse.emf.cdo.tests.model4.ImplSingleRefContainer;
-import org.eclipse.emf.cdo.tests.model4.ImplSingleRefContainerNPL;
-import org.eclipse.emf.cdo.tests.model4.ImplSingleRefNonContainedElement;
-import org.eclipse.emf.cdo.tests.model4.ImplSingleRefNonContainer;
-import org.eclipse.emf.cdo.tests.model4.ImplSingleRefNonContainerNPL;
-import org.eclipse.emf.cdo.tests.model4.MultiContainedElement;
-import org.eclipse.emf.cdo.tests.model4.MultiNonContainedElement;
-import org.eclipse.emf.cdo.tests.model4.MultiNonContainedUnsettableElement;
-import org.eclipse.emf.cdo.tests.model4.RefMultiContained;
-import org.eclipse.emf.cdo.tests.model4.RefMultiContainedNPL;
-import org.eclipse.emf.cdo.tests.model4.RefMultiNonContained;
-import org.eclipse.emf.cdo.tests.model4.RefMultiNonContainedNPL;
-import org.eclipse.emf.cdo.tests.model4.RefMultiNonContainedUnsettable;
-import org.eclipse.emf.cdo.tests.model4.RefSingleContained;
-import org.eclipse.emf.cdo.tests.model4.RefSingleContainedNPL;
-import org.eclipse.emf.cdo.tests.model4.RefSingleNonContained;
-import org.eclipse.emf.cdo.tests.model4.RefSingleNonContainedNPL;
-import org.eclipse.emf.cdo.tests.model4.SingleContainedElement;
-import org.eclipse.emf.cdo.tests.model4.SingleNonContainedElement;
-import org.eclipse.emf.cdo.tests.model4interfaces.IContainedElementNoParentLink;
-import org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainedElement;
-import org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainer;
-import org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainerNPL;
-import org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainedElement;
-import org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainer;
-import org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainerNPL;
-import org.eclipse.emf.cdo.tests.model4interfaces.INamedElement;
-import org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefContainedElement;
-import org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefContainer;
-import org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefContainerNPL;
-import org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainedElement;
-import org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainer;
-import org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainerNPL;
-
-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;
-
-import java.util.Map;
-
-/**
- * <!-- 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.legacy.model4.model4Package
- * @generated
- */
-public class model4AdapterFactory extends AdapterFactoryImpl
-{
-  /**
-   * The cached model package. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  protected static model4Package modelPackage;
-
-  /**
-   * Creates an instance of the adapter factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public model4AdapterFactory()
-  {
-    if (modelPackage == null)
-    {
-      modelPackage = model4Package.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 model4Switch<Adapter> modelSwitch = new model4Switch<Adapter>()
-  {
-    @Override
-    public Adapter caseRefSingleContained(RefSingleContained object)
-    {
-      return createRefSingleContainedAdapter();
-    }
-
-    @Override
-    public Adapter caseSingleContainedElement(SingleContainedElement object)
-    {
-      return createSingleContainedElementAdapter();
-    }
-
-    @Override
-    public Adapter caseRefSingleNonContained(RefSingleNonContained object)
-    {
-      return createRefSingleNonContainedAdapter();
-    }
-
-    @Override
-    public Adapter caseSingleNonContainedElement(SingleNonContainedElement object)
-    {
-      return createSingleNonContainedElementAdapter();
-    }
-
-    @Override
-    public Adapter caseRefMultiContained(RefMultiContained object)
-    {
-      return createRefMultiContainedAdapter();
-    }
-
-    @Override
-    public Adapter caseMultiContainedElement(MultiContainedElement object)
-    {
-      return createMultiContainedElementAdapter();
-    }
-
-    @Override
-    public Adapter caseRefMultiNonContained(RefMultiNonContained object)
-    {
-      return createRefMultiNonContainedAdapter();
-    }
-
-    @Override
-    public Adapter caseMultiNonContainedElement(MultiNonContainedElement object)
-    {
-      return createMultiNonContainedElementAdapter();
-    }
-
-    @Override
-    public Adapter caseRefMultiNonContainedUnsettable(RefMultiNonContainedUnsettable object)
-    {
-      return createRefMultiNonContainedUnsettableAdapter();
-    }
-
-    @Override
-    public Adapter caseMultiNonContainedUnsettableElement(MultiNonContainedUnsettableElement object)
-    {
-      return createMultiNonContainedUnsettableElementAdapter();
-    }
-
-    @Override
-    public Adapter caseRefSingleContainedNPL(RefSingleContainedNPL object)
-    {
-      return createRefSingleContainedNPLAdapter();
-    }
-
-    @Override
-    public Adapter caseRefSingleNonContainedNPL(RefSingleNonContainedNPL object)
-    {
-      return createRefSingleNonContainedNPLAdapter();
-    }
-
-    @Override
-    public Adapter caseRefMultiContainedNPL(RefMultiContainedNPL object)
-    {
-      return createRefMultiContainedNPLAdapter();
-    }
-
-    @Override
-    public Adapter caseRefMultiNonContainedNPL(RefMultiNonContainedNPL object)
-    {
-      return createRefMultiNonContainedNPLAdapter();
-    }
-
-    @Override
-    public Adapter caseContainedElementNoOpposite(ContainedElementNoOpposite object)
-    {
-      return createContainedElementNoOppositeAdapter();
-    }
-
-    @Override
-    public Adapter caseGenRefSingleContained(GenRefSingleContained object)
-    {
-      return createGenRefSingleContainedAdapter();
-    }
-
-    @Override
-    public Adapter caseGenRefSingleNonContained(GenRefSingleNonContained object)
-    {
-      return createGenRefSingleNonContainedAdapter();
-    }
-
-    @Override
-    public Adapter caseGenRefMultiContained(GenRefMultiContained object)
-    {
-      return createGenRefMultiContainedAdapter();
-    }
-
-    @Override
-    public Adapter caseGenRefMultiNonContained(GenRefMultiNonContained object)
-    {
-      return createGenRefMultiNonContainedAdapter();
-    }
-
-    @Override
-    public Adapter caseImplSingleRefContainer(ImplSingleRefContainer object)
-    {
-      return createImplSingleRefContainerAdapter();
-    }
-
-    @Override
-    public Adapter caseImplSingleRefContainedElement(ImplSingleRefContainedElement object)
-    {
-      return createImplSingleRefContainedElementAdapter();
-    }
-
-    @Override
-    public Adapter caseImplSingleRefNonContainer(ImplSingleRefNonContainer object)
-    {
-      return createImplSingleRefNonContainerAdapter();
-    }
-
-    @Override
-    public Adapter caseImplSingleRefNonContainedElement(ImplSingleRefNonContainedElement object)
-    {
-      return createImplSingleRefNonContainedElementAdapter();
-    }
-
-    @Override
-    public Adapter caseImplMultiRefNonContainer(ImplMultiRefNonContainer object)
-    {
-      return createImplMultiRefNonContainerAdapter();
-    }
-
-    @Override
-    public Adapter caseImplMultiRefNonContainedElement(ImplMultiRefNonContainedElement object)
-    {
-      return createImplMultiRefNonContainedElementAdapter();
-    }
-
-    @Override
-    public Adapter caseImplMultiRefContainer(ImplMultiRefContainer object)
-    {
-      return createImplMultiRefContainerAdapter();
-    }
-
-    @Override
-    public Adapter caseImplMultiRefContainedElement(ImplMultiRefContainedElement object)
-    {
-      return createImplMultiRefContainedElementAdapter();
-    }
-
-    @Override
-    public Adapter caseImplSingleRefContainerNPL(ImplSingleRefContainerNPL object)
-    {
-      return createImplSingleRefContainerNPLAdapter();
-    }
-
-    @Override
-    public Adapter caseImplSingleRefNonContainerNPL(ImplSingleRefNonContainerNPL object)
-    {
-      return createImplSingleRefNonContainerNPLAdapter();
-    }
-
-    @Override
-    public Adapter caseImplMultiRefContainerNPL(ImplMultiRefContainerNPL object)
-    {
-      return createImplMultiRefContainerNPLAdapter();
-    }
-
-    @Override
-    public Adapter caseImplMultiRefNonContainerNPL(ImplMultiRefNonContainerNPL object)
-    {
-      return createImplMultiRefNonContainerNPLAdapter();
-    }
-
-    @Override
-    public Adapter caseImplContainedElementNPL(ImplContainedElementNPL object)
-    {
-      return createImplContainedElementNPLAdapter();
-    }
-
-    @Override
-    public Adapter caseGenRefMultiNUNonContained(GenRefMultiNUNonContained object)
-    {
-      return createGenRefMultiNUNonContainedAdapter();
-    }
-
-    @Override
-    public Adapter caseGenRefMapNonContained(GenRefMapNonContained object)
-    {
-      return createGenRefMapNonContainedAdapter();
-    }
-
-    @Override
-    public Adapter caseStringToEObject(Map.Entry<String, EObject> object)
-    {
-      return createStringToEObjectAdapter();
-    }
-
-    @Override
-    public Adapter caseISingleRefContainer(ISingleRefContainer object)
-    {
-      return createISingleRefContainerAdapter();
-    }
-
-    @Override
-    public Adapter caseISingleRefContainedElement(ISingleRefContainedElement object)
-    {
-      return createISingleRefContainedElementAdapter();
-    }
-
-    @Override
-    public Adapter caseISingleRefNonContainer(ISingleRefNonContainer object)
-    {
-      return createISingleRefNonContainerAdapter();
-    }
-
-    @Override
-    public Adapter caseISingleRefNonContainedElement(ISingleRefNonContainedElement object)
-    {
-      return createISingleRefNonContainedElementAdapter();
-    }
-
-    @Override
-    public Adapter caseIMultiRefNonContainer(IMultiRefNonContainer object)
-    {
-      return createIMultiRefNonContainerAdapter();
-    }
-
-    @Override
-    public Adapter caseIMultiRefNonContainedElement(IMultiRefNonContainedElement object)
-    {
-      return createIMultiRefNonContainedElementAdapter();
-    }
-
-    @Override
-    public Adapter caseIMultiRefContainer(IMultiRefContainer object)
-    {
-      return createIMultiRefContainerAdapter();
-    }
-
-    @Override
-    public Adapter caseIMultiRefContainedElement(IMultiRefContainedElement object)
-    {
-      return createIMultiRefContainedElementAdapter();
-    }
-
-    @Override
-    public Adapter caseISingleRefContainerNPL(ISingleRefContainerNPL object)
-    {
-      return createISingleRefContainerNPLAdapter();
-    }
-
-    @Override
-    public Adapter caseISingleRefNonContainerNPL(ISingleRefNonContainerNPL object)
-    {
-      return createISingleRefNonContainerNPLAdapter();
-    }
-
-    @Override
-    public Adapter caseIMultiRefContainerNPL(IMultiRefContainerNPL object)
-    {
-      return createIMultiRefContainerNPLAdapter();
-    }
-
-    @Override
-    public Adapter caseIMultiRefNonContainerNPL(IMultiRefNonContainerNPL object)
-    {
-      return createIMultiRefNonContainerNPLAdapter();
-    }
-
-    @Override
-    public Adapter caseIContainedElementNoParentLink(IContainedElementNoParentLink object)
-    {
-      return createIContainedElementNoParentLinkAdapter();
-    }
-
-    @Override
-    public Adapter caseINamedElement(INamedElement object)
-    {
-      return createINamedElementAdapter();
-    }
-
-    @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.legacy.model4.RefSingleContained
-   * <em>Ref Single Contained</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.legacy.model4.RefSingleContained
-   * @generated
-   */
-  public Adapter createRefSingleContainedAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '
-   * {@link org.eclipse.emf.cdo.tests.legacy.model4.SingleContainedElement <em>Single Contained Element</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.legacy.model4.SingleContainedElement
-   * @generated
-   */
-  public Adapter createSingleContainedElementAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model4.RefSingleNonContained
-   * <em>Ref Single Non Contained</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.legacy.model4.RefSingleNonContained
-   * @generated
-   */
-  public Adapter createRefSingleNonContainedAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '
-   * {@link org.eclipse.emf.cdo.tests.legacy.model4.SingleNonContainedElement <em>Single Non Contained Element</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.legacy.model4.SingleNonContainedElement
-   * @generated
-   */
-  public Adapter createSingleNonContainedElementAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model4.RefMultiContained
-   * <em>Ref Multi Contained</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.legacy.model4.RefMultiContained
-   * @generated
-   */
-  public Adapter createRefMultiContainedAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model4.MultiContainedElement
-   * <em>Multi Contained Element</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.legacy.model4.MultiContainedElement
-   * @generated
-   */
-  public Adapter createMultiContainedElementAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model4.RefMultiNonContained
-   * <em>Ref Multi Non Contained</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.legacy.model4.RefMultiNonContained
-   * @generated
-   */
-  public Adapter createRefMultiNonContainedAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '
-   * {@link org.eclipse.emf.cdo.tests.legacy.model4.MultiNonContainedElement <em>Multi Non Contained Element</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.legacy.model4.MultiNonContainedElement
-   * @generated
-   */
-  public Adapter createMultiNonContainedElementAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '
-   * {@link org.eclipse.emf.cdo.tests.legacy.model4.RefMultiNonContainedUnsettable
-   * <em>Ref Multi Non Contained Unsettable</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.legacy.model4.RefMultiNonContainedUnsettable
-   * @generated
-   */
-  public Adapter createRefMultiNonContainedUnsettableAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '
-   * {@link org.eclipse.emf.cdo.tests.legacy.model4.MultiNonContainedUnsettableElement
-   * <em>Multi Non Contained Unsettable Element</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.legacy.model4.MultiNonContainedUnsettableElement
-   * @generated
-   */
-  public Adapter createMultiNonContainedUnsettableElementAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model4.RefSingleContainedNPL
-   * <em>Ref Single Contained NPL</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.legacy.model4.RefSingleContainedNPL
-   * @generated
-   */
-  public Adapter createRefSingleContainedNPLAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '
-   * {@link org.eclipse.emf.cdo.tests.legacy.model4.RefSingleNonContainedNPL <em>Ref Single Non Contained NPL</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.legacy.model4.RefSingleNonContainedNPL
-   * @generated
-   */
-  public Adapter createRefSingleNonContainedNPLAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model4.RefMultiContainedNPL
-   * <em>Ref Multi Contained NPL</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.legacy.model4.RefMultiContainedNPL
-   * @generated
-   */
-  public Adapter createRefMultiContainedNPLAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '
-   * {@link org.eclipse.emf.cdo.tests.legacy.model4.RefMultiNonContainedNPL <em>Ref Multi Non Contained NPL</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.legacy.model4.RefMultiNonContainedNPL
-   * @generated
-   */
-  public Adapter createRefMultiNonContainedNPLAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '
-   * {@link org.eclipse.emf.cdo.tests.legacy.model4.ContainedElementNoOpposite <em>Contained Element No Opposite</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.legacy.model4.ContainedElementNoOpposite
-   * @generated
-   */
-  public Adapter createContainedElementNoOppositeAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model4.GenRefSingleContained
-   * <em>Gen Ref Single Contained</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.legacy.model4.GenRefSingleContained
-   * @generated
-   */
-  public Adapter createGenRefSingleContainedAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '
-   * {@link org.eclipse.emf.cdo.tests.legacy.model4.GenRefSingleNonContained <em>Gen Ref Single Non Contained</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.legacy.model4.GenRefSingleNonContained
-   * @generated
-   */
-  public Adapter createGenRefSingleNonContainedAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model4.GenRefMultiContained
-   * <em>Gen Ref Multi Contained</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.legacy.model4.GenRefMultiContained
-   * @generated
-   */
-  public Adapter createGenRefMultiContainedAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '
-   * {@link org.eclipse.emf.cdo.tests.legacy.model4.GenRefMultiNonContained <em>Gen Ref Multi Non Contained</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.legacy.model4.GenRefMultiNonContained
-   * @generated
-   */
-  public Adapter createGenRefMultiNonContainedAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '
-   * {@link org.eclipse.emf.cdo.tests.legacy.model4.ImplSingleRefContainer <em>Impl Single Ref Container</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.legacy.model4.ImplSingleRefContainer
-   * @generated
-   */
-  public Adapter createImplSingleRefContainerAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '
-   * {@link org.eclipse.emf.cdo.tests.legacy.model4.ImplSingleRefContainedElement
-   * <em>Impl Single Ref Contained Element</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.legacy.model4.ImplSingleRefContainedElement
-   * @generated
-   */
-  public Adapter createImplSingleRefContainedElementAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '
-   * {@link org.eclipse.emf.cdo.tests.legacy.model4.ImplSingleRefNonContainer <em>Impl Single Ref Non Container</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.legacy.model4.ImplSingleRefNonContainer
-   * @generated
-   */
-  public Adapter createImplSingleRefNonContainerAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '
-   * {@link org.eclipse.emf.cdo.tests.legacy.model4.ImplSingleRefNonContainedElement
-   * <em>Impl Single Ref Non Contained Element</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.legacy.model4.ImplSingleRefNonContainedElement
-   * @generated
-   */
-  public Adapter createImplSingleRefNonContainedElementAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '
-   * {@link org.eclipse.emf.cdo.tests.legacy.model4.ImplMultiRefNonContainer <em>Impl Multi Ref Non Container</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.legacy.model4.ImplMultiRefNonContainer
-   * @generated
-   */
-  public Adapter createImplMultiRefNonContainerAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '
-   * {@link org.eclipse.emf.cdo.tests.legacy.model4.ImplMultiRefNonContainedElement
-   * <em>Impl Multi Ref Non Contained Element</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.legacy.model4.ImplMultiRefNonContainedElement
-   * @generated
-   */
-  public Adapter createImplMultiRefNonContainedElementAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model4.ImplMultiRefContainer
-   * <em>Impl Multi Ref Container</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.legacy.model4.ImplMultiRefContainer
-   * @generated
-   */
-  public Adapter createImplMultiRefContainerAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '
-   * {@link org.eclipse.emf.cdo.tests.legacy.model4.ImplMultiRefContainedElement
-   * <em>Impl Multi Ref Contained Element</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.legacy.model4.ImplMultiRefContainedElement
-   * @generated
-   */
-  public Adapter createImplMultiRefContainedElementAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '
-   * {@link org.eclipse.emf.cdo.tests.legacy.model4.ImplSingleRefContainerNPL <em>Impl Single Ref Container NPL</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.legacy.model4.ImplSingleRefContainerNPL
-   * @generated
-   */
-  public Adapter createImplSingleRefContainerNPLAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '
-   * {@link org.eclipse.emf.cdo.tests.legacy.model4.ImplSingleRefNonContainerNPL
-   * <em>Impl Single Ref Non Container NPL</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.legacy.model4.ImplSingleRefNonContainerNPL
-   * @generated
-   */
-  public Adapter createImplSingleRefNonContainerNPLAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '
-   * {@link org.eclipse.emf.cdo.tests.legacy.model4.ImplMultiRefContainerNPL <em>Impl Multi Ref Container NPL</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.legacy.model4.ImplMultiRefContainerNPL
-   * @generated
-   */
-  public Adapter createImplMultiRefContainerNPLAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '
-   * {@link org.eclipse.emf.cdo.tests.legacy.model4.ImplMultiRefNonContainerNPL
-   * <em>Impl Multi Ref Non Container NPL</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.legacy.model4.ImplMultiRefNonContainerNPL
-   * @generated
-   */
-  public Adapter createImplMultiRefNonContainerNPLAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '
-   * {@link org.eclipse.emf.cdo.tests.legacy.model4.ImplContainedElementNPL <em>Impl Contained Element NPL</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.legacy.model4.ImplContainedElementNPL
-   * @generated
-   */
-  public Adapter createImplContainedElementNPLAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '
-   * {@link org.eclipse.emf.cdo.tests.legacy.model4.GenRefMultiNUNonContained <em>Gen Ref Multi NU Non Contained</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.legacy.model4.GenRefMultiNUNonContained
-   * @generated
-   */
-  public Adapter createGenRefMultiNUNonContainedAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.model4.GenRefMapNonContained
-   * <em>Gen Ref Map Non Contained</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.legacy.model4.GenRefMapNonContained
-   * @generated
-   */
-  public Adapter createGenRefMapNonContainedAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link java.util.Map.Entry <em>String To EObject</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 java.util.Map.Entry
-   * @generated
-   */
-  public Adapter createStringToEObjectAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '
-   * {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefContainer <em>ISingle Ref Container</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.legacy.model4interfaces.ISingleRefContainer
-   * @generated
-   */
-  public Adapter createISingleRefContainerAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '
-   * {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefContainedElement
-   * <em>ISingle Ref Contained Element</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.legacy.model4interfaces.ISingleRefContainedElement
-   * @generated
-   */
-  public Adapter createISingleRefContainedElementAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '
-   * {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefNonContainer <em>ISingle Ref Non Container</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.legacy.model4interfaces.ISingleRefNonContainer
-   * @generated
-   */
-  public Adapter createISingleRefNonContainerAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '
-   * {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefNonContainedElement
-   * <em>ISingle Ref Non Contained Element</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.legacy.model4interfaces.ISingleRefNonContainedElement
-   * @generated
-   */
-  public Adapter createISingleRefNonContainedElementAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '
-   * {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefNonContainer <em>IMulti Ref Non Container</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.legacy.model4interfaces.IMultiRefNonContainer
-   * @generated
-   */
-  public Adapter createIMultiRefNonContainerAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '
-   * {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefNonContainedElement
-   * <em>IMulti Ref Non Contained Element</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.legacy.model4interfaces.IMultiRefNonContainedElement
-   * @generated
-   */
-  public Adapter createIMultiRefNonContainedElementAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '
-   * {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefContainer <em>IMulti Ref Container</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.legacy.model4interfaces.IMultiRefContainer
-   * @generated
-   */
-  public Adapter createIMultiRefContainerAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '
-   * {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefContainedElement
-   * <em>IMulti Ref Contained Element</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.legacy.model4interfaces.IMultiRefContainedElement
-   * @generated
-   */
-  public Adapter createIMultiRefContainedElementAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '
-   * {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefContainerNPL <em>ISingle Ref Container NPL</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.legacy.model4interfaces.ISingleRefContainerNPL
-   * @generated
-   */
-  public Adapter createISingleRefContainerNPLAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '
-   * {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefNonContainerNPL
-   * <em>ISingle Ref Non Container NPL</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.legacy.model4interfaces.ISingleRefNonContainerNPL
-   * @generated
-   */
-  public Adapter createISingleRefNonContainerNPLAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '
-   * {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefContainerNPL <em>IMulti Ref Container NPL</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.legacy.model4interfaces.IMultiRefContainerNPL
-   * @generated
-   */
-  public Adapter createIMultiRefContainerNPLAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '
-   * {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefNonContainerNPL
-   * <em>IMulti Ref Non Container NPL</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.legacy.model4interfaces.IMultiRefNonContainerNPL
-   * @generated
-   */
-  public Adapter createIMultiRefNonContainerNPLAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '
-   * {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IContainedElementNoParentLink
-   * <em>IContained Element No Parent Link</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.legacy.model4interfaces.IContainedElementNoParentLink
-   * @generated
-   */
-  public Adapter createIContainedElementNoParentLinkAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '
-   * {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.INamedElement <em>INamed Element</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.legacy.model4interfaces.INamedElement
-   * @generated
-   */
-  public Adapter createINamedElementAdapter()
-  {
-    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;
-  }
-
-} // model4AdapterFactory
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/util/model4Switch.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/util/model4Switch.java
deleted file mode 100644
index e948bec1f1..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/legacy/model4/util/model4Switch.java
+++ /dev/null
@@ -1,1254 +0,0 @@
-/**
- * Copyright (c) 2004 - 2011 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.legacy.model4.util;
-
-import org.eclipse.emf.cdo.tests.legacy.model4.model4Package;
-import org.eclipse.emf.cdo.tests.model4.ContainedElementNoOpposite;
-import org.eclipse.emf.cdo.tests.model4.GenRefMapNonContained;
-import org.eclipse.emf.cdo.tests.model4.GenRefMultiContained;
-import org.eclipse.emf.cdo.tests.model4.GenRefMultiNUNonContained;
-import org.eclipse.emf.cdo.tests.model4.GenRefMultiNonContained;
-import org.eclipse.emf.cdo.tests.model4.GenRefSingleContained;
-import org.eclipse.emf.cdo.tests.model4.GenRefSingleNonContained;
-import org.eclipse.emf.cdo.tests.model4.ImplContainedElementNPL;
-import org.eclipse.emf.cdo.tests.model4.ImplMultiRefContainedElement;
-import org.eclipse.emf.cdo.tests.model4.ImplMultiRefContainer;
-import org.eclipse.emf.cdo.tests.model4.ImplMultiRefContainerNPL;
-import org.eclipse.emf.cdo.tests.model4.ImplMultiRefNonContainedElement;
-import org.eclipse.emf.cdo.tests.model4.ImplMultiRefNonContainer;
-import org.eclipse.emf.cdo.tests.model4.ImplMultiRefNonContainerNPL;
-import org.eclipse.emf.cdo.tests.model4.ImplSingleRefContainedElement;
-import org.eclipse.emf.cdo.tests.model4.ImplSingleRefContainer;
-import org.eclipse.emf.cdo.tests.model4.ImplSingleRefContainerNPL;
-import org.eclipse.emf.cdo.tests.model4.ImplSingleRefNonContainedElement;
-import org.eclipse.emf.cdo.tests.model4.ImplSingleRefNonContainer;
-import org.eclipse.emf.cdo.tests.model4.ImplSingleRefNonContainerNPL;
-import org.eclipse.emf.cdo.tests.model4.MultiContainedElement;
-import org.eclipse.emf.cdo.tests.model4.MultiNonContainedElement;
-import org.eclipse.emf.cdo.tests.model4.MultiNonContainedUnsettableElement;
-import org.eclipse.emf.cdo.tests.model4.RefMultiContained;
-import org.eclipse.emf.cdo.tests.model4.RefMultiContainedNPL;
-import org.eclipse.emf.cdo.tests.model4.RefMultiNonContained;
-import org.eclipse.emf.cdo.tests.model4.RefMultiNonContainedNPL;
-import org.eclipse.emf.cdo.tests.model4.RefMultiNonContainedUnsettable;
-import org.eclipse.emf.cdo.tests.model4.RefSingleContained;
-import org.eclipse.emf.cdo.tests.model4.RefSingleContainedNPL;
-import org.eclipse.emf.cdo.tests.model4.RefSingleNonContained;
-import org.eclipse.emf.cdo.tests.model4.RefSingleNonContainedNPL;
-import org.eclipse.emf.cdo.tests.model4.SingleContainedElement;
-import org.eclipse.emf.cdo.tests.model4.SingleNonContainedElement;
-import org.eclipse.emf.cdo.tests.model4interfaces.IContainedElementNoParentLink;
-import org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainedElement;
-import org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainer;
-import org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainerNPL;
-import org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainedElement;
-import org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainer;
-import org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainerNPL;
-import org.eclipse.emf.cdo.tests.model4interfaces.INamedElement;
-import org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefContainedElement;
-import org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefContainer;
-import org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefContainerNPL;
-import org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainedElement;
-import org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainer;
-import org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainerNPL;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * <!-- 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.legacy.model4.model4Package
- * @generated
- */
-public class model4Switch<T>
-{
-  /**
-   * The cached model package <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  protected static model4Package modelPackage;
-
-  /**
-   * Creates an instance of the switch. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public model4Switch()
-  {
-    if (modelPackage == null)
-    {
-      modelPackage = model4Package.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 model4Package.REF_SINGLE_CONTAINED:
-    {
-      RefSingleContained refSingleContained = (RefSingleContained)theEObject;
-      T result = caseRefSingleContained(refSingleContained);
-      if (result == null)
-        result = defaultCase(theEObject);
-      return result;
-    }
-    case model4Package.SINGLE_CONTAINED_ELEMENT:
-    {
-      SingleContainedElement singleContainedElement = (SingleContainedElement)theEObject;
-      T result = caseSingleContainedElement(singleContainedElement);
-      if (result == null)
-        result = defaultCase(theEObject);
-      return result;
-    }
-    case model4Package.REF_SINGLE_NON_CONTAINED:
-    {
-      RefSingleNonContained refSingleNonContained = (RefSingleNonContained)theEObject;
-      T result = caseRefSingleNonContained(refSingleNonContained);
-      if (result == null)
-        result = defaultCase(theEObject);
-      return result;
-    }
-    case model4Package.SINGLE_NON_CONTAINED_ELEMENT:
-    {
-      SingleNonContainedElement singleNonContainedElement = (SingleNonContainedElement)theEObject;
-      T result = caseSingleNonContainedElement(singleNonContainedElement);
-      if (result == null)
-        result = defaultCase(theEObject);
-      return result;
-    }
-    case model4Package.REF_MULTI_CONTAINED:
-    {
-      RefMultiContained refMultiContained = (RefMultiContained)theEObject;
-      T result = caseRefMultiContained(refMultiContained);
-      if (result == null)
-        result = defaultCase(theEObject);
-      return result;
-    }
-    case model4Package.MULTI_CONTAINED_ELEMENT:
-    {
-      MultiContainedElement multiContainedElement = (MultiContainedElement)theEObject;
-      T result = caseMultiContainedElement(multiContainedElement);
-      if (result == null)
-        result = defaultCase(theEObject);
-      return result;
-    }
-    case model4Package.REF_MULTI_NON_CONTAINED:
-    {
-      RefMultiNonContained refMultiNonContained = (RefMultiNonContained)theEObject;
-      T result = caseRefMultiNonContained(refMultiNonContained);
-      if (result == null)
-        result = defaultCase(theEObject);
-      return result;
-    }
-    case model4Package.MULTI_NON_CONTAINED_ELEMENT:
-    {
-      MultiNonContainedElement multiNonContainedElement = (MultiNonContainedElement)theEObject;
-      T result = caseMultiNonContainedElement(multiNonContainedElement);
-      if (result == null)
-        result = defaultCase(theEObject);
-      return result;
-    }
-    case model4Package.REF_MULTI_NON_CONTAINED_UNSETTABLE:
-    {
-      RefMultiNonContainedUnsettable refMultiNonContainedUnsettable = (RefMultiNonContainedUnsettable)theEObject;
-      T result = caseRefMultiNonContainedUnsettable(refMultiNonContainedUnsettable);
-      if (result == null)
-        result = defaultCase(theEObject);
-      return result;
-    }
-    case model4Package.MULTI_NON_CONTAINED_UNSETTABLE_ELEMENT:
-    {
-      MultiNonContainedUnsettableElement multiNonContainedUnsettableElement = (MultiNonContainedUnsettableElement)theEObject;
-      T result = caseMultiNonContainedUnsettableElement(multiNonContainedUnsettableElement);
-      if (result == null)
-        result = defaultCase(theEObject);
-      return result;
-    }
-    case model4Package.REF_SINGLE_CONTAINED_NPL:
-    {
-      RefSingleContainedNPL refSingleContainedNPL = (RefSingleContainedNPL)theEObject;
-      T result = caseRefSingleContainedNPL(refSingleContainedNPL);
-      if (result == null)
-        result = defaultCase(theEObject);
-      return result;
-    }
-    case model4Package.REF_SINGLE_NON_CONTAINED_NPL:
-    {
-      RefSingleNonContainedNPL refSingleNonContainedNPL = (RefSingleNonContainedNPL)theEObject;
-      T result = caseRefSingleNonContainedNPL(refSingleNonContainedNPL);
-      if (result == null)
-        result = defaultCase(theEObject);
-      return result;
-    }
-    case model4Package.REF_MULTI_CONTAINED_NPL:
-    {
-      RefMultiContainedNPL refMultiContainedNPL = (RefMultiContainedNPL)theEObject;
-      T result = caseRefMultiContainedNPL(refMultiContainedNPL);
-      if (result == null)
-        result = defaultCase(theEObject);
-      return result;
-    }
-    case model4Package.REF_MULTI_NON_CONTAINED_NPL:
-    {
-      RefMultiNonContainedNPL refMultiNonContainedNPL = (RefMultiNonContainedNPL)theEObject;
-      T result = caseRefMultiNonContainedNPL(refMultiNonContainedNPL);
-      if (result == null)
-        result = defaultCase(theEObject);
-      return result;
-    }
-    case model4Package.CONTAINED_ELEMENT_NO_OPPOSITE:
-    {
-      ContainedElementNoOpposite containedElementNoOpposite = (ContainedElementNoOpposite)theEObject;
-      T result = caseContainedElementNoOpposite(containedElementNoOpposite);
-      if (result == null)
-        result = defaultCase(theEObject);
-      return result;
-    }
-    case model4Package.GEN_REF_SINGLE_CONTAINED:
-    {
-      GenRefSingleContained genRefSingleContained = (GenRefSingleContained)theEObject;
-      T result = caseGenRefSingleContained(genRefSingleContained);
-      if (result == null)
-        result = defaultCase(theEObject);
-      return result;
-    }
-    case model4Package.GEN_REF_SINGLE_NON_CONTAINED:
-    {
-      GenRefSingleNonContained genRefSingleNonContained = (GenRefSingleNonContained)theEObject;
-      T result = caseGenRefSingleNonContained(genRefSingleNonContained);
-      if (result == null)
-        result = defaultCase(theEObject);
-      return result;
-    }
-    case model4Package.GEN_REF_MULTI_CONTAINED:
-    {
-      GenRefMultiContained genRefMultiContained = (GenRefMultiContained)theEObject;
-      T result = caseGenRefMultiContained(genRefMultiContained);
-      if (result == null)
-        result = defaultCase(theEObject);
-      return result;
-    }
-    case model4Package.GEN_REF_MULTI_NON_CONTAINED:
-    {
-      GenRefMultiNonContained genRefMultiNonContained = (GenRefMultiNonContained)theEObject;
-      T result = caseGenRefMultiNonContained(genRefMultiNonContained);
-      if (result == null)
-        result = defaultCase(theEObject);
-      return result;
-    }
-    case model4Package.IMPL_SINGLE_REF_CONTAINER:
-    {
-      ImplSingleRefContainer implSingleRefContainer = (ImplSingleRefContainer)theEObject;
-      T result = caseImplSingleRefContainer(implSingleRefContainer);
-      if (result == null)
-        result = caseISingleRefContainer(implSingleRefContainer);
-      if (result == null)
-        result = defaultCase(theEObject);
-      return result;
-    }
-    case model4Package.IMPL_SINGLE_REF_CONTAINED_ELEMENT:
-    {
-      ImplSingleRefContainedElement implSingleRefContainedElement = (ImplSingleRefContainedElement)theEObject;
-      T result = caseImplSingleRefContainedElement(implSingleRefContainedElement);
-      if (result == null)
-        result = caseISingleRefContainedElement(implSingleRefContainedElement);
-      if (result == null)
-        result = defaultCase(theEObject);
-      return result;
-    }
-    case model4Package.IMPL_SINGLE_REF_NON_CONTAINER:
-    {
-      ImplSingleRefNonContainer implSingleRefNonContainer = (ImplSingleRefNonContainer)theEObject;
-      T result = caseImplSingleRefNonContainer(implSingleRefNonContainer);
-      if (result == null)
-        result = caseISingleRefNonContainer(implSingleRefNonContainer);
-      if (result == null)
-        result = defaultCase(theEObject);
-      return result;
-    }
-    case model4Package.IMPL_SINGLE_REF_NON_CONTAINED_ELEMENT:
-    {
-      ImplSingleRefNonContainedElement implSingleRefNonContainedElement = (ImplSingleRefNonContainedElement)theEObject;
-      T result = caseImplSingleRefNonContainedElement(implSingleRefNonContainedElement);
-      if (result == null)
-        result = caseISingleRefNonContainedElement(implSingleRefNonContainedElement);
-      if (result == null)
-        result = defaultCase(theEObject);
-      return result;
-    }
-    case model4Package.IMPL_MULTI_REF_NON_CONTAINER:
-    {
-      ImplMultiRefNonContainer implMultiRefNonContainer = (ImplMultiRefNonContainer)theEObject;
-      T result = caseImplMultiRefNonContainer(implMultiRefNonContainer);
-      if (result == null)
-        result = caseIMultiRefNonContainer(implMultiRefNonContainer);
-      if (result == null)
-        result = defaultCase(theEObject);
-      return result;
-    }
-    case model4Package.IMPL_MULTI_REF_NON_CONTAINED_ELEMENT:
-    {
-      ImplMultiRefNonContainedElement implMultiRefNonContainedElement = (ImplMultiRefNonContainedElement)theEObject;
-      T result = caseImplMultiRefNonContainedElement(implMultiRefNonContainedElement);
-      if (result == null)
-        result = caseIMultiRefNonContainedElement(implMultiRefNonContainedElement);
-      if (result == null)
-        result = defaultCase(theEObject);
-      return result;
-    }
-    case model4Package.IMPL_MULTI_REF_CONTAINER:
-    {
-      ImplMultiRefContainer implMultiRefContainer = (ImplMultiRefContainer)theEObject;
-      T result = caseImplMultiRefContainer(implMultiRefContainer);
-      if (result == null)
-        result = caseIMultiRefContainer(implMultiRefContainer);
-      if (result == null)
-        result = defaultCase(theEObject);
-      return result;
-    }
-    case model4Package.IMPL_MULTI_REF_CONTAINED_ELEMENT:
-    {
-      ImplMultiRefContainedElement implMultiRefContainedElement = (ImplMultiRefContainedElement)theEObject;
-      T result = caseImplMultiRefContainedElement(implMultiRefContainedElement);
-      if (result == null)
-        result = caseIMultiRefContainedElement(implMultiRefContainedElement);
-      if (result == null)
-        result = defaultCase(theEObject);
-      return result;
-    }
-    case model4Package.IMPL_SINGLE_REF_CONTAINER_NPL:
-    {
-      ImplSingleRefContainerNPL implSingleRefContainerNPL = (ImplSingleRefContainerNPL)theEObject;
-      T result = caseImplSingleRefContainerNPL(implSingleRefContainerNPL);
-      if (result == null)
-        result = caseISingleRefContainerNPL(implSingleRefContainerNPL);
-      if (result == null)
-        result = defaultCase(theEObject);
-      return result;
-    }
-    case model4Package.IMPL_SINGLE_REF_NON_CONTAINER_NPL:
-    {
-      ImplSingleRefNonContainerNPL implSingleRefNonContainerNPL = (ImplSingleRefNonContainerNPL)theEObject;
-      T result = caseImplSingleRefNonContainerNPL(implSingleRefNonContainerNPL);
-      if (result == null)
-        result = caseISingleRefNonContainerNPL(implSingleRefNonContainerNPL);
-      if (result == null)
-        result = defaultCase(theEObject);
-      return result;
-    }
-    case model4Package.IMPL_MULTI_REF_CONTAINER_NPL:
-    {
-      ImplMultiRefContainerNPL implMultiRefContainerNPL = (ImplMultiRefContainerNPL)theEObject;
-      T result = caseImplMultiRefContainerNPL(implMultiRefContainerNPL);
-      if (result == null)
-        result = caseIMultiRefContainerNPL(implMultiRefContainerNPL);
-      if (result == null)
-        result = defaultCase(theEObject);
-      return result;
-    }
-    case model4Package.IMPL_MULTI_REF_NON_CONTAINER_NPL:
-    {
-      ImplMultiRefNonContainerNPL implMultiRefNonContainerNPL = (ImplMultiRefNonContainerNPL)theEObject;
-      T result = caseImplMultiRefNonContainerNPL(implMultiRefNonContainerNPL);
-      if (result == null)
-        result = caseIMultiRefNonContainerNPL(implMultiRefNonContainerNPL);
-      if (result == null)
-        result = defaultCase(theEObject);
-      return result;
-    }
-    case model4Package.IMPL_CONTAINED_ELEMENT_NPL:
-    {
-      ImplContainedElementNPL implContainedElementNPL = (ImplContainedElementNPL)theEObject;
-      T result = caseImplContainedElementNPL(implContainedElementNPL);
-      if (result == null)
-        result = caseIContainedElementNoParentLink(implContainedElementNPL);
-      if (result == null)
-        result = caseINamedElement(implContainedElementNPL);
-      if (result == null)
-        result = defaultCase(theEObject);
-      return result;
-    }
-    case model4Package.GEN_REF_MULTI_NU_NON_CONTAINED:
-    {
-      GenRefMultiNUNonContained genRefMultiNUNonContained = (GenRefMultiNUNonContained)theEObject;
-      T result = caseGenRefMultiNUNonContained(genRefMultiNUNonContained);
-      if (result == null)
-        result = defaultCase(theEObject);
-      return result;
-    }
-    case model4Package.GEN_REF_MAP_NON_CONTAINED:
-    {
-      GenRefMapNonContained genRefMapNonContained = (GenRefMapNonContained)theEObject;
-      T result = caseGenRefMapNonContained(genRefMapNonContained);
-      if (result == null)
-        result = defaultCase(theEObject);
-      return result;
-    }
-    case model4Package.STRING_TO_EOBJECT:
-    {
-      @SuppressWarnings("unchecked")
-      Map.Entry<String, EObject> stringToEObject = (Map.Entry<String, EObject>)theEObject;
-      T result = caseStringToEObject(stringToEObject);
-      if (result == null)
-        result = defaultCase(theEObject);
-      return result;
-    }
-    default:
-      return defaultCase(theEObject);
-    }
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Ref Single Contained</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>Ref Single Contained</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseRefSingleContained(RefSingleContained object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Single Contained Element</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>Single Contained Element</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseSingleContainedElement(SingleContainedElement object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Ref Single Non Contained</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>Ref Single Non Contained</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseRefSingleNonContained(RefSingleNonContained object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Single Non Contained Element</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>Single Non Contained Element</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseSingleNonContainedElement(SingleNonContainedElement object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Ref Multi Contained</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>Ref Multi Contained</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseRefMultiContained(RefMultiContained object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Multi Contained Element</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>Multi Contained Element</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseMultiContainedElement(MultiContainedElement object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Ref Multi Non Contained</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>Ref Multi Non Contained</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseRefMultiNonContained(RefMultiNonContained object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Multi Non Contained Element</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>Multi Non Contained Element</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseMultiNonContainedElement(MultiNonContainedElement object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Ref Multi Non Contained Unsettable</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>Ref Multi Non Contained Unsettable</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseRefMultiNonContainedUnsettable(RefMultiNonContainedUnsettable object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Multi Non Contained Unsettable Element</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>Multi Non Contained Unsettable Element</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseMultiNonContainedUnsettableElement(MultiNonContainedUnsettableElement object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Ref Single Contained NPL</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>Ref Single Contained NPL</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseRefSingleContainedNPL(RefSingleContainedNPL object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Ref Single Non Contained NPL</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>Ref Single Non Contained NPL</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseRefSingleNonContainedNPL(RefSingleNonContainedNPL object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Ref Multi Contained NPL</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>Ref Multi Contained NPL</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseRefMultiContainedNPL(RefMultiContainedNPL object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Ref Multi Non Contained NPL</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>Ref Multi Non Contained NPL</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseRefMultiNonContainedNPL(RefMultiNonContainedNPL object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Contained Element No Opposite</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>Contained Element No Opposite</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseContainedElementNoOpposite(ContainedElementNoOpposite object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Gen Ref Single Contained</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 Ref Single Contained</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseGenRefSingleContained(GenRefSingleContained object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Gen Ref Single Non Contained</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 Ref Single Non Contained</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseGenRefSingleNonContained(GenRefSingleNonContained object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Gen Ref Multi Contained</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 Ref Multi Contained</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseGenRefMultiContained(GenRefMultiContained object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Gen Ref Multi Non Contained</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 Ref Multi Non Contained</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseGenRefMultiNonContained(GenRefMultiNonContained object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Impl Single Ref Container</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>Impl Single Ref Container</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseImplSingleRefContainer(ImplSingleRefContainer object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Impl Single Ref Contained Element</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>Impl Single Ref Contained Element</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseImplSingleRefContainedElement(ImplSingleRefContainedElement object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Impl Single Ref Non Container</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>Impl Single Ref Non Container</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseImplSingleRefNonContainer(ImplSingleRefNonContainer object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Impl Single Ref Non Contained Element</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>Impl Single Ref Non Contained Element</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseImplSingleRefNonContainedElement(ImplSingleRefNonContainedElement object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Impl Multi Ref Non Container</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>Impl Multi Ref Non Container</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseImplMultiRefNonContainer(ImplMultiRefNonContainer object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Impl Multi Ref Non Contained Element</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>Impl Multi Ref Non Contained Element</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseImplMultiRefNonContainedElement(ImplMultiRefNonContainedElement object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Impl Multi Ref Container</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>Impl Multi Ref Container</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseImplMultiRefContainer(ImplMultiRefContainer object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Impl Multi Ref Contained Element</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>Impl Multi Ref Contained Element</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseImplMultiRefContainedElement(ImplMultiRefContainedElement object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Impl Single Ref Container NPL</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>Impl Single Ref Container NPL</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseImplSingleRefContainerNPL(ImplSingleRefContainerNPL object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Impl Single Ref Non Container NPL</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>Impl Single Ref Non Container NPL</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseImplSingleRefNonContainerNPL(ImplSingleRefNonContainerNPL object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Impl Multi Ref Container NPL</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>Impl Multi Ref Container NPL</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseImplMultiRefContainerNPL(ImplMultiRefContainerNPL object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Impl Multi Ref Non Container NPL</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>Impl Multi Ref Non Container NPL</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseImplMultiRefNonContainerNPL(ImplMultiRefNonContainerNPL object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Impl Contained Element NPL</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>Impl Contained Element NPL</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseImplContainedElementNPL(ImplContainedElementNPL object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Gen Ref Multi NU Non Contained</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 Ref Multi NU Non Contained</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseGenRefMultiNUNonContained(GenRefMultiNUNonContained object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Gen Ref Map Non Contained</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 Ref Map Non Contained</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseGenRefMapNonContained(GenRefMapNonContained object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>String To EObject</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>String To EObject</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseStringToEObject(Map.Entry<String, EObject> object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>ISingle Ref Container</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>ISingle Ref Container</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseISingleRefContainer(ISingleRefContainer object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>ISingle Ref Contained Element</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>ISingle Ref Contained Element</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseISingleRefContainedElement(ISingleRefContainedElement object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>ISingle Ref Non Container</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>ISingle Ref Non Container</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseISingleRefNonContainer(ISingleRefNonContainer object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>ISingle Ref Non Contained Element</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>ISingle Ref Non Contained Element</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseISingleRefNonContainedElement(ISingleRefNonContainedElement object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>IMulti Ref Non Container</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>IMulti Ref Non Container</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseIMultiRefNonContainer(IMultiRefNonContainer object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>IMulti Ref Non Contained Element</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>IMulti Ref Non Contained Element</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseIMultiRefNonContainedElement(IMultiRefNonContainedElement object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>IMulti Ref Container</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>IMulti Ref Container</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseIMultiRefContainer(IMultiRefContainer object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>IMulti Ref Contained Element</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>IMulti Ref Contained Element</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseIMultiRefContainedElement(IMultiRefContainedElement object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>ISingle Ref Container NPL</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>ISingle Ref Container NPL</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseISingleRefContainerNPL(ISingleRefContainerNPL object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>ISingle Ref Non Container NPL</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>ISingle Ref Non Container NPL</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseISingleRefNonContainerNPL(ISingleRefNonContainerNPL object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>IMulti Ref Container NPL</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>IMulti Ref Container NPL</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseIMultiRefContainerNPL(IMultiRefContainerNPL object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>IMulti Ref Non Container NPL</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>IMulti Ref Non Container NPL</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseIMultiRefNonContainerNPL(IMultiRefNonContainerNPL object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>IContained Element No Parent Link</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>IContained Element No Parent Link</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseIContainedElementNoParentLink(IContainedElementNoParentLink object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>INamed Element</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>INamed Element</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseINamedElement(INamedElement 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;
-  }
-
-} // model4Switch
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/META-INF/MANIFEST.MF
index 0db3cf7d7a..618634acf1 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/META-INF/MANIFEST.MF
@@ -2,17 +2,16 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.cdo.tests.model4interfaces;singleton:=true
-Bundle-Version: 3.0.100.qualifier
+Bundle-Version: 3.0.200.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Export-Package: org.eclipse.emf.cdo.tests.legacy.model4interfaces;version="3.0.100",
  org.eclipse.emf.cdo.tests.legacy.model4interfaces.impl;version="3.0.100",
- org.eclipse.emf.cdo.tests.legacy.model4interfaces.util;version="3.0.100",
- org.eclipse.emf.cdo.tests.model4interfaces;version="3.0.100",
- org.eclipse.emf.cdo.tests.model4interfaces.impl;version="3.0.100",
- org.eclipse.emf.cdo.tests.model4interfaces.util;version="3.0.100"
+ org.eclipse.emf.cdo.tests.model4interfaces;version="3.0.200",
+ org.eclipse.emf.cdo.tests.model4interfaces.impl;version="3.0.200",
+ org.eclipse.emf.cdo.tests.model4interfaces.util;version="3.0.200"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.4.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.cdo;bundle-version="[4.0.0,5.0.0)";visibility:=reexport
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/model/interfaces.genmodel b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/model/interfaces.genmodel
index e06e8320b8..44397a7c6f 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/model/interfaces.genmodel
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/model/interfaces.genmodel
@@ -7,7 +7,7 @@
     modelName="Interfaces" updateClasspath="false" rootExtendsClass="org.eclipse.emf.internal.cdo.CDOObjectImpl"
     reflectiveDelegation="true" codeFormatting="true" testsDirectory="" importerID="org.eclipse.emf.importer.cdo"
     featureDelegation="Reflective" complianceLevel="5.0" copyrightFields="false" editPluginID="org.eclipse.emf.cdo.tests.model4interfaces.edit"
-    editorPluginID="org.eclipse.emf.cdo.tests.model4interfaces.edit">
+    editorPluginID="org.eclipse.emf.cdo.tests.model4interfaces.edit" runtimeVersion="2.6">
   <foreignModel>interfaces.ecore</foreignModel>
   <modelPluginVariables>CDO=org.eclipse.emf.cdo</modelPluginVariables>
   <genPackages prefix="model4interfaces" basePackage="org.eclipse.emf.cdo.tests" disposableProviderFactory="true"
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/model/interfaces.legacy-genmodel b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/model/interfaces.legacy-genmodel
index b50c546cda..009c76260e 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/model/interfaces.legacy-genmodel
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/model/interfaces.legacy-genmodel
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA;   Eike Stepper - initial API and implementation" modelDirectory="/org.eclipse.emf.cdo.tests.model4interfaces/src" editDirectory="" editorDirectory="" modelPluginID="org.eclipse.emf.cdo.tests.model4interfaces" modelName="Interfaces" updateClasspath="false" codeFormatting="true" testsDirectory="" importerID="org.eclipse.emf.importer.cdo" complianceLevel="5.0" copyrightFields="false" editPluginID="org.eclipse.emf.cdo.tests.model4interfaces.edit" editorPluginID="org.eclipse.emf.cdo.tests.model4interfaces.edit">
+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA;   Eike Stepper - initial API and implementation" modelDirectory="/org.eclipse.emf.cdo.tests.model4interfaces/src" editDirectory="" editorDirectory="" modelPluginID="org.eclipse.emf.cdo.tests.model4interfaces" modelName="Interfaces" updateClasspath="false" codeFormatting="true" testsDirectory="" importerID="org.eclipse.emf.importer.cdo" complianceLevel="5.0" copyrightFields="false" editPluginID="org.eclipse.emf.cdo.tests.model4interfaces.edit" editorPluginID="org.eclipse.emf.cdo.tests.model4interfaces.edit" runtimeVersion="2.6">
   <foreignModel>interfaces.ecore</foreignModel>
   <modelPluginVariables>CDO=org.eclipse.emf.cdo</modelPluginVariables>
   <genPackages prefix="model4interfaces" basePackage="org.eclipse.emf.cdo.tests.legacy" disposableProviderFactory="true" literalsInterface="false">
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/util/model4interfacesAdapterFactory.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/util/model4interfacesAdapterFactory.java
deleted file mode 100644
index 2a30ebbe66..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/util/model4interfacesAdapterFactory.java
+++ /dev/null
@@ -1,426 +0,0 @@
-/**
- * Copyright (c) 2004 - 2011 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.legacy.model4interfaces.util;
-
-import org.eclipse.emf.cdo.tests.legacy.model4interfaces.model4interfacesPackage;
-import org.eclipse.emf.cdo.tests.model4interfaces.IContainedElementNoParentLink;
-import org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainedElement;
-import org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainer;
-import org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainerNPL;
-import org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainedElement;
-import org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainer;
-import org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainerNPL;
-import org.eclipse.emf.cdo.tests.model4interfaces.INamedElement;
-import org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefContainedElement;
-import org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefContainer;
-import org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefContainerNPL;
-import org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainedElement;
-import org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainer;
-import org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainerNPL;
-
-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.legacy.model4interfaces.model4interfacesPackage
- * @generated
- */
-public class model4interfacesAdapterFactory extends AdapterFactoryImpl
-{
-  /**
-   * The cached model package. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  protected static model4interfacesPackage modelPackage;
-
-  /**
-   * Creates an instance of the adapter factory. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public model4interfacesAdapterFactory()
-  {
-    if (modelPackage == null)
-    {
-      modelPackage = model4interfacesPackage.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 model4interfacesSwitch<Adapter> modelSwitch = new model4interfacesSwitch<Adapter>()
-  {
-    @Override
-    public Adapter caseISingleRefContainer(ISingleRefContainer object)
-    {
-      return createISingleRefContainerAdapter();
-    }
-
-    @Override
-    public Adapter caseISingleRefContainedElement(ISingleRefContainedElement object)
-    {
-      return createISingleRefContainedElementAdapter();
-    }
-
-    @Override
-    public Adapter caseISingleRefNonContainer(ISingleRefNonContainer object)
-    {
-      return createISingleRefNonContainerAdapter();
-    }
-
-    @Override
-    public Adapter caseISingleRefNonContainedElement(ISingleRefNonContainedElement object)
-    {
-      return createISingleRefNonContainedElementAdapter();
-    }
-
-    @Override
-    public Adapter caseIMultiRefContainer(IMultiRefContainer object)
-    {
-      return createIMultiRefContainerAdapter();
-    }
-
-    @Override
-    public Adapter caseIMultiRefContainedElement(IMultiRefContainedElement object)
-    {
-      return createIMultiRefContainedElementAdapter();
-    }
-
-    @Override
-    public Adapter caseIMultiRefNonContainer(IMultiRefNonContainer object)
-    {
-      return createIMultiRefNonContainerAdapter();
-    }
-
-    @Override
-    public Adapter caseIMultiRefNonContainedElement(IMultiRefNonContainedElement object)
-    {
-      return createIMultiRefNonContainedElementAdapter();
-    }
-
-    @Override
-    public Adapter caseINamedElement(INamedElement object)
-    {
-      return createINamedElementAdapter();
-    }
-
-    @Override
-    public Adapter caseIContainedElementNoParentLink(IContainedElementNoParentLink object)
-    {
-      return createIContainedElementNoParentLinkAdapter();
-    }
-
-    @Override
-    public Adapter caseISingleRefContainerNPL(ISingleRefContainerNPL object)
-    {
-      return createISingleRefContainerNPLAdapter();
-    }
-
-    @Override
-    public Adapter caseISingleRefNonContainerNPL(ISingleRefNonContainerNPL object)
-    {
-      return createISingleRefNonContainerNPLAdapter();
-    }
-
-    @Override
-    public Adapter caseIMultiRefContainerNPL(IMultiRefContainerNPL object)
-    {
-      return createIMultiRefContainerNPLAdapter();
-    }
-
-    @Override
-    public Adapter caseIMultiRefNonContainerNPL(IMultiRefNonContainerNPL object)
-    {
-      return createIMultiRefNonContainerNPLAdapter();
-    }
-
-    @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.legacy.model4interfaces.ISingleRefContainer <em>ISingle Ref Container</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.legacy.model4interfaces.ISingleRefContainer
-   * @generated
-   */
-  public Adapter createISingleRefContainerAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '
-   * {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefContainedElement
-   * <em>ISingle Ref Contained Element</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.legacy.model4interfaces.ISingleRefContainedElement
-   * @generated
-   */
-  public Adapter createISingleRefContainedElementAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '
-   * {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefNonContainer <em>ISingle Ref Non Container</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.legacy.model4interfaces.ISingleRefNonContainer
-   * @generated
-   */
-  public Adapter createISingleRefNonContainerAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '
-   * {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefNonContainedElement
-   * <em>ISingle Ref Non Contained Element</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.legacy.model4interfaces.ISingleRefNonContainedElement
-   * @generated
-   */
-  public Adapter createISingleRefNonContainedElementAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '
-   * {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefContainer <em>IMulti Ref Container</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.legacy.model4interfaces.IMultiRefContainer
-   * @generated
-   */
-  public Adapter createIMultiRefContainerAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '
-   * {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefContainedElement
-   * <em>IMulti Ref Contained Element</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.legacy.model4interfaces.IMultiRefContainedElement
-   * @generated
-   */
-  public Adapter createIMultiRefContainedElementAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '
-   * {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefNonContainer <em>IMulti Ref Non Container</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.legacy.model4interfaces.IMultiRefNonContainer
-   * @generated
-   */
-  public Adapter createIMultiRefNonContainerAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '
-   * {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefNonContainedElement
-   * <em>IMulti Ref Non Contained Element</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.legacy.model4interfaces.IMultiRefNonContainedElement
-   * @generated
-   */
-  public Adapter createIMultiRefNonContainedElementAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '
-   * {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.INamedElement <em>INamed Element</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.legacy.model4interfaces.INamedElement
-   * @generated
-   */
-  public Adapter createINamedElementAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '
-   * {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IContainedElementNoParentLink
-   * <em>IContained Element No Parent Link</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.legacy.model4interfaces.IContainedElementNoParentLink
-   * @generated
-   */
-  public Adapter createIContainedElementNoParentLinkAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '
-   * {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefContainerNPL <em>ISingle Ref Container NPL</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.legacy.model4interfaces.ISingleRefContainerNPL
-   * @generated
-   */
-  public Adapter createISingleRefContainerNPLAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '
-   * {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.ISingleRefNonContainerNPL
-   * <em>ISingle Ref Non Container NPL</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.legacy.model4interfaces.ISingleRefNonContainerNPL
-   * @generated
-   */
-  public Adapter createISingleRefNonContainerNPLAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '
-   * {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefContainerNPL <em>IMulti Ref Container NPL</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.legacy.model4interfaces.IMultiRefContainerNPL
-   * @generated
-   */
-  public Adapter createIMultiRefContainerNPLAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '
-   * {@link org.eclipse.emf.cdo.tests.legacy.model4interfaces.IMultiRefNonContainerNPL
-   * <em>IMulti Ref Non Container NPL</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.legacy.model4interfaces.IMultiRefNonContainerNPL
-   * @generated
-   */
-  public Adapter createIMultiRefNonContainerNPLAdapter()
-  {
-    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;
-  }
-
-} // model4interfacesAdapterFactory
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/util/model4interfacesSwitch.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/util/model4interfacesSwitch.java
deleted file mode 100644
index e444fa000f..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/util/model4interfacesSwitch.java
+++ /dev/null
@@ -1,464 +0,0 @@
-/**
- * Copyright (c) 2004 - 2011 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.legacy.model4interfaces.util;
-
-import org.eclipse.emf.cdo.tests.legacy.model4interfaces.model4interfacesPackage;
-import org.eclipse.emf.cdo.tests.model4interfaces.IContainedElementNoParentLink;
-import org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainedElement;
-import org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainer;
-import org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainerNPL;
-import org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainedElement;
-import org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainer;
-import org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainerNPL;
-import org.eclipse.emf.cdo.tests.model4interfaces.INamedElement;
-import org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefContainedElement;
-import org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefContainer;
-import org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefContainerNPL;
-import org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainedElement;
-import org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainer;
-import org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainerNPL;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-
-import java.util.List;
-
-/**
- * <!-- 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.legacy.model4interfaces.model4interfacesPackage
- * @generated
- */
-public class model4interfacesSwitch<T>
-{
-  /**
-   * The cached model package <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  protected static model4interfacesPackage modelPackage;
-
-  /**
-   * Creates an instance of the switch. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public model4interfacesSwitch()
-  {
-    if (modelPackage == null)
-    {
-      modelPackage = model4interfacesPackage.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 model4interfacesPackage.ISINGLE_REF_CONTAINER:
-    {
-      ISingleRefContainer iSingleRefContainer = (ISingleRefContainer)theEObject;
-      T result = caseISingleRefContainer(iSingleRefContainer);
-      if (result == null)
-        result = defaultCase(theEObject);
-      return result;
-    }
-    case model4interfacesPackage.ISINGLE_REF_CONTAINED_ELEMENT:
-    {
-      ISingleRefContainedElement iSingleRefContainedElement = (ISingleRefContainedElement)theEObject;
-      T result = caseISingleRefContainedElement(iSingleRefContainedElement);
-      if (result == null)
-        result = defaultCase(theEObject);
-      return result;
-    }
-    case model4interfacesPackage.ISINGLE_REF_NON_CONTAINER:
-    {
-      ISingleRefNonContainer iSingleRefNonContainer = (ISingleRefNonContainer)theEObject;
-      T result = caseISingleRefNonContainer(iSingleRefNonContainer);
-      if (result == null)
-        result = defaultCase(theEObject);
-      return result;
-    }
-    case model4interfacesPackage.ISINGLE_REF_NON_CONTAINED_ELEMENT:
-    {
-      ISingleRefNonContainedElement iSingleRefNonContainedElement = (ISingleRefNonContainedElement)theEObject;
-      T result = caseISingleRefNonContainedElement(iSingleRefNonContainedElement);
-      if (result == null)
-        result = defaultCase(theEObject);
-      return result;
-    }
-    case model4interfacesPackage.IMULTI_REF_CONTAINER:
-    {
-      IMultiRefContainer iMultiRefContainer = (IMultiRefContainer)theEObject;
-      T result = caseIMultiRefContainer(iMultiRefContainer);
-      if (result == null)
-        result = defaultCase(theEObject);
-      return result;
-    }
-    case model4interfacesPackage.IMULTI_REF_CONTAINED_ELEMENT:
-    {
-      IMultiRefContainedElement iMultiRefContainedElement = (IMultiRefContainedElement)theEObject;
-      T result = caseIMultiRefContainedElement(iMultiRefContainedElement);
-      if (result == null)
-        result = defaultCase(theEObject);
-      return result;
-    }
-    case model4interfacesPackage.IMULTI_REF_NON_CONTAINER:
-    {
-      IMultiRefNonContainer iMultiRefNonContainer = (IMultiRefNonContainer)theEObject;
-      T result = caseIMultiRefNonContainer(iMultiRefNonContainer);
-      if (result == null)
-        result = defaultCase(theEObject);
-      return result;
-    }
-    case model4interfacesPackage.IMULTI_REF_NON_CONTAINED_ELEMENT:
-    {
-      IMultiRefNonContainedElement iMultiRefNonContainedElement = (IMultiRefNonContainedElement)theEObject;
-      T result = caseIMultiRefNonContainedElement(iMultiRefNonContainedElement);
-      if (result == null)
-        result = defaultCase(theEObject);
-      return result;
-    }
-    case model4interfacesPackage.INAMED_ELEMENT:
-    {
-      INamedElement iNamedElement = (INamedElement)theEObject;
-      T result = caseINamedElement(iNamedElement);
-      if (result == null)
-        result = defaultCase(theEObject);
-      return result;
-    }
-    case model4interfacesPackage.ICONTAINED_ELEMENT_NO_PARENT_LINK:
-    {
-      IContainedElementNoParentLink iContainedElementNoParentLink = (IContainedElementNoParentLink)theEObject;
-      T result = caseIContainedElementNoParentLink(iContainedElementNoParentLink);
-      if (result == null)
-        result = defaultCase(theEObject);
-      return result;
-    }
-    case model4interfacesPackage.ISINGLE_REF_CONTAINER_NPL:
-    {
-      ISingleRefContainerNPL iSingleRefContainerNPL = (ISingleRefContainerNPL)theEObject;
-      T result = caseISingleRefContainerNPL(iSingleRefContainerNPL);
-      if (result == null)
-        result = defaultCase(theEObject);
-      return result;
-    }
-    case model4interfacesPackage.ISINGLE_REF_NON_CONTAINER_NPL:
-    {
-      ISingleRefNonContainerNPL iSingleRefNonContainerNPL = (ISingleRefNonContainerNPL)theEObject;
-      T result = caseISingleRefNonContainerNPL(iSingleRefNonContainerNPL);
-      if (result == null)
-        result = defaultCase(theEObject);
-      return result;
-    }
-    case model4interfacesPackage.IMULTI_REF_CONTAINER_NPL:
-    {
-      IMultiRefContainerNPL iMultiRefContainerNPL = (IMultiRefContainerNPL)theEObject;
-      T result = caseIMultiRefContainerNPL(iMultiRefContainerNPL);
-      if (result == null)
-        result = defaultCase(theEObject);
-      return result;
-    }
-    case model4interfacesPackage.IMULTI_REF_NON_CONTAINER_NPL:
-    {
-      IMultiRefNonContainerNPL iMultiRefNonContainerNPL = (IMultiRefNonContainerNPL)theEObject;
-      T result = caseIMultiRefNonContainerNPL(iMultiRefNonContainerNPL);
-      if (result == null)
-        result = defaultCase(theEObject);
-      return result;
-    }
-    default:
-      return defaultCase(theEObject);
-    }
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>ISingle Ref Container</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>ISingle Ref Container</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseISingleRefContainer(ISingleRefContainer object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>ISingle Ref Contained Element</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>ISingle Ref Contained Element</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseISingleRefContainedElement(ISingleRefContainedElement object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>ISingle Ref Non Container</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>ISingle Ref Non Container</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseISingleRefNonContainer(ISingleRefNonContainer object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>ISingle Ref Non Contained Element</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>ISingle Ref Non Contained Element</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseISingleRefNonContainedElement(ISingleRefNonContainedElement object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>IMulti Ref Container</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>IMulti Ref Container</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseIMultiRefContainer(IMultiRefContainer object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>IMulti Ref Contained Element</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>IMulti Ref Contained Element</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseIMultiRefContainedElement(IMultiRefContainedElement object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>IMulti Ref Non Container</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>IMulti Ref Non Container</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseIMultiRefNonContainer(IMultiRefNonContainer object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>IMulti Ref Non Contained Element</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>IMulti Ref Non Contained Element</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseIMultiRefNonContainedElement(IMultiRefNonContainedElement object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>INamed Element</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>INamed Element</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseINamedElement(INamedElement object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>IContained Element No Parent Link</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>IContained Element No Parent Link</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseIContainedElementNoParentLink(IContainedElementNoParentLink object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>ISingle Ref Container NPL</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>ISingle Ref Container NPL</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseISingleRefContainerNPL(ISingleRefContainerNPL object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>ISingle Ref Non Container NPL</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>ISingle Ref Non Container NPL</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseISingleRefNonContainerNPL(ISingleRefNonContainerNPL object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>IMulti Ref Container NPL</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>IMulti Ref Container NPL</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseIMultiRefContainerNPL(IMultiRefContainerNPL object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>IMulti Ref Non Container NPL</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>IMulti Ref Non Container NPL</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseIMultiRefNonContainerNPL(IMultiRefNonContainerNPL 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;
-  }
-
-} // model4interfacesSwitch
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 37c7aec146..40bcd4addb 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
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.emf.cdo.tests.model5;singleton:=true
-Bundle-Version: 3.0.100.qualifier
+Bundle-Version: 3.0.200.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -11,7 +11,6 @@ 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
 Export-Package: org.eclipse.emf.cdo.tests.legacy.model5;version="3.0.100",
  org.eclipse.emf.cdo.tests.legacy.model5.impl;version="3.0.100",
- org.eclipse.emf.cdo.tests.legacy.model5.util;version="3.0.100",
- org.eclipse.emf.cdo.tests.model5;version="3.0.100",
- org.eclipse.emf.cdo.tests.model5.impl;version="3.0.100",
- org.eclipse.emf.cdo.tests.model5.util;version="3.0.100"
+ org.eclipse.emf.cdo.tests.model5;version="3.0.200",
+ org.eclipse.emf.cdo.tests.model5.impl;version="3.0.200",
+ org.eclipse.emf.cdo.tests.model5.util;version="3.0.200"
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/model/model5.genmodel b/plugins/org.eclipse.emf.cdo.tests.model5/model/model5.genmodel
index c2d97563fd..ef49dd5daf 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/model/model5.genmodel
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/model/model5.genmodel
@@ -6,7 +6,8 @@
     modelPluginID="org.eclipse.emf.cdo.tests.model5" modelName="Model5" updateClasspath="false"
     rootExtendsClass="org.eclipse.emf.internal.cdo.CDOObjectImpl" reflectiveDelegation="true"
     codeFormatting="true" testsDirectory="" importerID="org.eclipse.emf.importer.ecore"
-    featureDelegation="Reflective" complianceLevel="5.0" providerRootExtendsClass="org.eclipse.emf.cdo.edit.CDOItemProviderAdapter">
+    featureDelegation="Reflective" complianceLevel="5.0" providerRootExtendsClass="org.eclipse.emf.cdo.edit.CDOItemProviderAdapter"
+    runtimeVersion="2.6">
   <foreignModel>model5.ecore</foreignModel>
   <modelPluginVariables>CDO=org.eclipse.emf.cdo</modelPluginVariables>
   <genPackages prefix="Model5" basePackage="org.eclipse.emf.cdo.tests" disposableProviderFactory="true"
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 9c588ae725..be9a306251 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
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA;   Eike Stepper - initial API and implementation" modelDirectory="/org.eclipse.emf.cdo.tests.model5/src" editDirectory="" editorDirectory="" modelPluginID="org.eclipse.emf.cdo.tests.model5" modelName="Model5" updateClasspath="false" codeFormatting="true" testsDirectory="" importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0" providerRootExtendsClass="">
+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA;   Eike Stepper - initial API and implementation" modelDirectory="/org.eclipse.emf.cdo.tests.model5/src" editDirectory="" editorDirectory="" modelPluginID="org.eclipse.emf.cdo.tests.model5" modelName="Model5" updateClasspath="false" codeFormatting="true" testsDirectory="" importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0" providerRootExtendsClass="" runtimeVersion="2.6">
   <foreignModel>model5.ecore</foreignModel>
   <modelPluginVariables>CDO=org.eclipse.emf.cdo</modelPluginVariables>
   <genPackages prefix="Model5" basePackage="org.eclipse.emf.cdo.tests.legacy" disposableProviderFactory="true" literalsInterface="false" extensibleProviderFactory="true" childCreationExtenders="true">
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/util/Model5AdapterFactory.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/util/Model5AdapterFactory.java
deleted file mode 100644
index 4b7006806f..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/util/Model5AdapterFactory.java
+++ /dev/null
@@ -1,419 +0,0 @@
-/**
- * Copyright (c) 2004 - 2011 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.legacy.model5.util;
-
-import org.eclipse.emf.cdo.tests.legacy.model5.Model5Package;
-import org.eclipse.emf.cdo.tests.model5.Doctor;
-import org.eclipse.emf.cdo.tests.model5.GenListOfBoolean;
-import org.eclipse.emf.cdo.tests.model5.GenListOfChar;
-import org.eclipse.emf.cdo.tests.model5.GenListOfDate;
-import org.eclipse.emf.cdo.tests.model5.GenListOfDouble;
-import org.eclipse.emf.cdo.tests.model5.GenListOfFloat;
-import org.eclipse.emf.cdo.tests.model5.GenListOfInt;
-import org.eclipse.emf.cdo.tests.model5.GenListOfIntArray;
-import org.eclipse.emf.cdo.tests.model5.GenListOfInteger;
-import org.eclipse.emf.cdo.tests.model5.GenListOfLong;
-import org.eclipse.emf.cdo.tests.model5.GenListOfShort;
-import org.eclipse.emf.cdo.tests.model5.GenListOfString;
-import org.eclipse.emf.cdo.tests.model5.Manager;
-import org.eclipse.emf.cdo.tests.model5.TestFeatureMap;
-
-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.legacy.model5.Model5Package
- * @generated
- */
-public class Model5AdapterFactory extends AdapterFactoryImpl
-{
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public static final String copyright = "Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n   Eike Stepper - initial API and implementation";
-
-  /**
-   * 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 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.legacy.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.legacy.model5.TestFeatureMap
-   * @generated
-   */
-  public Adapter createTestFeatureMapAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.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.legacy.model5.Manager
-   * @generated
-   */
-  public Adapter createManagerAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.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.legacy.model5.Doctor
-   * @generated
-   */
-  public Adapter createDoctorAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.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.legacy.model5.GenListOfString
-   * @generated
-   */
-  public Adapter createGenListOfStringAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.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.legacy.model5.GenListOfInt
-   * @generated
-   */
-  public Adapter createGenListOfIntAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.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.legacy.model5.GenListOfInteger
-   * @generated
-   */
-  public Adapter createGenListOfIntegerAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.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.legacy.model5.GenListOfLong
-   * @generated
-   */
-  public Adapter createGenListOfLongAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.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.legacy.model5.GenListOfBoolean
-   * @generated
-   */
-  public Adapter createGenListOfBooleanAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.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.legacy.model5.GenListOfShort
-   * @generated
-   */
-  public Adapter createGenListOfShortAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.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.legacy.model5.GenListOfFloat
-   * @generated
-   */
-  public Adapter createGenListOfFloatAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.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.legacy.model5.GenListOfDouble
-   * @generated
-   */
-  public Adapter createGenListOfDoubleAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.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.legacy.model5.GenListOfDate
-   * @generated
-   */
-  public Adapter createGenListOfDateAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.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.legacy.model5.GenListOfChar
-   * @generated
-   */
-  public Adapter createGenListOfCharAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.legacy.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.legacy.model5.GenListOfIntArray
-   * @generated
-   */
-  public Adapter createGenListOfIntArrayAdapter()
-  {
-    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/legacy/model5/util/Model5Switch.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/util/Model5Switch.java
deleted file mode 100644
index 5acb7664d8..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/util/Model5Switch.java
+++ /dev/null
@@ -1,459 +0,0 @@
-/**
- * Copyright (c) 2004 - 2011 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.legacy.model5.util;
-
-import org.eclipse.emf.cdo.tests.legacy.model5.Model5Package;
-import org.eclipse.emf.cdo.tests.model5.Doctor;
-import org.eclipse.emf.cdo.tests.model5.GenListOfBoolean;
-import org.eclipse.emf.cdo.tests.model5.GenListOfChar;
-import org.eclipse.emf.cdo.tests.model5.GenListOfDate;
-import org.eclipse.emf.cdo.tests.model5.GenListOfDouble;
-import org.eclipse.emf.cdo.tests.model5.GenListOfFloat;
-import org.eclipse.emf.cdo.tests.model5.GenListOfInt;
-import org.eclipse.emf.cdo.tests.model5.GenListOfIntArray;
-import org.eclipse.emf.cdo.tests.model5.GenListOfInteger;
-import org.eclipse.emf.cdo.tests.model5.GenListOfLong;
-import org.eclipse.emf.cdo.tests.model5.GenListOfShort;
-import org.eclipse.emf.cdo.tests.model5.GenListOfString;
-import org.eclipse.emf.cdo.tests.model5.Manager;
-import org.eclipse.emf.cdo.tests.model5.TestFeatureMap;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-
-import java.util.List;
-
-/**
- * <!-- 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.legacy.model5.Model5Package
- * @generated
- */
-public class Model5Switch<T>
-{
-  /**
-   * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @generated
-   */
-  public static final String copyright = "Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n   Eike Stepper - initial API and implementation";
-
-  /**
-   * 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;
-    }
-    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>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.model6/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.tests.model6/META-INF/MANIFEST.MF
index 1e49ed0cf4..8f0c70685a 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/META-INF/MANIFEST.MF
@@ -14,11 +14,6 @@ Export-Package: org.eclipse.emf.cdo.tests.legacy.model6;version="4.0.0";uses:="o
    org.eclipse.emf.cdo.tests.legacy.model6,
    org.eclipse.emf.common.notify,
    org.eclipse.emf.ecore.impl",
- org.eclipse.emf.cdo.tests.legacy.model6.util;version="4.0.0";
-  uses:="org.eclipse.emf.ecore,
-   org.eclipse.emf.common.notify.impl,
-   org.eclipse.emf.cdo.tests.legacy.model6,
-   org.eclipse.emf.common.notify",
  org.eclipse.emf.cdo.tests.model6;version="4.0.0";uses:="org.eclipse.emf.ecore,org.eclipse.emf.common.util",
  org.eclipse.emf.cdo.tests.model6.impl;version="4.0.0";
   uses:="org.eclipse.emf.ecore,
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/model/model6.genmodel b/plugins/org.eclipse.emf.cdo.tests.model6/model/model6.genmodel
index daa9902c98..7ceef8889a 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/model/model6.genmodel
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/model/model6.genmodel
@@ -8,7 +8,7 @@
     updateClasspath="false" rootExtendsClass="org.eclipse.emf.internal.cdo.CDOObjectImpl"

     reflectiveDelegation="true" codeFormatting="true" testsDirectory="" testSuiteClass="org.eclipse.emf.cdo.tests.model6.tests.model6AllTests"

     importerID="org.eclipse.emf.importer.cdo" featureDelegation="Reflective" complianceLevel="5.0"

-    copyrightFields="false" editPluginID="org.eclipse.emf.cdo.tests.model6.edit">

+    copyrightFields="false" editPluginID="org.eclipse.emf.cdo.tests.model6.edit" runtimeVersion="2.6">

   <foreignModel>model6.ecore</foreignModel>

   <modelPluginVariables>CDO=org.eclipse.emf.cdo</modelPluginVariables>

   <genPackages prefix="Model6" basePackage="org.eclipse.emf.cdo.tests" disposableProviderFactory="true"

diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/model/model6.legacy.genmodel b/plugins/org.eclipse.emf.cdo.tests.model6/model/model6.legacy.genmodel
index d3f4231dc3..5fc5a37a89 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/model/model6.legacy.genmodel
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/model/model6.legacy.genmodel
@@ -5,7 +5,7 @@
     modelDirectory="/org.eclipse.emf.cdo.tests.model6/src" editDirectory="" editorDirectory=""

     modelPluginID="org.eclipse.emf.cdo.tests.model6" modelName="model6" updateClasspath="false"

     codeFormatting="true" testsDirectory="" importerID="org.eclipse.emf.importer.ecore"

-    complianceLevel="5.0" providerRootExtendsClass="">

+    complianceLevel="5.0" providerRootExtendsClass="" runtimeVersion="2.6">

   <foreignModel>model6.ecore</foreignModel>

   <modelPluginVariables>CDO=org.eclipse.emf.cdo</modelPluginVariables>

   <genPackages prefix="Model6" basePackage="org.eclipse.emf.cdo.tests.legacy" disposableProviderFactory="true"

diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/Model6Factory.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/Model6Factory.java
index f8c27e51b2..2d78637a72 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/Model6Factory.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/Model6Factory.java
@@ -16,73 +16,66 @@ import org.eclipse.emf.cdo.tests.model6.ReferenceObject;
 import org.eclipse.emf.cdo.tests.model6.Root;

 

 /**

- * <!-- 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 -->

+ * <!-- 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.model6.Model6Package

  * @generated

  */

-public interface Model6Factory extends

-		org.eclipse.emf.cdo.tests.model6.Model6Factory {

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	String copyright = "Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n   Eike Stepper - initial API and implementation";

+public interface Model6Factory extends org.eclipse.emf.cdo.tests.model6.Model6Factory

+{

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  String copyright = "Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n   Eike Stepper - initial API and implementation";

 

-	/**

-	 * The singleton instance of the factory. <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	Model6Factory eINSTANCE = org.eclipse.emf.cdo.tests.legacy.model6.impl.Model6FactoryImpl

-			.init();

+  /**

+   * The singleton instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  Model6Factory eINSTANCE = org.eclipse.emf.cdo.tests.legacy.model6.impl.Model6FactoryImpl.init();

 

-	/**

-	 * Returns a new object of class '<em>Root</em>'. <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return a new object of class '<em>Root</em>'.

-	 * @generated

-	 */

-	Root createRoot();

+  /**

+   * Returns a new object of class '<em>Root</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @return a new object of class '<em>Root</em>'.

+   * @generated

+   */

+  Root createRoot();

 

-	/**

-	 * Returns a new object of class '<em>Base Object</em>'. <!-- begin-user-doc

-	 * --> <!-- end-user-doc -->

-	 * 

-	 * @return a new object of class '<em>Base Object</em>'.

-	 * @generated

-	 */

-	BaseObject createBaseObject();

+  /**

+   * Returns a new object of class '<em>Base Object</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @return a new object of class '<em>Base Object</em>'.

+   * @generated

+   */

+  BaseObject createBaseObject();

 

-	/**

-	 * Returns a new object of class '<em>Reference Object</em>'. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

-	 * @return a new object of class '<em>Reference Object</em>'.

-	 * @generated

-	 */

-	ReferenceObject createReferenceObject();

+  /**

+   * Returns a new object of class '<em>Reference Object</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @return a new object of class '<em>Reference Object</em>'.

+   * @generated

+   */

+  ReferenceObject createReferenceObject();

 

-	/**

-	 * Returns a new object of class '<em>Containment Object</em>'. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

-	 * @return a new object of class '<em>Containment Object</em>'.

-	 * @generated

-	 */

-	ContainmentObject createContainmentObject();

+  /**

+   * Returns a new object of class '<em>Containment Object</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @return a new object of class '<em>Containment Object</em>'.

+   * @generated

+   */

+  ContainmentObject createContainmentObject();

 

-	/**

-	 * Returns the package supported by this factory. <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the package supported by this factory.

-	 * @generated

-	 */

-	Model6Package getModel6Package();

+  /**

+   * Returns the package supported by this factory. <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @return the package supported by this factory.

+   * @generated

+   */

+  Model6Package getModel6Package();

 

 } // Model6Factory

diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/BaseObjectImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/BaseObjectImpl.java
index 554d4f03ad..79347b169c 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/BaseObjectImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/BaseObjectImpl.java
@@ -10,10 +10,9 @@
  */

 package org.eclipse.emf.cdo.tests.legacy.model6.impl;

 

-import java.util.Collection;

-

 import org.eclipse.emf.cdo.tests.legacy.model6.Model6Package;

 import org.eclipse.emf.cdo.tests.model6.BaseObject;

+

 import org.eclipse.emf.common.notify.Notification;

 import org.eclipse.emf.common.util.EList;

 import org.eclipse.emf.ecore.EClass;

@@ -21,268 +20,278 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.EObjectImpl;

 import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;

 

+import java.util.Collection;

+

 /**

- * <!-- begin-user-doc --> An implementation of the model object '

- * <em><b>Base Object</b></em>'. <!-- end-user-doc -->

+ * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Base Object</b></em>'. <!-- end-user-doc -->

  * <p>

  * The following features are implemented:

  * <ul>

  * <li>

- * {@link org.eclipse.emf.cdo.tests.legacy.model6.impl.BaseObjectImpl#getAttributeOptional

- * <em>Attribute Optional</em>}</li>

+ * {@link org.eclipse.emf.cdo.tests.legacy.model6.impl.BaseObjectImpl#getAttributeOptional <em>Attribute Optional

+ * </em>}</li>

  * <li>

- * {@link org.eclipse.emf.cdo.tests.legacy.model6.impl.BaseObjectImpl#getAttributeRequired

- * <em>Attribute Required</em>}</li>

+ * {@link org.eclipse.emf.cdo.tests.legacy.model6.impl.BaseObjectImpl#getAttributeRequired <em>Attribute Required

+ * </em>}</li>

  * <li>

- * {@link org.eclipse.emf.cdo.tests.legacy.model6.impl.BaseObjectImpl#getAttributeList

- * <em>Attribute List</em>}</li>

+ * {@link org.eclipse.emf.cdo.tests.legacy.model6.impl.BaseObjectImpl#getAttributeList <em>Attribute List</em>}</li>

  * </ul>

  * </p>

  * 

  * @generated

  */

-public class BaseObjectImpl extends EObjectImpl implements BaseObject {

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public static final String copyright = "Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n   Eike Stepper - initial API and implementation";

+public class BaseObjectImpl extends EObjectImpl implements BaseObject

+{

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  public static final String copyright = "Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n   Eike Stepper - initial API and implementation";

 

-	/**

-	 * The default value of the '{@link #getAttributeOptional()

-	 * <em>Attribute Optional</em>}' attribute. <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 * 

-	 * @see #getAttributeOptional()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String ATTRIBUTE_OPTIONAL_EDEFAULT = null;

+  /**

+   * The default value of the '{@link #getAttributeOptional() <em>Attribute Optional</em>}' attribute. <!--

+   * begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @see #getAttributeOptional()

+   * @generated

+   * @ordered

+   */

+  protected static final String ATTRIBUTE_OPTIONAL_EDEFAULT = null;

 

-	/**

-	 * The cached value of the '{@link #getAttributeOptional()

-	 * <em>Attribute Optional</em>}' attribute. <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 * 

-	 * @see #getAttributeOptional()

-	 * @generated

-	 * @ordered

-	 */

-	protected String attributeOptional = ATTRIBUTE_OPTIONAL_EDEFAULT;

+  /**

+   * The cached value of the '{@link #getAttributeOptional() <em>Attribute Optional</em>}' attribute. <!--

+   * begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @see #getAttributeOptional()

+   * @generated

+   * @ordered

+   */

+  protected String attributeOptional = ATTRIBUTE_OPTIONAL_EDEFAULT;

 

-	/**

-	 * The default value of the '{@link #getAttributeRequired()

-	 * <em>Attribute Required</em>}' attribute. <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 * 

-	 * @see #getAttributeRequired()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String ATTRIBUTE_REQUIRED_EDEFAULT = null;

+  /**

+   * The default value of the '{@link #getAttributeRequired() <em>Attribute Required</em>}' attribute. <!--

+   * begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @see #getAttributeRequired()

+   * @generated

+   * @ordered

+   */

+  protected static final String ATTRIBUTE_REQUIRED_EDEFAULT = null;

 

-	/**

-	 * The cached value of the '{@link #getAttributeRequired()

-	 * <em>Attribute Required</em>}' attribute. <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 * 

-	 * @see #getAttributeRequired()

-	 * @generated

-	 * @ordered

-	 */

-	protected String attributeRequired = ATTRIBUTE_REQUIRED_EDEFAULT;

+  /**

+   * The cached value of the '{@link #getAttributeRequired() <em>Attribute Required</em>}' attribute. <!--

+   * begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @see #getAttributeRequired()

+   * @generated

+   * @ordered

+   */

+  protected String attributeRequired = ATTRIBUTE_REQUIRED_EDEFAULT;

 

-	/**

-	 * The cached value of the '{@link #getAttributeList()

-	 * <em>Attribute List</em>}' attribute list. <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 * 

-	 * @see #getAttributeList()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<String> attributeList;

+  /**

+   * The cached value of the '{@link #getAttributeList() <em>Attribute List</em>}' attribute list. <!-- begin-user-doc

+   * --> <!-- end-user-doc -->

+   * 

+   * @see #getAttributeList()

+   * @generated

+   * @ordered

+   */

+  protected EList<String> attributeList;

 

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	protected BaseObjectImpl() {

-		super();

-	}

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  protected BaseObjectImpl()

+  {

+    super();

+  }

 

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return Model6Package.eINSTANCE.getBaseObject();

-	}

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  @Override

+  protected EClass eStaticClass()

+  {

+    return Model6Package.eINSTANCE.getBaseObject();

+  }

 

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public String getAttributeOptional() {

-		return attributeOptional;

-	}

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  public String getAttributeOptional()

+  {

+    return attributeOptional;

+  }

 

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public void setAttributeOptional(String newAttributeOptional) {

-		String oldAttributeOptional = attributeOptional;

-		attributeOptional = newAttributeOptional;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET,

-					Model6Package.BASE_OBJECT__ATTRIBUTE_OPTIONAL,

-					oldAttributeOptional, attributeOptional));

-	}

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  public void setAttributeOptional(String newAttributeOptional)

+  {

+    String oldAttributeOptional = attributeOptional;

+    attributeOptional = newAttributeOptional;

+    if (eNotificationRequired())

+      eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.BASE_OBJECT__ATTRIBUTE_OPTIONAL,

+          oldAttributeOptional, attributeOptional));

+  }

 

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public String getAttributeRequired() {

-		return attributeRequired;

-	}

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  public String getAttributeRequired()

+  {

+    return attributeRequired;

+  }

 

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public void setAttributeRequired(String newAttributeRequired) {

-		String oldAttributeRequired = attributeRequired;

-		attributeRequired = newAttributeRequired;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET,

-					Model6Package.BASE_OBJECT__ATTRIBUTE_REQUIRED,

-					oldAttributeRequired, attributeRequired));

-	}

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  public void setAttributeRequired(String newAttributeRequired)

+  {

+    String oldAttributeRequired = attributeRequired;

+    attributeRequired = newAttributeRequired;

+    if (eNotificationRequired())

+      eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.BASE_OBJECT__ATTRIBUTE_REQUIRED,

+          oldAttributeRequired, attributeRequired));

+  }

 

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EList<String> getAttributeList() {

-		if (attributeList == null) {

-			attributeList = new EDataTypeUniqueEList<String>(String.class,

-					this, Model6Package.BASE_OBJECT__ATTRIBUTE_LIST);

-		}

-		return attributeList;

-	}

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  public EList<String> getAttributeList()

+  {

+    if (attributeList == null)

+    {

+      attributeList = new EDataTypeUniqueEList<String>(String.class, this, Model6Package.BASE_OBJECT__ATTRIBUTE_LIST);

+    }

+    return attributeList;

+  }

 

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-		case Model6Package.BASE_OBJECT__ATTRIBUTE_OPTIONAL:

-			return getAttributeOptional();

-		case Model6Package.BASE_OBJECT__ATTRIBUTE_REQUIRED:

-			return getAttributeRequired();

-		case Model6Package.BASE_OBJECT__ATTRIBUTE_LIST:

-			return getAttributeList();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  @Override

+  public Object eGet(int featureID, boolean resolve, boolean coreType)

+  {

+    switch (featureID)

+    {

+    case Model6Package.BASE_OBJECT__ATTRIBUTE_OPTIONAL:

+      return getAttributeOptional();

+    case Model6Package.BASE_OBJECT__ATTRIBUTE_REQUIRED:

+      return getAttributeRequired();

+    case Model6Package.BASE_OBJECT__ATTRIBUTE_LIST:

+      return getAttributeList();

+    }

+    return super.eGet(featureID, resolve, coreType);

+  }

 

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case Model6Package.BASE_OBJECT__ATTRIBUTE_OPTIONAL:

-			setAttributeOptional((String) newValue);

-			return;

-		case Model6Package.BASE_OBJECT__ATTRIBUTE_REQUIRED:

-			setAttributeRequired((String) newValue);

-			return;

-		case Model6Package.BASE_OBJECT__ATTRIBUTE_LIST:

-			getAttributeList().clear();

-			getAttributeList().addAll((Collection<? extends String>) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  @SuppressWarnings("unchecked")

+  @Override

+  public void eSet(int featureID, Object newValue)

+  {

+    switch (featureID)

+    {

+    case Model6Package.BASE_OBJECT__ATTRIBUTE_OPTIONAL:

+      setAttributeOptional((String)newValue);

+      return;

+    case Model6Package.BASE_OBJECT__ATTRIBUTE_REQUIRED:

+      setAttributeRequired((String)newValue);

+      return;

+    case Model6Package.BASE_OBJECT__ATTRIBUTE_LIST:

+      getAttributeList().clear();

+      getAttributeList().addAll((Collection<? extends String>)newValue);

+      return;

+    }

+    super.eSet(featureID, newValue);

+  }

 

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case Model6Package.BASE_OBJECT__ATTRIBUTE_OPTIONAL:

-			setAttributeOptional(ATTRIBUTE_OPTIONAL_EDEFAULT);

-			return;

-		case Model6Package.BASE_OBJECT__ATTRIBUTE_REQUIRED:

-			setAttributeRequired(ATTRIBUTE_REQUIRED_EDEFAULT);

-			return;

-		case Model6Package.BASE_OBJECT__ATTRIBUTE_LIST:

-			getAttributeList().clear();

-			return;

-		}

-		super.eUnset(featureID);

-	}

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  @Override

+  public void eUnset(int featureID)

+  {

+    switch (featureID)

+    {

+    case Model6Package.BASE_OBJECT__ATTRIBUTE_OPTIONAL:

+      setAttributeOptional(ATTRIBUTE_OPTIONAL_EDEFAULT);

+      return;

+    case Model6Package.BASE_OBJECT__ATTRIBUTE_REQUIRED:

+      setAttributeRequired(ATTRIBUTE_REQUIRED_EDEFAULT);

+      return;

+    case Model6Package.BASE_OBJECT__ATTRIBUTE_LIST:

+      getAttributeList().clear();

+      return;

+    }

+    super.eUnset(featureID);

+  }

 

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case Model6Package.BASE_OBJECT__ATTRIBUTE_OPTIONAL:

-			return ATTRIBUTE_OPTIONAL_EDEFAULT == null ? attributeOptional != null

-					: !ATTRIBUTE_OPTIONAL_EDEFAULT.equals(attributeOptional);

-		case Model6Package.BASE_OBJECT__ATTRIBUTE_REQUIRED:

-			return ATTRIBUTE_REQUIRED_EDEFAULT == null ? attributeRequired != null

-					: !ATTRIBUTE_REQUIRED_EDEFAULT.equals(attributeRequired);

-		case Model6Package.BASE_OBJECT__ATTRIBUTE_LIST:

-			return attributeList != null && !attributeList.isEmpty();

-		}

-		return super.eIsSet(featureID);

-	}

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  @Override

+  public boolean eIsSet(int featureID)

+  {

+    switch (featureID)

+    {

+    case Model6Package.BASE_OBJECT__ATTRIBUTE_OPTIONAL:

+      return ATTRIBUTE_OPTIONAL_EDEFAULT == null ? attributeOptional != null : !ATTRIBUTE_OPTIONAL_EDEFAULT

+          .equals(attributeOptional);

+    case Model6Package.BASE_OBJECT__ATTRIBUTE_REQUIRED:

+      return ATTRIBUTE_REQUIRED_EDEFAULT == null ? attributeRequired != null : !ATTRIBUTE_REQUIRED_EDEFAULT

+          .equals(attributeRequired);

+    case Model6Package.BASE_OBJECT__ATTRIBUTE_LIST:

+      return attributeList != null && !attributeList.isEmpty();

+    }

+    return super.eIsSet(featureID);

+  }

 

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		if (eIsProxy())

-			return super.toString();

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  @Override

+  public String toString()

+  {

+    if (eIsProxy())

+      return super.toString();

 

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (attributeOptional: ");

-		result.append(attributeOptional);

-		result.append(", attributeRequired: ");

-		result.append(attributeRequired);

-		result.append(", attributeList: ");

-		result.append(attributeList);

-		result.append(')');

-		return result.toString();

-	}

+    StringBuffer result = new StringBuffer(super.toString());

+    result.append(" (attributeOptional: ");

+    result.append(attributeOptional);

+    result.append(", attributeRequired: ");

+    result.append(attributeRequired);

+    result.append(", attributeList: ");

+    result.append(attributeList);

+    result.append(')');

+    return result.toString();

+  }

 

 } // BaseObjectImpl

diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/ContainmentObjectImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/ContainmentObjectImpl.java
index a083ba3040..c258bdfac8 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/ContainmentObjectImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/ContainmentObjectImpl.java
@@ -9,11 +9,10 @@
  */

 package org.eclipse.emf.cdo.tests.legacy.model6.impl;

 

-import java.util.Collection;

-

 import org.eclipse.emf.cdo.tests.legacy.model6.Model6Package;

 import org.eclipse.emf.cdo.tests.model6.BaseObject;

 import org.eclipse.emf.cdo.tests.model6.ContainmentObject;

+

 import org.eclipse.emf.common.notify.Notification;

 import org.eclipse.emf.common.notify.NotificationChain;

 import org.eclipse.emf.common.util.EList;

@@ -23,236 +22,240 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;

 import org.eclipse.emf.ecore.util.InternalEList;

 

+import java.util.Collection;

+

 /**

- * <!-- begin-user-doc --> An implementation of the model object '

- * <em><b>Containment Object</b></em>'. <!-- end-user-doc -->

+ * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Containment Object</b></em>'. <!--

+ * end-user-doc -->

  * <p>

  * The following features are implemented:

  * <ul>

  * <li>

- * {@link org.eclipse.emf.cdo.tests.legacy.model6.impl.ContainmentObjectImpl#getContainmentOptional

- * <em>Containment Optional</em>}</li>

+ * {@link org.eclipse.emf.cdo.tests.legacy.model6.impl.ContainmentObjectImpl#getContainmentOptional <em>Containment

+ * Optional</em>}</li>

  * <li>

- * {@link org.eclipse.emf.cdo.tests.legacy.model6.impl.ContainmentObjectImpl#getContainmentList

- * <em>Containment List</em>}</li>

+ * {@link org.eclipse.emf.cdo.tests.legacy.model6.impl.ContainmentObjectImpl#getContainmentList <em>Containment List

+ * </em>}</li>

  * </ul>

  * </p>

  * 

  * @generated

  */

-public class ContainmentObjectImpl extends BaseObjectImpl implements

-		ContainmentObject {

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public static final String copyright = "Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n   Eike Stepper - initial API and implementation";

+public class ContainmentObjectImpl extends BaseObjectImpl implements ContainmentObject

+{

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  public static final String copyright = "Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n   Eike Stepper - initial API and implementation";

 

-	/**

-	 * The cached value of the '{@link #getContainmentOptional()

-	 * <em>Containment Optional</em>}' containment reference. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

-	 * @see #getContainmentOptional()

-	 * @generated

-	 * @ordered

-	 */

-	protected BaseObject containmentOptional;

+  /**

+   * The cached value of the '{@link #getContainmentOptional() <em>Containment Optional</em>}' containment reference.

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @see #getContainmentOptional()

+   * @generated

+   * @ordered

+   */

+  protected BaseObject containmentOptional;

 

-	/**

-	 * The cached value of the '{@link #getContainmentList()

-	 * <em>Containment List</em>}' containment reference list. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

-	 * @see #getContainmentList()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<BaseObject> containmentList;

+  /**

+   * The cached value of the '{@link #getContainmentList() <em>Containment List</em>}' containment reference list. <!--

+   * begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @see #getContainmentList()

+   * @generated

+   * @ordered

+   */

+  protected EList<BaseObject> containmentList;

 

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	protected ContainmentObjectImpl() {

-		super();

-	}

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  protected ContainmentObjectImpl()

+  {

+    super();

+  }

 

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return Model6Package.eINSTANCE.getContainmentObject();

-	}

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  @Override

+  protected EClass eStaticClass()

+  {

+    return Model6Package.eINSTANCE.getContainmentObject();

+  }

 

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public BaseObject getContainmentOptional() {

-		return containmentOptional;

-	}

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  public BaseObject getContainmentOptional()

+  {

+    return containmentOptional;

+  }

 

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public NotificationChain basicSetContainmentOptional(

-			BaseObject newContainmentOptional, NotificationChain msgs) {

-		BaseObject oldContainmentOptional = containmentOptional;

-		containmentOptional = newContainmentOptional;

-		if (eNotificationRequired()) {

-			ENotificationImpl notification = new ENotificationImpl(this,

-					Notification.SET,

-					Model6Package.CONTAINMENT_OBJECT__CONTAINMENT_OPTIONAL,

-					oldContainmentOptional, newContainmentOptional);

-			if (msgs == null)

-				msgs = notification;

-			else

-				msgs.add(notification);

-		}

-		return msgs;

-	}

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  public NotificationChain basicSetContainmentOptional(BaseObject newContainmentOptional, NotificationChain msgs)

+  {

+    BaseObject oldContainmentOptional = containmentOptional;

+    containmentOptional = newContainmentOptional;

+    if (eNotificationRequired())

+    {

+      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,

+          Model6Package.CONTAINMENT_OBJECT__CONTAINMENT_OPTIONAL, oldContainmentOptional, newContainmentOptional);

+      if (msgs == null)

+        msgs = notification;

+      else

+        msgs.add(notification);

+    }

+    return msgs;

+  }

 

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public void setContainmentOptional(BaseObject newContainmentOptional) {

-		if (newContainmentOptional != containmentOptional) {

-			NotificationChain msgs = null;

-			if (containmentOptional != null)

-				msgs = ((InternalEObject) containmentOptional)

-						.eInverseRemove(

-								this,

-								EOPPOSITE_FEATURE_BASE

-										- Model6Package.CONTAINMENT_OBJECT__CONTAINMENT_OPTIONAL,

-								null, msgs);

-			if (newContainmentOptional != null)

-				msgs = ((InternalEObject) newContainmentOptional)

-						.eInverseAdd(

-								this,

-								EOPPOSITE_FEATURE_BASE

-										- Model6Package.CONTAINMENT_OBJECT__CONTAINMENT_OPTIONAL,

-								null, msgs);

-			msgs = basicSetContainmentOptional(newContainmentOptional, msgs);

-			if (msgs != null)

-				msgs.dispatch();

-		} else if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET,

-					Model6Package.CONTAINMENT_OBJECT__CONTAINMENT_OPTIONAL,

-					newContainmentOptional, newContainmentOptional));

-	}

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  public void setContainmentOptional(BaseObject newContainmentOptional)

+  {

+    if (newContainmentOptional != containmentOptional)

+    {

+      NotificationChain msgs = null;

+      if (containmentOptional != null)

+        msgs = ((InternalEObject)containmentOptional).eInverseRemove(this, EOPPOSITE_FEATURE_BASE

+            - Model6Package.CONTAINMENT_OBJECT__CONTAINMENT_OPTIONAL, null, msgs);

+      if (newContainmentOptional != null)

+        msgs = ((InternalEObject)newContainmentOptional).eInverseAdd(this, EOPPOSITE_FEATURE_BASE

+            - Model6Package.CONTAINMENT_OBJECT__CONTAINMENT_OPTIONAL, null, msgs);

+      msgs = basicSetContainmentOptional(newContainmentOptional, msgs);

+      if (msgs != null)

+        msgs.dispatch();

+    }

+    else if (eNotificationRequired())

+      eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.CONTAINMENT_OBJECT__CONTAINMENT_OPTIONAL,

+          newContainmentOptional, newContainmentOptional));

+  }

 

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EList<BaseObject> getContainmentList() {

-		if (containmentList == null) {

-			containmentList = new EObjectContainmentEList<BaseObject>(

-					BaseObject.class, this,

-					Model6Package.CONTAINMENT_OBJECT__CONTAINMENT_LIST);

-		}

-		return containmentList;

-	}

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  public EList<BaseObject> getContainmentList()

+  {

+    if (containmentList == null)

+    {

+      containmentList = new EObjectContainmentEList<BaseObject>(BaseObject.class, this,

+          Model6Package.CONTAINMENT_OBJECT__CONTAINMENT_LIST);

+    }

+    return containmentList;

+  }

 

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd,

-			int featureID, NotificationChain msgs) {

-		switch (featureID) {

-		case Model6Package.CONTAINMENT_OBJECT__CONTAINMENT_OPTIONAL:

-			return basicSetContainmentOptional(null, msgs);

-		case Model6Package.CONTAINMENT_OBJECT__CONTAINMENT_LIST:

-			return ((InternalEList<?>) getContainmentList()).basicRemove(

-					otherEnd, msgs);

-		}

-		return super.eInverseRemove(otherEnd, featureID, msgs);

-	}

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  @Override

+  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)

+  {

+    switch (featureID)

+    {

+    case Model6Package.CONTAINMENT_OBJECT__CONTAINMENT_OPTIONAL:

+      return basicSetContainmentOptional(null, msgs);

+    case Model6Package.CONTAINMENT_OBJECT__CONTAINMENT_LIST:

+      return ((InternalEList<?>)getContainmentList()).basicRemove(otherEnd, msgs);

+    }

+    return super.eInverseRemove(otherEnd, featureID, msgs);

+  }

 

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-		case Model6Package.CONTAINMENT_OBJECT__CONTAINMENT_OPTIONAL:

-			return getContainmentOptional();

-		case Model6Package.CONTAINMENT_OBJECT__CONTAINMENT_LIST:

-			return getContainmentList();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  @Override

+  public Object eGet(int featureID, boolean resolve, boolean coreType)

+  {

+    switch (featureID)

+    {

+    case Model6Package.CONTAINMENT_OBJECT__CONTAINMENT_OPTIONAL:

+      return getContainmentOptional();

+    case Model6Package.CONTAINMENT_OBJECT__CONTAINMENT_LIST:

+      return getContainmentList();

+    }

+    return super.eGet(featureID, resolve, coreType);

+  }

 

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case Model6Package.CONTAINMENT_OBJECT__CONTAINMENT_OPTIONAL:

-			setContainmentOptional((BaseObject) newValue);

-			return;

-		case Model6Package.CONTAINMENT_OBJECT__CONTAINMENT_LIST:

-			getContainmentList().clear();

-			getContainmentList().addAll(

-					(Collection<? extends BaseObject>) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  @SuppressWarnings("unchecked")

+  @Override

+  public void eSet(int featureID, Object newValue)

+  {

+    switch (featureID)

+    {

+    case Model6Package.CONTAINMENT_OBJECT__CONTAINMENT_OPTIONAL:

+      setContainmentOptional((BaseObject)newValue);

+      return;

+    case Model6Package.CONTAINMENT_OBJECT__CONTAINMENT_LIST:

+      getContainmentList().clear();

+      getContainmentList().addAll((Collection<? extends BaseObject>)newValue);

+      return;

+    }

+    super.eSet(featureID, newValue);

+  }

 

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case Model6Package.CONTAINMENT_OBJECT__CONTAINMENT_OPTIONAL:

-			setContainmentOptional((BaseObject) null);

-			return;

-		case Model6Package.CONTAINMENT_OBJECT__CONTAINMENT_LIST:

-			getContainmentList().clear();

-			return;

-		}

-		super.eUnset(featureID);

-	}

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  @Override

+  public void eUnset(int featureID)

+  {

+    switch (featureID)

+    {

+    case Model6Package.CONTAINMENT_OBJECT__CONTAINMENT_OPTIONAL:

+      setContainmentOptional((BaseObject)null);

+      return;

+    case Model6Package.CONTAINMENT_OBJECT__CONTAINMENT_LIST:

+      getContainmentList().clear();

+      return;

+    }

+    super.eUnset(featureID);

+  }

 

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case Model6Package.CONTAINMENT_OBJECT__CONTAINMENT_OPTIONAL:

-			return containmentOptional != null;

-		case Model6Package.CONTAINMENT_OBJECT__CONTAINMENT_LIST:

-			return containmentList != null && !containmentList.isEmpty();

-		}

-		return super.eIsSet(featureID);

-	}

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  @Override

+  public boolean eIsSet(int featureID)

+  {

+    switch (featureID)

+    {

+    case Model6Package.CONTAINMENT_OBJECT__CONTAINMENT_OPTIONAL:

+      return containmentOptional != null;

+    case Model6Package.CONTAINMENT_OBJECT__CONTAINMENT_LIST:

+      return containmentList != null && !containmentList.isEmpty();

+    }

+    return super.eIsSet(featureID);

+  }

 

 } // ContainmentObjectImpl

diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/Model6FactoryImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/Model6FactoryImpl.java
index a53e914b36..0a598b77b4 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/Model6FactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/Model6FactoryImpl.java
@@ -16,6 +16,7 @@ import org.eclipse.emf.cdo.tests.model6.BaseObject;
 import org.eclipse.emf.cdo.tests.model6.ContainmentObject;

 import org.eclipse.emf.cdo.tests.model6.ReferenceObject;

 import org.eclipse.emf.cdo.tests.model6.Root;

+

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.ecore.EPackage;

@@ -23,128 +24,139 @@ import org.eclipse.emf.ecore.impl.EFactoryImpl;
 import org.eclipse.emf.ecore.plugin.EcorePlugin;

 

 /**

- * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!--

- * end-user-doc -->

+ * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!-- end-user-doc -->

  * 

  * @generated

  */

-public class Model6FactoryImpl extends EFactoryImpl implements Model6Factory {

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public static final String copyright = "Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n   Eike Stepper - initial API and implementation";

+public class Model6FactoryImpl extends EFactoryImpl implements Model6Factory

+{

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  public static final String copyright = "Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n   Eike Stepper - initial API and implementation";

 

-	/**

-	 * Creates the default factory implementation. <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public static Model6Factory init() {

-		try {

-			Model6Factory theModel6Factory = (Model6Factory) EPackage.Registry.INSTANCE

-					.getEFactory("http://www.eclipse.org/emf/CDO/tests/model6/1.0.0");

-			if (theModel6Factory != null) {

-				return theModel6Factory;

-			}

-		} catch (Exception exception) {

-			EcorePlugin.INSTANCE.log(exception);

-		}

-		return new Model6FactoryImpl();

-	}

+  /**

+   * Creates the default factory implementation. <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  public static Model6Factory init()

+  {

+    try

+    {

+      Model6Factory theModel6Factory = (Model6Factory)EPackage.Registry.INSTANCE

+          .getEFactory("http://www.eclipse.org/emf/CDO/tests/model6/1.0.0");

+      if (theModel6Factory != null)

+      {

+        return theModel6Factory;

+      }

+    }

+    catch (Exception exception)

+    {

+      EcorePlugin.INSTANCE.log(exception);

+    }

+    return new Model6FactoryImpl();

+  }

 

-	/**

-	 * Creates an instance of the factory. <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public Model6FactoryImpl() {

-		super();

-	}

+  /**

+   * Creates an instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  public Model6FactoryImpl()

+  {

+    super();

+  }

 

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public EObject create(EClass eClass) {

-		switch (eClass.getClassifierID()) {

-		case Model6Package.ROOT:

-			return createRoot();

-		case Model6Package.BASE_OBJECT:

-			return createBaseObject();

-		case Model6Package.REFERENCE_OBJECT:

-			return createReferenceObject();

-		case Model6Package.CONTAINMENT_OBJECT:

-			return createContainmentObject();

-		default:

-			throw new IllegalArgumentException("The class '" + eClass.getName()

-					+ "' is not a valid classifier");

-		}

-	}

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  @Override

+  public EObject create(EClass eClass)

+  {

+    switch (eClass.getClassifierID())

+    {

+    case Model6Package.ROOT:

+      return createRoot();

+    case Model6Package.BASE_OBJECT:

+      return createBaseObject();

+    case Model6Package.REFERENCE_OBJECT:

+      return createReferenceObject();

+    case Model6Package.CONTAINMENT_OBJECT:

+      return createContainmentObject();

+    default:

+      throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");

+    }

+  }

 

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public Root createRoot() {

-		RootImpl root = new RootImpl();

-		return root;

-	}

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  public Root createRoot()

+  {

+    RootImpl root = new RootImpl();

+    return root;

+  }

 

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public BaseObject createBaseObject() {

-		BaseObjectImpl baseObject = new BaseObjectImpl();

-		return baseObject;

-	}

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  public BaseObject createBaseObject()

+  {

+    BaseObjectImpl baseObject = new BaseObjectImpl();

+    return baseObject;

+  }

 

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public ReferenceObject createReferenceObject() {

-		ReferenceObjectImpl referenceObject = new ReferenceObjectImpl();

-		return referenceObject;

-	}

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  public ReferenceObject createReferenceObject()

+  {

+    ReferenceObjectImpl referenceObject = new ReferenceObjectImpl();

+    return referenceObject;

+  }

 

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public ContainmentObject createContainmentObject() {

-		ContainmentObjectImpl containmentObject = new ContainmentObjectImpl();

-		return containmentObject;

-	}

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  public ContainmentObject createContainmentObject()

+  {

+    ContainmentObjectImpl containmentObject = new ContainmentObjectImpl();

+    return containmentObject;

+  }

 

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public Model6Package getModel6Package() {

-		return (Model6Package) getEPackage();

-	}

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  public Model6Package getModel6Package()

+  {

+    return (Model6Package)getEPackage();

+  }

 

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

-	 * @deprecated

-	 * @generated

-	 */

-	@Deprecated

-	public static Model6Package getPackage() {

-		return Model6Package.eINSTANCE;

-	}

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @deprecated

+   * @generated

+   */

+  @Deprecated

+  public static Model6Package getPackage()

+  {

+    return Model6Package.eINSTANCE;

+  }

 

 } // Model6FactoryImpl

diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/Model6PackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/Model6PackageImpl.java
index 3ca97a41dc..5bf7cb153b 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/Model6PackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/Model6PackageImpl.java
@@ -16,6 +16,7 @@ import org.eclipse.emf.cdo.tests.model6.BaseObject;
 import org.eclipse.emf.cdo.tests.model6.ContainmentObject;

 import org.eclipse.emf.cdo.tests.model6.ReferenceObject;

 import org.eclipse.emf.cdo.tests.model6.Root;

+

 import org.eclipse.emf.ecore.EAttribute;

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.EPackage;

@@ -23,403 +24,388 @@ import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.ecore.impl.EPackageImpl;

 

 /**

- * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!--

- * end-user-doc -->

+ * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!-- end-user-doc -->

  * 

  * @generated

  */

-public class Model6PackageImpl extends EPackageImpl implements Model6Package {

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public static final String copyright = "Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n   Eike Stepper - initial API and implementation";

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	private EClass rootEClass = null;

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	private EClass baseObjectEClass = null;

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	private EClass referenceObjectEClass = null;

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	private EClass containmentObjectEClass = null;

-

-	/**

-	 * Creates an instance of the model <b>Package</b>, registered with

-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the

-	 * package package URI value.

-	 * <p>

-	 * Note: the correct way to create the package is via the static factory

-	 * method {@link #init init()}, which also performs initialization of the

-	 * package, or returns the registered package, if one already exists. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

-	 * @see org.eclipse.emf.ecore.EPackage.Registry

-	 * @see org.eclipse.emf.cdo.tests.legacy.model6.Model6Package#eNS_URI

-	 * @see #init()

-	 * @generated

-	 */

-	private Model6PackageImpl() {

-		super(eNS_URI, Model6Factory.eINSTANCE);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	private static boolean isInited = false;

-

-	/**

-	 * Creates, registers, and initializes the <b>Package</b> for this model,

-	 * and for any others upon which it depends.

-	 * 

-	 * <p>

-	 * This method is used to initialize {@link Model6Package#eINSTANCE} when

-	 * that field is accessed. Clients should not invoke it directly. Instead,

-	 * they should simply access that field to obtain the package. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

-	 * @see #eNS_URI

-	 * @see #createPackageContents()

-	 * @see #initializePackageContents()

-	 * @generated

-	 */

-	public static Model6Package init() {

-		if (isInited)

-			return (Model6Package) EPackage.Registry.INSTANCE

-					.getEPackage(Model6Package.eNS_URI);

-

-		// Obtain or create and register package

-		Model6PackageImpl theModel6Package = (Model6PackageImpl) (EPackage.Registry.INSTANCE

-				.get(eNS_URI) instanceof Model6PackageImpl ? EPackage.Registry.INSTANCE

-				.get(eNS_URI) : new Model6PackageImpl());

-

-		isInited = true;

-

-		// Create package meta-data objects

-		theModel6Package.createPackageContents();

-

-		// Initialize created meta-data

-		theModel6Package.initializePackageContents();

-

-		// Mark meta-data to indicate it can't be changed

-		theModel6Package.freeze();

-

-		// Update the registry and return the package

-		EPackage.Registry.INSTANCE.put(Model6Package.eNS_URI, theModel6Package);

-		return theModel6Package;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EClass getRoot() {

-		return rootEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EReference getRoot_ListA() {

-		return (EReference) rootEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EReference getRoot_ListB() {

-		return (EReference) rootEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EReference getRoot_ListC() {

-		return (EReference) rootEClass.getEStructuralFeatures().get(2);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EReference getRoot_ListD() {

-		return (EReference) rootEClass.getEStructuralFeatures().get(3);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EClass getBaseObject() {

-		return baseObjectEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EAttribute getBaseObject_AttributeOptional() {

-		return (EAttribute) baseObjectEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EAttribute getBaseObject_AttributeRequired() {

-		return (EAttribute) baseObjectEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EAttribute getBaseObject_AttributeList() {

-		return (EAttribute) baseObjectEClass.getEStructuralFeatures().get(2);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EClass getReferenceObject() {

-		return referenceObjectEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EReference getReferenceObject_ReferenceOptional() {

-		return (EReference) referenceObjectEClass.getEStructuralFeatures().get(

-				0);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EReference getReferenceObject_ReferenceList() {

-		return (EReference) referenceObjectEClass.getEStructuralFeatures().get(

-				1);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EClass getContainmentObject() {

-		return containmentObjectEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EReference getContainmentObject_ContainmentOptional() {

-		return (EReference) containmentObjectEClass.getEStructuralFeatures()

-				.get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EReference getContainmentObject_ContainmentList() {

-		return (EReference) containmentObjectEClass.getEStructuralFeatures()

-				.get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public Model6Factory getModel6Factory() {

-		return (Model6Factory) getEFactoryInstance();

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	private boolean isCreated = false;

-

-	/**

-	 * Creates the meta-model objects for the package. This method is guarded to

-	 * have no affect on any invocation but its first. <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public void createPackageContents() {

-		if (isCreated)

-			return;

-		isCreated = true;

-

-		// Create classes and their features

-		rootEClass = createEClass(ROOT);

-		createEReference(rootEClass, ROOT__LIST_A);

-		createEReference(rootEClass, ROOT__LIST_B);

-		createEReference(rootEClass, ROOT__LIST_C);

-		createEReference(rootEClass, ROOT__LIST_D);

-

-		baseObjectEClass = createEClass(BASE_OBJECT);

-		createEAttribute(baseObjectEClass, BASE_OBJECT__ATTRIBUTE_OPTIONAL);

-		createEAttribute(baseObjectEClass, BASE_OBJECT__ATTRIBUTE_REQUIRED);

-		createEAttribute(baseObjectEClass, BASE_OBJECT__ATTRIBUTE_LIST);

-

-		referenceObjectEClass = createEClass(REFERENCE_OBJECT);

-		createEReference(referenceObjectEClass,

-				REFERENCE_OBJECT__REFERENCE_OPTIONAL);

-		createEReference(referenceObjectEClass,

-				REFERENCE_OBJECT__REFERENCE_LIST);

-

-		containmentObjectEClass = createEClass(CONTAINMENT_OBJECT);

-		createEReference(containmentObjectEClass,

-				CONTAINMENT_OBJECT__CONTAINMENT_OPTIONAL);

-		createEReference(containmentObjectEClass,

-				CONTAINMENT_OBJECT__CONTAINMENT_LIST);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	private boolean isInitialized = false;

-

-	/**

-	 * Complete the initialization of the package and its meta-model. This

-	 * method is guarded to have no affect on any invocation but its first. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public void initializePackageContents() {

-		if (isInitialized)

-			return;

-		isInitialized = true;

-

-		// Initialize package

-		setName(eNAME);

-		setNsPrefix(eNS_PREFIX);

-		setNsURI(eNS_URI);

-

-		// Create type parameters

-

-		// Set bounds for type parameters

-

-		// Add supertypes to classes

-		referenceObjectEClass.getESuperTypes().add(this.getBaseObject());

-		containmentObjectEClass.getESuperTypes().add(this.getBaseObject());

-

-		// Initialize classes and features; add operations and parameters

-		initEClass(rootEClass, Root.class, "Root", !IS_ABSTRACT, !IS_INTERFACE,

-				IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getRoot_ListA(), this.getBaseObject(), null, "listA",

-				null, 0, -1, Root.class, !IS_TRANSIENT, !IS_VOLATILE,

-				IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,

-				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEReference(getRoot_ListB(), this.getBaseObject(), null, "listB",

-				null, 0, -1, Root.class, !IS_TRANSIENT, !IS_VOLATILE,

-				IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,

-				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEReference(getRoot_ListC(), this.getBaseObject(), null, "listC",

-				null, 0, -1, Root.class, !IS_TRANSIENT, !IS_VOLATILE,

-				IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,

-				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEReference(getRoot_ListD(), this.getBaseObject(), null, "listD",

-				null, 0, -1, Root.class, !IS_TRANSIENT, !IS_VOLATILE,

-				IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,

-				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		initEClass(baseObjectEClass, BaseObject.class, "BaseObject",

-				!IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEAttribute(getBaseObject_AttributeOptional(),

-				ecorePackage.getEString(), "attributeOptional", null, 0, 1,

-				BaseObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,

-				!IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEAttribute(getBaseObject_AttributeRequired(),

-				ecorePackage.getEString(), "attributeRequired", null, 1, 1,

-				BaseObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,

-				!IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEAttribute(getBaseObject_AttributeList(),

-				ecorePackage.getEString(), "attributeList", null, 0, -1,

-				BaseObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,

-				!IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		initEClass(referenceObjectEClass, ReferenceObject.class,

-				"ReferenceObject", !IS_ABSTRACT, !IS_INTERFACE,

-				IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getReferenceObject_ReferenceOptional(),

-				this.getBaseObject(), null, "referenceOptional", null, 0, 1,

-				ReferenceObject.class, !IS_TRANSIENT, !IS_VOLATILE,

-				IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,

-				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEReference(getReferenceObject_ReferenceList(),

-				this.getBaseObject(), null, "referenceList", null, 0, -1,

-				ReferenceObject.class, !IS_TRANSIENT, !IS_VOLATILE,

-				IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,

-				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		initEClass(containmentObjectEClass, ContainmentObject.class,

-				"ContainmentObject", !IS_ABSTRACT, !IS_INTERFACE,

-				IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getContainmentObject_ContainmentOptional(),

-				this.getBaseObject(), null, "containmentOptional", null, 0, 1,

-				ContainmentObject.class, !IS_TRANSIENT, !IS_VOLATILE,

-				IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,

-				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEReference(getContainmentObject_ContainmentList(),

-				this.getBaseObject(), null, "containmentList", null, 0, -1,

-				ContainmentObject.class, !IS_TRANSIENT, !IS_VOLATILE,

-				IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,

-				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		// Create resource

-		createResource(eNS_URI);

-	}

+public class Model6PackageImpl extends EPackageImpl implements Model6Package

+{

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  public static final String copyright = "Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n   Eike Stepper - initial API and implementation";

+

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  private EClass rootEClass = null;

+

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  private EClass baseObjectEClass = null;

+

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  private EClass referenceObjectEClass = null;

+

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  private EClass containmentObjectEClass = null;

+

+  /**

+   * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry

+   * EPackage.Registry} by the package package URI value.

+   * <p>

+   * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also

+   * performs initialization of the package, or returns the registered package, if one already exists. <!--

+   * begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @see org.eclipse.emf.ecore.EPackage.Registry

+   * @see org.eclipse.emf.cdo.tests.legacy.model6.Model6Package#eNS_URI

+   * @see #init()

+   * @generated

+   */

+  private Model6PackageImpl()

+  {

+    super(eNS_URI, Model6Factory.eINSTANCE);

+  }

+

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  private static boolean isInited = false;

+

+  /**

+   * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.

+   * <p>

+   * This method is used to initialize {@link Model6Package#eINSTANCE} when that field is accessed. Clients should not

+   * invoke it directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * 

+   * @see #eNS_URI

+   * @see #createPackageContents()

+   * @see #initializePackageContents()

+   * @generated

+   */

+  public static Model6Package init()

+  {

+    if (isInited)

+      return (Model6Package)EPackage.Registry.INSTANCE.getEPackage(Model6Package.eNS_URI);

+

+    // Obtain or create and register package

+    Model6PackageImpl theModel6Package = (Model6PackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof Model6PackageImpl ? EPackage.Registry.INSTANCE

+        .get(eNS_URI) : new Model6PackageImpl());

+

+    isInited = true;

+

+    // Create package meta-data objects

+    theModel6Package.createPackageContents();

+

+    // Initialize created meta-data

+    theModel6Package.initializePackageContents();

+

+    // Mark meta-data to indicate it can't be changed

+    theModel6Package.freeze();

+

+    // Update the registry and return the package

+    EPackage.Registry.INSTANCE.put(Model6Package.eNS_URI, theModel6Package);

+    return theModel6Package;

+  }

+

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  public EClass getRoot()

+  {

+    return rootEClass;

+  }

+

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  public EReference getRoot_ListA()

+  {

+    return (EReference)rootEClass.getEStructuralFeatures().get(0);

+  }

+

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  public EReference getRoot_ListB()

+  {

+    return (EReference)rootEClass.getEStructuralFeatures().get(1);

+  }

+

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  public EReference getRoot_ListC()

+  {

+    return (EReference)rootEClass.getEStructuralFeatures().get(2);

+  }

+

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  public EReference getRoot_ListD()

+  {

+    return (EReference)rootEClass.getEStructuralFeatures().get(3);

+  }

+

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  public EClass getBaseObject()

+  {

+    return baseObjectEClass;

+  }

+

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  public EAttribute getBaseObject_AttributeOptional()

+  {

+    return (EAttribute)baseObjectEClass.getEStructuralFeatures().get(0);

+  }

+

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  public EAttribute getBaseObject_AttributeRequired()

+  {

+    return (EAttribute)baseObjectEClass.getEStructuralFeatures().get(1);

+  }

+

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  public EAttribute getBaseObject_AttributeList()

+  {

+    return (EAttribute)baseObjectEClass.getEStructuralFeatures().get(2);

+  }

+

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  public EClass getReferenceObject()

+  {

+    return referenceObjectEClass;

+  }

+

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  public EReference getReferenceObject_ReferenceOptional()

+  {

+    return (EReference)referenceObjectEClass.getEStructuralFeatures().get(0);

+  }

+

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  public EReference getReferenceObject_ReferenceList()

+  {

+    return (EReference)referenceObjectEClass.getEStructuralFeatures().get(1);

+  }

+

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  public EClass getContainmentObject()

+  {

+    return containmentObjectEClass;

+  }

+

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  public EReference getContainmentObject_ContainmentOptional()

+  {

+    return (EReference)containmentObjectEClass.getEStructuralFeatures().get(0);

+  }

+

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  public EReference getContainmentObject_ContainmentList()

+  {

+    return (EReference)containmentObjectEClass.getEStructuralFeatures().get(1);

+  }

+

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  public Model6Factory getModel6Factory()

+  {

+    return (Model6Factory)getEFactoryInstance();

+  }

+

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  private boolean isCreated = false;

+

+  /**

+   * Creates the meta-model objects for the package. This method is guarded to have no affect on any invocation but its

+   * first. <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  public void createPackageContents()

+  {

+    if (isCreated)

+      return;

+    isCreated = true;

+

+    // Create classes and their features

+    rootEClass = createEClass(ROOT);

+    createEReference(rootEClass, ROOT__LIST_A);

+    createEReference(rootEClass, ROOT__LIST_B);

+    createEReference(rootEClass, ROOT__LIST_C);

+    createEReference(rootEClass, ROOT__LIST_D);

+

+    baseObjectEClass = createEClass(BASE_OBJECT);

+    createEAttribute(baseObjectEClass, BASE_OBJECT__ATTRIBUTE_OPTIONAL);

+    createEAttribute(baseObjectEClass, BASE_OBJECT__ATTRIBUTE_REQUIRED);

+    createEAttribute(baseObjectEClass, BASE_OBJECT__ATTRIBUTE_LIST);

+

+    referenceObjectEClass = createEClass(REFERENCE_OBJECT);

+    createEReference(referenceObjectEClass, REFERENCE_OBJECT__REFERENCE_OPTIONAL);

+    createEReference(referenceObjectEClass, REFERENCE_OBJECT__REFERENCE_LIST);

+

+    containmentObjectEClass = createEClass(CONTAINMENT_OBJECT);

+    createEReference(containmentObjectEClass, CONTAINMENT_OBJECT__CONTAINMENT_OPTIONAL);

+    createEReference(containmentObjectEClass, CONTAINMENT_OBJECT__CONTAINMENT_LIST);

+  }

+

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  private boolean isInitialized = false;

+

+  /**

+   * Complete the initialization of the package and its meta-model. This method is guarded to have no affect on any

+   * invocation but its first. <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  public void initializePackageContents()

+  {

+    if (isInitialized)

+      return;

+    isInitialized = true;

+

+    // Initialize package

+    setName(eNAME);

+    setNsPrefix(eNS_PREFIX);

+    setNsURI(eNS_URI);

+

+    // Create type parameters

+

+    // Set bounds for type parameters

+

+    // Add supertypes to classes

+    referenceObjectEClass.getESuperTypes().add(this.getBaseObject());

+    containmentObjectEClass.getESuperTypes().add(this.getBaseObject());

+

+    // Initialize classes and features; add operations and parameters

+    initEClass(rootEClass, Root.class, "Root", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+    initEReference(getRoot_ListA(), this.getBaseObject(), null, "listA", null, 0, -1, Root.class, !IS_TRANSIENT,

+        !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,

+        IS_ORDERED);

+    initEReference(getRoot_ListB(), this.getBaseObject(), null, "listB", null, 0, -1, Root.class, !IS_TRANSIENT,

+        !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,

+        IS_ORDERED);

+    initEReference(getRoot_ListC(), this.getBaseObject(), null, "listC", null, 0, -1, Root.class, !IS_TRANSIENT,

+        !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,

+        IS_ORDERED);

+    initEReference(getRoot_ListD(), this.getBaseObject(), null, "listD", null, 0, -1, Root.class, !IS_TRANSIENT,

+        !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,

+        IS_ORDERED);

+

+    initEClass(baseObjectEClass, BaseObject.class, "BaseObject", !IS_ABSTRACT, !IS_INTERFACE,

+        IS_GENERATED_INSTANCE_CLASS);

+    initEAttribute(getBaseObject_AttributeOptional(), ecorePackage.getEString(), "attributeOptional", null, 0, 1,

+        BaseObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,

+        IS_ORDERED);

+    initEAttribute(getBaseObject_AttributeRequired(), ecorePackage.getEString(), "attributeRequired", null, 1, 1,

+        BaseObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,

+        IS_ORDERED);

+    initEAttribute(getBaseObject_AttributeList(), ecorePackage.getEString(), "attributeList", null, 0, -1,

+        BaseObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,

+        IS_ORDERED);

+

+    initEClass(referenceObjectEClass, ReferenceObject.class, "ReferenceObject", !IS_ABSTRACT, !IS_INTERFACE,

+        IS_GENERATED_INSTANCE_CLASS);

+    initEReference(getReferenceObject_ReferenceOptional(), this.getBaseObject(), null, "referenceOptional", null, 0, 1,

+        ReferenceObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,

+        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+    initEReference(getReferenceObject_ReferenceList(), this.getBaseObject(), null, "referenceList", null, 0, -1,

+        ReferenceObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,

+        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+    initEClass(containmentObjectEClass, ContainmentObject.class, "ContainmentObject", !IS_ABSTRACT, !IS_INTERFACE,

+        IS_GENERATED_INSTANCE_CLASS);

+    initEReference(getContainmentObject_ContainmentOptional(), this.getBaseObject(), null, "containmentOptional", null,

+        0, 1, ContainmentObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,

+        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+    initEReference(getContainmentObject_ContainmentList(), this.getBaseObject(), null, "containmentList", null, 0, -1,

+        ContainmentObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,

+        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+    // Create resource

+    createResource(eNS_URI);

+  }

 

 } // Model6PackageImpl

diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/ReferenceObjectImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/ReferenceObjectImpl.java
index 0dbfadd757..2e71a9d892 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/ReferenceObjectImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/ReferenceObjectImpl.java
@@ -10,11 +10,10 @@
  */

 package org.eclipse.emf.cdo.tests.legacy.model6.impl;

 

-import java.util.Collection;

-

 import org.eclipse.emf.cdo.tests.legacy.model6.Model6Package;

 import org.eclipse.emf.cdo.tests.model6.BaseObject;

 import org.eclipse.emf.cdo.tests.model6.ReferenceObject;

+

 import org.eclipse.emf.common.notify.Notification;

 import org.eclipse.emf.common.util.EList;

 import org.eclipse.emf.ecore.EClass;

@@ -22,200 +21,213 @@ import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;

 import org.eclipse.emf.ecore.util.EObjectResolvingEList;

 

+import java.util.Collection;

+

 /**

- * <!-- begin-user-doc --> An implementation of the model object '

- * <em><b>Reference Object</b></em>'. <!-- end-user-doc -->

+ * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Reference Object</b></em>'. <!-- end-user-doc

+ * -->

  * <p>

  * The following features are implemented:

  * <ul>

  * <li>

- * {@link org.eclipse.emf.cdo.tests.legacy.model6.impl.ReferenceObjectImpl#getReferenceOptional

- * <em>Reference Optional</em>}</li>

+ * {@link org.eclipse.emf.cdo.tests.legacy.model6.impl.ReferenceObjectImpl#getReferenceOptional <em>Reference

+ * Optional</em>}</li>

  * <li>

- * {@link org.eclipse.emf.cdo.tests.legacy.model6.impl.ReferenceObjectImpl#getReferenceList

- * <em>Reference List</em>}</li>

+ * {@link org.eclipse.emf.cdo.tests.legacy.model6.impl.ReferenceObjectImpl#getReferenceList <em>Reference List</em>}

+ * </li>

  * </ul>

  * </p>

  * 

  * @generated

  */

-public class ReferenceObjectImpl extends BaseObjectImpl implements

-		ReferenceObject {

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public static final String copyright = "Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n   Eike Stepper - initial API and implementation";

-

-	/**

-	 * The cached value of the '{@link #getReferenceOptional()

-	 * <em>Reference Optional</em>}' reference. <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 * 

-	 * @see #getReferenceOptional()

-	 * @generated

-	 * @ordered

-	 */

-	protected BaseObject referenceOptional;

-

-	/**

-	 * The cached value of the '{@link #getReferenceList()

-	 * <em>Reference List</em>}' reference list. <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 * 

-	 * @see #getReferenceList()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<BaseObject> referenceList;

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	protected ReferenceObjectImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return Model6Package.eINSTANCE.getReferenceObject();

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public BaseObject getReferenceOptional() {

-		if (referenceOptional != null && referenceOptional.eIsProxy()) {

-			InternalEObject oldReferenceOptional = (InternalEObject) referenceOptional;

-			referenceOptional = (BaseObject) eResolveProxy(oldReferenceOptional);

-			if (referenceOptional != oldReferenceOptional) {

-				if (eNotificationRequired())

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE,

-							Model6Package.REFERENCE_OBJECT__REFERENCE_OPTIONAL,

-							oldReferenceOptional, referenceOptional));

-			}

-		}

-		return referenceOptional;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public BaseObject basicGetReferenceOptional() {

-		return referenceOptional;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public void setReferenceOptional(BaseObject newReferenceOptional) {

-		BaseObject oldReferenceOptional = referenceOptional;

-		referenceOptional = newReferenceOptional;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET,

-					Model6Package.REFERENCE_OBJECT__REFERENCE_OPTIONAL,

-					oldReferenceOptional, referenceOptional));

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EList<BaseObject> getReferenceList() {

-		if (referenceList == null) {

-			referenceList = new EObjectResolvingEList<BaseObject>(

-					BaseObject.class, this,

-					Model6Package.REFERENCE_OBJECT__REFERENCE_LIST);

-		}

-		return referenceList;

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-		case Model6Package.REFERENCE_OBJECT__REFERENCE_OPTIONAL:

-			if (resolve)

-				return getReferenceOptional();

-			return basicGetReferenceOptional();

-		case Model6Package.REFERENCE_OBJECT__REFERENCE_LIST:

-			return getReferenceList();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case Model6Package.REFERENCE_OBJECT__REFERENCE_OPTIONAL:

-			setReferenceOptional((BaseObject) newValue);

-			return;

-		case Model6Package.REFERENCE_OBJECT__REFERENCE_LIST:

-			getReferenceList().clear();

-			getReferenceList().addAll(

-					(Collection<? extends BaseObject>) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case Model6Package.REFERENCE_OBJECT__REFERENCE_OPTIONAL:

-			setReferenceOptional((BaseObject) null);

-			return;

-		case Model6Package.REFERENCE_OBJECT__REFERENCE_LIST:

-			getReferenceList().clear();

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case Model6Package.REFERENCE_OBJECT__REFERENCE_OPTIONAL:

-			return referenceOptional != null;

-		case Model6Package.REFERENCE_OBJECT__REFERENCE_LIST:

-			return referenceList != null && !referenceList.isEmpty();

-		}

-		return super.eIsSet(featureID);

-	}

+public class ReferenceObjectImpl extends BaseObjectImpl implements ReferenceObject

+{

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  public static final String copyright = "Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n   Eike Stepper - initial API and implementation";

+

+  /**

+   * The cached value of the '{@link #getReferenceOptional() <em>Reference Optional</em>}' reference. <!--

+   * begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @see #getReferenceOptional()

+   * @generated

+   * @ordered

+   */

+  protected BaseObject referenceOptional;

+

+  /**

+   * The cached value of the '{@link #getReferenceList() <em>Reference List</em>}' reference list. <!-- begin-user-doc

+   * --> <!-- end-user-doc -->

+   * 

+   * @see #getReferenceList()

+   * @generated

+   * @ordered

+   */

+  protected EList<BaseObject> referenceList;

+

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  protected ReferenceObjectImpl()

+  {

+    super();

+  }

+

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  @Override

+  protected EClass eStaticClass()

+  {

+    return Model6Package.eINSTANCE.getReferenceObject();

+  }

+

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  public BaseObject getReferenceOptional()

+  {

+    if (referenceOptional != null && referenceOptional.eIsProxy())

+    {

+      InternalEObject oldReferenceOptional = (InternalEObject)referenceOptional;

+      referenceOptional = (BaseObject)eResolveProxy(oldReferenceOptional);

+      if (referenceOptional != oldReferenceOptional)

+      {

+        if (eNotificationRequired())

+          eNotify(new ENotificationImpl(this, Notification.RESOLVE, Model6Package.REFERENCE_OBJECT__REFERENCE_OPTIONAL,

+              oldReferenceOptional, referenceOptional));

+      }

+    }

+    return referenceOptional;

+  }

+

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  public BaseObject basicGetReferenceOptional()

+  {

+    return referenceOptional;

+  }

+

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  public void setReferenceOptional(BaseObject newReferenceOptional)

+  {

+    BaseObject oldReferenceOptional = referenceOptional;

+    referenceOptional = newReferenceOptional;

+    if (eNotificationRequired())

+      eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.REFERENCE_OBJECT__REFERENCE_OPTIONAL,

+          oldReferenceOptional, referenceOptional));

+  }

+

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  public EList<BaseObject> getReferenceList()

+  {

+    if (referenceList == null)

+    {

+      referenceList = new EObjectResolvingEList<BaseObject>(BaseObject.class, this,

+          Model6Package.REFERENCE_OBJECT__REFERENCE_LIST);

+    }

+    return referenceList;

+  }

+

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  @Override

+  public Object eGet(int featureID, boolean resolve, boolean coreType)

+  {

+    switch (featureID)

+    {

+    case Model6Package.REFERENCE_OBJECT__REFERENCE_OPTIONAL:

+      if (resolve)

+        return getReferenceOptional();

+      return basicGetReferenceOptional();

+    case Model6Package.REFERENCE_OBJECT__REFERENCE_LIST:

+      return getReferenceList();

+    }

+    return super.eGet(featureID, resolve, coreType);

+  }

+

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  @SuppressWarnings("unchecked")

+  @Override

+  public void eSet(int featureID, Object newValue)

+  {

+    switch (featureID)

+    {

+    case Model6Package.REFERENCE_OBJECT__REFERENCE_OPTIONAL:

+      setReferenceOptional((BaseObject)newValue);

+      return;

+    case Model6Package.REFERENCE_OBJECT__REFERENCE_LIST:

+      getReferenceList().clear();

+      getReferenceList().addAll((Collection<? extends BaseObject>)newValue);

+      return;

+    }

+    super.eSet(featureID, newValue);

+  }

+

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  @Override

+  public void eUnset(int featureID)

+  {

+    switch (featureID)

+    {

+    case Model6Package.REFERENCE_OBJECT__REFERENCE_OPTIONAL:

+      setReferenceOptional((BaseObject)null);

+      return;

+    case Model6Package.REFERENCE_OBJECT__REFERENCE_LIST:

+      getReferenceList().clear();

+      return;

+    }

+    super.eUnset(featureID);

+  }

+

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  @Override

+  public boolean eIsSet(int featureID)

+  {

+    switch (featureID)

+    {

+    case Model6Package.REFERENCE_OBJECT__REFERENCE_OPTIONAL:

+      return referenceOptional != null;

+    case Model6Package.REFERENCE_OBJECT__REFERENCE_LIST:

+      return referenceList != null && !referenceList.isEmpty();

+    }

+    return super.eIsSet(featureID);

+  }

 

 } // ReferenceObjectImpl

diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/RootImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/RootImpl.java
index 3ceefee6f4..5256ec58b3 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/RootImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/RootImpl.java
@@ -10,11 +10,10 @@
  */

 package org.eclipse.emf.cdo.tests.legacy.model6.impl;

 

-import java.util.Collection;

-

 import org.eclipse.emf.cdo.tests.legacy.model6.Model6Package;

 import org.eclipse.emf.cdo.tests.model6.BaseObject;

 import org.eclipse.emf.cdo.tests.model6.Root;

+

 import org.eclipse.emf.common.notify.NotificationChain;

 import org.eclipse.emf.common.util.EList;

 import org.eclipse.emf.ecore.EClass;

@@ -23,256 +22,269 @@ import org.eclipse.emf.ecore.impl.EObjectImpl;
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;

 import org.eclipse.emf.ecore.util.InternalEList;

 

+import java.util.Collection;

+

 /**

- * <!-- begin-user-doc --> An implementation of the model object '

- * <em><b>Root</b></em>'. <!-- end-user-doc -->

+ * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Root</b></em>'. <!-- end-user-doc -->

  * <p>

  * The following features are implemented:

  * <ul>

- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model6.impl.RootImpl#getListA

- * <em>List A</em>}</li>

- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model6.impl.RootImpl#getListB

- * <em>List B</em>}</li>

- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model6.impl.RootImpl#getListC

- * <em>List C</em>}</li>

- * <li>{@link org.eclipse.emf.cdo.tests.legacy.model6.impl.RootImpl#getListD

- * <em>List D</em>}</li>

+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model6.impl.RootImpl#getListA <em>List A</em>}</li>

+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model6.impl.RootImpl#getListB <em>List B</em>}</li>

+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model6.impl.RootImpl#getListC <em>List C</em>}</li>

+ * <li>{@link org.eclipse.emf.cdo.tests.legacy.model6.impl.RootImpl#getListD <em>List D</em>}</li>

  * </ul>

  * </p>

  * 

  * @generated

  */

-public class RootImpl extends EObjectImpl implements Root {

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public static final String copyright = "Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n   Eike Stepper - initial API and implementation";

+public class RootImpl extends EObjectImpl implements Root

+{

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  public static final String copyright = "Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n   Eike Stepper - initial API and implementation";

 

-	/**

-	 * The cached value of the '{@link #getListA() <em>List A</em>}' containment

-	 * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

-	 * @see #getListA()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<BaseObject> listA;

+  /**

+   * The cached value of the '{@link #getListA() <em>List A</em>}' containment reference list. <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * 

+   * @see #getListA()

+   * @generated

+   * @ordered

+   */

+  protected EList<BaseObject> listA;

 

-	/**

-	 * The cached value of the '{@link #getListB() <em>List B</em>}' containment

-	 * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

-	 * @see #getListB()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<BaseObject> listB;

+  /**

+   * The cached value of the '{@link #getListB() <em>List B</em>}' containment reference list. <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * 

+   * @see #getListB()

+   * @generated

+   * @ordered

+   */

+  protected EList<BaseObject> listB;

 

-	/**

-	 * The cached value of the '{@link #getListC() <em>List C</em>}' containment

-	 * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

-	 * @see #getListC()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<BaseObject> listC;

+  /**

+   * The cached value of the '{@link #getListC() <em>List C</em>}' containment reference list. <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * 

+   * @see #getListC()

+   * @generated

+   * @ordered

+   */

+  protected EList<BaseObject> listC;

 

-	/**

-	 * The cached value of the '{@link #getListD() <em>List D</em>}' containment

-	 * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

-	 * @see #getListD()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<BaseObject> listD;

+  /**

+   * The cached value of the '{@link #getListD() <em>List D</em>}' containment reference list. <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * 

+   * @see #getListD()

+   * @generated

+   * @ordered

+   */

+  protected EList<BaseObject> listD;

 

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	protected RootImpl() {

-		super();

-	}

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  protected RootImpl()

+  {

+    super();

+  }

 

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return Model6Package.eINSTANCE.getRoot();

-	}

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  @Override

+  protected EClass eStaticClass()

+  {

+    return Model6Package.eINSTANCE.getRoot();

+  }

 

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EList<BaseObject> getListA() {

-		if (listA == null) {

-			listA = new EObjectContainmentEList<BaseObject>(BaseObject.class,

-					this, Model6Package.ROOT__LIST_A);

-		}

-		return listA;

-	}

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  public EList<BaseObject> getListA()

+  {

+    if (listA == null)

+    {

+      listA = new EObjectContainmentEList<BaseObject>(BaseObject.class, this, Model6Package.ROOT__LIST_A);

+    }

+    return listA;

+  }

 

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EList<BaseObject> getListB() {

-		if (listB == null) {

-			listB = new EObjectContainmentEList<BaseObject>(BaseObject.class,

-					this, Model6Package.ROOT__LIST_B);

-		}

-		return listB;

-	}

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  public EList<BaseObject> getListB()

+  {

+    if (listB == null)

+    {

+      listB = new EObjectContainmentEList<BaseObject>(BaseObject.class, this, Model6Package.ROOT__LIST_B);

+    }

+    return listB;

+  }

 

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EList<BaseObject> getListC() {

-		if (listC == null) {

-			listC = new EObjectContainmentEList<BaseObject>(BaseObject.class,

-					this, Model6Package.ROOT__LIST_C);

-		}

-		return listC;

-	}

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  public EList<BaseObject> getListC()

+  {

+    if (listC == null)

+    {

+      listC = new EObjectContainmentEList<BaseObject>(BaseObject.class, this, Model6Package.ROOT__LIST_C);

+    }

+    return listC;

+  }

 

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EList<BaseObject> getListD() {

-		if (listD == null) {

-			listD = new EObjectContainmentEList<BaseObject>(BaseObject.class,

-					this, Model6Package.ROOT__LIST_D);

-		}

-		return listD;

-	}

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  public EList<BaseObject> getListD()

+  {

+    if (listD == null)

+    {

+      listD = new EObjectContainmentEList<BaseObject>(BaseObject.class, this, Model6Package.ROOT__LIST_D);

+    }

+    return listD;

+  }

 

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd,

-			int featureID, NotificationChain msgs) {

-		switch (featureID) {

-		case Model6Package.ROOT__LIST_A:

-			return ((InternalEList<?>) getListA()).basicRemove(otherEnd, msgs);

-		case Model6Package.ROOT__LIST_B:

-			return ((InternalEList<?>) getListB()).basicRemove(otherEnd, msgs);

-		case Model6Package.ROOT__LIST_C:

-			return ((InternalEList<?>) getListC()).basicRemove(otherEnd, msgs);

-		case Model6Package.ROOT__LIST_D:

-			return ((InternalEList<?>) getListD()).basicRemove(otherEnd, msgs);

-		}

-		return super.eInverseRemove(otherEnd, featureID, msgs);

-	}

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  @Override

+  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)

+  {

+    switch (featureID)

+    {

+    case Model6Package.ROOT__LIST_A:

+      return ((InternalEList<?>)getListA()).basicRemove(otherEnd, msgs);

+    case Model6Package.ROOT__LIST_B:

+      return ((InternalEList<?>)getListB()).basicRemove(otherEnd, msgs);

+    case Model6Package.ROOT__LIST_C:

+      return ((InternalEList<?>)getListC()).basicRemove(otherEnd, msgs);

+    case Model6Package.ROOT__LIST_D:

+      return ((InternalEList<?>)getListD()).basicRemove(otherEnd, msgs);

+    }

+    return super.eInverseRemove(otherEnd, featureID, msgs);

+  }

 

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID) {

-		case Model6Package.ROOT__LIST_A:

-			return getListA();

-		case Model6Package.ROOT__LIST_B:

-			return getListB();

-		case Model6Package.ROOT__LIST_C:

-			return getListC();

-		case Model6Package.ROOT__LIST_D:

-			return getListD();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  @Override

+  public Object eGet(int featureID, boolean resolve, boolean coreType)

+  {

+    switch (featureID)

+    {

+    case Model6Package.ROOT__LIST_A:

+      return getListA();

+    case Model6Package.ROOT__LIST_B:

+      return getListB();

+    case Model6Package.ROOT__LIST_C:

+      return getListC();

+    case Model6Package.ROOT__LIST_D:

+      return getListD();

+    }

+    return super.eGet(featureID, resolve, coreType);

+  }

 

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID) {

-		case Model6Package.ROOT__LIST_A:

-			getListA().clear();

-			getListA().addAll((Collection<? extends BaseObject>) newValue);

-			return;

-		case Model6Package.ROOT__LIST_B:

-			getListB().clear();

-			getListB().addAll((Collection<? extends BaseObject>) newValue);

-			return;

-		case Model6Package.ROOT__LIST_C:

-			getListC().clear();

-			getListC().addAll((Collection<? extends BaseObject>) newValue);

-			return;

-		case Model6Package.ROOT__LIST_D:

-			getListD().clear();

-			getListD().addAll((Collection<? extends BaseObject>) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  @SuppressWarnings("unchecked")

+  @Override

+  public void eSet(int featureID, Object newValue)

+  {

+    switch (featureID)

+    {

+    case Model6Package.ROOT__LIST_A:

+      getListA().clear();

+      getListA().addAll((Collection<? extends BaseObject>)newValue);

+      return;

+    case Model6Package.ROOT__LIST_B:

+      getListB().clear();

+      getListB().addAll((Collection<? extends BaseObject>)newValue);

+      return;

+    case Model6Package.ROOT__LIST_C:

+      getListC().clear();

+      getListC().addAll((Collection<? extends BaseObject>)newValue);

+      return;

+    case Model6Package.ROOT__LIST_D:

+      getListD().clear();

+      getListD().addAll((Collection<? extends BaseObject>)newValue);

+      return;

+    }

+    super.eSet(featureID, newValue);

+  }

 

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID) {

-		case Model6Package.ROOT__LIST_A:

-			getListA().clear();

-			return;

-		case Model6Package.ROOT__LIST_B:

-			getListB().clear();

-			return;

-		case Model6Package.ROOT__LIST_C:

-			getListC().clear();

-			return;

-		case Model6Package.ROOT__LIST_D:

-			getListD().clear();

-			return;

-		}

-		super.eUnset(featureID);

-	}

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  @Override

+  public void eUnset(int featureID)

+  {

+    switch (featureID)

+    {

+    case Model6Package.ROOT__LIST_A:

+      getListA().clear();

+      return;

+    case Model6Package.ROOT__LIST_B:

+      getListB().clear();

+      return;

+    case Model6Package.ROOT__LIST_C:

+      getListC().clear();

+      return;

+    case Model6Package.ROOT__LIST_D:

+      getListD().clear();

+      return;

+    }

+    super.eUnset(featureID);

+  }

 

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID) {

-		case Model6Package.ROOT__LIST_A:

-			return listA != null && !listA.isEmpty();

-		case Model6Package.ROOT__LIST_B:

-			return listB != null && !listB.isEmpty();

-		case Model6Package.ROOT__LIST_C:

-			return listC != null && !listC.isEmpty();

-		case Model6Package.ROOT__LIST_D:

-			return listD != null && !listD.isEmpty();

-		}

-		return super.eIsSet(featureID);

-	}

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  @Override

+  public boolean eIsSet(int featureID)

+  {

+    switch (featureID)

+    {

+    case Model6Package.ROOT__LIST_A:

+      return listA != null && !listA.isEmpty();

+    case Model6Package.ROOT__LIST_B:

+      return listB != null && !listB.isEmpty();

+    case Model6Package.ROOT__LIST_C:

+      return listC != null && !listC.isEmpty();

+    case Model6Package.ROOT__LIST_D:

+      return listD != null && !listD.isEmpty();

+    }

+    return super.eIsSet(featureID);

+  }

 

 } // RootImpl

diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/util/Model6AdapterFactory.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/util/Model6AdapterFactory.java
deleted file mode 100644
index 098f7bdef3..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/util/Model6AdapterFactory.java
+++ /dev/null
@@ -1,199 +0,0 @@
-/**

- * Copyright (c) 2004 - 2011 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.legacy.model6.util;

-

-import org.eclipse.emf.cdo.tests.legacy.model6.Model6Package;

-import org.eclipse.emf.cdo.tests.model6.BaseObject;

-import org.eclipse.emf.cdo.tests.model6.ContainmentObject;

-import org.eclipse.emf.cdo.tests.model6.ReferenceObject;

-import org.eclipse.emf.cdo.tests.model6.Root;

-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.legacy.model6.Model6Package

- * @generated

- */

-public class Model6AdapterFactory extends AdapterFactoryImpl {

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public static final String copyright = "Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n   Eike Stepper - initial API and implementation";

-

-	/**

-	 * The cached model package. <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	protected static Model6Package modelPackage;

-

-	/**

-	 * Creates an instance of the adapter factory. <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public Model6AdapterFactory() {

-		if (modelPackage == null) {

-			modelPackage = Model6Package.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 Model6Switch<Adapter> modelSwitch = new Model6Switch<Adapter>() {

-		@Override

-		public Adapter caseRoot(Root object) {

-			return createRootAdapter();

-		}

-

-		@Override

-		public Adapter caseBaseObject(BaseObject object) {

-			return createBaseObjectAdapter();

-		}

-

-		@Override

-		public Adapter caseReferenceObject(ReferenceObject object) {

-			return createReferenceObjectAdapter();

-		}

-

-		@Override

-		public Adapter caseContainmentObject(ContainmentObject object) {

-			return createContainmentObjectAdapter();

-		}

-

-		@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.legacy.model6.Root <em>Root</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.legacy.model6.Root

-	 * @generated

-	 */

-	public Adapter createRootAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '

-	 * {@link org.eclipse.emf.cdo.tests.legacy.model6.BaseObject

-	 * <em>Base Object</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.legacy.model6.BaseObject

-	 * @generated

-	 */

-	public Adapter createBaseObjectAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '

-	 * {@link org.eclipse.emf.cdo.tests.legacy.model6.ReferenceObject

-	 * <em>Reference Object</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.legacy.model6.ReferenceObject

-	 * @generated

-	 */

-	public Adapter createReferenceObjectAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '

-	 * {@link org.eclipse.emf.cdo.tests.legacy.model6.ContainmentObject

-	 * <em>Containment Object</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.legacy.model6.ContainmentObject

-	 * @generated

-	 */

-	public Adapter createContainmentObjectAdapter() {

-		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;

-	}

-

-} // Model6AdapterFactory

diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/util/Model6Switch.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/util/Model6Switch.java
deleted file mode 100644
index 7798ee8bc3..0000000000
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/util/Model6Switch.java
+++ /dev/null
@@ -1,226 +0,0 @@
-/**

- * Copyright (c) 2004 - 2011 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.legacy.model6.util;

-

-import java.util.List;

-

-import org.eclipse.emf.cdo.tests.legacy.model6.Model6Package;

-import org.eclipse.emf.cdo.tests.model6.BaseObject;

-import org.eclipse.emf.cdo.tests.model6.ContainmentObject;

-import org.eclipse.emf.cdo.tests.model6.ReferenceObject;

-import org.eclipse.emf.cdo.tests.model6.Root;

-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.legacy.model6.Model6Package

- * @generated

- */

-public class Model6Switch<T> {

-	/**

-	 * <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public static final String copyright = "Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n   Eike Stepper - initial API and implementation";

-

-	/**

-	 * The cached model package <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	protected static Model6Package modelPackage;

-

-	/**

-	 * Creates an instance of the switch. <!-- begin-user-doc --> <!--

-	 * end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public Model6Switch() {

-		if (modelPackage == null) {

-			modelPackage = Model6Package.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 Model6Package.ROOT: {

-			Root root = (Root) theEObject;

-			T result = caseRoot(root);

-			if (result == null)

-				result = defaultCase(theEObject);

-			return result;

-		}

-		case Model6Package.BASE_OBJECT: {

-			BaseObject baseObject = (BaseObject) theEObject;

-			T result = caseBaseObject(baseObject);

-			if (result == null)

-				result = defaultCase(theEObject);

-			return result;

-		}

-		case Model6Package.REFERENCE_OBJECT: {

-			ReferenceObject referenceObject = (ReferenceObject) theEObject;

-			T result = caseReferenceObject(referenceObject);

-			if (result == null)

-				result = caseBaseObject(referenceObject);

-			if (result == null)

-				result = defaultCase(theEObject);

-			return result;

-		}

-		case Model6Package.CONTAINMENT_OBJECT: {

-			ContainmentObject containmentObject = (ContainmentObject) theEObject;

-			T result = caseContainmentObject(containmentObject);

-			if (result == null)

-				result = caseBaseObject(containmentObject);

-			if (result == null)

-				result = defaultCase(theEObject);

-			return result;

-		}

-		default:

-			return defaultCase(theEObject);

-		}

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '

-	 * <em>Root</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>Root</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseRoot(Root object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '

-	 * <em>Base Object</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>Base Object</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseBaseObject(BaseObject object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '

-	 * <em>Reference Object</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>Reference Object</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseReferenceObject(ReferenceObject object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '

-	 * <em>Containment Object</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>Containment Object</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseContainmentObject(ContainmentObject 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;

-	}

-

-} // Model6Switch

diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/BaseObject.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/BaseObject.java
index 2babf0cbcf..366f1d7850 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/BaseObject.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/BaseObject.java
@@ -11,94 +11,93 @@
 package org.eclipse.emf.cdo.tests.model6;

 

 import org.eclipse.emf.common.util.EList;

-

 import org.eclipse.emf.ecore.EObject;

 

 /**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Base Object</b></em>'.

- * <!-- end-user-doc -->

- *

+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Base Object</b></em>'. <!-- end-user-doc -->

  * <p>

  * The following features are supported:

  * <ul>

- *   <li>{@link org.eclipse.emf.cdo.tests.model6.BaseObject#getAttributeOptional <em>Attribute Optional</em>}</li>

- *   <li>{@link org.eclipse.emf.cdo.tests.model6.BaseObject#getAttributeRequired <em>Attribute Required</em>}</li>

- *   <li>{@link org.eclipse.emf.cdo.tests.model6.BaseObject#getAttributeList <em>Attribute List</em>}</li>

+ * <li>{@link org.eclipse.emf.cdo.tests.model6.BaseObject#getAttributeOptional <em>Attribute Optional</em>}</li>

+ * <li>{@link org.eclipse.emf.cdo.tests.model6.BaseObject#getAttributeRequired <em>Attribute Required</em>}</li>

+ * <li>{@link org.eclipse.emf.cdo.tests.model6.BaseObject#getAttributeList <em>Attribute List</em>}</li>

  * </ul>

  * </p>

- *

+ * 

  * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getBaseObject()

  * @model

  * @generated

  */

-public interface BaseObject extends EObject {

-	/**

-	 * Returns the value of the '<em><b>Attribute Optional</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Attribute Optional</em>' attribute isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * @return the value of the '<em>Attribute Optional</em>' attribute.

-	 * @see #setAttributeOptional(String)

-	 * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getBaseObject_AttributeOptional()

-	 * @model

-	 * @generated

-	 */

-	String getAttributeOptional();

+public interface BaseObject extends EObject

+{

+  /**

+   * Returns the value of the '<em><b>Attribute Optional</b></em>' attribute. <!-- begin-user-doc -->

+   * <p>

+   * If the meaning of the '<em>Attribute Optional</em>' attribute isn't clear, there really should be more of a

+   * description here...

+   * </p>

+   * <!-- end-user-doc -->

+   * 

+   * @return the value of the '<em>Attribute Optional</em>' attribute.

+   * @see #setAttributeOptional(String)

+   * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getBaseObject_AttributeOptional()

+   * @model

+   * @generated

+   */

+  String getAttributeOptional();

 

-	/**

-	 * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model6.BaseObject#getAttributeOptional <em>Attribute Optional</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Attribute Optional</em>' attribute.

-	 * @see #getAttributeOptional()

-	 * @generated

-	 */

-	void setAttributeOptional(String value);

+  /**

+   * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model6.BaseObject#getAttributeOptional

+   * <em>Attribute Optional</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @param value

+   *          the new value of the '<em>Attribute Optional</em>' attribute.

+   * @see #getAttributeOptional()

+   * @generated

+   */

+  void setAttributeOptional(String value);

 

-	/**

-	 * Returns the value of the '<em><b>Attribute Required</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Attribute Required</em>' attribute isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * @return the value of the '<em>Attribute Required</em>' attribute.

-	 * @see #setAttributeRequired(String)

-	 * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getBaseObject_AttributeRequired()

-	 * @model required="true"

-	 * @generated

-	 */

-	String getAttributeRequired();

+  /**

+   * Returns the value of the '<em><b>Attribute Required</b></em>' attribute. <!-- begin-user-doc -->

+   * <p>

+   * If the meaning of the '<em>Attribute Required</em>' attribute isn't clear, there really should be more of a

+   * description here...

+   * </p>

+   * <!-- end-user-doc -->

+   * 

+   * @return the value of the '<em>Attribute Required</em>' attribute.

+   * @see #setAttributeRequired(String)

+   * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getBaseObject_AttributeRequired()

+   * @model required="true"

+   * @generated

+   */

+  String getAttributeRequired();

 

-	/**

-	 * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model6.BaseObject#getAttributeRequired <em>Attribute Required</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Attribute Required</em>' attribute.

-	 * @see #getAttributeRequired()

-	 * @generated

-	 */

-	void setAttributeRequired(String value);

+  /**

+   * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model6.BaseObject#getAttributeRequired

+   * <em>Attribute Required</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @param value

+   *          the new value of the '<em>Attribute Required</em>' attribute.

+   * @see #getAttributeRequired()

+   * @generated

+   */

+  void setAttributeRequired(String value);

 

-	/**

-	 * Returns the value of the '<em><b>Attribute List</b></em>' attribute list.

-	 * The list contents are of type {@link java.lang.String}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Attribute List</em>' attribute list isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * @return the value of the '<em>Attribute List</em>' attribute list.

-	 * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getBaseObject_AttributeList()

-	 * @model

-	 * @generated

-	 */

-	EList<String> getAttributeList();

+  /**

+   * Returns the value of the '<em><b>Attribute List</b></em>' attribute list. The list contents are of type

+   * {@link java.lang.String}. <!-- begin-user-doc -->

+   * <p>

+   * If the meaning of the '<em>Attribute List</em>' attribute list isn't clear, there really should be more of a

+   * description here...

+   * </p>

+   * <!-- end-user-doc -->

+   * 

+   * @return the value of the '<em>Attribute List</em>' attribute list.

+   * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getBaseObject_AttributeList()

+   * @model

+   * @generated

+   */

+  EList<String> getAttributeList();

 

 } // BaseObject

diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/ContainmentObject.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/ContainmentObject.java
index 292a1db804..8a7c5c9ec5 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/ContainmentObject.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/ContainmentObject.java
@@ -13,63 +13,63 @@ package org.eclipse.emf.cdo.tests.model6;
 import org.eclipse.emf.common.util.EList;

 

 /**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Containment Object</b></em>'.

- * <!-- end-user-doc -->

- *

+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Containment Object</b></em>'. <!-- end-user-doc

+ * -->

  * <p>

  * The following features are supported:

  * <ul>

- *   <li>{@link org.eclipse.emf.cdo.tests.model6.ContainmentObject#getContainmentOptional <em>Containment Optional</em>}</li>

- *   <li>{@link org.eclipse.emf.cdo.tests.model6.ContainmentObject#getContainmentList <em>Containment List</em>}</li>

+ * <li>{@link org.eclipse.emf.cdo.tests.model6.ContainmentObject#getContainmentOptional <em>Containment Optional</em>}</li>

+ * <li>{@link org.eclipse.emf.cdo.tests.model6.ContainmentObject#getContainmentList <em>Containment List</em>}</li>

  * </ul>

  * </p>

- *

+ * 

  * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getContainmentObject()

  * @model

  * @generated

  */

-public interface ContainmentObject extends BaseObject {

-	/**

-	 * Returns the value of the '<em><b>Containment Optional</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Containment Optional</em>' containment reference isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * @return the value of the '<em>Containment Optional</em>' containment reference.

-	 * @see #setContainmentOptional(BaseObject)

-	 * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getContainmentObject_ContainmentOptional()

-	 * @model containment="true"

-	 * @generated

-	 */

-	BaseObject getContainmentOptional();

+public interface ContainmentObject extends BaseObject

+{

+  /**

+   * Returns the value of the '<em><b>Containment Optional</b></em>' containment reference. <!-- begin-user-doc -->

+   * <p>

+   * If the meaning of the '<em>Containment Optional</em>' containment reference isn't clear, there really should be

+   * more of a description here...

+   * </p>

+   * <!-- end-user-doc -->

+   * 

+   * @return the value of the '<em>Containment Optional</em>' containment reference.

+   * @see #setContainmentOptional(BaseObject)

+   * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getContainmentObject_ContainmentOptional()

+   * @model containment="true"

+   * @generated

+   */

+  BaseObject getContainmentOptional();

 

-	/**

-	 * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model6.ContainmentObject#getContainmentOptional <em>Containment Optional</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Containment Optional</em>' containment reference.

-	 * @see #getContainmentOptional()

-	 * @generated

-	 */

-	void setContainmentOptional(BaseObject value);

+  /**

+   * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model6.ContainmentObject#getContainmentOptional

+   * <em>Containment Optional</em>}' containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @param value

+   *          the new value of the '<em>Containment Optional</em>' containment reference.

+   * @see #getContainmentOptional()

+   * @generated

+   */

+  void setContainmentOptional(BaseObject value);

 

-	/**

-	 * Returns the value of the '<em><b>Containment List</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.emf.cdo.tests.model6.BaseObject}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Containment List</em>' containment reference list isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * @return the value of the '<em>Containment List</em>' containment reference list.

-	 * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getContainmentObject_ContainmentList()

-	 * @model containment="true"

-	 * @generated

-	 */

-	EList<BaseObject> getContainmentList();

+  /**

+   * Returns the value of the '<em><b>Containment List</b></em>' containment reference list. The list contents are of

+   * type {@link org.eclipse.emf.cdo.tests.model6.BaseObject}. <!-- begin-user-doc -->

+   * <p>

+   * If the meaning of the '<em>Containment List</em>' containment reference list isn't clear, there really should be

+   * more of a description here...

+   * </p>

+   * <!-- end-user-doc -->

+   * 

+   * @return the value of the '<em>Containment List</em>' containment reference list.

+   * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getContainmentObject_ContainmentList()

+   * @model containment="true"

+   * @generated

+   */

+  EList<BaseObject> getContainmentList();

 

 } // ContainmentObject

diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/Model6Factory.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/Model6Factory.java
index f6d1f6ffc6..44dc4a531f 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/Model6Factory.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/Model6Factory.java
@@ -13,66 +13,59 @@ package org.eclipse.emf.cdo.tests.model6;
 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 -->

+ * <!-- 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.model6.Model6Package

  * @generated

  */

-public interface Model6Factory extends EFactory {

-	/**

-	 * The singleton instance of the factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	Model6Factory eINSTANCE = org.eclipse.emf.cdo.tests.model6.impl.Model6FactoryImpl

-			.init();

+public interface Model6Factory extends EFactory

+{

+  /**

+   * The singleton instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  Model6Factory eINSTANCE = org.eclipse.emf.cdo.tests.model6.impl.Model6FactoryImpl.init();

 

-	/**

-	 * Returns a new object of class '<em>Root</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return a new object of class '<em>Root</em>'.

-	 * @generated

-	 */

-	Root createRoot();

+  /**

+   * Returns a new object of class '<em>Root</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @return a new object of class '<em>Root</em>'.

+   * @generated

+   */

+  Root createRoot();

 

-	/**

-	 * Returns a new object of class '<em>Base Object</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return a new object of class '<em>Base Object</em>'.

-	 * @generated

-	 */

-	BaseObject createBaseObject();

+  /**

+   * Returns a new object of class '<em>Base Object</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @return a new object of class '<em>Base Object</em>'.

+   * @generated

+   */

+  BaseObject createBaseObject();

 

-	/**

-	 * Returns a new object of class '<em>Reference Object</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return a new object of class '<em>Reference Object</em>'.

-	 * @generated

-	 */

-	ReferenceObject createReferenceObject();

+  /**

+   * Returns a new object of class '<em>Reference Object</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @return a new object of class '<em>Reference Object</em>'.

+   * @generated

+   */

+  ReferenceObject createReferenceObject();

 

-	/**

-	 * Returns a new object of class '<em>Containment Object</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return a new object of class '<em>Containment Object</em>'.

-	 * @generated

-	 */

-	ContainmentObject createContainmentObject();

+  /**

+   * Returns a new object of class '<em>Containment Object</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @return a new object of class '<em>Containment Object</em>'.

+   * @generated

+   */

+  ContainmentObject createContainmentObject();

 

-	/**

-	 * Returns the package supported by this factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the package supported by this factory.

-	 * @generated

-	 */

-	Model6Package getModel6Package();

+  /**

+   * Returns the package supported by this factory. <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @return the package supported by this factory.

+   * @generated

+   */

+  Model6Package getModel6Package();

 

-} //Model6Factory

+} // Model6Factory

diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/Model6Package.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/Model6Package.java
index 56d9ac6d62..723ec495ac 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/Model6Package.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/Model6Package.java
@@ -16,601 +16,593 @@ import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EReference;

 

 /**

- * <!-- begin-user-doc -->

- * The <b>Package</b> for the model.

- * It contains accessors for the meta objects to represent

+ * <!-- begin-user-doc --> The <b>Package</b> for the model. It contains accessors for the meta objects to represent

  * <ul>

- *   <li>each class,</li>

- *   <li>each feature of each class,</li>

- *   <li>each enum,</li>

- *   <li>and each data type</li>

+ * <li>each class,</li>

+ * <li>each feature of each class,</li>

+ * <li>each enum,</li>

+ * <li>and each data type</li>

  * </ul>

  * <!-- end-user-doc -->

+ * 

  * @see org.eclipse.emf.cdo.tests.model6.Model6Factory

  * @model kind="package"

  * @generated

  */

-public interface Model6Package extends EPackage {

-	/**

-	 * The package name.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	String eNAME = "model6";

-

-	/**

-	 * The package namespace URI.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	String eNS_URI = "http://www.eclipse.org/emf/CDO/tests/model6/1.0.0";

-

-	/**

-	 * The package namespace name.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	String eNS_PREFIX = "model6";

-

-	/**

-	 * The singleton instance of the package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	Model6Package eINSTANCE = org.eclipse.emf.cdo.tests.model6.impl.Model6PackageImpl

-			.init();

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model6.impl.RootImpl <em>Root</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.emf.cdo.tests.model6.impl.RootImpl

-	 * @see org.eclipse.emf.cdo.tests.model6.impl.Model6PackageImpl#getRoot()

-	 * @generated

-	 */

-	int ROOT = 0;

-

-	/**

-	 * The feature id for the '<em><b>List A</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ROOT__LIST_A = 0;

-

-	/**

-	 * The feature id for the '<em><b>List B</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ROOT__LIST_B = 1;

-

-	/**

-	 * The feature id for the '<em><b>List C</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ROOT__LIST_C = 2;

-

-	/**

-	 * The feature id for the '<em><b>List D</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ROOT__LIST_D = 3;

-

-	/**

-	 * The number of structural features of the '<em>Root</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int ROOT_FEATURE_COUNT = 4;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model6.impl.BaseObjectImpl <em>Base Object</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.emf.cdo.tests.model6.impl.BaseObjectImpl

-	 * @see org.eclipse.emf.cdo.tests.model6.impl.Model6PackageImpl#getBaseObject()

-	 * @generated

-	 */

-	int BASE_OBJECT = 1;

-

-	/**

-	 * The feature id for the '<em><b>Attribute Optional</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int BASE_OBJECT__ATTRIBUTE_OPTIONAL = 0;

-

-	/**

-	 * The feature id for the '<em><b>Attribute Required</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int BASE_OBJECT__ATTRIBUTE_REQUIRED = 1;

-

-	/**

-	 * The feature id for the '<em><b>Attribute List</b></em>' attribute list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int BASE_OBJECT__ATTRIBUTE_LIST = 2;

-

-	/**

-	 * The number of structural features of the '<em>Base Object</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int BASE_OBJECT_FEATURE_COUNT = 3;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model6.impl.ReferenceObjectImpl <em>Reference Object</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.emf.cdo.tests.model6.impl.ReferenceObjectImpl

-	 * @see org.eclipse.emf.cdo.tests.model6.impl.Model6PackageImpl#getReferenceObject()

-	 * @generated

-	 */

-	int REFERENCE_OBJECT = 2;

-

-	/**

-	 * The feature id for the '<em><b>Attribute Optional</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int REFERENCE_OBJECT__ATTRIBUTE_OPTIONAL = BASE_OBJECT__ATTRIBUTE_OPTIONAL;

-

-	/**

-	 * The feature id for the '<em><b>Attribute Required</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int REFERENCE_OBJECT__ATTRIBUTE_REQUIRED = BASE_OBJECT__ATTRIBUTE_REQUIRED;

-

-	/**

-	 * The feature id for the '<em><b>Attribute List</b></em>' attribute list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int REFERENCE_OBJECT__ATTRIBUTE_LIST = BASE_OBJECT__ATTRIBUTE_LIST;

-

-	/**

-	 * The feature id for the '<em><b>Reference Optional</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int REFERENCE_OBJECT__REFERENCE_OPTIONAL = BASE_OBJECT_FEATURE_COUNT + 0;

-

-	/**

-	 * The feature id for the '<em><b>Reference List</b></em>' reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int REFERENCE_OBJECT__REFERENCE_LIST = BASE_OBJECT_FEATURE_COUNT + 1;

-

-	/**

-	 * The number of structural features of the '<em>Reference Object</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int REFERENCE_OBJECT_FEATURE_COUNT = BASE_OBJECT_FEATURE_COUNT + 2;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model6.impl.ContainmentObjectImpl <em>Containment Object</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.emf.cdo.tests.model6.impl.ContainmentObjectImpl

-	 * @see org.eclipse.emf.cdo.tests.model6.impl.Model6PackageImpl#getContainmentObject()

-	 * @generated

-	 */

-	int CONTAINMENT_OBJECT = 3;

-

-	/**

-	 * The feature id for the '<em><b>Attribute Optional</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int CONTAINMENT_OBJECT__ATTRIBUTE_OPTIONAL = BASE_OBJECT__ATTRIBUTE_OPTIONAL;

-

-	/**

-	 * The feature id for the '<em><b>Attribute Required</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int CONTAINMENT_OBJECT__ATTRIBUTE_REQUIRED = BASE_OBJECT__ATTRIBUTE_REQUIRED;

-

-	/**

-	 * The feature id for the '<em><b>Attribute List</b></em>' attribute list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int CONTAINMENT_OBJECT__ATTRIBUTE_LIST = BASE_OBJECT__ATTRIBUTE_LIST;

-

-	/**

-	 * The feature id for the '<em><b>Containment Optional</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int CONTAINMENT_OBJECT__CONTAINMENT_OPTIONAL = BASE_OBJECT_FEATURE_COUNT + 0;

-

-	/**

-	 * The feature id for the '<em><b>Containment List</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int CONTAINMENT_OBJECT__CONTAINMENT_LIST = BASE_OBJECT_FEATURE_COUNT + 1;

-

-	/**

-	 * The number of structural features of the '<em>Containment Object</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int CONTAINMENT_OBJECT_FEATURE_COUNT = BASE_OBJECT_FEATURE_COUNT + 2;

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model6.Root <em>Root</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for class '<em>Root</em>'.

-	 * @see org.eclipse.emf.cdo.tests.model6.Root

-	 * @generated

-	 */

-	EClass getRoot();

-

-	/**

-	 * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.model6.Root#getListA <em>List A</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the containment reference list '<em>List A</em>'.

-	 * @see org.eclipse.emf.cdo.tests.model6.Root#getListA()

-	 * @see #getRoot()

-	 * @generated

-	 */

-	EReference getRoot_ListA();

-

-	/**

-	 * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.model6.Root#getListB <em>List B</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the containment reference list '<em>List B</em>'.

-	 * @see org.eclipse.emf.cdo.tests.model6.Root#getListB()

-	 * @see #getRoot()

-	 * @generated

-	 */

-	EReference getRoot_ListB();

-

-	/**

-	 * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.model6.Root#getListC <em>List C</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the containment reference list '<em>List C</em>'.

-	 * @see org.eclipse.emf.cdo.tests.model6.Root#getListC()

-	 * @see #getRoot()

-	 * @generated

-	 */

-	EReference getRoot_ListC();

-

-	/**

-	 * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.model6.Root#getListD <em>List D</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the containment reference list '<em>List D</em>'.

-	 * @see org.eclipse.emf.cdo.tests.model6.Root#getListD()

-	 * @see #getRoot()

-	 * @generated

-	 */

-	EReference getRoot_ListD();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model6.BaseObject <em>Base Object</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for class '<em>Base Object</em>'.

-	 * @see org.eclipse.emf.cdo.tests.model6.BaseObject

-	 * @generated

-	 */

-	EClass getBaseObject();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model6.BaseObject#getAttributeOptional <em>Attribute Optional</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the attribute '<em>Attribute Optional</em>'.

-	 * @see org.eclipse.emf.cdo.tests.model6.BaseObject#getAttributeOptional()

-	 * @see #getBaseObject()

-	 * @generated

-	 */

-	EAttribute getBaseObject_AttributeOptional();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model6.BaseObject#getAttributeRequired <em>Attribute Required</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the attribute '<em>Attribute Required</em>'.

-	 * @see org.eclipse.emf.cdo.tests.model6.BaseObject#getAttributeRequired()

-	 * @see #getBaseObject()

-	 * @generated

-	 */

-	EAttribute getBaseObject_AttributeRequired();

-

-	/**

-	 * Returns the meta object for the attribute list '{@link org.eclipse.emf.cdo.tests.model6.BaseObject#getAttributeList <em>Attribute List</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the attribute list '<em>Attribute List</em>'.

-	 * @see org.eclipse.emf.cdo.tests.model6.BaseObject#getAttributeList()

-	 * @see #getBaseObject()

-	 * @generated

-	 */

-	EAttribute getBaseObject_AttributeList();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model6.ReferenceObject <em>Reference Object</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for class '<em>Reference Object</em>'.

-	 * @see org.eclipse.emf.cdo.tests.model6.ReferenceObject

-	 * @generated

-	 */

-	EClass getReferenceObject();

-

-	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.tests.model6.ReferenceObject#getReferenceOptional <em>Reference Optional</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the reference '<em>Reference Optional</em>'.

-	 * @see org.eclipse.emf.cdo.tests.model6.ReferenceObject#getReferenceOptional()

-	 * @see #getReferenceObject()

-	 * @generated

-	 */

-	EReference getReferenceObject_ReferenceOptional();

-

-	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.emf.cdo.tests.model6.ReferenceObject#getReferenceList <em>Reference List</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the reference list '<em>Reference List</em>'.

-	 * @see org.eclipse.emf.cdo.tests.model6.ReferenceObject#getReferenceList()

-	 * @see #getReferenceObject()

-	 * @generated

-	 */

-	EReference getReferenceObject_ReferenceList();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model6.ContainmentObject <em>Containment Object</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for class '<em>Containment Object</em>'.

-	 * @see org.eclipse.emf.cdo.tests.model6.ContainmentObject

-	 * @generated

-	 */

-	EClass getContainmentObject();

-

-	/**

-	 * Returns the meta object for the containment reference '{@link org.eclipse.emf.cdo.tests.model6.ContainmentObject#getContainmentOptional <em>Containment Optional</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the containment reference '<em>Containment Optional</em>'.

-	 * @see org.eclipse.emf.cdo.tests.model6.ContainmentObject#getContainmentOptional()

-	 * @see #getContainmentObject()

-	 * @generated

-	 */

-	EReference getContainmentObject_ContainmentOptional();

-

-	/**

-	 * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.model6.ContainmentObject#getContainmentList <em>Containment List</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the meta object for the containment reference list '<em>Containment List</em>'.

-	 * @see org.eclipse.emf.cdo.tests.model6.ContainmentObject#getContainmentList()

-	 * @see #getContainmentObject()

-	 * @generated

-	 */

-	EReference getContainmentObject_ContainmentList();

-

-	/**

-	 * Returns the factory that creates the instances of the model.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return the factory that creates the instances of the model.

-	 * @generated

-	 */

-	Model6Factory getModel6Factory();

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * Defines literals for the meta objects that represent

-	 * <ul>

-	 *   <li>each class,</li>

-	 *   <li>each feature of each class,</li>

-	 *   <li>each enum,</li>

-	 *   <li>and each data type</li>

-	 * </ul>

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	interface Literals {

-		/**

-		 * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model6.impl.RootImpl <em>Root</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @see org.eclipse.emf.cdo.tests.model6.impl.RootImpl

-		 * @see org.eclipse.emf.cdo.tests.model6.impl.Model6PackageImpl#getRoot()

-		 * @generated

-		 */

-		EClass ROOT = eINSTANCE.getRoot();

-

-		/**

-		 * The meta object literal for the '<em><b>List A</b></em>' containment reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EReference ROOT__LIST_A = eINSTANCE.getRoot_ListA();

-

-		/**

-		 * The meta object literal for the '<em><b>List B</b></em>' containment reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EReference ROOT__LIST_B = eINSTANCE.getRoot_ListB();

-

-		/**

-		 * The meta object literal for the '<em><b>List C</b></em>' containment reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EReference ROOT__LIST_C = eINSTANCE.getRoot_ListC();

-

-		/**

-		 * The meta object literal for the '<em><b>List D</b></em>' containment reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EReference ROOT__LIST_D = eINSTANCE.getRoot_ListD();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model6.impl.BaseObjectImpl <em>Base Object</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @see org.eclipse.emf.cdo.tests.model6.impl.BaseObjectImpl

-		 * @see org.eclipse.emf.cdo.tests.model6.impl.Model6PackageImpl#getBaseObject()

-		 * @generated

-		 */

-		EClass BASE_OBJECT = eINSTANCE.getBaseObject();

-

-		/**

-		 * The meta object literal for the '<em><b>Attribute Optional</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EAttribute BASE_OBJECT__ATTRIBUTE_OPTIONAL = eINSTANCE

-				.getBaseObject_AttributeOptional();

-

-		/**

-		 * The meta object literal for the '<em><b>Attribute Required</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EAttribute BASE_OBJECT__ATTRIBUTE_REQUIRED = eINSTANCE

-				.getBaseObject_AttributeRequired();

-

-		/**

-		 * The meta object literal for the '<em><b>Attribute List</b></em>' attribute list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EAttribute BASE_OBJECT__ATTRIBUTE_LIST = eINSTANCE

-				.getBaseObject_AttributeList();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model6.impl.ReferenceObjectImpl <em>Reference Object</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @see org.eclipse.emf.cdo.tests.model6.impl.ReferenceObjectImpl

-		 * @see org.eclipse.emf.cdo.tests.model6.impl.Model6PackageImpl#getReferenceObject()

-		 * @generated

-		 */

-		EClass REFERENCE_OBJECT = eINSTANCE.getReferenceObject();

-

-		/**

-		 * The meta object literal for the '<em><b>Reference Optional</b></em>' reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EReference REFERENCE_OBJECT__REFERENCE_OPTIONAL = eINSTANCE

-				.getReferenceObject_ReferenceOptional();

-

-		/**

-		 * The meta object literal for the '<em><b>Reference List</b></em>' reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EReference REFERENCE_OBJECT__REFERENCE_LIST = eINSTANCE

-				.getReferenceObject_ReferenceList();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model6.impl.ContainmentObjectImpl <em>Containment Object</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @see org.eclipse.emf.cdo.tests.model6.impl.ContainmentObjectImpl

-		 * @see org.eclipse.emf.cdo.tests.model6.impl.Model6PackageImpl#getContainmentObject()

-		 * @generated

-		 */

-		EClass CONTAINMENT_OBJECT = eINSTANCE.getContainmentObject();

-

-		/**

-		 * The meta object literal for the '<em><b>Containment Optional</b></em>' containment reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EReference CONTAINMENT_OBJECT__CONTAINMENT_OPTIONAL = eINSTANCE

-				.getContainmentObject_ContainmentOptional();

-

-		/**

-		 * The meta object literal for the '<em><b>Containment List</b></em>' containment reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @generated

-		 */

-		EReference CONTAINMENT_OBJECT__CONTAINMENT_LIST = eINSTANCE

-				.getContainmentObject_ContainmentList();

-

-	}

-

-} //Model6Package

+public interface Model6Package extends EPackage

+{

+  /**

+   * The package name. <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  String eNAME = "model6";

+

+  /**

+   * The package namespace URI. <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  String eNS_URI = "http://www.eclipse.org/emf/CDO/tests/model6/1.0.0";

+

+  /**

+   * The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  String eNS_PREFIX = "model6";

+

+  /**

+   * The singleton instance of the package. <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  Model6Package eINSTANCE = org.eclipse.emf.cdo.tests.model6.impl.Model6PackageImpl.init();

+

+  /**

+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model6.impl.RootImpl <em>Root</em>}' class. <!--

+   * begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @see org.eclipse.emf.cdo.tests.model6.impl.RootImpl

+   * @see org.eclipse.emf.cdo.tests.model6.impl.Model6PackageImpl#getRoot()

+   * @generated

+   */

+  int ROOT = 0;

+

+  /**

+   * The feature id for the '<em><b>List A</b></em>' containment reference list. <!-- begin-user-doc --> <!--

+   * end-user-doc -->

+   * 

+   * @generated

+   * @ordered

+   */

+  int ROOT__LIST_A = 0;

+

+  /**

+   * The feature id for the '<em><b>List B</b></em>' containment reference list. <!-- begin-user-doc --> <!--

+   * end-user-doc -->

+   * 

+   * @generated

+   * @ordered

+   */

+  int ROOT__LIST_B = 1;

+

+  /**

+   * The feature id for the '<em><b>List C</b></em>' containment reference list. <!-- begin-user-doc --> <!--

+   * end-user-doc -->

+   * 

+   * @generated

+   * @ordered

+   */

+  int ROOT__LIST_C = 2;

+

+  /**

+   * The feature id for the '<em><b>List D</b></em>' containment reference list. <!-- begin-user-doc --> <!--

+   * end-user-doc -->

+   * 

+   * @generated

+   * @ordered

+   */

+  int ROOT__LIST_D = 3;

+

+  /**

+   * The number of structural features of the '<em>Root</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   * @ordered

+   */

+  int ROOT_FEATURE_COUNT = 4;

+

+  /**

+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model6.impl.BaseObjectImpl <em>Base Object</em>}'

+   * class. <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @see org.eclipse.emf.cdo.tests.model6.impl.BaseObjectImpl

+   * @see org.eclipse.emf.cdo.tests.model6.impl.Model6PackageImpl#getBaseObject()

+   * @generated

+   */

+  int BASE_OBJECT = 1;

+

+  /**

+   * The feature id for the '<em><b>Attribute Optional</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc

+   * -->

+   * 

+   * @generated

+   * @ordered

+   */

+  int BASE_OBJECT__ATTRIBUTE_OPTIONAL = 0;

+

+  /**

+   * The feature id for the '<em><b>Attribute Required</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc

+   * -->

+   * 

+   * @generated

+   * @ordered

+   */

+  int BASE_OBJECT__ATTRIBUTE_REQUIRED = 1;

+

+  /**

+   * The feature id for the '<em><b>Attribute List</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc

+   * -->

+   * 

+   * @generated

+   * @ordered

+   */

+  int BASE_OBJECT__ATTRIBUTE_LIST = 2;

+

+  /**

+   * The number of structural features of the '<em>Base Object</em>' class. <!-- begin-user-doc --> <!-- end-user-doc

+   * -->

+   * 

+   * @generated

+   * @ordered

+   */

+  int BASE_OBJECT_FEATURE_COUNT = 3;

+

+  /**

+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model6.impl.ReferenceObjectImpl

+   * <em>Reference Object</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @see org.eclipse.emf.cdo.tests.model6.impl.ReferenceObjectImpl

+   * @see org.eclipse.emf.cdo.tests.model6.impl.Model6PackageImpl#getReferenceObject()

+   * @generated

+   */

+  int REFERENCE_OBJECT = 2;

+

+  /**

+   * The feature id for the '<em><b>Attribute Optional</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc

+   * -->

+   * 

+   * @generated

+   * @ordered

+   */

+  int REFERENCE_OBJECT__ATTRIBUTE_OPTIONAL = BASE_OBJECT__ATTRIBUTE_OPTIONAL;

+

+  /**

+   * The feature id for the '<em><b>Attribute Required</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc

+   * -->

+   * 

+   * @generated

+   * @ordered

+   */

+  int REFERENCE_OBJECT__ATTRIBUTE_REQUIRED = BASE_OBJECT__ATTRIBUTE_REQUIRED;

+

+  /**

+   * The feature id for the '<em><b>Attribute List</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc

+   * -->

+   * 

+   * @generated

+   * @ordered

+   */

+  int REFERENCE_OBJECT__ATTRIBUTE_LIST = BASE_OBJECT__ATTRIBUTE_LIST;

+

+  /**

+   * The feature id for the '<em><b>Reference Optional</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc

+   * -->

+   * 

+   * @generated

+   * @ordered

+   */

+  int REFERENCE_OBJECT__REFERENCE_OPTIONAL = BASE_OBJECT_FEATURE_COUNT + 0;

+

+  /**

+   * The feature id for the '<em><b>Reference List</b></em>' reference list. <!-- begin-user-doc --> <!-- end-user-doc

+   * -->

+   * 

+   * @generated

+   * @ordered

+   */

+  int REFERENCE_OBJECT__REFERENCE_LIST = BASE_OBJECT_FEATURE_COUNT + 1;

+

+  /**

+   * The number of structural features of the '<em>Reference Object</em>' class. <!-- begin-user-doc --> <!--

+   * end-user-doc -->

+   * 

+   * @generated

+   * @ordered

+   */

+  int REFERENCE_OBJECT_FEATURE_COUNT = BASE_OBJECT_FEATURE_COUNT + 2;

+

+  /**

+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model6.impl.ContainmentObjectImpl

+   * <em>Containment Object</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @see org.eclipse.emf.cdo.tests.model6.impl.ContainmentObjectImpl

+   * @see org.eclipse.emf.cdo.tests.model6.impl.Model6PackageImpl#getContainmentObject()

+   * @generated

+   */

+  int CONTAINMENT_OBJECT = 3;

+

+  /**

+   * The feature id for the '<em><b>Attribute Optional</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc

+   * -->

+   * 

+   * @generated

+   * @ordered

+   */

+  int CONTAINMENT_OBJECT__ATTRIBUTE_OPTIONAL = BASE_OBJECT__ATTRIBUTE_OPTIONAL;

+

+  /**

+   * The feature id for the '<em><b>Attribute Required</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc

+   * -->

+   * 

+   * @generated

+   * @ordered

+   */

+  int CONTAINMENT_OBJECT__ATTRIBUTE_REQUIRED = BASE_OBJECT__ATTRIBUTE_REQUIRED;

+

+  /**

+   * The feature id for the '<em><b>Attribute List</b></em>' attribute list. <!-- begin-user-doc --> <!-- end-user-doc

+   * -->

+   * 

+   * @generated

+   * @ordered

+   */

+  int CONTAINMENT_OBJECT__ATTRIBUTE_LIST = BASE_OBJECT__ATTRIBUTE_LIST;

+

+  /**

+   * The feature id for the '<em><b>Containment Optional</b></em>' containment reference. <!-- begin-user-doc --> <!--

+   * end-user-doc -->

+   * 

+   * @generated

+   * @ordered

+   */

+  int CONTAINMENT_OBJECT__CONTAINMENT_OPTIONAL = BASE_OBJECT_FEATURE_COUNT + 0;

+

+  /**

+   * The feature id for the '<em><b>Containment List</b></em>' containment reference list. <!-- begin-user-doc --> <!--

+   * end-user-doc -->

+   * 

+   * @generated

+   * @ordered

+   */

+  int CONTAINMENT_OBJECT__CONTAINMENT_LIST = BASE_OBJECT_FEATURE_COUNT + 1;

+

+  /**

+   * The number of structural features of the '<em>Containment Object</em>' class. <!-- begin-user-doc --> <!--

+   * end-user-doc -->

+   * 

+   * @generated

+   * @ordered

+   */

+  int CONTAINMENT_OBJECT_FEATURE_COUNT = BASE_OBJECT_FEATURE_COUNT + 2;

+

+  /**

+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model6.Root <em>Root</em>}'. <!--

+   * begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @return the meta object for class '<em>Root</em>'.

+   * @see org.eclipse.emf.cdo.tests.model6.Root

+   * @generated

+   */

+  EClass getRoot();

+

+  /**

+   * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.model6.Root#getListA

+   * <em>List A</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @return the meta object for the containment reference list '<em>List A</em>'.

+   * @see org.eclipse.emf.cdo.tests.model6.Root#getListA()

+   * @see #getRoot()

+   * @generated

+   */

+  EReference getRoot_ListA();

+

+  /**

+   * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.model6.Root#getListB

+   * <em>List B</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @return the meta object for the containment reference list '<em>List B</em>'.

+   * @see org.eclipse.emf.cdo.tests.model6.Root#getListB()

+   * @see #getRoot()

+   * @generated

+   */

+  EReference getRoot_ListB();

+

+  /**

+   * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.model6.Root#getListC

+   * <em>List C</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @return the meta object for the containment reference list '<em>List C</em>'.

+   * @see org.eclipse.emf.cdo.tests.model6.Root#getListC()

+   * @see #getRoot()

+   * @generated

+   */

+  EReference getRoot_ListC();

+

+  /**

+   * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.model6.Root#getListD

+   * <em>List D</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @return the meta object for the containment reference list '<em>List D</em>'.

+   * @see org.eclipse.emf.cdo.tests.model6.Root#getListD()

+   * @see #getRoot()

+   * @generated

+   */

+  EReference getRoot_ListD();

+

+  /**

+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model6.BaseObject <em>Base Object</em>}'. <!--

+   * begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @return the meta object for class '<em>Base Object</em>'.

+   * @see org.eclipse.emf.cdo.tests.model6.BaseObject

+   * @generated

+   */

+  EClass getBaseObject();

+

+  /**

+   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model6.BaseObject#getAttributeOptional

+   * <em>Attribute Optional</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @return the meta object for the attribute '<em>Attribute Optional</em>'.

+   * @see org.eclipse.emf.cdo.tests.model6.BaseObject#getAttributeOptional()

+   * @see #getBaseObject()

+   * @generated

+   */

+  EAttribute getBaseObject_AttributeOptional();

+

+  /**

+   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.model6.BaseObject#getAttributeRequired

+   * <em>Attribute Required</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @return the meta object for the attribute '<em>Attribute Required</em>'.

+   * @see org.eclipse.emf.cdo.tests.model6.BaseObject#getAttributeRequired()

+   * @see #getBaseObject()

+   * @generated

+   */

+  EAttribute getBaseObject_AttributeRequired();

+

+  /**

+   * Returns the meta object for the attribute list '

+   * {@link org.eclipse.emf.cdo.tests.model6.BaseObject#getAttributeList <em>Attribute List</em>}'. <!-- begin-user-doc

+   * --> <!-- end-user-doc -->

+   * 

+   * @return the meta object for the attribute list '<em>Attribute List</em>'.

+   * @see org.eclipse.emf.cdo.tests.model6.BaseObject#getAttributeList()

+   * @see #getBaseObject()

+   * @generated

+   */

+  EAttribute getBaseObject_AttributeList();

+

+  /**

+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model6.ReferenceObject

+   * <em>Reference Object</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @return the meta object for class '<em>Reference Object</em>'.

+   * @see org.eclipse.emf.cdo.tests.model6.ReferenceObject

+   * @generated

+   */

+  EClass getReferenceObject();

+

+  /**

+   * Returns the meta object for the reference '

+   * {@link org.eclipse.emf.cdo.tests.model6.ReferenceObject#getReferenceOptional <em>Reference Optional</em>}'. <!--

+   * begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @return the meta object for the reference '<em>Reference Optional</em>'.

+   * @see org.eclipse.emf.cdo.tests.model6.ReferenceObject#getReferenceOptional()

+   * @see #getReferenceObject()

+   * @generated

+   */

+  EReference getReferenceObject_ReferenceOptional();

+

+  /**

+   * Returns the meta object for the reference list '

+   * {@link org.eclipse.emf.cdo.tests.model6.ReferenceObject#getReferenceList <em>Reference List</em>}'. <!--

+   * begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @return the meta object for the reference list '<em>Reference List</em>'.

+   * @see org.eclipse.emf.cdo.tests.model6.ReferenceObject#getReferenceList()

+   * @see #getReferenceObject()

+   * @generated

+   */

+  EReference getReferenceObject_ReferenceList();

+

+  /**

+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model6.ContainmentObject

+   * <em>Containment Object</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @return the meta object for class '<em>Containment Object</em>'.

+   * @see org.eclipse.emf.cdo.tests.model6.ContainmentObject

+   * @generated

+   */

+  EClass getContainmentObject();

+

+  /**

+   * Returns the meta object for the containment reference '

+   * {@link org.eclipse.emf.cdo.tests.model6.ContainmentObject#getContainmentOptional <em>Containment Optional</em>}'.

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @return the meta object for the containment reference '<em>Containment Optional</em>'.

+   * @see org.eclipse.emf.cdo.tests.model6.ContainmentObject#getContainmentOptional()

+   * @see #getContainmentObject()

+   * @generated

+   */

+  EReference getContainmentObject_ContainmentOptional();

+

+  /**

+   * Returns the meta object for the containment reference list '

+   * {@link org.eclipse.emf.cdo.tests.model6.ContainmentObject#getContainmentList <em>Containment List</em>}'. <!--

+   * begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @return the meta object for the containment reference list '<em>Containment List</em>'.

+   * @see org.eclipse.emf.cdo.tests.model6.ContainmentObject#getContainmentList()

+   * @see #getContainmentObject()

+   * @generated

+   */

+  EReference getContainmentObject_ContainmentList();

+

+  /**

+   * Returns the factory that creates the instances of the model. <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @return the factory that creates the instances of the model.

+   * @generated

+   */

+  Model6Factory getModel6Factory();

+

+  /**

+   * <!-- begin-user-doc --> Defines literals for the meta objects that represent

+   * <ul>

+   * <li>each class,</li>

+   * <li>each feature of each class,</li>

+   * <li>each enum,</li>

+   * <li>and each data type</li>

+   * </ul>

+   * <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  interface Literals

+  {

+    /**

+     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model6.impl.RootImpl <em>Root</em>}' class.

+     * <!-- begin-user-doc --> <!-- end-user-doc -->

+     * 

+     * @see org.eclipse.emf.cdo.tests.model6.impl.RootImpl

+     * @see org.eclipse.emf.cdo.tests.model6.impl.Model6PackageImpl#getRoot()

+     * @generated

+     */

+    EClass ROOT = eINSTANCE.getRoot();

+

+    /**

+     * The meta object literal for the '<em><b>List A</b></em>' containment reference list feature. <!-- begin-user-doc

+     * --> <!-- end-user-doc -->

+     * 

+     * @generated

+     */

+    EReference ROOT__LIST_A = eINSTANCE.getRoot_ListA();

+

+    /**

+     * The meta object literal for the '<em><b>List B</b></em>' containment reference list feature. <!-- begin-user-doc

+     * --> <!-- end-user-doc -->

+     * 

+     * @generated

+     */

+    EReference ROOT__LIST_B = eINSTANCE.getRoot_ListB();

+

+    /**

+     * The meta object literal for the '<em><b>List C</b></em>' containment reference list feature. <!-- begin-user-doc

+     * --> <!-- end-user-doc -->

+     * 

+     * @generated

+     */

+    EReference ROOT__LIST_C = eINSTANCE.getRoot_ListC();

+

+    /**

+     * The meta object literal for the '<em><b>List D</b></em>' containment reference list feature. <!-- begin-user-doc

+     * --> <!-- end-user-doc -->

+     * 

+     * @generated

+     */

+    EReference ROOT__LIST_D = eINSTANCE.getRoot_ListD();

+

+    /**

+     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model6.impl.BaseObjectImpl

+     * <em>Base Object</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->

+     * 

+     * @see org.eclipse.emf.cdo.tests.model6.impl.BaseObjectImpl

+     * @see org.eclipse.emf.cdo.tests.model6.impl.Model6PackageImpl#getBaseObject()

+     * @generated

+     */

+    EClass BASE_OBJECT = eINSTANCE.getBaseObject();

+

+    /**

+     * The meta object literal for the '<em><b>Attribute Optional</b></em>' attribute feature. <!-- begin-user-doc -->

+     * <!-- end-user-doc -->

+     * 

+     * @generated

+     */

+    EAttribute BASE_OBJECT__ATTRIBUTE_OPTIONAL = eINSTANCE.getBaseObject_AttributeOptional();

+

+    /**

+     * The meta object literal for the '<em><b>Attribute Required</b></em>' attribute feature. <!-- begin-user-doc -->

+     * <!-- end-user-doc -->

+     * 

+     * @generated

+     */

+    EAttribute BASE_OBJECT__ATTRIBUTE_REQUIRED = eINSTANCE.getBaseObject_AttributeRequired();

+

+    /**

+     * The meta object literal for the '<em><b>Attribute List</b></em>' attribute list feature. <!-- begin-user-doc -->

+     * <!-- end-user-doc -->

+     * 

+     * @generated

+     */

+    EAttribute BASE_OBJECT__ATTRIBUTE_LIST = eINSTANCE.getBaseObject_AttributeList();

+

+    /**

+     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model6.impl.ReferenceObjectImpl

+     * <em>Reference Object</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->

+     * 

+     * @see org.eclipse.emf.cdo.tests.model6.impl.ReferenceObjectImpl

+     * @see org.eclipse.emf.cdo.tests.model6.impl.Model6PackageImpl#getReferenceObject()

+     * @generated

+     */

+    EClass REFERENCE_OBJECT = eINSTANCE.getReferenceObject();

+

+    /**

+     * The meta object literal for the '<em><b>Reference Optional</b></em>' reference feature. <!-- begin-user-doc -->

+     * <!-- end-user-doc -->

+     * 

+     * @generated

+     */

+    EReference REFERENCE_OBJECT__REFERENCE_OPTIONAL = eINSTANCE.getReferenceObject_ReferenceOptional();

+

+    /**

+     * The meta object literal for the '<em><b>Reference List</b></em>' reference list feature. <!-- begin-user-doc -->

+     * <!-- end-user-doc -->

+     * 

+     * @generated

+     */

+    EReference REFERENCE_OBJECT__REFERENCE_LIST = eINSTANCE.getReferenceObject_ReferenceList();

+

+    /**

+     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model6.impl.ContainmentObjectImpl

+     * <em>Containment Object</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->

+     * 

+     * @see org.eclipse.emf.cdo.tests.model6.impl.ContainmentObjectImpl

+     * @see org.eclipse.emf.cdo.tests.model6.impl.Model6PackageImpl#getContainmentObject()

+     * @generated

+     */

+    EClass CONTAINMENT_OBJECT = eINSTANCE.getContainmentObject();

+

+    /**

+     * The meta object literal for the '<em><b>Containment Optional</b></em>' containment reference feature. <!--

+     * begin-user-doc --> <!-- end-user-doc -->

+     * 

+     * @generated

+     */

+    EReference CONTAINMENT_OBJECT__CONTAINMENT_OPTIONAL = eINSTANCE.getContainmentObject_ContainmentOptional();

+

+    /**

+     * The meta object literal for the '<em><b>Containment List</b></em>' containment reference list feature. <!--

+     * begin-user-doc --> <!-- end-user-doc -->

+     * 

+     * @generated

+     */

+    EReference CONTAINMENT_OBJECT__CONTAINMENT_LIST = eINSTANCE.getContainmentObject_ContainmentList();

+

+  }

+

+} // Model6Package

diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/ReferenceObject.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/ReferenceObject.java
index ea3a039827..a9da3fb5e3 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/ReferenceObject.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/ReferenceObject.java
@@ -13,63 +13,63 @@ package org.eclipse.emf.cdo.tests.model6;
 import org.eclipse.emf.common.util.EList;

 

 /**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Reference Object</b></em>'.

- * <!-- end-user-doc -->

- *

+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Reference Object</b></em>'. <!-- end-user-doc

+ * -->

  * <p>

  * The following features are supported:

  * <ul>

- *   <li>{@link org.eclipse.emf.cdo.tests.model6.ReferenceObject#getReferenceOptional <em>Reference Optional</em>}</li>

- *   <li>{@link org.eclipse.emf.cdo.tests.model6.ReferenceObject#getReferenceList <em>Reference List</em>}</li>

+ * <li>{@link org.eclipse.emf.cdo.tests.model6.ReferenceObject#getReferenceOptional <em>Reference Optional</em>}</li>

+ * <li>{@link org.eclipse.emf.cdo.tests.model6.ReferenceObject#getReferenceList <em>Reference List</em>}</li>

  * </ul>

  * </p>

- *

+ * 

  * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getReferenceObject()

  * @model

  * @generated

  */

-public interface ReferenceObject extends BaseObject {

-	/**

-	 * Returns the value of the '<em><b>Reference Optional</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Reference Optional</em>' reference isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * @return the value of the '<em>Reference Optional</em>' reference.

-	 * @see #setReferenceOptional(BaseObject)

-	 * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getReferenceObject_ReferenceOptional()

-	 * @model

-	 * @generated

-	 */

-	BaseObject getReferenceOptional();

+public interface ReferenceObject extends BaseObject

+{

+  /**

+   * Returns the value of the '<em><b>Reference Optional</b></em>' reference. <!-- begin-user-doc -->

+   * <p>

+   * If the meaning of the '<em>Reference Optional</em>' reference isn't clear, there really should be more of a

+   * description here...

+   * </p>

+   * <!-- end-user-doc -->

+   * 

+   * @return the value of the '<em>Reference Optional</em>' reference.

+   * @see #setReferenceOptional(BaseObject)

+   * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getReferenceObject_ReferenceOptional()

+   * @model

+   * @generated

+   */

+  BaseObject getReferenceOptional();

 

-	/**

-	 * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model6.ReferenceObject#getReferenceOptional <em>Reference Optional</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param value the new value of the '<em>Reference Optional</em>' reference.

-	 * @see #getReferenceOptional()

-	 * @generated

-	 */

-	void setReferenceOptional(BaseObject value);

+  /**

+   * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model6.ReferenceObject#getReferenceOptional

+   * <em>Reference Optional</em>}' reference. <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @param value

+   *          the new value of the '<em>Reference Optional</em>' reference.

+   * @see #getReferenceOptional()

+   * @generated

+   */

+  void setReferenceOptional(BaseObject value);

 

-	/**

-	 * Returns the value of the '<em><b>Reference List</b></em>' reference list.

-	 * The list contents are of type {@link org.eclipse.emf.cdo.tests.model6.BaseObject}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Reference List</em>' reference list isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * @return the value of the '<em>Reference List</em>' reference list.

-	 * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getReferenceObject_ReferenceList()

-	 * @model

-	 * @generated

-	 */

-	EList<BaseObject> getReferenceList();

+  /**

+   * Returns the value of the '<em><b>Reference List</b></em>' reference list. The list contents are of type

+   * {@link org.eclipse.emf.cdo.tests.model6.BaseObject}. <!-- begin-user-doc -->

+   * <p>

+   * If the meaning of the '<em>Reference List</em>' reference list isn't clear, there really should be more of a

+   * description here...

+   * </p>

+   * <!-- end-user-doc -->

+   * 

+   * @return the value of the '<em>Reference List</em>' reference list.

+   * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getReferenceObject_ReferenceList()

+   * @model

+   * @generated

+   */

+  EList<BaseObject> getReferenceList();

 

 } // ReferenceObject

diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/Root.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/Root.java
index c12c9475f7..80c0f5dd23 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/Root.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/Root.java
@@ -11,91 +11,88 @@
 package org.eclipse.emf.cdo.tests.model6;

 

 import org.eclipse.emf.common.util.EList;

-

 import org.eclipse.emf.ecore.EObject;

 

 /**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Root</b></em>'.

- * <!-- end-user-doc -->

- *

+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Root</b></em>'. <!-- end-user-doc -->

  * <p>

  * The following features are supported:

  * <ul>

- *   <li>{@link org.eclipse.emf.cdo.tests.model6.Root#getListA <em>List A</em>}</li>

- *   <li>{@link org.eclipse.emf.cdo.tests.model6.Root#getListB <em>List B</em>}</li>

- *   <li>{@link org.eclipse.emf.cdo.tests.model6.Root#getListC <em>List C</em>}</li>

- *   <li>{@link org.eclipse.emf.cdo.tests.model6.Root#getListD <em>List D</em>}</li>

+ * <li>{@link org.eclipse.emf.cdo.tests.model6.Root#getListA <em>List A</em>}</li>

+ * <li>{@link org.eclipse.emf.cdo.tests.model6.Root#getListB <em>List B</em>}</li>

+ * <li>{@link org.eclipse.emf.cdo.tests.model6.Root#getListC <em>List C</em>}</li>

+ * <li>{@link org.eclipse.emf.cdo.tests.model6.Root#getListD <em>List D</em>}</li>

  * </ul>

  * </p>

- *

+ * 

  * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getRoot()

  * @model

  * @generated

  */

-public interface Root extends EObject {

-	/**

-	 * Returns the value of the '<em><b>List A</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.emf.cdo.tests.model6.BaseObject}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>List A</em>' containment reference list isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * @return the value of the '<em>List A</em>' containment reference list.

-	 * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getRoot_ListA()

-	 * @model containment="true"

-	 * @generated

-	 */

-	EList<BaseObject> getListA();

+public interface Root extends EObject

+{

+  /**

+   * Returns the value of the '<em><b>List A</b></em>' containment reference list. The list contents are of type

+   * {@link org.eclipse.emf.cdo.tests.model6.BaseObject}. <!-- begin-user-doc -->

+   * <p>

+   * If the meaning of the '<em>List A</em>' containment reference list isn't clear, there really should be more of a

+   * description here...

+   * </p>

+   * <!-- end-user-doc -->

+   * 

+   * @return the value of the '<em>List A</em>' containment reference list.

+   * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getRoot_ListA()

+   * @model containment="true"

+   * @generated

+   */

+  EList<BaseObject> getListA();

 

-	/**

-	 * Returns the value of the '<em><b>List B</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.emf.cdo.tests.model6.BaseObject}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>List B</em>' containment reference list isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * @return the value of the '<em>List B</em>' containment reference list.

-	 * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getRoot_ListB()

-	 * @model containment="true"

-	 * @generated

-	 */

-	EList<BaseObject> getListB();

+  /**

+   * Returns the value of the '<em><b>List B</b></em>' containment reference list. The list contents are of type

+   * {@link org.eclipse.emf.cdo.tests.model6.BaseObject}. <!-- begin-user-doc -->

+   * <p>

+   * If the meaning of the '<em>List B</em>' containment reference list isn't clear, there really should be more of a

+   * description here...

+   * </p>

+   * <!-- end-user-doc -->

+   * 

+   * @return the value of the '<em>List B</em>' containment reference list.

+   * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getRoot_ListB()

+   * @model containment="true"

+   * @generated

+   */

+  EList<BaseObject> getListB();

 

-	/**

-	 * Returns the value of the '<em><b>List C</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.emf.cdo.tests.model6.BaseObject}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>List C</em>' containment reference list isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * @return the value of the '<em>List C</em>' containment reference list.

-	 * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getRoot_ListC()

-	 * @model containment="true"

-	 * @generated

-	 */

-	EList<BaseObject> getListC();

+  /**

+   * Returns the value of the '<em><b>List C</b></em>' containment reference list. The list contents are of type

+   * {@link org.eclipse.emf.cdo.tests.model6.BaseObject}. <!-- begin-user-doc -->

+   * <p>

+   * If the meaning of the '<em>List C</em>' containment reference list isn't clear, there really should be more of a

+   * description here...

+   * </p>

+   * <!-- end-user-doc -->

+   * 

+   * @return the value of the '<em>List C</em>' containment reference list.

+   * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getRoot_ListC()

+   * @model containment="true"

+   * @generated

+   */

+  EList<BaseObject> getListC();

 

-	/**

-	 * Returns the value of the '<em><b>List D</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.emf.cdo.tests.model6.BaseObject}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>List D</em>' containment reference list isn't clear,

-	 * there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * @return the value of the '<em>List D</em>' containment reference list.

-	 * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getRoot_ListD()

-	 * @model containment="true"

-	 * @generated

-	 */

-	EList<BaseObject> getListD();

+  /**

+   * Returns the value of the '<em><b>List D</b></em>' containment reference list. The list contents are of type

+   * {@link org.eclipse.emf.cdo.tests.model6.BaseObject}. <!-- begin-user-doc -->

+   * <p>

+   * If the meaning of the '<em>List D</em>' containment reference list isn't clear, there really should be more of a

+   * description here...

+   * </p>

+   * <!-- end-user-doc -->

+   * 

+   * @return the value of the '<em>List D</em>' containment reference list.

+   * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getRoot_ListD()

+   * @model containment="true"

+   * @generated

+   */

+  EList<BaseObject> getListD();

 

 } // Root

diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/BaseObjectImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/BaseObjectImpl.java
index b0b58cd667..10a443a5a4 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/BaseObjectImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/BaseObjectImpl.java
@@ -13,106 +13,107 @@ package org.eclipse.emf.cdo.tests.model6.impl;
 import org.eclipse.emf.cdo.tests.model6.BaseObject;

 import org.eclipse.emf.cdo.tests.model6.Model6Package;

 

-import org.eclipse.emf.common.util.EList;

+import org.eclipse.emf.internal.cdo.CDOObjectImpl;

 

+import org.eclipse.emf.common.util.EList;

 import org.eclipse.emf.ecore.EClass;

 

-import org.eclipse.emf.internal.cdo.CDOObjectImpl;

-

 /**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Base Object</b></em>'.

- * <!-- end-user-doc -->

+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Base Object</b></em>'. <!-- end-user-doc -->

  * <p>

  * The following features are implemented:

  * <ul>

- *   <li>{@link org.eclipse.emf.cdo.tests.model6.impl.BaseObjectImpl#getAttributeOptional <em>Attribute Optional</em>}</li>

- *   <li>{@link org.eclipse.emf.cdo.tests.model6.impl.BaseObjectImpl#getAttributeRequired <em>Attribute Required</em>}</li>

- *   <li>{@link org.eclipse.emf.cdo.tests.model6.impl.BaseObjectImpl#getAttributeList <em>Attribute List</em>}</li>

+ * <li>{@link org.eclipse.emf.cdo.tests.model6.impl.BaseObjectImpl#getAttributeOptional <em>Attribute Optional</em>}</li>

+ * <li>{@link org.eclipse.emf.cdo.tests.model6.impl.BaseObjectImpl#getAttributeRequired <em>Attribute Required</em>}</li>

+ * <li>{@link org.eclipse.emf.cdo.tests.model6.impl.BaseObjectImpl#getAttributeList <em>Attribute List</em>}</li>

  * </ul>

  * </p>

- *

+ * 

  * @generated

  */

-public class BaseObjectImpl extends CDOObjectImpl implements BaseObject {

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected BaseObjectImpl() {

-		super();

-	}

+public class BaseObjectImpl extends CDOObjectImpl implements BaseObject

+{

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  protected BaseObjectImpl()

+  {

+    super();

+  }

 

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return Model6Package.Literals.BASE_OBJECT;

-	}

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  @Override

+  protected EClass eStaticClass()

+  {

+    return Model6Package.Literals.BASE_OBJECT;

+  }

 

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected int eStaticFeatureCount() {

-		return 0;

-	}

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  @Override

+  protected int eStaticFeatureCount()

+  {

+    return 0;

+  }

 

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public String getAttributeOptional() {

-		return (String) eGet(

-				Model6Package.Literals.BASE_OBJECT__ATTRIBUTE_OPTIONAL, true);

-	}

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  public String getAttributeOptional()

+  {

+    return (String)eGet(Model6Package.Literals.BASE_OBJECT__ATTRIBUTE_OPTIONAL, true);

+  }

 

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setAttributeOptional(String newAttributeOptional) {

-		eSet(Model6Package.Literals.BASE_OBJECT__ATTRIBUTE_OPTIONAL,

-				newAttributeOptional);

-	}

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  public void setAttributeOptional(String newAttributeOptional)

+  {

+    eSet(Model6Package.Literals.BASE_OBJECT__ATTRIBUTE_OPTIONAL, newAttributeOptional);

+  }

 

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public String getAttributeRequired() {

-		return (String) eGet(

-				Model6Package.Literals.BASE_OBJECT__ATTRIBUTE_REQUIRED, true);

-	}

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  public String getAttributeRequired()

+  {

+    return (String)eGet(Model6Package.Literals.BASE_OBJECT__ATTRIBUTE_REQUIRED, true);

+  }

 

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setAttributeRequired(String newAttributeRequired) {

-		eSet(Model6Package.Literals.BASE_OBJECT__ATTRIBUTE_REQUIRED,

-				newAttributeRequired);

-	}

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  public void setAttributeRequired(String newAttributeRequired)

+  {

+    eSet(Model6Package.Literals.BASE_OBJECT__ATTRIBUTE_REQUIRED, newAttributeRequired);

+  }

 

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	public EList<String> getAttributeList() {

-		return (EList<String>) eGet(

-				Model6Package.Literals.BASE_OBJECT__ATTRIBUTE_LIST, true);

-	}

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  @SuppressWarnings("unchecked")

+  public EList<String> getAttributeList()

+  {

+    return (EList<String>)eGet(Model6Package.Literals.BASE_OBJECT__ATTRIBUTE_LIST, true);

+  }

 

-} //BaseObjectImpl

+} // BaseObjectImpl

diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/ContainmentObjectImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/ContainmentObjectImpl.java
index f77d614c08..0ba6ff1e7f 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/ContainmentObjectImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/ContainmentObjectImpl.java
@@ -15,75 +15,74 @@ import org.eclipse.emf.cdo.tests.model6.ContainmentObject;
 import org.eclipse.emf.cdo.tests.model6.Model6Package;

 

 import org.eclipse.emf.common.util.EList;

-

 import org.eclipse.emf.ecore.EClass;

 

 /**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Containment Object</b></em>'.

- * <!-- end-user-doc -->

+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Containment Object</b></em>'. <!-- end-user-doc

+ * -->

  * <p>

  * The following features are implemented:

  * <ul>

- *   <li>{@link org.eclipse.emf.cdo.tests.model6.impl.ContainmentObjectImpl#getContainmentOptional <em>Containment Optional</em>}</li>

- *   <li>{@link org.eclipse.emf.cdo.tests.model6.impl.ContainmentObjectImpl#getContainmentList <em>Containment List</em>}</li>

+ * <li>{@link org.eclipse.emf.cdo.tests.model6.impl.ContainmentObjectImpl#getContainmentOptional <em>Containment

+ * Optional</em>}</li>

+ * <li>{@link org.eclipse.emf.cdo.tests.model6.impl.ContainmentObjectImpl#getContainmentList <em>Containment List</em>}</li>

  * </ul>

  * </p>

- *

+ * 

  * @generated

  */

-public class ContainmentObjectImpl extends BaseObjectImpl implements

-		ContainmentObject {

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ContainmentObjectImpl() {

-		super();

-	}

+public class ContainmentObjectImpl extends BaseObjectImpl implements ContainmentObject

+{

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  protected ContainmentObjectImpl()

+  {

+    super();

+  }

 

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return Model6Package.Literals.CONTAINMENT_OBJECT;

-	}

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  @Override

+  protected EClass eStaticClass()

+  {

+    return Model6Package.Literals.CONTAINMENT_OBJECT;

+  }

 

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public BaseObject getContainmentOptional() {

-		return (BaseObject) eGet(

-				Model6Package.Literals.CONTAINMENT_OBJECT__CONTAINMENT_OPTIONAL,

-				true);

-	}

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  public BaseObject getContainmentOptional()

+  {

+    return (BaseObject)eGet(Model6Package.Literals.CONTAINMENT_OBJECT__CONTAINMENT_OPTIONAL, true);

+  }

 

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setContainmentOptional(BaseObject newContainmentOptional) {

-		eSet(Model6Package.Literals.CONTAINMENT_OBJECT__CONTAINMENT_OPTIONAL,

-				newContainmentOptional);

-	}

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  public void setContainmentOptional(BaseObject newContainmentOptional)

+  {

+    eSet(Model6Package.Literals.CONTAINMENT_OBJECT__CONTAINMENT_OPTIONAL, newContainmentOptional);

+  }

 

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	public EList<BaseObject> getContainmentList() {

-		return (EList<BaseObject>) eGet(

-				Model6Package.Literals.CONTAINMENT_OBJECT__CONTAINMENT_LIST,

-				true);

-	}

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  @SuppressWarnings("unchecked")

+  public EList<BaseObject> getContainmentList()

+  {

+    return (EList<BaseObject>)eGet(Model6Package.Literals.CONTAINMENT_OBJECT__CONTAINMENT_LIST, true);

+  }

 

-} //ContainmentObjectImpl

+} // ContainmentObjectImpl

diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/Model6FactoryImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/Model6FactoryImpl.java
index 02635713f0..c5b6c16a83 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/Model6FactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/Model6FactoryImpl.java
@@ -10,132 +10,146 @@
  */

 package org.eclipse.emf.cdo.tests.model6.impl;

 

-import org.eclipse.emf.cdo.tests.model6.*;

+import org.eclipse.emf.cdo.tests.model6.BaseObject;

+import org.eclipse.emf.cdo.tests.model6.ContainmentObject;

+import org.eclipse.emf.cdo.tests.model6.Model6Factory;

+import org.eclipse.emf.cdo.tests.model6.Model6Package;

+import org.eclipse.emf.cdo.tests.model6.ReferenceObject;

+import org.eclipse.emf.cdo.tests.model6.Root;

 

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.ecore.EPackage;

-

 import org.eclipse.emf.ecore.impl.EFactoryImpl;

-

 import org.eclipse.emf.ecore.plugin.EcorePlugin;

 

 /**

- * <!-- begin-user-doc -->

- * An implementation of the model <b>Factory</b>.

- * <!-- end-user-doc -->

+ * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!-- end-user-doc -->

+ * 

  * @generated

  */

-public class Model6FactoryImpl extends EFactoryImpl implements Model6Factory {

-	/**

-	 * Creates the default factory implementation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public static Model6Factory init() {

-		try {

-			Model6Factory theModel6Factory = (Model6Factory) EPackage.Registry.INSTANCE

-					.getEFactory("http://www.eclipse.org/emf/CDO/tests/model6/1.0.0");

-			if (theModel6Factory != null) {

-				return theModel6Factory;

-			}

-		} catch (Exception exception) {

-			EcorePlugin.INSTANCE.log(exception);

-		}

-		return new Model6FactoryImpl();

-	}

+public class Model6FactoryImpl extends EFactoryImpl implements Model6Factory

+{

+  /**

+   * Creates the default factory implementation. <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  public static Model6Factory init()

+  {

+    try

+    {

+      Model6Factory theModel6Factory = (Model6Factory)EPackage.Registry.INSTANCE

+          .getEFactory("http://www.eclipse.org/emf/CDO/tests/model6/1.0.0");

+      if (theModel6Factory != null)

+      {

+        return theModel6Factory;

+      }

+    }

+    catch (Exception exception)

+    {

+      EcorePlugin.INSTANCE.log(exception);

+    }

+    return new Model6FactoryImpl();

+  }

 

-	/**

-	 * Creates an instance of the factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public Model6FactoryImpl() {

-		super();

-	}

+  /**

+   * Creates an instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  public Model6FactoryImpl()

+  {

+    super();

+  }

 

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public EObject create(EClass eClass) {

-		switch (eClass.getClassifierID()) {

-		case Model6Package.ROOT:

-			return createRoot();

-		case Model6Package.BASE_OBJECT:

-			return createBaseObject();

-		case Model6Package.REFERENCE_OBJECT:

-			return createReferenceObject();

-		case Model6Package.CONTAINMENT_OBJECT:

-			return createContainmentObject();

-		default:

-			throw new IllegalArgumentException("The class '" + eClass.getName()

-					+ "' is not a valid classifier");

-		}

-	}

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  @Override

+  public EObject create(EClass eClass)

+  {

+    switch (eClass.getClassifierID())

+    {

+    case Model6Package.ROOT:

+      return createRoot();

+    case Model6Package.BASE_OBJECT:

+      return createBaseObject();

+    case Model6Package.REFERENCE_OBJECT:

+      return createReferenceObject();

+    case Model6Package.CONTAINMENT_OBJECT:

+      return createContainmentObject();

+    default:

+      throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");

+    }

+  }

 

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public Root createRoot() {

-		RootImpl root = new RootImpl();

-		return root;

-	}

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  public Root createRoot()

+  {

+    RootImpl root = new RootImpl();

+    return root;

+  }

 

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public BaseObject createBaseObject() {

-		BaseObjectImpl baseObject = new BaseObjectImpl();

-		return baseObject;

-	}

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  public BaseObject createBaseObject()

+  {

+    BaseObjectImpl baseObject = new BaseObjectImpl();

+    return baseObject;

+  }

 

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public ReferenceObject createReferenceObject() {

-		ReferenceObjectImpl referenceObject = new ReferenceObjectImpl();

-		return referenceObject;

-	}

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  public ReferenceObject createReferenceObject()

+  {

+    ReferenceObjectImpl referenceObject = new ReferenceObjectImpl();

+    return referenceObject;

+  }

 

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public ContainmentObject createContainmentObject() {

-		ContainmentObjectImpl containmentObject = new ContainmentObjectImpl();

-		return containmentObject;

-	}

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  public ContainmentObject createContainmentObject()

+  {

+    ContainmentObjectImpl containmentObject = new ContainmentObjectImpl();

+    return containmentObject;

+  }

 

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public Model6Package getModel6Package() {

-		return (Model6Package) getEPackage();

-	}

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  public Model6Package getModel6Package()

+  {

+    return (Model6Package)getEPackage();

+  }

 

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @deprecated

-	 * @generated

-	 */

-	@Deprecated

-	public static Model6Package getPackage() {

-		return Model6Package.eINSTANCE;

-	}

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @deprecated

+   * @generated

+   */

+  @Deprecated

+  public static Model6Package getPackage()

+  {

+    return Model6Package.eINSTANCE;

+  }

 

-} //Model6FactoryImpl

+} // Model6FactoryImpl

diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/Model6PackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/Model6PackageImpl.java
index f222e17463..98571aa273 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/Model6PackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/Model6PackageImpl.java
@@ -21,397 +21,384 @@ import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.EPackage;

 import org.eclipse.emf.ecore.EReference;

-

 import org.eclipse.emf.ecore.impl.EPackageImpl;

 

 /**

- * <!-- begin-user-doc -->

- * An implementation of the model <b>Package</b>.

- * <!-- end-user-doc -->

+ * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!-- end-user-doc -->

+ * 

  * @generated

  */

-public class Model6PackageImpl extends EPackageImpl implements Model6Package {

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass rootEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass baseObjectEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass referenceObjectEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass containmentObjectEClass = null;

-

-	/**

-	 * Creates an instance of the model <b>Package</b>, registered with

-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package

-	 * package URI value.

-	 * <p>Note: the correct way to create the package is via the static

-	 * factory method {@link #init init()}, which also performs

-	 * initialization of the package, or returns the registered package,

-	 * if one already exists.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.emf.ecore.EPackage.Registry

-	 * @see org.eclipse.emf.cdo.tests.model6.Model6Package#eNS_URI

-	 * @see #init()

-	 * @generated

-	 */

-	private Model6PackageImpl() {

-		super(eNS_URI, Model6Factory.eINSTANCE);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private static boolean isInited = false;

-

-	/**

-	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.

-	 * 

-	 * <p>This method is used to initialize {@link Model6Package#eINSTANCE} when that field is accessed.

-	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see #eNS_URI

-	 * @see #createPackageContents()

-	 * @see #initializePackageContents()

-	 * @generated

-	 */

-	public static Model6Package init() {

-		if (isInited)

-			return (Model6Package) EPackage.Registry.INSTANCE

-					.getEPackage(Model6Package.eNS_URI);

-

-		// Obtain or create and register package

-		Model6PackageImpl theModel6Package = (Model6PackageImpl) (EPackage.Registry.INSTANCE

-				.get(eNS_URI) instanceof Model6PackageImpl ? EPackage.Registry.INSTANCE

-				.get(eNS_URI) : new Model6PackageImpl());

-

-		isInited = true;

-

-		// Create package meta-data objects

-		theModel6Package.createPackageContents();

-

-		// Initialize created meta-data

-		theModel6Package.initializePackageContents();

-

-		// Mark meta-data to indicate it can't be changed

-		theModel6Package.freeze();

-

-		// Update the registry and return the package

-		EPackage.Registry.INSTANCE.put(Model6Package.eNS_URI, theModel6Package);

-		return theModel6Package;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EClass getRoot() {

-		return rootEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EReference getRoot_ListA() {

-		return (EReference) rootEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EReference getRoot_ListB() {

-		return (EReference) rootEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EReference getRoot_ListC() {

-		return (EReference) rootEClass.getEStructuralFeatures().get(2);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EReference getRoot_ListD() {

-		return (EReference) rootEClass.getEStructuralFeatures().get(3);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EClass getBaseObject() {

-		return baseObjectEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EAttribute getBaseObject_AttributeOptional() {

-		return (EAttribute) baseObjectEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EAttribute getBaseObject_AttributeRequired() {

-		return (EAttribute) baseObjectEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EAttribute getBaseObject_AttributeList() {

-		return (EAttribute) baseObjectEClass.getEStructuralFeatures().get(2);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EClass getReferenceObject() {

-		return referenceObjectEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EReference getReferenceObject_ReferenceOptional() {

-		return (EReference) referenceObjectEClass.getEStructuralFeatures().get(

-				0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EReference getReferenceObject_ReferenceList() {

-		return (EReference) referenceObjectEClass.getEStructuralFeatures().get(

-				1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EClass getContainmentObject() {

-		return containmentObjectEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EReference getContainmentObject_ContainmentOptional() {

-		return (EReference) containmentObjectEClass.getEStructuralFeatures()

-				.get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EReference getContainmentObject_ContainmentList() {

-		return (EReference) containmentObjectEClass.getEStructuralFeatures()

-				.get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public Model6Factory getModel6Factory() {

-		return (Model6Factory) getEFactoryInstance();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private boolean isCreated = false;

-

-	/**

-	 * Creates the meta-model objects for the package.  This method is

-	 * guarded to have no affect on any invocation but its first.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void createPackageContents() {

-		if (isCreated)

-			return;

-		isCreated = true;

-

-		// Create classes and their features

-		rootEClass = createEClass(ROOT);

-		createEReference(rootEClass, ROOT__LIST_A);

-		createEReference(rootEClass, ROOT__LIST_B);

-		createEReference(rootEClass, ROOT__LIST_C);

-		createEReference(rootEClass, ROOT__LIST_D);

-

-		baseObjectEClass = createEClass(BASE_OBJECT);

-		createEAttribute(baseObjectEClass, BASE_OBJECT__ATTRIBUTE_OPTIONAL);

-		createEAttribute(baseObjectEClass, BASE_OBJECT__ATTRIBUTE_REQUIRED);

-		createEAttribute(baseObjectEClass, BASE_OBJECT__ATTRIBUTE_LIST);

-

-		referenceObjectEClass = createEClass(REFERENCE_OBJECT);

-		createEReference(referenceObjectEClass,

-				REFERENCE_OBJECT__REFERENCE_OPTIONAL);

-		createEReference(referenceObjectEClass,

-				REFERENCE_OBJECT__REFERENCE_LIST);

-

-		containmentObjectEClass = createEClass(CONTAINMENT_OBJECT);

-		createEReference(containmentObjectEClass,

-				CONTAINMENT_OBJECT__CONTAINMENT_OPTIONAL);

-		createEReference(containmentObjectEClass,

-				CONTAINMENT_OBJECT__CONTAINMENT_LIST);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private boolean isInitialized = false;

-

-	/**

-	 * Complete the initialization of the package and its meta-model.  This

-	 * method is guarded to have no affect on any invocation but its first.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void initializePackageContents() {

-		if (isInitialized)

-			return;

-		isInitialized = true;

-

-		// Initialize package

-		setName(eNAME);

-		setNsPrefix(eNS_PREFIX);

-		setNsURI(eNS_URI);

-

-		// Create type parameters

-

-		// Set bounds for type parameters

-

-		// Add supertypes to classes

-		referenceObjectEClass.getESuperTypes().add(this.getBaseObject());

-		containmentObjectEClass.getESuperTypes().add(this.getBaseObject());

-

-		// Initialize classes and features; add operations and parameters

-		initEClass(rootEClass, Root.class, "Root", !IS_ABSTRACT, !IS_INTERFACE,

-				IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getRoot_ListA(), this.getBaseObject(), null, "listA",

-				null, 0, -1, Root.class, !IS_TRANSIENT, !IS_VOLATILE,

-				IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,

-				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEReference(getRoot_ListB(), this.getBaseObject(), null, "listB",

-				null, 0, -1, Root.class, !IS_TRANSIENT, !IS_VOLATILE,

-				IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,

-				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEReference(getRoot_ListC(), this.getBaseObject(), null, "listC",

-				null, 0, -1, Root.class, !IS_TRANSIENT, !IS_VOLATILE,

-				IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,

-				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEReference(getRoot_ListD(), this.getBaseObject(), null, "listD",

-				null, 0, -1, Root.class, !IS_TRANSIENT, !IS_VOLATILE,

-				IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,

-				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		initEClass(baseObjectEClass, BaseObject.class, "BaseObject",

-				!IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-		initEAttribute(getBaseObject_AttributeOptional(),

-				ecorePackage.getEString(), "attributeOptional", null, 0, 1,

-				BaseObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,

-				!IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEAttribute(getBaseObject_AttributeRequired(),

-				ecorePackage.getEString(), "attributeRequired", null, 1, 1,

-				BaseObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,

-				!IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEAttribute(getBaseObject_AttributeList(),

-				ecorePackage.getEString(), "attributeList", null, 0, -1,

-				BaseObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,

-				!IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		initEClass(referenceObjectEClass, ReferenceObject.class,

-				"ReferenceObject", !IS_ABSTRACT, !IS_INTERFACE,

-				IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getReferenceObject_ReferenceOptional(),

-				this.getBaseObject(), null, "referenceOptional", null, 0, 1,

-				ReferenceObject.class, !IS_TRANSIENT, !IS_VOLATILE,

-				IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,

-				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEReference(getReferenceObject_ReferenceList(),

-				this.getBaseObject(), null, "referenceList", null, 0, -1,

-				ReferenceObject.class, !IS_TRANSIENT, !IS_VOLATILE,

-				IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,

-				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		initEClass(containmentObjectEClass, ContainmentObject.class,

-				"ContainmentObject", !IS_ABSTRACT, !IS_INTERFACE,

-				IS_GENERATED_INSTANCE_CLASS);

-		initEReference(getContainmentObject_ContainmentOptional(),

-				this.getBaseObject(), null, "containmentOptional", null, 0, 1,

-				ContainmentObject.class, !IS_TRANSIENT, !IS_VOLATILE,

-				IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,

-				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-		initEReference(getContainmentObject_ContainmentList(),

-				this.getBaseObject(), null, "containmentList", null, 0, -1,

-				ContainmentObject.class, !IS_TRANSIENT, !IS_VOLATILE,

-				IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,

-				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-

-		// Create resource

-		createResource(eNS_URI);

-	}

-

-} //Model6PackageImpl

+public class Model6PackageImpl extends EPackageImpl implements Model6Package

+{

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  private EClass rootEClass = null;

+

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  private EClass baseObjectEClass = null;

+

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  private EClass referenceObjectEClass = null;

+

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  private EClass containmentObjectEClass = null;

+

+  /**

+   * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry

+   * EPackage.Registry} by the package package URI value.

+   * <p>

+   * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also

+   * performs initialization of the package, or returns the registered package, if one already exists. <!--

+   * begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @see org.eclipse.emf.ecore.EPackage.Registry

+   * @see org.eclipse.emf.cdo.tests.model6.Model6Package#eNS_URI

+   * @see #init()

+   * @generated

+   */

+  private Model6PackageImpl()

+  {

+    super(eNS_URI, Model6Factory.eINSTANCE);

+  }

+

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  private static boolean isInited = false;

+

+  /**

+   * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.

+   * <p>

+   * This method is used to initialize {@link Model6Package#eINSTANCE} when that field is accessed. Clients should not

+   * invoke it directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc -->

+   * <!-- end-user-doc -->

+   * 

+   * @see #eNS_URI

+   * @see #createPackageContents()

+   * @see #initializePackageContents()

+   * @generated

+   */

+  public static Model6Package init()

+  {

+    if (isInited)

+      return (Model6Package)EPackage.Registry.INSTANCE.getEPackage(Model6Package.eNS_URI);

+

+    // Obtain or create and register package

+    Model6PackageImpl theModel6Package = (Model6PackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof Model6PackageImpl ? EPackage.Registry.INSTANCE

+        .get(eNS_URI) : new Model6PackageImpl());

+

+    isInited = true;

+

+    // Create package meta-data objects

+    theModel6Package.createPackageContents();

+

+    // Initialize created meta-data

+    theModel6Package.initializePackageContents();

+

+    // Mark meta-data to indicate it can't be changed

+    theModel6Package.freeze();

+

+    // Update the registry and return the package

+    EPackage.Registry.INSTANCE.put(Model6Package.eNS_URI, theModel6Package);

+    return theModel6Package;

+  }

+

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  public EClass getRoot()

+  {

+    return rootEClass;

+  }

+

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  public EReference getRoot_ListA()

+  {

+    return (EReference)rootEClass.getEStructuralFeatures().get(0);

+  }

+

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  public EReference getRoot_ListB()

+  {

+    return (EReference)rootEClass.getEStructuralFeatures().get(1);

+  }

+

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  public EReference getRoot_ListC()

+  {

+    return (EReference)rootEClass.getEStructuralFeatures().get(2);

+  }

+

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  public EReference getRoot_ListD()

+  {

+    return (EReference)rootEClass.getEStructuralFeatures().get(3);

+  }

+

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  public EClass getBaseObject()

+  {

+    return baseObjectEClass;

+  }

+

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  public EAttribute getBaseObject_AttributeOptional()

+  {

+    return (EAttribute)baseObjectEClass.getEStructuralFeatures().get(0);

+  }

+

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  public EAttribute getBaseObject_AttributeRequired()

+  {

+    return (EAttribute)baseObjectEClass.getEStructuralFeatures().get(1);

+  }

+

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  public EAttribute getBaseObject_AttributeList()

+  {

+    return (EAttribute)baseObjectEClass.getEStructuralFeatures().get(2);

+  }

+

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  public EClass getReferenceObject()

+  {

+    return referenceObjectEClass;

+  }

+

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  public EReference getReferenceObject_ReferenceOptional()

+  {

+    return (EReference)referenceObjectEClass.getEStructuralFeatures().get(0);

+  }

+

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  public EReference getReferenceObject_ReferenceList()

+  {

+    return (EReference)referenceObjectEClass.getEStructuralFeatures().get(1);

+  }

+

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  public EClass getContainmentObject()

+  {

+    return containmentObjectEClass;

+  }

+

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  public EReference getContainmentObject_ContainmentOptional()

+  {

+    return (EReference)containmentObjectEClass.getEStructuralFeatures().get(0);

+  }

+

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  public EReference getContainmentObject_ContainmentList()

+  {

+    return (EReference)containmentObjectEClass.getEStructuralFeatures().get(1);

+  }

+

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  public Model6Factory getModel6Factory()

+  {

+    return (Model6Factory)getEFactoryInstance();

+  }

+

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  private boolean isCreated = false;

+

+  /**

+   * Creates the meta-model objects for the package. This method is guarded to have no affect on any invocation but its

+   * first. <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  public void createPackageContents()

+  {

+    if (isCreated)

+      return;

+    isCreated = true;

+

+    // Create classes and their features

+    rootEClass = createEClass(ROOT);

+    createEReference(rootEClass, ROOT__LIST_A);

+    createEReference(rootEClass, ROOT__LIST_B);

+    createEReference(rootEClass, ROOT__LIST_C);

+    createEReference(rootEClass, ROOT__LIST_D);

+

+    baseObjectEClass = createEClass(BASE_OBJECT);

+    createEAttribute(baseObjectEClass, BASE_OBJECT__ATTRIBUTE_OPTIONAL);

+    createEAttribute(baseObjectEClass, BASE_OBJECT__ATTRIBUTE_REQUIRED);

+    createEAttribute(baseObjectEClass, BASE_OBJECT__ATTRIBUTE_LIST);

+

+    referenceObjectEClass = createEClass(REFERENCE_OBJECT);

+    createEReference(referenceObjectEClass, REFERENCE_OBJECT__REFERENCE_OPTIONAL);

+    createEReference(referenceObjectEClass, REFERENCE_OBJECT__REFERENCE_LIST);

+

+    containmentObjectEClass = createEClass(CONTAINMENT_OBJECT);

+    createEReference(containmentObjectEClass, CONTAINMENT_OBJECT__CONTAINMENT_OPTIONAL);

+    createEReference(containmentObjectEClass, CONTAINMENT_OBJECT__CONTAINMENT_LIST);

+  }

+

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  private boolean isInitialized = false;

+

+  /**

+   * Complete the initialization of the package and its meta-model. This method is guarded to have no affect on any

+   * invocation but its first. <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  public void initializePackageContents()

+  {

+    if (isInitialized)

+      return;

+    isInitialized = true;

+

+    // Initialize package

+    setName(eNAME);

+    setNsPrefix(eNS_PREFIX);

+    setNsURI(eNS_URI);

+

+    // Create type parameters

+

+    // Set bounds for type parameters

+

+    // Add supertypes to classes

+    referenceObjectEClass.getESuperTypes().add(this.getBaseObject());

+    containmentObjectEClass.getESuperTypes().add(this.getBaseObject());

+

+    // Initialize classes and features; add operations and parameters

+    initEClass(rootEClass, Root.class, "Root", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+    initEReference(getRoot_ListA(), this.getBaseObject(), null, "listA", null, 0, -1, Root.class, !IS_TRANSIENT,

+        !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,

+        IS_ORDERED);

+    initEReference(getRoot_ListB(), this.getBaseObject(), null, "listB", null, 0, -1, Root.class, !IS_TRANSIENT,

+        !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,

+        IS_ORDERED);

+    initEReference(getRoot_ListC(), this.getBaseObject(), null, "listC", null, 0, -1, Root.class, !IS_TRANSIENT,

+        !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,

+        IS_ORDERED);

+    initEReference(getRoot_ListD(), this.getBaseObject(), null, "listD", null, 0, -1, Root.class, !IS_TRANSIENT,

+        !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,

+        IS_ORDERED);

+

+    initEClass(baseObjectEClass, BaseObject.class, "BaseObject", !IS_ABSTRACT, !IS_INTERFACE,

+        IS_GENERATED_INSTANCE_CLASS);

+    initEAttribute(getBaseObject_AttributeOptional(), ecorePackage.getEString(), "attributeOptional", null, 0, 1,

+        BaseObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,

+        IS_ORDERED);

+    initEAttribute(getBaseObject_AttributeRequired(), ecorePackage.getEString(), "attributeRequired", null, 1, 1,

+        BaseObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,

+        IS_ORDERED);

+    initEAttribute(getBaseObject_AttributeList(), ecorePackage.getEString(), "attributeList", null, 0, -1,

+        BaseObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,

+        IS_ORDERED);

+

+    initEClass(referenceObjectEClass, ReferenceObject.class, "ReferenceObject", !IS_ABSTRACT, !IS_INTERFACE,

+        IS_GENERATED_INSTANCE_CLASS);

+    initEReference(getReferenceObject_ReferenceOptional(), this.getBaseObject(), null, "referenceOptional", null, 0, 1,

+        ReferenceObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,

+        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+    initEReference(getReferenceObject_ReferenceList(), this.getBaseObject(), null, "referenceList", null, 0, -1,

+        ReferenceObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,

+        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+    initEClass(containmentObjectEClass, ContainmentObject.class, "ContainmentObject", !IS_ABSTRACT, !IS_INTERFACE,

+        IS_GENERATED_INSTANCE_CLASS);

+    initEReference(getContainmentObject_ContainmentOptional(), this.getBaseObject(), null, "containmentOptional", null,

+        0, 1, ContainmentObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,

+        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+    initEReference(getContainmentObject_ContainmentList(), this.getBaseObject(), null, "containmentList", null, 0, -1,

+        ContainmentObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,

+        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+    // Create resource

+    createResource(eNS_URI);

+  }

+

+} // Model6PackageImpl

diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/ReferenceObjectImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/ReferenceObjectImpl.java
index 3e661607ad..6516b82ffb 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/ReferenceObjectImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/ReferenceObjectImpl.java
@@ -15,74 +15,74 @@ import org.eclipse.emf.cdo.tests.model6.Model6Package;
 import org.eclipse.emf.cdo.tests.model6.ReferenceObject;

 

 import org.eclipse.emf.common.util.EList;

-

 import org.eclipse.emf.ecore.EClass;

 

 /**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Reference Object</b></em>'.

- * <!-- end-user-doc -->

+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Reference Object</b></em>'. <!-- end-user-doc

+ * -->

  * <p>

  * The following features are implemented:

  * <ul>

- *   <li>{@link org.eclipse.emf.cdo.tests.model6.impl.ReferenceObjectImpl#getReferenceOptional <em>Reference Optional</em>}</li>

- *   <li>{@link org.eclipse.emf.cdo.tests.model6.impl.ReferenceObjectImpl#getReferenceList <em>Reference List</em>}</li>

+ * <li>{@link org.eclipse.emf.cdo.tests.model6.impl.ReferenceObjectImpl#getReferenceOptional <em>Reference Optional

+ * </em>}</li>

+ * <li>{@link org.eclipse.emf.cdo.tests.model6.impl.ReferenceObjectImpl#getReferenceList <em>Reference List</em>}</li>

  * </ul>

  * </p>

- *

+ * 

  * @generated

  */

-public class ReferenceObjectImpl extends BaseObjectImpl implements

-		ReferenceObject {

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected ReferenceObjectImpl() {

-		super();

-	}

+public class ReferenceObjectImpl extends BaseObjectImpl implements ReferenceObject

+{

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  protected ReferenceObjectImpl()

+  {

+    super();

+  }

 

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return Model6Package.Literals.REFERENCE_OBJECT;

-	}

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  @Override

+  protected EClass eStaticClass()

+  {

+    return Model6Package.Literals.REFERENCE_OBJECT;

+  }

 

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public BaseObject getReferenceOptional() {

-		return (BaseObject) eGet(

-				Model6Package.Literals.REFERENCE_OBJECT__REFERENCE_OPTIONAL,

-				true);

-	}

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  public BaseObject getReferenceOptional()

+  {

+    return (BaseObject)eGet(Model6Package.Literals.REFERENCE_OBJECT__REFERENCE_OPTIONAL, true);

+  }

 

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public void setReferenceOptional(BaseObject newReferenceOptional) {

-		eSet(Model6Package.Literals.REFERENCE_OBJECT__REFERENCE_OPTIONAL,

-				newReferenceOptional);

-	}

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  public void setReferenceOptional(BaseObject newReferenceOptional)

+  {

+    eSet(Model6Package.Literals.REFERENCE_OBJECT__REFERENCE_OPTIONAL, newReferenceOptional);

+  }

 

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	public EList<BaseObject> getReferenceList() {

-		return (EList<BaseObject>) eGet(

-				Model6Package.Literals.REFERENCE_OBJECT__REFERENCE_LIST, true);

-	}

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  @SuppressWarnings("unchecked")

+  public EList<BaseObject> getReferenceList()

+  {

+    return (EList<BaseObject>)eGet(Model6Package.Literals.REFERENCE_OBJECT__REFERENCE_LIST, true);

+  }

 

-} //ReferenceObjectImpl

+} // ReferenceObjectImpl

diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/RootImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/RootImpl.java
index c6aa499510..426fecb7b9 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/RootImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/RootImpl.java
@@ -14,100 +14,101 @@ import org.eclipse.emf.cdo.tests.model6.BaseObject;
 import org.eclipse.emf.cdo.tests.model6.Model6Package;

 import org.eclipse.emf.cdo.tests.model6.Root;

 

-import org.eclipse.emf.common.util.EList;

+import org.eclipse.emf.internal.cdo.CDOObjectImpl;

 

+import org.eclipse.emf.common.util.EList;

 import org.eclipse.emf.ecore.EClass;

 

-import org.eclipse.emf.internal.cdo.CDOObjectImpl;

-

 /**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Root</b></em>'.

- * <!-- end-user-doc -->

+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Root</b></em>'. <!-- end-user-doc -->

  * <p>

  * The following features are implemented:

  * <ul>

- *   <li>{@link org.eclipse.emf.cdo.tests.model6.impl.RootImpl#getListA <em>List A</em>}</li>

- *   <li>{@link org.eclipse.emf.cdo.tests.model6.impl.RootImpl#getListB <em>List B</em>}</li>

- *   <li>{@link org.eclipse.emf.cdo.tests.model6.impl.RootImpl#getListC <em>List C</em>}</li>

- *   <li>{@link org.eclipse.emf.cdo.tests.model6.impl.RootImpl#getListD <em>List D</em>}</li>

+ * <li>{@link org.eclipse.emf.cdo.tests.model6.impl.RootImpl#getListA <em>List A</em>}</li>

+ * <li>{@link org.eclipse.emf.cdo.tests.model6.impl.RootImpl#getListB <em>List B</em>}</li>

+ * <li>{@link org.eclipse.emf.cdo.tests.model6.impl.RootImpl#getListC <em>List C</em>}</li>

+ * <li>{@link org.eclipse.emf.cdo.tests.model6.impl.RootImpl#getListD <em>List D</em>}</li>

  * </ul>

  * </p>

- *

+ * 

  * @generated

  */

-public class RootImpl extends CDOObjectImpl implements Root {

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected RootImpl() {

-		super();

-	}

+public class RootImpl extends CDOObjectImpl implements Root

+{

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  protected RootImpl()

+  {

+    super();

+  }

 

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return Model6Package.Literals.ROOT;

-	}

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  @Override

+  protected EClass eStaticClass()

+  {

+    return Model6Package.Literals.ROOT;

+  }

 

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected int eStaticFeatureCount() {

-		return 0;

-	}

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  @Override

+  protected int eStaticFeatureCount()

+  {

+    return 0;

+  }

 

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	public EList<BaseObject> getListA() {

-		return (EList<BaseObject>) eGet(Model6Package.Literals.ROOT__LIST_A,

-				true);

-	}

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  @SuppressWarnings("unchecked")

+  public EList<BaseObject> getListA()

+  {

+    return (EList<BaseObject>)eGet(Model6Package.Literals.ROOT__LIST_A, true);

+  }

 

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	public EList<BaseObject> getListB() {

-		return (EList<BaseObject>) eGet(Model6Package.Literals.ROOT__LIST_B,

-				true);

-	}

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  @SuppressWarnings("unchecked")

+  public EList<BaseObject> getListB()

+  {

+    return (EList<BaseObject>)eGet(Model6Package.Literals.ROOT__LIST_B, true);

+  }

 

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	public EList<BaseObject> getListC() {

-		return (EList<BaseObject>) eGet(Model6Package.Literals.ROOT__LIST_C,

-				true);

-	}

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  @SuppressWarnings("unchecked")

+  public EList<BaseObject> getListC()

+  {

+    return (EList<BaseObject>)eGet(Model6Package.Literals.ROOT__LIST_C, true);

+  }

 

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	public EList<BaseObject> getListD() {

-		return (EList<BaseObject>) eGet(Model6Package.Literals.ROOT__LIST_D,

-				true);

-	}

+  /**

+   * <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  @SuppressWarnings("unchecked")

+  public EList<BaseObject> getListD()

+  {

+    return (EList<BaseObject>)eGet(Model6Package.Literals.ROOT__LIST_D, true);

+  }

 

-} //RootImpl

+} // RootImpl

diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/util/Model6AdapterFactory.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/util/Model6AdapterFactory.java
index 4bcb3a1c8b..3b5dd5c767 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/util/Model6AdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/util/Model6AdapterFactory.java
@@ -10,175 +10,187 @@
  */

 package org.eclipse.emf.cdo.tests.model6.util;

 

-import org.eclipse.emf.cdo.tests.model6.*;

+import org.eclipse.emf.cdo.tests.model6.BaseObject;

+import org.eclipse.emf.cdo.tests.model6.ContainmentObject;

+import org.eclipse.emf.cdo.tests.model6.Model6Package;

+import org.eclipse.emf.cdo.tests.model6.ReferenceObject;

+import org.eclipse.emf.cdo.tests.model6.Root;

 

 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 -->

+ * <!-- 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.model6.Model6Package

  * @generated

  */

-public class Model6AdapterFactory extends AdapterFactoryImpl {

-	/**

-	 * The cached model package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected static Model6Package modelPackage;

-

-	/**

-	 * Creates an instance of the adapter factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public Model6AdapterFactory() {

-		if (modelPackage == null) {

-			modelPackage = Model6Package.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 Model6Switch<Adapter> modelSwitch = new Model6Switch<Adapter>() {

-		@Override

-		public Adapter caseRoot(Root object) {

-			return createRootAdapter();

-		}

-

-		@Override

-		public Adapter caseBaseObject(BaseObject object) {

-			return createBaseObjectAdapter();

-		}

-

-		@Override

-		public Adapter caseReferenceObject(ReferenceObject object) {

-			return createReferenceObjectAdapter();

-		}

-

-		@Override

-		public Adapter caseContainmentObject(ContainmentObject object) {

-			return createContainmentObjectAdapter();

-		}

-

-		@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.model6.Root <em>Root</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.model6.Root

-	 * @generated

-	 */

-	public Adapter createRootAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model6.BaseObject <em>Base Object</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.model6.BaseObject

-	 * @generated

-	 */

-	public Adapter createBaseObjectAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model6.ReferenceObject <em>Reference Object</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.model6.ReferenceObject

-	 * @generated

-	 */

-	public Adapter createReferenceObjectAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model6.ContainmentObject <em>Containment Object</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.model6.ContainmentObject

-	 * @generated

-	 */

-	public Adapter createContainmentObjectAdapter() {

-		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;

-	}

-

-} //Model6AdapterFactory

+public class Model6AdapterFactory extends AdapterFactoryImpl

+{

+  /**

+   * The cached model package. <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  protected static Model6Package modelPackage;

+

+  /**

+   * Creates an instance of the adapter factory. <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  public Model6AdapterFactory()

+  {

+    if (modelPackage == null)

+    {

+      modelPackage = Model6Package.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 Model6Switch<Adapter> modelSwitch = new Model6Switch<Adapter>()

+  {

+    @Override

+    public Adapter caseRoot(Root object)

+    {

+      return createRootAdapter();

+    }

+

+    @Override

+    public Adapter caseBaseObject(BaseObject object)

+    {

+      return createBaseObjectAdapter();

+    }

+

+    @Override

+    public Adapter caseReferenceObject(ReferenceObject object)

+    {

+      return createReferenceObjectAdapter();

+    }

+

+    @Override

+    public Adapter caseContainmentObject(ContainmentObject object)

+    {

+      return createContainmentObjectAdapter();

+    }

+

+    @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.model6.Root <em>Root</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.model6.Root

+   * @generated

+   */

+  public Adapter createRootAdapter()

+  {

+    return null;

+  }

+

+  /**

+   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model6.BaseObject

+   * <em>Base Object</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.model6.BaseObject

+   * @generated

+   */

+  public Adapter createBaseObjectAdapter()

+  {

+    return null;

+  }

+

+  /**

+   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model6.ReferenceObject

+   * <em>Reference Object</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.model6.ReferenceObject

+   * @generated

+   */

+  public Adapter createReferenceObjectAdapter()

+  {

+    return null;

+  }

+

+  /**

+   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.model6.ContainmentObject

+   * <em>Containment Object</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.model6.ContainmentObject

+   * @generated

+   */

+  public Adapter createContainmentObjectAdapter()

+  {

+    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;

+  }

+

+} // Model6AdapterFactory

diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/util/Model6Switch.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/util/Model6Switch.java
index af8c3df90d..e42b8e3393 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/util/Model6Switch.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/util/Model6Switch.java
@@ -10,194 +10,206 @@
  */

 package org.eclipse.emf.cdo.tests.model6.util;

 

-import java.util.List;

-

-import org.eclipse.emf.cdo.tests.model6.*;

+import org.eclipse.emf.cdo.tests.model6.BaseObject;

+import org.eclipse.emf.cdo.tests.model6.ContainmentObject;

+import org.eclipse.emf.cdo.tests.model6.Model6Package;

+import org.eclipse.emf.cdo.tests.model6.ReferenceObject;

+import org.eclipse.emf.cdo.tests.model6.Root;

 

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.EObject;

 

+import java.util.List;

+

 /**

- * <!-- 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 -->

+ * <!-- 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.model6.Model6Package

  * @generated

  */

-public class Model6Switch<T> {

-	/**

-	 * The cached model package

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected static Model6Package modelPackage;

+public class Model6Switch<T>

+{

+  /**

+   * The cached model package <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  protected static Model6Package modelPackage;

 

-	/**

-	 * Creates an instance of the switch.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public Model6Switch() {

-		if (modelPackage == null) {

-			modelPackage = Model6Package.eINSTANCE;

-		}

-	}

+  /**

+   * Creates an instance of the switch. <!-- begin-user-doc --> <!-- end-user-doc -->

+   * 

+   * @generated

+   */

+  public Model6Switch()

+  {

+    if (modelPackage == null)

+    {

+      modelPackage = Model6Package.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

+   */

+  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(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 Model6Package.ROOT: {

-			Root root = (Root) theEObject;

-			T result = caseRoot(root);

-			if (result == null)

-				result = defaultCase(theEObject);

-			return result;

-		}

-		case Model6Package.BASE_OBJECT: {

-			BaseObject baseObject = (BaseObject) theEObject;

-			T result = caseBaseObject(baseObject);

-			if (result == null)

-				result = defaultCase(theEObject);

-			return result;

-		}

-		case Model6Package.REFERENCE_OBJECT: {

-			ReferenceObject referenceObject = (ReferenceObject) theEObject;

-			T result = caseReferenceObject(referenceObject);

-			if (result == null)

-				result = caseBaseObject(referenceObject);

-			if (result == null)

-				result = defaultCase(theEObject);

-			return result;

-		}

-		case Model6Package.CONTAINMENT_OBJECT: {

-			ContainmentObject containmentObject = (ContainmentObject) theEObject;

-			T result = caseContainmentObject(containmentObject);

-			if (result == null)

-				result = caseBaseObject(containmentObject);

-			if (result == null)

-				result = defaultCase(theEObject);

-			return result;

-		}

-		default:

-			return defaultCase(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 Model6Package.ROOT:

+    {

+      Root root = (Root)theEObject;

+      T result = caseRoot(root);

+      if (result == null)

+        result = defaultCase(theEObject);

+      return result;

+    }

+    case Model6Package.BASE_OBJECT:

+    {

+      BaseObject baseObject = (BaseObject)theEObject;

+      T result = caseBaseObject(baseObject);

+      if (result == null)

+        result = defaultCase(theEObject);

+      return result;

+    }

+    case Model6Package.REFERENCE_OBJECT:

+    {

+      ReferenceObject referenceObject = (ReferenceObject)theEObject;

+      T result = caseReferenceObject(referenceObject);

+      if (result == null)

+        result = caseBaseObject(referenceObject);

+      if (result == null)

+        result = defaultCase(theEObject);

+      return result;

+    }

+    case Model6Package.CONTAINMENT_OBJECT:

+    {

+      ContainmentObject containmentObject = (ContainmentObject)theEObject;

+      T result = caseContainmentObject(containmentObject);

+      if (result == null)

+        result = caseBaseObject(containmentObject);

+      if (result == null)

+        result = defaultCase(theEObject);

+      return result;

+    }

+    default:

+      return defaultCase(theEObject);

+    }

+  }

 

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Root</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>Root</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseRoot(Root object) {

-		return null;

-	}

+  /**

+   * Returns the result of interpreting the object as an instance of '<em>Root</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>Root</em>'.

+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

+   * @generated

+   */

+  public T caseRoot(Root object)

+  {

+    return null;

+  }

 

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Base Object</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>Base Object</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseBaseObject(BaseObject object) {

-		return null;

-	}

+  /**

+   * Returns the result of interpreting the object as an instance of '<em>Base Object</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>Base Object</em>'.

+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

+   * @generated

+   */

+  public T caseBaseObject(BaseObject object)

+  {

+    return null;

+  }

 

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Reference Object</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>Reference Object</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseReferenceObject(ReferenceObject object) {

-		return null;

-	}

+  /**

+   * Returns the result of interpreting the object as an instance of '<em>Reference Object</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>Reference Object</em>'.

+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

+   * @generated

+   */

+  public T caseReferenceObject(ReferenceObject object)

+  {

+    return null;

+  }

 

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Containment Object</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>Containment Object</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseContainmentObject(ContainmentObject object) {

-		return null;

-	}

+  /**

+   * Returns the result of interpreting the object as an instance of '<em>Containment Object</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>Containment Object</em>'.

+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

+   * @generated

+   */

+  public T caseContainmentObject(ContainmentObject 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;

-	}

+  /**

+   * 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;

+  }

 

-} //Model6Switch

+} // Model6Switch