You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by fr...@apache.org on 2007/05/08 23:51:26 UTC
svn commit: r536345 - in /incubator/tuscany/java/sdo/tools:
src/main/java/org/apache/tuscany/sdo/generate/templates/model/SDOFactoryClass.java
templates/models/SDOFactoryClass.javajet
Author: frankb
Date: Tue May 8 14:51:25 2007
New Revision: 536345
URL: http://svn.apache.org/viewvc?view=rev&rev=536345
Log:
Fix for TUSCANY-1250
Modified:
incubator/tuscany/java/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/templates/model/SDOFactoryClass.java
incubator/tuscany/java/sdo/tools/templates/models/SDOFactoryClass.javajet
Modified: incubator/tuscany/java/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/templates/model/SDOFactoryClass.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/templates/model/SDOFactoryClass.java?view=diff&rev=536345&r1=536344&r2=536345
==============================================================================
--- incubator/tuscany/java/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/templates/model/SDOFactoryClass.java (original)
+++ incubator/tuscany/java/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/templates/model/SDOFactoryClass.java Tue May 8 14:51:25 2007
@@ -172,192 +172,193 @@
protected final String TEXT_132 = " property = null;" + NL + "" + NL + "\t\t// Add supertypes to types";
protected final String TEXT_133 = NL + "\t\taddSuperType(";
protected final String TEXT_134 = "Type, ";
- protected final String TEXT_135 = "Type);";
- protected final String TEXT_136 = NL + NL + "\t\t// Initialize types and properties";
- protected final String TEXT_137 = NL + "\t\tinitializeType(";
- protected final String TEXT_138 = "Type, ";
- protected final String TEXT_139 = ".class, \"";
- protected final String TEXT_140 = "\", ";
- protected final String TEXT_141 = ");";
- protected final String TEXT_142 = NL + "\t\tsetInstanceProperty (";
- protected final String TEXT_143 = "Type, \"";
- protected final String TEXT_144 = "\", ";
- protected final String TEXT_145 = ", ";
- protected final String TEXT_146 = ");";
- protected final String TEXT_147 = NL + "\t\tproperty = getProperty(";
- protected final String TEXT_148 = "Type, ";
- protected final String TEXT_149 = ".INTERNAL_";
- protected final String TEXT_150 = ");";
- protected final String TEXT_151 = NL + "\t\tinitializeProperty(property, ";
- protected final String TEXT_152 = ", \"";
- protected final String TEXT_153 = "\", ";
- protected final String TEXT_154 = ", ";
+ protected final String TEXT_135 = ".get";
+ protected final String TEXT_136 = "());";
+ protected final String TEXT_137 = NL + NL + "\t\t// Initialize types and properties";
+ protected final String TEXT_138 = NL + "\t\tinitializeType(";
+ protected final String TEXT_139 = "Type, ";
+ protected final String TEXT_140 = ".class, \"";
+ protected final String TEXT_141 = "\", ";
+ protected final String TEXT_142 = ");";
+ protected final String TEXT_143 = NL + "\t\tsetInstanceProperty (";
+ protected final String TEXT_144 = "Type, \"";
+ protected final String TEXT_145 = "\", ";
+ protected final String TEXT_146 = ", ";
+ protected final String TEXT_147 = ");";
+ protected final String TEXT_148 = NL + "\t\tproperty = getProperty(";
+ protected final String TEXT_149 = "Type, ";
+ protected final String TEXT_150 = ".INTERNAL_";
+ protected final String TEXT_151 = ");";
+ protected final String TEXT_152 = NL + "\t\tinitializeProperty(property, ";
+ protected final String TEXT_153 = ", \"";
+ protected final String TEXT_154 = "\", ";
protected final String TEXT_155 = ", ";
protected final String TEXT_156 = ", ";
protected final String TEXT_157 = ", ";
protected final String TEXT_158 = ", ";
protected final String TEXT_159 = ", ";
protected final String TEXT_160 = ", ";
- protected final String TEXT_161 = " , ";
- protected final String TEXT_162 = ");";
- protected final String TEXT_163 = NL + "\t\tinitializeProperty(property, ";
- protected final String TEXT_164 = ", \"";
- protected final String TEXT_165 = "\", ";
- protected final String TEXT_166 = ", ";
+ protected final String TEXT_161 = ", ";
+ protected final String TEXT_162 = " , ";
+ protected final String TEXT_163 = ");";
+ protected final String TEXT_164 = NL + "\t\tinitializeProperty(property, ";
+ protected final String TEXT_165 = ", \"";
+ protected final String TEXT_166 = "\", ";
protected final String TEXT_167 = ", ";
protected final String TEXT_168 = ", ";
protected final String TEXT_169 = ", ";
protected final String TEXT_170 = ", ";
protected final String TEXT_171 = ", ";
- protected final String TEXT_172 = ");";
- protected final String TEXT_173 = NL + "\t\tsetInstanceProperty (property, \"";
- protected final String TEXT_174 = "\", ";
- protected final String TEXT_175 = ", ";
- protected final String TEXT_176 = ");";
- protected final String TEXT_177 = NL;
- protected final String TEXT_178 = NL + "\t\t// Initialize data types";
- protected final String TEXT_179 = NL + "\t\tinitializeType(";
- protected final String TEXT_180 = "Type, ";
- protected final String TEXT_181 = ".class, \"";
- protected final String TEXT_182 = "\", ";
- protected final String TEXT_183 = ", ";
- protected final String TEXT_184 = ");";
- protected final String TEXT_185 = NL + "\t\tsetInstanceProperty (";
- protected final String TEXT_186 = "Type, \"";
- protected final String TEXT_187 = "\", ";
- protected final String TEXT_188 = ", ";
- protected final String TEXT_189 = ");";
- protected final String TEXT_190 = NL;
- protected final String TEXT_191 = NL + "\t\tcreateXSDMetaData(";
- protected final String TEXT_192 = ");" + NL + "\t}" + NL + "\t " + NL + "\tprotected void createXSDMetaData(";
- protected final String TEXT_193 = ")" + NL + "\t{" + NL + "\t\tsuper.initXSD();" + NL + "\t\t" + NL + "\t\t";
- protected final String TEXT_194 = " property = null;" + NL + "\t\t";
- protected final String TEXT_195 = NL + "\t\taddXSDMapping" + NL + "\t\t (new String[]" + NL + "\t\t\t {";
- protected final String TEXT_196 = NL + "\t\t\t ";
- protected final String TEXT_197 = ", ";
- protected final String TEXT_198 = NL + "\t\t\t });" + NL;
- protected final String TEXT_199 = NL;
- protected final String TEXT_200 = NL + "\t\taddXSDMapping" + NL + "\t\t (";
- protected final String TEXT_201 = "Type," + NL + "\t\t\t new String[] " + NL + "\t\t\t {";
- protected final String TEXT_202 = NL + "\t\t\t ";
- protected final String TEXT_203 = ", ";
- protected final String TEXT_204 = NL + "\t\t\t });" + NL;
- protected final String TEXT_205 = NL + "\t\tproperty = createGlobalProperty" + NL + "\t\t (\"";
- protected final String TEXT_206 = "\"," + NL + "\t\t ";
- protected final String TEXT_207 = ".get";
- protected final String TEXT_208 = "()," + NL + "\t\t\t new String[]" + NL + "\t\t\t {";
- protected final String TEXT_209 = NL + "\t\t\t ";
- protected final String TEXT_210 = ", ";
- protected final String TEXT_211 = NL + "\t\t\t }," + NL + "\t\t\t IS_ATTRIBUTE);";
- protected final String TEXT_212 = NL + "\t\t\t });";
- protected final String TEXT_213 = NL + " ";
- protected final String TEXT_214 = NL + "\t\tsetInstanceProperty" + NL + "\t\t (property," + NL + "\t\t\t \"";
- protected final String TEXT_215 = "\"," + NL + "\t\t\t ";
- protected final String TEXT_216 = ", ";
- protected final String TEXT_217 = ");";
- protected final String TEXT_218 = NL + " ";
- protected final String TEXT_219 = " ";
- protected final String TEXT_220 = NL + "\t\taddXSDMapping" + NL + "\t\t\t(getProperty(";
- protected final String TEXT_221 = "Type, ";
- protected final String TEXT_222 = ".INTERNAL_";
- protected final String TEXT_223 = ")," + NL + "\t\t\t new String[]" + NL + "\t\t\t {";
- protected final String TEXT_224 = NL + "\t\t\t ";
- protected final String TEXT_225 = ", ";
- protected final String TEXT_226 = NL + "\t\t\t });" + NL;
- protected final String TEXT_227 = NL + " }" + NL + " ";
- protected final String TEXT_228 = NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic ";
- protected final String TEXT_229 = " create";
- protected final String TEXT_230 = "FromString(String initialValue)" + NL + "\t{";
- protected final String TEXT_231 = NL + "\t\t";
- protected final String TEXT_232 = " result = ";
- protected final String TEXT_233 = ".get(initialValue);" + NL + "\t\tif (result == null) throw new IllegalArgumentException(\"The value '\" + initialValue + \"' is not a valid enumerator of '\" + type.getName() + \"'\");";
- protected final String TEXT_234 = NL + "\t\treturn result;";
- protected final String TEXT_235 = NL + "\t\treturn (";
- protected final String TEXT_236 = ")create";
- protected final String TEXT_237 = "FromString(initialValue);";
- protected final String TEXT_238 = NL + "\t\treturn (";
- protected final String TEXT_239 = ")";
- protected final String TEXT_240 = ".create";
- protected final String TEXT_241 = "FromString(initialValue);";
- protected final String TEXT_242 = NL + "\t\tif (initialValue == null) return null;" + NL + "\t\t";
- protected final String TEXT_243 = " result = new ";
- protected final String TEXT_244 = "();" + NL + "\t\tfor (";
- protected final String TEXT_245 = " stringTokenizer = new ";
- protected final String TEXT_246 = "(initialValue); stringTokenizer.hasMoreTokens(); )" + NL + "\t\t{" + NL + "\t\t\tString item = stringTokenizer.nextToken();";
- protected final String TEXT_247 = NL + "\t\t\tresult.add(create";
- protected final String TEXT_248 = "FromString(item));";
- protected final String TEXT_249 = NL + "\t\t\tresult.add(";
- protected final String TEXT_250 = ".create";
- protected final String TEXT_251 = "FromString(item));";
- protected final String TEXT_252 = NL + "\t\t}" + NL + "\t\treturn result;";
- protected final String TEXT_253 = NL + "\t\tif (initialValue == null) return null;" + NL + "\t\t";
- protected final String TEXT_254 = " result = null;" + NL + "\t\tRuntimeException exception = null;";
- protected final String TEXT_255 = NL + "\t\ttry" + NL + "\t\t{";
- protected final String TEXT_256 = NL + "\t\t\tresult = (";
- protected final String TEXT_257 = ")create";
- protected final String TEXT_258 = "FromString(initialValue);";
- protected final String TEXT_259 = NL + "\t\t\tresult = (";
- protected final String TEXT_260 = ")";
- protected final String TEXT_261 = ".create";
- protected final String TEXT_262 = "FromString(initialValue);";
- protected final String TEXT_263 = NL + "\t\t\tif (result != null/* && Diagnostician.INSTANCE.validate(type, result, null, null)*/)" + NL + "\t\t\t{" + NL + "\t\t\t\treturn result;" + NL + "\t\t\t}" + NL + "\t\t}" + NL + "\t\tcatch (RuntimeException e)" + NL + "\t\t{" + NL + "\t\t\texception = e;" + NL + "\t\t}";
- protected final String TEXT_264 = NL + "\t\tif (result != null || exception == null) return result;" + NL + " " + NL + "\t\tthrow exception;";
- protected final String TEXT_265 = NL + "\t\t// TODO: implement this method" + NL + "\t\t// Ensure that you remove @generated or mark it @generated NOT" + NL + "\t\tthrow new ";
- protected final String TEXT_266 = "();";
- protected final String TEXT_267 = NL + "\t\treturn (";
- protected final String TEXT_268 = ")super.createFromString(";
- protected final String TEXT_269 = ", initialValue);";
- protected final String TEXT_270 = NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic String convert";
- protected final String TEXT_271 = "ToString(Object instanceValue)" + NL + "\t{";
- protected final String TEXT_272 = NL + "\t\treturn instanceValue == null ? null : instanceValue.toString();";
- protected final String TEXT_273 = NL + "\t\treturn convert";
- protected final String TEXT_274 = "ToString(instanceValue);";
- protected final String TEXT_275 = NL + "\t\treturn ";
- protected final String TEXT_276 = ".convert";
- protected final String TEXT_277 = "ToString(instanceValue);";
- protected final String TEXT_278 = NL + "\t\tif (instanceValue == null) return null;" + NL + "\t\t";
- protected final String TEXT_279 = " list = (";
- protected final String TEXT_280 = ")instanceValue;" + NL + "\t\tif (list.isEmpty()) return \"\";" + NL + "\t\t";
- protected final String TEXT_281 = " result = new ";
- protected final String TEXT_282 = "();" + NL + "\t\tfor (";
- protected final String TEXT_283 = " i = list.iterator(); i.hasNext(); )" + NL + "\t\t{";
- protected final String TEXT_284 = NL + "\t\t\tresult.append(convert";
- protected final String TEXT_285 = "ToString(i.next()));";
- protected final String TEXT_286 = NL + "\t\t\tresult.append(";
- protected final String TEXT_287 = ".convert";
- protected final String TEXT_288 = "ToString(i.next()));";
- protected final String TEXT_289 = NL + "\t\t\tresult.append(' ');" + NL + "\t\t}" + NL + "\t\treturn result.substring(0, result.length() - 1);";
- protected final String TEXT_290 = NL + "\t\tif (instanceValue == null) return null;";
- protected final String TEXT_291 = NL + "\t\tif (";
- protected final String TEXT_292 = ".isInstance(instanceValue))" + NL + "\t\t{" + NL + "\t\t\ttry" + NL + "\t\t\t{";
- protected final String TEXT_293 = NL + "\t\t\t\tString value = convert";
- protected final String TEXT_294 = "ToString(instanceValue);";
- protected final String TEXT_295 = NL + "\t\t\t\tString value = ";
- protected final String TEXT_296 = ".convert";
- protected final String TEXT_297 = "ToString(instanceValue);";
- protected final String TEXT_298 = NL + "\t\t\t\tif (value != null) return value;" + NL + "\t\t\t}" + NL + "\t\t\tcatch (Exception e)" + NL + "\t\t\t{" + NL + "\t\t\t}" + NL + "\t\t}";
- protected final String TEXT_299 = NL + "\t\tthrow new IllegalArgumentException(\"Invalid value: '\"+instanceValue+\"' for datatype :";
- protected final String TEXT_300 = "\");";
- protected final String TEXT_301 = NL + "\t\t// TODO: implement this method" + NL + "\t\t// Ensure that you remove @generated or mark it @generated NOT" + NL + "\t\tthrow new ";
- protected final String TEXT_302 = "();";
- protected final String TEXT_303 = NL + "\t\treturn super.convertToString(";
- protected final String TEXT_304 = ", instanceValue);";
- protected final String TEXT_305 = NL + "\t}" + NL;
- protected final String TEXT_306 = NL + "\t/**" + NL + "\t * Returns a new object of class '<em>";
- protected final String TEXT_307 = "</em>'." + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @return a new object of class '<em>";
- protected final String TEXT_308 = "</em>'." + NL + "\t * @generated" + NL + "\t */" + NL + "\t";
- protected final String TEXT_309 = " create";
- protected final String TEXT_310 = "();" + NL;
- protected final String TEXT_311 = NL + " /**" + NL + " * Registers the types supported by this Factory within the supplied scope.argument" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @param scope an instance of HelperContext used to manage the scoping of types." + NL + "\t * @generated" + NL + " */" + NL + " public void register(HelperContext scope);" + NL + " ";
- protected final String TEXT_312 = NL + "\t/**" + NL + "\t * Returns an instance of data type '<em>";
- protected final String TEXT_313 = "</em>' corresponding the given literal." + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @param literal a literal of the data type." + NL + "\t * @return a new instance value of the data type." + NL + "\t * @generated" + NL + "\t */" + NL + "\t";
- protected final String TEXT_314 = " create";
- protected final String TEXT_315 = "(String literal);" + NL + "" + NL + "\t/**" + NL + "\t * Returns a literal representation of an instance of data type '<em>";
- protected final String TEXT_316 = "</em>'." + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @param instanceValue an instance value of the data type." + NL + "\t * @return a literal representation of the instance value." + NL + "\t * @generated" + NL + "\t */" + NL + "\tString convert";
- protected final String TEXT_317 = "(";
- protected final String TEXT_318 = " instanceValue);" + NL;
- protected final String TEXT_319 = NL + "} //";
- protected final String TEXT_320 = NL;
+ protected final String TEXT_172 = ", ";
+ protected final String TEXT_173 = ");";
+ protected final String TEXT_174 = NL + "\t\tsetInstanceProperty (property, \"";
+ protected final String TEXT_175 = "\", ";
+ protected final String TEXT_176 = ", ";
+ protected final String TEXT_177 = ");";
+ protected final String TEXT_178 = NL;
+ protected final String TEXT_179 = NL + "\t\t// Initialize data types";
+ protected final String TEXT_180 = NL + "\t\tinitializeType(";
+ protected final String TEXT_181 = "Type, ";
+ protected final String TEXT_182 = ".class, \"";
+ protected final String TEXT_183 = "\", ";
+ protected final String TEXT_184 = ", ";
+ protected final String TEXT_185 = ");";
+ protected final String TEXT_186 = NL + "\t\tsetInstanceProperty (";
+ protected final String TEXT_187 = "Type, \"";
+ protected final String TEXT_188 = "\", ";
+ protected final String TEXT_189 = ", ";
+ protected final String TEXT_190 = ");";
+ protected final String TEXT_191 = NL;
+ protected final String TEXT_192 = NL + "\t\tcreateXSDMetaData(";
+ protected final String TEXT_193 = ");" + NL + "\t}" + NL + "\t " + NL + "\tprotected void createXSDMetaData(";
+ protected final String TEXT_194 = ")" + NL + "\t{" + NL + "\t\tsuper.initXSD();" + NL + "\t\t" + NL + "\t\t";
+ protected final String TEXT_195 = " property = null;" + NL + "\t\t";
+ protected final String TEXT_196 = NL + "\t\taddXSDMapping" + NL + "\t\t (new String[]" + NL + "\t\t\t {";
+ protected final String TEXT_197 = NL + "\t\t\t ";
+ protected final String TEXT_198 = ", ";
+ protected final String TEXT_199 = NL + "\t\t\t });" + NL;
+ protected final String TEXT_200 = NL;
+ protected final String TEXT_201 = NL + "\t\taddXSDMapping" + NL + "\t\t (";
+ protected final String TEXT_202 = "Type," + NL + "\t\t\t new String[] " + NL + "\t\t\t {";
+ protected final String TEXT_203 = NL + "\t\t\t ";
+ protected final String TEXT_204 = ", ";
+ protected final String TEXT_205 = NL + "\t\t\t });" + NL;
+ protected final String TEXT_206 = NL + "\t\tproperty = createGlobalProperty" + NL + "\t\t (\"";
+ protected final String TEXT_207 = "\"," + NL + "\t\t ";
+ protected final String TEXT_208 = ".get";
+ protected final String TEXT_209 = "()," + NL + "\t\t\t new String[]" + NL + "\t\t\t {";
+ protected final String TEXT_210 = NL + "\t\t\t ";
+ protected final String TEXT_211 = ", ";
+ protected final String TEXT_212 = NL + "\t\t\t }," + NL + "\t\t\t IS_ATTRIBUTE);";
+ protected final String TEXT_213 = NL + "\t\t\t });";
+ protected final String TEXT_214 = NL + " ";
+ protected final String TEXT_215 = NL + "\t\tsetInstanceProperty" + NL + "\t\t (property," + NL + "\t\t\t \"";
+ protected final String TEXT_216 = "\"," + NL + "\t\t\t ";
+ protected final String TEXT_217 = ", ";
+ protected final String TEXT_218 = ");";
+ protected final String TEXT_219 = NL + " ";
+ protected final String TEXT_220 = " ";
+ protected final String TEXT_221 = NL + "\t\taddXSDMapping" + NL + "\t\t\t(getProperty(";
+ protected final String TEXT_222 = "Type, ";
+ protected final String TEXT_223 = ".INTERNAL_";
+ protected final String TEXT_224 = ")," + NL + "\t\t\t new String[]" + NL + "\t\t\t {";
+ protected final String TEXT_225 = NL + "\t\t\t ";
+ protected final String TEXT_226 = ", ";
+ protected final String TEXT_227 = NL + "\t\t\t });" + NL;
+ protected final String TEXT_228 = NL + " }" + NL + " ";
+ protected final String TEXT_229 = NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic ";
+ protected final String TEXT_230 = " create";
+ protected final String TEXT_231 = "FromString(String initialValue)" + NL + "\t{";
+ protected final String TEXT_232 = NL + "\t\t";
+ protected final String TEXT_233 = " result = ";
+ protected final String TEXT_234 = ".get(initialValue);" + NL + "\t\tif (result == null) throw new IllegalArgumentException(\"The value '\" + initialValue + \"' is not a valid enumerator of '\" + type.getName() + \"'\");";
+ protected final String TEXT_235 = NL + "\t\treturn result;";
+ protected final String TEXT_236 = NL + "\t\treturn (";
+ protected final String TEXT_237 = ")create";
+ protected final String TEXT_238 = "FromString(initialValue);";
+ protected final String TEXT_239 = NL + "\t\treturn (";
+ protected final String TEXT_240 = ")";
+ protected final String TEXT_241 = ".create";
+ protected final String TEXT_242 = "FromString(initialValue);";
+ protected final String TEXT_243 = NL + "\t\tif (initialValue == null) return null;" + NL + "\t\t";
+ protected final String TEXT_244 = " result = new ";
+ protected final String TEXT_245 = "();" + NL + "\t\tfor (";
+ protected final String TEXT_246 = " stringTokenizer = new ";
+ protected final String TEXT_247 = "(initialValue); stringTokenizer.hasMoreTokens(); )" + NL + "\t\t{" + NL + "\t\t\tString item = stringTokenizer.nextToken();";
+ protected final String TEXT_248 = NL + "\t\t\tresult.add(create";
+ protected final String TEXT_249 = "FromString(item));";
+ protected final String TEXT_250 = NL + "\t\t\tresult.add(";
+ protected final String TEXT_251 = ".create";
+ protected final String TEXT_252 = "FromString(item));";
+ protected final String TEXT_253 = NL + "\t\t}" + NL + "\t\treturn result;";
+ protected final String TEXT_254 = NL + "\t\tif (initialValue == null) return null;" + NL + "\t\t";
+ protected final String TEXT_255 = " result = null;" + NL + "\t\tRuntimeException exception = null;";
+ protected final String TEXT_256 = NL + "\t\ttry" + NL + "\t\t{";
+ protected final String TEXT_257 = NL + "\t\t\tresult = (";
+ protected final String TEXT_258 = ")create";
+ protected final String TEXT_259 = "FromString(initialValue);";
+ protected final String TEXT_260 = NL + "\t\t\tresult = (";
+ protected final String TEXT_261 = ")";
+ protected final String TEXT_262 = ".create";
+ protected final String TEXT_263 = "FromString(initialValue);";
+ protected final String TEXT_264 = NL + "\t\t\tif (result != null/* && Diagnostician.INSTANCE.validate(type, result, null, null)*/)" + NL + "\t\t\t{" + NL + "\t\t\t\treturn result;" + NL + "\t\t\t}" + NL + "\t\t}" + NL + "\t\tcatch (RuntimeException e)" + NL + "\t\t{" + NL + "\t\t\texception = e;" + NL + "\t\t}";
+ protected final String TEXT_265 = NL + "\t\tif (result != null || exception == null) return result;" + NL + " " + NL + "\t\tthrow exception;";
+ protected final String TEXT_266 = NL + "\t\t// TODO: implement this method" + NL + "\t\t// Ensure that you remove @generated or mark it @generated NOT" + NL + "\t\tthrow new ";
+ protected final String TEXT_267 = "();";
+ protected final String TEXT_268 = NL + "\t\treturn (";
+ protected final String TEXT_269 = ")super.createFromString(";
+ protected final String TEXT_270 = ", initialValue);";
+ protected final String TEXT_271 = NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic String convert";
+ protected final String TEXT_272 = "ToString(Object instanceValue)" + NL + "\t{";
+ protected final String TEXT_273 = NL + "\t\treturn instanceValue == null ? null : instanceValue.toString();";
+ protected final String TEXT_274 = NL + "\t\treturn convert";
+ protected final String TEXT_275 = "ToString(instanceValue);";
+ protected final String TEXT_276 = NL + "\t\treturn ";
+ protected final String TEXT_277 = ".convert";
+ protected final String TEXT_278 = "ToString(instanceValue);";
+ protected final String TEXT_279 = NL + "\t\tif (instanceValue == null) return null;" + NL + "\t\t";
+ protected final String TEXT_280 = " list = (";
+ protected final String TEXT_281 = ")instanceValue;" + NL + "\t\tif (list.isEmpty()) return \"\";" + NL + "\t\t";
+ protected final String TEXT_282 = " result = new ";
+ protected final String TEXT_283 = "();" + NL + "\t\tfor (";
+ protected final String TEXT_284 = " i = list.iterator(); i.hasNext(); )" + NL + "\t\t{";
+ protected final String TEXT_285 = NL + "\t\t\tresult.append(convert";
+ protected final String TEXT_286 = "ToString(i.next()));";
+ protected final String TEXT_287 = NL + "\t\t\tresult.append(";
+ protected final String TEXT_288 = ".convert";
+ protected final String TEXT_289 = "ToString(i.next()));";
+ protected final String TEXT_290 = NL + "\t\t\tresult.append(' ');" + NL + "\t\t}" + NL + "\t\treturn result.substring(0, result.length() - 1);";
+ protected final String TEXT_291 = NL + "\t\tif (instanceValue == null) return null;";
+ protected final String TEXT_292 = NL + "\t\tif (";
+ protected final String TEXT_293 = ".isInstance(instanceValue))" + NL + "\t\t{" + NL + "\t\t\ttry" + NL + "\t\t\t{";
+ protected final String TEXT_294 = NL + "\t\t\t\tString value = convert";
+ protected final String TEXT_295 = "ToString(instanceValue);";
+ protected final String TEXT_296 = NL + "\t\t\t\tString value = ";
+ protected final String TEXT_297 = ".convert";
+ protected final String TEXT_298 = "ToString(instanceValue);";
+ protected final String TEXT_299 = NL + "\t\t\t\tif (value != null) return value;" + NL + "\t\t\t}" + NL + "\t\t\tcatch (Exception e)" + NL + "\t\t\t{" + NL + "\t\t\t}" + NL + "\t\t}";
+ protected final String TEXT_300 = NL + "\t\tthrow new IllegalArgumentException(\"Invalid value: '\"+instanceValue+\"' for datatype :";
+ protected final String TEXT_301 = "\");";
+ protected final String TEXT_302 = NL + "\t\t// TODO: implement this method" + NL + "\t\t// Ensure that you remove @generated or mark it @generated NOT" + NL + "\t\tthrow new ";
+ protected final String TEXT_303 = "();";
+ protected final String TEXT_304 = NL + "\t\treturn super.convertToString(";
+ protected final String TEXT_305 = ", instanceValue);";
+ protected final String TEXT_306 = NL + "\t}" + NL;
+ protected final String TEXT_307 = NL + "\t/**" + NL + "\t * Returns a new object of class '<em>";
+ protected final String TEXT_308 = "</em>'." + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @return a new object of class '<em>";
+ protected final String TEXT_309 = "</em>'." + NL + "\t * @generated" + NL + "\t */" + NL + "\t";
+ protected final String TEXT_310 = " create";
+ protected final String TEXT_311 = "();" + NL;
+ protected final String TEXT_312 = NL + " /**" + NL + " * Registers the types supported by this Factory within the supplied scope.argument" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @param scope an instance of HelperContext used to manage the scoping of types." + NL + "\t * @generated" + NL + " */" + NL + " public void register(HelperContext scope);" + NL + " ";
+ protected final String TEXT_313 = NL + "\t/**" + NL + "\t * Returns an instance of data type '<em>";
+ protected final String TEXT_314 = "</em>' corresponding the given literal." + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @param literal a literal of the data type." + NL + "\t * @return a new instance value of the data type." + NL + "\t * @generated" + NL + "\t */" + NL + "\t";
+ protected final String TEXT_315 = " create";
+ protected final String TEXT_316 = "(String literal);" + NL + "" + NL + "\t/**" + NL + "\t * Returns a literal representation of an instance of data type '<em>";
+ protected final String TEXT_317 = "</em>'." + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @param instanceValue an instance value of the data type." + NL + "\t * @return a literal representation of the instance value." + NL + "\t * @generated" + NL + "\t */" + NL + "\tString convert";
+ protected final String TEXT_318 = "(";
+ protected final String TEXT_319 = " instanceValue);" + NL;
+ protected final String TEXT_320 = NL + "} //";
+ protected final String TEXT_321 = NL;
public String generate(Object argument)
{
@@ -697,457 +698,459 @@
stringBuffer.append(TEXT_133);
stringBuffer.append(genClass.getSafeUncapName());
stringBuffer.append(TEXT_134);
- stringBuffer.append(baseGenClass.getSafeUncapName());
+ stringBuffer.append(genPackage.getPackageInstanceVariable(baseGenClass.getGenPackage()));
stringBuffer.append(TEXT_135);
+ stringBuffer.append(baseGenClass.getClassifierAccessorName());
+ stringBuffer.append(TEXT_136);
}
}
- stringBuffer.append(TEXT_136);
+ stringBuffer.append(TEXT_137);
for (Iterator i=genPackage.getGenClasses().iterator(); i.hasNext();) { GenClass genClass = (GenClass)i.next();
if (!genClass.isDynamic()) {
- stringBuffer.append(TEXT_137);
- stringBuffer.append(genClass.getSafeUncapName());
stringBuffer.append(TEXT_138);
- stringBuffer.append(genClass.getImportedInterfaceName());
+ stringBuffer.append(genClass.getSafeUncapName());
stringBuffer.append(TEXT_139);
- stringBuffer.append(genClass.getName());
+ stringBuffer.append(genClass.getImportedInterfaceName());
stringBuffer.append(TEXT_140);
- stringBuffer.append(genClass.isAbstract());
+ stringBuffer.append(genClass.getName());
stringBuffer.append(TEXT_141);
+ stringBuffer.append(genClass.isAbstract());
+ stringBuffer.append(TEXT_142);
for (Iterator sources = annotationSources.iterator(); sources.hasNext();) { String annotationSource = (String)sources.next();
EAnnotation classAnnotation = genClass.getEcoreClassifier().getEAnnotation(annotationSource);
if (classAnnotation != null) {
for (Iterator k = classAnnotation.getDetails().iterator(); k.hasNext();) { Map.Entry detail = (Map.Entry)k.next(); String key = Literals.toStringLiteral((String)detail.getKey(), genModel); String value = Literals.toStringLiteral((String)detail.getValue(), genModel);
- stringBuffer.append(TEXT_142);
- stringBuffer.append(genClass.getSafeUncapName());
stringBuffer.append(TEXT_143);
- stringBuffer.append(annotationSource);
+ stringBuffer.append(genClass.getSafeUncapName());
stringBuffer.append(TEXT_144);
- stringBuffer.append(key);
+ stringBuffer.append(annotationSource);
stringBuffer.append(TEXT_145);
+ stringBuffer.append(key);
+ stringBuffer.append(TEXT_146);
stringBuffer.append(value);
stringBuffer.append(genModel.getNonNLS(key + value));
- stringBuffer.append(TEXT_146);
+ stringBuffer.append(TEXT_147);
}
}
}
for (Iterator j=genClass.getGenFeatures().iterator(); j.hasNext();) {GenFeature genFeature = (GenFeature)j.next();
String type = genFeature.getType().equals("commonj.sdo.Sequence") ? "getSequence()" : genPackage.getPackageInstanceVariable(genFeature.getTypeGenPackage()) + ".get" + genFeature.getTypeClassifierAccessorName() + "()";
- stringBuffer.append(TEXT_147);
- stringBuffer.append(genClass.getSafeUncapName());
stringBuffer.append(TEXT_148);
- stringBuffer.append(genClass.getClassName());
+ stringBuffer.append(genClass.getSafeUncapName());
stringBuffer.append(TEXT_149);
- stringBuffer.append(genFeature.getUpperName());
+ stringBuffer.append(genClass.getClassName());
stringBuffer.append(TEXT_150);
+ stringBuffer.append(genFeature.getUpperName());
+ stringBuffer.append(TEXT_151);
if (genFeature.isReferenceType()) { GenFeature reverseGenFeature = genFeature.getReverse();
String reverse = reverseGenFeature == null ? "null" : genPackage.getPackageInstanceVariable(reverseGenFeature.getGenPackage()) + ".get" + reverseGenFeature.getFeatureAccessorName() + "()";
- stringBuffer.append(TEXT_151);
- stringBuffer.append(type);
stringBuffer.append(TEXT_152);
- stringBuffer.append(genFeature.getName());
+ stringBuffer.append(type);
stringBuffer.append(TEXT_153);
- stringBuffer.append(genFeature.getDefaultValue());
+ stringBuffer.append(genFeature.getName());
stringBuffer.append(TEXT_154);
- stringBuffer.append(genFeature.getLowerBound());
+ stringBuffer.append(genFeature.getDefaultValue());
stringBuffer.append(TEXT_155);
- stringBuffer.append(genFeature.getUpperBound());
+ stringBuffer.append(genFeature.getLowerBound());
stringBuffer.append(TEXT_156);
- stringBuffer.append(genFeature.getContainerClass());
+ stringBuffer.append(genFeature.getUpperBound());
stringBuffer.append(TEXT_157);
- stringBuffer.append(genFeature.getChangeableFlag().equals("IS_CHANGEABLE") ? "false" : "true");
+ stringBuffer.append(genFeature.getContainerClass());
stringBuffer.append(TEXT_158);
- stringBuffer.append(genFeature.getUnsettableFlag().equals("IS_UNSETTABLE") ? "true": "false");
+ stringBuffer.append(genFeature.getChangeableFlag().equals("IS_CHANGEABLE") ? "false" : "true");
stringBuffer.append(TEXT_159);
- stringBuffer.append(genFeature.getDerivedFlag().equals("IS_DERIVED") ? "true" : "false");
+ stringBuffer.append(genFeature.getUnsettableFlag().equals("IS_UNSETTABLE") ? "true": "false");
stringBuffer.append(TEXT_160);
- stringBuffer.append(genFeature.getContainmentFlag().equals("IS_COMPOSITE")? "true": "false");
+ stringBuffer.append(genFeature.getDerivedFlag().equals("IS_DERIVED") ? "true" : "false");
stringBuffer.append(TEXT_161);
- stringBuffer.append(reverse);
+ stringBuffer.append(genFeature.getContainmentFlag().equals("IS_COMPOSITE")? "true": "false");
stringBuffer.append(TEXT_162);
- }else{
+ stringBuffer.append(reverse);
stringBuffer.append(TEXT_163);
- stringBuffer.append(type);
+ }else{
stringBuffer.append(TEXT_164);
- stringBuffer.append(genFeature.getName());
+ stringBuffer.append(type);
stringBuffer.append(TEXT_165);
- stringBuffer.append(genFeature.getDefaultValue());
+ stringBuffer.append(genFeature.getName());
stringBuffer.append(TEXT_166);
- stringBuffer.append(genFeature.getLowerBound());
+ stringBuffer.append(genFeature.getDefaultValue());
stringBuffer.append(TEXT_167);
- stringBuffer.append(genFeature.getUpperBound());
+ stringBuffer.append(genFeature.getLowerBound());
stringBuffer.append(TEXT_168);
- stringBuffer.append(genFeature.getContainerClass());
+ stringBuffer.append(genFeature.getUpperBound());
stringBuffer.append(TEXT_169);
- stringBuffer.append(genFeature.getChangeableFlag().equals("IS_CHANGEABLE") ? "false" : "true");
+ stringBuffer.append(genFeature.getContainerClass());
stringBuffer.append(TEXT_170);
- stringBuffer.append(genFeature.getUnsettableFlag().equals("IS_UNSETTABLE") ? "true": "false");
+ stringBuffer.append(genFeature.getChangeableFlag().equals("IS_CHANGEABLE") ? "false" : "true");
stringBuffer.append(TEXT_171);
- stringBuffer.append(genFeature.getDerivedFlag().equals("IS_DERIVED") ? "true" : "false");
+ stringBuffer.append(genFeature.getUnsettableFlag().equals("IS_UNSETTABLE") ? "true": "false");
stringBuffer.append(TEXT_172);
+ stringBuffer.append(genFeature.getDerivedFlag().equals("IS_DERIVED") ? "true" : "false");
+ stringBuffer.append(TEXT_173);
}
for (Iterator sources = annotationSources.iterator(); sources.hasNext();) { String annotationSource = (String)sources.next();
EAnnotation featureAnnotation = genFeature.getEcoreFeature().getEAnnotation(annotationSource);
if (featureAnnotation != null) {
for (Iterator k = featureAnnotation.getDetails().iterator(); k.hasNext();) { Map.Entry detail = (Map.Entry)k.next(); String key = Literals.toStringLiteral((String)detail.getKey(), genModel); String value = Literals.toStringLiteral((String)detail.getValue(), genModel);
- stringBuffer.append(TEXT_173);
- stringBuffer.append(annotationSource);
stringBuffer.append(TEXT_174);
- stringBuffer.append(key);
+ stringBuffer.append(annotationSource);
stringBuffer.append(TEXT_175);
+ stringBuffer.append(key);
+ stringBuffer.append(TEXT_176);
stringBuffer.append(value);
stringBuffer.append(genModel.getNonNLS(key + value));
- stringBuffer.append(TEXT_176);
+ stringBuffer.append(TEXT_177);
}
}
}
- stringBuffer.append(TEXT_177);
+ stringBuffer.append(TEXT_178);
}
}
}
if (!genPackage.getGenDataTypes().isEmpty()) {
- stringBuffer.append(TEXT_178);
- for (Iterator d=genPackage.getGenDataTypes().iterator(); d.hasNext();) { GenDataType genDataType = (GenDataType)d.next();
stringBuffer.append(TEXT_179);
- stringBuffer.append(genDataType.getSafeUncapName());
+ for (Iterator d=genPackage.getGenDataTypes().iterator(); d.hasNext();) { GenDataType genDataType = (GenDataType)d.next();
stringBuffer.append(TEXT_180);
- stringBuffer.append(genDataType.getImportedInstanceClassName());
+ stringBuffer.append(genDataType.getSafeUncapName());
stringBuffer.append(TEXT_181);
- stringBuffer.append(genDataType.getName());
+ stringBuffer.append(genDataType.getImportedInstanceClassName());
stringBuffer.append(TEXT_182);
- stringBuffer.append(genDataType.getSerializableFlag().equals("IS_SERIALIZABLE") ? "true" : "false");
+ stringBuffer.append(genDataType.getName());
stringBuffer.append(TEXT_183);
- stringBuffer.append(genDataType.getGeneratedInstanceClassFlag().equals("IS_GENERATED_INSTANCE_CLASS") ? "true" : "false" );
+ stringBuffer.append(genDataType.getSerializableFlag().equals("IS_SERIALIZABLE") ? "true" : "false");
stringBuffer.append(TEXT_184);
+ stringBuffer.append(genDataType.getGeneratedInstanceClassFlag().equals("IS_GENERATED_INSTANCE_CLASS") ? "true" : "false" );
+ stringBuffer.append(TEXT_185);
stringBuffer.append(genModel.getNonNLS());
for (Iterator sources = annotationSources.iterator(); sources.hasNext();) { String annotationSource = (String)sources.next();
EAnnotation dataTypeAnnotation = genDataType.getEcoreDataType().getEAnnotation(annotationSource);
if (dataTypeAnnotation != null) {
for (Iterator k = dataTypeAnnotation.getDetails().iterator(); k.hasNext();) { Map.Entry detail = (Map.Entry)k.next(); String key = Literals.toStringLiteral((String)detail.getKey(), genModel); String value = Literals.toStringLiteral((String)detail.getValue(), genModel);
- stringBuffer.append(TEXT_185);
- stringBuffer.append(genDataType.getSafeUncapName());
stringBuffer.append(TEXT_186);
- stringBuffer.append(annotationSource);
+ stringBuffer.append(genDataType.getSafeUncapName());
stringBuffer.append(TEXT_187);
- stringBuffer.append(key);
+ stringBuffer.append(annotationSource);
stringBuffer.append(TEXT_188);
+ stringBuffer.append(key);
+ stringBuffer.append(TEXT_189);
stringBuffer.append(value);
stringBuffer.append(genModel.getNonNLS(key + value));
- stringBuffer.append(TEXT_189);
+ stringBuffer.append(TEXT_190);
}
}
}
- stringBuffer.append(TEXT_190);
+ stringBuffer.append(TEXT_191);
}
}
- stringBuffer.append(TEXT_191);
- stringBuffer.append(SDOGenUtil.getDependentFactoryArgumentList(genPackage, false));
stringBuffer.append(TEXT_192);
- stringBuffer.append(SDOGenUtil.getDependentFactoryArgumentList(genPackage, true));
+ stringBuffer.append(SDOGenUtil.getDependentFactoryArgumentList(genPackage, false));
stringBuffer.append(TEXT_193);
- stringBuffer.append(genModel.getImportedName("commonj.sdo.Property"));
+ stringBuffer.append(SDOGenUtil.getDependentFactoryArgumentList(genPackage, true));
stringBuffer.append(TEXT_194);
+ stringBuffer.append(genModel.getImportedName("commonj.sdo.Property"));
+ stringBuffer.append(TEXT_195);
String extendedMetaDataSource = ExtendedMetaData.ANNOTATION_URI;
EAnnotation packageAnnotation = genPackage.getEcorePackage().getEAnnotation(extendedMetaDataSource);
if (packageAnnotation != null){
- stringBuffer.append(TEXT_195);
- for (Iterator k = packageAnnotation.getDetails().iterator(); k.hasNext();) { Map.Entry detail = (Map.Entry)k.next(); String key = Literals.toStringLiteral((String)detail.getKey(), genModel); String value = Literals.toStringLiteral((String)detail.getValue(), genModel);
stringBuffer.append(TEXT_196);
- stringBuffer.append(key);
+ for (Iterator k = packageAnnotation.getDetails().iterator(); k.hasNext();) { Map.Entry detail = (Map.Entry)k.next(); String key = Literals.toStringLiteral((String)detail.getKey(), genModel); String value = Literals.toStringLiteral((String)detail.getValue(), genModel);
stringBuffer.append(TEXT_197);
+ stringBuffer.append(key);
+ stringBuffer.append(TEXT_198);
stringBuffer.append(value);
stringBuffer.append(k.hasNext() ? "," : "");
stringBuffer.append(genModel.getNonNLS(key + value));
}
- stringBuffer.append(TEXT_198);
- }
stringBuffer.append(TEXT_199);
+ }
+ stringBuffer.append(TEXT_200);
for (Iterator i=genPackage.getGenClassifiers().iterator(); i.hasNext();) { GenClassifier genClassifier = (GenClassifier)i.next(); EAnnotation classAnnotation = genClassifier.getEcoreClassifier().getEAnnotation(extendedMetaDataSource);
if (classAnnotation != null && !genClassifier.getName().equals("DocumentRoot")) {
- stringBuffer.append(TEXT_200);
- stringBuffer.append(genClassifier.getSafeUncapName());
stringBuffer.append(TEXT_201);
- for (Iterator k = classAnnotation.getDetails().iterator(); k.hasNext();) { Map.Entry detail = (Map.Entry)k.next(); String key = Literals.toStringLiteral((String)detail.getKey(), genModel); String value = Literals.toStringLiteral((String)detail.getValue(), genModel);
+ stringBuffer.append(genClassifier.getSafeUncapName());
stringBuffer.append(TEXT_202);
- stringBuffer.append(key);
+ for (Iterator k = classAnnotation.getDetails().iterator(); k.hasNext();) { Map.Entry detail = (Map.Entry)k.next(); String key = Literals.toStringLiteral((String)detail.getKey(), genModel); String value = Literals.toStringLiteral((String)detail.getValue(), genModel);
stringBuffer.append(TEXT_203);
+ stringBuffer.append(key);
+ stringBuffer.append(TEXT_204);
stringBuffer.append(value);
stringBuffer.append(k.hasNext() ? "," : "");
stringBuffer.append(genModel.getNonNLS(key + value));
}
- stringBuffer.append(TEXT_204);
+ stringBuffer.append(TEXT_205);
}
if (genClassifier instanceof GenClass) { GenClass genClass = (GenClass) genClassifier;
for (Iterator j=genClass.getGenFeatures().iterator(); j.hasNext();) { GenFeature genFeature = (GenFeature)j.next();
EAnnotation featureAnnotation = genFeature.getEcoreFeature().getEAnnotation(extendedMetaDataSource);
if (genClass.getName().equals("DocumentRoot")) {
if (!(genFeature.getName().equals("mixed") || genFeature.getName().equals("xMLNSPrefixMap") || genFeature.getName().equals("xSISchemaLocation"))) {
- stringBuffer.append(TEXT_205);
- stringBuffer.append(genFeature.getName());
stringBuffer.append(TEXT_206);
- stringBuffer.append(genPackage.getPackageInstanceVariable(genFeature.getTypeGenPackage()));
+ stringBuffer.append(genFeature.getName());
stringBuffer.append(TEXT_207);
- stringBuffer.append(genFeature.getTypeClassifierAccessorName());
+ stringBuffer.append(genPackage.getPackageInstanceVariable(genFeature.getTypeGenPackage()));
stringBuffer.append(TEXT_208);
- for (Iterator k = featureAnnotation.getDetails().iterator(); k.hasNext();) { Map.Entry detail = (Map.Entry)k.next(); String key = Literals.toStringLiteral((String)detail.getKey(), genModel); String value = Literals.toStringLiteral((String)detail.getValue(), genModel);
+ stringBuffer.append(genFeature.getTypeClassifierAccessorName());
stringBuffer.append(TEXT_209);
- stringBuffer.append(key);
+ for (Iterator k = featureAnnotation.getDetails().iterator(); k.hasNext();) { Map.Entry detail = (Map.Entry)k.next(); String key = Literals.toStringLiteral((String)detail.getKey(), genModel); String value = Literals.toStringLiteral((String)detail.getValue(), genModel);
stringBuffer.append(TEXT_210);
+ stringBuffer.append(key);
+ stringBuffer.append(TEXT_211);
stringBuffer.append(value);
stringBuffer.append(k.hasNext() ? "," : "");
stringBuffer.append(genModel.getNonNLS(key + value));
}
if (!genFeature.isReferenceType()) {
- stringBuffer.append(TEXT_211);
- } else {
stringBuffer.append(TEXT_212);
- }
+ } else {
stringBuffer.append(TEXT_213);
+ }
+ stringBuffer.append(TEXT_214);
for (Iterator sources = genPackage.getAnnotationSources().iterator(); sources.hasNext();) { String annotationSource = (String)sources.next();
if (!annotationSource.equals(extendedMetaDataSource)) {
EAnnotation globalAnnotation = genFeature.getEcoreFeature().getEAnnotation(annotationSource);
if (globalAnnotation != null) {
for (Iterator k = globalAnnotation.getDetails().iterator(); k.hasNext();) { Map.Entry detail = (Map.Entry)k.next(); String key = Literals.toStringLiteral((String)detail.getKey(), genModel); String value = Literals.toStringLiteral((String)detail.getValue(), genModel);
- stringBuffer.append(TEXT_214);
- stringBuffer.append(annotationSource);
stringBuffer.append(TEXT_215);
- stringBuffer.append(key);
+ stringBuffer.append(annotationSource);
stringBuffer.append(TEXT_216);
+ stringBuffer.append(key);
+ stringBuffer.append(TEXT_217);
stringBuffer.append(value);
stringBuffer.append(genModel.getNonNLS(key + value));
- stringBuffer.append(TEXT_217);
- }
stringBuffer.append(TEXT_218);
}
- }
stringBuffer.append(TEXT_219);
}
}
- } else {
stringBuffer.append(TEXT_220);
- stringBuffer.append(genClassifier.getSafeUncapName());
+ }
+ }
+ } else {
stringBuffer.append(TEXT_221);
- stringBuffer.append(genClass.getClassName());
+ stringBuffer.append(genClassifier.getSafeUncapName());
stringBuffer.append(TEXT_222);
- stringBuffer.append(genFeature.getUpperName());
+ stringBuffer.append(genClass.getClassName());
stringBuffer.append(TEXT_223);
- for (Iterator k = featureAnnotation.getDetails().iterator(); k.hasNext();) { Map.Entry detail = (Map.Entry)k.next(); String key = Literals.toStringLiteral((String)detail.getKey(), genModel); String value = Literals.toStringLiteral((String)detail.getValue(), genModel);
+ stringBuffer.append(genFeature.getUpperName());
stringBuffer.append(TEXT_224);
- stringBuffer.append(key);
+ for (Iterator k = featureAnnotation.getDetails().iterator(); k.hasNext();) { Map.Entry detail = (Map.Entry)k.next(); String key = Literals.toStringLiteral((String)detail.getKey(), genModel); String value = Literals.toStringLiteral((String)detail.getValue(), genModel);
stringBuffer.append(TEXT_225);
+ stringBuffer.append(key);
+ stringBuffer.append(TEXT_226);
stringBuffer.append(value);
stringBuffer.append(k.hasNext() ? "," : "");
stringBuffer.append(genModel.getNonNLS(key + value));
}
- stringBuffer.append(TEXT_226);
+ stringBuffer.append(TEXT_227);
}
}
}
}
- stringBuffer.append(TEXT_227);
+ stringBuffer.append(TEXT_228);
for (Iterator i=genPackage.getAllGenDataTypes().iterator(); i.hasNext();) { GenDataType genDataType = (GenDataType)i.next();
if (genDataType.isSerializable()) {
- stringBuffer.append(TEXT_228);
- stringBuffer.append(genDataType.getObjectInstanceClassName());
stringBuffer.append(TEXT_229);
- stringBuffer.append(genDataType.getName());
+ stringBuffer.append(genDataType.getObjectInstanceClassName());
stringBuffer.append(TEXT_230);
- if (genDataType instanceof GenEnum) {
+ stringBuffer.append(genDataType.getName());
stringBuffer.append(TEXT_231);
- stringBuffer.append(((GenEnum)genDataType).getImportedInstanceClassName());
+ if (genDataType instanceof GenEnum) {
stringBuffer.append(TEXT_232);
stringBuffer.append(((GenEnum)genDataType).getImportedInstanceClassName());
stringBuffer.append(TEXT_233);
+ stringBuffer.append(((GenEnum)genDataType).getImportedInstanceClassName());
+ stringBuffer.append(TEXT_234);
stringBuffer.append(genModel.getNonNLS());
stringBuffer.append(genModel.getNonNLS(2));
stringBuffer.append(genModel.getNonNLS(3));
- stringBuffer.append(TEXT_234);
+ stringBuffer.append(TEXT_235);
} else if (genDataType.getBaseType() != null) { GenDataType genBaseType = genDataType.getBaseType();
if (genBaseType.getGenPackage() == genPackage) {
- stringBuffer.append(TEXT_235);
- stringBuffer.append(genDataType.getObjectInstanceClassName());
stringBuffer.append(TEXT_236);
- stringBuffer.append(genBaseType.getName());
+ stringBuffer.append(genDataType.getObjectInstanceClassName());
stringBuffer.append(TEXT_237);
- } else {
+ stringBuffer.append(genBaseType.getName());
stringBuffer.append(TEXT_238);
- stringBuffer.append(genDataType.getObjectInstanceClassName());
+ } else {
stringBuffer.append(TEXT_239);
- stringBuffer.append(SDOGenUtil.getFactoryImpl(genBaseType.getGenPackage()));
+ stringBuffer.append(genDataType.getObjectInstanceClassName());
stringBuffer.append(TEXT_240);
- stringBuffer.append(genBaseType.getName());
+ stringBuffer.append(SDOGenUtil.getFactoryImpl(genBaseType.getGenPackage()));
stringBuffer.append(TEXT_241);
+ stringBuffer.append(genBaseType.getName());
+ stringBuffer.append(TEXT_242);
}
} else if (genDataType.getItemType() != null) { GenDataType genItemType = genDataType.getItemType();
- stringBuffer.append(TEXT_242);
- stringBuffer.append(genModel.getImportedName("java.util.List"));
stringBuffer.append(TEXT_243);
- stringBuffer.append(genModel.getImportedName("java.util.ArrayList"));
+ stringBuffer.append(genModel.getImportedName("java.util.List"));
stringBuffer.append(TEXT_244);
- stringBuffer.append(genModel.getImportedName("java.util.StringTokenizer"));
+ stringBuffer.append(genModel.getImportedName("java.util.ArrayList"));
stringBuffer.append(TEXT_245);
stringBuffer.append(genModel.getImportedName("java.util.StringTokenizer"));
stringBuffer.append(TEXT_246);
- if (genItemType.getGenPackage() == genPackage) {
+ stringBuffer.append(genModel.getImportedName("java.util.StringTokenizer"));
stringBuffer.append(TEXT_247);
- stringBuffer.append(genItemType.getName());
+ if (genItemType.getGenPackage() == genPackage) {
stringBuffer.append(TEXT_248);
- } else {
+ stringBuffer.append(genItemType.getName());
stringBuffer.append(TEXT_249);
- stringBuffer.append(SDOGenUtil.getFactoryImpl(genItemType.getGenPackage()));
+ } else {
stringBuffer.append(TEXT_250);
- stringBuffer.append(genItemType.getName());
+ stringBuffer.append(SDOGenUtil.getFactoryImpl(genItemType.getGenPackage()));
stringBuffer.append(TEXT_251);
- }
+ stringBuffer.append(genItemType.getName());
stringBuffer.append(TEXT_252);
- } else if (!genDataType.getMemberTypes().isEmpty()) {
+ }
stringBuffer.append(TEXT_253);
- stringBuffer.append(genDataType.getObjectInstanceClassName());
+ } else if (!genDataType.getMemberTypes().isEmpty()) {
stringBuffer.append(TEXT_254);
- for (Iterator j = genDataType.getMemberTypes().iterator(); j.hasNext(); ) { GenDataType genMemberType = (GenDataType)j.next();
+ stringBuffer.append(genDataType.getObjectInstanceClassName());
stringBuffer.append(TEXT_255);
- if (genMemberType.getGenPackage() == genPackage) {
+ for (Iterator j = genDataType.getMemberTypes().iterator(); j.hasNext(); ) { GenDataType genMemberType = (GenDataType)j.next();
stringBuffer.append(TEXT_256);
- stringBuffer.append(genDataType.getObjectInstanceClassName());
+ if (genMemberType.getGenPackage() == genPackage) {
stringBuffer.append(TEXT_257);
- stringBuffer.append(genMemberType.getName());
+ stringBuffer.append(genDataType.getObjectInstanceClassName());
stringBuffer.append(TEXT_258);
- } else {
+ stringBuffer.append(genMemberType.getName());
stringBuffer.append(TEXT_259);
- stringBuffer.append(genDataType.getObjectInstanceClassName());
+ } else {
stringBuffer.append(TEXT_260);
- stringBuffer.append(SDOGenUtil.getFactoryImpl(genMemberType.getGenPackage()));
+ stringBuffer.append(genDataType.getObjectInstanceClassName());
stringBuffer.append(TEXT_261);
- stringBuffer.append(genMemberType.getName());
+ stringBuffer.append(SDOGenUtil.getFactoryImpl(genMemberType.getGenPackage()));
stringBuffer.append(TEXT_262);
- }
+ stringBuffer.append(genMemberType.getName());
stringBuffer.append(TEXT_263);
}
stringBuffer.append(TEXT_264);
- } else if (genDataType.isArrayType()) {
+ }
stringBuffer.append(TEXT_265);
- stringBuffer.append(genModel.getImportedName("java.lang.UnsupportedOperationException"));
+ } else if (genDataType.isArrayType()) {
stringBuffer.append(TEXT_266);
- } else {
+ stringBuffer.append(genModel.getImportedName("java.lang.UnsupportedOperationException"));
stringBuffer.append(TEXT_267);
- stringBuffer.append(genDataType.getObjectInstanceClassName());
+ } else {
stringBuffer.append(TEXT_268);
- stringBuffer.append(genDataType.getClassifierID());
+ stringBuffer.append(genDataType.getObjectInstanceClassName());
stringBuffer.append(TEXT_269);
- }
+ stringBuffer.append(genDataType.getClassifierID());
stringBuffer.append(TEXT_270);
- stringBuffer.append(genDataType.getName());
+ }
stringBuffer.append(TEXT_271);
- if (genDataType instanceof GenEnum) {
+ stringBuffer.append(genDataType.getName());
stringBuffer.append(TEXT_272);
+ if (genDataType instanceof GenEnum) {
+ stringBuffer.append(TEXT_273);
} else if (genDataType.getBaseType() != null) { GenDataType genBaseType = genDataType.getBaseType();
if (genBaseType.getGenPackage() == genPackage) {
- stringBuffer.append(TEXT_273);
- stringBuffer.append(genBaseType.getName());
stringBuffer.append(TEXT_274);
- } else {
+ stringBuffer.append(genBaseType.getName());
stringBuffer.append(TEXT_275);
- stringBuffer.append(SDOGenUtil.getFactoryImpl(genBaseType.getGenPackage()));
+ } else {
stringBuffer.append(TEXT_276);
- stringBuffer.append(genBaseType.getName());
+ stringBuffer.append(SDOGenUtil.getFactoryImpl(genBaseType.getGenPackage()));
stringBuffer.append(TEXT_277);
+ stringBuffer.append(genBaseType.getName());
+ stringBuffer.append(TEXT_278);
}
} else if (genDataType.getItemType() != null) { GenDataType genItemType = genDataType.getItemType();
- stringBuffer.append(TEXT_278);
- stringBuffer.append(genModel.getImportedName("java.util.List"));
stringBuffer.append(TEXT_279);
stringBuffer.append(genModel.getImportedName("java.util.List"));
stringBuffer.append(TEXT_280);
- stringBuffer.append(genModel.getImportedName("java.lang.StringBuffer"));
+ stringBuffer.append(genModel.getImportedName("java.util.List"));
stringBuffer.append(TEXT_281);
stringBuffer.append(genModel.getImportedName("java.lang.StringBuffer"));
stringBuffer.append(TEXT_282);
- stringBuffer.append(genModel.getImportedName("java.util.Iterator"));
+ stringBuffer.append(genModel.getImportedName("java.lang.StringBuffer"));
stringBuffer.append(TEXT_283);
- if (genItemType.getGenPackage() == genPackage) {
+ stringBuffer.append(genModel.getImportedName("java.util.Iterator"));
stringBuffer.append(TEXT_284);
- stringBuffer.append(genItemType.getName());
+ if (genItemType.getGenPackage() == genPackage) {
stringBuffer.append(TEXT_285);
- } else {
+ stringBuffer.append(genItemType.getName());
stringBuffer.append(TEXT_286);
- stringBuffer.append(SDOGenUtil.getFactoryImpl(genItemType.getGenPackage()));
+ } else {
stringBuffer.append(TEXT_287);
- stringBuffer.append(genItemType.getName());
+ stringBuffer.append(SDOGenUtil.getFactoryImpl(genItemType.getGenPackage()));
stringBuffer.append(TEXT_288);
- }
+ stringBuffer.append(genItemType.getName());
stringBuffer.append(TEXT_289);
- } else if (!genDataType.getMemberTypes().isEmpty()) {
+ }
stringBuffer.append(TEXT_290);
- for (Iterator j = genDataType.getMemberTypes().iterator(); j.hasNext(); ) { GenDataType genMemberType = (GenDataType)j.next();
+ } else if (!genDataType.getMemberTypes().isEmpty()) {
stringBuffer.append(TEXT_291);
- stringBuffer.append(SDOGenUtil.getQualifiedTypeAccessor(genMemberType));
+ for (Iterator j = genDataType.getMemberTypes().iterator(); j.hasNext(); ) { GenDataType genMemberType = (GenDataType)j.next();
stringBuffer.append(TEXT_292);
- if (genMemberType.getGenPackage() == genPackage) {
+ stringBuffer.append(SDOGenUtil.getQualifiedTypeAccessor(genMemberType));
stringBuffer.append(TEXT_293);
- stringBuffer.append(genMemberType.getName());
+ if (genMemberType.getGenPackage() == genPackage) {
stringBuffer.append(TEXT_294);
- } else {
+ stringBuffer.append(genMemberType.getName());
stringBuffer.append(TEXT_295);
- stringBuffer.append(SDOGenUtil.getFactoryImpl(genMemberType.getGenPackage()));
+ } else {
stringBuffer.append(TEXT_296);
- stringBuffer.append(genMemberType.getName());
+ stringBuffer.append(SDOGenUtil.getFactoryImpl(genMemberType.getGenPackage()));
stringBuffer.append(TEXT_297);
- }
+ stringBuffer.append(genMemberType.getName());
stringBuffer.append(TEXT_298);
}
stringBuffer.append(TEXT_299);
- stringBuffer.append(genDataType.getName());
+ }
stringBuffer.append(TEXT_300);
- } else if (genDataType.isArrayType()) {
+ stringBuffer.append(genDataType.getName());
stringBuffer.append(TEXT_301);
- stringBuffer.append(genModel.getImportedName("java.lang.UnsupportedOperationException"));
+ } else if (genDataType.isArrayType()) {
stringBuffer.append(TEXT_302);
- } else {
+ stringBuffer.append(genModel.getImportedName("java.lang.UnsupportedOperationException"));
stringBuffer.append(TEXT_303);
- stringBuffer.append(genDataType.getClassifierID());
+ } else {
stringBuffer.append(TEXT_304);
- }
+ stringBuffer.append(genDataType.getClassifierID());
stringBuffer.append(TEXT_305);
}
+ stringBuffer.append(TEXT_306);
+ }
}
} else {
for (Iterator i=genPackage.getGenClasses().iterator(); i.hasNext();) { GenClass genClass = (GenClass)i.next();
if (genClass.hasFactoryInterfaceCreateMethod()) {
- stringBuffer.append(TEXT_306);
- stringBuffer.append(genClass.getFormattedName());
stringBuffer.append(TEXT_307);
stringBuffer.append(genClass.getFormattedName());
stringBuffer.append(TEXT_308);
- stringBuffer.append(genClass.getImportedInterfaceName());
+ stringBuffer.append(genClass.getFormattedName());
stringBuffer.append(TEXT_309);
- stringBuffer.append(genClass.getName());
+ stringBuffer.append(genClass.getImportedInterfaceName());
stringBuffer.append(TEXT_310);
+ stringBuffer.append(genClass.getName());
+ stringBuffer.append(TEXT_311);
}
}
- stringBuffer.append(TEXT_311);
+ stringBuffer.append(TEXT_312);
if (genPackage.isDataTypeConverters()) {
for (Iterator i=genPackage.getAllGenDataTypes().iterator(); i.hasNext();) { GenDataType genDataType = (GenDataType)i.next();
if (genDataType.isSerializable()) {
- stringBuffer.append(TEXT_312);
- stringBuffer.append(genDataType.getFormattedName());
stringBuffer.append(TEXT_313);
- stringBuffer.append(genDataType.getImportedInstanceClassName());
+ stringBuffer.append(genDataType.getFormattedName());
stringBuffer.append(TEXT_314);
- stringBuffer.append(genDataType.getName());
+ stringBuffer.append(genDataType.getImportedInstanceClassName());
stringBuffer.append(TEXT_315);
- stringBuffer.append(genDataType.getFormattedName());
- stringBuffer.append(TEXT_316);
stringBuffer.append(genDataType.getName());
+ stringBuffer.append(TEXT_316);
+ stringBuffer.append(genDataType.getFormattedName());
stringBuffer.append(TEXT_317);
- stringBuffer.append(genDataType.getImportedInstanceClassName());
+ stringBuffer.append(genDataType.getName());
stringBuffer.append(TEXT_318);
+ stringBuffer.append(genDataType.getImportedInstanceClassName());
+ stringBuffer.append(TEXT_319);
}
}
}
}
- stringBuffer.append(TEXT_319);
+ stringBuffer.append(TEXT_320);
stringBuffer.append(isInterface ? genPackage.getFactoryInterfaceName() : genPackage.getFactoryClassName());
genModel.emitSortedImports();
- stringBuffer.append(TEXT_320);
+ stringBuffer.append(TEXT_321);
return stringBuffer.toString();
}
}
Modified: incubator/tuscany/java/sdo/tools/templates/models/SDOFactoryClass.javajet
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/tools/templates/models/SDOFactoryClass.javajet?view=diff&rev=536345&r1=536344&r2=536345
==============================================================================
--- incubator/tuscany/java/sdo/tools/templates/models/SDOFactoryClass.javajet (original)
+++ incubator/tuscany/java/sdo/tools/templates/models/SDOFactoryClass.javajet Tue May 8 14:51:25 2007
@@ -322,7 +322,7 @@
// Add supertypes to types
<%for (Iterator c=genPackage.getGenClasses().iterator(); c.hasNext();) { GenClass genClass = (GenClass)c.next();%>
<%for (Iterator b=genClass.getBaseGenClasses().iterator(); b.hasNext();) { GenClass baseGenClass = (GenClass)b.next();%>
- addSuperType(<%=genClass.getSafeUncapName()%>Type, <%=baseGenClass.getSafeUncapName()%>Type);
+ addSuperType(<%=genClass.getSafeUncapName()%>Type, <%=genPackage.getPackageInstanceVariable(baseGenClass.getGenPackage())%>.get<%=baseGenClass.getClassifierAccessorName()%>());
<%}%>
<%}%>
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org