Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2009-07-09 05:24:38 +0000
committerEike Stepper2009-07-09 05:24:38 +0000
commit9543ab32dd0418949ed4840422ab3e9a3ce0c114 (patch)
tree1f74d8ae7a9b1dac5d49acc2f11198e961da4f92 /plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf
parent09070c072a8415314e9b2563471af0ce89939e2e (diff)
downloadcdo-9543ab32dd0418949ed4840422ab3e9a3ce0c114.tar.gz
cdo-9543ab32dd0418949ed4840422ab3e9a3ce0c114.tar.xz
cdo-9543ab32dd0418949ed4840422ab3e9a3ce0c114.zip
[282929] Model1.ecore changes for hibernate store tests
https://bugs.eclipse.org/bugs/show_bug.cgi?id=282929
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf')
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/MangoPackageImpl.java16
1 files changed, 6 insertions, 10 deletions
diff --git a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/MangoPackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/MangoPackageImpl.java
index fe9dfc5de8..9af72c8e02 100644
--- a/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/MangoPackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.mango/src/org/eclipse/emf/cdo/tests/mango/impl/MangoPackageImpl.java
@@ -86,15 +86,9 @@ public class MangoPackageImpl extends EPackageImpl implements MangoPackage
/**
* 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 -->
+ * This method is used to initialize {@link MangoPackage#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
@@ -108,8 +102,8 @@ public class MangoPackageImpl extends EPackageImpl implements MangoPackage
return (MangoPackage)EPackage.Registry.INSTANCE.getEPackage(MangoPackage.eNS_URI);
// Obtain or create and register package
- MangoPackageImpl theMangoPackage = (MangoPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof MangoPackageImpl ? EPackage.Registry.INSTANCE
- .getEPackage(eNS_URI)
+ MangoPackageImpl theMangoPackage = (MangoPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof MangoPackageImpl ? EPackage.Registry.INSTANCE
+ .get(eNS_URI)
: new MangoPackageImpl());
isInited = true;
@@ -123,6 +117,8 @@ public class MangoPackageImpl extends EPackageImpl implements MangoPackage
// Mark meta-data to indicate it can't be changed
theMangoPackage.freeze();
+ // Update the registry and return the package
+ EPackage.Registry.INSTANCE.put(MangoPackage.eNS_URI, theMangoPackage);
return theMangoPackage;
}

Back to the top