[282929] Model1.ecore changes for hibernate store tests

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

1 files changed, 6 insertions, 10 deletions

diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/impl/model4interfacesPackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/impl/model4interfacesPackageImpl.java
index 1e3d295cd6..e9c6aff276 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/impl/model4interfacesPackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/impl/model4interfacesPackageImpl.java
@@ -165,16 +165,10 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i
 
   /**
    * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-   * Simple dependencies are satisfied by calling this method on all dependent packages before doing anything else. This
-   * method drives initialization for interdependent packages directly, in parallel with this package, itself.
    * <p>
-   * Of this package and its interdependencies, all packages which have not yet been registered by their URI values are
-   * first created and registered. The packages are then initialized in two steps: meta-model objects for all of the
-   * packages are created before any are initialized, since one package's meta-model objects may refer to those of
-   * another.
-   * <p>
-   * Invocation of this method will not affect any packages that have already been initialized. <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
+   * This method is used to initialize {@link model4interfacesPackage#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()
@@ -188,7 +182,7 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i
 
     // Obtain or create and register package
     model4interfacesPackageImpl themodel4interfacesPackage = (model4interfacesPackageImpl)(EPackage.Registry.INSTANCE
-        .getEPackage(eNS_URI) instanceof model4interfacesPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI)
+        .get(eNS_URI) instanceof model4interfacesPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI)
         : new model4interfacesPackageImpl());
 
     isInited = true;
@@ -202,6 +196,8 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i
     // Mark meta-data to indicate it can't be changed
     themodel4interfacesPackage.freeze();
 
+    // Update the registry and return the package
+    EPackage.Registry.INSTANCE.put(model4interfacesPackage.eNS_URI, themodel4interfacesPackage);
     return themodel4interfacesPackage;
   }