Download
Getting Started
Members
Projects
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
More
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
Toggle navigation
Bugzilla – Attachment 135087 Details for
Bug 275476
EPackage.Registry.INSTANCE.getEPackage(String) returns null after package is initiated.
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
Terms of Use
|
Copyright Agent
Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read
this important communication.
[patch]
Updated template and regenerated EMF models
275476.patch (text/plain), 312.39 KB, created by
Dave Steinberg
on 2009-05-10 20:59:22 EDT
(
hide
)
Description:
Updated template and regenerated EMF models
Filename:
MIME Type:
Creator:
Dave Steinberg
Created:
2009-05-10 20:59:22 EDT
Size:
312.39 KB
patch
obsolete
>### Eclipse Workspace Patch 1.0 >#P org.eclipse.emf.codegen.ecore >Index: templates/model/PackageClass.javajet >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/plugins/org.eclipse.emf.codegen.ecore/templates/model/PackageClass.javajet,v >retrieving revision 1.45 >diff -u -r1.45 PackageClass.javajet >--- templates/model/PackageClass.javajet 18 Apr 2009 11:21:28 -0000 1.45 >+++ templates/model/PackageClass.javajet 11 May 2009 00:54:31 -0000 >@@ -236,20 +236,10 @@ > private static boolean isInited = false; > > /** >- * 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. >+ * 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 <%=genPackage.getImportedPackageInterfaceName()%>#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 >@@ -340,6 +330,9 @@ > the<%=genPackage.getBasicPackageName()%>.freeze(); > > <%}%> >+ >+ // Update the registry and return the package >+ <%=genModel.getImportedName("org.eclipse.emf.ecore.EPackage")%>.Registry.INSTANCE.put(<%=genPackage.getImportedPackageInterfaceName()%>.eNS_URI, the<%=genPackage.getBasicPackageName()%>); > return the<%=genPackage.getBasicPackageName()%>; > } > >Index: src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenModelPackageImpl.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenModelPackageImpl.java,v >retrieving revision 1.59 >diff -u -r1.59 GenModelPackageImpl.java >--- src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenModelPackageImpl.java 18 Apr 2009 11:38:01 -0000 1.59 >+++ src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenModelPackageImpl.java 11 May 2009 00:54:29 -0000 >@@ -228,20 +228,10 @@ > private static boolean isInited = false; > > /** >- * 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. >+ * 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 GenModelPackage#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 >@@ -281,6 +271,9 @@ > // Mark meta-data to indicate it can't be changed > theGenModelPackage.freeze(); > >+ >+ // Update the registry and return the package >+ EPackage.Registry.INSTANCE.put(GenModelPackage.eNS_URI, theGenModelPackage); > return theGenModelPackage; > } > >Index: src/org/eclipse/emf/codegen/ecore/templates/model/PackageClass.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/templates/model/PackageClass.java,v >retrieving revision 1.46 >diff -u -r1.46 PackageClass.java >--- src/org/eclipse/emf/codegen/ecore/templates/model/PackageClass.java 18 Apr 2009 11:21:28 -0000 1.46 >+++ src/org/eclipse/emf/codegen/ecore/templates/model/PackageClass.java 11 May 2009 00:54:31 -0000 >@@ -103,248 +103,248 @@ > protected final String TEXT_83 = NL + "\t/**" + NL + "\t * Creates an instance of the model <b>Package</b>, registered with" + NL + "\t * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package" + NL + "\t * package URI value." + NL + "\t * <p>Note: the correct way to create the package is via the static" + NL + "\t * factory method {@link #init init()}, which also performs" + NL + "\t * initialization of the package, or returns the registered package," + NL + "\t * if one already exists." + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @see org.eclipse.emf.ecore.EPackage.Registry" + NL + "\t * @see "; > protected final String TEXT_84 = "#eNS_URI" + NL + "\t * @see #init()" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate "; > protected final String TEXT_85 = "()" + NL + "\t{" + NL + "\t\tsuper(eNS_URI, "; >- protected final String TEXT_86 = ");" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate static boolean isInited = false;" + NL + "" + NL + "\t/**" + NL + "\t * Creates, registers, and initializes the <b>Package</b> for this" + NL + "\t * model, and for any others upon which it depends. Simple" + NL + "\t * dependencies are satisfied by calling this method on all" + NL + "\t * dependent packages before doing anything else. This method drives" + NL + "\t * initialization for interdependent packages directly, in parallel" + NL + "\t * with this package, itself." + NL + "\t * <p>Of this package and its interdependencies, all packages which" + NL + "\t * have not yet been registered by their URI values are first created" + NL + "\t * and registered. The packages are then initialized in two steps:" + NL + "\t * meta-model objects for all of the packages are created before any" + NL + "\t * are initialized, since one package's meta-model objects may refer to" + NL + "\t * those of another." + NL + "\t * <p>Invocation of this method will not affect any packages that have" + NL + "\t * already been initialized." + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @see #eNS_URI"; >- protected final String TEXT_87 = NL + "\t * @see #createPackageContents()" + NL + "\t * @see #initializePackageContents()"; >- protected final String TEXT_88 = NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic static "; >- protected final String TEXT_89 = " init()" + NL + "\t{" + NL + "\t\tif (isInited) return ("; >- protected final String TEXT_90 = ")"; >- protected final String TEXT_91 = ".Registry.INSTANCE.getEPackage("; >- protected final String TEXT_92 = ".eNS_URI);" + NL + "" + NL + "\t\t// Obtain or create and register package" + NL + "\t\t"; >- protected final String TEXT_93 = " the"; >- protected final String TEXT_94 = " = ("; >- protected final String TEXT_95 = ")("; >- protected final String TEXT_96 = ".Registry.INSTANCE.get(eNS_URI) instanceof "; >- protected final String TEXT_97 = " ? "; >- protected final String TEXT_98 = ".Registry.INSTANCE.get(eNS_URI) : new "; >- protected final String TEXT_99 = "());" + NL + "" + NL + "\t\tisInited = true;" + NL; >- protected final String TEXT_100 = NL + "\t\t// Initialize simple dependencies"; >- protected final String TEXT_101 = NL + "\t\t"; >- protected final String TEXT_102 = ".eINSTANCE.eClass();"; >- protected final String TEXT_103 = NL; >- protected final String TEXT_104 = NL + "\t\t// Obtain or create and register interdependencies"; >- protected final String TEXT_105 = NL + "\t\t"; >- protected final String TEXT_106 = " "; >- protected final String TEXT_107 = " = ("; >- protected final String TEXT_108 = ")("; >- protected final String TEXT_109 = ".Registry.INSTANCE.getEPackage("; >- protected final String TEXT_110 = ".eNS_URI) instanceof "; >- protected final String TEXT_111 = " ? "; >- protected final String TEXT_112 = ".Registry.INSTANCE.getEPackage("; >- protected final String TEXT_113 = ".eNS_URI) : "; >- protected final String TEXT_114 = ".eINSTANCE);"; >- protected final String TEXT_115 = NL; >- protected final String TEXT_116 = NL + "\t\t// Load packages"; >- protected final String TEXT_117 = NL + "\t\tthe"; >- protected final String TEXT_118 = ".loadPackage();"; >- protected final String TEXT_119 = NL + "\t\t"; >- protected final String TEXT_120 = ".loadPackage();"; >- protected final String TEXT_121 = NL; >- protected final String TEXT_122 = NL + "\t\t// Create package meta-data objects"; >- protected final String TEXT_123 = NL + "\t\tthe"; >- protected final String TEXT_124 = ".createPackageContents();"; >- protected final String TEXT_125 = NL + "\t\t"; >- protected final String TEXT_126 = ".createPackageContents();"; >- protected final String TEXT_127 = NL + NL + "\t\t// Initialize created meta-data"; >- protected final String TEXT_128 = NL + "\t\tthe"; >- protected final String TEXT_129 = ".initializePackageContents();"; >- protected final String TEXT_130 = NL + "\t\t"; >- protected final String TEXT_131 = ".initializePackageContents();"; >- protected final String TEXT_132 = NL; >- protected final String TEXT_133 = NL + "\t\t// Fix loaded packages"; >- protected final String TEXT_134 = NL + "\t\tthe"; >- protected final String TEXT_135 = ".fixPackageContents();"; >- protected final String TEXT_136 = NL + "\t\t"; >- protected final String TEXT_137 = ".fixPackageContents();"; >- protected final String TEXT_138 = NL; >- protected final String TEXT_139 = NL + "\t\t// Register package validator" + NL + "\t\t"; >- protected final String TEXT_140 = ".Registry.INSTANCE.put" + NL + "\t\t\t(the"; >- protected final String TEXT_141 = ", " + NL + "\t\t\t new "; >- protected final String TEXT_142 = ".Descriptor()" + NL + "\t\t\t {" + NL + "\t\t\t\t public "; >- protected final String TEXT_143 = " getEValidator()" + NL + "\t\t\t\t {" + NL + "\t\t\t\t\t return "; >- protected final String TEXT_144 = ".INSTANCE;" + NL + "\t\t\t\t }" + NL + "\t\t\t });" + NL; >- protected final String TEXT_145 = NL + "\t\t// Mark meta-data to indicate it can't be changed" + NL + "\t\tthe"; >- protected final String TEXT_146 = ".freeze();" + NL; >- protected final String TEXT_147 = NL + "\t\treturn the"; >- protected final String TEXT_148 = ";" + NL + "\t}" + NL; >- protected final String TEXT_149 = NL; >- protected final String TEXT_150 = NL + "\t/**"; >- protected final String TEXT_151 = NL + "\t * Returns the meta object for class '{@link "; >- protected final String TEXT_152 = " <em>"; >- protected final String TEXT_153 = "</em>}'." + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @return the meta object for class '<em>"; >- protected final String TEXT_154 = "</em>'." + NL + "\t * @see "; >- protected final String TEXT_155 = NL + "\t * @model "; >- protected final String TEXT_156 = NL + "\t * "; >- protected final String TEXT_157 = NL + "\t * @model"; >- protected final String TEXT_158 = NL + "\t * Returns the meta object for enum '{@link "; >- protected final String TEXT_159 = " <em>"; >- protected final String TEXT_160 = "</em>}'." + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @return the meta object for enum '<em>"; >- protected final String TEXT_161 = "</em>'." + NL + "\t * @see "; >- protected final String TEXT_162 = NL + "\t * Returns the meta object for data type '<em>"; >- protected final String TEXT_163 = "</em>'."; >- protected final String TEXT_164 = NL + "\t * Returns the meta object for data type '{@link "; >- protected final String TEXT_165 = " <em>"; >- protected final String TEXT_166 = "</em>}'."; >- protected final String TEXT_167 = NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @return the meta object for data type '<em>"; >- protected final String TEXT_168 = "</em>'."; >- protected final String TEXT_169 = NL + "\t * @see "; >- protected final String TEXT_170 = NL + "\t * @model "; >- protected final String TEXT_171 = NL + "\t * "; >- protected final String TEXT_172 = NL + "\t * @model"; >- protected final String TEXT_173 = NL + "\t * @generated" + NL + "\t */"; >- protected final String TEXT_174 = NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */"; >- protected final String TEXT_175 = NL + "\tpublic "; >- protected final String TEXT_176 = " get"; >- protected final String TEXT_177 = "()" + NL + "\t{"; >- protected final String TEXT_178 = NL + "\t\tif ("; >- protected final String TEXT_179 = " == null)" + NL + "\t\t{" + NL + "\t\t\t"; >- protected final String TEXT_180 = " = ("; >- protected final String TEXT_181 = ")"; >- protected final String TEXT_182 = ".Registry.INSTANCE.getEPackage("; >- protected final String TEXT_183 = ".eNS_URI).getEClassifiers().get("; >- protected final String TEXT_184 = ");" + NL + "\t\t}"; >- protected final String TEXT_185 = NL + "\t\treturn "; >- protected final String TEXT_186 = ";" + NL + "\t}" + NL; >- protected final String TEXT_187 = NL + "\t"; >- protected final String TEXT_188 = " get"; >- protected final String TEXT_189 = "();" + NL; >- protected final String TEXT_190 = NL + "\t/**" + NL + "\t * Returns the meta object for the "; >- protected final String TEXT_191 = " '{@link "; >- protected final String TEXT_192 = "#"; >- protected final String TEXT_193 = " <em>"; >- protected final String TEXT_194 = "</em>}'." + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @return the meta object for the "; >- protected final String TEXT_195 = " '<em>"; >- protected final String TEXT_196 = "</em>'." + NL + "\t * @see "; >- protected final String TEXT_197 = "#"; >- protected final String TEXT_198 = "()"; >- protected final String TEXT_199 = NL + "\t * @see #get"; >- protected final String TEXT_200 = "()" + NL + "\t * @generated" + NL + "\t */"; >- protected final String TEXT_201 = NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */"; >- protected final String TEXT_202 = NL + "\tpublic "; >- protected final String TEXT_203 = " get"; >- protected final String TEXT_204 = "()" + NL + "\t{"; >- protected final String TEXT_205 = NL + "\t\treturn ("; >- protected final String TEXT_206 = ")"; >- protected final String TEXT_207 = ".getEStructuralFeatures().get("; >- protected final String TEXT_208 = ");"; >- protected final String TEXT_209 = NL + " return ("; >- protected final String TEXT_210 = ")get"; >- protected final String TEXT_211 = "().getEStructuralFeatures().get("; >+ protected final String TEXT_86 = ");" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate static boolean isInited = false;" + NL + "" + NL + "\t/**" + NL + "\t * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends." + NL + "\t * " + NL + "\t * <p>This method is used to initialize {@link "; >+ protected final String TEXT_87 = "#eINSTANCE} when that field is accessed." + NL + "\t * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package." + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @see #eNS_URI"; >+ protected final String TEXT_88 = NL + "\t * @see #createPackageContents()" + NL + "\t * @see #initializePackageContents()"; >+ protected final String TEXT_89 = NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic static "; >+ protected final String TEXT_90 = " init()" + NL + "\t{" + NL + "\t\tif (isInited) return ("; >+ protected final String TEXT_91 = ")"; >+ protected final String TEXT_92 = ".Registry.INSTANCE.getEPackage("; >+ protected final String TEXT_93 = ".eNS_URI);" + NL + "" + NL + "\t\t// Obtain or create and register package" + NL + "\t\t"; >+ protected final String TEXT_94 = " the"; >+ protected final String TEXT_95 = " = ("; >+ protected final String TEXT_96 = ")("; >+ protected final String TEXT_97 = ".Registry.INSTANCE.get(eNS_URI) instanceof "; >+ protected final String TEXT_98 = " ? "; >+ protected final String TEXT_99 = ".Registry.INSTANCE.get(eNS_URI) : new "; >+ protected final String TEXT_100 = "());" + NL + "" + NL + "\t\tisInited = true;" + NL; >+ protected final String TEXT_101 = NL + "\t\t// Initialize simple dependencies"; >+ protected final String TEXT_102 = NL + "\t\t"; >+ protected final String TEXT_103 = ".eINSTANCE.eClass();"; >+ protected final String TEXT_104 = NL; >+ protected final String TEXT_105 = NL + "\t\t// Obtain or create and register interdependencies"; >+ protected final String TEXT_106 = NL + "\t\t"; >+ protected final String TEXT_107 = " "; >+ protected final String TEXT_108 = " = ("; >+ protected final String TEXT_109 = ")("; >+ protected final String TEXT_110 = ".Registry.INSTANCE.getEPackage("; >+ protected final String TEXT_111 = ".eNS_URI) instanceof "; >+ protected final String TEXT_112 = " ? "; >+ protected final String TEXT_113 = ".Registry.INSTANCE.getEPackage("; >+ protected final String TEXT_114 = ".eNS_URI) : "; >+ protected final String TEXT_115 = ".eINSTANCE);"; >+ protected final String TEXT_116 = NL; >+ protected final String TEXT_117 = NL + "\t\t// Load packages"; >+ protected final String TEXT_118 = NL + "\t\tthe"; >+ protected final String TEXT_119 = ".loadPackage();"; >+ protected final String TEXT_120 = NL + "\t\t"; >+ protected final String TEXT_121 = ".loadPackage();"; >+ protected final String TEXT_122 = NL; >+ protected final String TEXT_123 = NL + "\t\t// Create package meta-data objects"; >+ protected final String TEXT_124 = NL + "\t\tthe"; >+ protected final String TEXT_125 = ".createPackageContents();"; >+ protected final String TEXT_126 = NL + "\t\t"; >+ protected final String TEXT_127 = ".createPackageContents();"; >+ protected final String TEXT_128 = NL + NL + "\t\t// Initialize created meta-data"; >+ protected final String TEXT_129 = NL + "\t\tthe"; >+ protected final String TEXT_130 = ".initializePackageContents();"; >+ protected final String TEXT_131 = NL + "\t\t"; >+ protected final String TEXT_132 = ".initializePackageContents();"; >+ protected final String TEXT_133 = NL; >+ protected final String TEXT_134 = NL + "\t\t// Fix loaded packages"; >+ protected final String TEXT_135 = NL + "\t\tthe"; >+ protected final String TEXT_136 = ".fixPackageContents();"; >+ protected final String TEXT_137 = NL + "\t\t"; >+ protected final String TEXT_138 = ".fixPackageContents();"; >+ protected final String TEXT_139 = NL; >+ protected final String TEXT_140 = NL + "\t\t// Register package validator" + NL + "\t\t"; >+ protected final String TEXT_141 = ".Registry.INSTANCE.put" + NL + "\t\t\t(the"; >+ protected final String TEXT_142 = ", " + NL + "\t\t\t new "; >+ protected final String TEXT_143 = ".Descriptor()" + NL + "\t\t\t {" + NL + "\t\t\t\t public "; >+ protected final String TEXT_144 = " getEValidator()" + NL + "\t\t\t\t {" + NL + "\t\t\t\t\t return "; >+ protected final String TEXT_145 = ".INSTANCE;" + NL + "\t\t\t\t }" + NL + "\t\t\t });" + NL; >+ protected final String TEXT_146 = NL + "\t\t// Mark meta-data to indicate it can't be changed" + NL + "\t\tthe"; >+ protected final String TEXT_147 = ".freeze();" + NL; >+ protected final String TEXT_148 = NL + " " + NL + "\t\t// Update the registry and return the package" + NL + "\t\t"; >+ protected final String TEXT_149 = ".Registry.INSTANCE.put("; >+ protected final String TEXT_150 = ".eNS_URI, the"; >+ protected final String TEXT_151 = ");" + NL + "\t\treturn the"; >+ protected final String TEXT_152 = ";" + NL + "\t}" + NL; >+ protected final String TEXT_153 = NL; >+ protected final String TEXT_154 = NL + "\t/**"; >+ protected final String TEXT_155 = NL + "\t * Returns the meta object for class '{@link "; >+ protected final String TEXT_156 = " <em>"; >+ protected final String TEXT_157 = "</em>}'." + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @return the meta object for class '<em>"; >+ protected final String TEXT_158 = "</em>'." + NL + "\t * @see "; >+ protected final String TEXT_159 = NL + "\t * @model "; >+ protected final String TEXT_160 = NL + "\t * "; >+ protected final String TEXT_161 = NL + "\t * @model"; >+ protected final String TEXT_162 = NL + "\t * Returns the meta object for enum '{@link "; >+ protected final String TEXT_163 = " <em>"; >+ protected final String TEXT_164 = "</em>}'." + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @return the meta object for enum '<em>"; >+ protected final String TEXT_165 = "</em>'." + NL + "\t * @see "; >+ protected final String TEXT_166 = NL + "\t * Returns the meta object for data type '<em>"; >+ protected final String TEXT_167 = "</em>'."; >+ protected final String TEXT_168 = NL + "\t * Returns the meta object for data type '{@link "; >+ protected final String TEXT_169 = " <em>"; >+ protected final String TEXT_170 = "</em>}'."; >+ protected final String TEXT_171 = NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @return the meta object for data type '<em>"; >+ protected final String TEXT_172 = "</em>'."; >+ protected final String TEXT_173 = NL + "\t * @see "; >+ protected final String TEXT_174 = NL + "\t * @model "; >+ protected final String TEXT_175 = NL + "\t * "; >+ protected final String TEXT_176 = NL + "\t * @model"; >+ protected final String TEXT_177 = NL + "\t * @generated" + NL + "\t */"; >+ protected final String TEXT_178 = NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */"; >+ protected final String TEXT_179 = NL + "\tpublic "; >+ protected final String TEXT_180 = " get"; >+ protected final String TEXT_181 = "()" + NL + "\t{"; >+ protected final String TEXT_182 = NL + "\t\tif ("; >+ protected final String TEXT_183 = " == null)" + NL + "\t\t{" + NL + "\t\t\t"; >+ protected final String TEXT_184 = " = ("; >+ protected final String TEXT_185 = ")"; >+ protected final String TEXT_186 = ".Registry.INSTANCE.getEPackage("; >+ protected final String TEXT_187 = ".eNS_URI).getEClassifiers().get("; >+ protected final String TEXT_188 = ");" + NL + "\t\t}"; >+ protected final String TEXT_189 = NL + "\t\treturn "; >+ protected final String TEXT_190 = ";" + NL + "\t}" + NL; >+ protected final String TEXT_191 = NL + "\t"; >+ protected final String TEXT_192 = " get"; >+ protected final String TEXT_193 = "();" + NL; >+ protected final String TEXT_194 = NL + "\t/**" + NL + "\t * Returns the meta object for the "; >+ protected final String TEXT_195 = " '{@link "; >+ protected final String TEXT_196 = "#"; >+ protected final String TEXT_197 = " <em>"; >+ protected final String TEXT_198 = "</em>}'." + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @return the meta object for the "; >+ protected final String TEXT_199 = " '<em>"; >+ protected final String TEXT_200 = "</em>'." + NL + "\t * @see "; >+ protected final String TEXT_201 = "#"; >+ protected final String TEXT_202 = "()"; >+ protected final String TEXT_203 = NL + "\t * @see #get"; >+ protected final String TEXT_204 = "()" + NL + "\t * @generated" + NL + "\t */"; >+ protected final String TEXT_205 = NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */"; >+ protected final String TEXT_206 = NL + "\tpublic "; >+ protected final String TEXT_207 = " get"; >+ protected final String TEXT_208 = "()" + NL + "\t{"; >+ protected final String TEXT_209 = NL + "\t\treturn ("; >+ protected final String TEXT_210 = ")"; >+ protected final String TEXT_211 = ".getEStructuralFeatures().get("; > protected final String TEXT_212 = ");"; >- protected final String TEXT_213 = NL + "\t}"; >- protected final String TEXT_214 = NL + "\t"; >- protected final String TEXT_215 = " get"; >- protected final String TEXT_216 = "();"; >- protected final String TEXT_217 = NL; >- protected final String TEXT_218 = NL + "\t/**" + NL + "\t * Returns the factory that creates the instances of the model." + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @return the factory that creates the instances of the model." + NL + "\t * @generated" + NL + "\t */"; >- protected final String TEXT_219 = NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */"; >- protected final String TEXT_220 = NL + "\tpublic "; >- protected final String TEXT_221 = " get"; >- protected final String TEXT_222 = "()" + NL + "\t{" + NL + "\t\treturn ("; >- protected final String TEXT_223 = ")getEFactoryInstance();" + NL + "\t}"; >- protected final String TEXT_224 = NL + "\t"; >+ protected final String TEXT_213 = NL + " return ("; >+ protected final String TEXT_214 = ")get"; >+ protected final String TEXT_215 = "().getEStructuralFeatures().get("; >+ protected final String TEXT_216 = ");"; >+ protected final String TEXT_217 = NL + "\t}"; >+ protected final String TEXT_218 = NL + "\t"; >+ protected final String TEXT_219 = " get"; >+ protected final String TEXT_220 = "();"; >+ protected final String TEXT_221 = NL; >+ protected final String TEXT_222 = NL + "\t/**" + NL + "\t * Returns the factory that creates the instances of the model." + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @return the factory that creates the instances of the model." + NL + "\t * @generated" + NL + "\t */"; >+ protected final String TEXT_223 = NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */"; >+ protected final String TEXT_224 = NL + "\tpublic "; > protected final String TEXT_225 = " get"; >- protected final String TEXT_226 = "();"; >- protected final String TEXT_227 = NL; >- protected final String TEXT_228 = NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate boolean isCreated = false;" + NL + "" + NL + "\t/**" + NL + "\t * Creates the meta-model objects for the package. This method is" + NL + "\t * guarded to have no affect on any invocation but its first." + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic void createPackageContents()" + NL + "\t{" + NL + "\t\tif (isCreated) return;" + NL + "\t\tisCreated = true;"; >- protected final String TEXT_229 = NL + NL + "\t\t// Create classes and their features"; >- protected final String TEXT_230 = NL + "\t\t"; >- protected final String TEXT_231 = " = create"; >- protected final String TEXT_232 = "("; >- protected final String TEXT_233 = ");"; >- protected final String TEXT_234 = NL + "\t\tcreate"; >- protected final String TEXT_235 = "("; >- protected final String TEXT_236 = ", "; >+ protected final String TEXT_226 = "()" + NL + "\t{" + NL + "\t\treturn ("; >+ protected final String TEXT_227 = ")getEFactoryInstance();" + NL + "\t}"; >+ protected final String TEXT_228 = NL + "\t"; >+ protected final String TEXT_229 = " get"; >+ protected final String TEXT_230 = "();"; >+ protected final String TEXT_231 = NL; >+ protected final String TEXT_232 = NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate boolean isCreated = false;" + NL + "" + NL + "\t/**" + NL + "\t * Creates the meta-model objects for the package. This method is" + NL + "\t * guarded to have no affect on any invocation but its first." + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic void createPackageContents()" + NL + "\t{" + NL + "\t\tif (isCreated) return;" + NL + "\t\tisCreated = true;"; >+ protected final String TEXT_233 = NL + NL + "\t\t// Create classes and their features"; >+ protected final String TEXT_234 = NL + "\t\t"; >+ protected final String TEXT_235 = " = create"; >+ protected final String TEXT_236 = "("; > protected final String TEXT_237 = ");"; >- protected final String TEXT_238 = NL; >- protected final String TEXT_239 = NL + NL + "\t\t// Create enums"; >- protected final String TEXT_240 = NL + "\t\t"; >- protected final String TEXT_241 = " = createEEnum("; >- protected final String TEXT_242 = ");"; >- protected final String TEXT_243 = NL + NL + "\t\t// Create data types"; >+ protected final String TEXT_238 = NL + "\t\tcreate"; >+ protected final String TEXT_239 = "("; >+ protected final String TEXT_240 = ", "; >+ protected final String TEXT_241 = ");"; >+ protected final String TEXT_242 = NL; >+ protected final String TEXT_243 = NL + NL + "\t\t// Create enums"; > protected final String TEXT_244 = NL + "\t\t"; >- protected final String TEXT_245 = " = createEDataType("; >+ protected final String TEXT_245 = " = createEEnum("; > protected final String TEXT_246 = ");"; >- protected final String TEXT_247 = NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate boolean isInitialized = false;" + NL; >- protected final String TEXT_248 = NL + "\t/**" + NL + "\t * Complete the initialization of the package and its meta-model. This" + NL + "\t * method is guarded to have no affect on any invocation but its first." + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic void initializePackageContents()" + NL + "\t{" + NL + "\t\tif (isInitialized) return;" + NL + "\t\tisInitialized = true;" + NL + "" + NL + "\t\t// Initialize package" + NL + "\t\tsetName(eNAME);" + NL + "\t\tsetNsPrefix(eNS_PREFIX);" + NL + "\t\tsetNsURI(eNS_URI);"; >- protected final String TEXT_249 = NL + NL + "\t\t// Obtain other dependent packages"; >- protected final String TEXT_250 = NL + "\t\t"; >- protected final String TEXT_251 = " "; >- protected final String TEXT_252 = " = ("; >- protected final String TEXT_253 = ")"; >- protected final String TEXT_254 = ".Registry.INSTANCE.getEPackage("; >- protected final String TEXT_255 = ".eNS_URI);"; >- protected final String TEXT_256 = NL + NL + "\t\t// Add subpackages"; >- protected final String TEXT_257 = NL + "\t\tgetESubpackages().add("; >- protected final String TEXT_258 = ");"; >- protected final String TEXT_259 = NL + NL + "\t\t// Create type parameters"; >- protected final String TEXT_260 = NL + "\t\t"; >- protected final String TEXT_261 = " "; >- protected final String TEXT_262 = "_"; >- protected final String TEXT_263 = " = addETypeParameter("; >- protected final String TEXT_264 = ", \""; >- protected final String TEXT_265 = "\");"; >- protected final String TEXT_266 = NL + "\t\taddETypeParameter("; >- protected final String TEXT_267 = ", \""; >- protected final String TEXT_268 = "\");"; >- protected final String TEXT_269 = NL + NL + "\t\t// Set bounds for type parameters"; >- protected final String TEXT_270 = NL + "\t\t"; >- protected final String TEXT_271 = "g"; >- protected final String TEXT_272 = " = createEGenericType("; >- protected final String TEXT_273 = ");"; >- protected final String TEXT_274 = NL + "\t\tg"; >- protected final String TEXT_275 = "."; >- protected final String TEXT_276 = "(g"; >+ protected final String TEXT_247 = NL + NL + "\t\t// Create data types"; >+ protected final String TEXT_248 = NL + "\t\t"; >+ protected final String TEXT_249 = " = createEDataType("; >+ protected final String TEXT_250 = ");"; >+ protected final String TEXT_251 = NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate boolean isInitialized = false;" + NL; >+ protected final String TEXT_252 = NL + "\t/**" + NL + "\t * Complete the initialization of the package and its meta-model. This" + NL + "\t * method is guarded to have no affect on any invocation but its first." + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic void initializePackageContents()" + NL + "\t{" + NL + "\t\tif (isInitialized) return;" + NL + "\t\tisInitialized = true;" + NL + "" + NL + "\t\t// Initialize package" + NL + "\t\tsetName(eNAME);" + NL + "\t\tsetNsPrefix(eNS_PREFIX);" + NL + "\t\tsetNsURI(eNS_URI);"; >+ protected final String TEXT_253 = NL + NL + "\t\t// Obtain other dependent packages"; >+ protected final String TEXT_254 = NL + "\t\t"; >+ protected final String TEXT_255 = " "; >+ protected final String TEXT_256 = " = ("; >+ protected final String TEXT_257 = ")"; >+ protected final String TEXT_258 = ".Registry.INSTANCE.getEPackage("; >+ protected final String TEXT_259 = ".eNS_URI);"; >+ protected final String TEXT_260 = NL + NL + "\t\t// Add subpackages"; >+ protected final String TEXT_261 = NL + "\t\tgetESubpackages().add("; >+ protected final String TEXT_262 = ");"; >+ protected final String TEXT_263 = NL + NL + "\t\t// Create type parameters"; >+ protected final String TEXT_264 = NL + "\t\t"; >+ protected final String TEXT_265 = " "; >+ protected final String TEXT_266 = "_"; >+ protected final String TEXT_267 = " = addETypeParameter("; >+ protected final String TEXT_268 = ", \""; >+ protected final String TEXT_269 = "\");"; >+ protected final String TEXT_270 = NL + "\t\taddETypeParameter("; >+ protected final String TEXT_271 = ", \""; >+ protected final String TEXT_272 = "\");"; >+ protected final String TEXT_273 = NL + NL + "\t\t// Set bounds for type parameters"; >+ protected final String TEXT_274 = NL + "\t\t"; >+ protected final String TEXT_275 = "g"; >+ protected final String TEXT_276 = " = createEGenericType("; > protected final String TEXT_277 = ");"; >- protected final String TEXT_278 = NL + "\t\t"; >- protected final String TEXT_279 = "_"; >- protected final String TEXT_280 = ".getEBounds().add(g1);"; >- protected final String TEXT_281 = NL + NL + "\t\t// Add supertypes to classes"; >+ protected final String TEXT_278 = NL + "\t\tg"; >+ protected final String TEXT_279 = "."; >+ protected final String TEXT_280 = "(g"; >+ protected final String TEXT_281 = ");"; > protected final String TEXT_282 = NL + "\t\t"; >- protected final String TEXT_283 = ".getESuperTypes().add("; >- protected final String TEXT_284 = ".get"; >- protected final String TEXT_285 = "());"; >+ protected final String TEXT_283 = "_"; >+ protected final String TEXT_284 = ".getEBounds().add(g1);"; >+ protected final String TEXT_285 = NL + NL + "\t\t// Add supertypes to classes"; > protected final String TEXT_286 = NL + "\t\t"; >- protected final String TEXT_287 = "g"; >- protected final String TEXT_288 = " = createEGenericType("; >- protected final String TEXT_289 = ");"; >- protected final String TEXT_290 = NL + "\t\tg"; >- protected final String TEXT_291 = "."; >- protected final String TEXT_292 = "(g"; >+ protected final String TEXT_287 = ".getESuperTypes().add("; >+ protected final String TEXT_288 = ".get"; >+ protected final String TEXT_289 = "());"; >+ protected final String TEXT_290 = NL + "\t\t"; >+ protected final String TEXT_291 = "g"; >+ protected final String TEXT_292 = " = createEGenericType("; > protected final String TEXT_293 = ");"; >- protected final String TEXT_294 = NL + "\t\t"; >- protected final String TEXT_295 = ".getEGenericSuperTypes().add(g1);"; >- protected final String TEXT_296 = NL + NL + "\t\t// Initialize classes and features; add operations and parameters"; >- protected final String TEXT_297 = NL + "\t\tinitEClass("; >- protected final String TEXT_298 = ", "; >- protected final String TEXT_299 = "null"; >- protected final String TEXT_300 = ".class"; >- protected final String TEXT_301 = ", \""; >- protected final String TEXT_302 = "\", "; >- protected final String TEXT_303 = ", "; >- protected final String TEXT_304 = ", "; >+ protected final String TEXT_294 = NL + "\t\tg"; >+ protected final String TEXT_295 = "."; >+ protected final String TEXT_296 = "(g"; >+ protected final String TEXT_297 = ");"; >+ protected final String TEXT_298 = NL + "\t\t"; >+ protected final String TEXT_299 = ".getEGenericSuperTypes().add(g1);"; >+ protected final String TEXT_300 = NL + NL + "\t\t// Initialize classes and features; add operations and parameters"; >+ protected final String TEXT_301 = NL + "\t\tinitEClass("; >+ protected final String TEXT_302 = ", "; >+ protected final String TEXT_303 = "null"; >+ protected final String TEXT_304 = ".class"; > protected final String TEXT_305 = ", \""; >- protected final String TEXT_306 = "\""; >- protected final String TEXT_307 = ");"; >- protected final String TEXT_308 = NL + "\t\t"; >- protected final String TEXT_309 = "g"; >- protected final String TEXT_310 = " = createEGenericType("; >+ protected final String TEXT_306 = "\", "; >+ protected final String TEXT_307 = ", "; >+ protected final String TEXT_308 = ", "; >+ protected final String TEXT_309 = ", \""; >+ protected final String TEXT_310 = "\""; > protected final String TEXT_311 = ");"; >- protected final String TEXT_312 = NL + "\t\tg"; >- protected final String TEXT_313 = "."; >- protected final String TEXT_314 = "(g"; >+ protected final String TEXT_312 = NL + "\t\t"; >+ protected final String TEXT_313 = "g"; >+ protected final String TEXT_314 = " = createEGenericType("; > protected final String TEXT_315 = ");"; >- protected final String TEXT_316 = NL + "\t\tinitEReference(get"; >- protected final String TEXT_317 = "(), "; >- protected final String TEXT_318 = "g1"; >- protected final String TEXT_319 = ".get"; >- protected final String TEXT_320 = "()"; >- protected final String TEXT_321 = ", "; >- protected final String TEXT_322 = ", \""; >- protected final String TEXT_323 = "\", "; >- protected final String TEXT_324 = ", "; >+ protected final String TEXT_316 = NL + "\t\tg"; >+ protected final String TEXT_317 = "."; >+ protected final String TEXT_318 = "(g"; >+ protected final String TEXT_319 = ");"; >+ protected final String TEXT_320 = NL + "\t\tinitEReference(get"; >+ protected final String TEXT_321 = "(), "; >+ protected final String TEXT_322 = "g1"; >+ protected final String TEXT_323 = ".get"; >+ protected final String TEXT_324 = "()"; > protected final String TEXT_325 = ", "; >- protected final String TEXT_326 = ", "; >- protected final String TEXT_327 = ", "; >+ protected final String TEXT_326 = ", \""; >+ protected final String TEXT_327 = "\", "; > protected final String TEXT_328 = ", "; > protected final String TEXT_329 = ", "; > protected final String TEXT_330 = ", "; >@@ -353,22 +353,22 @@ > protected final String TEXT_333 = ", "; > protected final String TEXT_334 = ", "; > protected final String TEXT_335 = ", "; >- protected final String TEXT_336 = ");"; >- protected final String TEXT_337 = NL + "\t\tget"; >- protected final String TEXT_338 = "().getEKeys().add("; >- protected final String TEXT_339 = ".get"; >- protected final String TEXT_340 = "());"; >- protected final String TEXT_341 = NL + "\t\tinitEAttribute(get"; >- protected final String TEXT_342 = "(), "; >- protected final String TEXT_343 = "g1"; >- protected final String TEXT_344 = ".get"; >- protected final String TEXT_345 = "()"; >- protected final String TEXT_346 = ", \""; >- protected final String TEXT_347 = "\", "; >- protected final String TEXT_348 = ", "; >- protected final String TEXT_349 = ", "; >- protected final String TEXT_350 = ", "; >- protected final String TEXT_351 = ", "; >+ protected final String TEXT_336 = ", "; >+ protected final String TEXT_337 = ", "; >+ protected final String TEXT_338 = ", "; >+ protected final String TEXT_339 = ", "; >+ protected final String TEXT_340 = ");"; >+ protected final String TEXT_341 = NL + "\t\tget"; >+ protected final String TEXT_342 = "().getEKeys().add("; >+ protected final String TEXT_343 = ".get"; >+ protected final String TEXT_344 = "());"; >+ protected final String TEXT_345 = NL + "\t\tinitEAttribute(get"; >+ protected final String TEXT_346 = "(), "; >+ protected final String TEXT_347 = "g1"; >+ protected final String TEXT_348 = ".get"; >+ protected final String TEXT_349 = "()"; >+ protected final String TEXT_350 = ", \""; >+ protected final String TEXT_351 = "\", "; > protected final String TEXT_352 = ", "; > protected final String TEXT_353 = ", "; > protected final String TEXT_354 = ", "; >@@ -376,249 +376,253 @@ > protected final String TEXT_356 = ", "; > protected final String TEXT_357 = ", "; > protected final String TEXT_358 = ", "; >- protected final String TEXT_359 = ");"; >- protected final String TEXT_360 = NL; >- protected final String TEXT_361 = NL + "\t\t"; >- protected final String TEXT_362 = "addEOperation("; >- protected final String TEXT_363 = ", "; >- protected final String TEXT_364 = "null"; >- protected final String TEXT_365 = ".get"; >- protected final String TEXT_366 = "()"; >- protected final String TEXT_367 = ", \""; >- protected final String TEXT_368 = "\", "; >- protected final String TEXT_369 = ", "; >- protected final String TEXT_370 = ", "; >- protected final String TEXT_371 = ", "; >- protected final String TEXT_372 = ");"; >- protected final String TEXT_373 = NL + "\t\t"; >- protected final String TEXT_374 = "addEOperation("; >+ protected final String TEXT_359 = ", "; >+ protected final String TEXT_360 = ", "; >+ protected final String TEXT_361 = ", "; >+ protected final String TEXT_362 = ", "; >+ protected final String TEXT_363 = ");"; >+ protected final String TEXT_364 = NL; >+ protected final String TEXT_365 = NL + "\t\t"; >+ protected final String TEXT_366 = "addEOperation("; >+ protected final String TEXT_367 = ", "; >+ protected final String TEXT_368 = "null"; >+ protected final String TEXT_369 = ".get"; >+ protected final String TEXT_370 = "()"; >+ protected final String TEXT_371 = ", \""; >+ protected final String TEXT_372 = "\", "; >+ protected final String TEXT_373 = ", "; >+ protected final String TEXT_374 = ", "; > protected final String TEXT_375 = ", "; >- protected final String TEXT_376 = ".get"; >- protected final String TEXT_377 = "(), \""; >- protected final String TEXT_378 = "\", "; >+ protected final String TEXT_376 = ");"; >+ protected final String TEXT_377 = NL + "\t\t"; >+ protected final String TEXT_378 = "addEOperation("; > protected final String TEXT_379 = ", "; >- protected final String TEXT_380 = ", "; >- protected final String TEXT_381 = ", "; >- protected final String TEXT_382 = ");"; >- protected final String TEXT_383 = NL + "\t\t"; >- protected final String TEXT_384 = "addEOperation("; >+ protected final String TEXT_380 = ".get"; >+ protected final String TEXT_381 = "(), \""; >+ protected final String TEXT_382 = "\", "; >+ protected final String TEXT_383 = ", "; >+ protected final String TEXT_384 = ", "; > protected final String TEXT_385 = ", "; >- protected final String TEXT_386 = ".get"; >- protected final String TEXT_387 = "(), \""; >- protected final String TEXT_388 = "\", "; >+ protected final String TEXT_386 = ");"; >+ protected final String TEXT_387 = NL + "\t\t"; >+ protected final String TEXT_388 = "addEOperation("; > protected final String TEXT_389 = ", "; >- protected final String TEXT_390 = ");"; >- protected final String TEXT_391 = NL + "\t\t"; >- protected final String TEXT_392 = "addEOperation("; >- protected final String TEXT_393 = ", null, \""; >- protected final String TEXT_394 = "\");"; >+ protected final String TEXT_390 = ".get"; >+ protected final String TEXT_391 = "(), \""; >+ protected final String TEXT_392 = "\", "; >+ protected final String TEXT_393 = ", "; >+ protected final String TEXT_394 = ");"; > protected final String TEXT_395 = NL + "\t\t"; >- protected final String TEXT_396 = "addETypeParameter(op, \""; >- protected final String TEXT_397 = "\");"; >- protected final String TEXT_398 = NL + "\t\t"; >- protected final String TEXT_399 = "g"; >- protected final String TEXT_400 = " = createEGenericType("; >- protected final String TEXT_401 = ");"; >- protected final String TEXT_402 = NL + "\t\tg"; >- protected final String TEXT_403 = "."; >- protected final String TEXT_404 = "(g"; >+ protected final String TEXT_396 = "addEOperation("; >+ protected final String TEXT_397 = ", null, \""; >+ protected final String TEXT_398 = "\");"; >+ protected final String TEXT_399 = NL + "\t\t"; >+ protected final String TEXT_400 = "addETypeParameter(op, \""; >+ protected final String TEXT_401 = "\");"; >+ protected final String TEXT_402 = NL + "\t\t"; >+ protected final String TEXT_403 = "g"; >+ protected final String TEXT_404 = " = createEGenericType("; > protected final String TEXT_405 = ");"; >- protected final String TEXT_406 = NL + "\t\tt"; >- protected final String TEXT_407 = ".getEBounds().add(g1);"; >- protected final String TEXT_408 = NL + "\t\t"; >- protected final String TEXT_409 = "g"; >- protected final String TEXT_410 = " = createEGenericType("; >- protected final String TEXT_411 = ");"; >- protected final String TEXT_412 = NL + "\t\tg"; >- protected final String TEXT_413 = "."; >- protected final String TEXT_414 = "(g"; >+ protected final String TEXT_406 = NL + "\t\tg"; >+ protected final String TEXT_407 = "."; >+ protected final String TEXT_408 = "(g"; >+ protected final String TEXT_409 = ");"; >+ protected final String TEXT_410 = NL + "\t\tt"; >+ protected final String TEXT_411 = ".getEBounds().add(g1);"; >+ protected final String TEXT_412 = NL + "\t\t"; >+ protected final String TEXT_413 = "g"; >+ protected final String TEXT_414 = " = createEGenericType("; > protected final String TEXT_415 = ");"; >- protected final String TEXT_416 = NL + "\t\taddEParameter(op, "; >- protected final String TEXT_417 = "g1"; >- protected final String TEXT_418 = ".get"; >- protected final String TEXT_419 = "()"; >- protected final String TEXT_420 = ", \""; >- protected final String TEXT_421 = "\", "; >- protected final String TEXT_422 = ", "; >- protected final String TEXT_423 = ", "; >- protected final String TEXT_424 = ", "; >- protected final String TEXT_425 = ");"; >- protected final String TEXT_426 = NL + "\t\taddEParameter(op, "; >- protected final String TEXT_427 = "g1"; >- protected final String TEXT_428 = ".get"; >- protected final String TEXT_429 = "()"; >- protected final String TEXT_430 = ", \""; >- protected final String TEXT_431 = "\", "; >- protected final String TEXT_432 = ", "; >- protected final String TEXT_433 = ", "; >- protected final String TEXT_434 = ", "; >- protected final String TEXT_435 = ");"; >- protected final String TEXT_436 = NL + "\t\taddEParameter(op, "; >- protected final String TEXT_437 = "g1"; >- protected final String TEXT_438 = ".get"; >- protected final String TEXT_439 = "()"; >- protected final String TEXT_440 = ", \""; >- protected final String TEXT_441 = "\", "; >- protected final String TEXT_442 = ", "; >- protected final String TEXT_443 = ");"; >- protected final String TEXT_444 = NL + "\t\t"; >- protected final String TEXT_445 = "g"; >- protected final String TEXT_446 = " = createEGenericType("; >+ protected final String TEXT_416 = NL + "\t\tg"; >+ protected final String TEXT_417 = "."; >+ protected final String TEXT_418 = "(g"; >+ protected final String TEXT_419 = ");"; >+ protected final String TEXT_420 = NL + "\t\taddEParameter(op, "; >+ protected final String TEXT_421 = "g1"; >+ protected final String TEXT_422 = ".get"; >+ protected final String TEXT_423 = "()"; >+ protected final String TEXT_424 = ", \""; >+ protected final String TEXT_425 = "\", "; >+ protected final String TEXT_426 = ", "; >+ protected final String TEXT_427 = ", "; >+ protected final String TEXT_428 = ", "; >+ protected final String TEXT_429 = ");"; >+ protected final String TEXT_430 = NL + "\t\taddEParameter(op, "; >+ protected final String TEXT_431 = "g1"; >+ protected final String TEXT_432 = ".get"; >+ protected final String TEXT_433 = "()"; >+ protected final String TEXT_434 = ", \""; >+ protected final String TEXT_435 = "\", "; >+ protected final String TEXT_436 = ", "; >+ protected final String TEXT_437 = ", "; >+ protected final String TEXT_438 = ", "; >+ protected final String TEXT_439 = ");"; >+ protected final String TEXT_440 = NL + "\t\taddEParameter(op, "; >+ protected final String TEXT_441 = "g1"; >+ protected final String TEXT_442 = ".get"; >+ protected final String TEXT_443 = "()"; >+ protected final String TEXT_444 = ", \""; >+ protected final String TEXT_445 = "\", "; >+ protected final String TEXT_446 = ", "; > protected final String TEXT_447 = ");"; >- protected final String TEXT_448 = NL + "\t\tg"; >- protected final String TEXT_449 = "."; >- protected final String TEXT_450 = "(g"; >+ protected final String TEXT_448 = NL + "\t\t"; >+ protected final String TEXT_449 = "g"; >+ protected final String TEXT_450 = " = createEGenericType("; > protected final String TEXT_451 = ");"; >- protected final String TEXT_452 = NL + "\t\taddEException(op, g"; >- protected final String TEXT_453 = ");"; >- protected final String TEXT_454 = NL + "\t\taddEException(op, "; >- protected final String TEXT_455 = ".get"; >- protected final String TEXT_456 = "());"; >- protected final String TEXT_457 = NL + "\t\t"; >- protected final String TEXT_458 = "g"; >- protected final String TEXT_459 = " = createEGenericType("; >- protected final String TEXT_460 = ");"; >- protected final String TEXT_461 = NL + "\t\tg"; >- protected final String TEXT_462 = "."; >- protected final String TEXT_463 = "(g"; >+ protected final String TEXT_452 = NL + "\t\tg"; >+ protected final String TEXT_453 = "."; >+ protected final String TEXT_454 = "(g"; >+ protected final String TEXT_455 = ");"; >+ protected final String TEXT_456 = NL + "\t\taddEException(op, g"; >+ protected final String TEXT_457 = ");"; >+ protected final String TEXT_458 = NL + "\t\taddEException(op, "; >+ protected final String TEXT_459 = ".get"; >+ protected final String TEXT_460 = "());"; >+ protected final String TEXT_461 = NL + "\t\t"; >+ protected final String TEXT_462 = "g"; >+ protected final String TEXT_463 = " = createEGenericType("; > protected final String TEXT_464 = ");"; >- protected final String TEXT_465 = NL + "\t\tinitEOperation(op, g1);"; >- protected final String TEXT_466 = NL; >- protected final String TEXT_467 = NL + NL + "\t\t// Initialize enums and add enum literals"; >- protected final String TEXT_468 = NL + "\t\tinitEEnum("; >- protected final String TEXT_469 = ", "; >- protected final String TEXT_470 = ".class, \""; >- protected final String TEXT_471 = "\");"; >- protected final String TEXT_472 = NL + "\t\taddEEnumLiteral("; >+ protected final String TEXT_465 = NL + "\t\tg"; >+ protected final String TEXT_466 = "."; >+ protected final String TEXT_467 = "(g"; >+ protected final String TEXT_468 = ");"; >+ protected final String TEXT_469 = NL + "\t\tinitEOperation(op, g1);"; >+ protected final String TEXT_470 = NL; >+ protected final String TEXT_471 = NL + NL + "\t\t// Initialize enums and add enum literals"; >+ protected final String TEXT_472 = NL + "\t\tinitEEnum("; > protected final String TEXT_473 = ", "; >- protected final String TEXT_474 = "."; >- protected final String TEXT_475 = ");"; >- protected final String TEXT_476 = NL; >- protected final String TEXT_477 = NL + NL + "\t\t// Initialize data types"; >- protected final String TEXT_478 = NL + "\t\tinitEDataType("; >- protected final String TEXT_479 = ", "; >- protected final String TEXT_480 = ".class, \""; >- protected final String TEXT_481 = "\", "; >- protected final String TEXT_482 = ", "; >- protected final String TEXT_483 = ", \""; >- protected final String TEXT_484 = "\""; >- protected final String TEXT_485 = ");"; >- protected final String TEXT_486 = NL + NL + "\t\t// Create resource" + NL + "\t\tcreateResource(eNS_URI);"; >- protected final String TEXT_487 = NL + NL + "\t\t// Create annotations"; >- protected final String TEXT_488 = NL + "\t\t// "; >- protected final String TEXT_489 = NL + "\t\tcreate"; >- protected final String TEXT_490 = "Annotations();"; >- protected final String TEXT_491 = NL + "\t}" + NL; >- protected final String TEXT_492 = NL + "\t/**" + NL + "\t * Initializes the annotations for <b>"; >- protected final String TEXT_493 = "</b>." + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void create"; >- protected final String TEXT_494 = "Annotations()" + NL + "\t{" + NL + "\t\tString source = "; >- protected final String TEXT_495 = "null;"; >- protected final String TEXT_496 = "\""; >- protected final String TEXT_497 = "\";"; >- protected final String TEXT_498 = "\t"; >- protected final String TEXT_499 = "\t" + NL + "\t\taddAnnotation" + NL + "\t\t ("; >- protected final String TEXT_500 = ", " + NL + "\t\t source, " + NL + "\t\t new String[] " + NL + "\t\t {"; >- protected final String TEXT_501 = NL + "\t\t\t "; >- protected final String TEXT_502 = ", "; >- protected final String TEXT_503 = NL + "\t\t }"; >- protected final String TEXT_504 = ");"; >- protected final String TEXT_505 = ","; >- protected final String TEXT_506 = NL + "\t\t new "; >- protected final String TEXT_507 = "[] " + NL + "\t\t {"; >- protected final String TEXT_508 = NL + "\t\t\t "; >- protected final String TEXT_509 = ".createURI("; >- protected final String TEXT_510 = "."; >- protected final String TEXT_511 = "eNS_URI).appendFragment(\""; >- protected final String TEXT_512 = "\")"; >- protected final String TEXT_513 = ","; >- protected final String TEXT_514 = NL + "\t\t });"; >- protected final String TEXT_515 = NL + "\t\taddAnnotation" + NL + "\t\t ("; >- protected final String TEXT_516 = ", " + NL + "\t\t "; >- protected final String TEXT_517 = "," + NL + "\t\t "; >- protected final String TEXT_518 = "null,"; >- protected final String TEXT_519 = "\""; >- protected final String TEXT_520 = "\","; >- protected final String TEXT_521 = NL + "\t\t new String[] " + NL + "\t\t {"; >- protected final String TEXT_522 = NL + "\t\t\t "; >- protected final String TEXT_523 = ", "; >- protected final String TEXT_524 = NL + "\t\t }"; >- protected final String TEXT_525 = ");"; >- protected final String TEXT_526 = ","; >- protected final String TEXT_527 = NL + "\t\t new "; >- protected final String TEXT_528 = "[] " + NL + "\t\t {"; >- protected final String TEXT_529 = NL + "\t\t\t "; >- protected final String TEXT_530 = ".createURI("; >- protected final String TEXT_531 = "."; >- protected final String TEXT_532 = "eNS_URI).appendFragment(\""; >- protected final String TEXT_533 = "\")"; >- protected final String TEXT_534 = ","; >- protected final String TEXT_535 = NL + "\t\t });"; >- protected final String TEXT_536 = NL + "\t}" + NL; >- protected final String TEXT_537 = NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate boolean isLoaded = false;" + NL + "" + NL + "\t/**" + NL + "\t * Laods the package and any sub-packages from their serialized form." + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic void loadPackage()" + NL + "\t{" + NL + "\t\tif (isLoaded) return;" + NL + "\t\tisLoaded = true;" + NL + "" + NL + "\t\t"; >- protected final String TEXT_538 = " url = getClass().getResource(packageFilename);" + NL + "\t\tif (url == null)" + NL + "\t\t{" + NL + "\t\t\tthrow new RuntimeException(\"Missing serialized package: \" + packageFilename);"; >- protected final String TEXT_539 = NL + "\t\t}" + NL + "\t\t"; >- protected final String TEXT_540 = " uri = "; >- protected final String TEXT_541 = ".createURI(url.toString());" + NL + "\t\t"; >- protected final String TEXT_542 = " resource = new "; >- protected final String TEXT_543 = "().createResource(uri);" + NL + "\t\ttry" + NL + "\t\t{" + NL + "\t\t\tresource.load(null);" + NL + "\t\t}" + NL + "\t\tcatch ("; >- protected final String TEXT_544 = " exception)" + NL + "\t\t{" + NL + "\t\t\tthrow new "; >- protected final String TEXT_545 = "(exception);" + NL + "\t\t}" + NL + "\t\tinitializeFromLoadedEPackage(this, ("; >- protected final String TEXT_546 = ")resource.getContents().get(0));" + NL + "\t\tcreateResource(eNS_URI);" + NL + "\t}" + NL; >- protected final String TEXT_547 = NL + NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate boolean isFixed = false;" + NL + "" + NL + "\t/**" + NL + "\t * Fixes up the loaded package, to make it appear as if it had been programmatically built." + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic void fixPackageContents()" + NL + "\t{" + NL + "\t\tif (isFixed) return;" + NL + "\t\tisFixed = true;" + NL + "\t\tfixEClassifiers();" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * Sets the instance class on the given classifier." + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */"; >- protected final String TEXT_548 = NL + "\t@Override"; >- protected final String TEXT_549 = NL + "\tprotected void fixInstanceClass("; >- protected final String TEXT_550 = " eClassifier)" + NL + "\t{" + NL + "\t\tif (eClassifier.getInstanceClassName() == null)" + NL + "\t\t{"; >- protected final String TEXT_551 = NL + "\t\t\teClassifier.setInstanceClassName(\""; >- protected final String TEXT_552 = ".\" + eClassifier.getName());"; >- protected final String TEXT_553 = NL + "\t\t\tsetGeneratedClassName(eClassifier);"; >- protected final String TEXT_554 = NL + "\t\t\tswitch (eClassifier.getClassifierID())" + NL + "\t\t\t{"; >- protected final String TEXT_555 = NL + "\t\t\t\tcase "; >- protected final String TEXT_556 = ":"; >- protected final String TEXT_557 = NL + "\t\t\t\t{" + NL + "\t\t\t\t\tbreak;" + NL + "\t\t\t\t}" + NL + "\t\t\t\tdefault:" + NL + "\t\t\t\t{" + NL + "\t\t\t\t\teClassifier.setInstanceClassName(\""; >- protected final String TEXT_558 = ".\" + eClassifier.getName());"; >- protected final String TEXT_559 = NL + "\t\t\t\t\tsetGeneratedClassName(eClassifier);" + NL + "\t\t\t\t\tbreak;" + NL + "\t\t\t\t}" + NL + "\t\t\t}"; >- protected final String TEXT_560 = NL + "\t\t}" + NL + "\t}" + NL; >- protected final String TEXT_561 = NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected "; >- protected final String TEXT_562 = " addEOperation("; >- protected final String TEXT_563 = " owner, "; >- protected final String TEXT_564 = " type, String name, int lowerBound, int upperBound, boolean isUnique, boolean isOrdered)" + NL + "\t{" + NL + "\t\t"; >- protected final String TEXT_565 = " o = addEOperation(owner, type, name, lowerBound, upperBound);" + NL + "\t\to.setUnique(isUnique);" + NL + "\t\to.setOrdered(isOrdered);" + NL + "\t\treturn o;" + NL + "\t}" + NL + "\t"; >- protected final String TEXT_566 = NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected "; >- protected final String TEXT_567 = " addEParameter("; >- protected final String TEXT_568 = " owner, "; >- protected final String TEXT_569 = " type, String name, int lowerBound, int upperBound, boolean isUnique, boolean isOrdered)" + NL + "\t{" + NL + "\t\t"; >- protected final String TEXT_570 = " p = ecoreFactory.createEParameter();" + NL + "\t\tp.setEType(type);" + NL + "\t\tp.setName(name);" + NL + "\t\tp.setLowerBound(lowerBound);" + NL + "\t\tp.setUpperBound(upperBound);" + NL + "\t\tp.setUnique(isUnique);" + NL + "\t\tp.setOrdered(isOrdered);" + NL + "\t\towner.getEParameters().add(p);" + NL + "\t\treturn p;" + NL + "\t}" + NL + "\t"; >- protected final String TEXT_571 = NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * Defines literals for the meta objects that represent" + NL + "\t * <ul>" + NL + "\t * <li>each class,</li>" + NL + "\t * <li>each feature of each class,</li>" + NL + "\t * <li>each enum,</li>" + NL + "\t * <li>and each data type</li>" + NL + "\t * </ul>" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\t"; >- protected final String TEXT_572 = "public "; >- protected final String TEXT_573 = "interface Literals" + NL + "\t{"; >- protected final String TEXT_574 = NL + "\t\t/**"; >- protected final String TEXT_575 = NL + "\t\t * The meta object literal for the '{@link "; >- protected final String TEXT_576 = " <em>"; >- protected final String TEXT_577 = "</em>}' class." + NL + "\t\t * <!-- begin-user-doc -->" + NL + "\t\t * <!-- end-user-doc -->" + NL + "\t\t * @see "; >- protected final String TEXT_578 = NL + "\t\t * The meta object literal for the '{@link "; >- protected final String TEXT_579 = " <em>"; >- protected final String TEXT_580 = "</em>}' class." + NL + "\t\t * <!-- begin-user-doc -->" + NL + "\t\t * <!-- end-user-doc -->" + NL + "\t\t * @see "; >- protected final String TEXT_581 = NL + "\t\t * The meta object literal for the '{@link "; >- protected final String TEXT_582 = " <em>"; >- protected final String TEXT_583 = "</em>}' enum." + NL + "\t\t * <!-- begin-user-doc -->" + NL + "\t\t * <!-- end-user-doc -->" + NL + "\t\t * @see "; >- protected final String TEXT_584 = NL + "\t\t * The meta object literal for the '<em>"; >- protected final String TEXT_585 = "</em>' data type." + NL + "\t\t * <!-- begin-user-doc -->" + NL + "\t\t * <!-- end-user-doc -->"; >- protected final String TEXT_586 = NL + "\t\t * @see "; >- protected final String TEXT_587 = NL + "\t\t * @see "; >- protected final String TEXT_588 = "#get"; >- protected final String TEXT_589 = "()" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\t"; >- protected final String TEXT_590 = " "; >- protected final String TEXT_591 = " = eINSTANCE.get"; >- protected final String TEXT_592 = "();" + NL; >- protected final String TEXT_593 = NL + "\t\t/**" + NL + "\t\t * The meta object literal for the '<em><b>"; >- protected final String TEXT_594 = "</b></em>' "; >- protected final String TEXT_595 = " feature." + NL + "\t\t * <!-- begin-user-doc -->" + NL + "\t\t * <!-- end-user-doc -->" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\t"; >- protected final String TEXT_596 = " "; >- protected final String TEXT_597 = " = eINSTANCE.get"; >- protected final String TEXT_598 = "();" + NL; >- protected final String TEXT_599 = NL + "\t}" + NL; >- protected final String TEXT_600 = NL + "} //"; >- protected final String TEXT_601 = NL; >+ protected final String TEXT_474 = ".class, \""; >+ protected final String TEXT_475 = "\");"; >+ protected final String TEXT_476 = NL + "\t\taddEEnumLiteral("; >+ protected final String TEXT_477 = ", "; >+ protected final String TEXT_478 = "."; >+ protected final String TEXT_479 = ");"; >+ protected final String TEXT_480 = NL; >+ protected final String TEXT_481 = NL + NL + "\t\t// Initialize data types"; >+ protected final String TEXT_482 = NL + "\t\tinitEDataType("; >+ protected final String TEXT_483 = ", "; >+ protected final String TEXT_484 = ".class, \""; >+ protected final String TEXT_485 = "\", "; >+ protected final String TEXT_486 = ", "; >+ protected final String TEXT_487 = ", \""; >+ protected final String TEXT_488 = "\""; >+ protected final String TEXT_489 = ");"; >+ protected final String TEXT_490 = NL + NL + "\t\t// Create resource" + NL + "\t\tcreateResource(eNS_URI);"; >+ protected final String TEXT_491 = NL + NL + "\t\t// Create annotations"; >+ protected final String TEXT_492 = NL + "\t\t// "; >+ protected final String TEXT_493 = NL + "\t\tcreate"; >+ protected final String TEXT_494 = "Annotations();"; >+ protected final String TEXT_495 = NL + "\t}" + NL; >+ protected final String TEXT_496 = NL + "\t/**" + NL + "\t * Initializes the annotations for <b>"; >+ protected final String TEXT_497 = "</b>." + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void create"; >+ protected final String TEXT_498 = "Annotations()" + NL + "\t{" + NL + "\t\tString source = "; >+ protected final String TEXT_499 = "null;"; >+ protected final String TEXT_500 = "\""; >+ protected final String TEXT_501 = "\";"; >+ protected final String TEXT_502 = "\t"; >+ protected final String TEXT_503 = "\t" + NL + "\t\taddAnnotation" + NL + "\t\t ("; >+ protected final String TEXT_504 = ", " + NL + "\t\t source, " + NL + "\t\t new String[] " + NL + "\t\t {"; >+ protected final String TEXT_505 = NL + "\t\t\t "; >+ protected final String TEXT_506 = ", "; >+ protected final String TEXT_507 = NL + "\t\t }"; >+ protected final String TEXT_508 = ");"; >+ protected final String TEXT_509 = ","; >+ protected final String TEXT_510 = NL + "\t\t new "; >+ protected final String TEXT_511 = "[] " + NL + "\t\t {"; >+ protected final String TEXT_512 = NL + "\t\t\t "; >+ protected final String TEXT_513 = ".createURI("; >+ protected final String TEXT_514 = "."; >+ protected final String TEXT_515 = "eNS_URI).appendFragment(\""; >+ protected final String TEXT_516 = "\")"; >+ protected final String TEXT_517 = ","; >+ protected final String TEXT_518 = NL + "\t\t });"; >+ protected final String TEXT_519 = NL + "\t\taddAnnotation" + NL + "\t\t ("; >+ protected final String TEXT_520 = ", " + NL + "\t\t "; >+ protected final String TEXT_521 = "," + NL + "\t\t "; >+ protected final String TEXT_522 = "null,"; >+ protected final String TEXT_523 = "\""; >+ protected final String TEXT_524 = "\","; >+ protected final String TEXT_525 = NL + "\t\t new String[] " + NL + "\t\t {"; >+ protected final String TEXT_526 = NL + "\t\t\t "; >+ protected final String TEXT_527 = ", "; >+ protected final String TEXT_528 = NL + "\t\t }"; >+ protected final String TEXT_529 = ");"; >+ protected final String TEXT_530 = ","; >+ protected final String TEXT_531 = NL + "\t\t new "; >+ protected final String TEXT_532 = "[] " + NL + "\t\t {"; >+ protected final String TEXT_533 = NL + "\t\t\t "; >+ protected final String TEXT_534 = ".createURI("; >+ protected final String TEXT_535 = "."; >+ protected final String TEXT_536 = "eNS_URI).appendFragment(\""; >+ protected final String TEXT_537 = "\")"; >+ protected final String TEXT_538 = ","; >+ protected final String TEXT_539 = NL + "\t\t });"; >+ protected final String TEXT_540 = NL + "\t}" + NL; >+ protected final String TEXT_541 = NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate boolean isLoaded = false;" + NL + "" + NL + "\t/**" + NL + "\t * Laods the package and any sub-packages from their serialized form." + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic void loadPackage()" + NL + "\t{" + NL + "\t\tif (isLoaded) return;" + NL + "\t\tisLoaded = true;" + NL + "" + NL + "\t\t"; >+ protected final String TEXT_542 = " url = getClass().getResource(packageFilename);" + NL + "\t\tif (url == null)" + NL + "\t\t{" + NL + "\t\t\tthrow new RuntimeException(\"Missing serialized package: \" + packageFilename);"; >+ protected final String TEXT_543 = NL + "\t\t}" + NL + "\t\t"; >+ protected final String TEXT_544 = " uri = "; >+ protected final String TEXT_545 = ".createURI(url.toString());" + NL + "\t\t"; >+ protected final String TEXT_546 = " resource = new "; >+ protected final String TEXT_547 = "().createResource(uri);" + NL + "\t\ttry" + NL + "\t\t{" + NL + "\t\t\tresource.load(null);" + NL + "\t\t}" + NL + "\t\tcatch ("; >+ protected final String TEXT_548 = " exception)" + NL + "\t\t{" + NL + "\t\t\tthrow new "; >+ protected final String TEXT_549 = "(exception);" + NL + "\t\t}" + NL + "\t\tinitializeFromLoadedEPackage(this, ("; >+ protected final String TEXT_550 = ")resource.getContents().get(0));" + NL + "\t\tcreateResource(eNS_URI);" + NL + "\t}" + NL; >+ protected final String TEXT_551 = NL + NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate boolean isFixed = false;" + NL + "" + NL + "\t/**" + NL + "\t * Fixes up the loaded package, to make it appear as if it had been programmatically built." + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic void fixPackageContents()" + NL + "\t{" + NL + "\t\tif (isFixed) return;" + NL + "\t\tisFixed = true;" + NL + "\t\tfixEClassifiers();" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * Sets the instance class on the given classifier." + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */"; >+ protected final String TEXT_552 = NL + "\t@Override"; >+ protected final String TEXT_553 = NL + "\tprotected void fixInstanceClass("; >+ protected final String TEXT_554 = " eClassifier)" + NL + "\t{" + NL + "\t\tif (eClassifier.getInstanceClassName() == null)" + NL + "\t\t{"; >+ protected final String TEXT_555 = NL + "\t\t\teClassifier.setInstanceClassName(\""; >+ protected final String TEXT_556 = ".\" + eClassifier.getName());"; >+ protected final String TEXT_557 = NL + "\t\t\tsetGeneratedClassName(eClassifier);"; >+ protected final String TEXT_558 = NL + "\t\t\tswitch (eClassifier.getClassifierID())" + NL + "\t\t\t{"; >+ protected final String TEXT_559 = NL + "\t\t\t\tcase "; >+ protected final String TEXT_560 = ":"; >+ protected final String TEXT_561 = NL + "\t\t\t\t{" + NL + "\t\t\t\t\tbreak;" + NL + "\t\t\t\t}" + NL + "\t\t\t\tdefault:" + NL + "\t\t\t\t{" + NL + "\t\t\t\t\teClassifier.setInstanceClassName(\""; >+ protected final String TEXT_562 = ".\" + eClassifier.getName());"; >+ protected final String TEXT_563 = NL + "\t\t\t\t\tsetGeneratedClassName(eClassifier);" + NL + "\t\t\t\t\tbreak;" + NL + "\t\t\t\t}" + NL + "\t\t\t}"; >+ protected final String TEXT_564 = NL + "\t\t}" + NL + "\t}" + NL; >+ protected final String TEXT_565 = NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected "; >+ protected final String TEXT_566 = " addEOperation("; >+ protected final String TEXT_567 = " owner, "; >+ protected final String TEXT_568 = " type, String name, int lowerBound, int upperBound, boolean isUnique, boolean isOrdered)" + NL + "\t{" + NL + "\t\t"; >+ protected final String TEXT_569 = " o = addEOperation(owner, type, name, lowerBound, upperBound);" + NL + "\t\to.setUnique(isUnique);" + NL + "\t\to.setOrdered(isOrdered);" + NL + "\t\treturn o;" + NL + "\t}" + NL + "\t"; >+ protected final String TEXT_570 = NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected "; >+ protected final String TEXT_571 = " addEParameter("; >+ protected final String TEXT_572 = " owner, "; >+ protected final String TEXT_573 = " type, String name, int lowerBound, int upperBound, boolean isUnique, boolean isOrdered)" + NL + "\t{" + NL + "\t\t"; >+ protected final String TEXT_574 = " p = ecoreFactory.createEParameter();" + NL + "\t\tp.setEType(type);" + NL + "\t\tp.setName(name);" + NL + "\t\tp.setLowerBound(lowerBound);" + NL + "\t\tp.setUpperBound(upperBound);" + NL + "\t\tp.setUnique(isUnique);" + NL + "\t\tp.setOrdered(isOrdered);" + NL + "\t\towner.getEParameters().add(p);" + NL + "\t\treturn p;" + NL + "\t}" + NL + "\t"; >+ protected final String TEXT_575 = NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * Defines literals for the meta objects that represent" + NL + "\t * <ul>" + NL + "\t * <li>each class,</li>" + NL + "\t * <li>each feature of each class,</li>" + NL + "\t * <li>each enum,</li>" + NL + "\t * <li>and each data type</li>" + NL + "\t * </ul>" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\t"; >+ protected final String TEXT_576 = "public "; >+ protected final String TEXT_577 = "interface Literals" + NL + "\t{"; >+ protected final String TEXT_578 = NL + "\t\t/**"; >+ protected final String TEXT_579 = NL + "\t\t * The meta object literal for the '{@link "; >+ protected final String TEXT_580 = " <em>"; >+ protected final String TEXT_581 = "</em>}' class." + NL + "\t\t * <!-- begin-user-doc -->" + NL + "\t\t * <!-- end-user-doc -->" + NL + "\t\t * @see "; >+ protected final String TEXT_582 = NL + "\t\t * The meta object literal for the '{@link "; >+ protected final String TEXT_583 = " <em>"; >+ protected final String TEXT_584 = "</em>}' class." + NL + "\t\t * <!-- begin-user-doc -->" + NL + "\t\t * <!-- end-user-doc -->" + NL + "\t\t * @see "; >+ protected final String TEXT_585 = NL + "\t\t * The meta object literal for the '{@link "; >+ protected final String TEXT_586 = " <em>"; >+ protected final String TEXT_587 = "</em>}' enum." + NL + "\t\t * <!-- begin-user-doc -->" + NL + "\t\t * <!-- end-user-doc -->" + NL + "\t\t * @see "; >+ protected final String TEXT_588 = NL + "\t\t * The meta object literal for the '<em>"; >+ protected final String TEXT_589 = "</em>' data type." + NL + "\t\t * <!-- begin-user-doc -->" + NL + "\t\t * <!-- end-user-doc -->"; >+ protected final String TEXT_590 = NL + "\t\t * @see "; >+ protected final String TEXT_591 = NL + "\t\t * @see "; >+ protected final String TEXT_592 = "#get"; >+ protected final String TEXT_593 = "()" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\t"; >+ protected final String TEXT_594 = " "; >+ protected final String TEXT_595 = " = eINSTANCE.get"; >+ protected final String TEXT_596 = "();" + NL; >+ protected final String TEXT_597 = NL + "\t\t/**" + NL + "\t\t * The meta object literal for the '<em><b>"; >+ protected final String TEXT_598 = "</b></em>' "; >+ protected final String TEXT_599 = " feature." + NL + "\t\t * <!-- begin-user-doc -->" + NL + "\t\t * <!-- end-user-doc -->" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\t"; >+ protected final String TEXT_600 = " "; >+ protected final String TEXT_601 = " = eINSTANCE.get"; >+ protected final String TEXT_602 = "();" + NL; >+ protected final String TEXT_603 = NL + "\t}" + NL; >+ protected final String TEXT_604 = NL + "} //"; >+ protected final String TEXT_605 = NL; > > public String generate(Object argument) > { >@@ -857,374 +861,382 @@ > stringBuffer.append(TEXT_85); > stringBuffer.append(genPackage.getQualifiedEFactoryInstanceAccessor()); > stringBuffer.append(TEXT_86); >- if (!genPackage.isLoadedInitialization()) { >+ stringBuffer.append(genPackage.getImportedPackageInterfaceName()); > stringBuffer.append(TEXT_87); >- } >+ if (!genPackage.isLoadedInitialization()) { > stringBuffer.append(TEXT_88); >- stringBuffer.append(genPackage.getImportedPackageInterfaceName()); >+ } > stringBuffer.append(TEXT_89); > stringBuffer.append(genPackage.getImportedPackageInterfaceName()); > stringBuffer.append(TEXT_90); >- stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EPackage")); >- stringBuffer.append(TEXT_91); > stringBuffer.append(genPackage.getImportedPackageInterfaceName()); >+ stringBuffer.append(TEXT_91); >+ stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EPackage")); > stringBuffer.append(TEXT_92); >- stringBuffer.append(genPackage.getPackageClassName()); >+ stringBuffer.append(genPackage.getImportedPackageInterfaceName()); > stringBuffer.append(TEXT_93); >- stringBuffer.append(genPackage.getBasicPackageName()); >- stringBuffer.append(TEXT_94); > stringBuffer.append(genPackage.getPackageClassName()); >+ stringBuffer.append(TEXT_94); >+ stringBuffer.append(genPackage.getBasicPackageName()); > stringBuffer.append(TEXT_95); >- stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EPackage")); >- stringBuffer.append(TEXT_96); > stringBuffer.append(genPackage.getPackageClassName()); >- stringBuffer.append(TEXT_97); >+ stringBuffer.append(TEXT_96); > stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EPackage")); >- stringBuffer.append(TEXT_98); >+ stringBuffer.append(TEXT_97); > stringBuffer.append(genPackage.getPackageClassName()); >+ stringBuffer.append(TEXT_98); >+ stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EPackage")); > stringBuffer.append(TEXT_99); >- if (!genPackage.getPackageSimpleDependencies().isEmpty()) { >+ stringBuffer.append(genPackage.getPackageClassName()); > stringBuffer.append(TEXT_100); >- for (GenPackage dep : genPackage.getPackageSimpleDependencies()) { >+ if (!genPackage.getPackageSimpleDependencies().isEmpty()) { > stringBuffer.append(TEXT_101); >- stringBuffer.append(dep.getImportedPackageInterfaceName()); >+ for (GenPackage dep : genPackage.getPackageSimpleDependencies()) { > stringBuffer.append(TEXT_102); >- } >+ stringBuffer.append(dep.getImportedPackageInterfaceName()); > stringBuffer.append(TEXT_103); > } >- if (!genPackage.getPackageInterDependencies().isEmpty()) { > stringBuffer.append(TEXT_104); >- for (GenPackage interdep : genPackage.getPackageInterDependencies()) { >+ } >+ if (!genPackage.getPackageInterDependencies().isEmpty()) { > stringBuffer.append(TEXT_105); >- stringBuffer.append(interdep.getImportedPackageClassName()); >+ for (GenPackage interdep : genPackage.getPackageInterDependencies()) { > stringBuffer.append(TEXT_106); >- stringBuffer.append(genPackage.getPackageInstanceVariable(interdep)); >- stringBuffer.append(TEXT_107); > stringBuffer.append(interdep.getImportedPackageClassName()); >+ stringBuffer.append(TEXT_107); >+ stringBuffer.append(genPackage.getPackageInstanceVariable(interdep)); > stringBuffer.append(TEXT_108); >- stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EPackage")); >+ stringBuffer.append(interdep.getImportedPackageClassName()); > stringBuffer.append(TEXT_109); >- stringBuffer.append(interdep.getImportedPackageInterfaceName()); >+ stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EPackage")); > stringBuffer.append(TEXT_110); >- stringBuffer.append(interdep.getImportedPackageClassName()); >+ stringBuffer.append(interdep.getImportedPackageInterfaceName()); > stringBuffer.append(TEXT_111); >- stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EPackage")); >+ stringBuffer.append(interdep.getImportedPackageClassName()); > stringBuffer.append(TEXT_112); >- stringBuffer.append(interdep.getImportedPackageInterfaceName()); >+ stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EPackage")); > stringBuffer.append(TEXT_113); > stringBuffer.append(interdep.getImportedPackageInterfaceName()); > stringBuffer.append(TEXT_114); >- } >+ stringBuffer.append(interdep.getImportedPackageInterfaceName()); > stringBuffer.append(TEXT_115); > } >- if (genPackage.isLoadedInitialization() || !genPackage.getPackageLoadInterDependencies().isEmpty()) { > stringBuffer.append(TEXT_116); >- if (genPackage.isLoadingInitialization()) { >+ } >+ if (genPackage.isLoadedInitialization() || !genPackage.getPackageLoadInterDependencies().isEmpty()) { > stringBuffer.append(TEXT_117); >- stringBuffer.append(genPackage.getBasicPackageName()); >+ if (genPackage.isLoadingInitialization()) { > stringBuffer.append(TEXT_118); >+ stringBuffer.append(genPackage.getBasicPackageName()); >+ stringBuffer.append(TEXT_119); > } > for (GenPackage interdep : genPackage.getPackageLoadInterDependencies()) { > if (interdep.isLoadingInitialization()) { >- stringBuffer.append(TEXT_119); >- stringBuffer.append(genPackage.getPackageInstanceVariable(interdep)); > stringBuffer.append(TEXT_120); >+ stringBuffer.append(genPackage.getPackageInstanceVariable(interdep)); >+ stringBuffer.append(TEXT_121); > } > } >- stringBuffer.append(TEXT_121); >+ stringBuffer.append(TEXT_122); > } > if (!genPackage.isLoadedInitialization() || !genPackage.getPackageBuildInterDependencies().isEmpty()) { >- stringBuffer.append(TEXT_122); >- if (!genPackage.isLoadedInitialization()) { > stringBuffer.append(TEXT_123); >- stringBuffer.append(genPackage.getBasicPackageName()); >+ if (!genPackage.isLoadedInitialization()) { > stringBuffer.append(TEXT_124); >+ stringBuffer.append(genPackage.getBasicPackageName()); >+ stringBuffer.append(TEXT_125); > } > for (GenPackage interdep : genPackage.getPackageBuildInterDependencies()) { >- stringBuffer.append(TEXT_125); >- stringBuffer.append(genPackage.getPackageInstanceVariable(interdep)); > stringBuffer.append(TEXT_126); >- } >+ stringBuffer.append(genPackage.getPackageInstanceVariable(interdep)); > stringBuffer.append(TEXT_127); >- if (!genPackage.isLoadedInitialization()) { >+ } > stringBuffer.append(TEXT_128); >- stringBuffer.append(genPackage.getBasicPackageName()); >+ if (!genPackage.isLoadedInitialization()) { > stringBuffer.append(TEXT_129); >+ stringBuffer.append(genPackage.getBasicPackageName()); >+ stringBuffer.append(TEXT_130); > } > for (GenPackage interdep : genPackage.getPackageBuildInterDependencies()) { >- stringBuffer.append(TEXT_130); >- stringBuffer.append(genPackage.getPackageInstanceVariable(interdep)); > stringBuffer.append(TEXT_131); >- } >+ stringBuffer.append(genPackage.getPackageInstanceVariable(interdep)); > stringBuffer.append(TEXT_132); > } >- if (genPackage.isLoadedInitialization() || !genPackage.getPackageLoadInterDependencies().isEmpty()) { > stringBuffer.append(TEXT_133); >- if (genPackage.isLoadedInitialization()) { >+ } >+ if (genPackage.isLoadedInitialization() || !genPackage.getPackageLoadInterDependencies().isEmpty()) { > stringBuffer.append(TEXT_134); >- stringBuffer.append(genPackage.getBasicPackageName()); >+ if (genPackage.isLoadedInitialization()) { > stringBuffer.append(TEXT_135); >+ stringBuffer.append(genPackage.getBasicPackageName()); >+ stringBuffer.append(TEXT_136); > } > for (GenPackage interdep : genPackage.getPackageLoadInterDependencies()) { >- stringBuffer.append(TEXT_136); >- stringBuffer.append(genPackage.getPackageInstanceVariable(interdep)); > stringBuffer.append(TEXT_137); >- } >+ stringBuffer.append(genPackage.getPackageInstanceVariable(interdep)); > stringBuffer.append(TEXT_138); > } >- if (genPackage.hasConstraints()) { > stringBuffer.append(TEXT_139); >- stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EValidator")); >+ } >+ if (genPackage.hasConstraints()) { > stringBuffer.append(TEXT_140); >- stringBuffer.append(genPackage.getBasicPackageName()); >- stringBuffer.append(TEXT_141); > stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EValidator")); >+ stringBuffer.append(TEXT_141); >+ stringBuffer.append(genPackage.getBasicPackageName()); > stringBuffer.append(TEXT_142); > stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EValidator")); > stringBuffer.append(TEXT_143); >- stringBuffer.append(genPackage.getImportedValidatorClassName()); >+ stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EValidator")); > stringBuffer.append(TEXT_144); >+ stringBuffer.append(genPackage.getImportedValidatorClassName()); >+ stringBuffer.append(TEXT_145); > } > if (!genPackage.isEcorePackage()) { >- stringBuffer.append(TEXT_145); >- stringBuffer.append(genPackage.getBasicPackageName()); > stringBuffer.append(TEXT_146); >- } >- stringBuffer.append(TEXT_147); > stringBuffer.append(genPackage.getBasicPackageName()); >+ stringBuffer.append(TEXT_147); >+ } > stringBuffer.append(TEXT_148); >+ stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EPackage")); >+ stringBuffer.append(TEXT_149); >+ stringBuffer.append(genPackage.getImportedPackageInterfaceName()); >+ stringBuffer.append(TEXT_150); >+ stringBuffer.append(genPackage.getBasicPackageName()); >+ stringBuffer.append(TEXT_151); >+ stringBuffer.append(genPackage.getBasicPackageName()); >+ stringBuffer.append(TEXT_152); > } > if (isInterface) { // TODO REMOVE THIS BOGUS EMPTY LINE >- stringBuffer.append(TEXT_149); >+ stringBuffer.append(TEXT_153); > } > for (GenClassifier genClassifier : genPackage.getGenClassifiers()) { > if (isInterface) { >- stringBuffer.append(TEXT_150); >+ stringBuffer.append(TEXT_154); > if (genClassifier instanceof GenClass) { GenClass genClass = (GenClass)genClassifier; >- stringBuffer.append(TEXT_151); >+ stringBuffer.append(TEXT_155); > stringBuffer.append(genClass.getQualifiedInterfaceName()); >- stringBuffer.append(TEXT_152); >+ stringBuffer.append(TEXT_156); > stringBuffer.append(genClass.getFormattedName()); >- stringBuffer.append(TEXT_153); >+ stringBuffer.append(TEXT_157); > stringBuffer.append(genClass.getFormattedName()); >- stringBuffer.append(TEXT_154); >+ stringBuffer.append(TEXT_158); > stringBuffer.append(genClass.getQualifiedInterfaceName()); > if (!genModel.isSuppressEMFModelTags() && (genClass.isExternalInterface() || genClass.isDynamic())) { boolean first = true; for (StringTokenizer stringTokenizer = new StringTokenizer(genClass.getModelInfo(), "\n\r"); stringTokenizer.hasMoreTokens(); ) { String modelInfo = stringTokenizer.nextToken(); if (first) { first = false; >- stringBuffer.append(TEXT_155); >+ stringBuffer.append(TEXT_159); > stringBuffer.append(modelInfo); > } else { >- stringBuffer.append(TEXT_156); >+ stringBuffer.append(TEXT_160); > stringBuffer.append(modelInfo); > }} if (first) { >- stringBuffer.append(TEXT_157); >+ stringBuffer.append(TEXT_161); > }} > } else if (genClassifier instanceof GenEnum) { GenEnum genEnum = (GenEnum)genClassifier; >- stringBuffer.append(TEXT_158); >+ stringBuffer.append(TEXT_162); > stringBuffer.append(genEnum.getQualifiedName()); >- stringBuffer.append(TEXT_159); >+ stringBuffer.append(TEXT_163); > stringBuffer.append(genEnum.getFormattedName()); >- stringBuffer.append(TEXT_160); >+ stringBuffer.append(TEXT_164); > stringBuffer.append(genEnum.getFormattedName()); >- stringBuffer.append(TEXT_161); >+ stringBuffer.append(TEXT_165); > stringBuffer.append(genEnum.getQualifiedName()); > } else if (genClassifier instanceof GenDataType) { GenDataType genDataType = (GenDataType)genClassifier; > if (genDataType.isPrimitiveType() || genDataType.isArrayType()) { >- stringBuffer.append(TEXT_162); >+ stringBuffer.append(TEXT_166); > stringBuffer.append(genDataType.getFormattedName()); >- stringBuffer.append(TEXT_163); >+ stringBuffer.append(TEXT_167); > } else { >- stringBuffer.append(TEXT_164); >+ stringBuffer.append(TEXT_168); > stringBuffer.append(genDataType.getRawInstanceClassName()); >- stringBuffer.append(TEXT_165); >+ stringBuffer.append(TEXT_169); > stringBuffer.append(genDataType.getFormattedName()); >- stringBuffer.append(TEXT_166); >+ stringBuffer.append(TEXT_170); > } >- stringBuffer.append(TEXT_167); >+ stringBuffer.append(TEXT_171); > stringBuffer.append(genDataType.getFormattedName()); >- stringBuffer.append(TEXT_168); >+ stringBuffer.append(TEXT_172); > if (!genDataType.isPrimitiveType() && !genDataType.isArrayType()) { >- stringBuffer.append(TEXT_169); >+ stringBuffer.append(TEXT_173); > stringBuffer.append(genDataType.getRawInstanceClassName()); > } > if (!genModel.isSuppressEMFModelTags()) {boolean first = true; for (StringTokenizer stringTokenizer = new StringTokenizer(genDataType.getModelInfo(), "\n\r"); stringTokenizer.hasMoreTokens(); ) { String modelInfo = stringTokenizer.nextToken(); if (first) { first = false; >- stringBuffer.append(TEXT_170); >+ stringBuffer.append(TEXT_174); > stringBuffer.append(modelInfo); > } else { >- stringBuffer.append(TEXT_171); >+ stringBuffer.append(TEXT_175); > stringBuffer.append(modelInfo); > }} if (first) { >- stringBuffer.append(TEXT_172); >+ stringBuffer.append(TEXT_176); > }} > } >- stringBuffer.append(TEXT_173); >+ stringBuffer.append(TEXT_177); > } else { >- stringBuffer.append(TEXT_174); >+ stringBuffer.append(TEXT_178); > } > if (isImplementation) { >- stringBuffer.append(TEXT_175); >+ stringBuffer.append(TEXT_179); > stringBuffer.append(genClassifier.getImportedMetaType()); >- stringBuffer.append(TEXT_176); >+ stringBuffer.append(TEXT_180); > stringBuffer.append(genClassifier.getClassifierAccessorName()); >- stringBuffer.append(TEXT_177); >+ stringBuffer.append(TEXT_181); > if (genPackage.isLoadedInitialization()) { >- stringBuffer.append(TEXT_178); >+ stringBuffer.append(TEXT_182); > stringBuffer.append(genClassifier.getClassifierInstanceName()); >- stringBuffer.append(TEXT_179); >+ stringBuffer.append(TEXT_183); > stringBuffer.append(genClassifier.getClassifierInstanceName()); >- stringBuffer.append(TEXT_180); >+ stringBuffer.append(TEXT_184); > stringBuffer.append(genClassifier.getImportedMetaType()); >- stringBuffer.append(TEXT_181); >+ stringBuffer.append(TEXT_185); > stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EPackage")); >- stringBuffer.append(TEXT_182); >+ stringBuffer.append(TEXT_186); > stringBuffer.append(genPackage.getImportedPackageInterfaceName()); >- stringBuffer.append(TEXT_183); >+ stringBuffer.append(TEXT_187); > stringBuffer.append(genPackage.getLocalClassifierIndex(genClassifier)); >- stringBuffer.append(TEXT_184); >+ stringBuffer.append(TEXT_188); > } >- stringBuffer.append(TEXT_185); >+ stringBuffer.append(TEXT_189); > stringBuffer.append(genClassifier.getClassifierInstanceName()); >- stringBuffer.append(TEXT_186); >+ stringBuffer.append(TEXT_190); > } else { >- stringBuffer.append(TEXT_187); >+ stringBuffer.append(TEXT_191); > stringBuffer.append(genClassifier.getImportedMetaType()); >- stringBuffer.append(TEXT_188); >+ stringBuffer.append(TEXT_192); > stringBuffer.append(genClassifier.getClassifierAccessorName()); >- stringBuffer.append(TEXT_189); >+ stringBuffer.append(TEXT_193); > } > if (genClassifier instanceof GenClass) { GenClass genClass = (GenClass)genClassifier; > for (GenFeature genFeature : genClass.getGenFeatures()) { > if (isInterface) { >- stringBuffer.append(TEXT_190); >+ stringBuffer.append(TEXT_194); > stringBuffer.append(genFeature.getFeatureKind()); >- stringBuffer.append(TEXT_191); >+ stringBuffer.append(TEXT_195); > stringBuffer.append(genClass.getQualifiedInterfaceName()); > if (!genClass.isMapEntry() && !genFeature.isSuppressedGetVisibility()) { >- stringBuffer.append(TEXT_192); >+ stringBuffer.append(TEXT_196); > stringBuffer.append(genFeature.getGetAccessor()); > } >- stringBuffer.append(TEXT_193); >+ stringBuffer.append(TEXT_197); > stringBuffer.append(genFeature.getFormattedName()); >- stringBuffer.append(TEXT_194); >+ stringBuffer.append(TEXT_198); > stringBuffer.append(genFeature.getFeatureKind()); >- stringBuffer.append(TEXT_195); >+ stringBuffer.append(TEXT_199); > stringBuffer.append(genFeature.getFormattedName()); >- stringBuffer.append(TEXT_196); >+ stringBuffer.append(TEXT_200); > stringBuffer.append(genClass.getQualifiedInterfaceName()); > if (!genClass.isMapEntry() && !genFeature.isSuppressedGetVisibility()) { >- stringBuffer.append(TEXT_197); >+ stringBuffer.append(TEXT_201); > stringBuffer.append(genFeature.getGetAccessor()); >- stringBuffer.append(TEXT_198); >+ stringBuffer.append(TEXT_202); > } >- stringBuffer.append(TEXT_199); >+ stringBuffer.append(TEXT_203); > stringBuffer.append(genClass.getClassifierAccessorName()); >- stringBuffer.append(TEXT_200); >+ stringBuffer.append(TEXT_204); > } else { >- stringBuffer.append(TEXT_201); >+ stringBuffer.append(TEXT_205); > } > if (isImplementation) { >- stringBuffer.append(TEXT_202); >+ stringBuffer.append(TEXT_206); > stringBuffer.append(genFeature.getImportedMetaType()); >- stringBuffer.append(TEXT_203); >+ stringBuffer.append(TEXT_207); > stringBuffer.append(genFeature.getFeatureAccessorName()); >- stringBuffer.append(TEXT_204); >+ stringBuffer.append(TEXT_208); > if (!genPackage.isLoadedInitialization()) { >- stringBuffer.append(TEXT_205); >+ stringBuffer.append(TEXT_209); > stringBuffer.append(genFeature.getImportedMetaType()); >- stringBuffer.append(TEXT_206); >+ stringBuffer.append(TEXT_210); > stringBuffer.append(genClass.getClassifierInstanceName()); >- stringBuffer.append(TEXT_207); >+ stringBuffer.append(TEXT_211); > stringBuffer.append(genClass.getLocalFeatureIndex(genFeature)); >- stringBuffer.append(TEXT_208); >+ stringBuffer.append(TEXT_212); > } else { >- stringBuffer.append(TEXT_209); >+ stringBuffer.append(TEXT_213); > stringBuffer.append(genFeature.getImportedMetaType()); >- stringBuffer.append(TEXT_210); >+ stringBuffer.append(TEXT_214); > stringBuffer.append(genClassifier.getClassifierAccessorName()); >- stringBuffer.append(TEXT_211); >+ stringBuffer.append(TEXT_215); > stringBuffer.append(genClass.getLocalFeatureIndex(genFeature)); >- stringBuffer.append(TEXT_212); >+ stringBuffer.append(TEXT_216); > } >- stringBuffer.append(TEXT_213); >+ stringBuffer.append(TEXT_217); > } else { >- stringBuffer.append(TEXT_214); >+ stringBuffer.append(TEXT_218); > stringBuffer.append(genFeature.getImportedMetaType()); >- stringBuffer.append(TEXT_215); >+ stringBuffer.append(TEXT_219); > stringBuffer.append(genFeature.getFeatureAccessorName()); >- stringBuffer.append(TEXT_216); >+ stringBuffer.append(TEXT_220); > } >- stringBuffer.append(TEXT_217); >+ stringBuffer.append(TEXT_221); > } > } > } > if (isInterface) { >- stringBuffer.append(TEXT_218); >+ stringBuffer.append(TEXT_222); > } else { >- stringBuffer.append(TEXT_219); >+ stringBuffer.append(TEXT_223); > } > if (isImplementation) { >- stringBuffer.append(TEXT_220); >+ stringBuffer.append(TEXT_224); > stringBuffer.append(genPackage.getImportedFactoryInterfaceName()); >- stringBuffer.append(TEXT_221); >+ stringBuffer.append(TEXT_225); > stringBuffer.append(genPackage.getFactoryName()); >- stringBuffer.append(TEXT_222); >+ stringBuffer.append(TEXT_226); > stringBuffer.append(genPackage.getImportedFactoryInterfaceName()); >- stringBuffer.append(TEXT_223); >+ stringBuffer.append(TEXT_227); > } else { >- stringBuffer.append(TEXT_224); >+ stringBuffer.append(TEXT_228); > stringBuffer.append(genPackage.getFactoryInterfaceName()); >- stringBuffer.append(TEXT_225); >+ stringBuffer.append(TEXT_229); > stringBuffer.append(genPackage.getFactoryName()); >- stringBuffer.append(TEXT_226); >+ stringBuffer.append(TEXT_230); > } >- stringBuffer.append(TEXT_227); >+ stringBuffer.append(TEXT_231); > if (isImplementation) { > if (!genPackage.isLoadedInitialization()) { >- stringBuffer.append(TEXT_228); >+ stringBuffer.append(TEXT_232); > if (!genPackage.getGenClasses().isEmpty()) { >- stringBuffer.append(TEXT_229); >+ stringBuffer.append(TEXT_233); > for (Iterator<GenClass> c=genPackage.getGenClasses().iterator(); c.hasNext();) { GenClass genClass = c.next(); >- stringBuffer.append(TEXT_230); >+ stringBuffer.append(TEXT_234); > stringBuffer.append(genClass.getClassifierInstanceName()); >- stringBuffer.append(TEXT_231); >+ stringBuffer.append(TEXT_235); > stringBuffer.append(genClass.getMetaType()); >- stringBuffer.append(TEXT_232); >+ stringBuffer.append(TEXT_236); > stringBuffer.append(genClass.getClassifierID()); >- stringBuffer.append(TEXT_233); >+ stringBuffer.append(TEXT_237); > for (GenFeature genFeature : genClass.getGenFeatures()) { >- stringBuffer.append(TEXT_234); >+ stringBuffer.append(TEXT_238); > stringBuffer.append(genFeature.getMetaType()); >- stringBuffer.append(TEXT_235); >+ stringBuffer.append(TEXT_239); > stringBuffer.append(genClass.getClassifierInstanceName()); >- stringBuffer.append(TEXT_236); >+ stringBuffer.append(TEXT_240); > stringBuffer.append(genClass.getFeatureID(genFeature)); >- stringBuffer.append(TEXT_237); >+ stringBuffer.append(TEXT_241); > } > if (c.hasNext()) { >- stringBuffer.append(TEXT_238); >+ stringBuffer.append(TEXT_242); > } > } > } > if (!genPackage.getGenEnums().isEmpty()) { >- stringBuffer.append(TEXT_239); >+ stringBuffer.append(TEXT_243); > for (GenEnum genEnum : genPackage.getGenEnums()) { >- stringBuffer.append(TEXT_240); >+ stringBuffer.append(TEXT_244); > stringBuffer.append(genEnum.getClassifierInstanceName()); >- stringBuffer.append(TEXT_241); >+ stringBuffer.append(TEXT_245); > stringBuffer.append(genEnum.getClassifierID()); >- stringBuffer.append(TEXT_242); >+ stringBuffer.append(TEXT_246); > } > } > if (!genPackage.getGenDataTypes().isEmpty()) { >- stringBuffer.append(TEXT_243); >+ stringBuffer.append(TEXT_247); > for (GenDataType genDataType : genPackage.getGenDataTypes()) { >- stringBuffer.append(TEXT_244); >+ stringBuffer.append(TEXT_248); > stringBuffer.append(genDataType.getClassifierInstanceName()); >- stringBuffer.append(TEXT_245); >+ stringBuffer.append(TEXT_249); > stringBuffer.append(genDataType.getClassifierID()); >- stringBuffer.append(TEXT_246); >+ stringBuffer.append(TEXT_250); > } > } >- stringBuffer.append(TEXT_247); >+ stringBuffer.append(TEXT_251); > > /////////////////////// > class Information >@@ -1295,155 +1307,155 @@ > /////////////////////// > int maxGenericTypeAssignment = 0; > >- stringBuffer.append(TEXT_248); >+ stringBuffer.append(TEXT_252); > if (!genPackage.getPackageInitializationDependencies().isEmpty()) { >- stringBuffer.append(TEXT_249); >+ stringBuffer.append(TEXT_253); > for (GenPackage dep : genPackage.getPackageInitializationDependencies()) { >- stringBuffer.append(TEXT_250); >+ stringBuffer.append(TEXT_254); > stringBuffer.append(dep.getImportedPackageInterfaceName()); >- stringBuffer.append(TEXT_251); >+ stringBuffer.append(TEXT_255); > stringBuffer.append(genPackage.getPackageInstanceVariable(dep)); >- stringBuffer.append(TEXT_252); >+ stringBuffer.append(TEXT_256); > stringBuffer.append(dep.getImportedPackageInterfaceName()); >- stringBuffer.append(TEXT_253); >+ stringBuffer.append(TEXT_257); > stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EPackage")); >- stringBuffer.append(TEXT_254); >+ stringBuffer.append(TEXT_258); > stringBuffer.append(dep.getImportedPackageInterfaceName()); >- stringBuffer.append(TEXT_255); >+ stringBuffer.append(TEXT_259); > } > } > if (!genPackage.getSubGenPackages().isEmpty()) { >- stringBuffer.append(TEXT_256); >+ stringBuffer.append(TEXT_260); > for (GenPackage sub : genPackage.getSubGenPackages()) { >- stringBuffer.append(TEXT_257); >+ stringBuffer.append(TEXT_261); > stringBuffer.append(genPackage.getPackageInstanceVariable(sub)); >- stringBuffer.append(TEXT_258); >+ stringBuffer.append(TEXT_262); > } > } > if (!genPackage.getGenClasses().isEmpty()) { boolean firstOperationAssignment = true; int maxTypeParameterAssignment = 0; > if (genModel.useGenerics()) { >- stringBuffer.append(TEXT_259); >+ stringBuffer.append(TEXT_263); > for (GenClassifier genClassifier : genPackage.getGenClassifiers()) { > for (GenTypeParameter genTypeParameter : genClassifier.getGenTypeParameters()) { > if (!genTypeParameter.getEcoreTypeParameter().getEBounds().isEmpty() || genTypeParameter.isUsed()) { >- stringBuffer.append(TEXT_260); >+ stringBuffer.append(TEXT_264); > stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.ETypeParameter")); >- stringBuffer.append(TEXT_261); >+ stringBuffer.append(TEXT_265); > stringBuffer.append(genClassifier.getClassifierInstanceName()); >- stringBuffer.append(TEXT_262); >+ stringBuffer.append(TEXT_266); > stringBuffer.append(genTypeParameter.getName()); >- stringBuffer.append(TEXT_263); >+ stringBuffer.append(TEXT_267); > stringBuffer.append(genClassifier.getClassifierInstanceName()); >- stringBuffer.append(TEXT_264); >+ stringBuffer.append(TEXT_268); > stringBuffer.append(genTypeParameter.getName()); >- stringBuffer.append(TEXT_265); >+ stringBuffer.append(TEXT_269); > stringBuffer.append(genModel.getNonNLS()); > } else { >- stringBuffer.append(TEXT_266); >+ stringBuffer.append(TEXT_270); > stringBuffer.append(genClassifier.getClassifierInstanceName()); >- stringBuffer.append(TEXT_267); >+ stringBuffer.append(TEXT_271); > stringBuffer.append(genTypeParameter.getName()); >- stringBuffer.append(TEXT_268); >+ stringBuffer.append(TEXT_272); > stringBuffer.append(genModel.getNonNLS()); > } > } > } > } > if (genModel.useGenerics()) { >- stringBuffer.append(TEXT_269); >+ stringBuffer.append(TEXT_273); > for (GenClassifier genClassifier : genPackage.getGenClassifiers()) { > for (GenTypeParameter genTypeParameter : genClassifier.getGenTypeParameters()) { > for (EGenericType bound : genTypeParameter.getEcoreTypeParameter().getEBounds()) { > for (InformationIterator i=new InformationIterator(bound); i.hasNext(); ) { Information info = i.next(); String prefix = ""; if (maxGenericTypeAssignment <= info.depth) { ++maxGenericTypeAssignment; prefix = genModel.getImportedName("org.eclipse.emf.ecore.EGenericType") + " "; } >- stringBuffer.append(TEXT_270); >+ stringBuffer.append(TEXT_274); > stringBuffer.append(prefix); >- stringBuffer.append(TEXT_271); >+ stringBuffer.append(TEXT_275); > stringBuffer.append(info.depth + 1); >- stringBuffer.append(TEXT_272); >+ stringBuffer.append(TEXT_276); > stringBuffer.append(info.type); >- stringBuffer.append(TEXT_273); >+ stringBuffer.append(TEXT_277); > if (info.depth > 0) { >- stringBuffer.append(TEXT_274); >+ stringBuffer.append(TEXT_278); > stringBuffer.append(info.depth); >- stringBuffer.append(TEXT_275); >+ stringBuffer.append(TEXT_279); > stringBuffer.append(info.accessor); >- stringBuffer.append(TEXT_276); >+ stringBuffer.append(TEXT_280); > stringBuffer.append(info.depth + 1); >- stringBuffer.append(TEXT_277); >+ stringBuffer.append(TEXT_281); > } > } >- stringBuffer.append(TEXT_278); >+ stringBuffer.append(TEXT_282); > stringBuffer.append(genClassifier.getClassifierInstanceName()); >- stringBuffer.append(TEXT_279); >+ stringBuffer.append(TEXT_283); > stringBuffer.append(genTypeParameter.getName()); >- stringBuffer.append(TEXT_280); >+ stringBuffer.append(TEXT_284); > } > } > } > } >- stringBuffer.append(TEXT_281); >+ stringBuffer.append(TEXT_285); > for (GenClass genClass : genPackage.getGenClasses()) { > if (!genClass.hasGenericSuperTypes()) { > for (GenClass baseGenClass : genClass.getBaseGenClasses()) { >- stringBuffer.append(TEXT_282); >+ stringBuffer.append(TEXT_286); > stringBuffer.append(genClass.getClassifierInstanceName()); >- stringBuffer.append(TEXT_283); >+ stringBuffer.append(TEXT_287); > stringBuffer.append(genPackage.getPackageInstanceVariable(baseGenClass.getGenPackage())); >- stringBuffer.append(TEXT_284); >+ stringBuffer.append(TEXT_288); > stringBuffer.append(baseGenClass.getClassifierAccessorName()); >- stringBuffer.append(TEXT_285); >+ stringBuffer.append(TEXT_289); > } > } else { > for (EGenericType superType : genClass.getEcoreClass().getEGenericSuperTypes()) { > for (InformationIterator i=new InformationIterator(superType); i.hasNext(); ) { Information info = i.next(); String prefix = ""; if (maxGenericTypeAssignment <= info.depth) { ++maxGenericTypeAssignment; prefix = genModel.getImportedName("org.eclipse.emf.ecore.EGenericType") + " "; } >- stringBuffer.append(TEXT_286); >+ stringBuffer.append(TEXT_290); > stringBuffer.append(prefix); >- stringBuffer.append(TEXT_287); >+ stringBuffer.append(TEXT_291); > stringBuffer.append(info.depth + 1); >- stringBuffer.append(TEXT_288); >+ stringBuffer.append(TEXT_292); > stringBuffer.append(info.type); >- stringBuffer.append(TEXT_289); >+ stringBuffer.append(TEXT_293); > if (info.depth > 0) { >- stringBuffer.append(TEXT_290); >+ stringBuffer.append(TEXT_294); > stringBuffer.append(info.depth); >- stringBuffer.append(TEXT_291); >+ stringBuffer.append(TEXT_295); > stringBuffer.append(info.accessor); >- stringBuffer.append(TEXT_292); >+ stringBuffer.append(TEXT_296); > stringBuffer.append(info.depth + 1); >- stringBuffer.append(TEXT_293); >+ stringBuffer.append(TEXT_297); > } > } >- stringBuffer.append(TEXT_294); >+ stringBuffer.append(TEXT_298); > stringBuffer.append(genClass.getClassifierInstanceName()); >- stringBuffer.append(TEXT_295); >+ stringBuffer.append(TEXT_299); > } > } > } >- stringBuffer.append(TEXT_296); >+ stringBuffer.append(TEXT_300); > for (Iterator<GenClass> c=genPackage.getGenClasses().iterator(); c.hasNext();) { GenClass genClass = c.next(); boolean hasInstanceTypeName = genModel.useGenerics() && genClass.getEcoreClass().getInstanceTypeName() != null && genClass.getEcoreClass().getInstanceTypeName().contains("<"); >- stringBuffer.append(TEXT_297); >+ stringBuffer.append(TEXT_301); > stringBuffer.append(genClass.getClassifierInstanceName()); >- stringBuffer.append(TEXT_298); >+ stringBuffer.append(TEXT_302); > if (genClass.isDynamic()) { >- stringBuffer.append(TEXT_299); >+ stringBuffer.append(TEXT_303); > } else { > stringBuffer.append(genClass.getRawImportedInterfaceName()); >- stringBuffer.append(TEXT_300); >+ stringBuffer.append(TEXT_304); > } >- stringBuffer.append(TEXT_301); >+ stringBuffer.append(TEXT_305); > stringBuffer.append(genClass.getName()); >- stringBuffer.append(TEXT_302); >+ stringBuffer.append(TEXT_306); > stringBuffer.append(genClass.getAbstractFlag()); >- stringBuffer.append(TEXT_303); >+ stringBuffer.append(TEXT_307); > stringBuffer.append(genClass.getInterfaceFlag()); >- stringBuffer.append(TEXT_304); >+ stringBuffer.append(TEXT_308); > stringBuffer.append(genClass.getGeneratedInstanceClassFlag()); > if (hasInstanceTypeName) { >- stringBuffer.append(TEXT_305); >+ stringBuffer.append(TEXT_309); > stringBuffer.append(genClass.getEcoreClass().getInstanceTypeName()); >- stringBuffer.append(TEXT_306); >+ stringBuffer.append(TEXT_310); > } >- stringBuffer.append(TEXT_307); >+ stringBuffer.append(TEXT_311); > stringBuffer.append(genModel.getNonNLS()); > if (hasInstanceTypeName) { > stringBuffer.append(genModel.getNonNLS(2)); >@@ -1451,422 +1463,422 @@ > for (GenFeature genFeature : genClass.getGenFeatures()) { > if (genFeature.hasGenericType()) { > for (InformationIterator i=new InformationIterator(genFeature.getEcoreFeature().getEGenericType()); i.hasNext(); ) { Information info = i.next(); String prefix = ""; if (maxGenericTypeAssignment <= info.depth) { ++maxGenericTypeAssignment; prefix = genModel.getImportedName("org.eclipse.emf.ecore.EGenericType") + " "; } >- stringBuffer.append(TEXT_308); >+ stringBuffer.append(TEXT_312); > stringBuffer.append(prefix); >- stringBuffer.append(TEXT_309); >+ stringBuffer.append(TEXT_313); > stringBuffer.append(info.depth + 1); >- stringBuffer.append(TEXT_310); >+ stringBuffer.append(TEXT_314); > stringBuffer.append(info.type); >- stringBuffer.append(TEXT_311); >+ stringBuffer.append(TEXT_315); > if (info.depth > 0) { >- stringBuffer.append(TEXT_312); >+ stringBuffer.append(TEXT_316); > stringBuffer.append(info.depth); >- stringBuffer.append(TEXT_313); >+ stringBuffer.append(TEXT_317); > stringBuffer.append(info.accessor); >- stringBuffer.append(TEXT_314); >+ stringBuffer.append(TEXT_318); > stringBuffer.append(info.depth + 1); >- stringBuffer.append(TEXT_315); >+ stringBuffer.append(TEXT_319); > } > } > } > if (genFeature.isReferenceType()) { GenFeature reverseGenFeature = genFeature.getReverse(); > String reverse = reverseGenFeature == null ? "null" : genPackage.getPackageInstanceVariable(reverseGenFeature.getGenPackage()) + ".get" + reverseGenFeature.getFeatureAccessorName() + "()"; >- stringBuffer.append(TEXT_316); >+ stringBuffer.append(TEXT_320); > stringBuffer.append(genFeature.getFeatureAccessorName()); >- stringBuffer.append(TEXT_317); >+ stringBuffer.append(TEXT_321); > if (genFeature.hasGenericType()) { >- stringBuffer.append(TEXT_318); >+ stringBuffer.append(TEXT_322); > } else { > stringBuffer.append(genPackage.getPackageInstanceVariable(genFeature.getTypeGenPackage())); >- stringBuffer.append(TEXT_319); >+ stringBuffer.append(TEXT_323); > stringBuffer.append(genFeature.getTypeClassifierAccessorName()); >- stringBuffer.append(TEXT_320); >+ stringBuffer.append(TEXT_324); > } >- stringBuffer.append(TEXT_321); >+ stringBuffer.append(TEXT_325); > stringBuffer.append(reverse); >- stringBuffer.append(TEXT_322); >+ stringBuffer.append(TEXT_326); > stringBuffer.append(genFeature.getName()); >- stringBuffer.append(TEXT_323); >+ stringBuffer.append(TEXT_327); > stringBuffer.append(genFeature.getDefaultValue()); >- stringBuffer.append(TEXT_324); >+ stringBuffer.append(TEXT_328); > stringBuffer.append(genFeature.getLowerBound()); >- stringBuffer.append(TEXT_325); >+ stringBuffer.append(TEXT_329); > stringBuffer.append(genFeature.getUpperBound()); >- stringBuffer.append(TEXT_326); >+ stringBuffer.append(TEXT_330); > stringBuffer.append(genFeature.getContainerClass()); >- stringBuffer.append(TEXT_327); >+ stringBuffer.append(TEXT_331); > stringBuffer.append(genFeature.getTransientFlag()); >- stringBuffer.append(TEXT_328); >+ stringBuffer.append(TEXT_332); > stringBuffer.append(genFeature.getVolatileFlag()); >- stringBuffer.append(TEXT_329); >+ stringBuffer.append(TEXT_333); > stringBuffer.append(genFeature.getChangeableFlag()); >- stringBuffer.append(TEXT_330); >+ stringBuffer.append(TEXT_334); > stringBuffer.append(genFeature.getContainmentFlag()); >- stringBuffer.append(TEXT_331); >+ stringBuffer.append(TEXT_335); > stringBuffer.append(genFeature.getResolveProxiesFlag()); >- stringBuffer.append(TEXT_332); >+ stringBuffer.append(TEXT_336); > stringBuffer.append(genFeature.getUnsettableFlag()); >- stringBuffer.append(TEXT_333); >+ stringBuffer.append(TEXT_337); > stringBuffer.append(genFeature.getUniqueFlag()); >- stringBuffer.append(TEXT_334); >+ stringBuffer.append(TEXT_338); > stringBuffer.append(genFeature.getDerivedFlag()); >- stringBuffer.append(TEXT_335); >+ stringBuffer.append(TEXT_339); > stringBuffer.append(genFeature.getOrderedFlag()); >- stringBuffer.append(TEXT_336); >+ stringBuffer.append(TEXT_340); > stringBuffer.append(genModel.getNonNLS()); > stringBuffer.append(genModel.getNonNLS(genFeature.getDefaultValue(), 2)); > for (GenFeature keyFeature : genFeature.getKeys()) { >- stringBuffer.append(TEXT_337); >+ stringBuffer.append(TEXT_341); > stringBuffer.append(genFeature.getFeatureAccessorName()); >- stringBuffer.append(TEXT_338); >+ stringBuffer.append(TEXT_342); > stringBuffer.append(genPackage.getPackageInstanceVariable(keyFeature.getGenPackage())); >- stringBuffer.append(TEXT_339); >+ stringBuffer.append(TEXT_343); > stringBuffer.append(keyFeature.getFeatureAccessorName()); >- stringBuffer.append(TEXT_340); >+ stringBuffer.append(TEXT_344); > } > } else { >- stringBuffer.append(TEXT_341); >+ stringBuffer.append(TEXT_345); > stringBuffer.append(genFeature.getFeatureAccessorName()); >- stringBuffer.append(TEXT_342); >+ stringBuffer.append(TEXT_346); > if (genFeature.hasGenericType()) { >- stringBuffer.append(TEXT_343); >+ stringBuffer.append(TEXT_347); > } else { > stringBuffer.append(genPackage.getPackageInstanceVariable(genFeature.getTypeGenPackage())); >- stringBuffer.append(TEXT_344); >+ stringBuffer.append(TEXT_348); > stringBuffer.append(genFeature.getTypeClassifierAccessorName()); >- stringBuffer.append(TEXT_345); >+ stringBuffer.append(TEXT_349); > } >- stringBuffer.append(TEXT_346); >+ stringBuffer.append(TEXT_350); > stringBuffer.append(genFeature.getName()); >- stringBuffer.append(TEXT_347); >+ stringBuffer.append(TEXT_351); > stringBuffer.append(genFeature.getDefaultValue()); >- stringBuffer.append(TEXT_348); >+ stringBuffer.append(TEXT_352); > stringBuffer.append(genFeature.getLowerBound()); >- stringBuffer.append(TEXT_349); >+ stringBuffer.append(TEXT_353); > stringBuffer.append(genFeature.getUpperBound()); >- stringBuffer.append(TEXT_350); >+ stringBuffer.append(TEXT_354); > stringBuffer.append(genFeature.getContainerClass()); >- stringBuffer.append(TEXT_351); >+ stringBuffer.append(TEXT_355); > stringBuffer.append(genFeature.getTransientFlag()); >- stringBuffer.append(TEXT_352); >+ stringBuffer.append(TEXT_356); > stringBuffer.append(genFeature.getVolatileFlag()); >- stringBuffer.append(TEXT_353); >+ stringBuffer.append(TEXT_357); > stringBuffer.append(genFeature.getChangeableFlag()); >- stringBuffer.append(TEXT_354); >+ stringBuffer.append(TEXT_358); > stringBuffer.append(genFeature.getUnsettableFlag()); >- stringBuffer.append(TEXT_355); >+ stringBuffer.append(TEXT_359); > stringBuffer.append(genFeature.getIDFlag()); >- stringBuffer.append(TEXT_356); >+ stringBuffer.append(TEXT_360); > stringBuffer.append(genFeature.getUniqueFlag()); >- stringBuffer.append(TEXT_357); >+ stringBuffer.append(TEXT_361); > stringBuffer.append(genFeature.getDerivedFlag()); >- stringBuffer.append(TEXT_358); >+ stringBuffer.append(TEXT_362); > stringBuffer.append(genFeature.getOrderedFlag()); >- stringBuffer.append(TEXT_359); >+ stringBuffer.append(TEXT_363); > stringBuffer.append(genModel.getNonNLS()); > stringBuffer.append(genModel.getNonNLS(genFeature.getDefaultValue(), 2)); > } > } > for (GenOperation genOperation : genClass.getGenOperations()) {String prefix = ""; if (genOperation.hasGenericType() || !genOperation.getGenParameters().isEmpty() || !genOperation.getGenExceptions().isEmpty() || !genOperation.getGenTypeParameters().isEmpty()) { if (firstOperationAssignment) { firstOperationAssignment = false; prefix = genModel.getImportedName("org.eclipse.emf.ecore.EOperation") + " op = "; } else { prefix = "op = "; }} >- stringBuffer.append(TEXT_360); >+ stringBuffer.append(TEXT_364); > if (genModel.useGenerics()) { >- stringBuffer.append(TEXT_361); >+ stringBuffer.append(TEXT_365); > stringBuffer.append(prefix); >- stringBuffer.append(TEXT_362); >+ stringBuffer.append(TEXT_366); > stringBuffer.append(genClass.getClassifierInstanceName()); >- stringBuffer.append(TEXT_363); >+ stringBuffer.append(TEXT_367); > if (genOperation.isVoid() || genOperation.hasGenericType()) { >- stringBuffer.append(TEXT_364); >+ stringBuffer.append(TEXT_368); > } else { > stringBuffer.append(genPackage.getPackageInstanceVariable(genOperation.getTypeGenPackage())); >- stringBuffer.append(TEXT_365); >+ stringBuffer.append(TEXT_369); > stringBuffer.append(genOperation.getTypeClassifierAccessorName()); >- stringBuffer.append(TEXT_366); >+ stringBuffer.append(TEXT_370); > } >- stringBuffer.append(TEXT_367); >+ stringBuffer.append(TEXT_371); > stringBuffer.append(genOperation.getName()); >- stringBuffer.append(TEXT_368); >+ stringBuffer.append(TEXT_372); > stringBuffer.append(genOperation.getLowerBound()); >- stringBuffer.append(TEXT_369); >+ stringBuffer.append(TEXT_373); > stringBuffer.append(genOperation.getUpperBound()); >- stringBuffer.append(TEXT_370); >+ stringBuffer.append(TEXT_374); > stringBuffer.append(genOperation.getUniqueFlag()); >- stringBuffer.append(TEXT_371); >+ stringBuffer.append(TEXT_375); > stringBuffer.append(genOperation.getOrderedFlag()); >- stringBuffer.append(TEXT_372); >+ stringBuffer.append(TEXT_376); > stringBuffer.append(genModel.getNonNLS()); > } else if (!genOperation.isVoid()) { > if (!genOperation.getEcoreOperation().isOrdered() || !genOperation.getEcoreOperation().isUnique()) { needsAddEOperation = true; >- stringBuffer.append(TEXT_373); >+ stringBuffer.append(TEXT_377); > stringBuffer.append(prefix); >- stringBuffer.append(TEXT_374); >+ stringBuffer.append(TEXT_378); > stringBuffer.append(genClass.getClassifierInstanceName()); >- stringBuffer.append(TEXT_375); >+ stringBuffer.append(TEXT_379); > stringBuffer.append(genPackage.getPackageInstanceVariable(genOperation.getTypeGenPackage())); >- stringBuffer.append(TEXT_376); >+ stringBuffer.append(TEXT_380); > stringBuffer.append(genOperation.getTypeClassifierAccessorName()); >- stringBuffer.append(TEXT_377); >+ stringBuffer.append(TEXT_381); > stringBuffer.append(genOperation.getName()); >- stringBuffer.append(TEXT_378); >+ stringBuffer.append(TEXT_382); > stringBuffer.append(genOperation.getLowerBound()); >- stringBuffer.append(TEXT_379); >+ stringBuffer.append(TEXT_383); > stringBuffer.append(genOperation.getUpperBound()); >- stringBuffer.append(TEXT_380); >+ stringBuffer.append(TEXT_384); > stringBuffer.append(genOperation.getUniqueFlag()); >- stringBuffer.append(TEXT_381); >+ stringBuffer.append(TEXT_385); > stringBuffer.append(genOperation.getOrderedFlag()); >- stringBuffer.append(TEXT_382); >+ stringBuffer.append(TEXT_386); > stringBuffer.append(genModel.getNonNLS()); > } else { >- stringBuffer.append(TEXT_383); >+ stringBuffer.append(TEXT_387); > stringBuffer.append(prefix); >- stringBuffer.append(TEXT_384); >+ stringBuffer.append(TEXT_388); > stringBuffer.append(genClass.getClassifierInstanceName()); >- stringBuffer.append(TEXT_385); >+ stringBuffer.append(TEXT_389); > stringBuffer.append(genPackage.getPackageInstanceVariable(genOperation.getTypeGenPackage())); >- stringBuffer.append(TEXT_386); >+ stringBuffer.append(TEXT_390); > stringBuffer.append(genOperation.getTypeClassifierAccessorName()); >- stringBuffer.append(TEXT_387); >+ stringBuffer.append(TEXT_391); > stringBuffer.append(genOperation.getName()); >- stringBuffer.append(TEXT_388); >+ stringBuffer.append(TEXT_392); > stringBuffer.append(genOperation.getLowerBound()); >- stringBuffer.append(TEXT_389); >+ stringBuffer.append(TEXT_393); > stringBuffer.append(genOperation.getUpperBound()); >- stringBuffer.append(TEXT_390); >+ stringBuffer.append(TEXT_394); > stringBuffer.append(genModel.getNonNLS()); > } > } else { >- stringBuffer.append(TEXT_391); >+ stringBuffer.append(TEXT_395); > stringBuffer.append(prefix); >- stringBuffer.append(TEXT_392); >+ stringBuffer.append(TEXT_396); > stringBuffer.append(genClass.getClassifierInstanceName()); >- stringBuffer.append(TEXT_393); >+ stringBuffer.append(TEXT_397); > stringBuffer.append(genOperation.getName()); >- stringBuffer.append(TEXT_394); >+ stringBuffer.append(TEXT_398); > stringBuffer.append(genModel.getNonNLS()); > } > if (genModel.useGenerics()) { > for (ListIterator<GenTypeParameter> t=genOperation.getGenTypeParameters().listIterator(); t.hasNext(); ) { GenTypeParameter genTypeParameter = t.next(); String typeParameterVariable = ""; if (!genTypeParameter.getEcoreTypeParameter().getEBounds().isEmpty() || genTypeParameter.isUsed()) { if (maxTypeParameterAssignment <= t.previousIndex()) { ++maxTypeParameterAssignment; typeParameterVariable = genModel.getImportedName("org.eclipse.emf.ecore.ETypeParameter") + " t" + t.nextIndex() + " = "; } else { typeParameterVariable = "t" + t.nextIndex() + " = "; }} >- stringBuffer.append(TEXT_395); >+ stringBuffer.append(TEXT_399); > stringBuffer.append(typeParameterVariable); >- stringBuffer.append(TEXT_396); >+ stringBuffer.append(TEXT_400); > stringBuffer.append(genTypeParameter.getName()); >- stringBuffer.append(TEXT_397); >+ stringBuffer.append(TEXT_401); > stringBuffer.append(genModel.getNonNLS()); > for (EGenericType typeParameter : genTypeParameter.getEcoreTypeParameter().getEBounds()) { > for (InformationIterator i=new InformationIterator(typeParameter); i.hasNext(); ) { Information info = i.next(); String typePrefix = ""; if (maxGenericTypeAssignment <= info.depth) { ++maxGenericTypeAssignment; typePrefix = genModel.getImportedName("org.eclipse.emf.ecore.EGenericType") + " "; } >- stringBuffer.append(TEXT_398); >+ stringBuffer.append(TEXT_402); > stringBuffer.append(typePrefix); >- stringBuffer.append(TEXT_399); >+ stringBuffer.append(TEXT_403); > stringBuffer.append(info.depth + 1); >- stringBuffer.append(TEXT_400); >+ stringBuffer.append(TEXT_404); > stringBuffer.append(info.type); >- stringBuffer.append(TEXT_401); >+ stringBuffer.append(TEXT_405); > if (info.depth > 0) { >- stringBuffer.append(TEXT_402); >+ stringBuffer.append(TEXT_406); > stringBuffer.append(info.depth); >- stringBuffer.append(TEXT_403); >+ stringBuffer.append(TEXT_407); > stringBuffer.append(info.accessor); >- stringBuffer.append(TEXT_404); >+ stringBuffer.append(TEXT_408); > stringBuffer.append(info.depth + 1); >- stringBuffer.append(TEXT_405); >+ stringBuffer.append(TEXT_409); > } > } >- stringBuffer.append(TEXT_406); >+ stringBuffer.append(TEXT_410); > stringBuffer.append(t.nextIndex()); >- stringBuffer.append(TEXT_407); >+ stringBuffer.append(TEXT_411); > } > } > } > for (GenParameter genParameter : genOperation.getGenParameters()) { > if (genParameter.hasGenericType()) { > for (InformationIterator i=new InformationIterator(genParameter.getEcoreParameter().getEGenericType()); i.hasNext(); ) { Information info = i.next(); String typePrefix = ""; if (maxGenericTypeAssignment <= info.depth) { ++maxGenericTypeAssignment; typePrefix = genModel.getImportedName("org.eclipse.emf.ecore.EGenericType") + " "; } >- stringBuffer.append(TEXT_408); >+ stringBuffer.append(TEXT_412); > stringBuffer.append(typePrefix); >- stringBuffer.append(TEXT_409); >+ stringBuffer.append(TEXT_413); > stringBuffer.append(info.depth + 1); >- stringBuffer.append(TEXT_410); >+ stringBuffer.append(TEXT_414); > stringBuffer.append(info.type); >- stringBuffer.append(TEXT_411); >+ stringBuffer.append(TEXT_415); > if (info.depth > 0) { >- stringBuffer.append(TEXT_412); >+ stringBuffer.append(TEXT_416); > stringBuffer.append(info.depth); >- stringBuffer.append(TEXT_413); >+ stringBuffer.append(TEXT_417); > stringBuffer.append(info.accessor); >- stringBuffer.append(TEXT_414); >+ stringBuffer.append(TEXT_418); > stringBuffer.append(info.depth + 1); >- stringBuffer.append(TEXT_415); >+ stringBuffer.append(TEXT_419); > } > } > } > if (genModel.useGenerics()) { >- stringBuffer.append(TEXT_416); >+ stringBuffer.append(TEXT_420); > if (genParameter.hasGenericType()){ >- stringBuffer.append(TEXT_417); >+ stringBuffer.append(TEXT_421); > } else { > stringBuffer.append(genPackage.getPackageInstanceVariable(genParameter.getTypeGenPackage())); >- stringBuffer.append(TEXT_418); >+ stringBuffer.append(TEXT_422); > stringBuffer.append(genParameter.getTypeClassifierAccessorName()); >- stringBuffer.append(TEXT_419); >+ stringBuffer.append(TEXT_423); > } >- stringBuffer.append(TEXT_420); >+ stringBuffer.append(TEXT_424); > stringBuffer.append(genParameter.getName()); >- stringBuffer.append(TEXT_421); >+ stringBuffer.append(TEXT_425); > stringBuffer.append(genParameter.getLowerBound()); >- stringBuffer.append(TEXT_422); >+ stringBuffer.append(TEXT_426); > stringBuffer.append(genParameter.getUpperBound()); >- stringBuffer.append(TEXT_423); >+ stringBuffer.append(TEXT_427); > stringBuffer.append(genParameter.getUniqueFlag()); >- stringBuffer.append(TEXT_424); >+ stringBuffer.append(TEXT_428); > stringBuffer.append(genParameter.getOrderedFlag()); >- stringBuffer.append(TEXT_425); >+ stringBuffer.append(TEXT_429); > stringBuffer.append(genModel.getNonNLS()); > } else if (!genParameter.getEcoreParameter().isOrdered() || !genParameter.getEcoreParameter().isUnique()) { needsAddEParameter = true; >- stringBuffer.append(TEXT_426); >+ stringBuffer.append(TEXT_430); > if (genParameter.hasGenericType()){ >- stringBuffer.append(TEXT_427); >+ stringBuffer.append(TEXT_431); > } else { > stringBuffer.append(genPackage.getPackageInstanceVariable(genParameter.getTypeGenPackage())); >- stringBuffer.append(TEXT_428); >+ stringBuffer.append(TEXT_432); > stringBuffer.append(genParameter.getTypeClassifierAccessorName()); >- stringBuffer.append(TEXT_429); >+ stringBuffer.append(TEXT_433); > } >- stringBuffer.append(TEXT_430); >+ stringBuffer.append(TEXT_434); > stringBuffer.append(genParameter.getName()); >- stringBuffer.append(TEXT_431); >+ stringBuffer.append(TEXT_435); > stringBuffer.append(genParameter.getLowerBound()); >- stringBuffer.append(TEXT_432); >+ stringBuffer.append(TEXT_436); > stringBuffer.append(genParameter.getUpperBound()); >- stringBuffer.append(TEXT_433); >+ stringBuffer.append(TEXT_437); > stringBuffer.append(genParameter.getUniqueFlag()); >- stringBuffer.append(TEXT_434); >+ stringBuffer.append(TEXT_438); > stringBuffer.append(genParameter.getOrderedFlag()); >- stringBuffer.append(TEXT_435); >+ stringBuffer.append(TEXT_439); > stringBuffer.append(genModel.getNonNLS()); > } else { >- stringBuffer.append(TEXT_436); >+ stringBuffer.append(TEXT_440); > if (genParameter.hasGenericType()){ >- stringBuffer.append(TEXT_437); >+ stringBuffer.append(TEXT_441); > } else { > stringBuffer.append(genPackage.getPackageInstanceVariable(genParameter.getTypeGenPackage())); >- stringBuffer.append(TEXT_438); >+ stringBuffer.append(TEXT_442); > stringBuffer.append(genParameter.getTypeClassifierAccessorName()); >- stringBuffer.append(TEXT_439); >+ stringBuffer.append(TEXT_443); > } >- stringBuffer.append(TEXT_440); >+ stringBuffer.append(TEXT_444); > stringBuffer.append(genParameter.getName()); >- stringBuffer.append(TEXT_441); >+ stringBuffer.append(TEXT_445); > stringBuffer.append(genParameter.getLowerBound()); >- stringBuffer.append(TEXT_442); >+ stringBuffer.append(TEXT_446); > stringBuffer.append(genParameter.getUpperBound()); >- stringBuffer.append(TEXT_443); >+ stringBuffer.append(TEXT_447); > stringBuffer.append(genModel.getNonNLS()); > } > } > if (genOperation.hasGenericExceptions()) { > for (EGenericType genericExceptions : genOperation.getEcoreOperation().getEGenericExceptions()) { > for (InformationIterator i=new InformationIterator(genericExceptions); i.hasNext(); ) { Information info = i.next(); String typePrefix = ""; if (maxGenericTypeAssignment <= info.depth) { ++maxGenericTypeAssignment; typePrefix = genModel.getImportedName("org.eclipse.emf.ecore.EGenericType") + " "; } >- stringBuffer.append(TEXT_444); >+ stringBuffer.append(TEXT_448); > stringBuffer.append(typePrefix); >- stringBuffer.append(TEXT_445); >+ stringBuffer.append(TEXT_449); > stringBuffer.append(info.depth + 1); >- stringBuffer.append(TEXT_446); >+ stringBuffer.append(TEXT_450); > stringBuffer.append(info.type); >- stringBuffer.append(TEXT_447); >+ stringBuffer.append(TEXT_451); > if (info.depth > 0) { >- stringBuffer.append(TEXT_448); >+ stringBuffer.append(TEXT_452); > stringBuffer.append(info.depth); >- stringBuffer.append(TEXT_449); >+ stringBuffer.append(TEXT_453); > stringBuffer.append(info.accessor); >- stringBuffer.append(TEXT_450); >+ stringBuffer.append(TEXT_454); > stringBuffer.append(info.depth + 1); >- stringBuffer.append(TEXT_451); >+ stringBuffer.append(TEXT_455); > } >- stringBuffer.append(TEXT_452); >+ stringBuffer.append(TEXT_456); > stringBuffer.append(info.depth + 1); >- stringBuffer.append(TEXT_453); >+ stringBuffer.append(TEXT_457); > } > } > } else { > for (GenClassifier genException : genOperation.getGenExceptions()) { >- stringBuffer.append(TEXT_454); >+ stringBuffer.append(TEXT_458); > stringBuffer.append(genPackage.getPackageInstanceVariable(genException.getGenPackage())); >- stringBuffer.append(TEXT_455); >+ stringBuffer.append(TEXT_459); > stringBuffer.append(genException.getClassifierAccessorName()); >- stringBuffer.append(TEXT_456); >+ stringBuffer.append(TEXT_460); > } > } > if (!genOperation.isVoid() && genOperation.hasGenericType()) { > for (InformationIterator i=new InformationIterator(genOperation.getEcoreOperation().getEGenericType()); i.hasNext(); ) { Information info = i.next(); String typePrefix = ""; if (maxGenericTypeAssignment <= info.depth) { ++maxGenericTypeAssignment; typePrefix = genModel.getImportedName("org.eclipse.emf.ecore.EGenericType") + " "; } >- stringBuffer.append(TEXT_457); >+ stringBuffer.append(TEXT_461); > stringBuffer.append(typePrefix); >- stringBuffer.append(TEXT_458); >+ stringBuffer.append(TEXT_462); > stringBuffer.append(info.depth + 1); >- stringBuffer.append(TEXT_459); >+ stringBuffer.append(TEXT_463); > stringBuffer.append(info.type); >- stringBuffer.append(TEXT_460); >+ stringBuffer.append(TEXT_464); > if (info.depth > 0) { >- stringBuffer.append(TEXT_461); >+ stringBuffer.append(TEXT_465); > stringBuffer.append(info.depth); >- stringBuffer.append(TEXT_462); >+ stringBuffer.append(TEXT_466); > stringBuffer.append(info.accessor); >- stringBuffer.append(TEXT_463); >+ stringBuffer.append(TEXT_467); > stringBuffer.append(info.depth + 1); >- stringBuffer.append(TEXT_464); >+ stringBuffer.append(TEXT_468); > } > } >- stringBuffer.append(TEXT_465); >+ stringBuffer.append(TEXT_469); > } > } > if (c.hasNext()) { >- stringBuffer.append(TEXT_466); >+ stringBuffer.append(TEXT_470); > } > } > } > if (!genPackage.getGenEnums().isEmpty()) { >- stringBuffer.append(TEXT_467); >+ stringBuffer.append(TEXT_471); > for (Iterator<GenEnum> e=genPackage.getGenEnums().iterator(); e.hasNext();) { GenEnum genEnum = e.next(); >- stringBuffer.append(TEXT_468); >+ stringBuffer.append(TEXT_472); > stringBuffer.append(genEnum.getClassifierInstanceName()); >- stringBuffer.append(TEXT_469); >+ stringBuffer.append(TEXT_473); > stringBuffer.append(genEnum.getImportedName()); >- stringBuffer.append(TEXT_470); >+ stringBuffer.append(TEXT_474); > stringBuffer.append(genEnum.getName()); >- stringBuffer.append(TEXT_471); >+ stringBuffer.append(TEXT_475); > stringBuffer.append(genModel.getNonNLS()); > for (GenEnumLiteral genEnumLiteral : genEnum.getGenEnumLiterals()) { >- stringBuffer.append(TEXT_472); >+ stringBuffer.append(TEXT_476); > stringBuffer.append(genEnum.getClassifierInstanceName()); >- stringBuffer.append(TEXT_473); >+ stringBuffer.append(TEXT_477); > stringBuffer.append(genEnum.getImportedName().equals(genEnum.getClassifierID()) ? genEnum.getQualifiedName() : genEnum.getImportedName()); >- stringBuffer.append(TEXT_474); >+ stringBuffer.append(TEXT_478); > stringBuffer.append(genEnumLiteral.getEnumLiteralInstanceConstantName()); >- stringBuffer.append(TEXT_475); >+ stringBuffer.append(TEXT_479); > } > if (e.hasNext()) { >- stringBuffer.append(TEXT_476); >+ stringBuffer.append(TEXT_480); > } > } > } > if (!genPackage.getGenDataTypes().isEmpty()) { >- stringBuffer.append(TEXT_477); >+ stringBuffer.append(TEXT_481); > for (GenDataType genDataType : genPackage.getGenDataTypes()) {boolean hasInstanceTypeName = genModel.useGenerics() && genDataType.getEcoreDataType().getInstanceTypeName() != null && genDataType.getEcoreDataType().getInstanceTypeName().contains("<"); >- stringBuffer.append(TEXT_478); >+ stringBuffer.append(TEXT_482); > stringBuffer.append(genDataType.getClassifierInstanceName()); >- stringBuffer.append(TEXT_479); >+ stringBuffer.append(TEXT_483); > stringBuffer.append(genDataType.getRawImportedInstanceClassName()); >- stringBuffer.append(TEXT_480); >+ stringBuffer.append(TEXT_484); > stringBuffer.append(genDataType.getName()); >- stringBuffer.append(TEXT_481); >+ stringBuffer.append(TEXT_485); > stringBuffer.append(genDataType.getSerializableFlag()); >- stringBuffer.append(TEXT_482); >+ stringBuffer.append(TEXT_486); > stringBuffer.append(genDataType.getGeneratedInstanceClassFlag()); > if (hasInstanceTypeName) { >- stringBuffer.append(TEXT_483); >+ stringBuffer.append(TEXT_487); > stringBuffer.append(genDataType.getEcoreDataType().getInstanceTypeName()); >- stringBuffer.append(TEXT_484); >+ stringBuffer.append(TEXT_488); > } >- stringBuffer.append(TEXT_485); >+ stringBuffer.append(TEXT_489); > stringBuffer.append(genModel.getNonNLS()); > if (hasInstanceTypeName) { > stringBuffer.append(genModel.getNonNLS(2)); >@@ -1874,18 +1886,9 @@ > } > } > if (genPackage.getSuperGenPackage() == null) { >- stringBuffer.append(TEXT_486); >- } >- if (!genPackage.isEcorePackage() && !genPackage.getAnnotationSources().isEmpty()) { >- stringBuffer.append(TEXT_487); >- for (String annotationSource : genPackage.getAnnotationSources()) { >- stringBuffer.append(TEXT_488); >- stringBuffer.append(annotationSource); >- stringBuffer.append(TEXT_489); >- stringBuffer.append(genPackage.getAnnotationSourceIdentifier(annotationSource)); > stringBuffer.append(TEXT_490); > } >- } >+ if (!genPackage.isEcorePackage() && !genPackage.getAnnotationSources().isEmpty()) { > stringBuffer.append(TEXT_491); > for (String annotationSource : genPackage.getAnnotationSources()) { > stringBuffer.append(TEXT_492); >@@ -1893,263 +1896,272 @@ > stringBuffer.append(TEXT_493); > stringBuffer.append(genPackage.getAnnotationSourceIdentifier(annotationSource)); > stringBuffer.append(TEXT_494); >- if (annotationSource == null) { >+ } >+ } > stringBuffer.append(TEXT_495); >- } else { >+ for (String annotationSource : genPackage.getAnnotationSources()) { > stringBuffer.append(TEXT_496); > stringBuffer.append(annotationSource); > stringBuffer.append(TEXT_497); >+ stringBuffer.append(genPackage.getAnnotationSourceIdentifier(annotationSource)); >+ stringBuffer.append(TEXT_498); >+ if (annotationSource == null) { >+ stringBuffer.append(TEXT_499); >+ } else { >+ stringBuffer.append(TEXT_500); >+ stringBuffer.append(annotationSource); >+ stringBuffer.append(TEXT_501); > stringBuffer.append(genModel.getNonNLS()); > } > for (EAnnotation eAnnotation : genPackage.getAllAnnotations()) { List<GenPackage.AnnotationReferenceData> annotationReferenceDataList = genPackage.getReferenceData(eAnnotation); >- stringBuffer.append(TEXT_498); >+ stringBuffer.append(TEXT_502); > if (annotationSource == null ? eAnnotation.getSource() == null : annotationSource.equals(eAnnotation.getSource())) { >- stringBuffer.append(TEXT_499); >+ stringBuffer.append(TEXT_503); > stringBuffer.append(genPackage.getAnnotatedModelElementAccessor(eAnnotation)); >- stringBuffer.append(TEXT_500); >+ stringBuffer.append(TEXT_504); > for (Iterator<Map.Entry<String, String>> k = eAnnotation.getDetails().iterator(); k.hasNext();) { Map.Entry<String, String> detail = k.next(); String key = Literals.toStringLiteral(detail.getKey(), genModel); String value = Literals.toStringLiteral(detail.getValue(), genModel); >- stringBuffer.append(TEXT_501); >+ stringBuffer.append(TEXT_505); > stringBuffer.append(key); >- stringBuffer.append(TEXT_502); >+ stringBuffer.append(TEXT_506); > stringBuffer.append(value); > stringBuffer.append(k.hasNext() ? "," : ""); > stringBuffer.append(genModel.getNonNLS(key + value)); > } >- stringBuffer.append(TEXT_503); >+ stringBuffer.append(TEXT_507); > if (annotationReferenceDataList.isEmpty()) { >- stringBuffer.append(TEXT_504); >+ stringBuffer.append(TEXT_508); > } else { >- stringBuffer.append(TEXT_505); >+ stringBuffer.append(TEXT_509); > } > if (!annotationReferenceDataList.isEmpty()) { >- stringBuffer.append(TEXT_506); >+ stringBuffer.append(TEXT_510); > stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.URI")); >- stringBuffer.append(TEXT_507); >+ stringBuffer.append(TEXT_511); > for (Iterator<GenPackage.AnnotationReferenceData> k = annotationReferenceDataList.iterator(); k.hasNext();) { GenPackage.AnnotationReferenceData annotationReferenceData = k.next(); >- stringBuffer.append(TEXT_508); >+ stringBuffer.append(TEXT_512); > stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.URI")); >- stringBuffer.append(TEXT_509); >+ stringBuffer.append(TEXT_513); > if (annotationReferenceData.containingGenPackage != genPackage) { > stringBuffer.append(annotationReferenceData.containingGenPackage.getImportedPackageInterfaceName()); >- stringBuffer.append(TEXT_510); >+ stringBuffer.append(TEXT_514); > } >- stringBuffer.append(TEXT_511); >+ stringBuffer.append(TEXT_515); > stringBuffer.append(annotationReferenceData.uriFragment); >- stringBuffer.append(TEXT_512); >+ stringBuffer.append(TEXT_516); > if (k.hasNext()) { >- stringBuffer.append(TEXT_513); >+ stringBuffer.append(TEXT_517); > } > stringBuffer.append(genModel.getNonNLS()); > } >- stringBuffer.append(TEXT_514); >+ stringBuffer.append(TEXT_518); > } > } > for (EAnnotation nestedEAnnotation : genPackage.getAllNestedAnnotations(eAnnotation)) {String nestedAnnotationSource = nestedEAnnotation.getSource(); int depth = 1; for (EObject eContainer = nestedEAnnotation.eContainer(); eContainer != eAnnotation; eContainer = eContainer.eContainer()) { ++depth; } List<GenPackage.AnnotationReferenceData> nestedAnnotationReferenceDataList = genPackage.getReferenceData(nestedEAnnotation); >- stringBuffer.append(TEXT_515); >+ stringBuffer.append(TEXT_519); > stringBuffer.append(genPackage.getAnnotatedModelElementAccessor(eAnnotation)); >- stringBuffer.append(TEXT_516); >+ stringBuffer.append(TEXT_520); > stringBuffer.append(depth); >- stringBuffer.append(TEXT_517); >+ stringBuffer.append(TEXT_521); > if (nestedAnnotationSource == null) { >- stringBuffer.append(TEXT_518); >+ stringBuffer.append(TEXT_522); > } else { >- stringBuffer.append(TEXT_519); >+ stringBuffer.append(TEXT_523); > stringBuffer.append(nestedAnnotationSource); >- stringBuffer.append(TEXT_520); >+ stringBuffer.append(TEXT_524); > stringBuffer.append(genModel.getNonNLS()); > } >- stringBuffer.append(TEXT_521); >+ stringBuffer.append(TEXT_525); > for (Iterator<Map.Entry<String, String>> l = nestedEAnnotation.getDetails().iterator(); l.hasNext();) { Map.Entry<String, String> detail = l.next(); String key = Literals.toStringLiteral(detail.getKey(), genModel); String value = Literals.toStringLiteral(detail.getValue(), genModel); >- stringBuffer.append(TEXT_522); >+ stringBuffer.append(TEXT_526); > stringBuffer.append(key); >- stringBuffer.append(TEXT_523); >+ stringBuffer.append(TEXT_527); > stringBuffer.append(value); > stringBuffer.append(l.hasNext() ? "," : ""); > stringBuffer.append(genModel.getNonNLS(key + value)); > } >- stringBuffer.append(TEXT_524); >+ stringBuffer.append(TEXT_528); > if (nestedAnnotationReferenceDataList.isEmpty()) { >- stringBuffer.append(TEXT_525); >+ stringBuffer.append(TEXT_529); > } else { >- stringBuffer.append(TEXT_526); >+ stringBuffer.append(TEXT_530); > } > if (!nestedAnnotationReferenceDataList.isEmpty()) { >- stringBuffer.append(TEXT_527); >+ stringBuffer.append(TEXT_531); > stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.URI")); >- stringBuffer.append(TEXT_528); >+ stringBuffer.append(TEXT_532); > for (Iterator<GenPackage.AnnotationReferenceData> l = nestedAnnotationReferenceDataList.iterator(); l.hasNext();) { GenPackage.AnnotationReferenceData annotationReferenceData = l.next(); >- stringBuffer.append(TEXT_529); >+ stringBuffer.append(TEXT_533); > stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.URI")); >- stringBuffer.append(TEXT_530); >+ stringBuffer.append(TEXT_534); > if (annotationReferenceData.containingGenPackage != genPackage) { > stringBuffer.append(annotationReferenceData.containingGenPackage.getImportedPackageInterfaceName()); >- stringBuffer.append(TEXT_531); >+ stringBuffer.append(TEXT_535); > } >- stringBuffer.append(TEXT_532); >+ stringBuffer.append(TEXT_536); > stringBuffer.append(annotationReferenceData.uriFragment); >- stringBuffer.append(TEXT_533); >+ stringBuffer.append(TEXT_537); > if (l.hasNext()) { >- stringBuffer.append(TEXT_534); >+ stringBuffer.append(TEXT_538); > } > stringBuffer.append(genModel.getNonNLS()); > } >- stringBuffer.append(TEXT_535); >+ stringBuffer.append(TEXT_539); > } > } > } >- stringBuffer.append(TEXT_536); >+ stringBuffer.append(TEXT_540); > } > } else { > if (genPackage.isLoadingInitialization()) { >- stringBuffer.append(TEXT_537); >+ stringBuffer.append(TEXT_541); > stringBuffer.append(genModel.getImportedName("java.net.URL")); >- stringBuffer.append(TEXT_538); >+ stringBuffer.append(TEXT_542); > stringBuffer.append(genModel.getNonNLS()); >- stringBuffer.append(TEXT_539); >+ stringBuffer.append(TEXT_543); > stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.URI")); >- stringBuffer.append(TEXT_540); >+ stringBuffer.append(TEXT_544); > stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.URI")); >- stringBuffer.append(TEXT_541); >+ stringBuffer.append(TEXT_545); > stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.resource.Resource")); >- stringBuffer.append(TEXT_542); >+ stringBuffer.append(TEXT_546); > stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.xmi.impl.EcoreResourceFactoryImpl")); >- stringBuffer.append(TEXT_543); >+ stringBuffer.append(TEXT_547); > stringBuffer.append(genModel.getImportedName("java.io.IOException")); >- stringBuffer.append(TEXT_544); >+ stringBuffer.append(TEXT_548); > stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.WrappedException")); >- stringBuffer.append(TEXT_545); >+ stringBuffer.append(TEXT_549); > stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EPackage")); >- stringBuffer.append(TEXT_546); >+ stringBuffer.append(TEXT_550); > } >- stringBuffer.append(TEXT_547); >+ stringBuffer.append(TEXT_551); > if (genModel.useClassOverrideAnnotation()) { >- stringBuffer.append(TEXT_548); >+ stringBuffer.append(TEXT_552); > } >- stringBuffer.append(TEXT_549); >+ stringBuffer.append(TEXT_553); > stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EClassifier")); >- stringBuffer.append(TEXT_550); >+ stringBuffer.append(TEXT_554); > ArrayList<GenClass> dynamicGenClasses = new ArrayList<GenClass>(); for (GenClass genClass : genPackage.getGenClasses()) { if (genClass.isDynamic()) { dynamicGenClasses.add(genClass); } } > if (dynamicGenClasses.isEmpty()) { >- stringBuffer.append(TEXT_551); >+ stringBuffer.append(TEXT_555); > stringBuffer.append(genPackage.getInterfacePackageName()); >- stringBuffer.append(TEXT_552); >+ stringBuffer.append(TEXT_556); > stringBuffer.append(genModel.getNonNLS()); >- stringBuffer.append(TEXT_553); >+ stringBuffer.append(TEXT_557); > } else { >- stringBuffer.append(TEXT_554); >+ stringBuffer.append(TEXT_558); > for (GenClass genClass : dynamicGenClasses) { > if (genClass.isDynamic()) { >- stringBuffer.append(TEXT_555); >+ stringBuffer.append(TEXT_559); > stringBuffer.append(genPackage.getClassifierID(genClass)); >- stringBuffer.append(TEXT_556); >+ stringBuffer.append(TEXT_560); > } > } >- stringBuffer.append(TEXT_557); >+ stringBuffer.append(TEXT_561); > stringBuffer.append(genPackage.getInterfacePackageName()); >- stringBuffer.append(TEXT_558); >+ stringBuffer.append(TEXT_562); > stringBuffer.append(genModel.getNonNLS()); >- stringBuffer.append(TEXT_559); >+ stringBuffer.append(TEXT_563); > } >- stringBuffer.append(TEXT_560); >+ stringBuffer.append(TEXT_564); > } > if (needsAddEOperation) { >- stringBuffer.append(TEXT_561); >+ stringBuffer.append(TEXT_565); > stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EOperation")); >- stringBuffer.append(TEXT_562); >+ stringBuffer.append(TEXT_566); > stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EClass")); >- stringBuffer.append(TEXT_563); >+ stringBuffer.append(TEXT_567); > stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EClassifier")); >- stringBuffer.append(TEXT_564); >+ stringBuffer.append(TEXT_568); > stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EOperation")); >- stringBuffer.append(TEXT_565); >+ stringBuffer.append(TEXT_569); > } > if (needsAddEParameter) { >- stringBuffer.append(TEXT_566); >+ stringBuffer.append(TEXT_570); > stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EParameter")); >- stringBuffer.append(TEXT_567); >+ stringBuffer.append(TEXT_571); > stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EOperation")); >- stringBuffer.append(TEXT_568); >+ stringBuffer.append(TEXT_572); > stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EClassifier")); >- stringBuffer.append(TEXT_569); >+ stringBuffer.append(TEXT_573); > stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EParameter")); >- stringBuffer.append(TEXT_570); >+ stringBuffer.append(TEXT_574); > } > } > if (isInterface && genPackage.isLiteralsInterface()) { >- stringBuffer.append(TEXT_571); >+ stringBuffer.append(TEXT_575); > if (isImplementation) { >- stringBuffer.append(TEXT_572); >+ stringBuffer.append(TEXT_576); > } >- stringBuffer.append(TEXT_573); >+ stringBuffer.append(TEXT_577); > for (GenClassifier genClassifier : genPackage.getGenClassifiers()) { >- stringBuffer.append(TEXT_574); >+ stringBuffer.append(TEXT_578); > if (genClassifier instanceof GenClass) { GenClass genClass = (GenClass)genClassifier; > if (!genClass.isInterface()) { >- stringBuffer.append(TEXT_575); >+ stringBuffer.append(TEXT_579); > stringBuffer.append(genClass.getQualifiedClassName()); >- stringBuffer.append(TEXT_576); >+ stringBuffer.append(TEXT_580); > stringBuffer.append(genClass.getFormattedName()); >- stringBuffer.append(TEXT_577); >+ stringBuffer.append(TEXT_581); > stringBuffer.append(genClass.getQualifiedClassName()); > } else { >- stringBuffer.append(TEXT_578); >+ stringBuffer.append(TEXT_582); > stringBuffer.append(genClass.getQualifiedInterfaceName()); >- stringBuffer.append(TEXT_579); >+ stringBuffer.append(TEXT_583); > stringBuffer.append(genClass.getFormattedName()); >- stringBuffer.append(TEXT_580); >+ stringBuffer.append(TEXT_584); > stringBuffer.append(genClass.getQualifiedInterfaceName()); > } > } else if (genClassifier instanceof GenEnum) { GenEnum genEnum = (GenEnum)genClassifier; >- stringBuffer.append(TEXT_581); >+ stringBuffer.append(TEXT_585); > stringBuffer.append(genEnum.getQualifiedName()); >- stringBuffer.append(TEXT_582); >+ stringBuffer.append(TEXT_586); > stringBuffer.append(genEnum.getFormattedName()); >- stringBuffer.append(TEXT_583); >+ stringBuffer.append(TEXT_587); > stringBuffer.append(genEnum.getQualifiedName()); > } else if (genClassifier instanceof GenDataType) { GenDataType genDataType = (GenDataType)genClassifier; >- stringBuffer.append(TEXT_584); >+ stringBuffer.append(TEXT_588); > stringBuffer.append(genDataType.getFormattedName()); >- stringBuffer.append(TEXT_585); >+ stringBuffer.append(TEXT_589); > if (!genDataType.isPrimitiveType() && !genDataType.isArrayType()) { >- stringBuffer.append(TEXT_586); >+ stringBuffer.append(TEXT_590); > stringBuffer.append(genDataType.getRawInstanceClassName()); > } > } >- stringBuffer.append(TEXT_587); >+ stringBuffer.append(TEXT_591); > stringBuffer.append(genPackage.getQualifiedPackageClassName()); >- stringBuffer.append(TEXT_588); >+ stringBuffer.append(TEXT_592); > stringBuffer.append(genClassifier.getClassifierAccessorName()); >- stringBuffer.append(TEXT_589); >+ stringBuffer.append(TEXT_593); > stringBuffer.append(publicStaticFinalFlag); > stringBuffer.append(genClassifier.getImportedMetaType()); >- stringBuffer.append(TEXT_590); >+ stringBuffer.append(TEXT_594); > stringBuffer.append(genPackage.getClassifierID(genClassifier)); >- stringBuffer.append(TEXT_591); >+ stringBuffer.append(TEXT_595); > stringBuffer.append(genClassifier.getClassifierAccessorName()); >- stringBuffer.append(TEXT_592); >+ stringBuffer.append(TEXT_596); > if (genClassifier instanceof GenClass) { GenClass genClass = (GenClass)genClassifier; > for (GenFeature genFeature : genClass.getGenFeatures()) { >- stringBuffer.append(TEXT_593); >+ stringBuffer.append(TEXT_597); > stringBuffer.append(genFeature.getFormattedName()); >- stringBuffer.append(TEXT_594); >+ stringBuffer.append(TEXT_598); > stringBuffer.append(genFeature.getFeatureKind()); >- stringBuffer.append(TEXT_595); >+ stringBuffer.append(TEXT_599); > stringBuffer.append(publicStaticFinalFlag); > stringBuffer.append(genFeature.getImportedMetaType()); >- stringBuffer.append(TEXT_596); >+ stringBuffer.append(TEXT_600); > stringBuffer.append(genClass.getFeatureID(genFeature)); >- stringBuffer.append(TEXT_597); >+ stringBuffer.append(TEXT_601); > stringBuffer.append(genFeature.getFeatureAccessorName()); >- stringBuffer.append(TEXT_598); >+ stringBuffer.append(TEXT_602); > } > } > } >- stringBuffer.append(TEXT_599); >+ stringBuffer.append(TEXT_603); > } >- stringBuffer.append(TEXT_600); >+ stringBuffer.append(TEXT_604); > stringBuffer.append(isInterface ? genPackage.getPackageInterfaceName() : genPackage.getPackageClassName()); > genModel.emitSortedImports(); >- stringBuffer.append(TEXT_601); >+ stringBuffer.append(TEXT_605); > return stringBuffer.toString(); > } > } >#P org.eclipse.emf.test.tools >Index: data/ant.expected/models/1.4_5.0/reload/library.xsds/src/org/examples/library/elements/impl/ElementsPackageImpl.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.xsds/src/org/examples/library/elements/impl/ElementsPackageImpl.java,v >retrieving revision 1.6 >diff -u -r1.6 ElementsPackageImpl.java >--- data/ant.expected/models/1.4_5.0/reload/library.xsds/src/org/examples/library/elements/impl/ElementsPackageImpl.java 18 Apr 2009 11:49:55 -0000 1.6 >+++ data/ant.expected/models/1.4_5.0/reload/library.xsds/src/org/examples/library/elements/impl/ElementsPackageImpl.java 11 May 2009 00:54:38 -0000 >@@ -1,7 +1,7 @@ > /** > * This is my code. > * >- * $Id: ElementsPackageImpl.java,v 1.6 2009/04/18 11:49:55 emerks Exp $ >+ * $Id$ > */ > package org.examples.library.elements.impl; > >@@ -101,20 +101,10 @@ > private static boolean isInited = false; > > /** >- * 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. >+ * 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 ElementsPackage#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 >@@ -162,6 +152,9 @@ > // Mark meta-data to indicate it can't be changed > theElementsPackage.freeze(); > >+ >+ // Update the registry and return the package >+ EPackage.Registry.INSTANCE.put(ElementsPackage.eNS_URI, theElementsPackage); > return theElementsPackage; > } > >Index: data/ant.expected/models/1.4_5.0/creation/library.xsds/src/org/examples/library/elements/impl/ElementsPackageImpl.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/creation/library.xsds/src/org/examples/library/elements/impl/ElementsPackageImpl.java,v >retrieving revision 1.6 >diff -u -r1.6 ElementsPackageImpl.java >--- data/ant.expected/models/1.4_5.0/creation/library.xsds/src/org/examples/library/elements/impl/ElementsPackageImpl.java 18 Apr 2009 11:49:55 -0000 1.6 >+++ data/ant.expected/models/1.4_5.0/creation/library.xsds/src/org/examples/library/elements/impl/ElementsPackageImpl.java 11 May 2009 00:54:37 -0000 >@@ -1,7 +1,7 @@ > /** > * This is my code. > * >- * $Id: ElementsPackageImpl.java,v 1.6 2009/04/18 11:49:55 emerks Exp $ >+ * $Id$ > */ > package org.examples.library.elements.impl; > >@@ -90,20 +90,10 @@ > private static boolean isInited = false; > > /** >- * 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. >+ * 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 ElementsPackage#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 >@@ -137,6 +127,9 @@ > // Mark meta-data to indicate it can't be changed > theElementsPackage.freeze(); > >+ >+ // Update the registry and return the package >+ EPackage.Registry.INSTANCE.put(ElementsPackage.eNS_URI, theElementsPackage); > return theElementsPackage; > } > >Index: data/ant.expected/models/1.4/reload/library.xsd/src/org/examples/library/impl/LibraryPackageImpl.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.xsd/src/org/examples/library/impl/LibraryPackageImpl.java,v >retrieving revision 1.5 >diff -u -r1.5 LibraryPackageImpl.java >--- data/ant.expected/models/1.4/reload/library.xsd/src/org/examples/library/impl/LibraryPackageImpl.java 18 Apr 2009 11:49:55 -0000 1.5 >+++ data/ant.expected/models/1.4/reload/library.xsd/src/org/examples/library/impl/LibraryPackageImpl.java 11 May 2009 00:54:35 -0000 >@@ -1,7 +1,7 @@ > /** > * This is my code. > * >- * $Id: LibraryPackageImpl.java,v 1.5 2009/04/18 11:49:55 emerks Exp $ >+ * $Id$ > */ > package org.examples.library.impl; > >@@ -94,20 +94,10 @@ > private static boolean isInited = false; > > /** >- * 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. >+ * 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 LibraryPackage#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 >@@ -136,6 +126,9 @@ > // Mark meta-data to indicate it can't be changed > theLibraryPackage.freeze(); > >+ >+ // Update the registry and return the package >+ EPackage.Registry.INSTANCE.put(LibraryPackage.eNS_URI, theLibraryPackage); > return theLibraryPackage; > } > >Index: data/ant.expected/models/1.4/reload/library.xsds/src/org/examples/library/impl/LibraryPackageImpl.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.xsds/src/org/examples/library/impl/LibraryPackageImpl.java,v >retrieving revision 1.4 >diff -u -r1.4 LibraryPackageImpl.java >--- data/ant.expected/models/1.4/reload/library.xsds/src/org/examples/library/impl/LibraryPackageImpl.java 18 Apr 2009 11:49:55 -0000 1.4 >+++ data/ant.expected/models/1.4/reload/library.xsds/src/org/examples/library/impl/LibraryPackageImpl.java 11 May 2009 00:54:36 -0000 >@@ -1,7 +1,7 @@ > /** > * This is my code. > * >- * $Id: LibraryPackageImpl.java,v 1.4 2009/04/18 11:49:55 emerks Exp $ >+ * $Id$ > */ > package org.examples.library.impl; > >@@ -67,20 +67,10 @@ > private static boolean isInited = false; > > /** >- * 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. >+ * 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 LibraryPackage#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 >@@ -117,6 +107,9 @@ > // Mark meta-data to indicate it can't be changed > theLibraryPackage.freeze(); > >+ >+ // Update the registry and return the package >+ EPackage.Registry.INSTANCE.put(LibraryPackage.eNS_URI, theLibraryPackage); > return theLibraryPackage; > } > >Index: data/ant.expected/models/5.0/reload/library.xsd/src/org/examples/library/impl/LibraryPackageImpl.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.xsd/src/org/examples/library/impl/LibraryPackageImpl.java,v >retrieving revision 1.5 >diff -u -r1.5 LibraryPackageImpl.java >--- data/ant.expected/models/5.0/reload/library.xsd/src/org/examples/library/impl/LibraryPackageImpl.java 18 Apr 2009 11:49:55 -0000 1.5 >+++ data/ant.expected/models/5.0/reload/library.xsd/src/org/examples/library/impl/LibraryPackageImpl.java 11 May 2009 00:54:40 -0000 >@@ -1,7 +1,7 @@ > /** > * This is my code. > * >- * $Id: LibraryPackageImpl.java,v 1.5 2009/04/18 11:49:55 emerks Exp $ >+ * $Id$ > */ > package org.examples.library.impl; > >@@ -94,20 +94,10 @@ > private static boolean isInited = false; > > /** >- * 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. >+ * 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 LibraryPackage#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 >@@ -136,6 +126,9 @@ > // Mark meta-data to indicate it can't be changed > theLibraryPackage.freeze(); > >+ >+ // Update the registry and return the package >+ EPackage.Registry.INSTANCE.put(LibraryPackage.eNS_URI, theLibraryPackage); > return theLibraryPackage; > } > >Index: data/ant.expected/models/1.4/creation/library.rose/src/org/examples/library/impl/LibraryPackageImpl.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/creation/library.rose/src/org/examples/library/impl/LibraryPackageImpl.java,v >retrieving revision 1.3 >diff -u -r1.3 LibraryPackageImpl.java >--- data/ant.expected/models/1.4/creation/library.rose/src/org/examples/library/impl/LibraryPackageImpl.java 18 Apr 2009 11:49:55 -0000 1.3 >+++ data/ant.expected/models/1.4/creation/library.rose/src/org/examples/library/impl/LibraryPackageImpl.java 11 May 2009 00:54:34 -0000 >@@ -1,7 +1,7 @@ > /** > * This is my code. > * >- * $Id: LibraryPackageImpl.java,v 1.3 2009/04/18 11:49:55 emerks Exp $ >+ * $Id$ > */ > package org.examples.library.impl; > >@@ -84,20 +84,10 @@ > private static boolean isInited = false; > > /** >- * 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. >+ * 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 LibraryPackage#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 >@@ -123,6 +113,9 @@ > // Mark meta-data to indicate it can't be changed > theLibraryPackage.freeze(); > >+ >+ // Update the registry and return the package >+ EPackage.Registry.INSTANCE.put(LibraryPackage.eNS_URI, theLibraryPackage); > return theLibraryPackage; > } > >Index: data/ant.expected/models/1.4_5.0/reload/library.xsd/src/org/examples/library/impl/LibraryPackageImpl.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.xsd/src/org/examples/library/impl/LibraryPackageImpl.java,v >retrieving revision 1.5 >diff -u -r1.5 LibraryPackageImpl.java >--- data/ant.expected/models/1.4_5.0/reload/library.xsd/src/org/examples/library/impl/LibraryPackageImpl.java 18 Apr 2009 11:49:56 -0000 1.5 >+++ data/ant.expected/models/1.4_5.0/reload/library.xsd/src/org/examples/library/impl/LibraryPackageImpl.java 11 May 2009 00:54:38 -0000 >@@ -1,7 +1,7 @@ > /** > * This is my code. > * >- * $Id: LibraryPackageImpl.java,v 1.5 2009/04/18 11:49:56 emerks Exp $ >+ * $Id$ > */ > package org.examples.library.impl; > >@@ -94,20 +94,10 @@ > private static boolean isInited = false; > > /** >- * 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. >+ * 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 LibraryPackage#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 >@@ -136,6 +126,9 @@ > // Mark meta-data to indicate it can't be changed > theLibraryPackage.freeze(); > >+ >+ // Update the registry and return the package >+ EPackage.Registry.INSTANCE.put(LibraryPackage.eNS_URI, theLibraryPackage); > return theLibraryPackage; > } > >Index: data/ant.expected/models/1.4_5.0/creation/library.xsd/src/org/examples/library/impl/LibraryPackageImpl.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/creation/library.xsd/src/org/examples/library/impl/LibraryPackageImpl.java,v >retrieving revision 1.5 >diff -u -r1.5 LibraryPackageImpl.java >--- data/ant.expected/models/1.4_5.0/creation/library.xsd/src/org/examples/library/impl/LibraryPackageImpl.java 18 Apr 2009 11:49:55 -0000 1.5 >+++ data/ant.expected/models/1.4_5.0/creation/library.xsd/src/org/examples/library/impl/LibraryPackageImpl.java 11 May 2009 00:54:37 -0000 >@@ -1,7 +1,7 @@ > /** > * This is my code. > * >- * $Id: LibraryPackageImpl.java,v 1.5 2009/04/18 11:49:55 emerks Exp $ >+ * $Id$ > */ > package org.examples.library.impl; > >@@ -94,20 +94,10 @@ > private static boolean isInited = false; > > /** >- * 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. >+ * 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 LibraryPackage#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 >@@ -136,6 +126,9 @@ > // Mark meta-data to indicate it can't be changed > theLibraryPackage.freeze(); > >+ >+ // Update the registry and return the package >+ EPackage.Registry.INSTANCE.put(LibraryPackage.eNS_URI, theLibraryPackage); > return theLibraryPackage; > } > >Index: data/ant.expected/models/1.4/creation/library.ecore/src/org/examples/library/impl/LibraryPackageImpl.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/creation/library.ecore/src/org/examples/library/impl/LibraryPackageImpl.java,v >retrieving revision 1.3 >diff -u -r1.3 LibraryPackageImpl.java >--- data/ant.expected/models/1.4/creation/library.ecore/src/org/examples/library/impl/LibraryPackageImpl.java 21 Apr 2009 10:58:09 -0000 1.3 >+++ data/ant.expected/models/1.4/creation/library.ecore/src/org/examples/library/impl/LibraryPackageImpl.java 11 May 2009 00:54:34 -0000 >@@ -1,7 +1,7 @@ > /** > * This is my code. > * >- * $Id: LibraryPackageImpl.java,v 1.3 2009/04/21 10:58:09 emerks Exp $ >+ * $Id$ > */ > package org.examples.library.impl; > >@@ -84,20 +84,10 @@ > private static boolean isInited = false; > > /** >- * 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. >+ * 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 LibraryPackage#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 >@@ -123,6 +113,9 @@ > // Mark meta-data to indicate it can't be changed > theLibraryPackage.freeze(); > >+ >+ // Update the registry and return the package >+ EPackage.Registry.INSTANCE.put(LibraryPackage.eNS_URI, theLibraryPackage); > return theLibraryPackage; > } > >Index: data/ant.expected/models/1.4_5.0/reload/library.rose/src/org/examples/hr/impl/HRPackageImpl.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.rose/src/org/examples/hr/impl/HRPackageImpl.java,v >retrieving revision 1.3 >diff -u -r1.3 HRPackageImpl.java >--- data/ant.expected/models/1.4_5.0/reload/library.rose/src/org/examples/hr/impl/HRPackageImpl.java 18 Apr 2009 11:49:55 -0000 1.3 >+++ data/ant.expected/models/1.4_5.0/reload/library.rose/src/org/examples/hr/impl/HRPackageImpl.java 11 May 2009 00:54:37 -0000 >@@ -1,7 +1,7 @@ > /** > * This is my code. > * >- * $Id: HRPackageImpl.java,v 1.3 2009/04/18 11:49:55 emerks Exp $ >+ * $Id$ > */ > package org.examples.hr.impl; > >@@ -63,20 +63,10 @@ > private static boolean isInited = false; > > /** >- * 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. >+ * 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 HRPackage#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 >@@ -107,6 +97,9 @@ > // Mark meta-data to indicate it can't be changed > theHRPackage.freeze(); > >+ >+ // Update the registry and return the package >+ EPackage.Registry.INSTANCE.put(HRPackage.eNS_URI, theHRPackage); > return theHRPackage; > } > >Index: data/ant.expected/models/1.4/creation/library.xsds/src/org/examples/library/elements/impl/ElementsPackageImpl.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/creation/library.xsds/src/org/examples/library/elements/impl/ElementsPackageImpl.java,v >retrieving revision 1.6 >diff -u -r1.6 ElementsPackageImpl.java >--- data/ant.expected/models/1.4/creation/library.xsds/src/org/examples/library/elements/impl/ElementsPackageImpl.java 18 Apr 2009 11:49:55 -0000 1.6 >+++ data/ant.expected/models/1.4/creation/library.xsds/src/org/examples/library/elements/impl/ElementsPackageImpl.java 11 May 2009 00:54:35 -0000 >@@ -1,7 +1,7 @@ > /** > * This is my code. > * >- * $Id: ElementsPackageImpl.java,v 1.6 2009/04/18 11:49:55 emerks Exp $ >+ * $Id$ > */ > package org.examples.library.elements.impl; > >@@ -90,20 +90,10 @@ > private static boolean isInited = false; > > /** >- * 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. >+ * 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 ElementsPackage#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 >@@ -137,6 +127,9 @@ > // Mark meta-data to indicate it can't be changed > theElementsPackage.freeze(); > >+ >+ // Update the registry and return the package >+ EPackage.Registry.INSTANCE.put(ElementsPackage.eNS_URI, theElementsPackage); > return theElementsPackage; > } > >Index: data/ant.expected/models/1.4_5.0/reload/library.xsds/src/org/examples/library/impl/LibraryPackageImpl.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.xsds/src/org/examples/library/impl/LibraryPackageImpl.java,v >retrieving revision 1.4 >diff -u -r1.4 LibraryPackageImpl.java >--- data/ant.expected/models/1.4_5.0/reload/library.xsds/src/org/examples/library/impl/LibraryPackageImpl.java 18 Apr 2009 11:49:56 -0000 1.4 >+++ data/ant.expected/models/1.4_5.0/reload/library.xsds/src/org/examples/library/impl/LibraryPackageImpl.java 11 May 2009 00:54:38 -0000 >@@ -1,7 +1,7 @@ > /** > * This is my code. > * >- * $Id: LibraryPackageImpl.java,v 1.4 2009/04/18 11:49:56 emerks Exp $ >+ * $Id$ > */ > package org.examples.library.impl; > >@@ -67,20 +67,10 @@ > private static boolean isInited = false; > > /** >- * 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. >+ * 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 LibraryPackage#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 >@@ -117,6 +107,9 @@ > // Mark meta-data to indicate it can't be changed > theLibraryPackage.freeze(); > >+ >+ // Update the registry and return the package >+ EPackage.Registry.INSTANCE.put(LibraryPackage.eNS_URI, theLibraryPackage); > return theLibraryPackage; > } > >Index: data/ant.expected/models/1.4_5.0/creation/library.rose/src/org/examples/library/impl/LibraryPackageImpl.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/creation/library.rose/src/org/examples/library/impl/LibraryPackageImpl.java,v >retrieving revision 1.3 >diff -u -r1.3 LibraryPackageImpl.java >--- data/ant.expected/models/1.4_5.0/creation/library.rose/src/org/examples/library/impl/LibraryPackageImpl.java 18 Apr 2009 11:49:56 -0000 1.3 >+++ data/ant.expected/models/1.4_5.0/creation/library.rose/src/org/examples/library/impl/LibraryPackageImpl.java 11 May 2009 00:54:36 -0000 >@@ -1,7 +1,7 @@ > /** > * This is my code. > * >- * $Id: LibraryPackageImpl.java,v 1.3 2009/04/18 11:49:56 emerks Exp $ >+ * $Id$ > */ > package org.examples.library.impl; > >@@ -84,20 +84,10 @@ > private static boolean isInited = false; > > /** >- * 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. >+ * 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 LibraryPackage#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 >@@ -123,6 +113,9 @@ > // Mark meta-data to indicate it can't be changed > theLibraryPackage.freeze(); > >+ >+ // Update the registry and return the package >+ EPackage.Registry.INSTANCE.put(LibraryPackage.eNS_URI, theLibraryPackage); > return theLibraryPackage; > } > >Index: data/ant.expected/models/5.0/creation/library.xsd/src/org/examples/library/impl/LibraryPackageImpl.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/creation/library.xsd/src/org/examples/library/impl/LibraryPackageImpl.java,v >retrieving revision 1.5 >diff -u -r1.5 LibraryPackageImpl.java >--- data/ant.expected/models/5.0/creation/library.xsd/src/org/examples/library/impl/LibraryPackageImpl.java 18 Apr 2009 11:49:56 -0000 1.5 >+++ data/ant.expected/models/5.0/creation/library.xsd/src/org/examples/library/impl/LibraryPackageImpl.java 11 May 2009 00:54:39 -0000 >@@ -1,7 +1,7 @@ > /** > * This is my code. > * >- * $Id: LibraryPackageImpl.java,v 1.5 2009/04/18 11:49:56 emerks Exp $ >+ * $Id$ > */ > package org.examples.library.impl; > >@@ -94,20 +94,10 @@ > private static boolean isInited = false; > > /** >- * 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. >+ * 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 LibraryPackage#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 >@@ -136,6 +126,9 @@ > // Mark meta-data to indicate it can't be changed > theLibraryPackage.freeze(); > >+ >+ // Update the registry and return the package >+ EPackage.Registry.INSTANCE.put(LibraryPackage.eNS_URI, theLibraryPackage); > return theLibraryPackage; > } > >Index: data/ant.expected/models/1.4_5.0/creation/library.ecore/src/org/examples/library/impl/LibraryPackageImpl.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/creation/library.ecore/src/org/examples/library/impl/LibraryPackageImpl.java,v >retrieving revision 1.3 >diff -u -r1.3 LibraryPackageImpl.java >--- data/ant.expected/models/1.4_5.0/creation/library.ecore/src/org/examples/library/impl/LibraryPackageImpl.java 21 Apr 2009 10:58:09 -0000 1.3 >+++ data/ant.expected/models/1.4_5.0/creation/library.ecore/src/org/examples/library/impl/LibraryPackageImpl.java 11 May 2009 00:54:36 -0000 >@@ -1,7 +1,7 @@ > /** > * This is my code. > * >- * $Id: LibraryPackageImpl.java,v 1.3 2009/04/21 10:58:09 emerks Exp $ >+ * $Id$ > */ > package org.examples.library.impl; > >@@ -84,20 +84,10 @@ > private static boolean isInited = false; > > /** >- * 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. >+ * 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 LibraryPackage#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 >@@ -123,6 +113,9 @@ > // Mark meta-data to indicate it can't be changed > theLibraryPackage.freeze(); > >+ >+ // Update the registry and return the package >+ EPackage.Registry.INSTANCE.put(LibraryPackage.eNS_URI, theLibraryPackage); > return theLibraryPackage; > } > >Index: data/ant.expected/models/5.0/creation/library.xsds/src/org/examples/library/impl/LibraryPackageImpl.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/creation/library.xsds/src/org/examples/library/impl/LibraryPackageImpl.java,v >retrieving revision 1.4 >diff -u -r1.4 LibraryPackageImpl.java >--- data/ant.expected/models/5.0/creation/library.xsds/src/org/examples/library/impl/LibraryPackageImpl.java 18 Apr 2009 11:49:56 -0000 1.4 >+++ data/ant.expected/models/5.0/creation/library.xsds/src/org/examples/library/impl/LibraryPackageImpl.java 11 May 2009 00:54:39 -0000 >@@ -1,7 +1,7 @@ > /** > * This is my code. > * >- * $Id: LibraryPackageImpl.java,v 1.4 2009/04/18 11:49:56 emerks Exp $ >+ * $Id$ > */ > package org.examples.library.impl; > >@@ -65,20 +65,10 @@ > private static boolean isInited = false; > > /** >- * 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. >+ * 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 LibraryPackage#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 >@@ -112,6 +102,9 @@ > // Mark meta-data to indicate it can't be changed > theLibraryPackage.freeze(); > >+ >+ // Update the registry and return the package >+ EPackage.Registry.INSTANCE.put(LibraryPackage.eNS_URI, theLibraryPackage); > return theLibraryPackage; > } > >Index: data/ant.expected/models/1.4/reload/library.ecore/src/org/examples/hr/impl/HRPackageImpl.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.ecore/src/org/examples/hr/impl/HRPackageImpl.java,v >retrieving revision 1.3 >diff -u -r1.3 HRPackageImpl.java >--- data/ant.expected/models/1.4/reload/library.ecore/src/org/examples/hr/impl/HRPackageImpl.java 21 Apr 2009 10:58:09 -0000 1.3 >+++ data/ant.expected/models/1.4/reload/library.ecore/src/org/examples/hr/impl/HRPackageImpl.java 11 May 2009 00:54:35 -0000 >@@ -1,7 +1,7 @@ > /** > * This is my code. > * >- * $Id: HRPackageImpl.java,v 1.3 2009/04/21 10:58:09 emerks Exp $ >+ * $Id$ > */ > package org.examples.hr.impl; > >@@ -63,20 +63,10 @@ > private static boolean isInited = false; > > /** >- * 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. >+ * 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 HRPackage#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 >@@ -107,6 +97,9 @@ > // Mark meta-data to indicate it can't be changed > theHRPackage.freeze(); > >+ >+ // Update the registry and return the package >+ EPackage.Registry.INSTANCE.put(HRPackage.eNS_URI, theHRPackage); > return theHRPackage; > } > >Index: data/ant.expected/models/1.4_5.0/reload/library.ecore/src/org/examples/hr/impl/HRPackageImpl.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.ecore/src/org/examples/hr/impl/HRPackageImpl.java,v >retrieving revision 1.3 >diff -u -r1.3 HRPackageImpl.java >--- data/ant.expected/models/1.4_5.0/reload/library.ecore/src/org/examples/hr/impl/HRPackageImpl.java 21 Apr 2009 10:58:09 -0000 1.3 >+++ data/ant.expected/models/1.4_5.0/reload/library.ecore/src/org/examples/hr/impl/HRPackageImpl.java 11 May 2009 00:54:37 -0000 >@@ -1,7 +1,7 @@ > /** > * This is my code. > * >- * $Id: HRPackageImpl.java,v 1.3 2009/04/21 10:58:09 emerks Exp $ >+ * $Id$ > */ > package org.examples.hr.impl; > >@@ -63,20 +63,10 @@ > private static boolean isInited = false; > > /** >- * 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. >+ * 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 HRPackage#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 >@@ -107,6 +97,9 @@ > // Mark meta-data to indicate it can't be changed > theHRPackage.freeze(); > >+ >+ // Update the registry and return the package >+ EPackage.Registry.INSTANCE.put(HRPackage.eNS_URI, theHRPackage); > return theHRPackage; > } > >Index: data/ant.expected/models/1.4/creation/library.xsd/src/org/examples/library/impl/LibraryPackageImpl.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/creation/library.xsd/src/org/examples/library/impl/LibraryPackageImpl.java,v >retrieving revision 1.5 >diff -u -r1.5 LibraryPackageImpl.java >--- data/ant.expected/models/1.4/creation/library.xsd/src/org/examples/library/impl/LibraryPackageImpl.java 18 Apr 2009 11:49:56 -0000 1.5 >+++ data/ant.expected/models/1.4/creation/library.xsd/src/org/examples/library/impl/LibraryPackageImpl.java 11 May 2009 00:54:34 -0000 >@@ -1,7 +1,7 @@ > /** > * This is my code. > * >- * $Id: LibraryPackageImpl.java,v 1.5 2009/04/18 11:49:56 emerks Exp $ >+ * $Id$ > */ > package org.examples.library.impl; > >@@ -94,20 +94,10 @@ > private static boolean isInited = false; > > /** >- * 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. >+ * 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 LibraryPackage#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 >@@ -136,6 +126,9 @@ > // Mark meta-data to indicate it can't be changed > theLibraryPackage.freeze(); > >+ >+ // Update the registry and return the package >+ EPackage.Registry.INSTANCE.put(LibraryPackage.eNS_URI, theLibraryPackage); > return theLibraryPackage; > } > >Index: data/ant.expected/models/5.0/creation/library.rose/src/org/examples/library/impl/LibraryPackageImpl.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/creation/library.rose/src/org/examples/library/impl/LibraryPackageImpl.java,v >retrieving revision 1.3 >diff -u -r1.3 LibraryPackageImpl.java >--- data/ant.expected/models/5.0/creation/library.rose/src/org/examples/library/impl/LibraryPackageImpl.java 18 Apr 2009 11:49:56 -0000 1.3 >+++ data/ant.expected/models/5.0/creation/library.rose/src/org/examples/library/impl/LibraryPackageImpl.java 11 May 2009 00:54:39 -0000 >@@ -1,7 +1,7 @@ > /** > * This is my code. > * >- * $Id: LibraryPackageImpl.java,v 1.3 2009/04/18 11:49:56 emerks Exp $ >+ * $Id$ > */ > package org.examples.library.impl; > >@@ -84,20 +84,10 @@ > private static boolean isInited = false; > > /** >- * 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. >+ * 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 LibraryPackage#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 >@@ -123,6 +113,9 @@ > // Mark meta-data to indicate it can't be changed > theLibraryPackage.freeze(); > >+ >+ // Update the registry and return the package >+ EPackage.Registry.INSTANCE.put(LibraryPackage.eNS_URI, theLibraryPackage); > return theLibraryPackage; > } > >Index: data/ant.expected/models/5.0/creation/library.xsds/src/org/examples/library/elements/impl/ElementsPackageImpl.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/creation/library.xsds/src/org/examples/library/elements/impl/ElementsPackageImpl.java,v >retrieving revision 1.6 >diff -u -r1.6 ElementsPackageImpl.java >--- data/ant.expected/models/5.0/creation/library.xsds/src/org/examples/library/elements/impl/ElementsPackageImpl.java 18 Apr 2009 11:49:55 -0000 1.6 >+++ data/ant.expected/models/5.0/creation/library.xsds/src/org/examples/library/elements/impl/ElementsPackageImpl.java 11 May 2009 00:54:39 -0000 >@@ -1,7 +1,7 @@ > /** > * This is my code. > * >- * $Id: ElementsPackageImpl.java,v 1.6 2009/04/18 11:49:55 emerks Exp $ >+ * $Id$ > */ > package org.examples.library.elements.impl; > >@@ -90,20 +90,10 @@ > private static boolean isInited = false; > > /** >- * 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. >+ * 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 ElementsPackage#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 >@@ -137,6 +127,9 @@ > // Mark meta-data to indicate it can't be changed > theElementsPackage.freeze(); > >+ >+ // Update the registry and return the package >+ EPackage.Registry.INSTANCE.put(ElementsPackage.eNS_URI, theElementsPackage); > return theElementsPackage; > } > >Index: data/ant.expected/models/5.0/reload/library.ecore/src/org/examples/hr/impl/HRPackageImpl.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.ecore/src/org/examples/hr/impl/HRPackageImpl.java,v >retrieving revision 1.3 >diff -u -r1.3 HRPackageImpl.java >--- data/ant.expected/models/5.0/reload/library.ecore/src/org/examples/hr/impl/HRPackageImpl.java 21 Apr 2009 10:58:09 -0000 1.3 >+++ data/ant.expected/models/5.0/reload/library.ecore/src/org/examples/hr/impl/HRPackageImpl.java 11 May 2009 00:54:39 -0000 >@@ -1,7 +1,7 @@ > /** > * This is my code. > * >- * $Id: HRPackageImpl.java,v 1.3 2009/04/21 10:58:09 emerks Exp $ >+ * $Id$ > */ > package org.examples.hr.impl; > >@@ -63,20 +63,10 @@ > private static boolean isInited = false; > > /** >- * 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. >+ * 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 HRPackage#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 >@@ -107,6 +97,9 @@ > // Mark meta-data to indicate it can't be changed > theHRPackage.freeze(); > >+ >+ // Update the registry and return the package >+ EPackage.Registry.INSTANCE.put(HRPackage.eNS_URI, theHRPackage); > return theHRPackage; > } > >Index: data/ant.expected/models/5.0/creation/library.java/src/org/eclipse/example/library/impl/LibraryPackageImpl.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/creation/library.java/src/org/eclipse/example/library/impl/LibraryPackageImpl.java,v >retrieving revision 1.7 >diff -u -r1.7 LibraryPackageImpl.java >--- data/ant.expected/models/5.0/creation/library.java/src/org/eclipse/example/library/impl/LibraryPackageImpl.java 18 Apr 2009 11:49:56 -0000 1.7 >+++ data/ant.expected/models/5.0/creation/library.java/src/org/eclipse/example/library/impl/LibraryPackageImpl.java 11 May 2009 00:54:39 -0000 >@@ -1,7 +1,7 @@ > /** > * This is my code. > * >- * $Id: LibraryPackageImpl.java,v 1.7 2009/04/18 11:49:56 emerks Exp $ >+ * $Id$ > */ > package org.eclipse.example.library.impl; > >@@ -145,20 +145,10 @@ > private static boolean isInited = false; > > /** >- * 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. >+ * 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 LibraryPackage#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 >@@ -184,6 +174,9 @@ > // Mark meta-data to indicate it can't be changed > theLibraryPackage.freeze(); > >+ >+ // Update the registry and return the package >+ EPackage.Registry.INSTANCE.put(LibraryPackage.eNS_URI, theLibraryPackage); > return theLibraryPackage; > } > >Index: data/ant.expected/models/5.0/reload/library.xsds/src/org/examples/library/elements/impl/ElementsPackageImpl.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.xsds/src/org/examples/library/elements/impl/ElementsPackageImpl.java,v >retrieving revision 1.6 >diff -u -r1.6 ElementsPackageImpl.java >--- data/ant.expected/models/5.0/reload/library.xsds/src/org/examples/library/elements/impl/ElementsPackageImpl.java 18 Apr 2009 11:49:55 -0000 1.6 >+++ data/ant.expected/models/5.0/reload/library.xsds/src/org/examples/library/elements/impl/ElementsPackageImpl.java 11 May 2009 00:54:40 -0000 >@@ -1,7 +1,7 @@ > /** > * This is my code. > * >- * $Id: ElementsPackageImpl.java,v 1.6 2009/04/18 11:49:55 emerks Exp $ >+ * $Id$ > */ > package org.examples.library.elements.impl; > >@@ -101,20 +101,10 @@ > private static boolean isInited = false; > > /** >- * 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. >+ * 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 ElementsPackage#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 >@@ -162,6 +152,9 @@ > // Mark meta-data to indicate it can't be changed > theElementsPackage.freeze(); > >+ >+ // Update the registry and return the package >+ EPackage.Registry.INSTANCE.put(ElementsPackage.eNS_URI, theElementsPackage); > return theElementsPackage; > } > >Index: data/ant.expected/models/1.4/creation/library.java/src/org/eclipse/example/library/impl/LibraryPackageImpl.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/creation/library.java/src/org/eclipse/example/library/impl/LibraryPackageImpl.java,v >retrieving revision 1.6 >diff -u -r1.6 LibraryPackageImpl.java >--- data/ant.expected/models/1.4/creation/library.java/src/org/eclipse/example/library/impl/LibraryPackageImpl.java 18 Apr 2009 11:49:56 -0000 1.6 >+++ data/ant.expected/models/1.4/creation/library.java/src/org/eclipse/example/library/impl/LibraryPackageImpl.java 11 May 2009 00:54:34 -0000 >@@ -1,7 +1,7 @@ > /** > * This is my code. > * >- * $Id: LibraryPackageImpl.java,v 1.6 2009/04/18 11:49:56 emerks Exp $ >+ * $Id$ > */ > package org.eclipse.example.library.impl; > >@@ -115,20 +115,10 @@ > private static boolean isInited = false; > > /** >- * 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. >+ * 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 LibraryPackage#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 >@@ -154,6 +144,9 @@ > // Mark meta-data to indicate it can't be changed > theLibraryPackage.freeze(); > >+ >+ // Update the registry and return the package >+ EPackage.Registry.INSTANCE.put(LibraryPackage.eNS_URI, theLibraryPackage); > return theLibraryPackage; > } > >Index: data/ant.expected/models/1.4/reload/library.xsds/src/org/examples/library/hr/impl/HrPackageImpl.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.xsds/src/org/examples/library/hr/impl/HrPackageImpl.java,v >retrieving revision 1.4 >diff -u -r1.4 HrPackageImpl.java >--- data/ant.expected/models/1.4/reload/library.xsds/src/org/examples/library/hr/impl/HrPackageImpl.java 18 Apr 2009 11:49:55 -0000 1.4 >+++ data/ant.expected/models/1.4/reload/library.xsds/src/org/examples/library/hr/impl/HrPackageImpl.java 11 May 2009 00:54:36 -0000 >@@ -1,7 +1,7 @@ > /** > * This is my code. > * >- * $Id: HrPackageImpl.java,v 1.4 2009/04/18 11:49:55 emerks Exp $ >+ * $Id$ > */ > package org.examples.library.hr.impl; > >@@ -69,20 +69,10 @@ > private static boolean isInited = false; > > /** >- * 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. >+ * 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 HrPackage#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 >@@ -119,6 +109,9 @@ > // Mark meta-data to indicate it can't be changed > theHrPackage.freeze(); > >+ >+ // Update the registry and return the package >+ EPackage.Registry.INSTANCE.put(HrPackage.eNS_URI, theHrPackage); > return theHrPackage; > } > >Index: data/ant.expected/models/1.4_5.0/reload/library.rose/src/org/examples/library/impl/LibraryPackageImpl.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.rose/src/org/examples/library/impl/LibraryPackageImpl.java,v >retrieving revision 1.3 >diff -u -r1.3 LibraryPackageImpl.java >--- data/ant.expected/models/1.4_5.0/reload/library.rose/src/org/examples/library/impl/LibraryPackageImpl.java 18 Apr 2009 11:49:56 -0000 1.3 >+++ data/ant.expected/models/1.4_5.0/reload/library.rose/src/org/examples/library/impl/LibraryPackageImpl.java 11 May 2009 00:54:37 -0000 >@@ -1,7 +1,7 @@ > /** > * This is my code. > * >- * $Id: LibraryPackageImpl.java,v 1.3 2009/04/18 11:49:56 emerks Exp $ >+ * $Id$ > */ > package org.examples.library.impl; > >@@ -86,20 +86,10 @@ > private static boolean isInited = false; > > /** >- * 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. >+ * 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 LibraryPackage#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 >@@ -130,6 +120,9 @@ > // Mark meta-data to indicate it can't be changed > theLibraryPackage.freeze(); > >+ >+ // Update the registry and return the package >+ EPackage.Registry.INSTANCE.put(LibraryPackage.eNS_URI, theLibraryPackage); > return theLibraryPackage; > } > >Index: data/ant.expected/models/5.0/reload/library.rose/src/org/examples/library/impl/LibraryPackageImpl.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.rose/src/org/examples/library/impl/LibraryPackageImpl.java,v >retrieving revision 1.3 >diff -u -r1.3 LibraryPackageImpl.java >--- data/ant.expected/models/5.0/reload/library.rose/src/org/examples/library/impl/LibraryPackageImpl.java 18 Apr 2009 11:49:55 -0000 1.3 >+++ data/ant.expected/models/5.0/reload/library.rose/src/org/examples/library/impl/LibraryPackageImpl.java 11 May 2009 00:54:40 -0000 >@@ -1,7 +1,7 @@ > /** > * This is my code. > * >- * $Id: LibraryPackageImpl.java,v 1.3 2009/04/18 11:49:55 emerks Exp $ >+ * $Id$ > */ > package org.examples.library.impl; > >@@ -86,20 +86,10 @@ > private static boolean isInited = false; > > /** >- * 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. >+ * 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 LibraryPackage#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 >@@ -130,6 +120,9 @@ > // Mark meta-data to indicate it can't be changed > theLibraryPackage.freeze(); > >+ >+ // Update the registry and return the package >+ EPackage.Registry.INSTANCE.put(LibraryPackage.eNS_URI, theLibraryPackage); > return theLibraryPackage; > } > >Index: data/ant.expected/models/1.4/creation/library.xsds/src/org/examples/library/impl/LibraryPackageImpl.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/creation/library.xsds/src/org/examples/library/impl/LibraryPackageImpl.java,v >retrieving revision 1.4 >diff -u -r1.4 LibraryPackageImpl.java >--- data/ant.expected/models/1.4/creation/library.xsds/src/org/examples/library/impl/LibraryPackageImpl.java 18 Apr 2009 11:49:56 -0000 1.4 >+++ data/ant.expected/models/1.4/creation/library.xsds/src/org/examples/library/impl/LibraryPackageImpl.java 11 May 2009 00:54:35 -0000 >@@ -1,7 +1,7 @@ > /** > * This is my code. > * >- * $Id: LibraryPackageImpl.java,v 1.4 2009/04/18 11:49:56 emerks Exp $ >+ * $Id$ > */ > package org.examples.library.impl; > >@@ -65,20 +65,10 @@ > private static boolean isInited = false; > > /** >- * 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. >+ * 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 LibraryPackage#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 >@@ -112,6 +102,9 @@ > // Mark meta-data to indicate it can't be changed > theLibraryPackage.freeze(); > >+ >+ // Update the registry and return the package >+ EPackage.Registry.INSTANCE.put(LibraryPackage.eNS_URI, theLibraryPackage); > return theLibraryPackage; > } > >Index: data/ant.expected/models/5.0/reload/library.xsds/src/org/examples/library/hr/impl/HrPackageImpl.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.xsds/src/org/examples/library/hr/impl/HrPackageImpl.java,v >retrieving revision 1.4 >diff -u -r1.4 HrPackageImpl.java >--- data/ant.expected/models/5.0/reload/library.xsds/src/org/examples/library/hr/impl/HrPackageImpl.java 18 Apr 2009 11:49:55 -0000 1.4 >+++ data/ant.expected/models/5.0/reload/library.xsds/src/org/examples/library/hr/impl/HrPackageImpl.java 11 May 2009 00:54:41 -0000 >@@ -1,7 +1,7 @@ > /** > * This is my code. > * >- * $Id: HrPackageImpl.java,v 1.4 2009/04/18 11:49:55 emerks Exp $ >+ * $Id$ > */ > package org.examples.library.hr.impl; > >@@ -69,20 +69,10 @@ > private static boolean isInited = false; > > /** >- * 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. >+ * 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 HrPackage#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 >@@ -119,6 +109,9 @@ > // Mark meta-data to indicate it can't be changed > theHrPackage.freeze(); > >+ >+ // Update the registry and return the package >+ EPackage.Registry.INSTANCE.put(HrPackage.eNS_URI, theHrPackage); > return theHrPackage; > } > >Index: data/ant.expected/models/5.0/reload/library.xsds/src/org/examples/library/impl/LibraryPackageImpl.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.xsds/src/org/examples/library/impl/LibraryPackageImpl.java,v >retrieving revision 1.4 >diff -u -r1.4 LibraryPackageImpl.java >--- data/ant.expected/models/5.0/reload/library.xsds/src/org/examples/library/impl/LibraryPackageImpl.java 18 Apr 2009 11:49:55 -0000 1.4 >+++ data/ant.expected/models/5.0/reload/library.xsds/src/org/examples/library/impl/LibraryPackageImpl.java 11 May 2009 00:54:41 -0000 >@@ -1,7 +1,7 @@ > /** > * This is my code. > * >- * $Id: LibraryPackageImpl.java,v 1.4 2009/04/18 11:49:55 emerks Exp $ >+ * $Id$ > */ > package org.examples.library.impl; > >@@ -67,20 +67,10 @@ > private static boolean isInited = false; > > /** >- * 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. >+ * 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 LibraryPackage#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 >@@ -117,6 +107,9 @@ > // Mark meta-data to indicate it can't be changed > theLibraryPackage.freeze(); > >+ >+ // Update the registry and return the package >+ EPackage.Registry.INSTANCE.put(LibraryPackage.eNS_URI, theLibraryPackage); > return theLibraryPackage; > } > >Index: data/ant.expected/models/1.4/reload/library.rose/src/org/examples/hr/impl/HRPackageImpl.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.rose/src/org/examples/hr/impl/HRPackageImpl.java,v >retrieving revision 1.3 >diff -u -r1.3 HRPackageImpl.java >--- data/ant.expected/models/1.4/reload/library.rose/src/org/examples/hr/impl/HRPackageImpl.java 18 Apr 2009 11:49:55 -0000 1.3 >+++ data/ant.expected/models/1.4/reload/library.rose/src/org/examples/hr/impl/HRPackageImpl.java 11 May 2009 00:54:35 -0000 >@@ -1,7 +1,7 @@ > /** > * This is my code. > * >- * $Id: HRPackageImpl.java,v 1.3 2009/04/18 11:49:55 emerks Exp $ >+ * $Id$ > */ > package org.examples.hr.impl; > >@@ -63,20 +63,10 @@ > private static boolean isInited = false; > > /** >- * 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. >+ * 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 HRPackage#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 >@@ -107,6 +97,9 @@ > // Mark meta-data to indicate it can't be changed > theHRPackage.freeze(); > >+ >+ // Update the registry and return the package >+ EPackage.Registry.INSTANCE.put(HRPackage.eNS_URI, theHRPackage); > return theHRPackage; > } > >Index: data/ant.expected/models/1.4_5.0/creation/library.xsds/src/org/examples/library/impl/LibraryPackageImpl.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/creation/library.xsds/src/org/examples/library/impl/LibraryPackageImpl.java,v >retrieving revision 1.4 >diff -u -r1.4 LibraryPackageImpl.java >--- data/ant.expected/models/1.4_5.0/creation/library.xsds/src/org/examples/library/impl/LibraryPackageImpl.java 18 Apr 2009 11:49:55 -0000 1.4 >+++ data/ant.expected/models/1.4_5.0/creation/library.xsds/src/org/examples/library/impl/LibraryPackageImpl.java 11 May 2009 00:54:37 -0000 >@@ -1,7 +1,7 @@ > /** > * This is my code. > * >- * $Id: LibraryPackageImpl.java,v 1.4 2009/04/18 11:49:55 emerks Exp $ >+ * $Id$ > */ > package org.examples.library.impl; > >@@ -65,20 +65,10 @@ > private static boolean isInited = false; > > /** >- * 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. >+ * 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 LibraryPackage#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 >@@ -112,6 +102,9 @@ > // Mark meta-data to indicate it can't be changed > theLibraryPackage.freeze(); > >+ >+ // Update the registry and return the package >+ EPackage.Registry.INSTANCE.put(LibraryPackage.eNS_URI, theLibraryPackage); > return theLibraryPackage; > } > >Index: data/ant.expected/models/1.4/reload/library.rose/src/org/examples/library/impl/LibraryPackageImpl.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.rose/src/org/examples/library/impl/LibraryPackageImpl.java,v >retrieving revision 1.3 >diff -u -r1.3 LibraryPackageImpl.java >--- data/ant.expected/models/1.4/reload/library.rose/src/org/examples/library/impl/LibraryPackageImpl.java 18 Apr 2009 11:49:55 -0000 1.3 >+++ data/ant.expected/models/1.4/reload/library.rose/src/org/examples/library/impl/LibraryPackageImpl.java 11 May 2009 00:54:35 -0000 >@@ -1,7 +1,7 @@ > /** > * This is my code. > * >- * $Id: LibraryPackageImpl.java,v 1.3 2009/04/18 11:49:55 emerks Exp $ >+ * $Id$ > */ > package org.examples.library.impl; > >@@ -86,20 +86,10 @@ > private static boolean isInited = false; > > /** >- * 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. >+ * 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 LibraryPackage#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 >@@ -130,6 +120,9 @@ > // Mark meta-data to indicate it can't be changed > theLibraryPackage.freeze(); > >+ >+ // Update the registry and return the package >+ EPackage.Registry.INSTANCE.put(LibraryPackage.eNS_URI, theLibraryPackage); > return theLibraryPackage; > } > >Index: data/ant.expected/models/5.0/creation/library.ecore/src/org/examples/library/impl/LibraryPackageImpl.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/creation/library.ecore/src/org/examples/library/impl/LibraryPackageImpl.java,v >retrieving revision 1.3 >diff -u -r1.3 LibraryPackageImpl.java >--- data/ant.expected/models/5.0/creation/library.ecore/src/org/examples/library/impl/LibraryPackageImpl.java 21 Apr 2009 10:58:09 -0000 1.3 >+++ data/ant.expected/models/5.0/creation/library.ecore/src/org/examples/library/impl/LibraryPackageImpl.java 11 May 2009 00:54:38 -0000 >@@ -1,7 +1,7 @@ > /** > * This is my code. > * >- * $Id: LibraryPackageImpl.java,v 1.3 2009/04/21 10:58:09 emerks Exp $ >+ * $Id$ > */ > package org.examples.library.impl; > >@@ -84,20 +84,10 @@ > private static boolean isInited = false; > > /** >- * 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. >+ * 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 LibraryPackage#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 >@@ -123,6 +113,9 @@ > // Mark meta-data to indicate it can't be changed > theLibraryPackage.freeze(); > >+ >+ // Update the registry and return the package >+ EPackage.Registry.INSTANCE.put(LibraryPackage.eNS_URI, theLibraryPackage); > return theLibraryPackage; > } > >Index: data/ant.expected/models/1.4/reload/library.xsds/src/org/examples/library/elements/impl/ElementsPackageImpl.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.xsds/src/org/examples/library/elements/impl/ElementsPackageImpl.java,v >retrieving revision 1.6 >diff -u -r1.6 ElementsPackageImpl.java >--- data/ant.expected/models/1.4/reload/library.xsds/src/org/examples/library/elements/impl/ElementsPackageImpl.java 18 Apr 2009 11:49:55 -0000 1.6 >+++ data/ant.expected/models/1.4/reload/library.xsds/src/org/examples/library/elements/impl/ElementsPackageImpl.java 11 May 2009 00:54:36 -0000 >@@ -1,7 +1,7 @@ > /** > * This is my code. > * >- * $Id: ElementsPackageImpl.java,v 1.6 2009/04/18 11:49:55 emerks Exp $ >+ * $Id$ > */ > package org.examples.library.elements.impl; > >@@ -101,20 +101,10 @@ > private static boolean isInited = false; > > /** >- * 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. >+ * 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 ElementsPackage#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 >@@ -162,6 +152,9 @@ > // Mark meta-data to indicate it can't be changed > theElementsPackage.freeze(); > >+ >+ // Update the registry and return the package >+ EPackage.Registry.INSTANCE.put(ElementsPackage.eNS_URI, theElementsPackage); > return theElementsPackage; > } > >Index: data/ant.expected/models/1.4_5.0/reload/library.ecore/src/org/examples/library/impl/LibraryPackageImpl.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.ecore/src/org/examples/library/impl/LibraryPackageImpl.java,v >retrieving revision 1.3 >diff -u -r1.3 LibraryPackageImpl.java >--- data/ant.expected/models/1.4_5.0/reload/library.ecore/src/org/examples/library/impl/LibraryPackageImpl.java 21 Apr 2009 10:58:09 -0000 1.3 >+++ data/ant.expected/models/1.4_5.0/reload/library.ecore/src/org/examples/library/impl/LibraryPackageImpl.java 11 May 2009 00:54:37 -0000 >@@ -1,7 +1,7 @@ > /** > * This is my code. > * >- * $Id: LibraryPackageImpl.java,v 1.3 2009/04/21 10:58:09 emerks Exp $ >+ * $Id$ > */ > package org.examples.library.impl; > >@@ -86,20 +86,10 @@ > private static boolean isInited = false; > > /** >- * 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. >+ * 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 LibraryPackage#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 >@@ -130,6 +120,9 @@ > // Mark meta-data to indicate it can't be changed > theLibraryPackage.freeze(); > >+ >+ // Update the registry and return the package >+ EPackage.Registry.INSTANCE.put(LibraryPackage.eNS_URI, theLibraryPackage); > return theLibraryPackage; > } > >Index: data/ant.expected/models/1.4/reload/library.ecore/src/org/examples/library/impl/LibraryPackageImpl.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.ecore/src/org/examples/library/impl/LibraryPackageImpl.java,v >retrieving revision 1.3 >diff -u -r1.3 LibraryPackageImpl.java >--- data/ant.expected/models/1.4/reload/library.ecore/src/org/examples/library/impl/LibraryPackageImpl.java 21 Apr 2009 10:58:09 -0000 1.3 >+++ data/ant.expected/models/1.4/reload/library.ecore/src/org/examples/library/impl/LibraryPackageImpl.java 11 May 2009 00:54:35 -0000 >@@ -1,7 +1,7 @@ > /** > * This is my code. > * >- * $Id: LibraryPackageImpl.java,v 1.3 2009/04/21 10:58:09 emerks Exp $ >+ * $Id$ > */ > package org.examples.library.impl; > >@@ -86,20 +86,10 @@ > private static boolean isInited = false; > > /** >- * 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. >+ * 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 LibraryPackage#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 >@@ -130,6 +120,9 @@ > // Mark meta-data to indicate it can't be changed > theLibraryPackage.freeze(); > >+ >+ // Update the registry and return the package >+ EPackage.Registry.INSTANCE.put(LibraryPackage.eNS_URI, theLibraryPackage); > return theLibraryPackage; > } > >Index: data/ant.expected/models/5.0/reload/library.ecore/src/org/examples/library/impl/LibraryPackageImpl.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.ecore/src/org/examples/library/impl/LibraryPackageImpl.java,v >retrieving revision 1.3 >diff -u -r1.3 LibraryPackageImpl.java >--- data/ant.expected/models/5.0/reload/library.ecore/src/org/examples/library/impl/LibraryPackageImpl.java 21 Apr 2009 10:58:09 -0000 1.3 >+++ data/ant.expected/models/5.0/reload/library.ecore/src/org/examples/library/impl/LibraryPackageImpl.java 11 May 2009 00:54:40 -0000 >@@ -1,7 +1,7 @@ > /** > * This is my code. > * >- * $Id: LibraryPackageImpl.java,v 1.3 2009/04/21 10:58:09 emerks Exp $ >+ * $Id$ > */ > package org.examples.library.impl; > >@@ -86,20 +86,10 @@ > private static boolean isInited = false; > > /** >- * 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. >+ * 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 LibraryPackage#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 >@@ -130,6 +120,9 @@ > // Mark meta-data to indicate it can't be changed > theLibraryPackage.freeze(); > >+ >+ // Update the registry and return the package >+ EPackage.Registry.INSTANCE.put(LibraryPackage.eNS_URI, theLibraryPackage); > return theLibraryPackage; > } > >Index: data/ant.expected/models/1.4_5.0/reload/library.xsds/src/org/examples/library/hr/impl/HrPackageImpl.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.xsds/src/org/examples/library/hr/impl/HrPackageImpl.java,v >retrieving revision 1.4 >diff -u -r1.4 HrPackageImpl.java >--- data/ant.expected/models/1.4_5.0/reload/library.xsds/src/org/examples/library/hr/impl/HrPackageImpl.java 18 Apr 2009 11:49:55 -0000 1.4 >+++ data/ant.expected/models/1.4_5.0/reload/library.xsds/src/org/examples/library/hr/impl/HrPackageImpl.java 11 May 2009 00:54:38 -0000 >@@ -1,7 +1,7 @@ > /** > * This is my code. > * >- * $Id: HrPackageImpl.java,v 1.4 2009/04/18 11:49:55 emerks Exp $ >+ * $Id$ > */ > package org.examples.library.hr.impl; > >@@ -69,20 +69,10 @@ > private static boolean isInited = false; > > /** >- * 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. >+ * 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 HrPackage#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 >@@ -119,6 +109,9 @@ > // Mark meta-data to indicate it can't be changed > theHrPackage.freeze(); > >+ >+ // Update the registry and return the package >+ EPackage.Registry.INSTANCE.put(HrPackage.eNS_URI, theHrPackage); > return theHrPackage; > } > >Index: data/ant.expected/models/5.0/reload/library.rose/src/org/examples/hr/impl/HRPackageImpl.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.rose/src/org/examples/hr/impl/HRPackageImpl.java,v >retrieving revision 1.3 >diff -u -r1.3 HRPackageImpl.java >--- data/ant.expected/models/5.0/reload/library.rose/src/org/examples/hr/impl/HRPackageImpl.java 18 Apr 2009 11:49:55 -0000 1.3 >+++ data/ant.expected/models/5.0/reload/library.rose/src/org/examples/hr/impl/HRPackageImpl.java 11 May 2009 00:54:40 -0000 >@@ -1,7 +1,7 @@ > /** > * This is my code. > * >- * $Id: HRPackageImpl.java,v 1.3 2009/04/18 11:49:55 emerks Exp $ >+ * $Id$ > */ > package org.examples.hr.impl; > >@@ -63,20 +63,10 @@ > private static boolean isInited = false; > > /** >- * 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. >+ * 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 HRPackage#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 >@@ -107,6 +97,9 @@ > // Mark meta-data to indicate it can't be changed > theHRPackage.freeze(); > >+ >+ // Update the registry and return the package >+ EPackage.Registry.INSTANCE.put(HRPackage.eNS_URI, theHRPackage); > return theHRPackage; > } > >#P org.eclipse.emf.mapping.ecore2xml >Index: src/org/eclipse/emf/mapping/ecore2xml/impl/Ecore2XMLPackageImpl.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/plugins/org.eclipse.emf.mapping.ecore2xml/src/org/eclipse/emf/mapping/ecore2xml/impl/Ecore2XMLPackageImpl.java,v >retrieving revision 1.6 >diff -u -r1.6 Ecore2XMLPackageImpl.java >--- src/org/eclipse/emf/mapping/ecore2xml/impl/Ecore2XMLPackageImpl.java 18 Apr 2009 11:46:04 -0000 1.6 >+++ src/org/eclipse/emf/mapping/ecore2xml/impl/Ecore2XMLPackageImpl.java 11 May 2009 00:54:42 -0000 >@@ -88,20 +88,10 @@ > private static boolean isInited = false; > > /** >- * 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. >+ * 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 Ecore2XMLPackage#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 >@@ -130,6 +120,9 @@ > // Mark meta-data to indicate it can't be changed > theEcore2XMLPackage.freeze(); > >+ >+ // Update the registry and return the package >+ EPackage.Registry.INSTANCE.put(Ecore2XMLPackage.eNS_URI, theEcore2XMLPackage); > return theEcore2XMLPackage; > } > >#P org.eclipse.emf.edit >Index: src/org/eclipse/emf/edit/tree/impl/TreePackageImpl.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/plugins/org.eclipse.emf.edit/src/org/eclipse/emf/edit/tree/impl/TreePackageImpl.java,v >retrieving revision 1.10 >diff -u -r1.10 TreePackageImpl.java >--- src/org/eclipse/emf/edit/tree/impl/TreePackageImpl.java 18 Apr 2009 11:39:02 -0000 1.10 >+++ src/org/eclipse/emf/edit/tree/impl/TreePackageImpl.java 11 May 2009 00:54:42 -0000 >@@ -70,20 +70,10 @@ > private static boolean isInited = false; > > /** >- * 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. >+ * 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 TreePackage#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 >@@ -112,6 +102,9 @@ > // Mark meta-data to indicate it can't be changed > theTreePackage.freeze(); > >+ >+ // Update the registry and return the package >+ EPackage.Registry.INSTANCE.put(TreePackage.eNS_URI, theTreePackage); > return theTreePackage; > } > >#P org.eclipse.emf.examples.library >Index: src/org/eclipse/emf/examples/extlibrary/impl/EXTLibraryPackageImpl.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/examples/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/impl/EXTLibraryPackageImpl.java,v >retrieving revision 1.6 >diff -u -r1.6 EXTLibraryPackageImpl.java >--- src/org/eclipse/emf/examples/extlibrary/impl/EXTLibraryPackageImpl.java 18 Apr 2009 11:39:33 -0000 1.6 >+++ src/org/eclipse/emf/examples/extlibrary/impl/EXTLibraryPackageImpl.java 11 May 2009 00:54:43 -0000 >@@ -185,20 +185,10 @@ > private static boolean isInited = false; > > /** >- * 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. >+ * 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 EXTLibraryPackage#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 >@@ -224,6 +214,9 @@ > // Mark meta-data to indicate it can't be changed > theEXTLibraryPackage.freeze(); > >+ >+ // Update the registry and return the package >+ EPackage.Registry.INSTANCE.put(EXTLibraryPackage.eNS_URI, theEXTLibraryPackage); > return theEXTLibraryPackage; > } > >#P org.eclipse.emf.ecore.change >Index: src/org/eclipse/emf/ecore/change/impl/ChangePackageImpl.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/plugins/org.eclipse.emf.ecore.change/src/org/eclipse/emf/ecore/change/impl/ChangePackageImpl.java,v >retrieving revision 1.17 >diff -u -r1.17 ChangePackageImpl.java >--- src/org/eclipse/emf/ecore/change/impl/ChangePackageImpl.java 18 Apr 2009 11:38:46 -0000 1.17 >+++ src/org/eclipse/emf/ecore/change/impl/ChangePackageImpl.java 11 May 2009 00:54:44 -0000 >@@ -128,20 +128,10 @@ > private static boolean isInited = false; > > /** >- * 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. >+ * 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 ChangePackage#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 >@@ -170,6 +160,9 @@ > // Mark meta-data to indicate it can't be changed > theChangePackage.freeze(); > >+ >+ // Update the registry and return the package >+ EPackage.Registry.INSTANCE.put(ChangePackage.eNS_URI, theChangePackage); > return theChangePackage; > } > >#P org.eclipse.emf.test.core >Index: src/org/eclipse/emf/test/core/featuremap/supplier/impl/SupplierPackageImpl.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/tests/org.eclipse.emf.test.core/src/org/eclipse/emf/test/core/featuremap/supplier/impl/SupplierPackageImpl.java,v >retrieving revision 1.4 >diff -u -r1.4 SupplierPackageImpl.java >--- src/org/eclipse/emf/test/core/featuremap/supplier/impl/SupplierPackageImpl.java 18 Apr 2009 11:49:00 -0000 1.4 >+++ src/org/eclipse/emf/test/core/featuremap/supplier/impl/SupplierPackageImpl.java 11 May 2009 00:54:45 -0000 >@@ -70,20 +70,10 @@ > private static boolean isInited = false; > > /** >- * 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. >+ * 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 SupplierPackage#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 >@@ -112,6 +102,9 @@ > // Mark meta-data to indicate it can't be changed > theSupplierPackage.freeze(); > >+ >+ // Update the registry and return the package >+ EPackage.Registry.INSTANCE.put(SupplierPackage.eNS_URI, theSupplierPackage); > return theSupplierPackage; > } > >#P org.eclipse.emf.java >Index: src/org/eclipse/emf/java/impl/JavaPackageImpl.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/examples/org.eclipse.emf.java/src/org/eclipse/emf/java/impl/JavaPackageImpl.java,v >retrieving revision 1.8 >diff -u -r1.8 JavaPackageImpl.java >--- src/org/eclipse/emf/java/impl/JavaPackageImpl.java 18 Apr 2009 11:40:23 -0000 1.8 >+++ src/org/eclipse/emf/java/impl/JavaPackageImpl.java 11 May 2009 00:54:46 -0000 >@@ -191,20 +191,10 @@ > private static boolean isInited = false; > > /** >- * 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. >+ * 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 JavaPackage#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 >@@ -230,6 +220,9 @@ > // Mark meta-data to indicate it can't be changed > theJavaPackage.freeze(); > >+ >+ // Update the registry and return the package >+ EPackage.Registry.INSTANCE.put(JavaPackage.eNS_URI, theJavaPackage); > return theJavaPackage; > } > >#P org.eclipse.emf.test.common >Index: src/org/eclipse/emf/test/models/qname/impl/QNamePackageImpl.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/qname/impl/QNamePackageImpl.java,v >retrieving revision 1.4 >diff -u -r1.4 QNamePackageImpl.java >--- src/org/eclipse/emf/test/models/qname/impl/QNamePackageImpl.java 18 Apr 2009 11:46:39 -0000 1.4 >+++ src/org/eclipse/emf/test/models/qname/impl/QNamePackageImpl.java 11 May 2009 00:54:49 -0000 >@@ -114,20 +114,10 @@ > private static boolean isInited = false; > > /** >- * 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. >+ * 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 QNamePackage#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 >@@ -167,6 +157,9 @@ > // Mark meta-data to indicate it can't be changed > theQNamePackage.freeze(); > >+ >+ // Update the registry and return the package >+ EPackage.Registry.INSTANCE.put(QNamePackage.eNS_URI, theQNamePackage); > return theQNamePackage; > } > >Index: src/org/eclipse/emf/test/models/order/impl/OrderPackageImpl.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/order/impl/OrderPackageImpl.java,v >retrieving revision 1.4 >diff -u -r1.4 OrderPackageImpl.java >--- src/org/eclipse/emf/test/models/order/impl/OrderPackageImpl.java 18 Apr 2009 11:46:39 -0000 1.4 >+++ src/org/eclipse/emf/test/models/order/impl/OrderPackageImpl.java 11 May 2009 00:54:48 -0000 >@@ -96,20 +96,10 @@ > private static boolean isInited = false; > > /** >- * 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. >+ * 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 OrderPackage#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 >@@ -146,6 +136,9 @@ > // Mark meta-data to indicate it can't be changed > theOrderPackage.freeze(); > >+ >+ // Update the registry and return the package >+ EPackage.Registry.INSTANCE.put(OrderPackage.eNS_URI, theOrderPackage); > return theOrderPackage; > } > >Index: src/org/eclipse/emf/test/models/dbitem/impl/DBItemPackageImpl.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/dbitem/impl/DBItemPackageImpl.java,v >retrieving revision 1.3 >diff -u -r1.3 DBItemPackageImpl.java >--- src/org/eclipse/emf/test/models/dbitem/impl/DBItemPackageImpl.java 18 Apr 2009 11:46:39 -0000 1.3 >+++ src/org/eclipse/emf/test/models/dbitem/impl/DBItemPackageImpl.java 11 May 2009 00:54:47 -0000 >@@ -82,20 +82,10 @@ > private static boolean isInited = false; > > /** >- * 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. >+ * 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 DBItemPackage#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 >@@ -126,6 +116,9 @@ > // Mark meta-data to indicate it can't be changed > theDBItemPackage.freeze(); > >+ >+ // Update the registry and return the package >+ EPackage.Registry.INSTANCE.put(DBItemPackage.eNS_URI, theDBItemPackage); > return theDBItemPackage; > } > >Index: src/org/eclipse/emf/test/models/customer/impl/CustomerPackageImpl.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/customer/impl/CustomerPackageImpl.java,v >retrieving revision 1.4 >diff -u -r1.4 CustomerPackageImpl.java >--- src/org/eclipse/emf/test/models/customer/impl/CustomerPackageImpl.java 18 Apr 2009 11:46:39 -0000 1.4 >+++ src/org/eclipse/emf/test/models/customer/impl/CustomerPackageImpl.java 11 May 2009 00:54:46 -0000 >@@ -164,20 +164,10 @@ > private static boolean isInited = false; > > /** >- * 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. >+ * 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 CustomerPackage#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 >@@ -225,6 +215,9 @@ > // Mark meta-data to indicate it can't be changed > theCustomerPackage.freeze(); > >+ >+ // Update the registry and return the package >+ EPackage.Registry.INSTANCE.put(CustomerPackage.eNS_URI, theCustomerPackage); > return theCustomerPackage; > } > >Index: src/org/eclipse/emf/test/models/ref/impl/RefPackageImpl.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/ref/impl/RefPackageImpl.java,v >retrieving revision 1.3 >diff -u -r1.3 RefPackageImpl.java >--- src/org/eclipse/emf/test/models/ref/impl/RefPackageImpl.java 18 Apr 2009 11:46:39 -0000 1.3 >+++ src/org/eclipse/emf/test/models/ref/impl/RefPackageImpl.java 11 May 2009 00:54:49 -0000 >@@ -133,20 +133,10 @@ > private static boolean isInited = false; > > /** >- * 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. >+ * 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 RefPackage#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 >@@ -180,6 +170,9 @@ > // Mark meta-data to indicate it can't be changed > theRefPackage.freeze(); > >+ >+ // Update the registry and return the package >+ EPackage.Registry.INSTANCE.put(RefPackage.eNS_URI, theRefPackage); > return theRefPackage; > } > >Index: src/org/eclipse/emf/test/models/tree/impl/TreePackageImpl.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/tree/impl/TreePackageImpl.java,v >retrieving revision 1.3 >diff -u -r1.3 TreePackageImpl.java >--- src/org/eclipse/emf/test/models/tree/impl/TreePackageImpl.java 18 Apr 2009 11:46:39 -0000 1.3 >+++ src/org/eclipse/emf/test/models/tree/impl/TreePackageImpl.java 11 May 2009 00:54:49 -0000 >@@ -78,20 +78,10 @@ > private static boolean isInited = false; > > /** >- * 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. >+ * 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 TreePackage#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 >@@ -117,6 +107,9 @@ > // Mark meta-data to indicate it can't be changed > theTreePackage.freeze(); > >+ >+ // Update the registry and return the package >+ EPackage.Registry.INSTANCE.put(TreePackage.eNS_URI, theTreePackage); > return theTreePackage; > } > >Index: src/org/eclipse/emf/test/models/ppo/impl/PPOPackageImpl.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/ppo/impl/PPOPackageImpl.java,v >retrieving revision 1.4 >diff -u -r1.4 PPOPackageImpl.java >--- src/org/eclipse/emf/test/models/ppo/impl/PPOPackageImpl.java 18 Apr 2009 11:46:39 -0000 1.4 >+++ src/org/eclipse/emf/test/models/ppo/impl/PPOPackageImpl.java 11 May 2009 00:54:48 -0000 >@@ -108,20 +108,10 @@ > private static boolean isInited = false; > > /** >- * 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. >+ * 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 PPOPackage#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 >@@ -158,6 +148,9 @@ > // Mark meta-data to indicate it can't be changed > thePPOPackage.freeze(); > >+ >+ // Update the registry and return the package >+ EPackage.Registry.INSTANCE.put(PPOPackage.eNS_URI, thePPOPackage); > return thePPOPackage; > } > >Index: src/org/eclipse/emf/test/models/lib/impl/LibPackageImpl.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/lib/impl/LibPackageImpl.java,v >retrieving revision 1.3 >diff -u -r1.3 LibPackageImpl.java >--- src/org/eclipse/emf/test/models/lib/impl/LibPackageImpl.java 18 Apr 2009 11:46:39 -0000 1.3 >+++ src/org/eclipse/emf/test/models/lib/impl/LibPackageImpl.java 11 May 2009 00:54:47 -0000 >@@ -102,20 +102,10 @@ > private static boolean isInited = false; > > /** >- * 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. >+ * 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 LibPackage#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 >@@ -141,6 +131,9 @@ > // Mark meta-data to indicate it can't be changed > theLibPackage.freeze(); > >+ >+ // Update the registry and return the package >+ EPackage.Registry.INSTANCE.put(LibPackage.eNS_URI, theLibPackage); > return theLibPackage; > } > >Index: src/org/eclipse/emf/test/models/ref/unsettable/impl/URefPackageImpl.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/ref/unsettable/impl/URefPackageImpl.java,v >retrieving revision 1.3 >diff -u -r1.3 URefPackageImpl.java >--- src/org/eclipse/emf/test/models/ref/unsettable/impl/URefPackageImpl.java 18 Apr 2009 11:46:39 -0000 1.3 >+++ src/org/eclipse/emf/test/models/ref/unsettable/impl/URefPackageImpl.java 11 May 2009 00:54:49 -0000 >@@ -133,20 +133,10 @@ > private static boolean isInited = false; > > /** >- * 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. >+ * 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 URefPackage#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 >@@ -180,6 +170,9 @@ > // Mark meta-data to indicate it can't be changed > theURefPackage.freeze(); > >+ >+ // Update the registry and return the package >+ EPackage.Registry.INSTANCE.put(URefPackage.eNS_URI, theURefPackage); > return theURefPackage; > } > >Index: src/org/eclipse/emf/test/models/key/impl/KeyPackageImpl.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/key/impl/KeyPackageImpl.java,v >retrieving revision 1.3 >diff -u -r1.3 KeyPackageImpl.java >--- src/org/eclipse/emf/test/models/key/impl/KeyPackageImpl.java 18 Apr 2009 11:46:39 -0000 1.3 >+++ src/org/eclipse/emf/test/models/key/impl/KeyPackageImpl.java 11 May 2009 00:54:47 -0000 >@@ -78,20 +78,10 @@ > private static boolean isInited = false; > > /** >- * 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. >+ * 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 KeyPackage#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 >@@ -117,6 +107,9 @@ > // Mark meta-data to indicate it can't be changed > theKeyPackage.freeze(); > >+ >+ // Update the registry and return the package >+ EPackage.Registry.INSTANCE.put(KeyPackage.eNS_URI, theKeyPackage); > return theKeyPackage; > } > >Index: src/org/eclipse/emf/test/models/movie/db/impl/DBPackageImpl.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/movie/db/impl/DBPackageImpl.java,v >retrieving revision 1.5 >diff -u -r1.5 DBPackageImpl.java >--- src/org/eclipse/emf/test/models/movie/db/impl/DBPackageImpl.java 18 Apr 2009 11:46:39 -0000 1.5 >+++ src/org/eclipse/emf/test/models/movie/db/impl/DBPackageImpl.java 11 May 2009 00:54:48 -0000 >@@ -169,20 +169,10 @@ > private static boolean isInited = false; > > /** >- * 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. >+ * 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 DBPackage#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 >@@ -230,6 +220,9 @@ > // Mark meta-data to indicate it can't be changed > theDBPackage.freeze(); > >+ >+ // Update the registry and return the package >+ EPackage.Registry.INSTANCE.put(DBPackage.eNS_URI, theDBPackage); > return theDBPackage; > } > >Index: src/org/eclipse/emf/test/models/dbprice/impl/DBPricePackageImpl.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/dbprice/impl/DBPricePackageImpl.java,v >retrieving revision 1.4 >diff -u -r1.4 DBPricePackageImpl.java >--- src/org/eclipse/emf/test/models/dbprice/impl/DBPricePackageImpl.java 18 Apr 2009 11:46:39 -0000 1.4 >+++ src/org/eclipse/emf/test/models/dbprice/impl/DBPricePackageImpl.java 11 May 2009 00:54:47 -0000 >@@ -83,20 +83,10 @@ > private static boolean isInited = false; > > /** >- * 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. >+ * 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 DBPricePackage#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 >@@ -130,6 +120,9 @@ > // Mark meta-data to indicate it can't be changed > theDBPricePackage.freeze(); > >+ >+ // Update the registry and return the package >+ EPackage.Registry.INSTANCE.put(DBPricePackage.eNS_URI, theDBPricePackage); > return theDBPricePackage; > } > >Index: src/org/eclipse/emf/test/models/ext/impl/ExtPackageImpl.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/ext/impl/ExtPackageImpl.java,v >retrieving revision 1.3 >diff -u -r1.3 ExtPackageImpl.java >--- src/org/eclipse/emf/test/models/ext/impl/ExtPackageImpl.java 18 Apr 2009 11:46:39 -0000 1.3 >+++ src/org/eclipse/emf/test/models/ext/impl/ExtPackageImpl.java 11 May 2009 00:54:47 -0000 >@@ -85,20 +85,10 @@ > private static boolean isInited = false; > > /** >- * 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. >+ * 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 ExtPackage#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 >@@ -132,6 +122,9 @@ > // Mark meta-data to indicate it can't be changed > theExtPackage.freeze(); > >+ >+ // Update the registry and return the package >+ EPackage.Registry.INSTANCE.put(ExtPackage.eNS_URI, theExtPackage); > return theExtPackage; > } > >#P org.eclipse.emf.ecore >Index: src/org/eclipse/emf/ecore/xml/namespace/impl/XMLNamespacePackageImpl.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/xml/namespace/impl/XMLNamespacePackageImpl.java,v >retrieving revision 1.16 >diff -u -r1.16 XMLNamespacePackageImpl.java >--- src/org/eclipse/emf/ecore/xml/namespace/impl/XMLNamespacePackageImpl.java 18 Apr 2009 11:38:28 -0000 1.16 >+++ src/org/eclipse/emf/ecore/xml/namespace/impl/XMLNamespacePackageImpl.java 11 May 2009 00:54:52 -0000 >@@ -104,20 +104,10 @@ > private static boolean isInited = false; > > /** >- * 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. >+ * 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 XMLNamespacePackage#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 >@@ -157,6 +147,9 @@ > // Mark meta-data to indicate it can't be changed > theXMLNamespacePackage.freeze(); > >+ >+ // Update the registry and return the package >+ EPackage.Registry.INSTANCE.put(XMLNamespacePackage.eNS_URI, theXMLNamespacePackage); > return theXMLNamespacePackage; > } > >Index: src/org/eclipse/emf/ecore/impl/EcorePackageImpl.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/impl/EcorePackageImpl.java,v >retrieving revision 1.28 >diff -u -r1.28 EcorePackageImpl.java >--- src/org/eclipse/emf/ecore/impl/EcorePackageImpl.java 18 Apr 2009 11:38:28 -0000 1.28 >+++ src/org/eclipse/emf/ecore/impl/EcorePackageImpl.java 11 May 2009 00:54:52 -0000 >@@ -455,20 +455,10 @@ > private EDataType eResourceSetEDataType = null; > > /** >- * 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. >+ * 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 EcorePackage#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 >@@ -502,6 +492,9 @@ > } > }); > >+ >+ // Update the registry and return the package >+ EPackage.Registry.INSTANCE.put(EcorePackage.eNS_URI, theEcorePackage); > return theEcorePackage; > } > >Index: src/org/eclipse/emf/ecore/xml/type/impl/XMLTypePackageImpl.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/xml/type/impl/XMLTypePackageImpl.java,v >retrieving revision 1.22 >diff -u -r1.22 XMLTypePackageImpl.java >--- src/org/eclipse/emf/ecore/xml/type/impl/XMLTypePackageImpl.java 18 Apr 2009 11:38:28 -0000 1.22 >+++ src/org/eclipse/emf/ecore/xml/type/impl/XMLTypePackageImpl.java 11 May 2009 00:54:53 -0000 >@@ -512,20 +512,10 @@ > private static boolean isInited = false; > > /** >- * 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. >+ * 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 XMLTypePackage#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 >@@ -562,6 +552,9 @@ > // Mark meta-data to indicate it can't be changed > theXMLTypePackage.freeze(); > >+ >+ // Update the registry and return the package >+ EPackage.Registry.INSTANCE.put(XMLTypePackage.eNS_URI, theXMLTypePackage); > return theXMLTypePackage; > } > >#P org.eclipse.emf.mapping.xsd2ecore >Index: src/org/eclipse/emf/mapping/xsd2ecore/impl/XSD2EcorePackageImpl.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.xsd/plugins/org.eclipse.emf.mapping.xsd2ecore/src/org/eclipse/emf/mapping/xsd2ecore/impl/XSD2EcorePackageImpl.java,v >retrieving revision 1.11 >diff -u -r1.11 XSD2EcorePackageImpl.java >--- src/org/eclipse/emf/mapping/xsd2ecore/impl/XSD2EcorePackageImpl.java 18 Apr 2009 11:46:03 -0000 1.11 >+++ src/org/eclipse/emf/mapping/xsd2ecore/impl/XSD2EcorePackageImpl.java 11 May 2009 00:54:54 -0000 >@@ -70,20 +70,10 @@ > private static boolean isInited = false; > > /** >- * 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. >+ * 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 XSD2EcorePackage#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 >@@ -112,6 +102,9 @@ > // Mark meta-data to indicate it can't be changed > theXSD2EcorePackage.freeze(); > >+ >+ // Update the registry and return the package >+ EPackage.Registry.INSTANCE.put(XSD2EcorePackage.eNS_URI, theXSD2EcorePackage); > return theXSD2EcorePackage; > } > >#P org.eclipse.emf.mapping >Index: src/org/eclipse/emf/mapping/impl/MappingPackageImpl.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/plugins/org.eclipse.emf.mapping/src/org/eclipse/emf/mapping/impl/MappingPackageImpl.java,v >retrieving revision 1.10 >diff -u -r1.10 MappingPackageImpl.java >--- src/org/eclipse/emf/mapping/impl/MappingPackageImpl.java 18 Apr 2009 12:07:33 -0000 1.10 >+++ src/org/eclipse/emf/mapping/impl/MappingPackageImpl.java 11 May 2009 00:54:54 -0000 >@@ -127,20 +127,10 @@ > private static boolean isInited = false; > > /** >- * 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. >+ * 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 MappingPackage#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 >@@ -169,6 +159,9 @@ > // Mark meta-data to indicate it can't be changed > theMappingPackage.freeze(); > >+ >+ // Update the registry and return the package >+ EPackage.Registry.INSTANCE.put(MappingPackage.eNS_URI, theMappingPackage); > return theMappingPackage; > } > >#P org.eclipse.emf.mapping.ecore2ecore >Index: src/org/eclipse/emf/mapping/ecore2ecore/impl/Ecore2EcorePackageImpl.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf/plugins/org.eclipse.emf.mapping.ecore2ecore/src/org/eclipse/emf/mapping/ecore2ecore/impl/Ecore2EcorePackageImpl.java,v >retrieving revision 1.12 >diff -u -r1.12 Ecore2EcorePackageImpl.java >--- src/org/eclipse/emf/mapping/ecore2ecore/impl/Ecore2EcorePackageImpl.java 18 Apr 2009 11:46:04 -0000 1.12 >+++ src/org/eclipse/emf/mapping/ecore2ecore/impl/Ecore2EcorePackageImpl.java 11 May 2009 00:54:55 -0000 >@@ -72,20 +72,10 @@ > private static boolean isInited = false; > > /** >- * 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. >+ * 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 Ecore2EcorePackage#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 >@@ -114,6 +104,9 @@ > // Mark meta-data to indicate it can't be changed > theEcore2EcorePackage.freeze(); > >+ >+ // Update the registry and return the package >+ EPackage.Registry.INSTANCE.put(Ecore2EcorePackage.eNS_URI, theEcore2EcorePackage); > return theEcore2EcorePackage; > } > >#P org.eclipse.xsd >Index: src/org/eclipse/xsd/impl/XSDPackageImpl.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.mdt/org.eclipse.xsd/plugins/org.eclipse.xsd/src/org/eclipse/xsd/impl/XSDPackageImpl.java,v >retrieving revision 1.12 >diff -u -r1.12 XSDPackageImpl.java >--- src/org/eclipse/xsd/impl/XSDPackageImpl.java 18 Apr 2009 11:51:27 -0000 1.12 >+++ src/org/eclipse/xsd/impl/XSDPackageImpl.java 11 May 2009 00:54:58 -0000 >@@ -4719,20 +4719,10 @@ > } > > /** >- * 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. >+ * 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 XSDPackage#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 >@@ -4758,6 +4748,9 @@ > // Mark meta-data to indicate it can't be changed > theXSDPackage.freeze(); > >+ >+ // Update the registry and return the package >+ EPackage.Registry.INSTANCE.put(XSDPackage.eNS_URI, theXSDPackage); > return theXSDPackage; > } >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 275476
: 135087