MetaTest

13 files changed, 330 insertions, 29 deletions

diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/model/model3.ecore b/plugins/org.eclipse.emf.cdo.tests.model3/model/model3.ecore
index 8f8b33f12a..0ab40b84a9 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/model/model3.ecore
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/model/model3.ecore
@@ -7,6 +7,9 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="class2" upperBound="-1"
         eType="#//subpackage/Class2" eOpposite="#//subpackage/Class2/class1"/>
   </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="MetaRef">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="ePackageRef" eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EPackage"/>
+  </eClassifiers>
   <eSubpackages name="subpackage" nsURI="http://www.eclipse.org/emf/CDO/tests/subpackage/1.0.0"
       nsPrefix="subpackage">
     <eClassifiers xsi:type="ecore:EClass" name="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 f4d86b95c0..4912dadca1 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/model/model3.genmodel
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/model/model3.genmodel
@@ -4,8 +4,8 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.emf.cdo.tests.model3/src"
     editorDirectory="" modelPluginID="org.eclipse.emf.cdo.tests.model3" modelName="Model3"
     rootExtendsInterface="org.eclipse.emf.cdo.CDOObject" rootExtendsClass="org.eclipse.emf.internal.cdo.CDOObjectImpl"
-    reflectiveDelegation="true" testsDirectory="" importerID="org.eclipse.emf.importer.cdo"
-    featureDelegation="Reflective" complianceLevel="5.0" copyrightFields="false">
+    reflectiveDelegation="true" codeFormatting="true" testsDirectory="" importerID="org.eclipse.emf.importer.cdo"
+    featureDelegation="Reflective" complianceLevel="5.0" copyrightFields="false" usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
   <foreignModel>model3.ecore</foreignModel>
   <modelPluginVariables>CDO=org.eclipse.emf.cdo</modelPluginVariables>
   <genPackages prefix="Model3" basePackage="org.eclipse.emf.cdo.tests" disposableProviderFactory="true"
@@ -13,6 +13,9 @@
     <genClasses ecoreClass="model3.ecore#//Class1">
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model3.ecore#//Class1/class2"/>
     </genClasses>
+    <genClasses ecoreClass="model3.ecore#//MetaRef">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model3.ecore#//MetaRef/ePackageRef"/>
+    </genClasses>
     <nestedGenPackages prefix="Subpackage" disposableProviderFactory="true" ecorePackage="model3.ecore#//subpackage">
       <genClasses ecoreClass="model3.ecore#//subpackage/Class2">
         <genFeatures notify="false" createChild="false" propertySortChoices="true"
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/MetaRef.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/MetaRef.java
new file mode 100644
index 0000000000..bd00ba88a7
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/MetaRef.java
@@ -0,0 +1,51 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: MetaRef.java,v 1.1 2008-09-08 06:55:57 estepper Exp $
+ */
+package org.eclipse.emf.cdo.tests.model3;
+
+import org.eclipse.emf.cdo.CDOObject;
+
+import org.eclipse.emf.ecore.EPackage;
+
+/**
+ * <!-- begin-user-<!-- begin-user-doc --> A representation of the model object '/b></em>'. <!-- end-'. <!--
+ * end-user-doc --> e
+ * <p>
+ * The following features are supported: >{@link or <li>se.emf.cdo.tests.model3.MetaRef#getEPackageRef <em>EPackage Ref
+ * </em>}</li> </ul>
+ * </p>
+ * 
+ * @see org.ec se.emf.cdo.tests.model3.Model3Package#getMetaRef()
+ * @model
+ * @extends CDOObject
+ * @generated
+ */
+public interface MetaRef extends CDOObject
+{
+  /**
+   * Returns the value of the '<em><b>EPackage Ref</b></em>' reference. ' reference. <!-- begin-user-doc --> he meaning
+   * of the '<em>EPackage Ref</em>' reference isn'' reference isn't clear, there really should be more of a description
+   * here... </p> doc -->
+   * 
+   * @return the val e of the '<em>EPackage Ref</em>' reference.
+   * @see #setEPackageRef(EPackage)
+   * @see org.eclipse.emf.cdo.tests.model3.Model3Package#getMetaRef_EPackageRef()
+   * @model
+   * @generated
+   */
+  EPackage getEPackageRef();
+
+  /**
+   * Sets the value of the '{@link org.eclipse.emf.cdo.tests.model3.MetaRef#getEPackageRef <em>EPackage Ref</em>}'
+   * reference. ' reference. <!-- begin-user-doc --> <!-- end-user-doc --> h new v value the new value of the '</em>'
+   * reference.
+   * 
+   * @see #getEPackageRef()
+   * @generated
+   */
+  void setEPackageRef(EPackage value);
+
+} // MetaRef
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/Model3Factory.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/Model3Factory.java
index 9cf7dbbf55..95632f4067 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/Model3Factory.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/Model3Factory.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: Model3Factory.java,v 1.1 2008-04-20 09:58:05 estepper Exp $
+ * $Id: Model3Factory.java,v 1.2 2008-09-08 06:55:57 estepper Exp $
  */
 package org.eclipse.emf.cdo.tests.model3;
 
@@ -33,6 +33,14 @@ public interface Model3Factory extends EFactory
   Class1 createClass1();
 
   /**
+   * Returns a new object of class '<em>Meta Ref</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return a new object of class '<em>Meta Ref</em>'.
+   * @generated
+   */
+  MetaRef createMetaRef();
+
+  /**
    * Returns the package supported by this factory. <!-- begin-user-doc --> <!-- end-user-doc -->
    * 
    * @return the package supported by this factory.
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/Model3Package.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/Model3Package.java
index d520ec5614..66504724b3 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/Model3Package.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/Model3Package.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: Model3Package.java,v 1.2 2008-06-03 06:41:22 estepper Exp $
+ * $Id: Model3Package.java,v 1.3 2008-09-08 06:55:57 estepper Exp $
  */
 package org.eclipse.emf.cdo.tests.model3;
 
@@ -81,6 +81,32 @@ public interface Model3Package extends EPackage
   int CLASS1_FEATURE_COUNT = 1;
 
   /**
+   * The meta object id for the '{@link org.eclipse.emf.cdo.tests.model3.impl.MetaRefImpl <em>Meta Ref</em>}' class.
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @see org.eclipse.emf.cdo.tests.model3.impl.MetaRefImpl
+   * @see org.eclipse.emf.cdo.tests.model3.impl.Model3PackageImpl#getMetaRef()
+   * @generated
+   */
+  int META_REF = 1;
+
+  /**
+   * The feature id for the '<em><b>EPackage Ref</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int META_REF__EPACKAGE_REF = 0;
+
+  /**
+   * The number of structural features of the '<em>Meta Ref</em>' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   * @ordered
+   */
+  int META_REF_FEATURE_COUNT = 1;
+
+  /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model3.Class1 <em>Class1</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
    * 
@@ -102,6 +128,27 @@ public interface Model3Package extends EPackage
   EReference getClass1_Class2();
 
   /**
+   * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.model3.MetaRef <em>Meta Ref</em>}'. <!--
+   * begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for class '<em>Meta Ref</em>'.
+   * @see org.eclipse.emf.cdo.tests.model3.MetaRef
+   * @generated
+   */
+  EClass getMetaRef();
+
+  /**
+   * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.tests.model3.MetaRef#getEPackageRef
+   * <em>EPackage Ref</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @return the meta object for the reference '<em>EPackage Ref</em>'.
+   * @see org.eclipse.emf.cdo.tests.model3.MetaRef#getEPackageRef()
+   * @see #getMetaRef()
+   * @generated
+   */
+  EReference getMetaRef_EPackageRef();
+
+  /**
    * 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.
@@ -141,6 +188,24 @@ public interface Model3Package extends EPackage
      */
     EReference CLASS1__CLASS2 = eINSTANCE.getClass1_Class2();
 
+    /**
+     * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.model3.impl.MetaRefImpl <em>Meta Ref</em>}'
+     * class. <!-- begin-user-doc --> <!-- end-user-doc -->
+     * 
+     * @see org.eclipse.emf.cdo.tests.model3.impl.MetaRefImpl
+     * @see org.eclipse.emf.cdo.tests.model3.impl.Model3PackageImpl#getMetaRef()
+     * @generated
+     */
+    EClass META_REF = eINSTANCE.getMetaRef();
+
+    /**
+     * The meta object literal for the '<em><b>EPackage Ref</b></em>' reference feature. <!-- begin-user-doc --> <!--
+     * end-user-doc -->
+     * 
+     * @generated
+     */
+    EReference META_REF__EPACKAGE_REF = eINSTANCE.getMetaRef_EPackageRef();
+
   }
 
 } // Model3Package
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/MetaRefImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/MetaRefImpl.java
new file mode 100644
index 0000000000..948de89d00
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/MetaRefImpl.java
@@ -0,0 +1,83 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: MetaRefImpl.java,v 1.1 2008-09-08 06:55:56 estepper Exp $
+ */
+package org.eclipse.emf.cdo.tests.model3.impl;
+
+import org.eclipse.emf.cdo.tests.model3.MetaRef;
+import org.eclipse.emf.cdo.tests.model3.Model3Package;
+
+import org.eclipse.emf.internal.cdo.CDOObjectImpl;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EPackage;
+
+/**
+ * <!-- import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EPackage; begin-user-doc --> An implementation
+ * of the model object '<em><b>Meta Ref</b></em>'. <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.emf.cdo.tests.model3.impl.MetaRefImpl#getEPackageRef <em>EPackage Ref</em>}</li>
+ * </ul>
+ * </p>
+ * 
+ * @generated
+ */
+public class MetaRefImpl extends CDOObjectImpl implements MetaRef
+{
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  protected MetaRefImpl()
+  {
+    super();
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return Model3Package.Literals.META_REF;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  @Override
+  protected int eStaticFeatureCount()
+  {
+    return 0;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EPackage getEPackageRef()
+  {
+    return (EPackage)eGet(Model3Package.Literals.META_REF__EPACKAGE_REF, true);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public void setEPackageRef(EPackage newEPackageRef)
+  {
+    eSet(Model3Package.Literals.META_REF__EPACKAGE_REF, newEPackageRef);
+  }
+
+} // MetaRefImpl
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/Model3FactoryImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/Model3FactoryImpl.java
index 88bfb48a38..4f2463039b 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/Model3FactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/Model3FactoryImpl.java
@@ -2,11 +2,12 @@
  * <copyright>
  * </copyright>
  *
- * $Id: Model3FactoryImpl.java,v 1.2 2008-08-11 05:11:48 estepper Exp $
+ * $Id: Model3FactoryImpl.java,v 1.3 2008-09-08 06:55:56 estepper Exp $
  */
 package org.eclipse.emf.cdo.tests.model3.impl;
 
 import org.eclipse.emf.cdo.tests.model3.Class1;
+import org.eclipse.emf.cdo.tests.model3.MetaRef;
 import org.eclipse.emf.cdo.tests.model3.Model3Factory;
 import org.eclipse.emf.cdo.tests.model3.Model3Package;
 
@@ -67,7 +68,9 @@ public class Model3FactoryImpl extends EFactoryImpl implements Model3Factory
     switch (eClass.getClassifierID())
     {
     case Model3Package.CLASS1:
-      return createClass1();
+      return (EObject)createClass1();
+    case Model3Package.META_REF:
+      return (EObject)createMetaRef();
     default:
       throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
     }
@@ -89,6 +92,17 @@ public class Model3FactoryImpl extends EFactoryImpl implements Model3Factory
    * 
    * @generated
    */
+  public MetaRef createMetaRef()
+  {
+    MetaRefImpl metaRef = new MetaRefImpl();
+    return metaRef;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
   public Model3Package getModel3Package()
   {
     return (Model3Package)getEPackage();
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/Model3PackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/Model3PackageImpl.java
index 41d529d04e..bdcc3d754e 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/Model3PackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/Model3PackageImpl.java
@@ -2,11 +2,12 @@
  * <copyright>
  * </copyright>
  *
- * $Id: Model3PackageImpl.java,v 1.3 2008-08-11 05:11:48 estepper Exp $
+ * $Id: Model3PackageImpl.java,v 1.4 2008-09-08 06:55:56 estepper Exp $
  */
 package org.eclipse.emf.cdo.tests.model3.impl;
 
 import org.eclipse.emf.cdo.tests.model3.Class1;
+import org.eclipse.emf.cdo.tests.model3.MetaRef;
 import org.eclipse.emf.cdo.tests.model3.Model3Factory;
 import org.eclipse.emf.cdo.tests.model3.Model3Package;
 import org.eclipse.emf.cdo.tests.model3.subpackage.SubpackagePackage;
@@ -15,6 +16,7 @@ import org.eclipse.emf.cdo.tests.model3.subpackage.impl.SubpackagePackageImpl;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.EcorePackage;
 import org.eclipse.emf.ecore.impl.EPackageImpl;
 
 /**
@@ -32,6 +34,13 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package
   private EClass class1EClass = null;
 
   /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  private EClass metaRefEClass = 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>
@@ -77,9 +86,7 @@ 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.getEPackage(eNS_URI) instanceof Model3PackageImpl ? EPackage.Registry.INSTANCE
@@ -88,6 +95,9 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package
 
     isInited = true;
 
+    // Initialize simple dependencies
+    EcorePackage.eINSTANCE.eClass();
+
     // Obtain or create and register interdependencies
     SubpackagePackageImpl theSubpackagePackage = (SubpackagePackageImpl)(EPackage.Registry.INSTANCE
         .getEPackage(SubpackagePackage.eNS_URI) instanceof SubpackagePackageImpl ? EPackage.Registry.INSTANCE
@@ -132,6 +142,26 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package
    * 
    * @generated
    */
+  public EClass getMetaRef()
+  {
+    return metaRefEClass;
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
+  public EReference getMetaRef_EPackageRef()
+  {
+    return (EReference)metaRefEClass.getEStructuralFeatures().get(0);
+  }
+
+  /**
+   * <!-- begin-user-doc --> <!-- end-user-doc -->
+   * 
+   * @generated
+   */
   public Model3Factory getModel3Factory()
   {
     return (Model3Factory)getEFactoryInstance();
@@ -153,14 +183,15 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package
   public void createPackageContents()
   {
     if (isCreated)
-    {
       return;
-    }
     isCreated = true;
 
     // Create classes and their features
     class1EClass = createEClass(CLASS1);
     createEReference(class1EClass, CLASS1__CLASS2);
+
+    metaRefEClass = createEClass(META_REF);
+    createEReference(metaRefEClass, META_REF__EPACKAGE_REF);
   }
 
   /**
@@ -179,9 +210,7 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package
   public void initializePackageContents()
   {
     if (isInitialized)
-    {
       return;
-    }
     isInitialized = true;
 
     // Initialize package
@@ -192,6 +221,7 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package
     // Obtain other dependent packages
     SubpackagePackage theSubpackagePackage = (SubpackagePackage)EPackage.Registry.INSTANCE
         .getEPackage(SubpackagePackage.eNS_URI);
+    EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
 
     // Add subpackages
     getESubpackages().add(theSubpackagePackage);
@@ -208,6 +238,11 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package
         "class2", null, 0, -1, Class1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
         IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
+    initEClass(metaRefEClass, MetaRef.class, "MetaRef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getMetaRef_EPackageRef(), theEcorePackage.getEPackage(), null, "ePackageRef", null, 0, 1,
+        MetaRef.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);
   }
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/impl/SubpackageFactoryImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/impl/SubpackageFactoryImpl.java
index 68f3b9e37f..abfdfd9861 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/impl/SubpackageFactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/impl/SubpackageFactoryImpl.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: SubpackageFactoryImpl.java,v 1.2 2008-08-11 05:11:48 estepper Exp $
+ * $Id: SubpackageFactoryImpl.java,v 1.3 2008-09-08 06:55:57 estepper Exp $
  */
 package org.eclipse.emf.cdo.tests.model3.subpackage.impl;
 
@@ -67,7 +67,7 @@ public class SubpackageFactoryImpl extends EFactoryImpl implements SubpackageFac
     switch (eClass.getClassifierID())
     {
     case SubpackagePackage.CLASS2:
-      return createClass2();
+      return (EObject)createClass2();
     default:
       throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
     }
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/impl/SubpackagePackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/impl/SubpackagePackageImpl.java
index ba3dda0e83..be7fd9c9b4 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/impl/SubpackagePackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/impl/SubpackagePackageImpl.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: SubpackagePackageImpl.java,v 1.3 2008-08-11 05:11:48 estepper Exp $
+ * $Id: SubpackagePackageImpl.java,v 1.4 2008-09-08 06:55:57 estepper Exp $
  */
 package org.eclipse.emf.cdo.tests.model3.subpackage.impl;
 
@@ -15,6 +15,7 @@ import org.eclipse.emf.cdo.tests.model3.subpackage.SubpackagePackage;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.EcorePackage;
 import org.eclipse.emf.ecore.impl.EPackageImpl;
 
 /**
@@ -77,9 +78,7 @@ public class SubpackagePackageImpl extends EPackageImpl implements SubpackagePac
   public static SubpackagePackage init()
   {
     if (isInited)
-    {
       return (SubpackagePackage)EPackage.Registry.INSTANCE.getEPackage(SubpackagePackage.eNS_URI);
-    }
 
     // Obtain or create and register package
     SubpackagePackageImpl theSubpackagePackage = (SubpackagePackageImpl)(EPackage.Registry.INSTANCE
@@ -88,6 +87,9 @@ public class SubpackagePackageImpl extends EPackageImpl implements SubpackagePac
 
     isInited = true;
 
+    // Initialize simple dependencies
+    EcorePackage.eINSTANCE.eClass();
+
     // Obtain or create and register interdependencies
     Model3PackageImpl theModel3Package = (Model3PackageImpl)(EPackage.Registry.INSTANCE
         .getEPackage(Model3Package.eNS_URI) instanceof Model3PackageImpl ? EPackage.Registry.INSTANCE
@@ -153,9 +155,7 @@ public class SubpackagePackageImpl extends EPackageImpl implements SubpackagePac
   public void createPackageContents()
   {
     if (isCreated)
-    {
       return;
-    }
     isCreated = true;
 
     // Create classes and their features
@@ -179,9 +179,7 @@ public class SubpackagePackageImpl extends EPackageImpl implements SubpackagePac
   public void initializePackageContents()
   {
     if (isInitialized)
-    {
       return;
-    }
     isInitialized = true;
 
     // Initialize package
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 7f7d6ff7d9..a585d5ff1f 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
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: SubpackageSwitch.java,v 1.3 2008-08-11 05:11:48 estepper Exp $
+ * $Id: SubpackageSwitch.java,v 1.4 2008-09-08 06:55:57 estepper Exp $
  */
 package org.eclipse.emf.cdo.tests.model3.subpackage.util;
 
@@ -93,9 +93,7 @@ public class SubpackageSwitch<T>
       Class2 class2 = (Class2)theEObject;
       T result = caseClass2(class2);
       if (result == null)
-      {
         result = defaultCase(theEObject);
-      }
       return result;
     }
     default:
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/util/Model3AdapterFactory.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/util/Model3AdapterFactory.java
index 3230fce621..b827f74d81 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/util/Model3AdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/util/Model3AdapterFactory.java
@@ -2,11 +2,12 @@
  * <copyright>
  * </copyright>
  *
- * $Id: Model3AdapterFactory.java,v 1.1 2008-04-20 09:58:05 estepper Exp $
+ * $Id: Model3AdapterFactory.java,v 1.2 2008-09-08 06:55:57 estepper Exp $
  */
 package org.eclipse.emf.cdo.tests.model3.util;
 
 import org.eclipse.emf.cdo.tests.model3.Class1;
+import org.eclipse.emf.cdo.tests.model3.MetaRef;
 import org.eclipse.emf.cdo.tests.model3.Model3Package;
 
 import org.eclipse.emf.common.notify.Adapter;
@@ -79,6 +80,12 @@ public class Model3AdapterFactory extends AdapterFactoryImpl
     }
 
     @Override
+    public Adapter caseMetaRef(MetaRef object)
+    {
+      return createMetaRefAdapter();
+    }
+
+    @Override
     public Adapter defaultCase(EObject object)
     {
       return createEObjectAdapter();
@@ -114,6 +121,20 @@ public class Model3AdapterFactory extends AdapterFactoryImpl
   }
 
   /**
+   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.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.model3.MetaRef
+   * @generated
+   */
+  public Adapter createMetaRefAdapter()
+  {
+    return null;
+  }
+
+  /**
    * Creates a new adapter for the default case. <!-- begin-user-doc --> This default implementation returns null. <!--
    * end-user-doc -->
    * 
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 5b3bf3118d..ea705032fc 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
@@ -2,11 +2,12 @@
  * <copyright>
  * </copyright>
  *
- * $Id: Model3Switch.java,v 1.3 2008-08-11 05:11:48 estepper Exp $
+ * $Id: Model3Switch.java,v 1.4 2008-09-08 06:55:57 estepper Exp $
  */
 package org.eclipse.emf.cdo.tests.model3.util;
 
 import org.eclipse.emf.cdo.tests.model3.Class1;
+import org.eclipse.emf.cdo.tests.model3.MetaRef;
 import org.eclipse.emf.cdo.tests.model3.Model3Package;
 
 import org.eclipse.emf.ecore.EClass;
@@ -93,9 +94,15 @@ public class Model3Switch<T>
       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;
     }
     default:
@@ -119,6 +126,21 @@ public class Model3Switch<T>
   }
 
   /**
+   * 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>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 -->