diff options
| author | Ed Merks | 2017-08-24 07:38:00 +0000 |
|---|---|---|
| committer | Ed Merks | 2017-08-24 07:38:00 +0000 |
| commit | a2e3c1a991e3b4aff9466a3eb27bb509325f7292 (patch) | |
| tree | 19eecf7e410ec861bd2ea95e9da732242ba33571 | |
| parent | 43913751ac99bcb959d343212092a99d71f2bbfd (diff) | |
| download | org.eclipse.emf-a2e3c1a991e3b4aff9466a3eb27bb509325f7292.tar.gz org.eclipse.emf-a2e3c1a991e3b4aff9466a3eb27bb509325f7292.tar.xz org.eclipse.emf-a2e3c1a991e3b4aff9466a3eb27bb509325f7292.zip | |
[485764] Improve package initialization logic and formatting
43 files changed, 2540 insertions, 2497 deletions
diff --git a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/templates/model/PackageClass.java b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/templates/model/PackageClass.java index 0a5d6c4e4..d6aaa4f1c 100644 --- a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/templates/model/PackageClass.java +++ b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/templates/model/PackageClass.java @@ -141,7 +141,7 @@ public class PackageClass protected final String TEXT_120 = 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_121 = "#eNS_URI" + NL + "\t * @see #init()" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate "; protected final String TEXT_122 = "()" + NL + "\t{" + NL + "\t\tsuper(eNS_URI, "; - protected final String TEXT_123 = ");" + 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_123 = ");" + 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_124 = "#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_125 = NL + "\t * @see #createPackageContents()" + NL + "\t * @see #initializePackageContents()"; protected final String TEXT_126 = NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic static "; @@ -150,321 +150,321 @@ public class PackageClass protected final String TEXT_129 = ".Registry.INSTANCE.getEPackage("; protected final String TEXT_130 = ".eNS_URI);" + NL; protected final String TEXT_131 = NL + "\t\tinitializeRegistryHelpers();" + NL; - protected final String TEXT_132 = NL + "\t\t// Obtain or create and register package" + NL + "\t\t"; - protected final String TEXT_133 = " the"; - protected final String TEXT_134 = " = ("; - protected final String TEXT_135 = ")("; - protected final String TEXT_136 = ".Registry.INSTANCE.get(eNS_URI) instanceof "; - protected final String TEXT_137 = " ? "; - protected final String TEXT_138 = ".Registry.INSTANCE.get(eNS_URI) : new "; - protected final String TEXT_139 = "());" + NL + "" + NL + "\t\tisInited = true;" + NL; - protected final String TEXT_140 = NL + "\t\t// Initialize simple dependencies"; - protected final String TEXT_141 = NL + "\t\t"; - protected final String TEXT_142 = ".eINSTANCE.eClass();"; - protected final String TEXT_143 = NL; - protected final String TEXT_144 = NL + "\t\t// Obtain or create and register interdependencies"; - protected final String TEXT_145 = NL + "\t\t"; - protected final String TEXT_146 = " "; - protected final String TEXT_147 = " = ("; - protected final String TEXT_148 = ")("; - protected final String TEXT_149 = ".Registry.INSTANCE.getEPackage("; - protected final String TEXT_150 = ".eNS_URI) instanceof "; - protected final String TEXT_151 = " ? "; - protected final String TEXT_152 = ".Registry.INSTANCE.getEPackage("; - protected final String TEXT_153 = ".eNS_URI) : "; - protected final String TEXT_154 = ".eINSTANCE);"; - protected final String TEXT_155 = NL; - protected final String TEXT_156 = NL + "\t\t// Load packages"; - protected final String TEXT_157 = NL + "\t\tthe"; - protected final String TEXT_158 = ".loadPackage();"; - protected final String TEXT_159 = NL + "\t\t"; + protected final String TEXT_132 = NL + "\t\t// Obtain or create and register package" + NL + "\t\tObject registered"; + protected final String TEXT_133 = " = "; + protected final String TEXT_134 = ".Registry.INSTANCE.get(eNS_URI);" + NL + "\t\t"; + protected final String TEXT_135 = " the"; + protected final String TEXT_136 = " = registered"; + protected final String TEXT_137 = " instanceof "; + protected final String TEXT_138 = " ? ("; + protected final String TEXT_139 = ")registered"; + protected final String TEXT_140 = " : new "; + protected final String TEXT_141 = "();" + NL + "" + NL + "\t\tisInited = true;" + NL; + protected final String TEXT_142 = NL + "\t\t// Initialize simple dependencies"; + protected final String TEXT_143 = NL + "\t\t"; + protected final String TEXT_144 = ".eINSTANCE.eClass();"; + protected final String TEXT_145 = NL; + protected final String TEXT_146 = NL + "\t\t// Obtain or create and register interdependencies"; + protected final String TEXT_147 = NL + "\t\t"; + protected final String TEXT_148 = "Object "; + protected final String TEXT_149 = "registeredPackage = "; + protected final String TEXT_150 = ".Registry.INSTANCE.getEPackage("; + protected final String TEXT_151 = ".eNS_URI);" + NL + "\t\t"; + protected final String TEXT_152 = " "; + protected final String TEXT_153 = " = ("; + protected final String TEXT_154 = ")(registeredPackage instanceof "; + protected final String TEXT_155 = " ? registeredPackage : "; + protected final String TEXT_156 = ".eINSTANCE);"; + protected final String TEXT_157 = NL; + protected final String TEXT_158 = NL + "\t\t// Load packages"; + protected final String TEXT_159 = NL + "\t\tthe"; protected final String TEXT_160 = ".loadPackage();"; - protected final String TEXT_161 = NL; - protected final String TEXT_162 = NL + "\t\t// Create package meta-data objects"; - protected final String TEXT_163 = NL + "\t\tthe"; - protected final String TEXT_164 = ".createPackageContents();"; - protected final String TEXT_165 = NL + "\t\t"; + protected final String TEXT_161 = NL + "\t\t"; + protected final String TEXT_162 = ".loadPackage();"; + protected final String TEXT_163 = NL; + protected final String TEXT_164 = NL + "\t\t// Create package meta-data objects"; + protected final String TEXT_165 = NL + "\t\tthe"; protected final String TEXT_166 = ".createPackageContents();"; - protected final String TEXT_167 = NL + NL + "\t\t// Initialize created meta-data"; - protected final String TEXT_168 = NL + "\t\tthe"; - protected final String TEXT_169 = ".initializePackageContents();"; - protected final String TEXT_170 = NL + "\t\t"; + protected final String TEXT_167 = NL + "\t\t"; + protected final String TEXT_168 = ".createPackageContents();"; + protected final String TEXT_169 = NL + NL + "\t\t// Initialize created meta-data"; + protected final String TEXT_170 = NL + "\t\tthe"; protected final String TEXT_171 = ".initializePackageContents();"; - protected final String TEXT_172 = NL; - protected final String TEXT_173 = NL + "\t\t// Fix loaded packages"; - protected final String TEXT_174 = NL + "\t\tthe"; - protected final String TEXT_175 = ".fixPackageContents();"; - protected final String TEXT_176 = NL + "\t\t"; + protected final String TEXT_172 = NL + "\t\t"; + protected final String TEXT_173 = ".initializePackageContents();"; + protected final String TEXT_174 = NL; + protected final String TEXT_175 = NL + "\t\t// Fix loaded packages"; + protected final String TEXT_176 = NL + "\t\tthe"; protected final String TEXT_177 = ".fixPackageContents();"; - protected final String TEXT_178 = NL; - protected final String TEXT_179 = NL + "\t\t// Register package validator" + NL + "\t\t"; - protected final String TEXT_180 = ".Registry.INSTANCE.put" + NL + "\t\t\t(the"; - protected final String TEXT_181 = ", " + NL + "\t\t\t new "; - protected final String TEXT_182 = ".Descriptor()" + NL + "\t\t\t {" + NL + "\t\t\t\t public "; - protected final String TEXT_183 = " getEValidator()" + NL + "\t\t\t\t {" + NL + "\t\t\t\t\t return "; - protected final String TEXT_184 = ".INSTANCE;" + NL + "\t\t\t\t }" + NL + "\t\t\t });" + NL; - protected final String TEXT_185 = NL + "\t\t// Mark meta-data to indicate it can't be changed" + NL + "\t\tthe"; - protected final String TEXT_186 = ".freeze();" + NL; - protected final String TEXT_187 = NL + " " + NL + "\t\t// Update the registry and return the package" + NL + "\t\t"; - protected final String TEXT_188 = ".Registry.INSTANCE.put("; - protected final String TEXT_189 = ".eNS_URI, the"; - protected final String TEXT_190 = ");" + NL + "\t\treturn the"; - protected final String TEXT_191 = ";" + NL + "\t}"; - protected final String TEXT_192 = NL + NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic static void initializeRegistryHelpers()" + NL + "\t{"; - protected final String TEXT_193 = NL + "\t\t"; - protected final String TEXT_194 = ".register" + NL + "\t\t\t("; - protected final String TEXT_195 = ".class, " + NL + "\t\t\t new "; - protected final String TEXT_196 = ".Helper() " + NL + "\t\t\t {" + NL + "\t\t\t\t public boolean isInstance(Object instance)" + NL + "\t\t\t\t {" + NL + "\t\t\t\t\t return instance instanceof "; - protected final String TEXT_197 = ";" + NL + "\t\t\t\t }" + NL + "" + NL + "\t\t\t\t public Object newArrayInstance(int size)" + NL + "\t\t\t\t {" + NL + "\t\t\t\t\t return new "; - protected final String TEXT_198 = "[size];" + NL + "\t\t\t\t }" + NL + "\t\t\t });"; - protected final String TEXT_199 = NL + "\t\t"; - protected final String TEXT_200 = ".register" + NL + "\t\t\t("; - protected final String TEXT_201 = ".class, " + NL + "\t\t\t new "; - protected final String TEXT_202 = ".Helper() " + NL + "\t\t\t {" + NL + "\t\t\t\t public boolean isInstance(Object instance)" + NL + "\t\t\t\t {" + NL + "\t\t\t\t\t return instance instanceof "; - protected final String TEXT_203 = ";" + NL + "\t\t\t\t }" + NL + "" + NL + "\t\t\t\t public Object newArrayInstance(int size)" + NL + "\t\t\t\t {"; - protected final String TEXT_204 = NL + "\t\t\t\t\t return new "; - protected final String TEXT_205 = "[size]"; - protected final String TEXT_206 = ";"; - protected final String TEXT_207 = NL + "\t\t\t\t\t return new "; - protected final String TEXT_208 = "[size];"; - protected final String TEXT_209 = NL + "\t\t\t\t }" + NL + "\t\t});"; - protected final String TEXT_210 = NL + "\t}" + NL + "" + NL + "" + NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic static class WhiteList implements "; - protected final String TEXT_211 = ", EBasicWhiteList" + NL + "\t{"; - protected final String TEXT_212 = NL + "\t\t/**" + NL + "\t\t * <!-- begin-user-doc -->" + NL + "\t\t * <!-- end-user-doc -->" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprotected "; - protected final String TEXT_213 = " "; - protected final String TEXT_214 = ";" + NL; - protected final String TEXT_215 = NL + "\t\t/**" + NL + "\t\t * <!-- begin-user-doc -->" + NL + "\t\t * <!-- end-user-doc -->" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprotected "; - protected final String TEXT_216 = " "; - protected final String TEXT_217 = ";" + NL; - protected final String TEXT_218 = NL + "\t}"; - protected final String TEXT_219 = NL; - protected final String TEXT_220 = NL; - protected final String TEXT_221 = NL + "\t/**"; - protected final String TEXT_222 = NL + "\t * Returns the meta object for class '{@link "; - protected final String TEXT_223 = " <em>"; - protected final String TEXT_224 = "</em>}'." + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @return the meta object for class '<em>"; - protected final String TEXT_225 = "</em>'." + NL + "\t * @see "; - protected final String TEXT_226 = NL + "\t * @model "; - protected final String TEXT_227 = NL + "\t * "; - protected final String TEXT_228 = NL + "\t * @model"; - protected final String TEXT_229 = NL + "\t * Returns the meta object for enum '{@link "; - protected final String TEXT_230 = " <em>"; - protected final String TEXT_231 = "</em>}'." + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @return the meta object for enum '<em>"; - protected final String TEXT_232 = "</em>'." + NL + "\t * @see "; - protected final String TEXT_233 = NL + "\t * Returns the meta object for data type '<em>"; - protected final String TEXT_234 = "</em>'."; - protected final String TEXT_235 = NL + "\t * Returns the meta object for data type '{@link "; - protected final String TEXT_236 = " <em>"; - protected final String TEXT_237 = "</em>}'."; - protected final String TEXT_238 = NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->"; - protected final String TEXT_239 = NL + " * <!-- begin-model-doc -->" + NL + " * "; - protected final String TEXT_240 = NL + " * <!-- end-model-doc -->"; - protected final String TEXT_241 = NL + "\t * @return the meta object for data type '<em>"; - protected final String TEXT_242 = "</em>'."; - protected final String TEXT_243 = NL + "\t * @see "; - protected final String TEXT_244 = NL + "\t * @model "; - protected final String TEXT_245 = NL + "\t * "; - protected final String TEXT_246 = NL + "\t * @model"; - protected final String TEXT_247 = NL + "\t * "; - protected final String TEXT_248 = NL + "\t * @generated" + NL + "\t */"; - protected final String TEXT_249 = NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->"; - protected final String TEXT_250 = NL + "\t * "; - protected final String TEXT_251 = NL + "\t * @generated" + NL + "\t */"; - protected final String TEXT_252 = NL + "\t@Deprecated"; - protected final String TEXT_253 = NL + "\tpublic "; - protected final String TEXT_254 = " get"; - protected final String TEXT_255 = "()" + NL + "\t{"; - protected final String TEXT_256 = NL + "\t\tif ("; - protected final String TEXT_257 = " == null)" + NL + "\t\t{" + NL + "\t\t\t"; - protected final String TEXT_258 = " = ("; - protected final String TEXT_259 = ")"; - protected final String TEXT_260 = ".Registry.INSTANCE.getEPackage("; - protected final String TEXT_261 = ".eNS_URI).getEClassifiers().get("; - protected final String TEXT_262 = ");" + NL + "\t\t}"; - protected final String TEXT_263 = NL + "\t\treturn "; - protected final String TEXT_264 = ";" + NL + "\t}" + NL; - protected final String TEXT_265 = NL + "\t"; - protected final String TEXT_266 = " get"; - protected final String TEXT_267 = "();" + NL; - protected final String TEXT_268 = NL + "\t/**" + NL + "\t * Returns the meta object for the "; - protected final String TEXT_269 = " '{@link "; - protected final String TEXT_270 = "#"; - protected final String TEXT_271 = " <em>"; - protected final String TEXT_272 = "</em>}'." + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @return the meta object for the "; - protected final String TEXT_273 = " '<em>"; - protected final String TEXT_274 = "</em>'." + NL + "\t * @see "; - protected final String TEXT_275 = "#"; - protected final String TEXT_276 = "()"; - protected final String TEXT_277 = NL + "\t * @see #get"; + protected final String TEXT_178 = NL + "\t\t"; + protected final String TEXT_179 = ".fixPackageContents();"; + protected final String TEXT_180 = NL; + protected final String TEXT_181 = NL + "\t\t// Register package validator" + NL + "\t\t"; + protected final String TEXT_182 = ".Registry.INSTANCE.put" + NL + "\t\t\t(the"; + protected final String TEXT_183 = "," + NL + "\t\t\t new "; + protected final String TEXT_184 = ".Descriptor()" + NL + "\t\t\t {" + NL + "\t\t\t\t public "; + protected final String TEXT_185 = " getEValidator()" + NL + "\t\t\t\t {" + NL + "\t\t\t\t\t return "; + protected final String TEXT_186 = ".INSTANCE;" + NL + "\t\t\t\t }" + NL + "\t\t\t });" + NL; + protected final String TEXT_187 = NL + "\t\t// Mark meta-data to indicate it can't be changed" + NL + "\t\tthe"; + protected final String TEXT_188 = ".freeze();" + NL; + protected final String TEXT_189 = NL + "\t\t// Update the registry and return the package" + NL + "\t\t"; + protected final String TEXT_190 = ".Registry.INSTANCE.put("; + protected final String TEXT_191 = ".eNS_URI, the"; + protected final String TEXT_192 = ");" + NL + "\t\treturn the"; + protected final String TEXT_193 = ";" + NL + "\t}"; + protected final String TEXT_194 = NL + NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic static void initializeRegistryHelpers()" + NL + "\t{"; + protected final String TEXT_195 = NL + "\t\t"; + protected final String TEXT_196 = ".register" + NL + "\t\t\t("; + protected final String TEXT_197 = ".class," + NL + "\t\t\t new "; + protected final String TEXT_198 = ".Helper()" + NL + "\t\t\t {" + NL + "\t\t\t\t public boolean isInstance(Object instance)" + NL + "\t\t\t\t {" + NL + "\t\t\t\t\t return instance instanceof "; + protected final String TEXT_199 = ";" + NL + "\t\t\t\t }" + NL + "" + NL + "\t\t\t\t public Object newArrayInstance(int size)" + NL + "\t\t\t\t {" + NL + "\t\t\t\t\t return new "; + protected final String TEXT_200 = "[size];" + NL + "\t\t\t\t }" + NL + "\t\t\t });"; + protected final String TEXT_201 = NL + "\t\t"; + protected final String TEXT_202 = ".register" + NL + "\t\t\t("; + protected final String TEXT_203 = ".class," + NL + "\t\t\t new "; + protected final String TEXT_204 = ".Helper()" + NL + "\t\t\t {" + NL + "\t\t\t\t public boolean isInstance(Object instance)" + NL + "\t\t\t\t {" + NL + "\t\t\t\t\t return instance instanceof "; + protected final String TEXT_205 = ";" + NL + "\t\t\t\t }" + NL + "" + NL + "\t\t\t\t public Object newArrayInstance(int size)" + NL + "\t\t\t\t {"; + protected final String TEXT_206 = NL + "\t\t\t\t\t return new "; + protected final String TEXT_207 = "[size]"; + protected final String TEXT_208 = ";"; + protected final String TEXT_209 = NL + "\t\t\t\t\t return new "; + protected final String TEXT_210 = "[size];"; + protected final String TEXT_211 = NL + "\t\t\t\t }" + NL + "\t\t});"; + protected final String TEXT_212 = NL + "\t}" + NL + "" + NL + "" + NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic static class WhiteList implements "; + protected final String TEXT_213 = ", EBasicWhiteList" + NL + "\t{"; + protected final String TEXT_214 = NL + "\t\t/**" + NL + "\t\t * <!-- begin-user-doc -->" + NL + "\t\t * <!-- end-user-doc -->" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprotected "; + protected final String TEXT_215 = " "; + protected final String TEXT_216 = ";" + NL; + protected final String TEXT_217 = NL + "\t\t/**" + NL + "\t\t * <!-- begin-user-doc -->" + NL + "\t\t * <!-- end-user-doc -->" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprotected "; + protected final String TEXT_218 = " "; + protected final String TEXT_219 = ";" + NL; + protected final String TEXT_220 = NL + "\t}"; + protected final String TEXT_221 = NL; + protected final String TEXT_222 = NL; + protected final String TEXT_223 = NL + "\t/**"; + protected final String TEXT_224 = NL + "\t * Returns the meta object for class '{@link "; + protected final String TEXT_225 = " <em>"; + protected final String TEXT_226 = "</em>}'." + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @return the meta object for class '<em>"; + protected final String TEXT_227 = "</em>'." + NL + "\t * @see "; + protected final String TEXT_228 = NL + "\t * @model "; + protected final String TEXT_229 = NL + "\t * "; + protected final String TEXT_230 = NL + "\t * @model"; + protected final String TEXT_231 = NL + "\t * Returns the meta object for enum '{@link "; + protected final String TEXT_232 = " <em>"; + protected final String TEXT_233 = "</em>}'." + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @return the meta object for enum '<em>"; + protected final String TEXT_234 = "</em>'." + NL + "\t * @see "; + protected final String TEXT_235 = NL + "\t * Returns the meta object for data type '<em>"; + protected final String TEXT_236 = "</em>'."; + protected final String TEXT_237 = NL + "\t * Returns the meta object for data type '{@link "; + protected final String TEXT_238 = " <em>"; + protected final String TEXT_239 = "</em>}'."; + protected final String TEXT_240 = NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->"; + protected final String TEXT_241 = NL + " * <!-- begin-model-doc -->" + NL + " * "; + protected final String TEXT_242 = NL + " * <!-- end-model-doc -->"; + protected final String TEXT_243 = NL + "\t * @return the meta object for data type '<em>"; + protected final String TEXT_244 = "</em>'."; + protected final String TEXT_245 = NL + "\t * @see "; + protected final String TEXT_246 = NL + "\t * @model "; + protected final String TEXT_247 = NL + "\t * "; + protected final String TEXT_248 = NL + "\t * @model"; + protected final String TEXT_249 = NL + "\t * "; + protected final String TEXT_250 = NL + "\t * @generated" + NL + "\t */"; + protected final String TEXT_251 = NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->"; + protected final String TEXT_252 = NL + "\t * "; + protected final String TEXT_253 = NL + "\t * @generated" + NL + "\t */"; + protected final String TEXT_254 = NL + "\t@Deprecated"; + protected final String TEXT_255 = NL + "\tpublic "; + protected final String TEXT_256 = " get"; + protected final String TEXT_257 = "()" + NL + "\t{"; + protected final String TEXT_258 = NL + "\t\tif ("; + protected final String TEXT_259 = " == null)" + NL + "\t\t{" + NL + "\t\t\t"; + protected final String TEXT_260 = " = ("; + protected final String TEXT_261 = ")"; + protected final String TEXT_262 = ".Registry.INSTANCE.getEPackage("; + protected final String TEXT_263 = ".eNS_URI).getEClassifiers().get("; + protected final String TEXT_264 = ");" + NL + "\t\t}"; + protected final String TEXT_265 = NL + "\t\treturn "; + protected final String TEXT_266 = ";" + NL + "\t}" + NL; + protected final String TEXT_267 = NL + "\t"; + protected final String TEXT_268 = " get"; + protected final String TEXT_269 = "();" + NL; + protected final String TEXT_270 = NL + "\t/**" + NL + "\t * Returns the meta object for the "; + protected final String TEXT_271 = " '{@link "; + protected final String TEXT_272 = "#"; + protected final String TEXT_273 = " <em>"; + protected final String TEXT_274 = "</em>}'." + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @return the meta object for the "; + protected final String TEXT_275 = " '<em>"; + protected final String TEXT_276 = "</em>'." + NL + "\t * @see "; + protected final String TEXT_277 = "#"; protected final String TEXT_278 = "()"; - protected final String TEXT_279 = NL + "\t * "; - protected final String TEXT_280 = NL + "\t * @generated" + NL + "\t */"; - protected final String TEXT_281 = NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->"; - protected final String TEXT_282 = NL + "\t * "; - protected final String TEXT_283 = NL + "\t * @generated" + NL + "\t */"; - protected final String TEXT_284 = NL + "\t@Deprecated"; - protected final String TEXT_285 = NL + "\tpublic "; - protected final String TEXT_286 = " get"; - protected final String TEXT_287 = "()" + NL + "\t{"; - protected final String TEXT_288 = NL + "\t\treturn ("; - protected final String TEXT_289 = ")"; - protected final String TEXT_290 = ".getEStructuralFeatures().get("; - protected final String TEXT_291 = ");"; - protected final String TEXT_292 = NL + " return ("; - protected final String TEXT_293 = ")get"; - protected final String TEXT_294 = "().getEStructuralFeatures().get("; - protected final String TEXT_295 = ");"; - protected final String TEXT_296 = NL + "\t}"; - protected final String TEXT_297 = NL + "\t"; - protected final String TEXT_298 = " get"; - protected final String TEXT_299 = "();"; - protected final String TEXT_300 = NL; - protected final String TEXT_301 = NL + "\t/**" + NL + "\t * Returns the meta object for the '{@link "; - protected final String TEXT_302 = "#"; - protected final String TEXT_303 = "("; - protected final String TEXT_304 = ") <em>"; - protected final String TEXT_305 = "</em>}' operation." + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @return the meta object for the '<em>"; - protected final String TEXT_306 = "</em>' operation." + NL + "\t * @see "; - protected final String TEXT_307 = "#"; - protected final String TEXT_308 = "("; - protected final String TEXT_309 = ")"; - protected final String TEXT_310 = NL + "\t * "; - protected final String TEXT_311 = NL + "\t * @generated" + NL + "\t */"; - protected final String TEXT_312 = NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->"; - protected final String TEXT_313 = NL + "\t * "; - protected final String TEXT_314 = NL + "\t * @generated" + NL + "\t */"; - protected final String TEXT_315 = NL + "\t@Deprecated"; - protected final String TEXT_316 = NL + "\tpublic "; - protected final String TEXT_317 = " get"; - protected final String TEXT_318 = "()" + NL + "\t{"; - protected final String TEXT_319 = NL + "\t\treturn "; - protected final String TEXT_320 = ".getEOperations().get("; - protected final String TEXT_321 = ");"; - protected final String TEXT_322 = NL + " return get"; - protected final String TEXT_323 = "().getEOperations().get("; - protected final String TEXT_324 = ");"; - protected final String TEXT_325 = NL + "\t}"; - protected final String TEXT_326 = NL + "\t"; - protected final String TEXT_327 = " get"; - protected final String TEXT_328 = "();"; - protected final String TEXT_329 = NL; - protected final String TEXT_330 = 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_331 = NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */"; - protected final String TEXT_332 = NL + "\tpublic "; - protected final String TEXT_333 = " get"; - protected final String TEXT_334 = "()" + NL + "\t{" + NL + "\t\treturn ("; - protected final String TEXT_335 = ")getEFactoryInstance();" + NL + "\t}"; - protected final String TEXT_336 = NL + "\t"; - protected final String TEXT_337 = " get"; - protected final String TEXT_338 = "();"; - protected final String TEXT_339 = NL; - protected final String TEXT_340 = 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 */"; - protected final String TEXT_341 = NL + "\t@SuppressWarnings(\"deprecation\")"; - protected final String TEXT_342 = NL + "\tpublic void createPackageContents()" + NL + "\t{" + NL + "\t\tif (isCreated) return;" + NL + "\t\tisCreated = true;"; - protected final String TEXT_343 = NL + NL + "\t\t// Create classes and their features"; - protected final String TEXT_344 = NL + "\t\t"; - protected final String TEXT_345 = " = create"; - protected final String TEXT_346 = "("; - protected final String TEXT_347 = ");"; - protected final String TEXT_348 = NL + "\t\tcreate"; - protected final String TEXT_349 = "("; - protected final String TEXT_350 = ", "; - protected final String TEXT_351 = ");"; - protected final String TEXT_352 = NL + "\t\tcreateEOperation("; - protected final String TEXT_353 = ", "; - protected final String TEXT_354 = ");"; - protected final String TEXT_355 = NL; - protected final String TEXT_356 = NL + NL + "\t\t// Create enums"; - protected final String TEXT_357 = NL + "\t\t"; - protected final String TEXT_358 = " = createEEnum("; - protected final String TEXT_359 = ");"; - protected final String TEXT_360 = NL + NL + "\t\t// Create data types"; - protected final String TEXT_361 = NL + "\t\t"; - protected final String TEXT_362 = " = createEDataType("; - protected final String TEXT_363 = ");"; - protected final String TEXT_364 = 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_365 = 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 */"; - protected final String TEXT_366 = NL + "\t@SuppressWarnings(\"deprecation\")"; - protected final String TEXT_367 = 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_368 = NL + NL + "\t\t// Obtain other dependent packages"; - protected final String TEXT_369 = NL + "\t\t"; - protected final String TEXT_370 = " "; - protected final String TEXT_371 = " = ("; - protected final String TEXT_372 = ")"; - protected final String TEXT_373 = ".Registry.INSTANCE.getEPackage("; - protected final String TEXT_374 = ".eNS_URI);"; - protected final String TEXT_375 = NL + NL + "\t\t// Add subpackages"; - protected final String TEXT_376 = NL + "\t\tgetESubpackages().add("; - protected final String TEXT_377 = ");"; - protected final String TEXT_378 = NL + NL + "\t\t// Create type parameters"; - protected final String TEXT_379 = NL + "\t\t"; - protected final String TEXT_380 = " "; - protected final String TEXT_381 = "_"; - protected final String TEXT_382 = " = addETypeParameter("; - protected final String TEXT_383 = ", \""; - protected final String TEXT_384 = "\");"; - protected final String TEXT_385 = NL + "\t\taddETypeParameter("; - protected final String TEXT_386 = ", \""; - protected final String TEXT_387 = "\");"; - protected final String TEXT_388 = NL + NL + "\t\t// Set bounds for type parameters"; - protected final String TEXT_389 = NL + "\t\t"; - protected final String TEXT_390 = "g"; - protected final String TEXT_391 = " = createEGenericType("; - protected final String TEXT_392 = ");"; - protected final String TEXT_393 = NL + "\t\tg"; - protected final String TEXT_394 = "."; - protected final String TEXT_395 = "(g"; - protected final String TEXT_396 = ");"; - protected final String TEXT_397 = NL + "\t\t"; - protected final String TEXT_398 = "_"; - protected final String TEXT_399 = ".getEBounds().add(g1);"; - protected final String TEXT_400 = NL + NL + "\t\t// Add supertypes to classes"; - protected final String TEXT_401 = NL + "\t\t"; - protected final String TEXT_402 = ".getESuperTypes().add("; - protected final String TEXT_403 = ".get"; - protected final String TEXT_404 = "());"; - protected final String TEXT_405 = NL + "\t\t"; - protected final String TEXT_406 = "g"; - protected final String TEXT_407 = " = createEGenericType("; - protected final String TEXT_408 = ");"; - protected final String TEXT_409 = NL + "\t\tg"; - protected final String TEXT_410 = "."; - protected final String TEXT_411 = "(g"; - protected final String TEXT_412 = ");"; - protected final String TEXT_413 = NL + "\t\t"; - protected final String TEXT_414 = ".getEGenericSuperTypes().add(g1);"; - protected final String TEXT_415 = NL + NL + "\t\t// Initialize classes"; - protected final String TEXT_416 = ", features, and operations; add parameters"; - protected final String TEXT_417 = " and features; add operations and parameters"; - protected final String TEXT_418 = NL + "\t\tinitEClass("; - protected final String TEXT_419 = ", "; - protected final String TEXT_420 = "null"; - protected final String TEXT_421 = ".class"; - 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 = ", \""; - protected final String TEXT_427 = "\""; - protected final String TEXT_428 = ");"; - protected final String TEXT_429 = NL + "\t\t"; - protected final String TEXT_430 = "g"; - protected final String TEXT_431 = " = createEGenericType("; - protected final String TEXT_432 = ");"; - protected final String TEXT_433 = NL + "\t\tg"; - protected final String TEXT_434 = "."; - protected final String TEXT_435 = "(g"; - protected final String TEXT_436 = ");"; - protected final String TEXT_437 = NL + "\t\tinitEReference(get"; - protected final String TEXT_438 = "(), "; - protected final String TEXT_439 = "g1"; - protected final String TEXT_440 = ".get"; - protected final String TEXT_441 = "()"; - protected final String TEXT_442 = ", "; - protected final String TEXT_443 = ", \""; - protected final String TEXT_444 = "\", "; - protected final String TEXT_445 = ", "; - protected final String TEXT_446 = ", "; + protected final String TEXT_279 = NL + "\t * @see #get"; + protected final String TEXT_280 = "()"; + protected final String TEXT_281 = NL + "\t * "; + protected final String TEXT_282 = NL + "\t * @generated" + NL + "\t */"; + protected final String TEXT_283 = NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->"; + protected final String TEXT_284 = NL + "\t * "; + protected final String TEXT_285 = NL + "\t * @generated" + NL + "\t */"; + protected final String TEXT_286 = NL + "\t@Deprecated"; + protected final String TEXT_287 = NL + "\tpublic "; + protected final String TEXT_288 = " get"; + protected final String TEXT_289 = "()" + NL + "\t{"; + protected final String TEXT_290 = NL + "\t\treturn ("; + protected final String TEXT_291 = ")"; + protected final String TEXT_292 = ".getEStructuralFeatures().get("; + protected final String TEXT_293 = ");"; + protected final String TEXT_294 = NL + " return ("; + protected final String TEXT_295 = ")get"; + protected final String TEXT_296 = "().getEStructuralFeatures().get("; + protected final String TEXT_297 = ");"; + protected final String TEXT_298 = NL + "\t}"; + protected final String TEXT_299 = NL + "\t"; + protected final String TEXT_300 = " get"; + protected final String TEXT_301 = "();"; + protected final String TEXT_302 = NL; + protected final String TEXT_303 = NL + "\t/**" + NL + "\t * Returns the meta object for the '{@link "; + protected final String TEXT_304 = "#"; + protected final String TEXT_305 = "("; + protected final String TEXT_306 = ") <em>"; + protected final String TEXT_307 = "</em>}' operation." + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @return the meta object for the '<em>"; + protected final String TEXT_308 = "</em>' operation." + NL + "\t * @see "; + protected final String TEXT_309 = "#"; + protected final String TEXT_310 = "("; + protected final String TEXT_311 = ")"; + protected final String TEXT_312 = NL + "\t * "; + protected final String TEXT_313 = NL + "\t * @generated" + NL + "\t */"; + protected final String TEXT_314 = NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->"; + protected final String TEXT_315 = NL + "\t * "; + protected final String TEXT_316 = NL + "\t * @generated" + NL + "\t */"; + protected final String TEXT_317 = NL + "\t@Deprecated"; + protected final String TEXT_318 = NL + "\tpublic "; + protected final String TEXT_319 = " get"; + protected final String TEXT_320 = "()" + NL + "\t{"; + protected final String TEXT_321 = NL + "\t\treturn "; + protected final String TEXT_322 = ".getEOperations().get("; + protected final String TEXT_323 = ");"; + protected final String TEXT_324 = NL + " return get"; + protected final String TEXT_325 = "().getEOperations().get("; + protected final String TEXT_326 = ");"; + protected final String TEXT_327 = NL + "\t}"; + protected final String TEXT_328 = NL + "\t"; + protected final String TEXT_329 = " get"; + protected final String TEXT_330 = "();"; + protected final String TEXT_331 = NL; + protected final String TEXT_332 = 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_333 = NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */"; + protected final String TEXT_334 = NL + "\tpublic "; + protected final String TEXT_335 = " get"; + protected final String TEXT_336 = "()" + NL + "\t{" + NL + "\t\treturn ("; + protected final String TEXT_337 = ")getEFactoryInstance();" + NL + "\t}"; + protected final String TEXT_338 = NL + "\t"; + protected final String TEXT_339 = " get"; + protected final String TEXT_340 = "();"; + protected final String TEXT_341 = NL; + protected final String TEXT_342 = 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 */"; + protected final String TEXT_343 = NL + "\t@SuppressWarnings(\"deprecation\")"; + protected final String TEXT_344 = NL + "\tpublic void createPackageContents()" + NL + "\t{" + NL + "\t\tif (isCreated) return;" + NL + "\t\tisCreated = true;"; + protected final String TEXT_345 = NL + NL + "\t\t// Create classes and their features"; + protected final String TEXT_346 = NL + "\t\t"; + protected final String TEXT_347 = " = create"; + protected final String TEXT_348 = "("; + protected final String TEXT_349 = ");"; + protected final String TEXT_350 = NL + "\t\tcreate"; + protected final String TEXT_351 = "("; + protected final String TEXT_352 = ", "; + protected final String TEXT_353 = ");"; + protected final String TEXT_354 = NL + "\t\tcreateEOperation("; + protected final String TEXT_355 = ", "; + protected final String TEXT_356 = ");"; + protected final String TEXT_357 = NL; + protected final String TEXT_358 = NL + NL + "\t\t// Create enums"; + protected final String TEXT_359 = NL + "\t\t"; + protected final String TEXT_360 = " = createEEnum("; + protected final String TEXT_361 = ");"; + protected final String TEXT_362 = NL + NL + "\t\t// Create data types"; + protected final String TEXT_363 = NL + "\t\t"; + protected final String TEXT_364 = " = createEDataType("; + protected final String TEXT_365 = ");"; + protected final String TEXT_366 = 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_367 = 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 */"; + protected final String TEXT_368 = NL + "\t@SuppressWarnings(\"deprecation\")"; + protected final String TEXT_369 = 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_370 = NL + NL + "\t\t// Obtain other dependent packages"; + protected final String TEXT_371 = NL + "\t\t"; + protected final String TEXT_372 = " "; + protected final String TEXT_373 = " = ("; + protected final String TEXT_374 = ")"; + protected final String TEXT_375 = ".Registry.INSTANCE.getEPackage("; + protected final String TEXT_376 = ".eNS_URI);"; + protected final String TEXT_377 = NL + NL + "\t\t// Add subpackages"; + protected final String TEXT_378 = NL + "\t\tgetESubpackages().add("; + protected final String TEXT_379 = ");"; + protected final String TEXT_380 = NL + NL + "\t\t// Create type parameters"; + protected final String TEXT_381 = NL + "\t\t"; + protected final String TEXT_382 = " "; + protected final String TEXT_383 = "_"; + protected final String TEXT_384 = " = addETypeParameter("; + protected final String TEXT_385 = ", \""; + protected final String TEXT_386 = "\");"; + protected final String TEXT_387 = NL + "\t\taddETypeParameter("; + protected final String TEXT_388 = ", \""; + protected final String TEXT_389 = "\");"; + protected final String TEXT_390 = NL + NL + "\t\t// Set bounds for type parameters"; + protected final String TEXT_391 = NL + "\t\t"; + protected final String TEXT_392 = "g"; + protected final String TEXT_393 = " = createEGenericType("; + protected final String TEXT_394 = ");"; + protected final String TEXT_395 = NL + "\t\tg"; + protected final String TEXT_396 = "."; + protected final String TEXT_397 = "(g"; + protected final String TEXT_398 = ");"; + protected final String TEXT_399 = NL + "\t\t"; + protected final String TEXT_400 = "_"; + protected final String TEXT_401 = ".getEBounds().add(g1);"; + protected final String TEXT_402 = NL + NL + "\t\t// Add supertypes to classes"; + protected final String TEXT_403 = NL + "\t\t"; + protected final String TEXT_404 = ".getESuperTypes().add("; + protected final String TEXT_405 = ".get"; + protected final String TEXT_406 = "());"; + protected final String TEXT_407 = NL + "\t\t"; + protected final String TEXT_408 = "g"; + protected final String TEXT_409 = " = createEGenericType("; + protected final String TEXT_410 = ");"; + protected final String TEXT_411 = NL + "\t\tg"; + protected final String TEXT_412 = "."; + protected final String TEXT_413 = "(g"; + protected final String TEXT_414 = ");"; + protected final String TEXT_415 = NL + "\t\t"; + protected final String TEXT_416 = ".getEGenericSuperTypes().add(g1);"; + protected final String TEXT_417 = NL + NL + "\t\t// Initialize classes"; + protected final String TEXT_418 = ", features, and operations; add parameters"; + protected final String TEXT_419 = " and features; add operations and parameters"; + protected final String TEXT_420 = NL + "\t\tinitEClass("; + protected final String TEXT_421 = ", "; + protected final String TEXT_422 = "null"; + protected final String TEXT_423 = ".class"; + 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 = ");"; + protected final String TEXT_431 = NL + "\t\t"; + protected final String TEXT_432 = "g"; + protected final String TEXT_433 = " = createEGenericType("; + protected final String TEXT_434 = ");"; + protected final String TEXT_435 = NL + "\t\tg"; + protected final String TEXT_436 = "."; + protected final String TEXT_437 = "(g"; + protected final String TEXT_438 = ");"; + protected final String TEXT_439 = NL + "\t\tinitEReference(get"; + protected final String TEXT_440 = "(), "; + 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 = ", "; protected final String TEXT_449 = ", "; @@ -475,20 +475,20 @@ public class PackageClass protected final String TEXT_454 = ", "; protected final String TEXT_455 = ", "; protected final String TEXT_456 = ", "; - protected final String TEXT_457 = ");"; - protected final String TEXT_458 = NL + "\t\tget"; - protected final String TEXT_459 = "().getEKeys().add("; - protected final String TEXT_460 = ".get"; - protected final String TEXT_461 = "());"; - protected final String TEXT_462 = NL + "\t\tinitEAttribute(get"; - protected final String TEXT_463 = "(), "; - protected final String TEXT_464 = "g1"; - protected final String TEXT_465 = ".get"; - protected final String TEXT_466 = "()"; - protected final String TEXT_467 = ", \""; - protected final String TEXT_468 = "\", "; - protected final String TEXT_469 = ", "; - protected final String TEXT_470 = ", "; + protected final String TEXT_457 = ", "; + protected final String TEXT_458 = ", "; + protected final String TEXT_459 = ");"; + protected final String TEXT_460 = NL + "\t\tget"; + protected final String TEXT_461 = "().getEKeys().add("; + protected final String TEXT_462 = ".get"; + protected final String TEXT_463 = "());"; + protected final String TEXT_464 = NL + "\t\tinitEAttribute(get"; + protected final String TEXT_465 = "(), "; + protected final String TEXT_466 = "g1"; + protected final String TEXT_467 = ".get"; + protected final String TEXT_468 = "()"; + protected final String TEXT_469 = ", \""; + protected final String TEXT_470 = "\", "; protected final String TEXT_471 = ", "; protected final String TEXT_472 = ", "; protected final String TEXT_473 = ", "; @@ -498,278 +498,280 @@ public class PackageClass protected final String TEXT_477 = ", "; protected final String TEXT_478 = ", "; protected final String TEXT_479 = ", "; - protected final String TEXT_480 = ");"; - protected final String TEXT_481 = NL; - protected final String TEXT_482 = NL + "\t\t"; - protected final String TEXT_483 = "initEOperation(get"; - protected final String TEXT_484 = "()"; - protected final String TEXT_485 = "addEOperation("; - protected final String TEXT_486 = ", "; - protected final String TEXT_487 = "null"; - protected final String TEXT_488 = ".get"; - protected final String TEXT_489 = "()"; - protected final String TEXT_490 = ", \""; - protected final String TEXT_491 = "\", "; - protected final String TEXT_492 = ", "; - protected final String TEXT_493 = ", "; + protected final String TEXT_480 = ", "; + protected final String TEXT_481 = ", "; + protected final String TEXT_482 = ");"; + protected final String TEXT_483 = NL; + protected final String TEXT_484 = NL + "\t\t"; + protected final String TEXT_485 = "initEOperation(get"; + protected final String TEXT_486 = "()"; + protected final String TEXT_487 = "addEOperation("; + protected final String TEXT_488 = ", "; + protected final String TEXT_489 = "null"; + protected final String TEXT_490 = ".get"; + protected final String TEXT_491 = "()"; + protected final String TEXT_492 = ", \""; + protected final String TEXT_493 = "\", "; protected final String TEXT_494 = ", "; - protected final String TEXT_495 = ");"; - protected final String TEXT_496 = NL + "\t\t"; - protected final String TEXT_497 = "initEOperation(get"; - protected final String TEXT_498 = "()"; - protected final String TEXT_499 = "addEOperation("; - protected final String TEXT_500 = ", "; - protected final String TEXT_501 = ".get"; - protected final String TEXT_502 = "(), \""; - protected final String TEXT_503 = "\", "; - protected final String TEXT_504 = ", "; - protected final String TEXT_505 = ", "; + protected final String TEXT_495 = ", "; + protected final String TEXT_496 = ", "; + protected final String TEXT_497 = ");"; + protected final String TEXT_498 = NL + "\t\t"; + protected final String TEXT_499 = "initEOperation(get"; + protected final String TEXT_500 = "()"; + protected final String TEXT_501 = "addEOperation("; + protected final String TEXT_502 = ", "; + protected final String TEXT_503 = ".get"; + protected final String TEXT_504 = "(), \""; + protected final String TEXT_505 = "\", "; protected final String TEXT_506 = ", "; - protected final String TEXT_507 = ");"; - protected final String TEXT_508 = NL + "\t\t"; - protected final String TEXT_509 = "initEOperation(get"; - protected final String TEXT_510 = "()"; - protected final String TEXT_511 = "addEOperation("; - protected final String TEXT_512 = ", "; - protected final String TEXT_513 = ".get"; - protected final String TEXT_514 = "(), \""; - protected final String TEXT_515 = "\", "; - protected final String TEXT_516 = ", "; - protected final String TEXT_517 = ");"; - protected final String TEXT_518 = NL + "\t\t"; - protected final String TEXT_519 = "initEOperation(get"; - protected final String TEXT_520 = "()"; - protected final String TEXT_521 = "addEOperation("; - protected final String TEXT_522 = ", null, \""; - protected final String TEXT_523 = "\");"; - protected final String TEXT_524 = NL + "\t\t"; - protected final String TEXT_525 = "addETypeParameter(op, \""; - protected final String TEXT_526 = "\");"; - protected final String TEXT_527 = NL + "\t\t"; - protected final String TEXT_528 = "g"; - protected final String TEXT_529 = " = createEGenericType("; - protected final String TEXT_530 = ");"; - protected final String TEXT_531 = NL + "\t\tg"; - protected final String TEXT_532 = "."; - protected final String TEXT_533 = "(g"; - protected final String TEXT_534 = ");"; - protected final String TEXT_535 = NL + "\t\tt"; - protected final String TEXT_536 = ".getEBounds().add(g1);"; - protected final String TEXT_537 = NL + "\t\t"; - protected final String TEXT_538 = "g"; - protected final String TEXT_539 = " = createEGenericType("; - protected final String TEXT_540 = ");"; - protected final String TEXT_541 = NL + "\t\tg"; - protected final String TEXT_542 = "."; - protected final String TEXT_543 = "(g"; - protected final String TEXT_544 = ");"; - protected final String TEXT_545 = NL + "\t\taddEParameter(op, "; - protected final String TEXT_546 = "g1"; - protected final String TEXT_547 = ".get"; - protected final String TEXT_548 = "()"; - protected final String TEXT_549 = ", \""; - protected final String TEXT_550 = "\", "; - protected final String TEXT_551 = ", "; - protected final String TEXT_552 = ", "; + protected final String TEXT_507 = ", "; + protected final String TEXT_508 = ", "; + protected final String TEXT_509 = ");"; + protected final String TEXT_510 = NL + "\t\t"; + protected final String TEXT_511 = "initEOperation(get"; + protected final String TEXT_512 = "()"; + protected final String TEXT_513 = "addEOperation("; + protected final String TEXT_514 = ", "; + protected final String TEXT_515 = ".get"; + protected final String TEXT_516 = "(), \""; + protected final String TEXT_517 = "\", "; + protected final String TEXT_518 = ", "; + protected final String TEXT_519 = ");"; + protected final String TEXT_520 = NL + "\t\t"; + protected final String TEXT_521 = "initEOperation(get"; + protected final String TEXT_522 = "()"; + protected final String TEXT_523 = "addEOperation("; + protected final String TEXT_524 = ", null, \""; + protected final String TEXT_525 = "\");"; + protected final String TEXT_526 = NL + "\t\t"; + protected final String TEXT_527 = "addETypeParameter(op, \""; + protected final String TEXT_528 = "\");"; + protected final String TEXT_529 = NL + "\t\t"; + protected final String TEXT_530 = "g"; + protected final String TEXT_531 = " = createEGenericType("; + protected final String TEXT_532 = ");"; + protected final String TEXT_533 = NL + "\t\tg"; + protected final String TEXT_534 = "."; + protected final String TEXT_535 = "(g"; + protected final String TEXT_536 = ");"; + protected final String TEXT_537 = NL + "\t\tt"; + protected final String TEXT_538 = ".getEBounds().add(g1);"; + protected final String TEXT_539 = NL + "\t\t"; + protected final String TEXT_540 = "g"; + protected final String TEXT_541 = " = createEGenericType("; + protected final String TEXT_542 = ");"; + protected final String TEXT_543 = NL + "\t\tg"; + protected final String TEXT_544 = "."; + protected final String TEXT_545 = "(g"; + protected final String TEXT_546 = ");"; + protected final String TEXT_547 = NL + "\t\taddEParameter(op, "; + protected final String TEXT_548 = "g1"; + protected final String TEXT_549 = ".get"; + protected final String TEXT_550 = "()"; + protected final String TEXT_551 = ", \""; + protected final String TEXT_552 = "\", "; protected final String TEXT_553 = ", "; - protected final String TEXT_554 = ");"; - protected final String TEXT_555 = NL + "\t\taddEParameter(op, "; - protected final String TEXT_556 = "g1"; - protected final String TEXT_557 = ".get"; - protected final String TEXT_558 = "()"; - protected final String TEXT_559 = ", \""; - protected final String TEXT_560 = "\", "; - protected final String TEXT_561 = ", "; - protected final String TEXT_562 = ", "; + protected final String TEXT_554 = ", "; + protected final String TEXT_555 = ", "; + protected final String TEXT_556 = ");"; + protected final String TEXT_557 = NL + "\t\taddEParameter(op, "; + protected final String TEXT_558 = "g1"; + protected final String TEXT_559 = ".get"; + protected final String TEXT_560 = "()"; + protected final String TEXT_561 = ", \""; + protected final String TEXT_562 = "\", "; protected final String TEXT_563 = ", "; - protected final String TEXT_564 = ");"; - protected final String TEXT_565 = NL + "\t\taddEParameter(op, "; - protected final String TEXT_566 = "g1"; - protected final String TEXT_567 = ".get"; - protected final String TEXT_568 = "()"; - protected final String TEXT_569 = ", \""; - protected final String TEXT_570 = "\", "; - protected final String TEXT_571 = ", "; - protected final String TEXT_572 = ");"; - protected final String TEXT_573 = NL + "\t\t"; - protected final String TEXT_574 = "g"; - protected final String TEXT_575 = " = createEGenericType("; - protected final String TEXT_576 = ");"; - protected final String TEXT_577 = NL + "\t\tg"; - protected final String TEXT_578 = "."; - protected final String TEXT_579 = "(g"; - protected final String TEXT_580 = ");"; - protected final String TEXT_581 = NL + "\t\taddEException(op, g"; + protected final String TEXT_564 = ", "; + protected final String TEXT_565 = ", "; + protected final String TEXT_566 = ");"; + protected final String TEXT_567 = NL + "\t\taddEParameter(op, "; + protected final String TEXT_568 = "g1"; + protected final String TEXT_569 = ".get"; + protected final String TEXT_570 = "()"; + protected final String TEXT_571 = ", \""; + protected final String TEXT_572 = "\", "; + protected final String TEXT_573 = ", "; + protected final String TEXT_574 = ");"; + protected final String TEXT_575 = NL + "\t\t"; + protected final String TEXT_576 = "g"; + protected final String TEXT_577 = " = createEGenericType("; + protected final String TEXT_578 = ");"; + protected final String TEXT_579 = NL + "\t\tg"; + protected final String TEXT_580 = "."; + protected final String TEXT_581 = "(g"; protected final String TEXT_582 = ");"; - protected final String TEXT_583 = NL + "\t\taddEException(op, "; - protected final String TEXT_584 = ".get"; - protected final String TEXT_585 = "());"; - protected final String TEXT_586 = NL + "\t\t"; - protected final String TEXT_587 = "g"; - protected final String TEXT_588 = " = createEGenericType("; - protected final String TEXT_589 = ");"; - protected final String TEXT_590 = NL + "\t\tg"; - protected final String TEXT_591 = "."; - protected final String TEXT_592 = "(g"; - protected final String TEXT_593 = ");"; - protected final String TEXT_594 = NL + "\t\tinitEOperation(op, g1);"; - protected final String TEXT_595 = NL; - protected final String TEXT_596 = NL + NL + "\t\t// Initialize enums and add enum literals"; - protected final String TEXT_597 = NL + "\t\tinitEEnum("; - protected final String TEXT_598 = ", "; - protected final String TEXT_599 = ".class, \""; - protected final String TEXT_600 = "\");"; - protected final String TEXT_601 = NL + "\t\taddEEnumLiteral("; - protected final String TEXT_602 = ", "; - protected final String TEXT_603 = "."; - protected final String TEXT_604 = ");"; - protected final String TEXT_605 = NL; - protected final String TEXT_606 = NL + NL + "\t\t// Initialize data types"; - protected final String TEXT_607 = NL + "\t\tinitEDataType("; - protected final String TEXT_608 = ", "; - protected final String TEXT_609 = ".class, \""; - protected final String TEXT_610 = "\", "; - protected final String TEXT_611 = ", "; - protected final String TEXT_612 = ", \""; - protected final String TEXT_613 = "\""; - protected final String TEXT_614 = ");"; - protected final String TEXT_615 = NL + NL + "\t\t// Create resource" + NL + "\t\tcreateResource("; + protected final String TEXT_583 = NL + "\t\taddEException(op, g"; + protected final String TEXT_584 = ");"; + protected final String TEXT_585 = NL + "\t\taddEException(op, "; + protected final String TEXT_586 = ".get"; + protected final String TEXT_587 = "());"; + protected final String TEXT_588 = NL + "\t\t"; + protected final String TEXT_589 = "g"; + protected final String TEXT_590 = " = createEGenericType("; + protected final String TEXT_591 = ");"; + protected final String TEXT_592 = NL + "\t\tg"; + protected final String TEXT_593 = "."; + protected final String TEXT_594 = "(g"; + protected final String TEXT_595 = ");"; + protected final String TEXT_596 = NL + "\t\tinitEOperation(op, g1);"; + protected final String TEXT_597 = NL; + protected final String TEXT_598 = NL + NL + "\t\t// Initialize enums and add enum literals"; + protected final String TEXT_599 = NL + "\t\tinitEEnum("; + protected final String TEXT_600 = ", "; + protected final String TEXT_601 = ".class, \""; + protected final String TEXT_602 = "\");"; + protected final String TEXT_603 = NL + "\t\taddEEnumLiteral("; + protected final String TEXT_604 = ", "; + protected final String TEXT_605 = "."; + protected final String TEXT_606 = ");"; + protected final String TEXT_607 = NL; + protected final String TEXT_608 = NL + NL + "\t\t// Initialize data types"; + protected final String TEXT_609 = NL + "\t\tinitEDataType("; + protected final String TEXT_610 = ", "; + protected final String TEXT_611 = ".class, \""; + protected final String TEXT_612 = "\", "; + protected final String TEXT_613 = ", "; + protected final String TEXT_614 = ", \""; + protected final String TEXT_615 = "\""; protected final String TEXT_616 = ");"; - protected final String TEXT_617 = NL + NL + "\t\t// Create annotations"; - protected final String TEXT_618 = NL + "\t\t// "; - protected final String TEXT_619 = NL + "\t\tcreate"; - protected final String TEXT_620 = "Annotations();"; - protected final String TEXT_621 = NL + "\t}" + NL; - protected final String TEXT_622 = NL + "\t/**" + NL + "\t * Initializes the annotations for <b>"; - protected final String TEXT_623 = "</b>." + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void create"; - protected final String TEXT_624 = "Annotations()" + NL + "\t{" + NL + "\t\tString source = "; - protected final String TEXT_625 = "null;"; - protected final String TEXT_626 = "\""; - protected final String TEXT_627 = "\";"; - protected final String TEXT_628 = "\t" + NL + "\t\taddAnnotation" + NL + "\t\t ("; - protected final String TEXT_629 = ", " + NL + "\t\t source, " + NL + "\t\t new String[] " + NL + "\t\t {"; - protected final String TEXT_630 = NL + "\t\t\t "; - protected final String TEXT_631 = ", "; - protected final String TEXT_632 = NL + "\t\t }"; - protected final String TEXT_633 = ");"; - protected final String TEXT_634 = ","; - protected final String TEXT_635 = NL + "\t\t new "; - protected final String TEXT_636 = "[] " + NL + "\t\t {"; - protected final String TEXT_637 = NL + "\t\t\t "; - protected final String TEXT_638 = ".createURI("; - protected final String TEXT_639 = "."; - protected final String TEXT_640 = "eNS_URI).appendFragment(\""; - protected final String TEXT_641 = "\")"; - protected final String TEXT_642 = ","; - protected final String TEXT_643 = NL + "\t\t });"; - protected final String TEXT_644 = NL + "\t\taddAnnotation" + NL + "\t\t ("; - protected final String TEXT_645 = ", " + NL + "\t\t "; - protected final String TEXT_646 = "new boolean[] { "; - protected final String TEXT_647 = " }"; - protected final String TEXT_648 = "," + NL + "\t\t "; - protected final String TEXT_649 = "null,"; - protected final String TEXT_650 = "\""; - protected final String TEXT_651 = "\","; - protected final String TEXT_652 = NL + "\t\t new String[] " + NL + "\t\t {"; - protected final String TEXT_653 = NL + "\t\t\t "; - protected final String TEXT_654 = ", "; - protected final String TEXT_655 = NL + "\t\t }"; - protected final String TEXT_656 = ");"; - protected final String TEXT_657 = ","; - protected final String TEXT_658 = NL + "\t\t new "; - protected final String TEXT_659 = "[] " + NL + "\t\t {"; - protected final String TEXT_660 = NL + "\t\t\t "; - protected final String TEXT_661 = ".createURI("; - protected final String TEXT_662 = "."; - protected final String TEXT_663 = "eNS_URI).appendFragment(\""; - protected final String TEXT_664 = "\")"; - protected final String TEXT_665 = ","; - protected final String TEXT_666 = NL + "\t\t });"; - protected final String TEXT_667 = NL + "\t}" + NL; - protected final String TEXT_668 = 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_669 = " 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_670 = NL + "\t\t}" + NL + "\t\t"; - protected final String TEXT_671 = " uri = "; - protected final String TEXT_672 = ".createURI(url.toString());" + NL + "\t\t"; - protected final String TEXT_673 = " resource = new "; - protected final String TEXT_674 = "().createResource(uri);" + NL + "\t\ttry" + NL + "\t\t{" + NL + "\t\t\tresource.load(null);" + NL + "\t\t}" + NL + "\t\tcatch ("; - protected final String TEXT_675 = " exception)" + NL + "\t\t{" + NL + "\t\t\tthrow new "; - protected final String TEXT_676 = "(exception);" + NL + "\t\t}" + NL + "\t\tinitializeFromLoadedEPackage(this, ("; - protected final String TEXT_677 = ")resource.getContents().get(0));" + NL + "\t\tcreateResource(eNS_URI);" + NL + "\t}" + NL; - protected final String TEXT_678 = 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_679 = NL + "\t@Override"; - protected final String TEXT_680 = NL + "\tprotected void fixInstanceClass("; - protected final String TEXT_681 = " eClassifier)" + NL + "\t{" + NL + "\t\tif (eClassifier.getInstanceClassName() == null)" + NL + "\t\t{"; - protected final String TEXT_682 = NL + "\t\t\teClassifier.setInstanceClassName(\""; - protected final String TEXT_683 = ".\" + eClassifier.getName());"; - protected final String TEXT_684 = NL + "\t\t\tsetGeneratedClassName(eClassifier);"; - protected final String TEXT_685 = NL + "\t\t\tswitch (eClassifier.getClassifierID())" + NL + "\t\t\t{"; - protected final String TEXT_686 = NL + "\t\t\t\tcase "; - protected final String TEXT_687 = ":"; - protected final String TEXT_688 = 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_689 = ".\" + eClassifier.getName());"; - protected final String TEXT_690 = 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_691 = NL + "\t\t}" + NL + "\t}" + NL; - protected final String TEXT_692 = NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected "; - protected final String TEXT_693 = " addEOperation("; - protected final String TEXT_694 = " owner, "; - protected final String TEXT_695 = " type, String name, int lowerBound, int upperBound, boolean isUnique, boolean isOrdered)" + NL + "\t{" + NL + "\t\t"; - protected final String TEXT_696 = " 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_697 = NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected "; - protected final String TEXT_698 = " addEParameter("; - protected final String TEXT_699 = " owner, "; - protected final String TEXT_700 = " type, String name, int lowerBound, int upperBound, boolean isUnique, boolean isOrdered)" + NL + "\t{" + NL + "\t\t"; - protected final String TEXT_701 = " 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_702 = 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>"; - protected final String TEXT_703 = NL + "\t * <li>each operation of each class,</li>"; - protected final String TEXT_704 = 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_705 = "public "; - protected final String TEXT_706 = "interface Literals" + NL + "\t{"; - protected final String TEXT_707 = NL + "\t\t/**"; - protected final String TEXT_708 = NL + "\t\t * The meta object literal for the '{@link "; - protected final String TEXT_709 = " <em>"; - protected final String TEXT_710 = "</em>}' class." + NL + "\t\t * <!-- begin-user-doc -->" + NL + "\t\t * <!-- end-user-doc -->" + NL + "\t\t * @see "; - protected final String TEXT_711 = NL + "\t\t * The meta object literal for the '{@link "; - protected final String TEXT_712 = " <em>"; - protected final String TEXT_713 = "</em>}' class." + NL + "\t\t * <!-- begin-user-doc -->" + NL + "\t\t * <!-- end-user-doc -->" + NL + "\t\t * @see "; - protected final String TEXT_714 = NL + "\t\t * The meta object literal for the '{@link "; - protected final String TEXT_715 = " <em>"; - protected final String TEXT_716 = "</em>}' enum." + NL + "\t\t * <!-- begin-user-doc -->" + NL + "\t\t * <!-- end-user-doc -->" + NL + "\t\t * @see "; - protected final String TEXT_717 = NL + "\t\t * The meta object literal for the '<em>"; - protected final String TEXT_718 = "</em>' data type." + NL + "\t\t * <!-- begin-user-doc -->" + NL + "\t\t * <!-- end-user-doc -->"; - protected final String TEXT_719 = NL + "\t\t * @see "; - protected final String TEXT_720 = NL + "\t\t * @see "; - protected final String TEXT_721 = "#get"; - protected final String TEXT_722 = "()"; - protected final String TEXT_723 = NL + "\t\t * "; - protected final String TEXT_724 = NL + "\t\t * @generated" + NL + "\t\t */"; - protected final String TEXT_725 = NL + "\t\t@Deprecated"; - protected final String TEXT_726 = NL + "\t\t"; - protected final String TEXT_727 = " "; - protected final String TEXT_728 = " = eINSTANCE.get"; - protected final String TEXT_729 = "();" + NL; - protected final String TEXT_730 = NL + "\t\t/**" + NL + "\t\t * The meta object literal for the '<em><b>"; - protected final String TEXT_731 = "</b></em>' "; - protected final String TEXT_732 = " feature." + NL + "\t\t * <!-- begin-user-doc -->" + NL + "\t\t * <!-- end-user-doc -->"; - protected final String TEXT_733 = NL + "\t\t * "; - protected final String TEXT_734 = NL + "\t\t * @generated" + NL + "\t\t */"; - protected final String TEXT_735 = NL + "\t\t@Deprecated"; - protected final String TEXT_736 = NL + "\t\t"; - protected final String TEXT_737 = " "; - protected final String TEXT_738 = " = eINSTANCE.get"; - protected final String TEXT_739 = "();" + NL; - protected final String TEXT_740 = NL + "\t\t/**" + NL + "\t\t * The meta object literal for the '<em><b>"; - protected final String TEXT_741 = "</b></em>' operation." + NL + "\t\t * <!-- begin-user-doc -->" + NL + "\t\t * <!-- end-user-doc -->"; - protected final String TEXT_742 = NL + "\t\t * "; - protected final String TEXT_743 = NL + "\t\t * @generated" + NL + "\t\t */"; - protected final String TEXT_744 = NL + "\t\t@Deprecated"; - protected final String TEXT_745 = NL + "\t\t"; - protected final String TEXT_746 = " "; - protected final String TEXT_747 = " = eINSTANCE.get"; - protected final String TEXT_748 = "();" + NL; - protected final String TEXT_749 = NL + "\t}" + NL; - protected final String TEXT_750 = NL + "} //"; - protected final String TEXT_751 = NL; + protected final String TEXT_617 = NL + NL + "\t\t// Create resource" + NL + "\t\tcreateResource("; + protected final String TEXT_618 = ");"; + protected final String TEXT_619 = NL + NL + "\t\t// Create annotations"; + protected final String TEXT_620 = NL + "\t\t// "; + protected final String TEXT_621 = NL + "\t\tcreate"; + protected final String TEXT_622 = "Annotations();"; + protected final String TEXT_623 = NL + "\t}" + NL; + protected final String TEXT_624 = NL + "\t/**" + NL + "\t * Initializes the annotations for <b>"; + protected final String TEXT_625 = "</b>." + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void create"; + protected final String TEXT_626 = "Annotations()" + NL + "\t{" + NL + "\t\tString source = "; + protected final String TEXT_627 = "null;"; + protected final String TEXT_628 = "\""; + protected final String TEXT_629 = "\";"; + protected final String TEXT_630 = NL + "\t\taddAnnotation" + NL + "\t\t ("; + protected final String TEXT_631 = "," + NL + "\t\t source," + NL + "\t\t new String[]" + NL + "\t\t {"; + protected final String TEXT_632 = NL + "\t\t\t "; + protected final String TEXT_633 = ", "; + protected final String TEXT_634 = NL + "\t\t }"; + protected final String TEXT_635 = ");"; + protected final String TEXT_636 = ","; + protected final String TEXT_637 = NL + "\t\t new "; + protected final String TEXT_638 = "[]" + NL + "\t\t {"; + protected final String TEXT_639 = NL + "\t\t\t "; + protected final String TEXT_640 = ".createURI("; + protected final String TEXT_641 = "."; + protected final String TEXT_642 = "eNS_URI).appendFragment(\""; + protected final String TEXT_643 = "\")"; + protected final String TEXT_644 = ","; + protected final String TEXT_645 = NL + "\t\t });"; + protected final String TEXT_646 = NL + "\t\taddAnnotation" + NL + "\t\t ("; + protected final String TEXT_647 = "," + NL + "\t\t "; + protected final String TEXT_648 = "new boolean[] { "; + protected final String TEXT_649 = " }"; + protected final String TEXT_650 = "," + NL + "\t\t "; + protected final String TEXT_651 = "null,"; + protected final String TEXT_652 = "\""; + protected final String TEXT_653 = "\","; + protected final String TEXT_654 = NL + "\t\t new String[]" + NL + "\t\t {"; + protected final String TEXT_655 = NL + "\t\t\t "; + protected final String TEXT_656 = ", "; + protected final String TEXT_657 = NL + "\t\t }"; + protected final String TEXT_658 = ");"; + protected final String TEXT_659 = ","; + protected final String TEXT_660 = NL + "\t\t new "; + protected final String TEXT_661 = "[]" + NL + "\t\t {"; + protected final String TEXT_662 = NL + "\t\t\t "; + protected final String TEXT_663 = ".createURI("; + protected final String TEXT_664 = "."; + protected final String TEXT_665 = "eNS_URI).appendFragment(\""; + protected final String TEXT_666 = "\")"; + protected final String TEXT_667 = ","; + protected final String TEXT_668 = NL + "\t\t });"; + protected final String TEXT_669 = NL + "\t}" + NL; + protected final String TEXT_670 = 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_671 = " 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_672 = NL + "\t\t}" + NL + "\t\t"; + protected final String TEXT_673 = " uri = "; + protected final String TEXT_674 = ".createURI(url.toString());" + NL + "\t\t"; + protected final String TEXT_675 = " resource = new "; + protected final String TEXT_676 = "().createResource(uri);" + NL + "\t\ttry" + NL + "\t\t{" + NL + "\t\t\tresource.load(null);" + NL + "\t\t}" + NL + "\t\tcatch ("; + protected final String TEXT_677 = " exception)" + NL + "\t\t{" + NL + "\t\t\tthrow new "; + protected final String TEXT_678 = "(exception);" + NL + "\t\t}" + NL + "\t\tinitializeFromLoadedEPackage(this, ("; + protected final String TEXT_679 = ")resource.getContents().get(0));" + NL + "\t\tcreateResource(eNS_URI);" + NL + "\t}" + NL; + protected final String TEXT_680 = 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_681 = NL + "\t@Override"; + protected final String TEXT_682 = NL + "\tprotected void fixInstanceClass("; + protected final String TEXT_683 = " eClassifier)" + NL + "\t{" + NL + "\t\tif (eClassifier.getInstanceClassName() == null)" + NL + "\t\t{"; + protected final String TEXT_684 = NL + "\t\t\teClassifier.setInstanceClassName(\""; + protected final String TEXT_685 = ".\" + eClassifier.getName());"; + protected final String TEXT_686 = NL + "\t\t\tsetGeneratedClassName(eClassifier);"; + protected final String TEXT_687 = NL + "\t\t\tswitch (eClassifier.getClassifierID())" + NL + "\t\t\t{"; + protected final String TEXT_688 = NL + "\t\t\t\tcase "; + protected final String TEXT_689 = ":"; + protected final String TEXT_690 = 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_691 = ".\" + eClassifier.getName());"; + protected final String TEXT_692 = 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_693 = NL + "\t\t}" + NL + "\t}" + NL; + protected final String TEXT_694 = NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected "; + protected final String TEXT_695 = " addEOperation("; + protected final String TEXT_696 = " owner, "; + protected final String TEXT_697 = " type, String name, int lowerBound, int upperBound, boolean isUnique, boolean isOrdered)" + NL + "\t{" + NL + "\t\t"; + protected final String TEXT_698 = " o = addEOperation(owner, type, name, lowerBound, upperBound);" + NL + "\t\to.setUnique(isUnique);" + NL + "\t\to.setOrdered(isOrdered);" + NL + "\t\treturn o;" + NL + "\t}" + NL; + protected final String TEXT_699 = NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected "; + protected final String TEXT_700 = " addEParameter("; + protected final String TEXT_701 = " owner, "; + protected final String TEXT_702 = " type, String name, int lowerBound, int upperBound, boolean isUnique, boolean isOrdered)" + NL + "\t{" + NL + "\t\t"; + protected final String TEXT_703 = " 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; + protected final String TEXT_704 = 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>"; + protected final String TEXT_705 = NL + "\t * <li>each operation of each class,</li>"; + protected final String TEXT_706 = 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_707 = "public "; + protected final String TEXT_708 = "interface Literals" + NL + "\t{"; + protected final String TEXT_709 = NL + "\t\t/**"; + protected final String TEXT_710 = NL + "\t\t * The meta object literal for the '{@link "; + protected final String TEXT_711 = " <em>"; + protected final String TEXT_712 = "</em>}' class." + NL + "\t\t * <!-- begin-user-doc -->" + NL + "\t\t * <!-- end-user-doc -->" + NL + "\t\t * @see "; + protected final String TEXT_713 = NL + "\t\t * The meta object literal for the '{@link "; + protected final String TEXT_714 = " <em>"; + protected final String TEXT_715 = "</em>}' class." + NL + "\t\t * <!-- begin-user-doc -->" + NL + "\t\t * <!-- end-user-doc -->" + NL + "\t\t * @see "; + protected final String TEXT_716 = NL + "\t\t * The meta object literal for the '{@link "; + protected final String TEXT_717 = " <em>"; + protected final String TEXT_718 = "</em>}' enum." + NL + "\t\t * <!-- begin-user-doc -->" + NL + "\t\t * <!-- end-user-doc -->" + NL + "\t\t * @see "; + protected final String TEXT_719 = NL + "\t\t * The meta object literal for the '<em>"; + protected final String TEXT_720 = "</em>' data type." + NL + "\t\t * <!-- begin-user-doc -->" + NL + "\t\t * <!-- end-user-doc -->"; + protected final String TEXT_721 = NL + "\t\t * @see "; + protected final String TEXT_722 = NL + "\t\t * @see "; + protected final String TEXT_723 = "#get"; + protected final String TEXT_724 = "()"; + protected final String TEXT_725 = NL + "\t\t * "; + protected final String TEXT_726 = NL + "\t\t * @generated" + NL + "\t\t */"; + protected final String TEXT_727 = NL + "\t\t@Deprecated"; + protected final String TEXT_728 = NL + "\t\t"; + protected final String TEXT_729 = " "; + protected final String TEXT_730 = " = eINSTANCE.get"; + protected final String TEXT_731 = "();" + NL; + protected final String TEXT_732 = NL + "\t\t/**" + NL + "\t\t * The meta object literal for the '<em><b>"; + protected final String TEXT_733 = "</b></em>' "; + protected final String TEXT_734 = " feature." + NL + "\t\t * <!-- begin-user-doc -->" + NL + "\t\t * <!-- end-user-doc -->"; + protected final String TEXT_735 = NL + "\t\t * "; + protected final String TEXT_736 = NL + "\t\t * @generated" + NL + "\t\t */"; + protected final String TEXT_737 = NL + "\t\t@Deprecated"; + protected final String TEXT_738 = NL + "\t\t"; + protected final String TEXT_739 = " "; + protected final String TEXT_740 = " = eINSTANCE.get"; + protected final String TEXT_741 = "();" + NL; + protected final String TEXT_742 = NL + "\t\t/**" + NL + "\t\t * The meta object literal for the '<em><b>"; + protected final String TEXT_743 = "</b></em>' operation." + NL + "\t\t * <!-- begin-user-doc -->" + NL + "\t\t * <!-- end-user-doc -->"; + protected final String TEXT_744 = NL + "\t\t * "; + protected final String TEXT_745 = NL + "\t\t * @generated" + NL + "\t\t */"; + protected final String TEXT_746 = NL + "\t\t@Deprecated"; + protected final String TEXT_747 = NL + "\t\t"; + protected final String TEXT_748 = " "; + protected final String TEXT_749 = " = eINSTANCE.get"; + protected final String TEXT_750 = "();" + NL; + protected final String TEXT_751 = NL + "\t}" + NL; + protected final String TEXT_752 = NL + "} //"; + protected final String TEXT_753 = NL; public String generate(Object argument) { @@ -1112,547 +1114,551 @@ public class PackageClass stringBuffer.append(TEXT_131); } stringBuffer.append(TEXT_132); - stringBuffer.append(genPackage.getPackageClassName()); - stringBuffer.append(TEXT_133); stringBuffer.append(genPackage.getBasicPackageName()); + stringBuffer.append(TEXT_133); + stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EPackage")); stringBuffer.append(TEXT_134); stringBuffer.append(genPackage.getPackageClassName()); stringBuffer.append(TEXT_135); - stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EPackage")); + stringBuffer.append(genPackage.getBasicPackageName()); stringBuffer.append(TEXT_136); - stringBuffer.append(genPackage.getPackageClassName()); + stringBuffer.append(genPackage.getBasicPackageName()); stringBuffer.append(TEXT_137); - stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EPackage")); + stringBuffer.append(genPackage.getPackageClassName()); stringBuffer.append(TEXT_138); stringBuffer.append(genPackage.getPackageClassName()); stringBuffer.append(TEXT_139); - if (!genPackage.getPackageSimpleDependencies().isEmpty()) { + stringBuffer.append(genPackage.getBasicPackageName()); stringBuffer.append(TEXT_140); - for (GenPackage dep : genPackage.getPackageSimpleDependencies()) { + stringBuffer.append(genPackage.getPackageClassName()); stringBuffer.append(TEXT_141); - stringBuffer.append(dep.getImportedPackageInterfaceName()); + if (!genPackage.getPackageSimpleDependencies().isEmpty()) { stringBuffer.append(TEXT_142); - } + for (GenPackage dep : genPackage.getPackageSimpleDependencies()) { stringBuffer.append(TEXT_143); - } - if (!genPackage.getPackageInterDependencies().isEmpty()) { + stringBuffer.append(dep.getImportedPackageInterfaceName()); stringBuffer.append(TEXT_144); - for (GenPackage interdep : genPackage.getPackageInterDependencies()) { + } stringBuffer.append(TEXT_145); - stringBuffer.append(interdep.getImportedPackageClassName()); + } + if (!genPackage.getPackageInterDependencies().isEmpty()) { stringBuffer.append(TEXT_146); - stringBuffer.append(genPackage.getPackageInstanceVariable(interdep)); + for (ListIterator<GenPackage> i = genPackage.getPackageInterDependencies().listIterator(); i.hasNext(); ) { GenPackage interdep = i.next(); stringBuffer.append(TEXT_147); - stringBuffer.append(interdep.getImportedPackageClassName()); + if (i.previousIndex() == 0) { stringBuffer.append(TEXT_148); - stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EPackage")); + } stringBuffer.append(TEXT_149); - stringBuffer.append(interdep.getImportedPackageInterfaceName()); + stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EPackage")); stringBuffer.append(TEXT_150); - stringBuffer.append(interdep.getImportedPackageClassName()); + stringBuffer.append(interdep.getImportedPackageInterfaceName()); stringBuffer.append(TEXT_151); - stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EPackage")); + stringBuffer.append(interdep.getImportedPackageClassName()); stringBuffer.append(TEXT_152); - stringBuffer.append(interdep.getImportedPackageInterfaceName()); + stringBuffer.append(genPackage.getPackageInstanceVariable(interdep)); stringBuffer.append(TEXT_153); - stringBuffer.append(interdep.getImportedPackageInterfaceName()); + stringBuffer.append(interdep.getImportedPackageClassName()); stringBuffer.append(TEXT_154); - } + stringBuffer.append(interdep.getImportedPackageClassName()); stringBuffer.append(TEXT_155); + stringBuffer.append(interdep.getImportedPackageInterfaceName()); + stringBuffer.append(TEXT_156); + } + stringBuffer.append(TEXT_157); } if (genPackage.isLoadedInitialization() || !genPackage.getPackageLoadInterDependencies().isEmpty()) { - stringBuffer.append(TEXT_156); + stringBuffer.append(TEXT_158); if (genPackage.isLoadingInitialization()) { - stringBuffer.append(TEXT_157); + stringBuffer.append(TEXT_159); stringBuffer.append(genPackage.getBasicPackageName()); - stringBuffer.append(TEXT_158); + stringBuffer.append(TEXT_160); } for (GenPackage interdep : genPackage.getPackageLoadInterDependencies()) { if (interdep.isLoadingInitialization()) { - stringBuffer.append(TEXT_159); + stringBuffer.append(TEXT_161); stringBuffer.append(genPackage.getPackageInstanceVariable(interdep)); - stringBuffer.append(TEXT_160); + stringBuffer.append(TEXT_162); } } - stringBuffer.append(TEXT_161); + stringBuffer.append(TEXT_163); } if (!genPackage.isLoadedInitialization() || !genPackage.getPackageBuildInterDependencies().isEmpty()) { - stringBuffer.append(TEXT_162); + stringBuffer.append(TEXT_164); if (!genPackage.isLoadedInitialization()) { - stringBuffer.append(TEXT_163); + stringBuffer.append(TEXT_165); stringBuffer.append(genPackage.getBasicPackageName()); - stringBuffer.append(TEXT_164); + stringBuffer.append(TEXT_166); } for (GenPackage interdep : genPackage.getPackageBuildInterDependencies()) { - stringBuffer.append(TEXT_165); + stringBuffer.append(TEXT_167); stringBuffer.append(genPackage.getPackageInstanceVariable(interdep)); - stringBuffer.append(TEXT_166); + stringBuffer.append(TEXT_168); } - stringBuffer.append(TEXT_167); + stringBuffer.append(TEXT_169); if (!genPackage.isLoadedInitialization()) { - stringBuffer.append(TEXT_168); + stringBuffer.append(TEXT_170); stringBuffer.append(genPackage.getBasicPackageName()); - stringBuffer.append(TEXT_169); + stringBuffer.append(TEXT_171); } for (GenPackage interdep : genPackage.getPackageBuildInterDependencies()) { - stringBuffer.append(TEXT_170); + stringBuffer.append(TEXT_172); stringBuffer.append(genPackage.getPackageInstanceVariable(interdep)); - stringBuffer.append(TEXT_171); + stringBuffer.append(TEXT_173); } - stringBuffer.append(TEXT_172); + stringBuffer.append(TEXT_174); } if (genPackage.isLoadedInitialization() || !genPackage.getPackageLoadInterDependencies().isEmpty()) { - stringBuffer.append(TEXT_173); + stringBuffer.append(TEXT_175); if (genPackage.isLoadedInitialization()) { - stringBuffer.append(TEXT_174); + stringBuffer.append(TEXT_176); stringBuffer.append(genPackage.getBasicPackageName()); - stringBuffer.append(TEXT_175); + stringBuffer.append(TEXT_177); } for (GenPackage interdep : genPackage.getPackageLoadInterDependencies()) { - stringBuffer.append(TEXT_176); + stringBuffer.append(TEXT_178); stringBuffer.append(genPackage.getPackageInstanceVariable(interdep)); - stringBuffer.append(TEXT_177); + stringBuffer.append(TEXT_179); } - stringBuffer.append(TEXT_178); + stringBuffer.append(TEXT_180); } if (genPackage.hasConstraints()) { - stringBuffer.append(TEXT_179); - stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EValidator")); - stringBuffer.append(TEXT_180); - stringBuffer.append(genPackage.getBasicPackageName()); stringBuffer.append(TEXT_181); stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EValidator")); stringBuffer.append(TEXT_182); - stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EValidator")); + stringBuffer.append(genPackage.getBasicPackageName()); stringBuffer.append(TEXT_183); - stringBuffer.append(genPackage.getImportedValidatorClassName()); + stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EValidator")); stringBuffer.append(TEXT_184); - } - if (!genPackage.isEcorePackage()) { + stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EValidator")); stringBuffer.append(TEXT_185); - stringBuffer.append(genPackage.getBasicPackageName()); + stringBuffer.append(genPackage.getImportedValidatorClassName()); stringBuffer.append(TEXT_186); } + if (!genPackage.isEcorePackage()) { stringBuffer.append(TEXT_187); - stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EPackage")); + stringBuffer.append(genPackage.getBasicPackageName()); stringBuffer.append(TEXT_188); - stringBuffer.append(genPackage.getImportedPackageInterfaceName()); + } stringBuffer.append(TEXT_189); - stringBuffer.append(genPackage.getBasicPackageName()); + stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EPackage")); stringBuffer.append(TEXT_190); - stringBuffer.append(genPackage.getBasicPackageName()); + stringBuffer.append(genPackage.getImportedPackageInterfaceName()); stringBuffer.append(TEXT_191); - if (genModel.getRuntimePlatform() == GenRuntimePlatform.GWT) { + stringBuffer.append(genPackage.getBasicPackageName()); stringBuffer.append(TEXT_192); + stringBuffer.append(genPackage.getBasicPackageName()); + stringBuffer.append(TEXT_193); + if (genModel.getRuntimePlatform() == GenRuntimePlatform.GWT) { + stringBuffer.append(TEXT_194); Set<String> helpers = new HashSet<String>(); for (GenClassifier genClassifier : genPackage.getGenClassifiers()) { if (genClassifier instanceof GenClass) { GenClass genClass = (GenClass)genClassifier; if (!genClass.isDynamic()) { String theClass = genClass.isMapEntry() ? genClass.getImportedClassName() : genClass.getRawImportedInterfaceName(); if (helpers.add(theClass)) { - stringBuffer.append(TEXT_193); - stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.Reflect")); - stringBuffer.append(TEXT_194); - stringBuffer.append(theClass); stringBuffer.append(TEXT_195); stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.Reflect")); stringBuffer.append(TEXT_196); - stringBuffer.append(genClass.isMapEntry() ? genClass.getImportedClassName() : genClass.getRawImportedInterfaceName() + genClass.getInterfaceWildTypeArguments()); - stringBuffer.append(TEXT_197); stringBuffer.append(theClass); + stringBuffer.append(TEXT_197); + stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.Reflect")); stringBuffer.append(TEXT_198); + stringBuffer.append(genClass.isMapEntry() ? genClass.getImportedClassName() : genClass.getRawImportedInterfaceName() + genClass.getInterfaceWildTypeArguments()); + stringBuffer.append(TEXT_199); + stringBuffer.append(theClass); + stringBuffer.append(TEXT_200); }} } else if (genClassifier instanceof GenDataType) { GenDataType genDataType = (GenDataType)genClassifier; if (!genDataType.isPrimitiveType() && !genDataType.isObjectType()) { String theClass = genDataType.getRawImportedInstanceClassName(); if (helpers.add(theClass)) { - stringBuffer.append(TEXT_199); - stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.Reflect")); - stringBuffer.append(TEXT_200); - stringBuffer.append(theClass); stringBuffer.append(TEXT_201); stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.Reflect")); stringBuffer.append(TEXT_202); stringBuffer.append(theClass); stringBuffer.append(TEXT_203); - if (genDataType.isArrayType()) { String componentType = theClass; String indices = ""; while(componentType.endsWith("[]")) { componentType = componentType.substring(0, componentType.length() - 2); indices += "[]";} + stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.Reflect")); stringBuffer.append(TEXT_204); - stringBuffer.append(componentType); + stringBuffer.append(theClass); stringBuffer.append(TEXT_205); - stringBuffer.append(indices); + if (genDataType.isArrayType()) { String componentType = theClass; String indices = ""; while(componentType.endsWith("[]")) { componentType = componentType.substring(0, componentType.length() - 2); indices += "[]";} stringBuffer.append(TEXT_206); - } else { + stringBuffer.append(componentType); stringBuffer.append(TEXT_207); - stringBuffer.append(theClass); + stringBuffer.append(indices); stringBuffer.append(TEXT_208); - } + } else { stringBuffer.append(TEXT_209); + stringBuffer.append(theClass); + stringBuffer.append(TEXT_210); + } + stringBuffer.append(TEXT_211); }} } } - stringBuffer.append(TEXT_210); + stringBuffer.append(TEXT_212); stringBuffer.append(genModel.getImportedName("com.google.gwt.user.client.rpc.IsSerializable")); - stringBuffer.append(TEXT_211); + stringBuffer.append(TEXT_213); for (GenClassifier genClassifier : genPackage.getGenClassifiers()) { if (genClassifier instanceof GenClass) { GenClass genClass = (GenClass)genClassifier; if (!genClass.isDynamic()) { - stringBuffer.append(TEXT_212); + stringBuffer.append(TEXT_214); stringBuffer.append(genClass.isMapEntry() ? genClass.getImportedClassName() : genClass.getImportedWildcardInstanceClassName()); - stringBuffer.append(TEXT_213); + stringBuffer.append(TEXT_215); stringBuffer.append(genClass.getSafeUncapName()); - stringBuffer.append(TEXT_214); + stringBuffer.append(TEXT_216); } } else if (genClassifier instanceof GenDataType) { GenDataType genDataType = (GenDataType)genClassifier; if (!genDataType.isObjectType() && genDataType.isSerializable()) { - stringBuffer.append(TEXT_215); + stringBuffer.append(TEXT_217); stringBuffer.append(genDataType.getImportedWildcardInstanceClassName()); - stringBuffer.append(TEXT_216); + stringBuffer.append(TEXT_218); stringBuffer.append(genDataType.getSafeUncapName()); - stringBuffer.append(TEXT_217); + stringBuffer.append(TEXT_219); } } } - stringBuffer.append(TEXT_218); + stringBuffer.append(TEXT_220); } - stringBuffer.append(TEXT_219); + stringBuffer.append(TEXT_221); } if (isInterface) { // TODO REMOVE THIS BOGUS EMPTY LINE - stringBuffer.append(TEXT_220); + stringBuffer.append(TEXT_222); } for (GenClassifier genClassifier : genPackage.getGenClassifiers()) { if (isInterface) { - stringBuffer.append(TEXT_221); + stringBuffer.append(TEXT_223); if (genClassifier instanceof GenClass) { GenClass genClass = (GenClass)genClassifier; - stringBuffer.append(TEXT_222); + stringBuffer.append(TEXT_224); stringBuffer.append(genClass.getQualifiedInterfaceName()); - stringBuffer.append(TEXT_223); + stringBuffer.append(TEXT_225); stringBuffer.append(genClass.getFormattedName()); - stringBuffer.append(TEXT_224); + stringBuffer.append(TEXT_226); stringBuffer.append(genClass.getFormattedName()); - stringBuffer.append(TEXT_225); + stringBuffer.append(TEXT_227); 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_226); + stringBuffer.append(TEXT_228); stringBuffer.append(modelInfo); } else { - stringBuffer.append(TEXT_227); + stringBuffer.append(TEXT_229); stringBuffer.append(modelInfo); }} if (first) { - stringBuffer.append(TEXT_228); + stringBuffer.append(TEXT_230); }} } else if (genClassifier instanceof GenEnum) { GenEnum genEnum = (GenEnum)genClassifier; - stringBuffer.append(TEXT_229); + stringBuffer.append(TEXT_231); stringBuffer.append(genEnum.getQualifiedName()); - stringBuffer.append(TEXT_230); + stringBuffer.append(TEXT_232); stringBuffer.append(genEnum.getFormattedName()); - stringBuffer.append(TEXT_231); + stringBuffer.append(TEXT_233); stringBuffer.append(genEnum.getFormattedName()); - stringBuffer.append(TEXT_232); + stringBuffer.append(TEXT_234); stringBuffer.append(genEnum.getQualifiedName()); } else if (genClassifier instanceof GenDataType) { GenDataType genDataType = (GenDataType)genClassifier; if (genDataType.isPrimitiveType() || genDataType.isArrayType()) { - stringBuffer.append(TEXT_233); + stringBuffer.append(TEXT_235); stringBuffer.append(genDataType.getFormattedName()); - stringBuffer.append(TEXT_234); + stringBuffer.append(TEXT_236); } else { - stringBuffer.append(TEXT_235); + stringBuffer.append(TEXT_237); stringBuffer.append(genDataType.getRawInstanceClassName()); - stringBuffer.append(TEXT_236); + stringBuffer.append(TEXT_238); stringBuffer.append(genDataType.getFormattedName()); - stringBuffer.append(TEXT_237); + stringBuffer.append(TEXT_239); } - stringBuffer.append(TEXT_238); + stringBuffer.append(TEXT_240); if (genDataType.hasDocumentation()) { - stringBuffer.append(TEXT_239); + stringBuffer.append(TEXT_241); stringBuffer.append(genDataType.getDocumentation(genModel.getIndentation(stringBuffer))); - stringBuffer.append(TEXT_240); + stringBuffer.append(TEXT_242); } - stringBuffer.append(TEXT_241); + stringBuffer.append(TEXT_243); stringBuffer.append(genDataType.getFormattedName()); - stringBuffer.append(TEXT_242); + stringBuffer.append(TEXT_244); if (!genDataType.isPrimitiveType() && !genDataType.isArrayType()) { - stringBuffer.append(TEXT_243); + stringBuffer.append(TEXT_245); 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_244); + stringBuffer.append(TEXT_246); stringBuffer.append(modelInfo); } else { - stringBuffer.append(TEXT_245); + stringBuffer.append(TEXT_247); stringBuffer.append(modelInfo); }} if (first) { - stringBuffer.append(TEXT_246); + stringBuffer.append(TEXT_248); }} } if ((genClassifier instanceof GenClass || genClassifier instanceof GenEnum) && genClassifier.hasAPITags()) { - stringBuffer.append(TEXT_247); + stringBuffer.append(TEXT_249); stringBuffer.append(genClassifier.getAPITags(genModel.getIndentation(stringBuffer))); } - stringBuffer.append(TEXT_248); + stringBuffer.append(TEXT_250); } else { - stringBuffer.append(TEXT_249); + stringBuffer.append(TEXT_251); if (genClassifier.hasAPITags()) { - stringBuffer.append(TEXT_250); + stringBuffer.append(TEXT_252); stringBuffer.append(genClassifier.getAPITags(genModel.getIndentation(stringBuffer))); } - stringBuffer.append(TEXT_251); + stringBuffer.append(TEXT_253); } if (isJDK50 && genClassifier.hasAPIDeprecatedTag()) { - stringBuffer.append(TEXT_252); + stringBuffer.append(TEXT_254); } if (isImplementation) { - stringBuffer.append(TEXT_253); + stringBuffer.append(TEXT_255); stringBuffer.append(genClassifier.getImportedMetaType()); - stringBuffer.append(TEXT_254); + stringBuffer.append(TEXT_256); stringBuffer.append(genClassifier.getClassifierAccessorName()); - stringBuffer.append(TEXT_255); + stringBuffer.append(TEXT_257); if (genPackage.isLoadedInitialization()) { - stringBuffer.append(TEXT_256); + stringBuffer.append(TEXT_258); stringBuffer.append(genClassifier.getClassifierInstanceName()); - stringBuffer.append(TEXT_257); + stringBuffer.append(TEXT_259); stringBuffer.append(genClassifier.getClassifierInstanceName()); - stringBuffer.append(TEXT_258); + stringBuffer.append(TEXT_260); stringBuffer.append(genClassifier.getImportedMetaType()); - stringBuffer.append(TEXT_259); + stringBuffer.append(TEXT_261); stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EPackage")); - stringBuffer.append(TEXT_260); + stringBuffer.append(TEXT_262); stringBuffer.append(genPackage.getImportedPackageInterfaceName()); - stringBuffer.append(TEXT_261); + stringBuffer.append(TEXT_263); stringBuffer.append(genPackage.getLocalClassifierIndex(genClassifier)); - stringBuffer.append(TEXT_262); + stringBuffer.append(TEXT_264); } - stringBuffer.append(TEXT_263); + stringBuffer.append(TEXT_265); stringBuffer.append(genClassifier.getClassifierInstanceName()); - stringBuffer.append(TEXT_264); + stringBuffer.append(TEXT_266); } else { - stringBuffer.append(TEXT_265); + stringBuffer.append(TEXT_267); stringBuffer.append(genClassifier.getImportedMetaType()); - stringBuffer.append(TEXT_266); + stringBuffer.append(TEXT_268); stringBuffer.append(genClassifier.getClassifierAccessorName()); - stringBuffer.append(TEXT_267); + stringBuffer.append(TEXT_269); } if (genClassifier instanceof GenClass) { GenClass genClass = (GenClass)genClassifier; for (GenFeature genFeature : genClass.getGenFeatures()) { if (isInterface) { - stringBuffer.append(TEXT_268); + stringBuffer.append(TEXT_270); stringBuffer.append(genFeature.getFeatureKind()); - stringBuffer.append(TEXT_269); + stringBuffer.append(TEXT_271); stringBuffer.append(genClass.getQualifiedInterfaceName()); if (!genClass.isMapEntry() && !genFeature.isSuppressedGetVisibility()) { - stringBuffer.append(TEXT_270); + stringBuffer.append(TEXT_272); stringBuffer.append(genFeature.getGetAccessor()); } - stringBuffer.append(TEXT_271); - stringBuffer.append(genFeature.getFormattedName()); - stringBuffer.append(TEXT_272); - stringBuffer.append(genFeature.getFeatureKind()); stringBuffer.append(TEXT_273); stringBuffer.append(genFeature.getFormattedName()); stringBuffer.append(TEXT_274); + stringBuffer.append(genFeature.getFeatureKind()); + stringBuffer.append(TEXT_275); + stringBuffer.append(genFeature.getFormattedName()); + stringBuffer.append(TEXT_276); stringBuffer.append(genClass.getQualifiedInterfaceName()); if (!genClass.isMapEntry() && !genFeature.isSuppressedGetVisibility()) { - stringBuffer.append(TEXT_275); + stringBuffer.append(TEXT_277); stringBuffer.append(genFeature.getGetAccessor()); - stringBuffer.append(TEXT_276); + stringBuffer.append(TEXT_278); } - stringBuffer.append(TEXT_277); + stringBuffer.append(TEXT_279); stringBuffer.append(genClass.getClassifierAccessorName()); - stringBuffer.append(TEXT_278); + stringBuffer.append(TEXT_280); if (genFeature.hasImplicitAPITags()) { - stringBuffer.append(TEXT_279); + stringBuffer.append(TEXT_281); stringBuffer.append(genFeature.getImplicitAPITags(genModel.getIndentation(stringBuffer))); } - stringBuffer.append(TEXT_280); + stringBuffer.append(TEXT_282); } else { - stringBuffer.append(TEXT_281); + stringBuffer.append(TEXT_283); if (genFeature.hasImplicitAPITags()) { - stringBuffer.append(TEXT_282); + stringBuffer.append(TEXT_284); stringBuffer.append(genFeature.getImplicitAPITags(genModel.getIndentation(stringBuffer))); } - stringBuffer.append(TEXT_283); + stringBuffer.append(TEXT_285); } if (isJDK50 && genFeature.hasImplicitAPIDeprecatedTag()) { - stringBuffer.append(TEXT_284); + stringBuffer.append(TEXT_286); } if (isImplementation) { - stringBuffer.append(TEXT_285); + stringBuffer.append(TEXT_287); stringBuffer.append(genFeature.getImportedMetaType()); - stringBuffer.append(TEXT_286); + stringBuffer.append(TEXT_288); stringBuffer.append(genFeature.getFeatureAccessorName()); - stringBuffer.append(TEXT_287); + stringBuffer.append(TEXT_289); if (!genPackage.isLoadedInitialization()) { - stringBuffer.append(TEXT_288); + stringBuffer.append(TEXT_290); stringBuffer.append(genFeature.getImportedMetaType()); - stringBuffer.append(TEXT_289); + stringBuffer.append(TEXT_291); stringBuffer.append(genClass.getClassifierInstanceName()); - stringBuffer.append(TEXT_290); + stringBuffer.append(TEXT_292); stringBuffer.append(genClass.getLocalFeatureIndex(genFeature)); - stringBuffer.append(TEXT_291); + stringBuffer.append(TEXT_293); } else { - stringBuffer.append(TEXT_292); + stringBuffer.append(TEXT_294); stringBuffer.append(genFeature.getImportedMetaType()); - stringBuffer.append(TEXT_293); + stringBuffer.append(TEXT_295); stringBuffer.append(genClassifier.getClassifierAccessorName()); - stringBuffer.append(TEXT_294); + stringBuffer.append(TEXT_296); stringBuffer.append(genClass.getLocalFeatureIndex(genFeature)); - stringBuffer.append(TEXT_295); + stringBuffer.append(TEXT_297); } - stringBuffer.append(TEXT_296); + stringBuffer.append(TEXT_298); } else { - stringBuffer.append(TEXT_297); + stringBuffer.append(TEXT_299); stringBuffer.append(genFeature.getImportedMetaType()); - stringBuffer.append(TEXT_298); + stringBuffer.append(TEXT_300); stringBuffer.append(genFeature.getFeatureAccessorName()); - stringBuffer.append(TEXT_299); + stringBuffer.append(TEXT_301); } - stringBuffer.append(TEXT_300); + stringBuffer.append(TEXT_302); } if (genModel.isOperationReflection()) { for (GenOperation genOperation : genClass.getGenOperations()) { if (isInterface) { - stringBuffer.append(TEXT_301); + stringBuffer.append(TEXT_303); stringBuffer.append(genClass.getQualifiedInterfaceName()); - stringBuffer.append(TEXT_302); + stringBuffer.append(TEXT_304); stringBuffer.append(genOperation.getName()); - stringBuffer.append(TEXT_303); + stringBuffer.append(TEXT_305); stringBuffer.append(genOperation.getParameterTypes(", ")); - stringBuffer.append(TEXT_304); + stringBuffer.append(TEXT_306); stringBuffer.append(genOperation.getFormattedName()); - stringBuffer.append(TEXT_305); + stringBuffer.append(TEXT_307); stringBuffer.append(genOperation.getFormattedName()); - stringBuffer.append(TEXT_306); + stringBuffer.append(TEXT_308); stringBuffer.append(genClass.getQualifiedInterfaceName()); - stringBuffer.append(TEXT_307); + stringBuffer.append(TEXT_309); stringBuffer.append(genOperation.getName()); - stringBuffer.append(TEXT_308); + stringBuffer.append(TEXT_310); stringBuffer.append(genOperation.getParameterTypes(", ")); - stringBuffer.append(TEXT_309); + stringBuffer.append(TEXT_311); if (genOperation.hasImplicitAPITags()) { - stringBuffer.append(TEXT_310); + stringBuffer.append(TEXT_312); stringBuffer.append(genOperation.getImplicitAPITags(genModel.getIndentation(stringBuffer))); } - stringBuffer.append(TEXT_311); + stringBuffer.append(TEXT_313); } else { - stringBuffer.append(TEXT_312); + stringBuffer.append(TEXT_314); if (genOperation.hasImplicitAPITags()) { - stringBuffer.append(TEXT_313); + stringBuffer.append(TEXT_315); stringBuffer.append(genOperation.getImplicitAPITags(genModel.getIndentation(stringBuffer))); } - stringBuffer.append(TEXT_314); + stringBuffer.append(TEXT_316); } if (isJDK50 && genOperation.hasImplicitAPIDeprecatedTag()) { - stringBuffer.append(TEXT_315); + stringBuffer.append(TEXT_317); } if (isImplementation) { - stringBuffer.append(TEXT_316); + stringBuffer.append(TEXT_318); stringBuffer.append(genOperation.getImportedMetaType()); - stringBuffer.append(TEXT_317); + stringBuffer.append(TEXT_319); stringBuffer.append(genOperation.getOperationAccessorName()); - stringBuffer.append(TEXT_318); + stringBuffer.append(TEXT_320); if (!genPackage.isLoadedInitialization()) { - stringBuffer.append(TEXT_319); + stringBuffer.append(TEXT_321); stringBuffer.append(genClass.getClassifierInstanceName()); - stringBuffer.append(TEXT_320); + stringBuffer.append(TEXT_322); stringBuffer.append(genClass.getLocalOperationIndex(genOperation)); - stringBuffer.append(TEXT_321); + stringBuffer.append(TEXT_323); } else { - stringBuffer.append(TEXT_322); + stringBuffer.append(TEXT_324); stringBuffer.append(genClassifier.getClassifierAccessorName()); - stringBuffer.append(TEXT_323); + stringBuffer.append(TEXT_325); stringBuffer.append(genClass.getLocalOperationIndex(genOperation)); - stringBuffer.append(TEXT_324); + stringBuffer.append(TEXT_326); } - stringBuffer.append(TEXT_325); + stringBuffer.append(TEXT_327); } else { - stringBuffer.append(TEXT_326); + stringBuffer.append(TEXT_328); stringBuffer.append(genOperation.getImportedMetaType()); - stringBuffer.append(TEXT_327); + stringBuffer.append(TEXT_329); stringBuffer.append(genOperation.getOperationAccessorName()); - stringBuffer.append(TEXT_328); + stringBuffer.append(TEXT_330); } - stringBuffer.append(TEXT_329); + stringBuffer.append(TEXT_331); } } } } if (isInterface) { - stringBuffer.append(TEXT_330); + stringBuffer.append(TEXT_332); } else { - stringBuffer.append(TEXT_331); + stringBuffer.append(TEXT_333); } if (isImplementation) { - stringBuffer.append(TEXT_332); - stringBuffer.append(genPackage.getImportedFactoryInterfaceName()); - stringBuffer.append(TEXT_333); - stringBuffer.append(genPackage.getFactoryName()); stringBuffer.append(TEXT_334); stringBuffer.append(genPackage.getImportedFactoryInterfaceName()); stringBuffer.append(TEXT_335); - } else { + stringBuffer.append(genPackage.getFactoryName()); stringBuffer.append(TEXT_336); - stringBuffer.append(genPackage.getFactoryInterfaceName()); + stringBuffer.append(genPackage.getImportedFactoryInterfaceName()); stringBuffer.append(TEXT_337); - stringBuffer.append(genPackage.getFactoryName()); + } else { stringBuffer.append(TEXT_338); - } + stringBuffer.append(genPackage.getFactoryInterfaceName()); stringBuffer.append(TEXT_339); + stringBuffer.append(genPackage.getFactoryName()); + stringBuffer.append(TEXT_340); + } + stringBuffer.append(TEXT_341); if (isImplementation) { if (!genPackage.isLoadedInitialization()) { - stringBuffer.append(TEXT_340); + stringBuffer.append(TEXT_342); {boolean needsSuppressDeprecation = false; if (!packageNeedsSuppressDeprecation && isJDK50) { LOOP: for (GenClass genClass : genPackage.getGenClasses()) { for (GenFeature genFeature : genClass.getGenFeatures()) { if (genFeature.hasAPIDeprecatedTag()) { needsSuppressDeprecation = true; break LOOP; }} for (GenOperation genOperation : genClass.getGenOperations()) { if (genOperation.hasAPIDeprecatedTag()) { needsSuppressDeprecation = true; break LOOP; }}} if (needsSuppressDeprecation) { - stringBuffer.append(TEXT_341); + stringBuffer.append(TEXT_343); }}} - stringBuffer.append(TEXT_342); + stringBuffer.append(TEXT_344); if (!genPackage.getGenClasses().isEmpty()) { - stringBuffer.append(TEXT_343); + stringBuffer.append(TEXT_345); for (Iterator<GenClass> c=genPackage.getGenClasses().iterator(); c.hasNext();) { GenClass genClass = c.next(); - stringBuffer.append(TEXT_344); + stringBuffer.append(TEXT_346); stringBuffer.append(genClass.getClassifierInstanceName()); - stringBuffer.append(TEXT_345); + stringBuffer.append(TEXT_347); stringBuffer.append(genClass.getMetaType()); - stringBuffer.append(TEXT_346); + stringBuffer.append(TEXT_348); stringBuffer.append(genClass.getClassifierID()); - stringBuffer.append(TEXT_347); + stringBuffer.append(TEXT_349); for (GenFeature genFeature : genClass.getGenFeatures()) { - stringBuffer.append(TEXT_348); + stringBuffer.append(TEXT_350); stringBuffer.append(genFeature.getMetaType()); - stringBuffer.append(TEXT_349); + stringBuffer.append(TEXT_351); stringBuffer.append(genClass.getClassifierInstanceName()); - stringBuffer.append(TEXT_350); + stringBuffer.append(TEXT_352); stringBuffer.append(genClass.getFeatureID(genFeature)); - stringBuffer.append(TEXT_351); + stringBuffer.append(TEXT_353); } if (genModel.isOperationReflection()) { for (GenOperation genOperation : genClass.getGenOperations()) { - stringBuffer.append(TEXT_352); + stringBuffer.append(TEXT_354); stringBuffer.append(genClass.getClassifierInstanceName()); - stringBuffer.append(TEXT_353); + stringBuffer.append(TEXT_355); stringBuffer.append(genClass.getOperationID(genOperation, false)); - stringBuffer.append(TEXT_354); + stringBuffer.append(TEXT_356); } } if (c.hasNext()) { - stringBuffer.append(TEXT_355); + stringBuffer.append(TEXT_357); } } } if (!genPackage.getGenEnums().isEmpty()) { - stringBuffer.append(TEXT_356); + stringBuffer.append(TEXT_358); for (GenEnum genEnum : genPackage.getGenEnums()) { - stringBuffer.append(TEXT_357); + stringBuffer.append(TEXT_359); stringBuffer.append(genEnum.getClassifierInstanceName()); - stringBuffer.append(TEXT_358); + stringBuffer.append(TEXT_360); stringBuffer.append(genEnum.getClassifierID()); - stringBuffer.append(TEXT_359); + stringBuffer.append(TEXT_361); } } if (!genPackage.getGenDataTypes().isEmpty()) { - stringBuffer.append(TEXT_360); + stringBuffer.append(TEXT_362); for (GenDataType genDataType : genPackage.getGenDataTypes()) { - stringBuffer.append(TEXT_361); + stringBuffer.append(TEXT_363); stringBuffer.append(genDataType.getClassifierInstanceName()); - stringBuffer.append(TEXT_362); + stringBuffer.append(TEXT_364); stringBuffer.append(genDataType.getClassifierID()); - stringBuffer.append(TEXT_363); + stringBuffer.append(TEXT_365); } } - stringBuffer.append(TEXT_364); + stringBuffer.append(TEXT_366); /////////////////////// class Information @@ -1723,164 +1729,164 @@ class InformationIterator /////////////////////// int maxGenericTypeAssignment = 0; - stringBuffer.append(TEXT_365); - {boolean needsSuppressDeprecation = false; if (!packageNeedsSuppressDeprecation && isJDK50) { LOOP: for (GenEnum genEnum : genPackage.getGenEnums()) { for (GenEnumLiteral genEnumLiteral : genEnum.getGenEnumLiterals()) { if (genEnumLiteral.hasAPIDeprecatedTag()) { needsSuppressDeprecation = true; break LOOP; }}} if (needsSuppressDeprecation) { - stringBuffer.append(TEXT_366); - }}} stringBuffer.append(TEXT_367); - if (!genPackage.getPackageInitializationDependencies().isEmpty()) { + {boolean needsSuppressDeprecation = false; if (!packageNeedsSuppressDeprecation && isJDK50) { LOOP: for (GenEnum genEnum : genPackage.getGenEnums()) { for (GenEnumLiteral genEnumLiteral : genEnum.getGenEnumLiterals()) { if (genEnumLiteral.hasAPIDeprecatedTag()) { needsSuppressDeprecation = true; break LOOP; }}} if (needsSuppressDeprecation) { stringBuffer.append(TEXT_368); - for (GenPackage dep : genPackage.getPackageInitializationDependencies()) { + }}} stringBuffer.append(TEXT_369); - stringBuffer.append(dep.getImportedPackageInterfaceName()); + if (!genPackage.getPackageInitializationDependencies().isEmpty()) { stringBuffer.append(TEXT_370); - stringBuffer.append(genPackage.getPackageInstanceVariable(dep)); + for (GenPackage dep : genPackage.getPackageInitializationDependencies()) { stringBuffer.append(TEXT_371); stringBuffer.append(dep.getImportedPackageInterfaceName()); stringBuffer.append(TEXT_372); - stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EPackage")); + stringBuffer.append(genPackage.getPackageInstanceVariable(dep)); stringBuffer.append(TEXT_373); stringBuffer.append(dep.getImportedPackageInterfaceName()); stringBuffer.append(TEXT_374); + stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EPackage")); + stringBuffer.append(TEXT_375); + stringBuffer.append(dep.getImportedPackageInterfaceName()); + stringBuffer.append(TEXT_376); } } if (!genPackage.getSubGenPackages().isEmpty()) { - stringBuffer.append(TEXT_375); + stringBuffer.append(TEXT_377); for (GenPackage sub : genPackage.getSubGenPackages()) { - stringBuffer.append(TEXT_376); + stringBuffer.append(TEXT_378); stringBuffer.append(genPackage.getPackageInstanceVariable(sub)); - stringBuffer.append(TEXT_377); + stringBuffer.append(TEXT_379); } } if (!genPackage.getGenClasses().isEmpty()) { boolean firstOperationAssignment = true; int maxTypeParameterAssignment = 0; if (genModel.useGenerics()) { - stringBuffer.append(TEXT_378); + stringBuffer.append(TEXT_380); for (GenClassifier genClassifier : genPackage.getGenClassifiers()) { for (GenTypeParameter genTypeParameter : genClassifier.getGenTypeParameters()) { if (!genTypeParameter.getEcoreTypeParameter().getEBounds().isEmpty() || genTypeParameter.isUsed()) { - stringBuffer.append(TEXT_379); - stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.ETypeParameter")); - stringBuffer.append(TEXT_380); - stringBuffer.append(genClassifier.getClassifierInstanceName()); stringBuffer.append(TEXT_381); - stringBuffer.append(genTypeParameter.getName()); + stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.ETypeParameter")); stringBuffer.append(TEXT_382); stringBuffer.append(genClassifier.getClassifierInstanceName()); stringBuffer.append(TEXT_383); stringBuffer.append(genTypeParameter.getName()); stringBuffer.append(TEXT_384); + stringBuffer.append(genClassifier.getClassifierInstanceName()); + stringBuffer.append(TEXT_385); + stringBuffer.append(genTypeParameter.getName()); + stringBuffer.append(TEXT_386); stringBuffer.append(genModel.getNonNLS()); } else { - stringBuffer.append(TEXT_385); + stringBuffer.append(TEXT_387); stringBuffer.append(genClassifier.getClassifierInstanceName()); - stringBuffer.append(TEXT_386); + stringBuffer.append(TEXT_388); stringBuffer.append(genTypeParameter.getName()); - stringBuffer.append(TEXT_387); + stringBuffer.append(TEXT_389); stringBuffer.append(genModel.getNonNLS()); } } } } if (genModel.useGenerics()) { - stringBuffer.append(TEXT_388); + stringBuffer.append(TEXT_390); 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_389); + stringBuffer.append(TEXT_391); stringBuffer.append(prefix); - stringBuffer.append(TEXT_390); + stringBuffer.append(TEXT_392); stringBuffer.append(info.depth + 1); - stringBuffer.append(TEXT_391); + stringBuffer.append(TEXT_393); stringBuffer.append(info.type); - stringBuffer.append(TEXT_392); + stringBuffer.append(TEXT_394); if (info.depth > 0) { - stringBuffer.append(TEXT_393); + stringBuffer.append(TEXT_395); stringBuffer.append(info.depth); - stringBuffer.append(TEXT_394); + stringBuffer.append(TEXT_396); stringBuffer.append(info.accessor); - stringBuffer.append(TEXT_395); + stringBuffer.append(TEXT_397); stringBuffer.append(info.depth + 1); - stringBuffer.append(TEXT_396); + stringBuffer.append(TEXT_398); } } - stringBuffer.append(TEXT_397); + stringBuffer.append(TEXT_399); stringBuffer.append(genClassifier.getClassifierInstanceName()); - stringBuffer.append(TEXT_398); + stringBuffer.append(TEXT_400); stringBuffer.append(genTypeParameter.getName()); - stringBuffer.append(TEXT_399); + stringBuffer.append(TEXT_401); } } } } - stringBuffer.append(TEXT_400); + stringBuffer.append(TEXT_402); for (GenClass genClass : genPackage.getGenClasses()) { if (!genClass.hasGenericSuperTypes()) { for (GenClass baseGenClass : genClass.getBaseGenClasses()) { - stringBuffer.append(TEXT_401); + stringBuffer.append(TEXT_403); stringBuffer.append(genClass.getClassifierInstanceName()); - stringBuffer.append(TEXT_402); + stringBuffer.append(TEXT_404); stringBuffer.append(genPackage.getPackageInstanceVariable(baseGenClass.getGenPackage())); - stringBuffer.append(TEXT_403); + stringBuffer.append(TEXT_405); stringBuffer.append(baseGenClass.getClassifierAccessorName()); - stringBuffer.append(TEXT_404); + stringBuffer.append(TEXT_406); } } 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_405); + stringBuffer.append(TEXT_407); stringBuffer.append(prefix); - stringBuffer.append(TEXT_406); + stringBuffer.append(TEXT_408); stringBuffer.append(info.depth + 1); - stringBuffer.append(TEXT_407); + stringBuffer.append(TEXT_409); stringBuffer.append(info.type); - stringBuffer.append(TEXT_408); + stringBuffer.append(TEXT_410); if (info.depth > 0) { - stringBuffer.append(TEXT_409); + stringBuffer.append(TEXT_411); stringBuffer.append(info.depth); - stringBuffer.append(TEXT_410); + stringBuffer.append(TEXT_412); stringBuffer.append(info.accessor); - stringBuffer.append(TEXT_411); + stringBuffer.append(TEXT_413); stringBuffer.append(info.depth + 1); - stringBuffer.append(TEXT_412); + stringBuffer.append(TEXT_414); } } - stringBuffer.append(TEXT_413); + stringBuffer.append(TEXT_415); stringBuffer.append(genClass.getClassifierInstanceName()); - stringBuffer.append(TEXT_414); + stringBuffer.append(TEXT_416); } } } - stringBuffer.append(TEXT_415); + stringBuffer.append(TEXT_417); if (genModel.isOperationReflection()) { - stringBuffer.append(TEXT_416); + stringBuffer.append(TEXT_418); } else { - stringBuffer.append(TEXT_417); + stringBuffer.append(TEXT_419); } 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_418); + stringBuffer.append(TEXT_420); stringBuffer.append(genClass.getClassifierInstanceName()); - stringBuffer.append(TEXT_419); + stringBuffer.append(TEXT_421); if (genClass.isDynamic()) { - stringBuffer.append(TEXT_420); + stringBuffer.append(TEXT_422); } else { stringBuffer.append(genClass.getRawImportedInterfaceName()); - stringBuffer.append(TEXT_421); + stringBuffer.append(TEXT_423); } - stringBuffer.append(TEXT_422); + stringBuffer.append(TEXT_424); stringBuffer.append(genClass.getName()); - stringBuffer.append(TEXT_423); + stringBuffer.append(TEXT_425); stringBuffer.append(genClass.getAbstractFlag()); - stringBuffer.append(TEXT_424); + stringBuffer.append(TEXT_426); stringBuffer.append(genClass.getInterfaceFlag()); - stringBuffer.append(TEXT_425); + stringBuffer.append(TEXT_427); stringBuffer.append(genClass.getGeneratedInstanceClassFlag()); if (hasInstanceTypeName) { - stringBuffer.append(TEXT_426); + stringBuffer.append(TEXT_428); stringBuffer.append(genClass.getEcoreClass().getInstanceTypeName()); - stringBuffer.append(TEXT_427); + stringBuffer.append(TEXT_429); } - stringBuffer.append(TEXT_428); + stringBuffer.append(TEXT_430); stringBuffer.append(genModel.getNonNLS()); if (hasInstanceTypeName) { stringBuffer.append(genModel.getNonNLS(2)); @@ -1888,446 +1894,446 @@ int maxGenericTypeAssignment = 0; 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_429); + stringBuffer.append(TEXT_431); stringBuffer.append(prefix); - stringBuffer.append(TEXT_430); + stringBuffer.append(TEXT_432); stringBuffer.append(info.depth + 1); - stringBuffer.append(TEXT_431); + stringBuffer.append(TEXT_433); stringBuffer.append(info.type); - stringBuffer.append(TEXT_432); + stringBuffer.append(TEXT_434); if (info.depth > 0) { - stringBuffer.append(TEXT_433); + stringBuffer.append(TEXT_435); stringBuffer.append(info.depth); - stringBuffer.append(TEXT_434); + stringBuffer.append(TEXT_436); stringBuffer.append(info.accessor); - stringBuffer.append(TEXT_435); + stringBuffer.append(TEXT_437); stringBuffer.append(info.depth + 1); - stringBuffer.append(TEXT_436); + stringBuffer.append(TEXT_438); } } } if (genFeature.isReferenceType()) { GenFeature reverseGenFeature = genFeature.getReverse(); String reverse = reverseGenFeature == null ? "null" : genPackage.getPackageInstanceVariable(reverseGenFeature.getGenPackage()) + ".get" + reverseGenFeature.getFeatureAccessorName() + "()"; - stringBuffer.append(TEXT_437); + stringBuffer.append(TEXT_439); stringBuffer.append(genFeature.getFeatureAccessorName()); - stringBuffer.append(TEXT_438); + stringBuffer.append(TEXT_440); if (genFeature.hasGenericType()) { - stringBuffer.append(TEXT_439); + stringBuffer.append(TEXT_441); } else { stringBuffer.append(genPackage.getPackageInstanceVariable(genFeature.getTypeGenPackage())); - stringBuffer.append(TEXT_440); + stringBuffer.append(TEXT_442); stringBuffer.append(genFeature.getTypeClassifierAccessorName()); - stringBuffer.append(TEXT_441); + stringBuffer.append(TEXT_443); } - stringBuffer.append(TEXT_442); + stringBuffer.append(TEXT_444); stringBuffer.append(reverse); - stringBuffer.append(TEXT_443); + stringBuffer.append(TEXT_445); stringBuffer.append(genFeature.getName()); - stringBuffer.append(TEXT_444); + stringBuffer.append(TEXT_446); stringBuffer.append(genFeature.getDefaultValue()); - stringBuffer.append(TEXT_445); + stringBuffer.append(TEXT_447); stringBuffer.append(genFeature.getLowerBound()); - stringBuffer.append(TEXT_446); + stringBuffer.append(TEXT_448); stringBuffer.append(genFeature.getUpperBound()); - stringBuffer.append(TEXT_447); + stringBuffer.append(TEXT_449); stringBuffer.append(genFeature.getContainerClass()); - stringBuffer.append(TEXT_448); + stringBuffer.append(TEXT_450); stringBuffer.append(genFeature.getTransientFlag()); - stringBuffer.append(TEXT_449); + stringBuffer.append(TEXT_451); stringBuffer.append(genFeature.getVolatileFlag()); - stringBuffer.append(TEXT_450); + stringBuffer.append(TEXT_452); stringBuffer.append(genFeature.getChangeableFlag()); - stringBuffer.append(TEXT_451); + stringBuffer.append(TEXT_453); stringBuffer.append(genFeature.getContainmentFlag()); - stringBuffer.append(TEXT_452); + stringBuffer.append(TEXT_454); stringBuffer.append(genFeature.getResolveProxiesFlag()); - stringBuffer.append(TEXT_453); + stringBuffer.append(TEXT_455); stringBuffer.append(genFeature.getUnsettableFlag()); - stringBuffer.append(TEXT_454); + stringBuffer.append(TEXT_456); stringBuffer.append(genFeature.getUniqueFlag()); - stringBuffer.append(TEXT_455); + stringBuffer.append(TEXT_457); stringBuffer.append(genFeature.getDerivedFlag()); - stringBuffer.append(TEXT_456); + stringBuffer.append(TEXT_458); stringBuffer.append(genFeature.getOrderedFlag()); - stringBuffer.append(TEXT_457); + stringBuffer.append(TEXT_459); stringBuffer.append(genModel.getNonNLS()); stringBuffer.append(genModel.getNonNLS(genFeature.getDefaultValue(), 2)); for (GenFeature keyFeature : genFeature.getKeys()) { - stringBuffer.append(TEXT_458); + stringBuffer.append(TEXT_460); stringBuffer.append(genFeature.getFeatureAccessorName()); - stringBuffer.append(TEXT_459); + stringBuffer.append(TEXT_461); stringBuffer.append(genPackage.getPackageInstanceVariable(keyFeature.getGenPackage())); - stringBuffer.append(TEXT_460); + stringBuffer.append(TEXT_462); stringBuffer.append(keyFeature.getFeatureAccessorName()); - stringBuffer.append(TEXT_461); + stringBuffer.append(TEXT_463); } } else { - stringBuffer.append(TEXT_462); + stringBuffer.append(TEXT_464); stringBuffer.append(genFeature.getFeatureAccessorName()); - stringBuffer.append(TEXT_463); + stringBuffer.append(TEXT_465); if (genFeature.hasGenericType()) { - stringBuffer.append(TEXT_464); + stringBuffer.append(TEXT_466); } else { stringBuffer.append(genPackage.getPackageInstanceVariable(genFeature.getTypeGenPackage())); - stringBuffer.append(TEXT_465); + stringBuffer.append(TEXT_467); stringBuffer.append(genFeature.getTypeClassifierAccessorName()); - stringBuffer.append(TEXT_466); + stringBuffer.append(TEXT_468); } - stringBuffer.append(TEXT_467); + stringBuffer.append(TEXT_469); stringBuffer.append(genFeature.getName()); - stringBuffer.append(TEXT_468); + stringBuffer.append(TEXT_470); stringBuffer.append(genFeature.getDefaultValue()); - stringBuffer.append(TEXT_469); + stringBuffer.append(TEXT_471); stringBuffer.append(genFeature.getLowerBound()); - stringBuffer.append(TEXT_470); + stringBuffer.append(TEXT_472); stringBuffer.append(genFeature.getUpperBound()); - stringBuffer.append(TEXT_471); + stringBuffer.append(TEXT_473); stringBuffer.append(genFeature.getContainerClass()); - stringBuffer.append(TEXT_472); + stringBuffer.append(TEXT_474); stringBuffer.append(genFeature.getTransientFlag()); - stringBuffer.append(TEXT_473); + stringBuffer.append(TEXT_475); stringBuffer.append(genFeature.getVolatileFlag()); - stringBuffer.append(TEXT_474); + stringBuffer.append(TEXT_476); stringBuffer.append(genFeature.getChangeableFlag()); - stringBuffer.append(TEXT_475); + stringBuffer.append(TEXT_477); stringBuffer.append(genFeature.getUnsettableFlag()); - stringBuffer.append(TEXT_476); + stringBuffer.append(TEXT_478); stringBuffer.append(genFeature.getIDFlag()); - stringBuffer.append(TEXT_477); + stringBuffer.append(TEXT_479); stringBuffer.append(genFeature.getUniqueFlag()); - stringBuffer.append(TEXT_478); + stringBuffer.append(TEXT_480); stringBuffer.append(genFeature.getDerivedFlag()); - stringBuffer.append(TEXT_479); + stringBuffer.append(TEXT_481); stringBuffer.append(genFeature.getOrderedFlag()); - stringBuffer.append(TEXT_480); + stringBuffer.append(TEXT_482); 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_481); + stringBuffer.append(TEXT_483); if (genModel.useGenerics()) { - stringBuffer.append(TEXT_482); + stringBuffer.append(TEXT_484); stringBuffer.append(prefix); if (genModel.isOperationReflection()) { - stringBuffer.append(TEXT_483); + stringBuffer.append(TEXT_485); stringBuffer.append(genOperation.getOperationAccessorName()); - stringBuffer.append(TEXT_484); + stringBuffer.append(TEXT_486); } else { - stringBuffer.append(TEXT_485); + stringBuffer.append(TEXT_487); stringBuffer.append(genClass.getClassifierInstanceName()); } - stringBuffer.append(TEXT_486); + stringBuffer.append(TEXT_488); if (genOperation.isVoid() || genOperation.hasGenericType()) { - stringBuffer.append(TEXT_487); + stringBuffer.append(TEXT_489); } else { stringBuffer.append(genPackage.getPackageInstanceVariable(genOperation.getTypeGenPackage())); - stringBuffer.append(TEXT_488); + stringBuffer.append(TEXT_490); stringBuffer.append(genOperation.getTypeClassifierAccessorName()); - stringBuffer.append(TEXT_489); + stringBuffer.append(TEXT_491); } - stringBuffer.append(TEXT_490); + stringBuffer.append(TEXT_492); stringBuffer.append(genOperation.getName()); - stringBuffer.append(TEXT_491); + stringBuffer.append(TEXT_493); stringBuffer.append(genOperation.getLowerBound()); - stringBuffer.append(TEXT_492); + stringBuffer.append(TEXT_494); stringBuffer.append(genOperation.getUpperBound()); - stringBuffer.append(TEXT_493); + stringBuffer.append(TEXT_495); stringBuffer.append(genOperation.getUniqueFlag()); - stringBuffer.append(TEXT_494); + stringBuffer.append(TEXT_496); stringBuffer.append(genOperation.getOrderedFlag()); - stringBuffer.append(TEXT_495); + stringBuffer.append(TEXT_497); stringBuffer.append(genModel.getNonNLS()); } else if (!genOperation.isVoid()) { if (!genOperation.getEcoreOperation().isOrdered() || !genOperation.getEcoreOperation().isUnique()) { needsAddEOperation = true; - stringBuffer.append(TEXT_496); + stringBuffer.append(TEXT_498); stringBuffer.append(prefix); if (genModel.isOperationReflection()) { - stringBuffer.append(TEXT_497); + stringBuffer.append(TEXT_499); stringBuffer.append(genOperation.getOperationAccessorName()); - stringBuffer.append(TEXT_498); + stringBuffer.append(TEXT_500); } else { - stringBuffer.append(TEXT_499); + stringBuffer.append(TEXT_501); stringBuffer.append(genClass.getClassifierInstanceName()); } - stringBuffer.append(TEXT_500); + stringBuffer.append(TEXT_502); stringBuffer.append(genPackage.getPackageInstanceVariable(genOperation.getTypeGenPackage())); - stringBuffer.append(TEXT_501); + stringBuffer.append(TEXT_503); stringBuffer.append(genOperation.getTypeClassifierAccessorName()); - stringBuffer.append(TEXT_502); + stringBuffer.append(TEXT_504); stringBuffer.append(genOperation.getName()); - stringBuffer.append(TEXT_503); + stringBuffer.append(TEXT_505); stringBuffer.append(genOperation.getLowerBound()); - stringBuffer.append(TEXT_504); + stringBuffer.append(TEXT_506); stringBuffer.append(genOperation.getUpperBound()); - stringBuffer.append(TEXT_505); + stringBuffer.append(TEXT_507); stringBuffer.append(genOperation.getUniqueFlag()); - stringBuffer.append(TEXT_506); + stringBuffer.append(TEXT_508); stringBuffer.append(genOperation.getOrderedFlag()); - stringBuffer.append(TEXT_507); + stringBuffer.append(TEXT_509); stringBuffer.append(genModel.getNonNLS()); } else { - stringBuffer.append(TEXT_508); + stringBuffer.append(TEXT_510); stringBuffer.append(prefix); if (genModel.isOperationReflection()) { - stringBuffer.append(TEXT_509); + stringBuffer.append(TEXT_511); stringBuffer.append(genOperation.getOperationAccessorName()); - stringBuffer.append(TEXT_510); + stringBuffer.append(TEXT_512); } else { - stringBuffer.append(TEXT_511); + stringBuffer.append(TEXT_513); stringBuffer.append(genClass.getClassifierInstanceName()); } - stringBuffer.append(TEXT_512); + stringBuffer.append(TEXT_514); stringBuffer.append(genPackage.getPackageInstanceVariable(genOperation.getTypeGenPackage())); - stringBuffer.append(TEXT_513); + stringBuffer.append(TEXT_515); stringBuffer.append(genOperation.getTypeClassifierAccessorName()); - stringBuffer.append(TEXT_514); + stringBuffer.append(TEXT_516); stringBuffer.append(genOperation.getName()); - stringBuffer.append(TEXT_515); + stringBuffer.append(TEXT_517); stringBuffer.append(genOperation.getLowerBound()); - stringBuffer.append(TEXT_516); + stringBuffer.append(TEXT_518); stringBuffer.append(genOperation.getUpperBound()); - stringBuffer.append(TEXT_517); + stringBuffer.append(TEXT_519); stringBuffer.append(genModel.getNonNLS()); } } else { - stringBuffer.append(TEXT_518); + stringBuffer.append(TEXT_520); stringBuffer.append(prefix); if (genModel.isOperationReflection()) { - stringBuffer.append(TEXT_519); + stringBuffer.append(TEXT_521); stringBuffer.append(genOperation.getOperationAccessorName()); - stringBuffer.append(TEXT_520); + stringBuffer.append(TEXT_522); } else { - stringBuffer.append(TEXT_521); + stringBuffer.append(TEXT_523); stringBuffer.append(genClass.getClassifierInstanceName()); } - stringBuffer.append(TEXT_522); + stringBuffer.append(TEXT_524); stringBuffer.append(genOperation.getName()); - stringBuffer.append(TEXT_523); + stringBuffer.append(TEXT_525); 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_524); + stringBuffer.append(TEXT_526); stringBuffer.append(typeParameterVariable); - stringBuffer.append(TEXT_525); + stringBuffer.append(TEXT_527); stringBuffer.append(genTypeParameter.getName()); - stringBuffer.append(TEXT_526); + stringBuffer.append(TEXT_528); 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_527); + stringBuffer.append(TEXT_529); stringBuffer.append(typePrefix); - stringBuffer.append(TEXT_528); + stringBuffer.append(TEXT_530); stringBuffer.append(info.depth + 1); - stringBuffer.append(TEXT_529); + stringBuffer.append(TEXT_531); stringBuffer.append(info.type); - stringBuffer.append(TEXT_530); + stringBuffer.append(TEXT_532); if (info.depth > 0) { - stringBuffer.append(TEXT_531); + stringBuffer.append(TEXT_533); stringBuffer.append(info.depth); - stringBuffer.append(TEXT_532); + stringBuffer.append(TEXT_534); stringBuffer.append(info.accessor); - stringBuffer.append(TEXT_533); + stringBuffer.append(TEXT_535); stringBuffer.append(info.depth + 1); - stringBuffer.append(TEXT_534); + stringBuffer.append(TEXT_536); } } - stringBuffer.append(TEXT_535); + stringBuffer.append(TEXT_537); stringBuffer.append(t.nextIndex()); - stringBuffer.append(TEXT_536); + stringBuffer.append(TEXT_538); } } } 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_537); + stringBuffer.append(TEXT_539); stringBuffer.append(typePrefix); - stringBuffer.append(TEXT_538); + stringBuffer.append(TEXT_540); stringBuffer.append(info.depth + 1); - stringBuffer.append(TEXT_539); + stringBuffer.append(TEXT_541); stringBuffer.append(info.type); - stringBuffer.append(TEXT_540); + stringBuffer.append(TEXT_542); if (info.depth > 0) { - stringBuffer.append(TEXT_541); + stringBuffer.append(TEXT_543); stringBuffer.append(info.depth); - stringBuffer.append(TEXT_542); + stringBuffer.append(TEXT_544); stringBuffer.append(info.accessor); - stringBuffer.append(TEXT_543); + stringBuffer.append(TEXT_545); stringBuffer.append(info.depth + 1); - stringBuffer.append(TEXT_544); + stringBuffer.append(TEXT_546); } } } if (genModel.useGenerics()) { - stringBuffer.append(TEXT_545); + stringBuffer.append(TEXT_547); if (genParameter.hasGenericType()){ - stringBuffer.append(TEXT_546); + stringBuffer.append(TEXT_548); } else { stringBuffer.append(genPackage.getPackageInstanceVariable(genParameter.getTypeGenPackage())); - stringBuffer.append(TEXT_547); + stringBuffer.append(TEXT_549); stringBuffer.append(genParameter.getTypeClassifierAccessorName()); - stringBuffer.append(TEXT_548); + stringBuffer.append(TEXT_550); } - stringBuffer.append(TEXT_549); + stringBuffer.append(TEXT_551); stringBuffer.append(genParameter.getName()); - stringBuffer.append(TEXT_550); + stringBuffer.append(TEXT_552); stringBuffer.append(genParameter.getLowerBound()); - stringBuffer.append(TEXT_551); + stringBuffer.append(TEXT_553); stringBuffer.append(genParameter.getUpperBound()); - stringBuffer.append(TEXT_552); + stringBuffer.append(TEXT_554); stringBuffer.append(genParameter.getUniqueFlag()); - stringBuffer.append(TEXT_553); + stringBuffer.append(TEXT_555); stringBuffer.append(genParameter.getOrderedFlag()); - stringBuffer.append(TEXT_554); + stringBuffer.append(TEXT_556); stringBuffer.append(genModel.getNonNLS()); } else if (!genParameter.getEcoreParameter().isOrdered() || !genParameter.getEcoreParameter().isUnique()) { needsAddEParameter = true; - stringBuffer.append(TEXT_555); + stringBuffer.append(TEXT_557); if (genParameter.hasGenericType()){ - stringBuffer.append(TEXT_556); + stringBuffer.append(TEXT_558); } else { stringBuffer.append(genPackage.getPackageInstanceVariable(genParameter.getTypeGenPackage())); - stringBuffer.append(TEXT_557); + stringBuffer.append(TEXT_559); stringBuffer.append(genParameter.getTypeClassifierAccessorName()); - stringBuffer.append(TEXT_558); + stringBuffer.append(TEXT_560); } - stringBuffer.append(TEXT_559); + stringBuffer.append(TEXT_561); stringBuffer.append(genParameter.getName()); - stringBuffer.append(TEXT_560); + stringBuffer.append(TEXT_562); stringBuffer.append(genParameter.getLowerBound()); - stringBuffer.append(TEXT_561); + stringBuffer.append(TEXT_563); stringBuffer.append(genParameter.getUpperBound()); - stringBuffer.append(TEXT_562); + stringBuffer.append(TEXT_564); stringBuffer.append(genParameter.getUniqueFlag()); - stringBuffer.append(TEXT_563); + stringBuffer.append(TEXT_565); stringBuffer.append(genParameter.getOrderedFlag()); - stringBuffer.append(TEXT_564); + stringBuffer.append(TEXT_566); stringBuffer.append(genModel.getNonNLS()); } else { - stringBuffer.append(TEXT_565); + stringBuffer.append(TEXT_567); if (genParameter.hasGenericType()){ - stringBuffer.append(TEXT_566); + stringBuffer.append(TEXT_568); } else { stringBuffer.append(genPackage.getPackageInstanceVariable(genParameter.getTypeGenPackage())); - stringBuffer.append(TEXT_567); + stringBuffer.append(TEXT_569); stringBuffer.append(genParameter.getTypeClassifierAccessorName()); - stringBuffer.append(TEXT_568); + stringBuffer.append(TEXT_570); } - stringBuffer.append(TEXT_569); + stringBuffer.append(TEXT_571); stringBuffer.append(genParameter.getName()); - stringBuffer.append(TEXT_570); + stringBuffer.append(TEXT_572); stringBuffer.append(genParameter.getLowerBound()); - stringBuffer.append(TEXT_571); + stringBuffer.append(TEXT_573); stringBuffer.append(genParameter.getUpperBound()); - stringBuffer.append(TEXT_572); + stringBuffer.append(TEXT_574); 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_573); - stringBuffer.append(typePrefix); - stringBuffer.append(TEXT_574); - stringBuffer.append(info.depth + 1); stringBuffer.append(TEXT_575); - stringBuffer.append(info.type); + stringBuffer.append(typePrefix); stringBuffer.append(TEXT_576); - if (info.depth > 0) { + stringBuffer.append(info.depth + 1); stringBuffer.append(TEXT_577); - stringBuffer.append(info.depth); + stringBuffer.append(info.type); stringBuffer.append(TEXT_578); - stringBuffer.append(info.accessor); + if (info.depth > 0) { stringBuffer.append(TEXT_579); - stringBuffer.append(info.depth + 1); + stringBuffer.append(info.depth); stringBuffer.append(TEXT_580); - } + stringBuffer.append(info.accessor); stringBuffer.append(TEXT_581); stringBuffer.append(info.depth + 1); stringBuffer.append(TEXT_582); } + stringBuffer.append(TEXT_583); + stringBuffer.append(info.depth + 1); + stringBuffer.append(TEXT_584); + } } } else { for (GenClassifier genException : genOperation.getGenExceptions()) { - stringBuffer.append(TEXT_583); + stringBuffer.append(TEXT_585); stringBuffer.append(genPackage.getPackageInstanceVariable(genException.getGenPackage())); - stringBuffer.append(TEXT_584); + stringBuffer.append(TEXT_586); stringBuffer.append(genException.getClassifierAccessorName()); - stringBuffer.append(TEXT_585); + stringBuffer.append(TEXT_587); } } 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_586); + stringBuffer.append(TEXT_588); stringBuffer.append(typePrefix); - stringBuffer.append(TEXT_587); + stringBuffer.append(TEXT_589); stringBuffer.append(info.depth + 1); - stringBuffer.append(TEXT_588); + stringBuffer.append(TEXT_590); stringBuffer.append(info.type); - stringBuffer.append(TEXT_589); + stringBuffer.append(TEXT_591); if (info.depth > 0) { - stringBuffer.append(TEXT_590); + stringBuffer.append(TEXT_592); stringBuffer.append(info.depth); - stringBuffer.append(TEXT_591); + stringBuffer.append(TEXT_593); stringBuffer.append(info.accessor); - stringBuffer.append(TEXT_592); + stringBuffer.append(TEXT_594); stringBuffer.append(info.depth + 1); - stringBuffer.append(TEXT_593); + stringBuffer.append(TEXT_595); } } - stringBuffer.append(TEXT_594); + stringBuffer.append(TEXT_596); } } if (c.hasNext()) { - stringBuffer.append(TEXT_595); + stringBuffer.append(TEXT_597); } } } if (!genPackage.getGenEnums().isEmpty()) { - stringBuffer.append(TEXT_596); + stringBuffer.append(TEXT_598); for (Iterator<GenEnum> e=genPackage.getGenEnums().iterator(); e.hasNext();) { GenEnum genEnum = e.next(); - stringBuffer.append(TEXT_597); + stringBuffer.append(TEXT_599); stringBuffer.append(genEnum.getClassifierInstanceName()); - stringBuffer.append(TEXT_598); + stringBuffer.append(TEXT_600); stringBuffer.append(genEnum.getImportedName()); - stringBuffer.append(TEXT_599); + stringBuffer.append(TEXT_601); stringBuffer.append(genEnum.getName()); - stringBuffer.append(TEXT_600); + stringBuffer.append(TEXT_602); stringBuffer.append(genModel.getNonNLS()); for (GenEnumLiteral genEnumLiteral : genEnum.getGenEnumLiterals()) { - stringBuffer.append(TEXT_601); + stringBuffer.append(TEXT_603); stringBuffer.append(genEnum.getClassifierInstanceName()); - stringBuffer.append(TEXT_602); + stringBuffer.append(TEXT_604); stringBuffer.append(genEnum.getImportedName().equals(genEnum.getClassifierID()) ? genEnum.getQualifiedName() : genEnum.getImportedName()); - stringBuffer.append(TEXT_603); + stringBuffer.append(TEXT_605); stringBuffer.append(genEnumLiteral.getEnumLiteralInstanceConstantName()); - stringBuffer.append(TEXT_604); + stringBuffer.append(TEXT_606); } if (e.hasNext()) { - stringBuffer.append(TEXT_605); + stringBuffer.append(TEXT_607); } } } if (!genPackage.getGenDataTypes().isEmpty()) { - stringBuffer.append(TEXT_606); + stringBuffer.append(TEXT_608); for (GenDataType genDataType : genPackage.getGenDataTypes()) {boolean hasInstanceTypeName = genModel.useGenerics() && genDataType.getEcoreDataType().getInstanceTypeName() != null && genDataType.getEcoreDataType().getInstanceTypeName().contains("<"); - stringBuffer.append(TEXT_607); + stringBuffer.append(TEXT_609); stringBuffer.append(genDataType.getClassifierInstanceName()); - stringBuffer.append(TEXT_608); + stringBuffer.append(TEXT_610); stringBuffer.append(genDataType.getRawImportedInstanceClassName()); - stringBuffer.append(TEXT_609); + stringBuffer.append(TEXT_611); stringBuffer.append(genDataType.getName()); - stringBuffer.append(TEXT_610); + stringBuffer.append(TEXT_612); stringBuffer.append(genDataType.getSerializableFlag()); - stringBuffer.append(TEXT_611); + stringBuffer.append(TEXT_613); stringBuffer.append(genDataType.getGeneratedInstanceClassFlag()); if (hasInstanceTypeName) { - stringBuffer.append(TEXT_612); + stringBuffer.append(TEXT_614); stringBuffer.append(genDataType.getEcoreDataType().getInstanceTypeName()); - stringBuffer.append(TEXT_613); + stringBuffer.append(TEXT_615); } - stringBuffer.append(TEXT_614); + stringBuffer.append(TEXT_616); stringBuffer.append(genModel.getNonNLS()); if (hasInstanceTypeName) { stringBuffer.append(genModel.getNonNLS(2)); @@ -2335,334 +2341,334 @@ int maxGenericTypeAssignment = 0; } } if (genPackage.getSuperGenPackage() == null) { - stringBuffer.append(TEXT_615); + stringBuffer.append(TEXT_617); stringBuffer.append(genPackage.getSchemaLocation()); - stringBuffer.append(TEXT_616); + stringBuffer.append(TEXT_618); } if (!genPackage.isEcorePackage() && !genPackage.getAnnotationSources().isEmpty()) { - stringBuffer.append(TEXT_617); + stringBuffer.append(TEXT_619); for (String annotationSource : genPackage.getAnnotationSources()) { - stringBuffer.append(TEXT_618); + stringBuffer.append(TEXT_620); stringBuffer.append(annotationSource); - stringBuffer.append(TEXT_619); + stringBuffer.append(TEXT_621); stringBuffer.append(genPackage.getAnnotationSourceIdentifier(annotationSource)); - stringBuffer.append(TEXT_620); + stringBuffer.append(TEXT_622); } } - stringBuffer.append(TEXT_621); + stringBuffer.append(TEXT_623); for (String annotationSource : genPackage.getAnnotationSources()) { - stringBuffer.append(TEXT_622); + stringBuffer.append(TEXT_624); stringBuffer.append(annotationSource); - stringBuffer.append(TEXT_623); + stringBuffer.append(TEXT_625); stringBuffer.append(genPackage.getAnnotationSourceIdentifier(annotationSource)); - stringBuffer.append(TEXT_624); + stringBuffer.append(TEXT_626); if (annotationSource == null) { - stringBuffer.append(TEXT_625); + stringBuffer.append(TEXT_627); } else { - stringBuffer.append(TEXT_626); + stringBuffer.append(TEXT_628); stringBuffer.append(annotationSource); - stringBuffer.append(TEXT_627); + stringBuffer.append(TEXT_629); stringBuffer.append(genModel.getNonNLS()); } for (EAnnotation eAnnotation : genPackage.getAllAnnotations()) { List<GenPackage.AnnotationReferenceData> annotationReferenceDataList = genPackage.getReferenceData(eAnnotation); if (annotationSource == null ? eAnnotation.getSource() == null : annotationSource.equals(eAnnotation.getSource())) { - stringBuffer.append(TEXT_628); + stringBuffer.append(TEXT_630); stringBuffer.append(genPackage.getAnnotatedModelElementAccessor(eAnnotation)); - stringBuffer.append(TEXT_629); + stringBuffer.append(TEXT_631); 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_630); + stringBuffer.append(TEXT_632); stringBuffer.append(key); - stringBuffer.append(TEXT_631); + stringBuffer.append(TEXT_633); stringBuffer.append(value); stringBuffer.append(k.hasNext() ? "," : ""); stringBuffer.append(genModel.getNonNLS(key + value)); } - stringBuffer.append(TEXT_632); + stringBuffer.append(TEXT_634); if (annotationReferenceDataList.isEmpty()) { - stringBuffer.append(TEXT_633); + stringBuffer.append(TEXT_635); } else { - stringBuffer.append(TEXT_634); + stringBuffer.append(TEXT_636); } if (!annotationReferenceDataList.isEmpty()) { - stringBuffer.append(TEXT_635); - stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.URI")); - stringBuffer.append(TEXT_636); - for (Iterator<GenPackage.AnnotationReferenceData> k = annotationReferenceDataList.iterator(); k.hasNext();) { GenPackage.AnnotationReferenceData annotationReferenceData = k.next(); stringBuffer.append(TEXT_637); stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.URI")); stringBuffer.append(TEXT_638); + for (Iterator<GenPackage.AnnotationReferenceData> k = annotationReferenceDataList.iterator(); k.hasNext();) { GenPackage.AnnotationReferenceData annotationReferenceData = k.next(); + stringBuffer.append(TEXT_639); + stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.URI")); + stringBuffer.append(TEXT_640); if (annotationReferenceData.containingGenPackage != genPackage) { stringBuffer.append(annotationReferenceData.containingGenPackage.getImportedPackageInterfaceName()); - stringBuffer.append(TEXT_639); + stringBuffer.append(TEXT_641); } - stringBuffer.append(TEXT_640); + stringBuffer.append(TEXT_642); stringBuffer.append(annotationReferenceData.uriFragment); - stringBuffer.append(TEXT_641); + stringBuffer.append(TEXT_643); if (k.hasNext()) { - stringBuffer.append(TEXT_642); + stringBuffer.append(TEXT_644); } stringBuffer.append(genModel.getNonNLS()); } - stringBuffer.append(TEXT_643); + stringBuffer.append(TEXT_645); } for (EAnnotation nestedEAnnotation : genPackage.getAllNestedAnnotations(eAnnotation)) {String nestedAnnotationSource = nestedEAnnotation.getSource(); int depth = 0; boolean nonContentAnnotation = false; StringBuilder path = new StringBuilder(); for (EObject eContainer = nestedEAnnotation.eContainer(), child = nestedEAnnotation; child != eAnnotation; child = eContainer, eContainer = eContainer.eContainer()) { boolean nonContentChild = child.eContainmentFeature() != EcorePackage.Literals.EANNOTATION__CONTENTS; if (path.length() != 0) { path.insert(0, ", "); } path.insert(0, nonContentChild); if (nonContentChild) { nonContentAnnotation = true; } ++depth; } List<GenPackage.AnnotationReferenceData> nestedAnnotationReferenceDataList = genPackage.getReferenceData(nestedEAnnotation); - stringBuffer.append(TEXT_644); + stringBuffer.append(TEXT_646); stringBuffer.append(genPackage.getAnnotatedModelElementAccessor(eAnnotation)); - stringBuffer.append(TEXT_645); + stringBuffer.append(TEXT_647); if (nonContentAnnotation && genModel.getRuntimeVersion().getValue() >= GenRuntimeVersion.EMF210_VALUE) { - stringBuffer.append(TEXT_646); + stringBuffer.append(TEXT_648); stringBuffer.append(path.toString()); - stringBuffer.append(TEXT_647); + stringBuffer.append(TEXT_649); } else { stringBuffer.append(depth); } - stringBuffer.append(TEXT_648); + stringBuffer.append(TEXT_650); if (nestedAnnotationSource == null) { - stringBuffer.append(TEXT_649); + stringBuffer.append(TEXT_651); } else { - stringBuffer.append(TEXT_650); + stringBuffer.append(TEXT_652); stringBuffer.append(nestedAnnotationSource); - stringBuffer.append(TEXT_651); + stringBuffer.append(TEXT_653); stringBuffer.append(genModel.getNonNLS()); } - stringBuffer.append(TEXT_652); + stringBuffer.append(TEXT_654); 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_653); + stringBuffer.append(TEXT_655); stringBuffer.append(key); - stringBuffer.append(TEXT_654); + stringBuffer.append(TEXT_656); stringBuffer.append(value); stringBuffer.append(l.hasNext() ? "," : ""); stringBuffer.append(genModel.getNonNLS(key + value)); } - stringBuffer.append(TEXT_655); + stringBuffer.append(TEXT_657); if (nestedAnnotationReferenceDataList.isEmpty()) { - stringBuffer.append(TEXT_656); + stringBuffer.append(TEXT_658); } else { - stringBuffer.append(TEXT_657); + stringBuffer.append(TEXT_659); } if (!nestedAnnotationReferenceDataList.isEmpty()) { - stringBuffer.append(TEXT_658); - stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.URI")); - stringBuffer.append(TEXT_659); - for (Iterator<GenPackage.AnnotationReferenceData> l = nestedAnnotationReferenceDataList.iterator(); l.hasNext();) { GenPackage.AnnotationReferenceData annotationReferenceData = l.next(); stringBuffer.append(TEXT_660); stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.URI")); stringBuffer.append(TEXT_661); + for (Iterator<GenPackage.AnnotationReferenceData> l = nestedAnnotationReferenceDataList.iterator(); l.hasNext();) { GenPackage.AnnotationReferenceData annotationReferenceData = l.next(); + stringBuffer.append(TEXT_662); + stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.URI")); + stringBuffer.append(TEXT_663); if (annotationReferenceData.containingGenPackage != genPackage) { stringBuffer.append(annotationReferenceData.containingGenPackage.getImportedPackageInterfaceName()); - stringBuffer.append(TEXT_662); + stringBuffer.append(TEXT_664); } - stringBuffer.append(TEXT_663); + stringBuffer.append(TEXT_665); stringBuffer.append(annotationReferenceData.uriFragment); - stringBuffer.append(TEXT_664); + stringBuffer.append(TEXT_666); if (l.hasNext()) { - stringBuffer.append(TEXT_665); + stringBuffer.append(TEXT_667); } stringBuffer.append(genModel.getNonNLS()); } - stringBuffer.append(TEXT_666); + stringBuffer.append(TEXT_668); } } } } - stringBuffer.append(TEXT_667); + stringBuffer.append(TEXT_669); } } else { if (genPackage.isLoadingInitialization()) { - stringBuffer.append(TEXT_668); - stringBuffer.append(genModel.getImportedName("java.net.URL")); - stringBuffer.append(TEXT_669); - stringBuffer.append(genModel.getNonNLS()); stringBuffer.append(TEXT_670); - stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.URI")); + stringBuffer.append(genModel.getImportedName("java.net.URL")); stringBuffer.append(TEXT_671); - stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.URI")); + stringBuffer.append(genModel.getNonNLS()); stringBuffer.append(TEXT_672); - stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.resource.Resource")); + stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.URI")); stringBuffer.append(TEXT_673); - stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.xmi.impl.EcoreResourceFactoryImpl")); + stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.URI")); stringBuffer.append(TEXT_674); - stringBuffer.append(genModel.getImportedName("java.io.IOException")); + stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.resource.Resource")); stringBuffer.append(TEXT_675); - stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.WrappedException")); + stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.xmi.impl.EcoreResourceFactoryImpl")); stringBuffer.append(TEXT_676); - stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EPackage")); + stringBuffer.append(genModel.getImportedName("java.io.IOException")); stringBuffer.append(TEXT_677); - } + stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.WrappedException")); stringBuffer.append(TEXT_678); - if (genModel.useClassOverrideAnnotation()) { + stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EPackage")); stringBuffer.append(TEXT_679); } stringBuffer.append(TEXT_680); - stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EClassifier")); + if (genModel.useClassOverrideAnnotation()) { stringBuffer.append(TEXT_681); + } + stringBuffer.append(TEXT_682); + stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EClassifier")); + stringBuffer.append(TEXT_683); ArrayList<GenClass> dynamicGenClasses = new ArrayList<GenClass>(); for (GenClass genClass : genPackage.getGenClasses()) { if (genClass.isDynamic()) { dynamicGenClasses.add(genClass); } } if (dynamicGenClasses.isEmpty()) { - stringBuffer.append(TEXT_682); + stringBuffer.append(TEXT_684); stringBuffer.append(genPackage.getInterfacePackageName()); - stringBuffer.append(TEXT_683); + stringBuffer.append(TEXT_685); stringBuffer.append(genModel.getNonNLS()); - stringBuffer.append(TEXT_684); + stringBuffer.append(TEXT_686); } else { - stringBuffer.append(TEXT_685); + stringBuffer.append(TEXT_687); for (GenClass genClass : dynamicGenClasses) { if (genClass.isDynamic()) { - stringBuffer.append(TEXT_686); + stringBuffer.append(TEXT_688); stringBuffer.append(genPackage.getClassifierID(genClass)); - stringBuffer.append(TEXT_687); + stringBuffer.append(TEXT_689); } } - stringBuffer.append(TEXT_688); + stringBuffer.append(TEXT_690); stringBuffer.append(genPackage.getInterfacePackageName()); - stringBuffer.append(TEXT_689); + stringBuffer.append(TEXT_691); stringBuffer.append(genModel.getNonNLS()); - stringBuffer.append(TEXT_690); + stringBuffer.append(TEXT_692); } - stringBuffer.append(TEXT_691); + stringBuffer.append(TEXT_693); } if (needsAddEOperation) { - stringBuffer.append(TEXT_692); + stringBuffer.append(TEXT_694); stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EOperation")); - stringBuffer.append(TEXT_693); + stringBuffer.append(TEXT_695); stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EClass")); - stringBuffer.append(TEXT_694); + stringBuffer.append(TEXT_696); stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EClassifier")); - stringBuffer.append(TEXT_695); + stringBuffer.append(TEXT_697); stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EOperation")); - stringBuffer.append(TEXT_696); + stringBuffer.append(TEXT_698); } if (needsAddEParameter) { - stringBuffer.append(TEXT_697); + stringBuffer.append(TEXT_699); stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EParameter")); - stringBuffer.append(TEXT_698); + stringBuffer.append(TEXT_700); stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EOperation")); - stringBuffer.append(TEXT_699); + stringBuffer.append(TEXT_701); stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EClassifier")); - stringBuffer.append(TEXT_700); + stringBuffer.append(TEXT_702); stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EParameter")); - stringBuffer.append(TEXT_701); + stringBuffer.append(TEXT_703); } } if (isInterface && genPackage.isLiteralsInterface()) { - stringBuffer.append(TEXT_702); - if (genModel.isOperationReflection()) { - stringBuffer.append(TEXT_703); - } stringBuffer.append(TEXT_704); - if (isImplementation) { + if (genModel.isOperationReflection()) { stringBuffer.append(TEXT_705); } stringBuffer.append(TEXT_706); - for (GenClassifier genClassifier : genPackage.getGenClassifiers()) { + if (isImplementation) { stringBuffer.append(TEXT_707); + } + stringBuffer.append(TEXT_708); + for (GenClassifier genClassifier : genPackage.getGenClassifiers()) { + stringBuffer.append(TEXT_709); if (genClassifier instanceof GenClass) { GenClass genClass = (GenClass)genClassifier; if (!genClass.isInterface()) { - stringBuffer.append(TEXT_708); + stringBuffer.append(TEXT_710); stringBuffer.append(genClass.getQualifiedClassName()); - stringBuffer.append(TEXT_709); + stringBuffer.append(TEXT_711); stringBuffer.append(genClass.getFormattedName()); - stringBuffer.append(TEXT_710); + stringBuffer.append(TEXT_712); stringBuffer.append(genClass.getQualifiedClassName()); } else { - stringBuffer.append(TEXT_711); + stringBuffer.append(TEXT_713); stringBuffer.append(genClass.getQualifiedInterfaceName()); - stringBuffer.append(TEXT_712); + stringBuffer.append(TEXT_714); stringBuffer.append(genClass.getFormattedName()); - stringBuffer.append(TEXT_713); + stringBuffer.append(TEXT_715); stringBuffer.append(genClass.getQualifiedInterfaceName()); } } else if (genClassifier instanceof GenEnum) { GenEnum genEnum = (GenEnum)genClassifier; - stringBuffer.append(TEXT_714); + stringBuffer.append(TEXT_716); stringBuffer.append(genEnum.getQualifiedName()); - stringBuffer.append(TEXT_715); + stringBuffer.append(TEXT_717); stringBuffer.append(genEnum.getFormattedName()); - stringBuffer.append(TEXT_716); + stringBuffer.append(TEXT_718); stringBuffer.append(genEnum.getQualifiedName()); } else if (genClassifier instanceof GenDataType) { GenDataType genDataType = (GenDataType)genClassifier; - stringBuffer.append(TEXT_717); + stringBuffer.append(TEXT_719); stringBuffer.append(genDataType.getFormattedName()); - stringBuffer.append(TEXT_718); + stringBuffer.append(TEXT_720); if (!genDataType.isPrimitiveType() && !genDataType.isArrayType()) { - stringBuffer.append(TEXT_719); + stringBuffer.append(TEXT_721); stringBuffer.append(genDataType.getRawInstanceClassName()); } } - stringBuffer.append(TEXT_720); + stringBuffer.append(TEXT_722); stringBuffer.append(genPackage.getQualifiedPackageClassName()); - stringBuffer.append(TEXT_721); + stringBuffer.append(TEXT_723); stringBuffer.append(genClassifier.getClassifierAccessorName()); - stringBuffer.append(TEXT_722); + stringBuffer.append(TEXT_724); if (genClassifier.hasAPITags()) { - stringBuffer.append(TEXT_723); + stringBuffer.append(TEXT_725); stringBuffer.append(genClassifier.getAPITags(genModel.getIndentation(stringBuffer))); } - stringBuffer.append(TEXT_724); + stringBuffer.append(TEXT_726); if (isJDK50 && genClassifier.hasAPIDeprecatedTag()) { - stringBuffer.append(TEXT_725); + stringBuffer.append(TEXT_727); } - stringBuffer.append(TEXT_726); + stringBuffer.append(TEXT_728); stringBuffer.append(publicStaticFinalFlag); stringBuffer.append(genClassifier.getImportedMetaType()); - stringBuffer.append(TEXT_727); + stringBuffer.append(TEXT_729); stringBuffer.append(genPackage.getClassifierID(genClassifier)); - stringBuffer.append(TEXT_728); + stringBuffer.append(TEXT_730); stringBuffer.append(genClassifier.getClassifierAccessorName()); - stringBuffer.append(TEXT_729); + stringBuffer.append(TEXT_731); if (genClassifier instanceof GenClass) { GenClass genClass = (GenClass)genClassifier; for (GenFeature genFeature : genClass.getGenFeatures()) { - stringBuffer.append(TEXT_730); + stringBuffer.append(TEXT_732); stringBuffer.append(genFeature.getFormattedName()); - stringBuffer.append(TEXT_731); + stringBuffer.append(TEXT_733); stringBuffer.append(genFeature.getFeatureKind()); - stringBuffer.append(TEXT_732); + stringBuffer.append(TEXT_734); if (genFeature.hasImplicitAPITags()) { - stringBuffer.append(TEXT_733); + stringBuffer.append(TEXT_735); stringBuffer.append(genFeature.getImplicitAPITags(genModel.getIndentation(stringBuffer))); } - stringBuffer.append(TEXT_734); + stringBuffer.append(TEXT_736); if (isJDK50 && genFeature.hasImplicitAPIDeprecatedTag()) { - stringBuffer.append(TEXT_735); + stringBuffer.append(TEXT_737); } - stringBuffer.append(TEXT_736); + stringBuffer.append(TEXT_738); stringBuffer.append(publicStaticFinalFlag); stringBuffer.append(genFeature.getImportedMetaType()); - stringBuffer.append(TEXT_737); + stringBuffer.append(TEXT_739); stringBuffer.append(genClass.getFeatureID(genFeature)); - stringBuffer.append(TEXT_738); + stringBuffer.append(TEXT_740); stringBuffer.append(genFeature.getFeatureAccessorName()); - stringBuffer.append(TEXT_739); + stringBuffer.append(TEXT_741); } if (genModel.isOperationReflection()) { for (GenOperation genOperation : genClass.getGenOperations()) { - stringBuffer.append(TEXT_740); + stringBuffer.append(TEXT_742); stringBuffer.append(genOperation.getFormattedName()); - stringBuffer.append(TEXT_741); + stringBuffer.append(TEXT_743); if (genOperation.hasImplicitAPITags()) { - stringBuffer.append(TEXT_742); + stringBuffer.append(TEXT_744); stringBuffer.append(genOperation.getImplicitAPITags(genModel.getIndentation(stringBuffer))); } - stringBuffer.append(TEXT_743); + stringBuffer.append(TEXT_745); if (isJDK50 && genOperation.hasImplicitAPIDeprecatedTag()) { - stringBuffer.append(TEXT_744); + stringBuffer.append(TEXT_746); } - stringBuffer.append(TEXT_745); + stringBuffer.append(TEXT_747); stringBuffer.append(publicStaticFinalFlag); stringBuffer.append(genOperation.getImportedMetaType()); - stringBuffer.append(TEXT_746); + stringBuffer.append(TEXT_748); stringBuffer.append(genClass.getOperationID(genOperation, false)); - stringBuffer.append(TEXT_747); + stringBuffer.append(TEXT_749); stringBuffer.append(genOperation.getOperationAccessorName()); - stringBuffer.append(TEXT_748); + stringBuffer.append(TEXT_750); } } } } - stringBuffer.append(TEXT_749); + stringBuffer.append(TEXT_751); } - stringBuffer.append(TEXT_750); + stringBuffer.append(TEXT_752); stringBuffer.append(isInterface ? genPackage.getPackageInterfaceName() : genPackage.getPackageClassName()); genModel.emitSortedImports(); - stringBuffer.append(TEXT_751); + stringBuffer.append(TEXT_753); return stringBuffer.toString(); } } diff --git a/plugins/org.eclipse.emf.codegen.ecore/templates/model/PackageClass.javajet b/plugins/org.eclipse.emf.codegen.ecore/templates/model/PackageClass.javajet index 74c38b819..89d8cfbfb 100644 --- a/plugins/org.eclipse.emf.codegen.ecore/templates/model/PackageClass.javajet +++ b/plugins/org.eclipse.emf.codegen.ecore/templates/model/PackageClass.javajet @@ -308,7 +308,7 @@ public interface <%=genPackage.getPackageInterfaceName()%> extends <%=genModel.g /** * 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 --> @@ -329,7 +329,8 @@ public interface <%=genPackage.getPackageInterfaceName()%> extends <%=genModel.g <%}%> // Obtain or create and register package - <%=genPackage.getPackageClassName()%> the<%=genPackage.getBasicPackageName()%> = (<%=genPackage.getPackageClassName()%>)(<%=genModel.getImportedName("org.eclipse.emf.ecore.EPackage")%>.Registry.INSTANCE.get(eNS_URI) instanceof <%=genPackage.getPackageClassName()%> ? <%=genModel.getImportedName("org.eclipse.emf.ecore.EPackage")%>.Registry.INSTANCE.get(eNS_URI) : new <%=genPackage.getPackageClassName()%>()); + Object registered<%=genPackage.getBasicPackageName()%> = <%=genModel.getImportedName("org.eclipse.emf.ecore.EPackage")%>.Registry.INSTANCE.get(eNS_URI); + <%=genPackage.getPackageClassName()%> the<%=genPackage.getBasicPackageName()%> = registered<%=genPackage.getBasicPackageName()%> instanceof <%=genPackage.getPackageClassName()%> ? (<%=genPackage.getPackageClassName()%>)registered<%=genPackage.getBasicPackageName()%> : new <%=genPackage.getPackageClassName()%>(); isInited = true; @@ -342,8 +343,9 @@ public interface <%=genPackage.getPackageInterfaceName()%> extends <%=genModel.g <%}%> <%if (!genPackage.getPackageInterDependencies().isEmpty()) {%> // Obtain or create and register interdependencies - <%for (GenPackage interdep : genPackage.getPackageInterDependencies()) {%> - <%=interdep.getImportedPackageClassName()%> <%=genPackage.getPackageInstanceVariable(interdep)%> = (<%=interdep.getImportedPackageClassName()%>)(<%=genModel.getImportedName("org.eclipse.emf.ecore.EPackage")%>.Registry.INSTANCE.getEPackage(<%=interdep.getImportedPackageInterfaceName()%>.eNS_URI) instanceof <%=interdep.getImportedPackageClassName()%> ? <%=genModel.getImportedName("org.eclipse.emf.ecore.EPackage")%>.Registry.INSTANCE.getEPackage(<%=interdep.getImportedPackageInterfaceName()%>.eNS_URI) : <%=interdep.getImportedPackageInterfaceName()%>.eINSTANCE); + <%for (ListIterator<GenPackage> i = genPackage.getPackageInterDependencies().listIterator(); i.hasNext(); ) { GenPackage interdep = i.next(); %> + <%if (i.previousIndex() == 0) {%>Object <%}%>registeredPackage = <%=genModel.getImportedName("org.eclipse.emf.ecore.EPackage")%>.Registry.INSTANCE.getEPackage(<%=interdep.getImportedPackageInterfaceName()%>.eNS_URI); + <%=interdep.getImportedPackageClassName()%> <%=genPackage.getPackageInstanceVariable(interdep)%> = (<%=interdep.getImportedPackageClassName()%>)(registeredPackage instanceof <%=interdep.getImportedPackageClassName()%> ? registeredPackage : <%=interdep.getImportedPackageInterfaceName()%>.eINSTANCE); <%}%> <%}%> @@ -390,7 +392,7 @@ public interface <%=genPackage.getPackageInterfaceName()%> extends <%=genModel.g <%if (genPackage.hasConstraints()) {%> // Register package validator <%=genModel.getImportedName("org.eclipse.emf.ecore.EValidator")%>.Registry.INSTANCE.put - (the<%=genPackage.getBasicPackageName()%>, + (the<%=genPackage.getBasicPackageName()%>, new <%=genModel.getImportedName("org.eclipse.emf.ecore.EValidator")%>.Descriptor() { public <%=genModel.getImportedName("org.eclipse.emf.ecore.EValidator")%> getEValidator() @@ -405,7 +407,6 @@ public interface <%=genPackage.getPackageInterfaceName()%> extends <%=genModel.g 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()%>; @@ -423,8 +424,8 @@ public interface <%=genPackage.getPackageInterfaceName()%> extends <%=genModel.g <%if (genClassifier instanceof GenClass) { GenClass genClass = (GenClass)genClassifier;%> <%if (!genClass.isDynamic()) { String theClass = genClass.isMapEntry() ? genClass.getImportedClassName() : genClass.getRawImportedInterfaceName(); if (helpers.add(theClass)) {%> <%=genModel.getImportedName("org.eclipse.emf.common.util.Reflect")%>.register - (<%=theClass%>.class, - new <%=genModel.getImportedName("org.eclipse.emf.common.util.Reflect")%>.Helper() + (<%=theClass%>.class, + new <%=genModel.getImportedName("org.eclipse.emf.common.util.Reflect")%>.Helper() { public boolean isInstance(Object instance) { @@ -440,8 +441,8 @@ public interface <%=genPackage.getPackageInterfaceName()%> extends <%=genModel.g <%} else if (genClassifier instanceof GenDataType) { GenDataType genDataType = (GenDataType)genClassifier;%> <%if (!genDataType.isPrimitiveType() && !genDataType.isObjectType()) { String theClass = genDataType.getRawImportedInstanceClassName(); if (helpers.add(theClass)) { %> <%=genModel.getImportedName("org.eclipse.emf.common.util.Reflect")%>.register - (<%=theClass%>.class, - new <%=genModel.getImportedName("org.eclipse.emf.common.util.Reflect")%>.Helper() + (<%=theClass%>.class, + new <%=genModel.getImportedName("org.eclipse.emf.common.util.Reflect")%>.Helper() { public boolean isInstance(Object instance) { @@ -1052,18 +1053,18 @@ int maxGenericTypeAssignment = 0; { String source = <%if (annotationSource == null) {%>null;<%} else {%>"<%=annotationSource%>";<%=genModel.getNonNLS()%><%}%> <%for (EAnnotation eAnnotation : genPackage.getAllAnnotations()) { List<GenPackage.AnnotationReferenceData> annotationReferenceDataList = genPackage.getReferenceData(eAnnotation);%> - <%if (annotationSource == null ? eAnnotation.getSource() == null : annotationSource.equals(eAnnotation.getSource())) {%> + <%if (annotationSource == null ? eAnnotation.getSource() == null : annotationSource.equals(eAnnotation.getSource())) {%> addAnnotation - (<%=genPackage.getAnnotatedModelElementAccessor(eAnnotation)%>, - source, - new String[] + (<%=genPackage.getAnnotatedModelElementAccessor(eAnnotation)%>, + source, + new String[] { <%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);%> - <%=key%>, <%=value%><%=k.hasNext() ? "," : ""%><%=genModel.getNonNLS(key + value)%> + <%=key%>, <%=value%><%=k.hasNext() ? "," : ""%><%=genModel.getNonNLS(key + value)%> <%}%> }<%if (annotationReferenceDataList.isEmpty()) {%>);<%} else {%>,<%}%> <%if (!annotationReferenceDataList.isEmpty()) {%> - new <%=genModel.getImportedName("org.eclipse.emf.common.util.URI")%>[] + new <%=genModel.getImportedName("org.eclipse.emf.common.util.URI")%>[] { <%for (Iterator<GenPackage.AnnotationReferenceData> k = annotationReferenceDataList.iterator(); k.hasNext();) { GenPackage.AnnotationReferenceData annotationReferenceData = k.next();%> <%=genModel.getImportedName("org.eclipse.emf.common.util.URI")%>.createURI(<%if (annotationReferenceData.containingGenPackage != genPackage) {%><%=annotationReferenceData.containingGenPackage.getImportedPackageInterfaceName()%>.<%}%>eNS_URI).appendFragment("<%=annotationReferenceData.uriFragment%>")<%if (k.hasNext()) {%>,<%}%><%=genModel.getNonNLS()%> @@ -1072,17 +1073,17 @@ int maxGenericTypeAssignment = 0; <%}%> <%for (EAnnotation nestedEAnnotation : genPackage.getAllNestedAnnotations(eAnnotation)) {String nestedAnnotationSource = nestedEAnnotation.getSource(); int depth = 0; boolean nonContentAnnotation = false; StringBuilder path = new StringBuilder(); for (EObject eContainer = nestedEAnnotation.eContainer(), child = nestedEAnnotation; child != eAnnotation; child = eContainer, eContainer = eContainer.eContainer()) { boolean nonContentChild = child.eContainmentFeature() != EcorePackage.Literals.EANNOTATION__CONTENTS; if (path.length() != 0) { path.insert(0, ", "); } path.insert(0, nonContentChild); if (nonContentChild) { nonContentAnnotation = true; } ++depth; } List<GenPackage.AnnotationReferenceData> nestedAnnotationReferenceDataList = genPackage.getReferenceData(nestedEAnnotation);%> addAnnotation - (<%=genPackage.getAnnotatedModelElementAccessor(eAnnotation)%>, + (<%=genPackage.getAnnotatedModelElementAccessor(eAnnotation)%>, <%if (nonContentAnnotation && genModel.getRuntimeVersion().getValue() >= GenRuntimeVersion.EMF210_VALUE) {%>new boolean[] { <%=path.toString()%> }<%} else {%><%=depth%><%}%>, <%if (nestedAnnotationSource == null) {%>null,<%} else {%>"<%=nestedAnnotationSource%>",<%=genModel.getNonNLS()%><%}%> - new String[] + new String[] { <%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);%> - <%=key%>, <%=value%><%=l.hasNext() ? "," : ""%><%=genModel.getNonNLS(key + value)%> + <%=key%>, <%=value%><%=l.hasNext() ? "," : ""%><%=genModel.getNonNLS(key + value)%> <%}%> }<%if (nestedAnnotationReferenceDataList.isEmpty()) {%>);<%} else {%>,<%}%> <%if (!nestedAnnotationReferenceDataList.isEmpty()) {%> - new <%=genModel.getImportedName("org.eclipse.emf.common.util.URI")%>[] + new <%=genModel.getImportedName("org.eclipse.emf.common.util.URI")%>[] { <%for (Iterator<GenPackage.AnnotationReferenceData> l = nestedAnnotationReferenceDataList.iterator(); l.hasNext();) { GenPackage.AnnotationReferenceData annotationReferenceData = l.next();%> <%=genModel.getImportedName("org.eclipse.emf.common.util.URI")%>.createURI(<%if (annotationReferenceData.containingGenPackage != genPackage) {%><%=annotationReferenceData.containingGenPackage.getImportedPackageInterfaceName()%>.<%}%>eNS_URI).appendFragment("<%=annotationReferenceData.uriFragment%>")<%if (l.hasNext()) {%>,<%}%><%=genModel.getNonNLS()%> @@ -1209,7 +1210,7 @@ int maxGenericTypeAssignment = 0; o.setOrdered(isOrdered); return o; } - + <%}%> <%if (needsAddEParameter) {%> /** @@ -1229,7 +1230,7 @@ int maxGenericTypeAssignment = 0; owner.getEParameters().add(p); return p; } - + <%}%> <%}%> <%if (isInterface && genPackage.isLiteralsInterface()) {%> diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/creation/library.ecore/src/org/examples/library/impl/LibraryPackageImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/creation/library.ecore/src/org/examples/library/impl/LibraryPackageImpl.java index 2fb7ac6e2..25b40512d 100644 --- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/creation/library.ecore/src/org/examples/library/impl/LibraryPackageImpl.java +++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/creation/library.ecore/src/org/examples/library/impl/LibraryPackageImpl.java @@ -83,7 +83,7 @@ public class LibraryPackageImpl extends EPackageImpl implements LibraryPackage /** * 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 --> @@ -98,7 +98,8 @@ public class LibraryPackageImpl extends EPackageImpl implements LibraryPackage if (isInited) return (LibraryPackage)EPackage.Registry.INSTANCE.getEPackage(LibraryPackage.eNS_URI); // Obtain or create and register package - LibraryPackageImpl theLibraryPackage = (LibraryPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof LibraryPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new LibraryPackageImpl()); + Object registeredLibraryPackage = EPackage.Registry.INSTANCE.get(eNS_URI); + LibraryPackageImpl theLibraryPackage = registeredLibraryPackage instanceof LibraryPackageImpl ? (LibraryPackageImpl)registeredLibraryPackage : new LibraryPackageImpl(); isInited = true; @@ -111,7 +112,6 @@ public class LibraryPackageImpl extends EPackageImpl implements LibraryPackage // 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; diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/creation/library.java/src/org/eclipse/example/library/impl/LibraryPackageImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/creation/library.java/src/org/eclipse/example/library/impl/LibraryPackageImpl.java index 997777719..5315c7d93 100644 --- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/creation/library.java/src/org/eclipse/example/library/impl/LibraryPackageImpl.java +++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/creation/library.java/src/org/eclipse/example/library/impl/LibraryPackageImpl.java @@ -114,7 +114,7 @@ public class LibraryPackageImpl extends EPackageImpl implements LibraryPackage /** * 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 --> @@ -129,7 +129,8 @@ public class LibraryPackageImpl extends EPackageImpl implements LibraryPackage if (isInited) return (LibraryPackage)EPackage.Registry.INSTANCE.getEPackage(LibraryPackage.eNS_URI); // Obtain or create and register package - LibraryPackageImpl theLibraryPackage = (LibraryPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof LibraryPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new LibraryPackageImpl()); + Object registeredLibraryPackage = EPackage.Registry.INSTANCE.get(eNS_URI); + LibraryPackageImpl theLibraryPackage = registeredLibraryPackage instanceof LibraryPackageImpl ? (LibraryPackageImpl)registeredLibraryPackage : new LibraryPackageImpl(); isInited = true; @@ -142,7 +143,6 @@ public class LibraryPackageImpl extends EPackageImpl implements LibraryPackage // 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; diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/creation/library.rose/src/org/examples/library/impl/LibraryPackageImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/creation/library.rose/src/org/examples/library/impl/LibraryPackageImpl.java index 2fb7ac6e2..25b40512d 100644 --- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/creation/library.rose/src/org/examples/library/impl/LibraryPackageImpl.java +++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/creation/library.rose/src/org/examples/library/impl/LibraryPackageImpl.java @@ -83,7 +83,7 @@ public class LibraryPackageImpl extends EPackageImpl implements LibraryPackage /** * 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 --> @@ -98,7 +98,8 @@ public class LibraryPackageImpl extends EPackageImpl implements LibraryPackage if (isInited) return (LibraryPackage)EPackage.Registry.INSTANCE.getEPackage(LibraryPackage.eNS_URI); // Obtain or create and register package - LibraryPackageImpl theLibraryPackage = (LibraryPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof LibraryPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new LibraryPackageImpl()); + Object registeredLibraryPackage = EPackage.Registry.INSTANCE.get(eNS_URI); + LibraryPackageImpl theLibraryPackage = registeredLibraryPackage instanceof LibraryPackageImpl ? (LibraryPackageImpl)registeredLibraryPackage : new LibraryPackageImpl(); isInited = true; @@ -111,7 +112,6 @@ public class LibraryPackageImpl extends EPackageImpl implements LibraryPackage // 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; diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/creation/library.xsd/src/org/examples/library/impl/LibraryPackageImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/creation/library.xsd/src/org/examples/library/impl/LibraryPackageImpl.java index 2ac0397b9..b0178d297 100644 --- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/creation/library.xsd/src/org/examples/library/impl/LibraryPackageImpl.java +++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/creation/library.xsd/src/org/examples/library/impl/LibraryPackageImpl.java @@ -93,7 +93,7 @@ public class LibraryPackageImpl extends EPackageImpl implements LibraryPackage /** * 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 --> @@ -108,7 +108,8 @@ public class LibraryPackageImpl extends EPackageImpl implements LibraryPackage if (isInited) return (LibraryPackage)EPackage.Registry.INSTANCE.getEPackage(LibraryPackage.eNS_URI); // Obtain or create and register package - LibraryPackageImpl theLibraryPackage = (LibraryPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof LibraryPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new LibraryPackageImpl()); + Object registeredLibraryPackage = EPackage.Registry.INSTANCE.get(eNS_URI); + LibraryPackageImpl theLibraryPackage = registeredLibraryPackage instanceof LibraryPackageImpl ? (LibraryPackageImpl)registeredLibraryPackage : new LibraryPackageImpl(); isInited = true; @@ -124,7 +125,6 @@ public class LibraryPackageImpl extends EPackageImpl implements LibraryPackage // 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; @@ -392,117 +392,117 @@ public class LibraryPackageImpl extends EPackageImpl implements LibraryPackage */ protected void createExtendedMetaDataAnnotations() { - String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; + String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; addAnnotation - (bookEClass, - source, - new String[] + (bookEClass, + source, + new String[] { - "name", "Book", - "kind", "elementOnly" - }); + "name", "Book", + "kind", "elementOnly" + }); addAnnotation - (getBook_Title(), - source, - new String[] + (getBook_Title(), + source, + new String[] { - "kind", "element", - "name", "title" - }); + "kind", "element", + "name", "title" + }); addAnnotation - (getBook_Pages(), - source, - new String[] + (getBook_Pages(), + source, + new String[] { - "kind", "element", - "name", "pages" - }); + "kind", "element", + "name", "pages" + }); addAnnotation - (getBook_Category(), - source, - new String[] + (getBook_Category(), + source, + new String[] { - "kind", "element", - "name", "category" - }); + "kind", "element", + "name", "category" + }); addAnnotation - (getBook_Author(), - source, - new String[] + (getBook_Author(), + source, + new String[] { - "kind", "element", - "name", "author" - }); + "kind", "element", + "name", "author" + }); addAnnotation - (bookCategoryEEnum, - source, - new String[] + (bookCategoryEEnum, + source, + new String[] { - "name", "BookCategory" - }); + "name", "BookCategory" + }); addAnnotation - (bookCategoryObjectEDataType, - source, - new String[] + (bookCategoryObjectEDataType, + source, + new String[] { - "name", "BookCategory:Object", - "baseType", "BookCategory" - }); + "name", "BookCategory:Object", + "baseType", "BookCategory" + }); addAnnotation - (libraryEClass, - source, - new String[] + (libraryEClass, + source, + new String[] { - "name", "Library", - "kind", "elementOnly" - }); + "name", "Library", + "kind", "elementOnly" + }); addAnnotation - (getLibrary_Name(), - source, - new String[] + (getLibrary_Name(), + source, + new String[] { - "kind", "element", - "name", "name" - }); + "kind", "element", + "name", "name" + }); addAnnotation - (getLibrary_Writers(), - source, - new String[] + (getLibrary_Writers(), + source, + new String[] { - "kind", "element", - "name", "writers" - }); + "kind", "element", + "name", "writers" + }); addAnnotation - (getLibrary_Books(), - source, - new String[] + (getLibrary_Books(), + source, + new String[] { - "kind", "element", - "name", "books" - }); + "kind", "element", + "name", "books" + }); addAnnotation - (writerEClass, - source, - new String[] + (writerEClass, + source, + new String[] { - "name", "Writer", - "kind", "elementOnly" - }); + "name", "Writer", + "kind", "elementOnly" + }); addAnnotation - (getWriter_Name(), - source, - new String[] + (getWriter_Name(), + source, + new String[] { - "kind", "element", - "name", "name" - }); + "kind", "element", + "name", "name" + }); addAnnotation - (getWriter_Books(), - source, - new String[] + (getWriter_Books(), + source, + new String[] { - "kind", "element", - "name", "books" + "kind", "element", + "name", "books" }); } diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/creation/library.xsds/src/org/examples/library/elements/impl/ElementsPackageImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/creation/library.xsds/src/org/examples/library/elements/impl/ElementsPackageImpl.java index ef748defc..6703dbd23 100644 --- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/creation/library.xsds/src/org/examples/library/elements/impl/ElementsPackageImpl.java +++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/creation/library.xsds/src/org/examples/library/elements/impl/ElementsPackageImpl.java @@ -89,7 +89,7 @@ public class ElementsPackageImpl extends EPackageImpl implements ElementsPackage /** * 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 --> @@ -104,7 +104,8 @@ public class ElementsPackageImpl extends EPackageImpl implements ElementsPackage if (isInited) return (ElementsPackage)EPackage.Registry.INSTANCE.getEPackage(ElementsPackage.eNS_URI); // Obtain or create and register package - ElementsPackageImpl theElementsPackage = (ElementsPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof ElementsPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new ElementsPackageImpl()); + Object registeredElementsPackage = EPackage.Registry.INSTANCE.get(eNS_URI); + ElementsPackageImpl theElementsPackage = registeredElementsPackage instanceof ElementsPackageImpl ? (ElementsPackageImpl)registeredElementsPackage : new ElementsPackageImpl(); isInited = true; @@ -112,7 +113,8 @@ public class ElementsPackageImpl extends EPackageImpl implements ElementsPackage XMLTypePackage.eINSTANCE.eClass(); // Obtain or create and register interdependencies - LibraryPackageImpl theLibraryPackage = (LibraryPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(LibraryPackage.eNS_URI) instanceof LibraryPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(LibraryPackage.eNS_URI) : LibraryPackage.eINSTANCE); + Object registeredPackage = EPackage.Registry.INSTANCE.getEPackage(LibraryPackage.eNS_URI); + LibraryPackageImpl theLibraryPackage = (LibraryPackageImpl)(registeredPackage instanceof LibraryPackageImpl ? registeredPackage : LibraryPackage.eINSTANCE); // Create package meta-data objects theElementsPackage.createPackageContents(); @@ -125,7 +127,6 @@ public class ElementsPackageImpl extends EPackageImpl implements ElementsPackage // 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; @@ -343,85 +344,85 @@ public class ElementsPackageImpl extends EPackageImpl implements ElementsPackage */ protected void createExtendedMetaDataAnnotations() { - String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; + String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; addAnnotation - (bookEClass, - source, - new String[] + (bookEClass, + source, + new String[] { - "name", "Book", - "kind", "elementOnly" - }); + "name", "Book", + "kind", "elementOnly" + }); addAnnotation - (getBook_Title(), - source, - new String[] + (getBook_Title(), + source, + new String[] { - "kind", "element", - "name", "title" - }); + "kind", "element", + "name", "title" + }); addAnnotation - (getBook_Pages(), - source, - new String[] + (getBook_Pages(), + source, + new String[] { - "kind", "element", - "name", "pages" - }); + "kind", "element", + "name", "pages" + }); addAnnotation - (getBook_Category(), - source, - new String[] + (getBook_Category(), + source, + new String[] { - "kind", "element", - "name", "category" - }); + "kind", "element", + "name", "category" + }); addAnnotation - (getBook_Author(), - source, - new String[] + (getBook_Author(), + source, + new String[] { - "kind", "element", - "name", "author" - }); + "kind", "element", + "name", "author" + }); addAnnotation - (bookCategoryEEnum, - source, - new String[] + (bookCategoryEEnum, + source, + new String[] { - "name", "BookCategory" - }); + "name", "BookCategory" + }); addAnnotation - (bookCategoryObjectEDataType, - source, - new String[] + (bookCategoryObjectEDataType, + source, + new String[] { - "name", "BookCategory:Object", - "baseType", "BookCategory" - }); + "name", "BookCategory:Object", + "baseType", "BookCategory" + }); addAnnotation - (writerEClass, - source, - new String[] + (writerEClass, + source, + new String[] { - "name", "Writer", - "kind", "elementOnly" - }); + "name", "Writer", + "kind", "elementOnly" + }); addAnnotation - (getWriter_Name(), - source, - new String[] + (getWriter_Name(), + source, + new String[] { - "kind", "element", - "name", "name" - }); + "kind", "element", + "name", "name" + }); addAnnotation - (getWriter_Books(), - source, - new String[] + (getWriter_Books(), + source, + new String[] { - "kind", "element", - "name", "books" + "kind", "element", + "name", "books" }); } diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/creation/library.xsds/src/org/examples/library/impl/LibraryPackageImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/creation/library.xsds/src/org/examples/library/impl/LibraryPackageImpl.java index fbf192a0b..116119615 100644 --- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/creation/library.xsds/src/org/examples/library/impl/LibraryPackageImpl.java +++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/creation/library.xsds/src/org/examples/library/impl/LibraryPackageImpl.java @@ -64,7 +64,7 @@ public class LibraryPackageImpl extends EPackageImpl implements LibraryPackage /** * 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 --> @@ -79,7 +79,8 @@ public class LibraryPackageImpl extends EPackageImpl implements LibraryPackage if (isInited) return (LibraryPackage)EPackage.Registry.INSTANCE.getEPackage(LibraryPackage.eNS_URI); // Obtain or create and register package - LibraryPackageImpl theLibraryPackage = (LibraryPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof LibraryPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new LibraryPackageImpl()); + Object registeredLibraryPackage = EPackage.Registry.INSTANCE.get(eNS_URI); + LibraryPackageImpl theLibraryPackage = registeredLibraryPackage instanceof LibraryPackageImpl ? (LibraryPackageImpl)registeredLibraryPackage : new LibraryPackageImpl(); isInited = true; @@ -87,7 +88,8 @@ public class LibraryPackageImpl extends EPackageImpl implements LibraryPackage XMLTypePackage.eINSTANCE.eClass(); // Obtain or create and register interdependencies - ElementsPackageImpl theElementsPackage = (ElementsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ElementsPackage.eNS_URI) instanceof ElementsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ElementsPackage.eNS_URI) : ElementsPackage.eINSTANCE); + Object registeredPackage = EPackage.Registry.INSTANCE.getEPackage(ElementsPackage.eNS_URI); + ElementsPackageImpl theElementsPackage = (ElementsPackageImpl)(registeredPackage instanceof ElementsPackageImpl ? registeredPackage : ElementsPackage.eINSTANCE); // Create package meta-data objects theLibraryPackage.createPackageContents(); @@ -100,7 +102,6 @@ public class LibraryPackageImpl extends EPackageImpl implements LibraryPackage // 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; @@ -234,38 +235,38 @@ public class LibraryPackageImpl extends EPackageImpl implements LibraryPackage */ protected void createExtendedMetaDataAnnotations() { - String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; + String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; addAnnotation - (libraryEClass, - source, - new String[] + (libraryEClass, + source, + new String[] { - "name", "Library", - "kind", "elementOnly" - }); + "name", "Library", + "kind", "elementOnly" + }); addAnnotation - (getLibrary_Name(), - source, - new String[] + (getLibrary_Name(), + source, + new String[] { - "kind", "element", - "name", "name" - }); + "kind", "element", + "name", "name" + }); addAnnotation - (getLibrary_Writers(), - source, - new String[] + (getLibrary_Writers(), + source, + new String[] { - "kind", "element", - "name", "writers" - }); + "kind", "element", + "name", "writers" + }); addAnnotation - (getLibrary_Books(), - source, - new String[] + (getLibrary_Books(), + source, + new String[] { - "kind", "element", - "name", "books" + "kind", "element", + "name", "books" }); } diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.ecore/src/org/examples/hr/impl/HRPackageImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.ecore/src/org/examples/hr/impl/HRPackageImpl.java index 01368f843..bf53514fe 100644 --- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.ecore/src/org/examples/hr/impl/HRPackageImpl.java +++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.ecore/src/org/examples/hr/impl/HRPackageImpl.java @@ -62,7 +62,7 @@ public class HRPackageImpl extends EPackageImpl implements HRPackage /** * 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 --> @@ -77,12 +77,14 @@ public class HRPackageImpl extends EPackageImpl implements HRPackage if (isInited) return (HRPackage)EPackage.Registry.INSTANCE.getEPackage(HRPackage.eNS_URI); // Obtain or create and register package - HRPackageImpl theHRPackage = (HRPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof HRPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new HRPackageImpl()); + Object registeredHRPackage = EPackage.Registry.INSTANCE.get(eNS_URI); + HRPackageImpl theHRPackage = registeredHRPackage instanceof HRPackageImpl ? (HRPackageImpl)registeredHRPackage : new HRPackageImpl(); isInited = true; // Obtain or create and register interdependencies - LibraryPackageImpl theLibraryPackage = (LibraryPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(LibraryPackage.eNS_URI) instanceof LibraryPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(LibraryPackage.eNS_URI) : LibraryPackage.eINSTANCE); + Object registeredPackage = EPackage.Registry.INSTANCE.getEPackage(LibraryPackage.eNS_URI); + LibraryPackageImpl theLibraryPackage = (LibraryPackageImpl)(registeredPackage instanceof LibraryPackageImpl ? registeredPackage : LibraryPackage.eINSTANCE); // Create package meta-data objects theHRPackage.createPackageContents(); @@ -95,7 +97,6 @@ public class HRPackageImpl extends EPackageImpl implements HRPackage // 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; diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.ecore/src/org/examples/library/impl/LibraryPackageImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.ecore/src/org/examples/library/impl/LibraryPackageImpl.java index 0f090a985..b66396467 100644 --- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.ecore/src/org/examples/library/impl/LibraryPackageImpl.java +++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.ecore/src/org/examples/library/impl/LibraryPackageImpl.java @@ -85,7 +85,7 @@ public class LibraryPackageImpl extends EPackageImpl implements LibraryPackage /** * 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 --> @@ -100,12 +100,14 @@ public class LibraryPackageImpl extends EPackageImpl implements LibraryPackage if (isInited) return (LibraryPackage)EPackage.Registry.INSTANCE.getEPackage(LibraryPackage.eNS_URI); // Obtain or create and register package - LibraryPackageImpl theLibraryPackage = (LibraryPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof LibraryPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new LibraryPackageImpl()); + Object registeredLibraryPackage = EPackage.Registry.INSTANCE.get(eNS_URI); + LibraryPackageImpl theLibraryPackage = registeredLibraryPackage instanceof LibraryPackageImpl ? (LibraryPackageImpl)registeredLibraryPackage : new LibraryPackageImpl(); isInited = true; // Obtain or create and register interdependencies - HRPackageImpl theHRPackage = (HRPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(HRPackage.eNS_URI) instanceof HRPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(HRPackage.eNS_URI) : HRPackage.eINSTANCE); + Object registeredPackage = EPackage.Registry.INSTANCE.getEPackage(HRPackage.eNS_URI); + HRPackageImpl theHRPackage = (HRPackageImpl)(registeredPackage instanceof HRPackageImpl ? registeredPackage : HRPackage.eINSTANCE); // Create package meta-data objects theLibraryPackage.createPackageContents(); @@ -118,7 +120,6 @@ public class LibraryPackageImpl extends EPackageImpl implements LibraryPackage // 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; diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.rose/src/org/examples/hr/impl/HRPackageImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.rose/src/org/examples/hr/impl/HRPackageImpl.java index 01368f843..bf53514fe 100644 --- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.rose/src/org/examples/hr/impl/HRPackageImpl.java +++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.rose/src/org/examples/hr/impl/HRPackageImpl.java @@ -62,7 +62,7 @@ public class HRPackageImpl extends EPackageImpl implements HRPackage /** * 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 --> @@ -77,12 +77,14 @@ public class HRPackageImpl extends EPackageImpl implements HRPackage if (isInited) return (HRPackage)EPackage.Registry.INSTANCE.getEPackage(HRPackage.eNS_URI); // Obtain or create and register package - HRPackageImpl theHRPackage = (HRPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof HRPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new HRPackageImpl()); + Object registeredHRPackage = EPackage.Registry.INSTANCE.get(eNS_URI); + HRPackageImpl theHRPackage = registeredHRPackage instanceof HRPackageImpl ? (HRPackageImpl)registeredHRPackage : new HRPackageImpl(); isInited = true; // Obtain or create and register interdependencies - LibraryPackageImpl theLibraryPackage = (LibraryPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(LibraryPackage.eNS_URI) instanceof LibraryPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(LibraryPackage.eNS_URI) : LibraryPackage.eINSTANCE); + Object registeredPackage = EPackage.Registry.INSTANCE.getEPackage(LibraryPackage.eNS_URI); + LibraryPackageImpl theLibraryPackage = (LibraryPackageImpl)(registeredPackage instanceof LibraryPackageImpl ? registeredPackage : LibraryPackage.eINSTANCE); // Create package meta-data objects theHRPackage.createPackageContents(); @@ -95,7 +97,6 @@ public class HRPackageImpl extends EPackageImpl implements HRPackage // 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; diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.rose/src/org/examples/library/impl/LibraryPackageImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.rose/src/org/examples/library/impl/LibraryPackageImpl.java index 0f090a985..b66396467 100644 --- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.rose/src/org/examples/library/impl/LibraryPackageImpl.java +++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.rose/src/org/examples/library/impl/LibraryPackageImpl.java @@ -85,7 +85,7 @@ public class LibraryPackageImpl extends EPackageImpl implements LibraryPackage /** * 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 --> @@ -100,12 +100,14 @@ public class LibraryPackageImpl extends EPackageImpl implements LibraryPackage if (isInited) return (LibraryPackage)EPackage.Registry.INSTANCE.getEPackage(LibraryPackage.eNS_URI); // Obtain or create and register package - LibraryPackageImpl theLibraryPackage = (LibraryPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof LibraryPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new LibraryPackageImpl()); + Object registeredLibraryPackage = EPackage.Registry.INSTANCE.get(eNS_URI); + LibraryPackageImpl theLibraryPackage = registeredLibraryPackage instanceof LibraryPackageImpl ? (LibraryPackageImpl)registeredLibraryPackage : new LibraryPackageImpl(); isInited = true; // Obtain or create and register interdependencies - HRPackageImpl theHRPackage = (HRPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(HRPackage.eNS_URI) instanceof HRPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(HRPackage.eNS_URI) : HRPackage.eINSTANCE); + Object registeredPackage = EPackage.Registry.INSTANCE.getEPackage(HRPackage.eNS_URI); + HRPackageImpl theHRPackage = (HRPackageImpl)(registeredPackage instanceof HRPackageImpl ? registeredPackage : HRPackage.eINSTANCE); // Create package meta-data objects theLibraryPackage.createPackageContents(); @@ -118,7 +120,6 @@ public class LibraryPackageImpl extends EPackageImpl implements LibraryPackage // 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; diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.xsd/src/org/examples/library/impl/LibraryPackageImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.xsd/src/org/examples/library/impl/LibraryPackageImpl.java index cf4ad51d0..a7adb7319 100644 --- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.xsd/src/org/examples/library/impl/LibraryPackageImpl.java +++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.xsd/src/org/examples/library/impl/LibraryPackageImpl.java @@ -93,7 +93,7 @@ public class LibraryPackageImpl extends EPackageImpl implements LibraryPackage /** * 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 --> @@ -108,7 +108,8 @@ public class LibraryPackageImpl extends EPackageImpl implements LibraryPackage if (isInited) return (LibraryPackage)EPackage.Registry.INSTANCE.getEPackage(LibraryPackage.eNS_URI); // Obtain or create and register package - LibraryPackageImpl theLibraryPackage = (LibraryPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof LibraryPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new LibraryPackageImpl()); + Object registeredLibraryPackage = EPackage.Registry.INSTANCE.get(eNS_URI); + LibraryPackageImpl theLibraryPackage = registeredLibraryPackage instanceof LibraryPackageImpl ? (LibraryPackageImpl)registeredLibraryPackage : new LibraryPackageImpl(); isInited = true; @@ -124,7 +125,6 @@ public class LibraryPackageImpl extends EPackageImpl implements LibraryPackage // 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; @@ -405,125 +405,125 @@ public class LibraryPackageImpl extends EPackageImpl implements LibraryPackage */ protected void createExtendedMetaDataAnnotations() { - String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; //$NON-NLS-1$ + String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; //$NON-NLS-1$ addAnnotation - (bookEClass, - source, - new String[] + (bookEClass, + source, + new String[] { - "name", "Book", //$NON-NLS-1$ //$NON-NLS-2$ - "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$ - }); + "name", "Book", //$NON-NLS-1$ //$NON-NLS-2$ + "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$ + }); addAnnotation - (getBook_Title(), - source, - new String[] + (getBook_Title(), + source, + new String[] { - "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "title" //$NON-NLS-1$ //$NON-NLS-2$ - }); + "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ + "name", "title" //$NON-NLS-1$ //$NON-NLS-2$ + }); addAnnotation - (getBook_Pages(), - source, - new String[] + (getBook_Pages(), + source, + new String[] { - "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "pages" //$NON-NLS-1$ //$NON-NLS-2$ - }); + "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ + "name", "pages" //$NON-NLS-1$ //$NON-NLS-2$ + }); addAnnotation - (getBook_Category(), - source, - new String[] + (getBook_Category(), + source, + new String[] { - "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "category" //$NON-NLS-1$ //$NON-NLS-2$ - }); + "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ + "name", "category" //$NON-NLS-1$ //$NON-NLS-2$ + }); addAnnotation - (getBook_Author(), - source, - new String[] + (getBook_Author(), + source, + new String[] { - "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "author" //$NON-NLS-1$ //$NON-NLS-2$ - }); + "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ + "name", "author" //$NON-NLS-1$ //$NON-NLS-2$ + }); addAnnotation - (bookCategoryEEnum, - source, - new String[] + (bookCategoryEEnum, + source, + new String[] { - "name", "BookCategory" //$NON-NLS-1$ //$NON-NLS-2$ - }); + "name", "BookCategory" //$NON-NLS-1$ //$NON-NLS-2$ + }); addAnnotation - (bookCategoryObjectEDataType, - source, - new String[] + (bookCategoryObjectEDataType, + source, + new String[] { - "name", "BookCategory:Object", //$NON-NLS-1$ //$NON-NLS-2$ - "baseType", "BookCategory" //$NON-NLS-1$ //$NON-NLS-2$ - }); + "name", "BookCategory:Object", //$NON-NLS-1$ //$NON-NLS-2$ + "baseType", "BookCategory" //$NON-NLS-1$ //$NON-NLS-2$ + }); addAnnotation - (libraryEClass, - source, - new String[] + (libraryEClass, + source, + new String[] { - "name", "Library", //$NON-NLS-1$ //$NON-NLS-2$ - "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$ - }); + "name", "Library", //$NON-NLS-1$ //$NON-NLS-2$ + "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$ + }); addAnnotation - (getLibrary_Name(), - source, - new String[] + (getLibrary_Name(), + source, + new String[] { - "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "name" //$NON-NLS-1$ //$NON-NLS-2$ - }); + "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ + "name", "name" //$NON-NLS-1$ //$NON-NLS-2$ + }); addAnnotation - (getLibrary_Site(), - source, - new String[] + (getLibrary_Site(), + source, + new String[] { - "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "site" //$NON-NLS-1$ //$NON-NLS-2$ - }); + "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ + "name", "site" //$NON-NLS-1$ //$NON-NLS-2$ + }); addAnnotation - (getLibrary_Writers(), - source, - new String[] + (getLibrary_Writers(), + source, + new String[] { - "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "writers" //$NON-NLS-1$ //$NON-NLS-2$ - }); + "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ + "name", "writers" //$NON-NLS-1$ //$NON-NLS-2$ + }); addAnnotation - (getLibrary_Books(), - source, - new String[] + (getLibrary_Books(), + source, + new String[] { - "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "books" //$NON-NLS-1$ //$NON-NLS-2$ - }); + "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ + "name", "books" //$NON-NLS-1$ //$NON-NLS-2$ + }); addAnnotation - (writerEClass, - source, - new String[] + (writerEClass, + source, + new String[] { - "name", "Writer", //$NON-NLS-1$ //$NON-NLS-2$ - "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$ - }); + "name", "Writer", //$NON-NLS-1$ //$NON-NLS-2$ + "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$ + }); addAnnotation - (getWriter_Name(), - source, - new String[] + (getWriter_Name(), + source, + new String[] { - "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "name" //$NON-NLS-1$ //$NON-NLS-2$ - }); + "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ + "name", "name" //$NON-NLS-1$ //$NON-NLS-2$ + }); addAnnotation - (getWriter_Books(), - source, - new String[] + (getWriter_Books(), + source, + new String[] { - "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "books" //$NON-NLS-1$ //$NON-NLS-2$ + "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ + "name", "books" //$NON-NLS-1$ //$NON-NLS-2$ }); } diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.xsds/src/org/examples/library/elements/impl/ElementsPackageImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.xsds/src/org/examples/library/elements/impl/ElementsPackageImpl.java index 34eb0b737..70880443a 100644 --- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.xsds/src/org/examples/library/elements/impl/ElementsPackageImpl.java +++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.xsds/src/org/examples/library/elements/impl/ElementsPackageImpl.java @@ -100,7 +100,7 @@ public class ElementsPackageImpl extends EPackageImpl implements ElementsPackage /** * 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 --> @@ -115,7 +115,8 @@ public class ElementsPackageImpl extends EPackageImpl implements ElementsPackage if (isInited) return (ElementsPackage)EPackage.Registry.INSTANCE.getEPackage(ElementsPackage.eNS_URI); // Obtain or create and register package - ElementsPackageImpl theElementsPackage = (ElementsPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof ElementsPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new ElementsPackageImpl()); + Object registeredElementsPackage = EPackage.Registry.INSTANCE.get(eNS_URI); + ElementsPackageImpl theElementsPackage = registeredElementsPackage instanceof ElementsPackageImpl ? (ElementsPackageImpl)registeredElementsPackage : new ElementsPackageImpl(); isInited = true; @@ -123,8 +124,10 @@ public class ElementsPackageImpl extends EPackageImpl implements ElementsPackage XMLTypePackage.eINSTANCE.eClass(); // Obtain or create and register interdependencies - HrPackageImpl theHrPackage = (HrPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(HrPackage.eNS_URI) instanceof HrPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(HrPackage.eNS_URI) : HrPackage.eINSTANCE); - LibraryPackageImpl theLibraryPackage = (LibraryPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(LibraryPackage.eNS_URI) instanceof LibraryPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(LibraryPackage.eNS_URI) : LibraryPackage.eINSTANCE); + Object registeredPackage = EPackage.Registry.INSTANCE.getEPackage(HrPackage.eNS_URI); + HrPackageImpl theHrPackage = (HrPackageImpl)(registeredPackage instanceof HrPackageImpl ? registeredPackage : HrPackage.eINSTANCE); + registeredPackage = EPackage.Registry.INSTANCE.getEPackage(LibraryPackage.eNS_URI); + LibraryPackageImpl theLibraryPackage = (LibraryPackageImpl)(registeredPackage instanceof LibraryPackageImpl ? registeredPackage : LibraryPackage.eINSTANCE); // Create package meta-data objects theElementsPackage.createPackageContents(); @@ -138,7 +141,7 @@ public class ElementsPackageImpl extends EPackageImpl implements ElementsPackage // Register package validator EValidator.Registry.INSTANCE.put - (theElementsPackage, + (theElementsPackage, new EValidator.Descriptor() { public EValidator getEValidator() @@ -150,7 +153,6 @@ public class ElementsPackageImpl extends EPackageImpl implements ElementsPackage // 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; @@ -383,94 +385,94 @@ public class ElementsPackageImpl extends EPackageImpl implements ElementsPackage */ protected void createExtendedMetaDataAnnotations() { - String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; //$NON-NLS-1$ + String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; //$NON-NLS-1$ addAnnotation - (bookEClass, - source, - new String[] + (bookEClass, + source, + new String[] { - "name", "Book", //$NON-NLS-1$ //$NON-NLS-2$ - "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$ - }); + "name", "Book", //$NON-NLS-1$ //$NON-NLS-2$ + "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$ + }); addAnnotation - (getBook_Title(), - source, - new String[] + (getBook_Title(), + source, + new String[] { - "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "title" //$NON-NLS-1$ //$NON-NLS-2$ - }); + "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ + "name", "title" //$NON-NLS-1$ //$NON-NLS-2$ + }); addAnnotation - (getBook_Pages(), - source, - new String[] + (getBook_Pages(), + source, + new String[] { - "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "pages" //$NON-NLS-1$ //$NON-NLS-2$ - }); + "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ + "name", "pages" //$NON-NLS-1$ //$NON-NLS-2$ + }); addAnnotation - (getBook_Category(), - source, - new String[] + (getBook_Category(), + source, + new String[] { - "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "category" //$NON-NLS-1$ //$NON-NLS-2$ - }); + "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ + "name", "category" //$NON-NLS-1$ //$NON-NLS-2$ + }); addAnnotation - (getBook_Author(), - source, - new String[] + (getBook_Author(), + source, + new String[] { - "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "author" //$NON-NLS-1$ //$NON-NLS-2$ - }); + "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ + "name", "author" //$NON-NLS-1$ //$NON-NLS-2$ + }); addAnnotation - (getBook_Uuid(), - source, - new String[] + (getBook_Uuid(), + source, + new String[] { - "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "uuid" //$NON-NLS-1$ //$NON-NLS-2$ - }); + "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$ + "name", "uuid" //$NON-NLS-1$ //$NON-NLS-2$ + }); addAnnotation - (bookCategoryEEnum, - source, - new String[] + (bookCategoryEEnum, + source, + new String[] { - "name", "BookCategory" //$NON-NLS-1$ //$NON-NLS-2$ - }); + "name", "BookCategory" //$NON-NLS-1$ //$NON-NLS-2$ + }); addAnnotation - (bookCategoryObjectEDataType, - source, - new String[] + (bookCategoryObjectEDataType, + source, + new String[] { - "name", "BookCategory:Object", //$NON-NLS-1$ //$NON-NLS-2$ - "baseType", "BookCategory" //$NON-NLS-1$ //$NON-NLS-2$ - }); + "name", "BookCategory:Object", //$NON-NLS-1$ //$NON-NLS-2$ + "baseType", "BookCategory" //$NON-NLS-1$ //$NON-NLS-2$ + }); addAnnotation - (uuidEDataType, - source, - new String[] + (uuidEDataType, + source, + new String[] { - "name", "UUID", //$NON-NLS-1$ //$NON-NLS-2$ - "baseType", "http://www.eclipse.org/emf/2003/XMLType#hexBinary", //$NON-NLS-1$ //$NON-NLS-2$ - "length", "16" //$NON-NLS-1$ //$NON-NLS-2$ - }); + "name", "UUID", //$NON-NLS-1$ //$NON-NLS-2$ + "baseType", "http://www.eclipse.org/emf/2003/XMLType#hexBinary", //$NON-NLS-1$ //$NON-NLS-2$ + "length", "16" //$NON-NLS-1$ //$NON-NLS-2$ + }); addAnnotation - (writerEClass, - source, - new String[] + (writerEClass, + source, + new String[] { - "name", "Writer", //$NON-NLS-1$ //$NON-NLS-2$ - "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$ - }); + "name", "Writer", //$NON-NLS-1$ //$NON-NLS-2$ + "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$ + }); addAnnotation - (getWriter_Books(), - source, - new String[] + (getWriter_Books(), + source, + new String[] { - "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "books" //$NON-NLS-1$ //$NON-NLS-2$ + "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ + "name", "books" //$NON-NLS-1$ //$NON-NLS-2$ }); } diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.xsds/src/org/examples/library/hr/impl/HrPackageImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.xsds/src/org/examples/library/hr/impl/HrPackageImpl.java index 8e7611c33..569ac5190 100644 --- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.xsds/src/org/examples/library/hr/impl/HrPackageImpl.java +++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.xsds/src/org/examples/library/hr/impl/HrPackageImpl.java @@ -68,7 +68,7 @@ public class HrPackageImpl extends EPackageImpl implements HrPackage /** * 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 --> @@ -83,7 +83,8 @@ public class HrPackageImpl extends EPackageImpl implements HrPackage if (isInited) return (HrPackage)EPackage.Registry.INSTANCE.getEPackage(HrPackage.eNS_URI); // Obtain or create and register package - HrPackageImpl theHrPackage = (HrPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof HrPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new HrPackageImpl()); + Object registeredHrPackage = EPackage.Registry.INSTANCE.get(eNS_URI); + HrPackageImpl theHrPackage = registeredHrPackage instanceof HrPackageImpl ? (HrPackageImpl)registeredHrPackage : new HrPackageImpl(); isInited = true; @@ -91,8 +92,10 @@ public class HrPackageImpl extends EPackageImpl implements HrPackage XMLTypePackage.eINSTANCE.eClass(); // Obtain or create and register interdependencies - ElementsPackageImpl theElementsPackage = (ElementsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ElementsPackage.eNS_URI) instanceof ElementsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ElementsPackage.eNS_URI) : ElementsPackage.eINSTANCE); - LibraryPackageImpl theLibraryPackage = (LibraryPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(LibraryPackage.eNS_URI) instanceof LibraryPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(LibraryPackage.eNS_URI) : LibraryPackage.eINSTANCE); + Object registeredPackage = EPackage.Registry.INSTANCE.getEPackage(ElementsPackage.eNS_URI); + ElementsPackageImpl theElementsPackage = (ElementsPackageImpl)(registeredPackage instanceof ElementsPackageImpl ? registeredPackage : ElementsPackage.eINSTANCE); + registeredPackage = EPackage.Registry.INSTANCE.getEPackage(LibraryPackage.eNS_URI); + LibraryPackageImpl theLibraryPackage = (LibraryPackageImpl)(registeredPackage instanceof LibraryPackageImpl ? registeredPackage : LibraryPackage.eINSTANCE); // Create package meta-data objects theHrPackage.createPackageContents(); @@ -107,7 +110,6 @@ public class HrPackageImpl extends EPackageImpl implements HrPackage // 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; @@ -229,30 +231,30 @@ public class HrPackageImpl extends EPackageImpl implements HrPackage */ protected void createExtendedMetaDataAnnotations() { - String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; //$NON-NLS-1$ + String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; //$NON-NLS-1$ addAnnotation - (personEClass, - source, - new String[] + (personEClass, + source, + new String[] { - "name", "Person", //$NON-NLS-1$ //$NON-NLS-2$ - "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$ - }); + "name", "Person", //$NON-NLS-1$ //$NON-NLS-2$ + "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$ + }); addAnnotation - (getPerson_Name(), - source, - new String[] + (getPerson_Name(), + source, + new String[] { - "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "name" //$NON-NLS-1$ //$NON-NLS-2$ - }); + "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ + "name", "name" //$NON-NLS-1$ //$NON-NLS-2$ + }); addAnnotation - (getPerson_Library(), - source, - new String[] + (getPerson_Library(), + source, + new String[] { - "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "library" //$NON-NLS-1$ //$NON-NLS-2$ + "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ + "name", "library" //$NON-NLS-1$ //$NON-NLS-2$ }); } diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.xsds/src/org/examples/library/impl/LibraryPackageImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.xsds/src/org/examples/library/impl/LibraryPackageImpl.java index ffe633278..32efdc219 100644 --- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.xsds/src/org/examples/library/impl/LibraryPackageImpl.java +++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.xsds/src/org/examples/library/impl/LibraryPackageImpl.java @@ -66,7 +66,7 @@ public class LibraryPackageImpl extends EPackageImpl implements LibraryPackage /** * 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 --> @@ -81,7 +81,8 @@ public class LibraryPackageImpl extends EPackageImpl implements LibraryPackage if (isInited) return (LibraryPackage)EPackage.Registry.INSTANCE.getEPackage(LibraryPackage.eNS_URI); // Obtain or create and register package - LibraryPackageImpl theLibraryPackage = (LibraryPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof LibraryPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new LibraryPackageImpl()); + Object registeredLibraryPackage = EPackage.Registry.INSTANCE.get(eNS_URI); + LibraryPackageImpl theLibraryPackage = registeredLibraryPackage instanceof LibraryPackageImpl ? (LibraryPackageImpl)registeredLibraryPackage : new LibraryPackageImpl(); isInited = true; @@ -89,8 +90,10 @@ public class LibraryPackageImpl extends EPackageImpl implements LibraryPackage XMLTypePackage.eINSTANCE.eClass(); // Obtain or create and register interdependencies - ElementsPackageImpl theElementsPackage = (ElementsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ElementsPackage.eNS_URI) instanceof ElementsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ElementsPackage.eNS_URI) : ElementsPackage.eINSTANCE); - HrPackageImpl theHrPackage = (HrPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(HrPackage.eNS_URI) instanceof HrPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(HrPackage.eNS_URI) : HrPackage.eINSTANCE); + Object registeredPackage = EPackage.Registry.INSTANCE.getEPackage(ElementsPackage.eNS_URI); + ElementsPackageImpl theElementsPackage = (ElementsPackageImpl)(registeredPackage instanceof ElementsPackageImpl ? registeredPackage : ElementsPackage.eINSTANCE); + registeredPackage = EPackage.Registry.INSTANCE.getEPackage(HrPackage.eNS_URI); + HrPackageImpl theHrPackage = (HrPackageImpl)(registeredPackage instanceof HrPackageImpl ? registeredPackage : HrPackage.eINSTANCE); // Create package meta-data objects theLibraryPackage.createPackageContents(); @@ -105,7 +108,6 @@ public class LibraryPackageImpl extends EPackageImpl implements LibraryPackage // 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; @@ -252,46 +254,46 @@ public class LibraryPackageImpl extends EPackageImpl implements LibraryPackage */ protected void createExtendedMetaDataAnnotations() { - String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; //$NON-NLS-1$ + String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; //$NON-NLS-1$ addAnnotation - (libraryEClass, - source, - new String[] + (libraryEClass, + source, + new String[] { - "name", "Library", //$NON-NLS-1$ //$NON-NLS-2$ - "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$ - }); + "name", "Library", //$NON-NLS-1$ //$NON-NLS-2$ + "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$ + }); addAnnotation - (getLibrary_Name(), - source, - new String[] + (getLibrary_Name(), + source, + new String[] { - "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "name" //$NON-NLS-1$ //$NON-NLS-2$ - }); + "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ + "name", "name" //$NON-NLS-1$ //$NON-NLS-2$ + }); addAnnotation - (getLibrary_Writers(), - source, - new String[] + (getLibrary_Writers(), + source, + new String[] { - "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "writers" //$NON-NLS-1$ //$NON-NLS-2$ - }); + "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ + "name", "writers" //$NON-NLS-1$ //$NON-NLS-2$ + }); addAnnotation - (getLibrary_Books(), - source, - new String[] + (getLibrary_Books(), + source, + new String[] { - "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "books" //$NON-NLS-1$ //$NON-NLS-2$ - }); + "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ + "name", "books" //$NON-NLS-1$ //$NON-NLS-2$ + }); addAnnotation - (getLibrary_Employees(), - source, - new String[] + (getLibrary_Employees(), + source, + new String[] { - "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "employees" //$NON-NLS-1$ //$NON-NLS-2$ + "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ + "name", "employees" //$NON-NLS-1$ //$NON-NLS-2$ }); } diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/creation/library.ecore/src/org/examples/library/impl/LibraryPackageImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/creation/library.ecore/src/org/examples/library/impl/LibraryPackageImpl.java index 2fb7ac6e2..25b40512d 100644 --- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/creation/library.ecore/src/org/examples/library/impl/LibraryPackageImpl.java +++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/creation/library.ecore/src/org/examples/library/impl/LibraryPackageImpl.java @@ -83,7 +83,7 @@ public class LibraryPackageImpl extends EPackageImpl implements LibraryPackage /** * 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 --> @@ -98,7 +98,8 @@ public class LibraryPackageImpl extends EPackageImpl implements LibraryPackage if (isInited) return (LibraryPackage)EPackage.Registry.INSTANCE.getEPackage(LibraryPackage.eNS_URI); // Obtain or create and register package - LibraryPackageImpl theLibraryPackage = (LibraryPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof LibraryPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new LibraryPackageImpl()); + Object registeredLibraryPackage = EPackage.Registry.INSTANCE.get(eNS_URI); + LibraryPackageImpl theLibraryPackage = registeredLibraryPackage instanceof LibraryPackageImpl ? (LibraryPackageImpl)registeredLibraryPackage : new LibraryPackageImpl(); isInited = true; @@ -111,7 +112,6 @@ public class LibraryPackageImpl extends EPackageImpl implements LibraryPackage // 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; diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/creation/library.rose/src/org/examples/library/impl/LibraryPackageImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/creation/library.rose/src/org/examples/library/impl/LibraryPackageImpl.java index 2fb7ac6e2..25b40512d 100644 --- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/creation/library.rose/src/org/examples/library/impl/LibraryPackageImpl.java +++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/creation/library.rose/src/org/examples/library/impl/LibraryPackageImpl.java @@ -83,7 +83,7 @@ public class LibraryPackageImpl extends EPackageImpl implements LibraryPackage /** * 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 --> @@ -98,7 +98,8 @@ public class LibraryPackageImpl extends EPackageImpl implements LibraryPackage if (isInited) return (LibraryPackage)EPackage.Registry.INSTANCE.getEPackage(LibraryPackage.eNS_URI); // Obtain or create and register package - LibraryPackageImpl theLibraryPackage = (LibraryPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof LibraryPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new LibraryPackageImpl()); + Object registeredLibraryPackage = EPackage.Registry.INSTANCE.get(eNS_URI); + LibraryPackageImpl theLibraryPackage = registeredLibraryPackage instanceof LibraryPackageImpl ? (LibraryPackageImpl)registeredLibraryPackage : new LibraryPackageImpl(); isInited = true; @@ -111,7 +112,6 @@ public class LibraryPackageImpl extends EPackageImpl implements LibraryPackage // 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; diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/creation/library.xsd/src/org/examples/library/impl/LibraryPackageImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/creation/library.xsd/src/org/examples/library/impl/LibraryPackageImpl.java index 2ac0397b9..b0178d297 100644 --- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/creation/library.xsd/src/org/examples/library/impl/LibraryPackageImpl.java +++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/creation/library.xsd/src/org/examples/library/impl/LibraryPackageImpl.java @@ -93,7 +93,7 @@ public class LibraryPackageImpl extends EPackageImpl implements LibraryPackage /** * 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 --> @@ -108,7 +108,8 @@ public class LibraryPackageImpl extends EPackageImpl implements LibraryPackage if (isInited) return (LibraryPackage)EPackage.Registry.INSTANCE.getEPackage(LibraryPackage.eNS_URI); // Obtain or create and register package - LibraryPackageImpl theLibraryPackage = (LibraryPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof LibraryPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new LibraryPackageImpl()); + Object registeredLibraryPackage = EPackage.Registry.INSTANCE.get(eNS_URI); + LibraryPackageImpl theLibraryPackage = registeredLibraryPackage instanceof LibraryPackageImpl ? (LibraryPackageImpl)registeredLibraryPackage : new LibraryPackageImpl(); isInited = true; @@ -124,7 +125,6 @@ public class LibraryPackageImpl extends EPackageImpl implements LibraryPackage // 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; @@ -392,117 +392,117 @@ public class LibraryPackageImpl extends EPackageImpl implements LibraryPackage */ protected void createExtendedMetaDataAnnotations() { - String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; + String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; addAnnotation - (bookEClass, - source, - new String[] + (bookEClass, + source, + new String[] { - "name", "Book", - "kind", "elementOnly" - }); + "name", "Book", + "kind", "elementOnly" + }); addAnnotation - (getBook_Title(), - source, - new String[] + (getBook_Title(), + source, + new String[] { - "kind", "element", - "name", "title" - }); + "kind", "element", + "name", "title" + }); addAnnotation - (getBook_Pages(), - source, - new String[] + (getBook_Pages(), + source, + new String[] { - "kind", "element", - "name", "pages" - }); + "kind", "element", + "name", "pages" + }); addAnnotation - (getBook_Category(), - source, - new String[] + (getBook_Category(), + source, + new String[] { - "kind", "element", - "name", "category" - }); + "kind", "element", + "name", "category" + }); addAnnotation - (getBook_Author(), - source, - new String[] + (getBook_Author(), + source, + new String[] { - "kind", "element", - "name", "author" - }); + "kind", "element", + "name", "author" + }); addAnnotation - (bookCategoryEEnum, - source, - new String[] + (bookCategoryEEnum, + source, + new String[] { - "name", "BookCategory" - }); + "name", "BookCategory" + }); addAnnotation - (bookCategoryObjectEDataType, - source, - new String[] + (bookCategoryObjectEDataType, + source, + new String[] { - "name", "BookCategory:Object", - "baseType", "BookCategory" - }); + "name", "BookCategory:Object", + "baseType", "BookCategory" + }); addAnnotation - (libraryEClass, - source, - new String[] + (libraryEClass, + source, + new String[] { - "name", "Library", - "kind", "elementOnly" - }); + "name", "Library", + "kind", "elementOnly" + }); addAnnotation - (getLibrary_Name(), - source, - new String[] + (getLibrary_Name(), + source, + new String[] { - "kind", "element", - "name", "name" - }); + "kind", "element", + "name", "name" + }); addAnnotation - (getLibrary_Writers(), - source, - new String[] + (getLibrary_Writers(), + source, + new String[] { - "kind", "element", - "name", "writers" - }); + "kind", "element", + "name", "writers" + }); addAnnotation - (getLibrary_Books(), - source, - new String[] + (getLibrary_Books(), + source, + new String[] { - "kind", "element", - "name", "books" - }); + "kind", "element", + "name", "books" + }); addAnnotation - (writerEClass, - source, - new String[] + (writerEClass, + source, + new String[] { - "name", "Writer", - "kind", "elementOnly" - }); + "name", "Writer", + "kind", "elementOnly" + }); addAnnotation - (getWriter_Name(), - source, - new String[] + (getWriter_Name(), + source, + new String[] { - "kind", "element", - "name", "name" - }); + "kind", "element", + "name", "name" + }); addAnnotation - (getWriter_Books(), - source, - new String[] + (getWriter_Books(), + source, + new String[] { - "kind", "element", - "name", "books" + "kind", "element", + "name", "books" }); } diff --git a/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 b/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 index ef748defc..6703dbd23 100644 --- a/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 +++ b/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 @@ -89,7 +89,7 @@ public class ElementsPackageImpl extends EPackageImpl implements ElementsPackage /** * 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 --> @@ -104,7 +104,8 @@ public class ElementsPackageImpl extends EPackageImpl implements ElementsPackage if (isInited) return (ElementsPackage)EPackage.Registry.INSTANCE.getEPackage(ElementsPackage.eNS_URI); // Obtain or create and register package - ElementsPackageImpl theElementsPackage = (ElementsPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof ElementsPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new ElementsPackageImpl()); + Object registeredElementsPackage = EPackage.Registry.INSTANCE.get(eNS_URI); + ElementsPackageImpl theElementsPackage = registeredElementsPackage instanceof ElementsPackageImpl ? (ElementsPackageImpl)registeredElementsPackage : new ElementsPackageImpl(); isInited = true; @@ -112,7 +113,8 @@ public class ElementsPackageImpl extends EPackageImpl implements ElementsPackage XMLTypePackage.eINSTANCE.eClass(); // Obtain or create and register interdependencies - LibraryPackageImpl theLibraryPackage = (LibraryPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(LibraryPackage.eNS_URI) instanceof LibraryPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(LibraryPackage.eNS_URI) : LibraryPackage.eINSTANCE); + Object registeredPackage = EPackage.Registry.INSTANCE.getEPackage(LibraryPackage.eNS_URI); + LibraryPackageImpl theLibraryPackage = (LibraryPackageImpl)(registeredPackage instanceof LibraryPackageImpl ? registeredPackage : LibraryPackage.eINSTANCE); // Create package meta-data objects theElementsPackage.createPackageContents(); @@ -125,7 +127,6 @@ public class ElementsPackageImpl extends EPackageImpl implements ElementsPackage // 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; @@ -343,85 +344,85 @@ public class ElementsPackageImpl extends EPackageImpl implements ElementsPackage */ protected void createExtendedMetaDataAnnotations() { - String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; + String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; addAnnotation - (bookEClass, - source, - new String[] + (bookEClass, + source, + new String[] { - "name", "Book", - "kind", "elementOnly" - }); + "name", "Book", + "kind", "elementOnly" + }); addAnnotation - (getBook_Title(), - source, - new String[] + (getBook_Title(), + source, + new String[] { - "kind", "element", - "name", "title" - }); + "kind", "element", + "name", "title" + }); addAnnotation - (getBook_Pages(), - source, - new String[] + (getBook_Pages(), + source, + new String[] { - "kind", "element", - "name", "pages" - }); + "kind", "element", + "name", "pages" + }); addAnnotation - (getBook_Category(), - source, - new String[] + (getBook_Category(), + source, + new String[] { - "kind", "element", - "name", "category" - }); + "kind", "element", + "name", "category" + }); addAnnotation - (getBook_Author(), - source, - new String[] + (getBook_Author(), + source, + new String[] { - "kind", "element", - "name", "author" - }); + "kind", "element", + "name", "author" + }); addAnnotation - (bookCategoryEEnum, - source, - new String[] + (bookCategoryEEnum, + source, + new String[] { - "name", "BookCategory" - }); + "name", "BookCategory" + }); addAnnotation - (bookCategoryObjectEDataType, - source, - new String[] + (bookCategoryObjectEDataType, + source, + new String[] { - "name", "BookCategory:Object", - "baseType", "BookCategory" - }); + "name", "BookCategory:Object", + "baseType", "BookCategory" + }); addAnnotation - (writerEClass, - source, - new String[] + (writerEClass, + source, + new String[] { - "name", "Writer", - "kind", "elementOnly" - }); + "name", "Writer", + "kind", "elementOnly" + }); addAnnotation - (getWriter_Name(), - source, - new String[] + (getWriter_Name(), + source, + new String[] { - "kind", "element", - "name", "name" - }); + "kind", "element", + "name", "name" + }); addAnnotation - (getWriter_Books(), - source, - new String[] + (getWriter_Books(), + source, + new String[] { - "kind", "element", - "name", "books" + "kind", "element", + "name", "books" }); } diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/creation/library.xsds/src/org/examples/library/impl/LibraryPackageImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/creation/library.xsds/src/org/examples/library/impl/LibraryPackageImpl.java index fbf192a0b..116119615 100644 --- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/creation/library.xsds/src/org/examples/library/impl/LibraryPackageImpl.java +++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/creation/library.xsds/src/org/examples/library/impl/LibraryPackageImpl.java @@ -64,7 +64,7 @@ public class LibraryPackageImpl extends EPackageImpl implements LibraryPackage /** * 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 --> @@ -79,7 +79,8 @@ public class LibraryPackageImpl extends EPackageImpl implements LibraryPackage if (isInited) return (LibraryPackage)EPackage.Registry.INSTANCE.getEPackage(LibraryPackage.eNS_URI); // Obtain or create and register package - LibraryPackageImpl theLibraryPackage = (LibraryPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof LibraryPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new LibraryPackageImpl()); + Object registeredLibraryPackage = EPackage.Registry.INSTANCE.get(eNS_URI); + LibraryPackageImpl theLibraryPackage = registeredLibraryPackage instanceof LibraryPackageImpl ? (LibraryPackageImpl)registeredLibraryPackage : new LibraryPackageImpl(); isInited = true; @@ -87,7 +88,8 @@ public class LibraryPackageImpl extends EPackageImpl implements LibraryPackage XMLTypePackage.eINSTANCE.eClass(); // Obtain or create and register interdependencies - ElementsPackageImpl theElementsPackage = (ElementsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ElementsPackage.eNS_URI) instanceof ElementsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ElementsPackage.eNS_URI) : ElementsPackage.eINSTANCE); + Object registeredPackage = EPackage.Registry.INSTANCE.getEPackage(ElementsPackage.eNS_URI); + ElementsPackageImpl theElementsPackage = (ElementsPackageImpl)(registeredPackage instanceof ElementsPackageImpl ? registeredPackage : ElementsPackage.eINSTANCE); // Create package meta-data objects theLibraryPackage.createPackageContents(); @@ -100,7 +102,6 @@ public class LibraryPackageImpl extends EPackageImpl implements LibraryPackage // 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; @@ -234,38 +235,38 @@ public class LibraryPackageImpl extends EPackageImpl implements LibraryPackage */ protected void createExtendedMetaDataAnnotations() { - String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; + String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; addAnnotation - (libraryEClass, - source, - new String[] + (libraryEClass, + source, + new String[] { - "name", "Library", - "kind", "elementOnly" - }); + "name", "Library", + "kind", "elementOnly" + }); addAnnotation - (getLibrary_Name(), - source, - new String[] + (getLibrary_Name(), + source, + new String[] { - "kind", "element", - "name", "name" - }); + "kind", "element", + "name", "name" + }); addAnnotation - (getLibrary_Writers(), - source, - new String[] + (getLibrary_Writers(), + source, + new String[] { - "kind", "element", - "name", "writers" - }); + "kind", "element", + "name", "writers" + }); addAnnotation - (getLibrary_Books(), - source, - new String[] + (getLibrary_Books(), + source, + new String[] { - "kind", "element", - "name", "books" + "kind", "element", + "name", "books" }); } diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.ecore/src/org/examples/hr/impl/HRPackageImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.ecore/src/org/examples/hr/impl/HRPackageImpl.java index e44106a04..3d6717613 100644 --- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.ecore/src/org/examples/hr/impl/HRPackageImpl.java +++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.ecore/src/org/examples/hr/impl/HRPackageImpl.java @@ -62,7 +62,7 @@ public class HRPackageImpl extends EPackageImpl implements HRPackage /** * 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 --> @@ -77,12 +77,14 @@ public class HRPackageImpl extends EPackageImpl implements HRPackage if (isInited) return (HRPackage)EPackage.Registry.INSTANCE.getEPackage(HRPackage.eNS_URI); // Obtain or create and register package - HRPackageImpl theHRPackage = (HRPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof HRPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new HRPackageImpl()); + Object registeredHRPackage = EPackage.Registry.INSTANCE.get(eNS_URI); + HRPackageImpl theHRPackage = registeredHRPackage instanceof HRPackageImpl ? (HRPackageImpl)registeredHRPackage : new HRPackageImpl(); isInited = true; // Obtain or create and register interdependencies - LibraryPackageImpl theLibraryPackage = (LibraryPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(LibraryPackage.eNS_URI) instanceof LibraryPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(LibraryPackage.eNS_URI) : LibraryPackage.eINSTANCE); + Object registeredPackage = EPackage.Registry.INSTANCE.getEPackage(LibraryPackage.eNS_URI); + LibraryPackageImpl theLibraryPackage = (LibraryPackageImpl)(registeredPackage instanceof LibraryPackageImpl ? registeredPackage : LibraryPackage.eINSTANCE); // Create package meta-data objects theHRPackage.createPackageContents(); @@ -95,7 +97,6 @@ public class HRPackageImpl extends EPackageImpl implements HRPackage // 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; diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.ecore/src/org/examples/library/impl/LibraryPackageImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.ecore/src/org/examples/library/impl/LibraryPackageImpl.java index 02cf69c28..d21e5dba8 100644 --- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.ecore/src/org/examples/library/impl/LibraryPackageImpl.java +++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.ecore/src/org/examples/library/impl/LibraryPackageImpl.java @@ -85,7 +85,7 @@ public class LibraryPackageImpl extends EPackageImpl implements LibraryPackage /** * 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 --> @@ -100,12 +100,14 @@ public class LibraryPackageImpl extends EPackageImpl implements LibraryPackage if (isInited) return (LibraryPackage)EPackage.Registry.INSTANCE.getEPackage(LibraryPackage.eNS_URI); // Obtain or create and register package - LibraryPackageImpl theLibraryPackage = (LibraryPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof LibraryPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new LibraryPackageImpl()); + Object registeredLibraryPackage = EPackage.Registry.INSTANCE.get(eNS_URI); + LibraryPackageImpl theLibraryPackage = registeredLibraryPackage instanceof LibraryPackageImpl ? (LibraryPackageImpl)registeredLibraryPackage : new LibraryPackageImpl(); isInited = true; // Obtain or create and register interdependencies - HRPackageImpl theHRPackage = (HRPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(HRPackage.eNS_URI) instanceof HRPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(HRPackage.eNS_URI) : HRPackage.eINSTANCE); + Object registeredPackage = EPackage.Registry.INSTANCE.getEPackage(HRPackage.eNS_URI); + HRPackageImpl theHRPackage = (HRPackageImpl)(registeredPackage instanceof HRPackageImpl ? registeredPackage : HRPackage.eINSTANCE); // Create package meta-data objects theLibraryPackage.createPackageContents(); @@ -118,7 +120,6 @@ public class LibraryPackageImpl extends EPackageImpl implements LibraryPackage // 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; diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.rose/src/org/examples/hr/impl/HRPackageImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.rose/src/org/examples/hr/impl/HRPackageImpl.java index e44106a04..3d6717613 100644 --- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.rose/src/org/examples/hr/impl/HRPackageImpl.java +++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.rose/src/org/examples/hr/impl/HRPackageImpl.java @@ -62,7 +62,7 @@ public class HRPackageImpl extends EPackageImpl implements HRPackage /** * 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 --> @@ -77,12 +77,14 @@ public class HRPackageImpl extends EPackageImpl implements HRPackage if (isInited) return (HRPackage)EPackage.Registry.INSTANCE.getEPackage(HRPackage.eNS_URI); // Obtain or create and register package - HRPackageImpl theHRPackage = (HRPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof HRPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new HRPackageImpl()); + Object registeredHRPackage = EPackage.Registry.INSTANCE.get(eNS_URI); + HRPackageImpl theHRPackage = registeredHRPackage instanceof HRPackageImpl ? (HRPackageImpl)registeredHRPackage : new HRPackageImpl(); isInited = true; // Obtain or create and register interdependencies - LibraryPackageImpl theLibraryPackage = (LibraryPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(LibraryPackage.eNS_URI) instanceof LibraryPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(LibraryPackage.eNS_URI) : LibraryPackage.eINSTANCE); + Object registeredPackage = EPackage.Registry.INSTANCE.getEPackage(LibraryPackage.eNS_URI); + LibraryPackageImpl theLibraryPackage = (LibraryPackageImpl)(registeredPackage instanceof LibraryPackageImpl ? registeredPackage : LibraryPackage.eINSTANCE); // Create package meta-data objects theHRPackage.createPackageContents(); @@ -95,7 +97,6 @@ public class HRPackageImpl extends EPackageImpl implements HRPackage // 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; diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.rose/src/org/examples/library/impl/LibraryPackageImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.rose/src/org/examples/library/impl/LibraryPackageImpl.java index 02cf69c28..d21e5dba8 100644 --- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.rose/src/org/examples/library/impl/LibraryPackageImpl.java +++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.rose/src/org/examples/library/impl/LibraryPackageImpl.java @@ -85,7 +85,7 @@ public class LibraryPackageImpl extends EPackageImpl implements LibraryPackage /** * 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 --> @@ -100,12 +100,14 @@ public class LibraryPackageImpl extends EPackageImpl implements LibraryPackage if (isInited) return (LibraryPackage)EPackage.Registry.INSTANCE.getEPackage(LibraryPackage.eNS_URI); // Obtain or create and register package - LibraryPackageImpl theLibraryPackage = (LibraryPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof LibraryPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new LibraryPackageImpl()); + Object registeredLibraryPackage = EPackage.Registry.INSTANCE.get(eNS_URI); + LibraryPackageImpl theLibraryPackage = registeredLibraryPackage instanceof LibraryPackageImpl ? (LibraryPackageImpl)registeredLibraryPackage : new LibraryPackageImpl(); isInited = true; // Obtain or create and register interdependencies - HRPackageImpl theHRPackage = (HRPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(HRPackage.eNS_URI) instanceof HRPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(HRPackage.eNS_URI) : HRPackage.eINSTANCE); + Object registeredPackage = EPackage.Registry.INSTANCE.getEPackage(HRPackage.eNS_URI); + HRPackageImpl theHRPackage = (HRPackageImpl)(registeredPackage instanceof HRPackageImpl ? registeredPackage : HRPackage.eINSTANCE); // Create package meta-data objects theLibraryPackage.createPackageContents(); @@ -118,7 +120,6 @@ public class LibraryPackageImpl extends EPackageImpl implements LibraryPackage // 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; diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.xsd/src/org/examples/library/impl/LibraryPackageImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.xsd/src/org/examples/library/impl/LibraryPackageImpl.java index 5fa013b01..568b15f12 100644 --- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.xsd/src/org/examples/library/impl/LibraryPackageImpl.java +++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.xsd/src/org/examples/library/impl/LibraryPackageImpl.java @@ -93,7 +93,7 @@ public class LibraryPackageImpl extends EPackageImpl implements LibraryPackage /** * 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 --> @@ -108,7 +108,8 @@ public class LibraryPackageImpl extends EPackageImpl implements LibraryPackage if (isInited) return (LibraryPackage)EPackage.Registry.INSTANCE.getEPackage(LibraryPackage.eNS_URI); // Obtain or create and register package - LibraryPackageImpl theLibraryPackage = (LibraryPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof LibraryPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new LibraryPackageImpl()); + Object registeredLibraryPackage = EPackage.Registry.INSTANCE.get(eNS_URI); + LibraryPackageImpl theLibraryPackage = registeredLibraryPackage instanceof LibraryPackageImpl ? (LibraryPackageImpl)registeredLibraryPackage : new LibraryPackageImpl(); isInited = true; @@ -124,7 +125,6 @@ public class LibraryPackageImpl extends EPackageImpl implements LibraryPackage // 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; @@ -409,125 +409,125 @@ public class LibraryPackageImpl extends EPackageImpl implements LibraryPackage */ protected void createExtendedMetaDataAnnotations() { - String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; //$NON-NLS-1$ + String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; //$NON-NLS-1$ addAnnotation - (bookEClass, - source, - new String[] + (bookEClass, + source, + new String[] { - "name", "Book", //$NON-NLS-1$ //$NON-NLS-2$ - "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$ - }); + "name", "Book", //$NON-NLS-1$ //$NON-NLS-2$ + "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$ + }); addAnnotation - (getBook_Title(), - source, - new String[] + (getBook_Title(), + source, + new String[] { - "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "title" //$NON-NLS-1$ //$NON-NLS-2$ - }); + "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ + "name", "title" //$NON-NLS-1$ //$NON-NLS-2$ + }); addAnnotation - (getBook_Pages(), - source, - new String[] + (getBook_Pages(), + source, + new String[] { - "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "pages" //$NON-NLS-1$ //$NON-NLS-2$ - }); + "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ + "name", "pages" //$NON-NLS-1$ //$NON-NLS-2$ + }); addAnnotation - (getBook_Category(), - source, - new String[] + (getBook_Category(), + source, + new String[] { - "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "category" //$NON-NLS-1$ //$NON-NLS-2$ - }); + "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ + "name", "category" //$NON-NLS-1$ //$NON-NLS-2$ + }); addAnnotation - (getBook_Author(), - source, - new String[] + (getBook_Author(), + source, + new String[] { - "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "author" //$NON-NLS-1$ //$NON-NLS-2$ - }); + "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ + "name", "author" //$NON-NLS-1$ //$NON-NLS-2$ + }); addAnnotation - (bookCategoryEEnum, - source, - new String[] + (bookCategoryEEnum, + source, + new String[] { - "name", "BookCategory" //$NON-NLS-1$ //$NON-NLS-2$ - }); + "name", "BookCategory" //$NON-NLS-1$ //$NON-NLS-2$ + }); addAnnotation - (bookCategoryObjectEDataType, - source, - new String[] + (bookCategoryObjectEDataType, + source, + new String[] { - "name", "BookCategory:Object", //$NON-NLS-1$ //$NON-NLS-2$ - "baseType", "BookCategory" //$NON-NLS-1$ //$NON-NLS-2$ - }); + "name", "BookCategory:Object", //$NON-NLS-1$ //$NON-NLS-2$ + "baseType", "BookCategory" //$NON-NLS-1$ //$NON-NLS-2$ + }); addAnnotation - (libraryEClass, - source, - new String[] + (libraryEClass, + source, + new String[] { - "name", "Library", //$NON-NLS-1$ //$NON-NLS-2$ - "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$ - }); + "name", "Library", //$NON-NLS-1$ //$NON-NLS-2$ + "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$ + }); addAnnotation - (getLibrary_Name(), - source, - new String[] + (getLibrary_Name(), + source, + new String[] { - "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "name" //$NON-NLS-1$ //$NON-NLS-2$ - }); + "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ + "name", "name" //$NON-NLS-1$ //$NON-NLS-2$ + }); addAnnotation - (getLibrary_Site(), - source, - new String[] + (getLibrary_Site(), + source, + new String[] { - "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "site" //$NON-NLS-1$ //$NON-NLS-2$ - }); + "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ + "name", "site" //$NON-NLS-1$ //$NON-NLS-2$ + }); addAnnotation - (getLibrary_Writers(), - source, - new String[] + (getLibrary_Writers(), + source, + new String[] { - "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "writers" //$NON-NLS-1$ //$NON-NLS-2$ - }); + "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ + "name", "writers" //$NON-NLS-1$ //$NON-NLS-2$ + }); addAnnotation - (getLibrary_Books(), - source, - new String[] + (getLibrary_Books(), + source, + new String[] { - "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "books" //$NON-NLS-1$ //$NON-NLS-2$ - }); + "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ + "name", "books" //$NON-NLS-1$ //$NON-NLS-2$ + }); addAnnotation - (writerEClass, - source, - new String[] + (writerEClass, + source, + new String[] { - "name", "Writer", //$NON-NLS-1$ //$NON-NLS-2$ - "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$ - }); + "name", "Writer", //$NON-NLS-1$ //$NON-NLS-2$ + "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$ + }); addAnnotation - (getWriter_Name(), - source, - new String[] + (getWriter_Name(), + source, + new String[] { - "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "name" //$NON-NLS-1$ //$NON-NLS-2$ - }); + "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ + "name", "name" //$NON-NLS-1$ //$NON-NLS-2$ + }); addAnnotation - (getWriter_Books(), - source, - new String[] + (getWriter_Books(), + source, + new String[] { - "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "books" //$NON-NLS-1$ //$NON-NLS-2$ + "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ + "name", "books" //$NON-NLS-1$ //$NON-NLS-2$ }); } diff --git a/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 b/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 index 477d69da8..4bdf017ce 100644 --- a/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 +++ b/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 @@ -100,7 +100,7 @@ public class ElementsPackageImpl extends EPackageImpl implements ElementsPackage /** * 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 --> @@ -115,7 +115,8 @@ public class ElementsPackageImpl extends EPackageImpl implements ElementsPackage if (isInited) return (ElementsPackage)EPackage.Registry.INSTANCE.getEPackage(ElementsPackage.eNS_URI); // Obtain or create and register package - ElementsPackageImpl theElementsPackage = (ElementsPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof ElementsPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new ElementsPackageImpl()); + Object registeredElementsPackage = EPackage.Registry.INSTANCE.get(eNS_URI); + ElementsPackageImpl theElementsPackage = registeredElementsPackage instanceof ElementsPackageImpl ? (ElementsPackageImpl)registeredElementsPackage : new ElementsPackageImpl(); isInited = true; @@ -123,8 +124,10 @@ public class ElementsPackageImpl extends EPackageImpl implements ElementsPackage XMLTypePackage.eINSTANCE.eClass(); // Obtain or create and register interdependencies - HrPackageImpl theHrPackage = (HrPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(HrPackage.eNS_URI) instanceof HrPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(HrPackage.eNS_URI) : HrPackage.eINSTANCE); - LibraryPackageImpl theLibraryPackage = (LibraryPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(LibraryPackage.eNS_URI) instanceof LibraryPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(LibraryPackage.eNS_URI) : LibraryPackage.eINSTANCE); + Object registeredPackage = EPackage.Registry.INSTANCE.getEPackage(HrPackage.eNS_URI); + HrPackageImpl theHrPackage = (HrPackageImpl)(registeredPackage instanceof HrPackageImpl ? registeredPackage : HrPackage.eINSTANCE); + registeredPackage = EPackage.Registry.INSTANCE.getEPackage(LibraryPackage.eNS_URI); + LibraryPackageImpl theLibraryPackage = (LibraryPackageImpl)(registeredPackage instanceof LibraryPackageImpl ? registeredPackage : LibraryPackage.eINSTANCE); // Create package meta-data objects theElementsPackage.createPackageContents(); @@ -138,7 +141,7 @@ public class ElementsPackageImpl extends EPackageImpl implements ElementsPackage // Register package validator EValidator.Registry.INSTANCE.put - (theElementsPackage, + (theElementsPackage, new EValidator.Descriptor() { public EValidator getEValidator() @@ -150,7 +153,6 @@ public class ElementsPackageImpl extends EPackageImpl implements ElementsPackage // 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; @@ -387,94 +389,94 @@ public class ElementsPackageImpl extends EPackageImpl implements ElementsPackage */ protected void createExtendedMetaDataAnnotations() { - String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; //$NON-NLS-1$ + String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; //$NON-NLS-1$ addAnnotation - (bookEClass, - source, - new String[] + (bookEClass, + source, + new String[] { - "name", "Book", //$NON-NLS-1$ //$NON-NLS-2$ - "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$ - }); + "name", "Book", //$NON-NLS-1$ //$NON-NLS-2$ + "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$ + }); addAnnotation - (getBook_Title(), - source, - new String[] + (getBook_Title(), + source, + new String[] { - "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "title" //$NON-NLS-1$ //$NON-NLS-2$ - }); + "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ + "name", "title" //$NON-NLS-1$ //$NON-NLS-2$ + }); addAnnotation - (getBook_Pages(), - source, - new String[] + (getBook_Pages(), + source, + new String[] { - "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "pages" //$NON-NLS-1$ //$NON-NLS-2$ - }); + "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ + "name", "pages" //$NON-NLS-1$ //$NON-NLS-2$ + }); addAnnotation - (getBook_Category(), - source, - new String[] + (getBook_Category(), + source, + new String[] { - "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "category" //$NON-NLS-1$ //$NON-NLS-2$ - }); + "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ + "name", "category" //$NON-NLS-1$ //$NON-NLS-2$ + }); addAnnotation - (getBook_Author(), - source, - new String[] + (getBook_Author(), + source, + new String[] { - "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "author" //$NON-NLS-1$ //$NON-NLS-2$ - }); + "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ + "name", "author" //$NON-NLS-1$ //$NON-NLS-2$ + }); addAnnotation - (getBook_Uuid(), - source, - new String[] + (getBook_Uuid(), + source, + new String[] { - "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "uuid" //$NON-NLS-1$ //$NON-NLS-2$ - }); + "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$ + "name", "uuid" //$NON-NLS-1$ //$NON-NLS-2$ + }); addAnnotation - (bookCategoryEEnum, - source, - new String[] + (bookCategoryEEnum, + source, + new String[] { - "name", "BookCategory" //$NON-NLS-1$ //$NON-NLS-2$ - }); + "name", "BookCategory" //$NON-NLS-1$ //$NON-NLS-2$ + }); addAnnotation - (bookCategoryObjectEDataType, - source, - new String[] + (bookCategoryObjectEDataType, + source, + new String[] { - "name", "BookCategory:Object", //$NON-NLS-1$ //$NON-NLS-2$ - "baseType", "BookCategory" //$NON-NLS-1$ //$NON-NLS-2$ - }); + "name", "BookCategory:Object", //$NON-NLS-1$ //$NON-NLS-2$ + "baseType", "BookCategory" //$NON-NLS-1$ //$NON-NLS-2$ + }); addAnnotation - (uuidEDataType, - source, - new String[] + (uuidEDataType, + source, + new String[] { - "name", "UUID", //$NON-NLS-1$ //$NON-NLS-2$ - "baseType", "http://www.eclipse.org/emf/2003/XMLType#hexBinary", //$NON-NLS-1$ //$NON-NLS-2$ - "length", "16" //$NON-NLS-1$ //$NON-NLS-2$ - }); + "name", "UUID", //$NON-NLS-1$ //$NON-NLS-2$ + "baseType", "http://www.eclipse.org/emf/2003/XMLType#hexBinary", //$NON-NLS-1$ //$NON-NLS-2$ + "length", "16" //$NON-NLS-1$ //$NON-NLS-2$ + }); addAnnotation - (writerEClass, - source, - new String[] + (writerEClass, + source, + new String[] { - "name", "Writer", //$NON-NLS-1$ //$NON-NLS-2$ - "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$ - }); + "name", "Writer", //$NON-NLS-1$ //$NON-NLS-2$ + "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$ + }); addAnnotation - (getWriter_Books(), - source, - new String[] + (getWriter_Books(), + source, + new String[] { - "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "books" //$NON-NLS-1$ //$NON-NLS-2$ + "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ + "name", "books" //$NON-NLS-1$ //$NON-NLS-2$ }); } diff --git a/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 b/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 index 0f47b821c..3788e27cc 100644 --- a/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 +++ b/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 @@ -68,7 +68,7 @@ public class HrPackageImpl extends EPackageImpl implements HrPackage /** * 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 --> @@ -83,7 +83,8 @@ public class HrPackageImpl extends EPackageImpl implements HrPackage if (isInited) return (HrPackage)EPackage.Registry.INSTANCE.getEPackage(HrPackage.eNS_URI); // Obtain or create and register package - HrPackageImpl theHrPackage = (HrPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof HrPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new HrPackageImpl()); + Object registeredHrPackage = EPackage.Registry.INSTANCE.get(eNS_URI); + HrPackageImpl theHrPackage = registeredHrPackage instanceof HrPackageImpl ? (HrPackageImpl)registeredHrPackage : new HrPackageImpl(); isInited = true; @@ -91,8 +92,10 @@ public class HrPackageImpl extends EPackageImpl implements HrPackage XMLTypePackage.eINSTANCE.eClass(); // Obtain or create and register interdependencies - ElementsPackageImpl theElementsPackage = (ElementsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ElementsPackage.eNS_URI) instanceof ElementsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ElementsPackage.eNS_URI) : ElementsPackage.eINSTANCE); - LibraryPackageImpl theLibraryPackage = (LibraryPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(LibraryPackage.eNS_URI) instanceof LibraryPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(LibraryPackage.eNS_URI) : LibraryPackage.eINSTANCE); + Object registeredPackage = EPackage.Registry.INSTANCE.getEPackage(ElementsPackage.eNS_URI); + ElementsPackageImpl theElementsPackage = (ElementsPackageImpl)(registeredPackage instanceof ElementsPackageImpl ? registeredPackage : ElementsPackage.eINSTANCE); + registeredPackage = EPackage.Registry.INSTANCE.getEPackage(LibraryPackage.eNS_URI); + LibraryPackageImpl theLibraryPackage = (LibraryPackageImpl)(registeredPackage instanceof LibraryPackageImpl ? registeredPackage : LibraryPackage.eINSTANCE); // Create package meta-data objects theHrPackage.createPackageContents(); @@ -107,7 +110,6 @@ public class HrPackageImpl extends EPackageImpl implements HrPackage // 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; @@ -233,30 +235,30 @@ public class HrPackageImpl extends EPackageImpl implements HrPackage */ protected void createExtendedMetaDataAnnotations() { - String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; //$NON-NLS-1$ + String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; //$NON-NLS-1$ addAnnotation - (personEClass, - source, - new String[] + (personEClass, + source, + new String[] { - "name", "Person", //$NON-NLS-1$ //$NON-NLS-2$ - "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$ - }); + "name", "Person", //$NON-NLS-1$ //$NON-NLS-2$ + "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$ + }); addAnnotation - (getPerson_Name(), - source, - new String[] + (getPerson_Name(), + source, + new String[] { - "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "name" //$NON-NLS-1$ //$NON-NLS-2$ - }); + "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ + "name", "name" //$NON-NLS-1$ //$NON-NLS-2$ + }); addAnnotation - (getPerson_Library(), - source, - new String[] + (getPerson_Library(), + source, + new String[] { - "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "library" //$NON-NLS-1$ //$NON-NLS-2$ + "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ + "name", "library" //$NON-NLS-1$ //$NON-NLS-2$ }); } diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.xsds/src/org/examples/library/impl/LibraryPackageImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.xsds/src/org/examples/library/impl/LibraryPackageImpl.java index 1cdcd31e7..b5ec4dc1b 100644 --- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.xsds/src/org/examples/library/impl/LibraryPackageImpl.java +++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.xsds/src/org/examples/library/impl/LibraryPackageImpl.java @@ -66,7 +66,7 @@ public class LibraryPackageImpl extends EPackageImpl implements LibraryPackage /** * 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 --> @@ -81,7 +81,8 @@ public class LibraryPackageImpl extends EPackageImpl implements LibraryPackage if (isInited) return (LibraryPackage)EPackage.Registry.INSTANCE.getEPackage(LibraryPackage.eNS_URI); // Obtain or create and register package - LibraryPackageImpl theLibraryPackage = (LibraryPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof LibraryPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new LibraryPackageImpl()); + Object registeredLibraryPackage = EPackage.Registry.INSTANCE.get(eNS_URI); + LibraryPackageImpl theLibraryPackage = registeredLibraryPackage instanceof LibraryPackageImpl ? (LibraryPackageImpl)registeredLibraryPackage : new LibraryPackageImpl(); isInited = true; @@ -89,8 +90,10 @@ public class LibraryPackageImpl extends EPackageImpl implements LibraryPackage XMLTypePackage.eINSTANCE.eClass(); // Obtain or create and register interdependencies - ElementsPackageImpl theElementsPackage = (ElementsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ElementsPackage.eNS_URI) instanceof ElementsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ElementsPackage.eNS_URI) : ElementsPackage.eINSTANCE); - HrPackageImpl theHrPackage = (HrPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(HrPackage.eNS_URI) instanceof HrPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(HrPackage.eNS_URI) : HrPackage.eINSTANCE); + Object registeredPackage = EPackage.Registry.INSTANCE.getEPackage(ElementsPackage.eNS_URI); + ElementsPackageImpl theElementsPackage = (ElementsPackageImpl)(registeredPackage instanceof ElementsPackageImpl ? registeredPackage : ElementsPackage.eINSTANCE); + registeredPackage = EPackage.Registry.INSTANCE.getEPackage(HrPackage.eNS_URI); + HrPackageImpl theHrPackage = (HrPackageImpl)(registeredPackage instanceof HrPackageImpl ? registeredPackage : HrPackage.eINSTANCE); // Create package meta-data objects theLibraryPackage.createPackageContents(); @@ -105,7 +108,6 @@ public class LibraryPackageImpl extends EPackageImpl implements LibraryPackage // 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; @@ -256,46 +258,46 @@ public class LibraryPackageImpl extends EPackageImpl implements LibraryPackage */ protected void createExtendedMetaDataAnnotations() { - String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; //$NON-NLS-1$ + String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; //$NON-NLS-1$ addAnnotation - (libraryEClass, - source, - new String[] + (libraryEClass, + source, + new String[] { - "name", "Library", //$NON-NLS-1$ //$NON-NLS-2$ - "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$ - }); + "name", "Library", //$NON-NLS-1$ //$NON-NLS-2$ + "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$ + }); addAnnotation - (getLibrary_Name(), - source, - new String[] + (getLibrary_Name(), + source, + new String[] { - "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "name" //$NON-NLS-1$ //$NON-NLS-2$ - }); + "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ + "name", "name" //$NON-NLS-1$ //$NON-NLS-2$ + }); addAnnotation - (getLibrary_Writers(), - source, - new String[] + (getLibrary_Writers(), + source, + new String[] { - "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "writers" //$NON-NLS-1$ //$NON-NLS-2$ - }); + "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ + "name", "writers" //$NON-NLS-1$ //$NON-NLS-2$ + }); addAnnotation - (getLibrary_Books(), - source, - new String[] + (getLibrary_Books(), + source, + new String[] { - "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "books" //$NON-NLS-1$ //$NON-NLS-2$ - }); + "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ + "name", "books" //$NON-NLS-1$ //$NON-NLS-2$ + }); addAnnotation - (getLibrary_Employees(), - source, - new String[] + (getLibrary_Employees(), + source, + new String[] { - "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "employees" //$NON-NLS-1$ //$NON-NLS-2$ + "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ + "name", "employees" //$NON-NLS-1$ //$NON-NLS-2$ }); } diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/creation/library.ecore/src/org/examples/library/impl/LibraryPackageImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/creation/library.ecore/src/org/examples/library/impl/LibraryPackageImpl.java index edf8eea94..957822b9f 100644 --- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/creation/library.ecore/src/org/examples/library/impl/LibraryPackageImpl.java +++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/creation/library.ecore/src/org/examples/library/impl/LibraryPackageImpl.java @@ -83,7 +83,7 @@ public class LibraryPackageImpl extends EPackageImpl implements LibraryPackage /** * 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 --> @@ -98,7 +98,8 @@ public class LibraryPackageImpl extends EPackageImpl implements LibraryPackage if (isInited) return (LibraryPackage)EPackage.Registry.INSTANCE.getEPackage(LibraryPackage.eNS_URI); // Obtain or create and register package - LibraryPackageImpl theLibraryPackage = (LibraryPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof LibraryPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new LibraryPackageImpl()); + Object registeredLibraryPackage = EPackage.Registry.INSTANCE.get(eNS_URI); + LibraryPackageImpl theLibraryPackage = registeredLibraryPackage instanceof LibraryPackageImpl ? (LibraryPackageImpl)registeredLibraryPackage : new LibraryPackageImpl(); isInited = true; @@ -111,7 +112,6 @@ public class LibraryPackageImpl extends EPackageImpl implements LibraryPackage // 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; diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/creation/library.java/src/org/eclipse/example/library/impl/LibraryPackageImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/creation/library.java/src/org/eclipse/example/library/impl/LibraryPackageImpl.java index bd3f40fa1..31b3c2b05 100644 --- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/creation/library.java/src/org/eclipse/example/library/impl/LibraryPackageImpl.java +++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/creation/library.java/src/org/eclipse/example/library/impl/LibraryPackageImpl.java @@ -144,7 +144,7 @@ public class LibraryPackageImpl extends EPackageImpl implements LibraryPackage /** * 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 --> @@ -159,7 +159,8 @@ public class LibraryPackageImpl extends EPackageImpl implements LibraryPackage if (isInited) return (LibraryPackage)EPackage.Registry.INSTANCE.getEPackage(LibraryPackage.eNS_URI); // Obtain or create and register package - LibraryPackageImpl theLibraryPackage = (LibraryPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof LibraryPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new LibraryPackageImpl()); + Object registeredLibraryPackage = EPackage.Registry.INSTANCE.get(eNS_URI); + LibraryPackageImpl theLibraryPackage = registeredLibraryPackage instanceof LibraryPackageImpl ? (LibraryPackageImpl)registeredLibraryPackage : new LibraryPackageImpl(); isInited = true; @@ -172,7 +173,6 @@ public class LibraryPackageImpl extends EPackageImpl implements LibraryPackage // 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; diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/creation/library.rose/src/org/examples/library/impl/LibraryPackageImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/creation/library.rose/src/org/examples/library/impl/LibraryPackageImpl.java index edf8eea94..957822b9f 100644 --- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/creation/library.rose/src/org/examples/library/impl/LibraryPackageImpl.java +++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/creation/library.rose/src/org/examples/library/impl/LibraryPackageImpl.java @@ -83,7 +83,7 @@ public class LibraryPackageImpl extends EPackageImpl implements LibraryPackage /** * 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 --> @@ -98,7 +98,8 @@ public class LibraryPackageImpl extends EPackageImpl implements LibraryPackage if (isInited) return (LibraryPackage)EPackage.Registry.INSTANCE.getEPackage(LibraryPackage.eNS_URI); // Obtain or create and register package - LibraryPackageImpl theLibraryPackage = (LibraryPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof LibraryPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new LibraryPackageImpl()); + Object registeredLibraryPackage = EPackage.Registry.INSTANCE.get(eNS_URI); + LibraryPackageImpl theLibraryPackage = registeredLibraryPackage instanceof LibraryPackageImpl ? (LibraryPackageImpl)registeredLibraryPackage : new LibraryPackageImpl(); isInited = true; @@ -111,7 +112,6 @@ public class LibraryPackageImpl extends EPackageImpl implements LibraryPackage // 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; diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/creation/library.xsd/src/org/examples/library/impl/LibraryPackageImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/creation/library.xsd/src/org/examples/library/impl/LibraryPackageImpl.java index 469ba4b4e..878d67a8e 100644 --- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/creation/library.xsd/src/org/examples/library/impl/LibraryPackageImpl.java +++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/creation/library.xsd/src/org/examples/library/impl/LibraryPackageImpl.java @@ -93,7 +93,7 @@ public class LibraryPackageImpl extends EPackageImpl implements LibraryPackage /** * 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 --> @@ -108,7 +108,8 @@ public class LibraryPackageImpl extends EPackageImpl implements LibraryPackage if (isInited) return (LibraryPackage)EPackage.Registry.INSTANCE.getEPackage(LibraryPackage.eNS_URI); // Obtain or create and register package - LibraryPackageImpl theLibraryPackage = (LibraryPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof LibraryPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new LibraryPackageImpl()); + Object registeredLibraryPackage = EPackage.Registry.INSTANCE.get(eNS_URI); + LibraryPackageImpl theLibraryPackage = registeredLibraryPackage instanceof LibraryPackageImpl ? (LibraryPackageImpl)registeredLibraryPackage : new LibraryPackageImpl(); isInited = true; @@ -124,7 +125,6 @@ public class LibraryPackageImpl extends EPackageImpl implements LibraryPackage // 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; @@ -396,117 +396,117 @@ public class LibraryPackageImpl extends EPackageImpl implements LibraryPackage */ protected void createExtendedMetaDataAnnotations() { - String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; + String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; addAnnotation - (bookEClass, - source, - new String[] + (bookEClass, + source, + new String[] { - "name", "Book", - "kind", "elementOnly" - }); + "name", "Book", + "kind", "elementOnly" + }); addAnnotation - (getBook_Title(), - source, - new String[] + (getBook_Title(), + source, + new String[] { - "kind", "element", - "name", "title" - }); + "kind", "element", + "name", "title" + }); addAnnotation - (getBook_Pages(), - source, - new String[] + (getBook_Pages(), + source, + new String[] { - "kind", "element", - "name", "pages" - }); + "kind", "element", + "name", "pages" + }); addAnnotation - (getBook_Category(), - source, - new String[] + (getBook_Category(), + source, + new String[] { - "kind", "element", - "name", "category" - }); + "kind", "element", + "name", "category" + }); addAnnotation - (getBook_Author(), - source, - new String[] + (getBook_Author(), + source, + new String[] { - "kind", "element", - "name", "author" - }); + "kind", "element", + "name", "author" + }); addAnnotation - (bookCategoryEEnum, - source, - new String[] + (bookCategoryEEnum, + source, + new String[] { - "name", "BookCategory" - }); + "name", "BookCategory" + }); addAnnotation - (bookCategoryObjectEDataType, - source, - new String[] + (bookCategoryObjectEDataType, + source, + new String[] { - "name", "BookCategory:Object", - "baseType", "BookCategory" - }); + "name", "BookCategory:Object", + "baseType", "BookCategory" + }); addAnnotation - (libraryEClass, - source, - new String[] + (libraryEClass, + source, + new String[] { - "name", "Library", - "kind", "elementOnly" - }); + "name", "Library", + "kind", "elementOnly" + }); addAnnotation - (getLibrary_Name(), - source, - new String[] + (getLibrary_Name(), + source, + new String[] { - "kind", "element", - "name", "name" - }); + "kind", "element", + "name", "name" + }); addAnnotation - (getLibrary_Writers(), - source, - new String[] + (getLibrary_Writers(), + source, + new String[] { - "kind", "element", - "name", "writers" - }); + "kind", "element", + "name", "writers" + }); addAnnotation - (getLibrary_Books(), - source, - new String[] + (getLibrary_Books(), + source, + new String[] { - "kind", "element", - "name", "books" - }); + "kind", "element", + "name", "books" + }); addAnnotation - (writerEClass, - source, - new String[] + (writerEClass, + source, + new String[] { - "name", "Writer", - "kind", "elementOnly" - }); + "name", "Writer", + "kind", "elementOnly" + }); addAnnotation - (getWriter_Name(), - source, - new String[] + (getWriter_Name(), + source, + new String[] { - "kind", "element", - "name", "name" - }); + "kind", "element", + "name", "name" + }); addAnnotation - (getWriter_Books(), - source, - new String[] + (getWriter_Books(), + source, + new String[] { - "kind", "element", - "name", "books" + "kind", "element", + "name", "books" }); } diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/creation/library.xsds/src/org/examples/library/elements/impl/ElementsPackageImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/creation/library.xsds/src/org/examples/library/elements/impl/ElementsPackageImpl.java index 6d2b27b4a..204d86060 100644 --- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/creation/library.xsds/src/org/examples/library/elements/impl/ElementsPackageImpl.java +++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/creation/library.xsds/src/org/examples/library/elements/impl/ElementsPackageImpl.java @@ -89,7 +89,7 @@ public class ElementsPackageImpl extends EPackageImpl implements ElementsPackage /** * 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 --> @@ -104,7 +104,8 @@ public class ElementsPackageImpl extends EPackageImpl implements ElementsPackage if (isInited) return (ElementsPackage)EPackage.Registry.INSTANCE.getEPackage(ElementsPackage.eNS_URI); // Obtain or create and register package - ElementsPackageImpl theElementsPackage = (ElementsPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof ElementsPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new ElementsPackageImpl()); + Object registeredElementsPackage = EPackage.Registry.INSTANCE.get(eNS_URI); + ElementsPackageImpl theElementsPackage = registeredElementsPackage instanceof ElementsPackageImpl ? (ElementsPackageImpl)registeredElementsPackage : new ElementsPackageImpl(); isInited = true; @@ -112,7 +113,8 @@ public class ElementsPackageImpl extends EPackageImpl implements ElementsPackage XMLTypePackage.eINSTANCE.eClass(); // Obtain or create and register interdependencies - LibraryPackageImpl theLibraryPackage = (LibraryPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(LibraryPackage.eNS_URI) instanceof LibraryPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(LibraryPackage.eNS_URI) : LibraryPackage.eINSTANCE); + Object registeredPackage = EPackage.Registry.INSTANCE.getEPackage(LibraryPackage.eNS_URI); + LibraryPackageImpl theLibraryPackage = (LibraryPackageImpl)(registeredPackage instanceof LibraryPackageImpl ? registeredPackage : LibraryPackage.eINSTANCE); // Create package meta-data objects theElementsPackage.createPackageContents(); @@ -125,7 +127,6 @@ public class ElementsPackageImpl extends EPackageImpl implements ElementsPackage // 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; @@ -347,85 +348,85 @@ public class ElementsPackageImpl extends EPackageImpl implements ElementsPackage */ protected void createExtendedMetaDataAnnotations() { - String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; + String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; addAnnotation - (bookEClass, - source, - new String[] + (bookEClass, + source, + new String[] { - "name", "Book", - "kind", "elementOnly" - }); + "name", "Book", + "kind", "elementOnly" + }); addAnnotation - (getBook_Title(), - source, - new String[] + (getBook_Title(), + source, + new String[] { - "kind", "element", - "name", "title" - }); + "kind", "element", + "name", "title" + }); addAnnotation - (getBook_Pages(), - source, - new String[] + (getBook_Pages(), + source, + new String[] { - "kind", "element", - "name", "pages" - }); + "kind", "element", + "name", "pages" + }); addAnnotation - (getBook_Category(), - source, - new String[] + (getBook_Category(), + source, + new String[] { - "kind", "element", - "name", "category" - }); + "kind", "element", + "name", "category" + }); addAnnotation - (getBook_Author(), - source, - new String[] + (getBook_Author(), + source, + new String[] { - "kind", "element", - "name", "author" - }); + "kind", "element", + "name", "author" + }); addAnnotation - (bookCategoryEEnum, - source, - new String[] + (bookCategoryEEnum, + source, + new String[] { - "name", "BookCategory" - }); + "name", "BookCategory" + }); addAnnotation - (bookCategoryObjectEDataType, - source, - new String[] + (bookCategoryObjectEDataType, + source, + new String[] { - "name", "BookCategory:Object", - "baseType", "BookCategory" - }); + "name", "BookCategory:Object", + "baseType", "BookCategory" + }); addAnnotation - (writerEClass, - source, - new String[] + (writerEClass, + source, + new String[] { - "name", "Writer", - "kind", "elementOnly" - }); + "name", "Writer", + "kind", "elementOnly" + }); addAnnotation - (getWriter_Name(), - source, - new String[] + (getWriter_Name(), + source, + new String[] { - "kind", "element", - "name", "name" - }); + "kind", "element", + "name", "name" + }); addAnnotation - (getWriter_Books(), - source, - new String[] + (getWriter_Books(), + source, + new String[] { - "kind", "element", - "name", "books" + "kind", "element", + "name", "books" }); } diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/creation/library.xsds/src/org/examples/library/impl/LibraryPackageImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/creation/library.xsds/src/org/examples/library/impl/LibraryPackageImpl.java index 514c5466e..1a1885fa7 100644 --- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/creation/library.xsds/src/org/examples/library/impl/LibraryPackageImpl.java +++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/creation/library.xsds/src/org/examples/library/impl/LibraryPackageImpl.java @@ -64,7 +64,7 @@ public class LibraryPackageImpl extends EPackageImpl implements LibraryPackage /** * 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 --> @@ -79,7 +79,8 @@ public class LibraryPackageImpl extends EPackageImpl implements LibraryPackage if (isInited) return (LibraryPackage)EPackage.Registry.INSTANCE.getEPackage(LibraryPackage.eNS_URI); // Obtain or create and register package - LibraryPackageImpl theLibraryPackage = (LibraryPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof LibraryPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new LibraryPackageImpl()); + Object registeredLibraryPackage = EPackage.Registry.INSTANCE.get(eNS_URI); + LibraryPackageImpl theLibraryPackage = registeredLibraryPackage instanceof LibraryPackageImpl ? (LibraryPackageImpl)registeredLibraryPackage : new LibraryPackageImpl(); isInited = true; @@ -87,7 +88,8 @@ public class LibraryPackageImpl extends EPackageImpl implements LibraryPackage XMLTypePackage.eINSTANCE.eClass(); // Obtain or create and register interdependencies - ElementsPackageImpl theElementsPackage = (ElementsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ElementsPackage.eNS_URI) instanceof ElementsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ElementsPackage.eNS_URI) : ElementsPackage.eINSTANCE); + Object registeredPackage = EPackage.Registry.INSTANCE.getEPackage(ElementsPackage.eNS_URI); + ElementsPackageImpl theElementsPackage = (ElementsPackageImpl)(registeredPackage instanceof ElementsPackageImpl ? registeredPackage : ElementsPackage.eINSTANCE); // Create package meta-data objects theLibraryPackage.createPackageContents(); @@ -100,7 +102,6 @@ public class LibraryPackageImpl extends EPackageImpl implements LibraryPackage // 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; @@ -238,38 +239,38 @@ public class LibraryPackageImpl extends EPackageImpl implements LibraryPackage */ protected void createExtendedMetaDataAnnotations() { - String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; + String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; addAnnotation - (libraryEClass, - source, - new String[] + (libraryEClass, + source, + new String[] { - "name", "Library", - "kind", "elementOnly" - }); + "name", "Library", + "kind", "elementOnly" + }); addAnnotation - (getLibrary_Name(), - source, - new String[] + (getLibrary_Name(), + source, + new String[] { - "kind", "element", - "name", "name" - }); + "kind", "element", + "name", "name" + }); addAnnotation - (getLibrary_Writers(), - source, - new String[] + (getLibrary_Writers(), + source, + new String[] { - "kind", "element", - "name", "writers" - }); + "kind", "element", + "name", "writers" + }); addAnnotation - (getLibrary_Books(), - source, - new String[] + (getLibrary_Books(), + source, + new String[] { - "kind", "element", - "name", "books" + "kind", "element", + "name", "books" }); } diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.ecore/src/org/examples/hr/impl/HRPackageImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.ecore/src/org/examples/hr/impl/HRPackageImpl.java index e44106a04..3d6717613 100644 --- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.ecore/src/org/examples/hr/impl/HRPackageImpl.java +++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.ecore/src/org/examples/hr/impl/HRPackageImpl.java @@ -62,7 +62,7 @@ public class HRPackageImpl extends EPackageImpl implements HRPackage /** * 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 --> @@ -77,12 +77,14 @@ public class HRPackageImpl extends EPackageImpl implements HRPackage if (isInited) return (HRPackage)EPackage.Registry.INSTANCE.getEPackage(HRPackage.eNS_URI); // Obtain or create and register package - HRPackageImpl theHRPackage = (HRPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof HRPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new HRPackageImpl()); + Object registeredHRPackage = EPackage.Registry.INSTANCE.get(eNS_URI); + HRPackageImpl theHRPackage = registeredHRPackage instanceof HRPackageImpl ? (HRPackageImpl)registeredHRPackage : new HRPackageImpl(); isInited = true; // Obtain or create and register interdependencies - LibraryPackageImpl theLibraryPackage = (LibraryPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(LibraryPackage.eNS_URI) instanceof LibraryPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(LibraryPackage.eNS_URI) : LibraryPackage.eINSTANCE); + Object registeredPackage = EPackage.Registry.INSTANCE.getEPackage(LibraryPackage.eNS_URI); + LibraryPackageImpl theLibraryPackage = (LibraryPackageImpl)(registeredPackage instanceof LibraryPackageImpl ? registeredPackage : LibraryPackage.eINSTANCE); // Create package meta-data objects theHRPackage.createPackageContents(); @@ -95,7 +97,6 @@ public class HRPackageImpl extends EPackageImpl implements HRPackage // 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; diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.ecore/src/org/examples/library/impl/LibraryPackageImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.ecore/src/org/examples/library/impl/LibraryPackageImpl.java index 02cf69c28..d21e5dba8 100644 --- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.ecore/src/org/examples/library/impl/LibraryPackageImpl.java +++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.ecore/src/org/examples/library/impl/LibraryPackageImpl.java @@ -85,7 +85,7 @@ public class LibraryPackageImpl extends EPackageImpl implements LibraryPackage /** * 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 --> @@ -100,12 +100,14 @@ public class LibraryPackageImpl extends EPackageImpl implements LibraryPackage if (isInited) return (LibraryPackage)EPackage.Registry.INSTANCE.getEPackage(LibraryPackage.eNS_URI); // Obtain or create and register package - LibraryPackageImpl theLibraryPackage = (LibraryPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof LibraryPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new LibraryPackageImpl()); + Object registeredLibraryPackage = EPackage.Registry.INSTANCE.get(eNS_URI); + LibraryPackageImpl theLibraryPackage = registeredLibraryPackage instanceof LibraryPackageImpl ? (LibraryPackageImpl)registeredLibraryPackage : new LibraryPackageImpl(); isInited = true; // Obtain or create and register interdependencies - HRPackageImpl theHRPackage = (HRPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(HRPackage.eNS_URI) instanceof HRPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(HRPackage.eNS_URI) : HRPackage.eINSTANCE); + Object registeredPackage = EPackage.Registry.INSTANCE.getEPackage(HRPackage.eNS_URI); + HRPackageImpl theHRPackage = (HRPackageImpl)(registeredPackage instanceof HRPackageImpl ? registeredPackage : HRPackage.eINSTANCE); // Create package meta-data objects theLibraryPackage.createPackageContents(); @@ -118,7 +120,6 @@ public class LibraryPackageImpl extends EPackageImpl implements LibraryPackage // 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; diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.rose/src/org/examples/hr/impl/HRPackageImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.rose/src/org/examples/hr/impl/HRPackageImpl.java index e44106a04..3d6717613 100644 --- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.rose/src/org/examples/hr/impl/HRPackageImpl.java +++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.rose/src/org/examples/hr/impl/HRPackageImpl.java @@ -62,7 +62,7 @@ public class HRPackageImpl extends EPackageImpl implements HRPackage /** * 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 --> @@ -77,12 +77,14 @@ public class HRPackageImpl extends EPackageImpl implements HRPackage if (isInited) return (HRPackage)EPackage.Registry.INSTANCE.getEPackage(HRPackage.eNS_URI); // Obtain or create and register package - HRPackageImpl theHRPackage = (HRPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof HRPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new HRPackageImpl()); + Object registeredHRPackage = EPackage.Registry.INSTANCE.get(eNS_URI); + HRPackageImpl theHRPackage = registeredHRPackage instanceof HRPackageImpl ? (HRPackageImpl)registeredHRPackage : new HRPackageImpl(); isInited = true; // Obtain or create and register interdependencies - LibraryPackageImpl theLibraryPackage = (LibraryPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(LibraryPackage.eNS_URI) instanceof LibraryPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(LibraryPackage.eNS_URI) : LibraryPackage.eINSTANCE); + Object registeredPackage = EPackage.Registry.INSTANCE.getEPackage(LibraryPackage.eNS_URI); + LibraryPackageImpl theLibraryPackage = (LibraryPackageImpl)(registeredPackage instanceof LibraryPackageImpl ? registeredPackage : LibraryPackage.eINSTANCE); // Create package meta-data objects theHRPackage.createPackageContents(); @@ -95,7 +97,6 @@ public class HRPackageImpl extends EPackageImpl implements HRPackage // 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; diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.rose/src/org/examples/library/impl/LibraryPackageImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.rose/src/org/examples/library/impl/LibraryPackageImpl.java index 02cf69c28..d21e5dba8 100644 --- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.rose/src/org/examples/library/impl/LibraryPackageImpl.java +++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.rose/src/org/examples/library/impl/LibraryPackageImpl.java @@ -85,7 +85,7 @@ public class LibraryPackageImpl extends EPackageImpl implements LibraryPackage /** * 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 --> @@ -100,12 +100,14 @@ public class LibraryPackageImpl extends EPackageImpl implements LibraryPackage if (isInited) return (LibraryPackage)EPackage.Registry.INSTANCE.getEPackage(LibraryPackage.eNS_URI); // Obtain or create and register package - LibraryPackageImpl theLibraryPackage = (LibraryPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof LibraryPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new LibraryPackageImpl()); + Object registeredLibraryPackage = EPackage.Registry.INSTANCE.get(eNS_URI); + LibraryPackageImpl theLibraryPackage = registeredLibraryPackage instanceof LibraryPackageImpl ? (LibraryPackageImpl)registeredLibraryPackage : new LibraryPackageImpl(); isInited = true; // Obtain or create and register interdependencies - HRPackageImpl theHRPackage = (HRPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(HRPackage.eNS_URI) instanceof HRPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(HRPackage.eNS_URI) : HRPackage.eINSTANCE); + Object registeredPackage = EPackage.Registry.INSTANCE.getEPackage(HRPackage.eNS_URI); + HRPackageImpl theHRPackage = (HRPackageImpl)(registeredPackage instanceof HRPackageImpl ? registeredPackage : HRPackage.eINSTANCE); // Create package meta-data objects theLibraryPackage.createPackageContents(); @@ -118,7 +120,6 @@ public class LibraryPackageImpl extends EPackageImpl implements LibraryPackage // 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; diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.xsd/src/org/examples/library/impl/LibraryPackageImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.xsd/src/org/examples/library/impl/LibraryPackageImpl.java index 5fa013b01..568b15f12 100644 --- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.xsd/src/org/examples/library/impl/LibraryPackageImpl.java +++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.xsd/src/org/examples/library/impl/LibraryPackageImpl.java @@ -93,7 +93,7 @@ public class LibraryPackageImpl extends EPackageImpl implements LibraryPackage /** * 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 --> @@ -108,7 +108,8 @@ public class LibraryPackageImpl extends EPackageImpl implements LibraryPackage if (isInited) return (LibraryPackage)EPackage.Registry.INSTANCE.getEPackage(LibraryPackage.eNS_URI); // Obtain or create and register package - LibraryPackageImpl theLibraryPackage = (LibraryPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof LibraryPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new LibraryPackageImpl()); + Object registeredLibraryPackage = EPackage.Registry.INSTANCE.get(eNS_URI); + LibraryPackageImpl theLibraryPackage = registeredLibraryPackage instanceof LibraryPackageImpl ? (LibraryPackageImpl)registeredLibraryPackage : new LibraryPackageImpl(); isInited = true; @@ -124,7 +125,6 @@ public class LibraryPackageImpl extends EPackageImpl implements LibraryPackage // 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; @@ -409,125 +409,125 @@ public class LibraryPackageImpl extends EPackageImpl implements LibraryPackage */ protected void createExtendedMetaDataAnnotations() { - String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; //$NON-NLS-1$ + String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; //$NON-NLS-1$ addAnnotation - (bookEClass, - source, - new String[] + (bookEClass, + source, + new String[] { - "name", "Book", //$NON-NLS-1$ //$NON-NLS-2$ - "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$ - }); + "name", "Book", //$NON-NLS-1$ //$NON-NLS-2$ + "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$ + }); addAnnotation - (getBook_Title(), - source, - new String[] + (getBook_Title(), + source, + new String[] { - "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "title" //$NON-NLS-1$ //$NON-NLS-2$ - }); + "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ + "name", "title" //$NON-NLS-1$ //$NON-NLS-2$ + }); addAnnotation - (getBook_Pages(), - source, - new String[] + (getBook_Pages(), + source, + new String[] { - "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "pages" //$NON-NLS-1$ //$NON-NLS-2$ - }); + "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ + "name", "pages" //$NON-NLS-1$ //$NON-NLS-2$ + }); addAnnotation - (getBook_Category(), - source, - new String[] + (getBook_Category(), + source, + new String[] { - "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "category" //$NON-NLS-1$ //$NON-NLS-2$ - }); + "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ + "name", "category" //$NON-NLS-1$ //$NON-NLS-2$ + }); addAnnotation - (getBook_Author(), - source, - new String[] + (getBook_Author(), + source, + new String[] { - "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "author" //$NON-NLS-1$ //$NON-NLS-2$ - }); + "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ + "name", "author" //$NON-NLS-1$ //$NON-NLS-2$ + }); addAnnotation - (bookCategoryEEnum, - source, - new String[] + (bookCategoryEEnum, + source, + new String[] { - "name", "BookCategory" //$NON-NLS-1$ //$NON-NLS-2$ - }); + "name", "BookCategory" //$NON-NLS-1$ //$NON-NLS-2$ + }); addAnnotation - (bookCategoryObjectEDataType, - source, - new String[] + (bookCategoryObjectEDataType, + source, + new String[] { - "name", "BookCategory:Object", //$NON-NLS-1$ //$NON-NLS-2$ - "baseType", "BookCategory" //$NON-NLS-1$ //$NON-NLS-2$ - }); + "name", "BookCategory:Object", //$NON-NLS-1$ //$NON-NLS-2$ + "baseType", "BookCategory" //$NON-NLS-1$ //$NON-NLS-2$ + }); addAnnotation - (libraryEClass, - source, - new String[] + (libraryEClass, + source, + new String[] { - "name", "Library", //$NON-NLS-1$ //$NON-NLS-2$ - "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$ - }); + "name", "Library", //$NON-NLS-1$ //$NON-NLS-2$ + "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$ + }); addAnnotation - (getLibrary_Name(), - source, - new String[] + (getLibrary_Name(), + source, + new String[] { - "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "name" //$NON-NLS-1$ //$NON-NLS-2$ - }); + "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ + "name", "name" //$NON-NLS-1$ //$NON-NLS-2$ + }); addAnnotation - (getLibrary_Site(), - source, - new String[] + (getLibrary_Site(), + source, + new String[] { - "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "site" //$NON-NLS-1$ //$NON-NLS-2$ - }); + "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ + "name", "site" //$NON-NLS-1$ //$NON-NLS-2$ + }); addAnnotation - (getLibrary_Writers(), - source, - new String[] + (getLibrary_Writers(), + source, + new String[] { - "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "writers" //$NON-NLS-1$ //$NON-NLS-2$ - }); + "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ + "name", "writers" //$NON-NLS-1$ //$NON-NLS-2$ + }); addAnnotation - (getLibrary_Books(), - source, - new String[] + (getLibrary_Books(), + source, + new String[] { - "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "books" //$NON-NLS-1$ //$NON-NLS-2$ - }); + "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ + "name", "books" //$NON-NLS-1$ //$NON-NLS-2$ + }); addAnnotation - (writerEClass, - source, - new String[] + (writerEClass, + source, + new String[] { - "name", "Writer", //$NON-NLS-1$ //$NON-NLS-2$ - "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$ - }); + "name", "Writer", //$NON-NLS-1$ //$NON-NLS-2$ + "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$ + }); addAnnotation - (getWriter_Name(), - source, - new String[] + (getWriter_Name(), + source, + new String[] { - "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "name" //$NON-NLS-1$ //$NON-NLS-2$ - }); + "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ + "name", "name" //$NON-NLS-1$ //$NON-NLS-2$ + }); addAnnotation - (getWriter_Books(), - source, - new String[] + (getWriter_Books(), + source, + new String[] { - "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "books" //$NON-NLS-1$ //$NON-NLS-2$ + "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ + "name", "books" //$NON-NLS-1$ //$NON-NLS-2$ }); } diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.xsds/src/org/examples/library/elements/impl/ElementsPackageImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.xsds/src/org/examples/library/elements/impl/ElementsPackageImpl.java index 477d69da8..4bdf017ce 100644 --- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.xsds/src/org/examples/library/elements/impl/ElementsPackageImpl.java +++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.xsds/src/org/examples/library/elements/impl/ElementsPackageImpl.java @@ -100,7 +100,7 @@ public class ElementsPackageImpl extends EPackageImpl implements ElementsPackage /** * 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 --> @@ -115,7 +115,8 @@ public class ElementsPackageImpl extends EPackageImpl implements ElementsPackage if (isInited) return (ElementsPackage)EPackage.Registry.INSTANCE.getEPackage(ElementsPackage.eNS_URI); // Obtain or create and register package - ElementsPackageImpl theElementsPackage = (ElementsPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof ElementsPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new ElementsPackageImpl()); + Object registeredElementsPackage = EPackage.Registry.INSTANCE.get(eNS_URI); + ElementsPackageImpl theElementsPackage = registeredElementsPackage instanceof ElementsPackageImpl ? (ElementsPackageImpl)registeredElementsPackage : new ElementsPackageImpl(); isInited = true; @@ -123,8 +124,10 @@ public class ElementsPackageImpl extends EPackageImpl implements ElementsPackage XMLTypePackage.eINSTANCE.eClass(); // Obtain or create and register interdependencies - HrPackageImpl theHrPackage = (HrPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(HrPackage.eNS_URI) instanceof HrPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(HrPackage.eNS_URI) : HrPackage.eINSTANCE); - LibraryPackageImpl theLibraryPackage = (LibraryPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(LibraryPackage.eNS_URI) instanceof LibraryPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(LibraryPackage.eNS_URI) : LibraryPackage.eINSTANCE); + Object registeredPackage = EPackage.Registry.INSTANCE.getEPackage(HrPackage.eNS_URI); + HrPackageImpl theHrPackage = (HrPackageImpl)(registeredPackage instanceof HrPackageImpl ? registeredPackage : HrPackage.eINSTANCE); + registeredPackage = EPackage.Registry.INSTANCE.getEPackage(LibraryPackage.eNS_URI); + LibraryPackageImpl theLibraryPackage = (LibraryPackageImpl)(registeredPackage instanceof LibraryPackageImpl ? registeredPackage : LibraryPackage.eINSTANCE); // Create package meta-data objects theElementsPackage.createPackageContents(); @@ -138,7 +141,7 @@ public class ElementsPackageImpl extends EPackageImpl implements ElementsPackage // Register package validator EValidator.Registry.INSTANCE.put - (theElementsPackage, + (theElementsPackage, new EValidator.Descriptor() { public EValidator getEValidator() @@ -150,7 +153,6 @@ public class ElementsPackageImpl extends EPackageImpl implements ElementsPackage // 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; @@ -387,94 +389,94 @@ public class ElementsPackageImpl extends EPackageImpl implements ElementsPackage */ protected void createExtendedMetaDataAnnotations() { - String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; //$NON-NLS-1$ + String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; //$NON-NLS-1$ addAnnotation - (bookEClass, - source, - new String[] + (bookEClass, + source, + new String[] { - "name", "Book", //$NON-NLS-1$ //$NON-NLS-2$ - "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$ - }); + "name", "Book", //$NON-NLS-1$ //$NON-NLS-2$ + "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$ + }); addAnnotation - (getBook_Title(), - source, - new String[] + (getBook_Title(), + source, + new String[] { - "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "title" //$NON-NLS-1$ //$NON-NLS-2$ - }); + "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ + "name", "title" //$NON-NLS-1$ //$NON-NLS-2$ + }); addAnnotation - (getBook_Pages(), - source, - new String[] + (getBook_Pages(), + source, + new String[] { - "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "pages" //$NON-NLS-1$ //$NON-NLS-2$ - }); + "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ + "name", "pages" //$NON-NLS-1$ //$NON-NLS-2$ + }); addAnnotation - (getBook_Category(), - source, - new String[] + (getBook_Category(), + source, + new String[] { - "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "category" //$NON-NLS-1$ //$NON-NLS-2$ - }); + "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ + "name", "category" //$NON-NLS-1$ //$NON-NLS-2$ + }); addAnnotation - (getBook_Author(), - source, - new String[] + (getBook_Author(), + source, + new String[] { - "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "author" //$NON-NLS-1$ //$NON-NLS-2$ - }); + "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ + "name", "author" //$NON-NLS-1$ //$NON-NLS-2$ + }); addAnnotation - (getBook_Uuid(), - source, - new String[] + (getBook_Uuid(), + source, + new String[] { - "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "uuid" //$NON-NLS-1$ //$NON-NLS-2$ - }); + "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$ + "name", "uuid" //$NON-NLS-1$ //$NON-NLS-2$ + }); addAnnotation - (bookCategoryEEnum, - source, - new String[] + (bookCategoryEEnum, + source, + new String[] { - "name", "BookCategory" //$NON-NLS-1$ //$NON-NLS-2$ - }); + "name", "BookCategory" //$NON-NLS-1$ //$NON-NLS-2$ + }); addAnnotation - (bookCategoryObjectEDataType, - source, - new String[] + (bookCategoryObjectEDataType, + source, + new String[] { - "name", "BookCategory:Object", //$NON-NLS-1$ //$NON-NLS-2$ - "baseType", "BookCategory" //$NON-NLS-1$ //$NON-NLS-2$ - }); + "name", "BookCategory:Object", //$NON-NLS-1$ //$NON-NLS-2$ + "baseType", "BookCategory" //$NON-NLS-1$ //$NON-NLS-2$ + }); addAnnotation - (uuidEDataType, - source, - new String[] + (uuidEDataType, + source, + new String[] { - "name", "UUID", //$NON-NLS-1$ //$NON-NLS-2$ - "baseType", "http://www.eclipse.org/emf/2003/XMLType#hexBinary", //$NON-NLS-1$ //$NON-NLS-2$ - "length", "16" //$NON-NLS-1$ //$NON-NLS-2$ - }); + "name", "UUID", //$NON-NLS-1$ //$NON-NLS-2$ + "baseType", "http://www.eclipse.org/emf/2003/XMLType#hexBinary", //$NON-NLS-1$ //$NON-NLS-2$ + "length", "16" //$NON-NLS-1$ //$NON-NLS-2$ + }); addAnnotation - (writerEClass, - source, - new String[] + (writerEClass, + source, + new String[] { - "name", "Writer", //$NON-NLS-1$ //$NON-NLS-2$ - "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$ - }); + "name", "Writer", //$NON-NLS-1$ //$NON-NLS-2$ + "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$ + }); addAnnotation - (getWriter_Books(), - source, - new String[] + (getWriter_Books(), + source, + new String[] { - "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "books" //$NON-NLS-1$ //$NON-NLS-2$ + "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ + "name", "books" //$NON-NLS-1$ //$NON-NLS-2$ }); } diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.xsds/src/org/examples/library/hr/impl/HrPackageImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.xsds/src/org/examples/library/hr/impl/HrPackageImpl.java index 0f47b821c..3788e27cc 100644 --- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.xsds/src/org/examples/library/hr/impl/HrPackageImpl.java +++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.xsds/src/org/examples/library/hr/impl/HrPackageImpl.java @@ -68,7 +68,7 @@ public class HrPackageImpl extends EPackageImpl implements HrPackage /** * 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 --> @@ -83,7 +83,8 @@ public class HrPackageImpl extends EPackageImpl implements HrPackage if (isInited) return (HrPackage)EPackage.Registry.INSTANCE.getEPackage(HrPackage.eNS_URI); // Obtain or create and register package - HrPackageImpl theHrPackage = (HrPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof HrPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new HrPackageImpl()); + Object registeredHrPackage = EPackage.Registry.INSTANCE.get(eNS_URI); + HrPackageImpl theHrPackage = registeredHrPackage instanceof HrPackageImpl ? (HrPackageImpl)registeredHrPackage : new HrPackageImpl(); isInited = true; @@ -91,8 +92,10 @@ public class HrPackageImpl extends EPackageImpl implements HrPackage XMLTypePackage.eINSTANCE.eClass(); // Obtain or create and register interdependencies - ElementsPackageImpl theElementsPackage = (ElementsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ElementsPackage.eNS_URI) instanceof ElementsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ElementsPackage.eNS_URI) : ElementsPackage.eINSTANCE); - LibraryPackageImpl theLibraryPackage = (LibraryPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(LibraryPackage.eNS_URI) instanceof LibraryPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(LibraryPackage.eNS_URI) : LibraryPackage.eINSTANCE); + Object registeredPackage = EPackage.Registry.INSTANCE.getEPackage(ElementsPackage.eNS_URI); + ElementsPackageImpl theElementsPackage = (ElementsPackageImpl)(registeredPackage instanceof ElementsPackageImpl ? registeredPackage : ElementsPackage.eINSTANCE); + registeredPackage = EPackage.Registry.INSTANCE.getEPackage(LibraryPackage.eNS_URI); + LibraryPackageImpl theLibraryPackage = (LibraryPackageImpl)(registeredPackage instanceof LibraryPackageImpl ? registeredPackage : LibraryPackage.eINSTANCE); // Create package meta-data objects theHrPackage.createPackageContents(); @@ -107,7 +110,6 @@ public class HrPackageImpl extends EPackageImpl implements HrPackage // 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; @@ -233,30 +235,30 @@ public class HrPackageImpl extends EPackageImpl implements HrPackage */ protected void createExtendedMetaDataAnnotations() { - String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; //$NON-NLS-1$ + String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; //$NON-NLS-1$ addAnnotation - (personEClass, - source, - new String[] + (personEClass, + source, + new String[] { - "name", "Person", //$NON-NLS-1$ //$NON-NLS-2$ - "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$ - }); + "name", "Person", //$NON-NLS-1$ //$NON-NLS-2$ + "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$ + }); addAnnotation - (getPerson_Name(), - source, - new String[] + (getPerson_Name(), + source, + new String[] { - "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "name" //$NON-NLS-1$ //$NON-NLS-2$ - }); + "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ + "name", "name" //$NON-NLS-1$ //$NON-NLS-2$ + }); addAnnotation - (getPerson_Library(), - source, - new String[] + (getPerson_Library(), + source, + new String[] { - "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "library" //$NON-NLS-1$ //$NON-NLS-2$ + "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ + "name", "library" //$NON-NLS-1$ //$NON-NLS-2$ }); } diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.xsds/src/org/examples/library/impl/LibraryPackageImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.xsds/src/org/examples/library/impl/LibraryPackageImpl.java index 1cdcd31e7..b5ec4dc1b 100644 --- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.xsds/src/org/examples/library/impl/LibraryPackageImpl.java +++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.xsds/src/org/examples/library/impl/LibraryPackageImpl.java @@ -66,7 +66,7 @@ public class LibraryPackageImpl extends EPackageImpl implements LibraryPackage /** * 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 --> @@ -81,7 +81,8 @@ public class LibraryPackageImpl extends EPackageImpl implements LibraryPackage if (isInited) return (LibraryPackage)EPackage.Registry.INSTANCE.getEPackage(LibraryPackage.eNS_URI); // Obtain or create and register package - LibraryPackageImpl theLibraryPackage = (LibraryPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof LibraryPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new LibraryPackageImpl()); + Object registeredLibraryPackage = EPackage.Registry.INSTANCE.get(eNS_URI); + LibraryPackageImpl theLibraryPackage = registeredLibraryPackage instanceof LibraryPackageImpl ? (LibraryPackageImpl)registeredLibraryPackage : new LibraryPackageImpl(); isInited = true; @@ -89,8 +90,10 @@ public class LibraryPackageImpl extends EPackageImpl implements LibraryPackage XMLTypePackage.eINSTANCE.eClass(); // Obtain or create and register interdependencies - ElementsPackageImpl theElementsPackage = (ElementsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ElementsPackage.eNS_URI) instanceof ElementsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ElementsPackage.eNS_URI) : ElementsPackage.eINSTANCE); - HrPackageImpl theHrPackage = (HrPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(HrPackage.eNS_URI) instanceof HrPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(HrPackage.eNS_URI) : HrPackage.eINSTANCE); + Object registeredPackage = EPackage.Registry.INSTANCE.getEPackage(ElementsPackage.eNS_URI); + ElementsPackageImpl theElementsPackage = (ElementsPackageImpl)(registeredPackage instanceof ElementsPackageImpl ? registeredPackage : ElementsPackage.eINSTANCE); + registeredPackage = EPackage.Registry.INSTANCE.getEPackage(HrPackage.eNS_URI); + HrPackageImpl theHrPackage = (HrPackageImpl)(registeredPackage instanceof HrPackageImpl ? registeredPackage : HrPackage.eINSTANCE); // Create package meta-data objects theLibraryPackage.createPackageContents(); @@ -105,7 +108,6 @@ public class LibraryPackageImpl extends EPackageImpl implements LibraryPackage // 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; @@ -256,46 +258,46 @@ public class LibraryPackageImpl extends EPackageImpl implements LibraryPackage */ protected void createExtendedMetaDataAnnotations() { - String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; //$NON-NLS-1$ + String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; //$NON-NLS-1$ addAnnotation - (libraryEClass, - source, - new String[] + (libraryEClass, + source, + new String[] { - "name", "Library", //$NON-NLS-1$ //$NON-NLS-2$ - "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$ - }); + "name", "Library", //$NON-NLS-1$ //$NON-NLS-2$ + "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$ + }); addAnnotation - (getLibrary_Name(), - source, - new String[] + (getLibrary_Name(), + source, + new String[] { - "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "name" //$NON-NLS-1$ //$NON-NLS-2$ - }); + "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ + "name", "name" //$NON-NLS-1$ //$NON-NLS-2$ + }); addAnnotation - (getLibrary_Writers(), - source, - new String[] + (getLibrary_Writers(), + source, + new String[] { - "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "writers" //$NON-NLS-1$ //$NON-NLS-2$ - }); + "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ + "name", "writers" //$NON-NLS-1$ //$NON-NLS-2$ + }); addAnnotation - (getLibrary_Books(), - source, - new String[] + (getLibrary_Books(), + source, + new String[] { - "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "books" //$NON-NLS-1$ //$NON-NLS-2$ - }); + "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ + "name", "books" //$NON-NLS-1$ //$NON-NLS-2$ + }); addAnnotation - (getLibrary_Employees(), - source, - new String[] + (getLibrary_Employees(), + source, + new String[] { - "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ - "name", "employees" //$NON-NLS-1$ //$NON-NLS-2$ + "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$ + "name", "employees" //$NON-NLS-1$ //$NON-NLS-2$ }); } |