tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kelvingood...@apache.org
Subject svn commit: r509986 [3/4] - in /incubator/tuscany/java/sdo: impl/src/main/java/org/apache/tuscany/sdo/helper/ impl/src/main/java/org/apache/tuscany/sdo/impl/ impl/src/main/java/org/apache/tuscany/sdo/util/ impl/src/test/java/org/apache/tuscany/sdo/test...
Date Wed, 21 Feb 2007 12:49:56 GMT
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=509986&r1=509985&r2=509986
==============================================================================
--- 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 Wed Feb 21 04:49:54 2007
@@ -154,213 +154,212 @@
   protected final String TEXT_114 = ");";
   protected final String TEXT_115 = NL + "\t\tcreateProperty(";
   protected final String TEXT_116 = ", ";
-  protected final String TEXT_117 = "Type,";
-  protected final String TEXT_118 = ".INTERNAL_";
-  protected final String TEXT_119 = "); ";
-  protected final String TEXT_120 = NL + NL + "\t\t// Create data types";
-  protected final String TEXT_121 = NL + "\t\t";
-  protected final String TEXT_122 = "Type = createType(true, ";
-  protected final String TEXT_123 = " );";
-  protected final String TEXT_124 = NL + "\t}" + NL + "\t" + NL + "\tprivate boolean isInitialized = false;" + NL + "" + NL + "\tpublic void initializeMetaData()" + NL + "\t{" + NL + "\t\tif (isInitialized) return;" + NL + "\t\tisInitialized = true;";
-  protected final String TEXT_125 = NL + NL + "\t\t// Obtain other dependent packages";
-  protected final String TEXT_126 = NL + "\t\t";
-  protected final String TEXT_127 = " ";
-  protected final String TEXT_128 = " = (";
-  protected final String TEXT_129 = ")FactoryBase.getStaticFactory(";
-  protected final String TEXT_130 = ".NAMESPACE_URI);";
-  protected final String TEXT_131 = NL + "\t\t";
-  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_155 = ", ";
+  protected final String TEXT_117 = "Type, ";
+  protected final String TEXT_118 = ".";
+  protected final String TEXT_119 = ");";
+  protected final String TEXT_120 = NL;
+  protected final String TEXT_121 = NL + NL + "\t\t// Create data types";
+  protected final String TEXT_122 = NL + "\t\t";
+  protected final String TEXT_123 = "Type = createType(true, ";
+  protected final String TEXT_124 = " );";
+  protected final String TEXT_125 = NL + "\t}" + NL + "\t" + NL + "\tprivate boolean isInitialized = false;" + NL + "" + NL + "\tpublic void initializeMetaData()" + NL + "\t{" + NL + "\t\tif (isInitialized) return;" + NL + "\t\tisInitialized = true;";
+  protected final String TEXT_126 = NL + NL + "\t\t// Obtain other dependent packages";
+  protected final String TEXT_127 = NL + "\t\t";
+  protected final String TEXT_128 = " ";
+  protected final String TEXT_129 = " = (";
+  protected final String TEXT_130 = ")FactoryBase.getStaticFactory(";
+  protected final String TEXT_131 = ".NAMESPACE_URI);";
+  protected final String TEXT_132 = NL + "\t\t";
+  protected final String TEXT_133 = " property = null;" + NL + "" + NL + "\t\t// Add supertypes to types";
+  protected final String TEXT_134 = NL + "\t\taddSuperType(";
+  protected final String TEXT_135 = "Type, ";
+  protected final String TEXT_136 = "Type);";
+  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 = (";
+  protected final String TEXT_149 = ")";
+  protected final String TEXT_150 = "Type.getProperties().get(";
+  protected final String TEXT_151 = ".";
+  protected final String TEXT_152 = ");";
+  protected final String TEXT_153 = NL + "\t\tinitializeProperty(property, ";
+  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_167 = ", ";
+  protected final String TEXT_161 = ", ";
+  protected final String TEXT_162 = ", ";
+  protected final String TEXT_163 = ", ";
+  protected final String TEXT_164 = ");";
+  protected final String TEXT_165 = NL + "\t\tinitializeProperty(property, ";
+  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 = ");";
-  protected final String TEXT_193 = NL + "\t}" + NL;
-  protected final String TEXT_194 = NL + "\t  " + NL + "\tprotected void createXSDMetaData(";
+  protected final String TEXT_172 = ", ";
+  protected final String TEXT_173 = ", ";
+  protected final String TEXT_174 = ");";
+  protected final String TEXT_175 = NL + "\t\tsetInstanceProperty (property, \"";
+  protected final String TEXT_176 = "\", ";
+  protected final String TEXT_177 = ", ";
+  protected final String TEXT_178 = ");";
+  protected final String TEXT_179 = NL;
+  protected final String TEXT_180 = NL + "\t\t// Initialize data types";
+  protected final String TEXT_181 = NL + "\t\tinitializeType(";
+  protected final String TEXT_182 = "Type, ";
+  protected final String TEXT_183 = ".class, \"";
+  protected final String TEXT_184 = "\", ";
+  protected final String TEXT_185 = ", ";
+  protected final String TEXT_186 = ");";
+  protected final String TEXT_187 = NL + "\t\tsetInstanceProperty (";
+  protected final String TEXT_188 = "Type, \"";
+  protected final String TEXT_189 = "\", ";
+  protected final String TEXT_190 = ", ";
+  protected final String TEXT_191 = ");";
+  protected final String TEXT_192 = NL;
+  protected final String TEXT_193 = NL + "\t\tcreateXSDMetaData(";
+  protected final String TEXT_194 = ");" + NL + "\t}" + NL + "\t  " + NL + "\tprotected void createXSDMetaData(";
   protected final String TEXT_195 = ")" + NL + "\t{" + NL + "\t\tsuper.initXSD();" + NL + "\t\t" + NL + "\t\t";
   protected final String TEXT_196 = " property = null;" + NL + "\t\t";
   protected final String TEXT_197 = NL + "\t\taddXSDMapping" + NL + "\t\t  (new String[]" + NL + "\t\t\t {";
   protected final String TEXT_198 = NL + "\t\t\t ";
   protected final String TEXT_199 = ", ";
   protected final String TEXT_200 = NL + "\t\t\t });" + NL;
-  protected final String TEXT_201 = NL;
-  protected final String TEXT_202 = NL + "\t\taddXSDMapping" + NL + "\t\t  (";
-  protected final String TEXT_203 = "Type," + NL + "\t\t\t new String[] " + NL + "\t\t\t {";
-  protected final String TEXT_204 = NL + "\t\t\t ";
-  protected final String TEXT_205 = ", ";
-  protected final String TEXT_206 = NL + "\t\t\t });" + NL;
-  protected final String TEXT_207 = NL + "\t\tproperty = createGlobalProperty" + NL + "\t\t  (\"";
-  protected final String TEXT_208 = "\"," + NL + "\t\t  ";
-  protected final String TEXT_209 = ".get";
-  protected final String TEXT_210 = "()," + NL + "\t\t\t new String[]" + NL + "\t\t\t {";
-  protected final String TEXT_211 = NL + "\t\t\t ";
-  protected final String TEXT_212 = ", ";
-  protected final String TEXT_213 = NL + "\t\t\t }," + NL + "\t\t\t IS_ATTRIBUTE);";
-  protected final String TEXT_214 = NL + "\t\t\t });";
-  protected final String TEXT_215 = NL + "              ";
-  protected final String TEXT_216 = NL + "\t\tsetInstanceProperty" + NL + "\t\t  (property," + NL + "\t\t\t \"";
-  protected final String TEXT_217 = "\"," + NL + "\t\t\t ";
-  protected final String TEXT_218 = ", ";
-  protected final String TEXT_219 = ");";
-  protected final String TEXT_220 = NL + "                  ";
-  protected final String TEXT_221 = "  ";
-  protected final String TEXT_222 = NL + "\t\taddXSDMapping" + NL + "\t\t  (getProperty(";
-  protected final String TEXT_223 = "Type, ";
-  protected final String TEXT_224 = ".INTERNAL_";
+  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  ((";
+  protected final String TEXT_222 = ")";
+  protected final String TEXT_223 = "Type.getProperties().get(";
+  protected final String TEXT_224 = ".";
   protected final String TEXT_225 = ")," + NL + "\t\t\t new String[]" + NL + "\t\t\t {";
   protected final String TEXT_226 = NL + "\t\t\t ";
   protected final String TEXT_227 = ", ";
   protected final String TEXT_228 = NL + "\t\t\t });" + NL;
-  protected final String TEXT_229 = NL + "  }";
-  protected final String TEXT_230 = NL + "    ";
-  protected final String TEXT_231 = NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic ";
-  protected final String TEXT_232 = " create";
-  protected final String TEXT_233 = "FromString(String initialValue)" + NL + "\t{";
-  protected final String TEXT_234 = NL + "\t\t";
-  protected final String TEXT_235 = " result = ";
-  protected final String TEXT_236 = ".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_237 = NL + "\t\treturn result;";
-  protected final String TEXT_238 = NL + "\t\treturn (";
-  protected final String TEXT_239 = ")create";
-  protected final String TEXT_240 = "FromString(initialValue);";
-  protected final String TEXT_241 = NL + "\t\treturn (";
-  protected final String TEXT_242 = ")";
-  protected final String TEXT_243 = ".create";
-  protected final String TEXT_244 = "FromString(initialValue);";
-  protected final String TEXT_245 = NL + "\t\tif (initialValue == null) return null;" + NL + "\t\t";
-  protected final String TEXT_246 = " result = new ";
-  protected final String TEXT_247 = "();" + NL + "\t\tfor (";
-  protected final String TEXT_248 = " stringTokenizer = new ";
-  protected final String TEXT_249 = "(initialValue); stringTokenizer.hasMoreTokens(); )" + NL + "\t\t{" + NL + "\t\t\tString item = stringTokenizer.nextToken();";
-  protected final String TEXT_250 = NL + "\t\t\tresult.add(create";
-  protected final String TEXT_251 = "FromString(item));";
-  protected final String TEXT_252 = NL + "\t\t\tresult.add(";
-  protected final String TEXT_253 = ".create";
-  protected final String TEXT_254 = "FromString(item));";
-  protected final String TEXT_255 = NL + "\t\t}" + NL + "\t\treturn result;";
-  protected final String TEXT_256 = NL + "\t\tif (initialValue == null) return null;" + NL + "\t\t";
-  protected final String TEXT_257 = " result = null;" + NL + "\t\tRuntimeException exception = null;";
-  protected final String TEXT_258 = NL + "\t\ttry" + NL + "\t\t{";
-  protected final String TEXT_259 = NL + "\t\t\tresult = (";
-  protected final String TEXT_260 = ")create";
-  protected final String TEXT_261 = "FromString(initialValue);";
-  protected final String TEXT_262 = NL + "\t\t\tresult = (";
-  protected final String TEXT_263 = ")";
-  protected final String TEXT_264 = ".create";
-  protected final String TEXT_265 = "FromString(initialValue);";
-  protected final String TEXT_266 = 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_267 = NL + "\t\tif (result != null || exception == null) return result;" + NL + "    " + NL + "\t\tthrow exception;";
-  protected final String TEXT_268 = 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_269 = "();";
-  protected final String TEXT_270 = NL + "\t\treturn (";
-  protected final String TEXT_271 = ")super.createFromString(";
-  protected final String TEXT_272 = ", initialValue);";
-  protected final String TEXT_273 = 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_274 = "ToString(Object instanceValue)" + NL + "\t{";
-  protected final String TEXT_275 = NL + "\t\treturn instanceValue == null ? null : instanceValue.toString();";
-  protected final String TEXT_276 = NL + "\t\treturn convert";
-  protected final String TEXT_277 = "ToString(instanceValue);";
-  protected final String TEXT_278 = NL + "\t\treturn ";
-  protected final String TEXT_279 = ".convert";
-  protected final String TEXT_280 = "ToString(instanceValue);";
-  protected final String TEXT_281 = NL + "\t\tif (instanceValue == null) return null;" + NL + "\t\t";
-  protected final String TEXT_282 = " list = (";
-  protected final String TEXT_283 = ")instanceValue;" + NL + "\t\tif (list.isEmpty()) return \"\";" + NL + "\t\t";
-  protected final String TEXT_284 = " result = new ";
-  protected final String TEXT_285 = "();" + NL + "\t\tfor (";
-  protected final String TEXT_286 = " i = list.iterator(); i.hasNext(); )" + NL + "\t\t{";
-  protected final String TEXT_287 = NL + "\t\t\tresult.append(convert";
-  protected final String TEXT_288 = "ToString(i.next()));";
-  protected final String TEXT_289 = NL + "\t\t\tresult.append(";
-  protected final String TEXT_290 = ".convert";
-  protected final String TEXT_291 = "ToString(i.next()));";
-  protected final String TEXT_292 = NL + "\t\t\tresult.append(' ');" + NL + "\t\t}" + NL + "\t\treturn result.substring(0, result.length() - 1);";
-  protected final String TEXT_293 = NL + "\t\tif (instanceValue == null) return null;";
-  protected final String TEXT_294 = NL + "\t\tif (";
-  protected final String TEXT_295 = ".isInstance(instanceValue))" + NL + "\t\t{" + NL + "\t\t\ttry" + NL + "\t\t\t{";
-  protected final String TEXT_296 = NL + "\t\t\t\tString value = convert";
-  protected final String TEXT_297 = "ToString(instanceValue);";
-  protected final String TEXT_298 = NL + "\t\t\t\tString value = ";
-  protected final String TEXT_299 = ".convert";
-  protected final String TEXT_300 = "ToString(instanceValue);";
-  protected final String TEXT_301 = 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_302 = NL + "\t\tthrow new IllegalArgumentException(\"Invalid value: '\"+instanceValue+\"' for datatype :";
-  protected final String TEXT_303 = "\");";
-  protected final String TEXT_304 = 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_305 = "();";
-  protected final String TEXT_306 = NL + "\t\treturn super.convertToString(";
-  protected final String TEXT_307 = ", instanceValue);";
-  protected final String TEXT_308 = NL + "\t}" + NL;
-  protected final String TEXT_309 = NL + "\t/**" + NL + "\t * Returns a new object of class '<em>";
-  protected final String TEXT_310 = "</em>'." + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @return a new object of class '<em>";
-  protected final String TEXT_311 = "</em>'." + NL + "\t * @generated" + NL + "\t */" + NL + "\t";
-  protected final String TEXT_312 = " create";
-  protected final String TEXT_313 = "();" + NL;
-  protected final String TEXT_314 = 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_315 = NL + "\t/**" + NL + "\t * Returns an instance of data type '<em>";
-  protected final String TEXT_316 = "</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_317 = " create";
-  protected final String TEXT_318 = "(String literal);" + NL + "" + NL + "\t/**" + NL + "\t * Returns a literal representation of an instance of data type '<em>";
-  protected final String TEXT_319 = "</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_320 = "(";
-  protected final String TEXT_321 = " instanceValue);" + NL;
-  protected final String TEXT_322 = NL + "} //";
-  protected final String TEXT_323 = NL;
+  protected final String TEXT_229 = NL + "  }" + NL + "  ";
+  protected final String TEXT_230 = NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic ";
+  protected final String TEXT_231 = " create";
+  protected final String TEXT_232 = "FromString(String initialValue)" + NL + "\t{";
+  protected final String TEXT_233 = NL + "\t\t";
+  protected final String TEXT_234 = " result = ";
+  protected final String TEXT_235 = ".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_236 = NL + "\t\treturn result;";
+  protected final String TEXT_237 = NL + "\t\treturn (";
+  protected final String TEXT_238 = ")create";
+  protected final String TEXT_239 = "FromString(initialValue);";
+  protected final String TEXT_240 = NL + "\t\treturn (";
+  protected final String TEXT_241 = ")";
+  protected final String TEXT_242 = ".create";
+  protected final String TEXT_243 = "FromString(initialValue);";
+  protected final String TEXT_244 = NL + "\t\tif (initialValue == null) return null;" + NL + "\t\t";
+  protected final String TEXT_245 = " result = new ";
+  protected final String TEXT_246 = "();" + NL + "\t\tfor (";
+  protected final String TEXT_247 = " stringTokenizer = new ";
+  protected final String TEXT_248 = "(initialValue); stringTokenizer.hasMoreTokens(); )" + NL + "\t\t{" + NL + "\t\t\tString item = stringTokenizer.nextToken();";
+  protected final String TEXT_249 = NL + "\t\t\tresult.add(create";
+  protected final String TEXT_250 = "FromString(item));";
+  protected final String TEXT_251 = NL + "\t\t\tresult.add(";
+  protected final String TEXT_252 = ".create";
+  protected final String TEXT_253 = "FromString(item));";
+  protected final String TEXT_254 = NL + "\t\t}" + NL + "\t\treturn result;";
+  protected final String TEXT_255 = NL + "\t\tif (initialValue == null) return null;" + NL + "\t\t";
+  protected final String TEXT_256 = " result = null;" + NL + "\t\tRuntimeException exception = null;";
+  protected final String TEXT_257 = NL + "\t\ttry" + NL + "\t\t{";
+  protected final String TEXT_258 = NL + "\t\t\tresult = (";
+  protected final String TEXT_259 = ")create";
+  protected final String TEXT_260 = "FromString(initialValue);";
+  protected final String TEXT_261 = NL + "\t\t\tresult = (";
+  protected final String TEXT_262 = ")";
+  protected final String TEXT_263 = ".create";
+  protected final String TEXT_264 = "FromString(initialValue);";
+  protected final String TEXT_265 = 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_266 = NL + "\t\tif (result != null || exception == null) return result;" + NL + "    " + NL + "\t\tthrow exception;";
+  protected final String TEXT_267 = 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_268 = "();";
+  protected final String TEXT_269 = NL + "\t\treturn (";
+  protected final String TEXT_270 = ")super.createFromString(";
+  protected final String TEXT_271 = ", initialValue);";
+  protected final String TEXT_272 = 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_273 = "ToString(Object instanceValue)" + NL + "\t{";
+  protected final String TEXT_274 = NL + "\t\treturn instanceValue == null ? null : instanceValue.toString();";
+  protected final String TEXT_275 = NL + "\t\treturn convert";
+  protected final String TEXT_276 = "ToString(instanceValue);";
+  protected final String TEXT_277 = NL + "\t\treturn ";
+  protected final String TEXT_278 = ".convert";
+  protected final String TEXT_279 = "ToString(instanceValue);";
+  protected final String TEXT_280 = NL + "\t\tif (instanceValue == null) return null;" + NL + "\t\t";
+  protected final String TEXT_281 = " list = (";
+  protected final String TEXT_282 = ")instanceValue;" + NL + "\t\tif (list.isEmpty()) return \"\";" + NL + "\t\t";
+  protected final String TEXT_283 = " result = new ";
+  protected final String TEXT_284 = "();" + NL + "\t\tfor (";
+  protected final String TEXT_285 = " i = list.iterator(); i.hasNext(); )" + NL + "\t\t{";
+  protected final String TEXT_286 = NL + "\t\t\tresult.append(convert";
+  protected final String TEXT_287 = "ToString(i.next()));";
+  protected final String TEXT_288 = NL + "\t\t\tresult.append(";
+  protected final String TEXT_289 = ".convert";
+  protected final String TEXT_290 = "ToString(i.next()));";
+  protected final String TEXT_291 = NL + "\t\t\tresult.append(' ');" + NL + "\t\t}" + NL + "\t\treturn result.substring(0, result.length() - 1);";
+  protected final String TEXT_292 = NL + "\t\tif (instanceValue == null) return null;";
+  protected final String TEXT_293 = NL + "\t\tif (";
+  protected final String TEXT_294 = ".isInstance(instanceValue))" + NL + "\t\t{" + NL + "\t\t\ttry" + NL + "\t\t\t{";
+  protected final String TEXT_295 = NL + "\t\t\t\tString value = convert";
+  protected final String TEXT_296 = "ToString(instanceValue);";
+  protected final String TEXT_297 = NL + "\t\t\t\tString value = ";
+  protected final String TEXT_298 = ".convert";
+  protected final String TEXT_299 = "ToString(instanceValue);";
+  protected final String TEXT_300 = 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_301 = NL + "\t\tthrow new IllegalArgumentException(\"Invalid value: '\"+instanceValue+\"' for datatype :";
+  protected final String TEXT_302 = "\");";
+  protected final String TEXT_303 = 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_304 = "();";
+  protected final String TEXT_305 = NL + "\t\treturn super.convertToString(";
+  protected final String TEXT_306 = ", instanceValue);";
+  protected final String TEXT_307 = NL + "\t}" + NL;
+  protected final String TEXT_308 = NL + "\t/**" + NL + "\t * Returns a new object of class '<em>";
+  protected final String TEXT_309 = "</em>'." + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @return a new object of class '<em>";
+  protected final String TEXT_310 = "</em>'." + NL + "\t * @generated" + NL + "\t */" + NL + "\t";
+  protected final String TEXT_311 = " create";
+  protected final String TEXT_312 = "();" + NL;
+  protected final String TEXT_313 = 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_314 = NL + "\t/**" + NL + "\t * Returns an instance of data type '<em>";
+  protected final String TEXT_315 = "</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_316 = " create";
+  protected final String TEXT_317 = "(String literal);" + NL + "" + NL + "\t/**" + NL + "\t * Returns a literal representation of an instance of data type '<em>";
+  protected final String TEXT_318 = "</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_319 = "(";
+  protected final String TEXT_320 = " instanceValue);" + NL;
+  protected final String TEXT_321 = NL + "} //";
+  protected final String TEXT_322 = NL;
 
    public String generate(Object argument)
   {
@@ -388,7 +387,7 @@
 
     GenPackage genPackage = (GenPackage)((Object[])argument)[0]; GenModel genModel=genPackage.getGenModel();
     boolean isInterface = Boolean.TRUE.equals(((Object[])argument)[1]); boolean isImplementation = Boolean.TRUE.equals(((Object[])argument)[2]);
-    String factoryPatternVersion = "1.1";
+    String factoryPatternVersion = "1.0";
     String publicStaticFinalFlag = isImplementation ? "public static final " : "";
     stringBuffer.append(TEXT_1);
     stringBuffer.append(TEXT_2);
@@ -662,193 +661,193 @@
     stringBuffer.append(genFeature.getUpperName());
     stringBuffer.append(TEXT_119);
     }
+    if (c.hasNext()) {
+    stringBuffer.append(TEXT_120);
+    }
     }
     }
     }
     if (!genPackage.getGenDataTypes().isEmpty()) {
-    stringBuffer.append(TEXT_120);
-    for (Iterator d=genPackage.getGenDataTypes().iterator(); d.hasNext();) { GenDataType genDataType = (GenDataType)d.next();
     stringBuffer.append(TEXT_121);
-    stringBuffer.append(genDataType.getSafeUncapName());
+    for (Iterator d=genPackage.getGenDataTypes().iterator(); d.hasNext();) { GenDataType genDataType = (GenDataType)d.next();
     stringBuffer.append(TEXT_122);
-    stringBuffer.append(genPackage.getClassifierID(genDataType));
+    stringBuffer.append(genDataType.getSafeUncapName());
     stringBuffer.append(TEXT_123);
+    stringBuffer.append(genPackage.getClassifierID(genDataType));
+    stringBuffer.append(TEXT_124);
     }
     }
-    stringBuffer.append(TEXT_124);
-    if (!genPackage.getPackageInitializationDependencies().isEmpty()) {
     stringBuffer.append(TEXT_125);
-    for (Iterator p=genPackage.getPackageInitializationDependencies().iterator(); p.hasNext();) { GenPackage dep = (GenPackage)p.next();
+    if (!genPackage.getPackageInitializationDependencies().isEmpty()) {
     stringBuffer.append(TEXT_126);
-    stringBuffer.append(dep.getImportedFactoryClassName());
+    for (Iterator p=genPackage.getPackageInitializationDependencies().iterator(); p.hasNext();) { GenPackage dep = (GenPackage)p.next();
     stringBuffer.append(TEXT_127);
-    stringBuffer.append(genPackage.getPackageInstanceVariable(dep));
-    stringBuffer.append(TEXT_128);
     stringBuffer.append(dep.getImportedFactoryClassName());
+    stringBuffer.append(TEXT_128);
+    stringBuffer.append(genPackage.getPackageInstanceVariable(dep));
     stringBuffer.append(TEXT_129);
     stringBuffer.append(dep.getImportedFactoryClassName());
     stringBuffer.append(TEXT_130);
+    stringBuffer.append(dep.getImportedFactoryClassName());
+    stringBuffer.append(TEXT_131);
     }
     }
     List annotationSources = genPackage.getAnnotationSources();
     annotationSources.remove(ExtendedMetaData.ANNOTATION_URI);
-    stringBuffer.append(TEXT_131);
-    stringBuffer.append(genModel.getImportedName("commonj.sdo.Property"));
     stringBuffer.append(TEXT_132);
+    stringBuffer.append(genModel.getImportedName("commonj.sdo.Property"));
+    stringBuffer.append(TEXT_133);
     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();
-    stringBuffer.append(TEXT_133);
-    stringBuffer.append(genClass.getSafeUncapName());
     stringBuffer.append(TEXT_134);
-    stringBuffer.append(baseGenClass.getSafeUncapName());
+    stringBuffer.append(genClass.getSafeUncapName());
     stringBuffer.append(TEXT_135);
+    stringBuffer.append(baseGenClass.getSafeUncapName());
+    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(genModel.getImportedName("commonj.sdo.Property"));
     stringBuffer.append(TEXT_149);
-    stringBuffer.append(genFeature.getUpperName());
+    stringBuffer.append(genClass.getSafeUncapName());
     stringBuffer.append(TEXT_150);
-    if (genFeature.isReferenceType()) { GenFeature reverseGenFeature = genFeature.getReverse();
-    String reverse = reverseGenFeature == null ? "null" : genPackage.getPackageInstanceVariable(reverseGenFeature.getGenPackage()) + ".get" + reverseGenFeature.getFeatureAccessorName() + "()";
+    stringBuffer.append(genClass.getClassName());
     stringBuffer.append(TEXT_151);
-    stringBuffer.append(type);
+    stringBuffer.append(genFeature.getUpperName());
     stringBuffer.append(TEXT_152);
-    stringBuffer.append(genFeature.getSafeName());
+    if (genFeature.isReferenceType()) { GenFeature reverseGenFeature = genFeature.getReverse();
+    String reverse = reverseGenFeature == null ? "null" : genPackage.getPackageInstanceVariable(reverseGenFeature.getGenPackage()) + ".get" + reverseGenFeature.getFeatureAccessorName() + "()";
     stringBuffer.append(TEXT_153);
-    stringBuffer.append(genFeature.getDefaultValue());
+    stringBuffer.append(type);
     stringBuffer.append(TEXT_154);
-    stringBuffer.append(genFeature.getLowerBound());
+    stringBuffer.append(genFeature.getName());
     stringBuffer.append(TEXT_155);
-    stringBuffer.append(genFeature.getUpperBound());
+    stringBuffer.append(genFeature.getDefaultValue());
     stringBuffer.append(TEXT_156);
-    stringBuffer.append(genFeature.getContainerClass());
+    stringBuffer.append(genFeature.getLowerBound());
     stringBuffer.append(TEXT_157);
-    stringBuffer.append(genFeature.getChangeableFlag().equals("IS_CHANGEABLE") ? "false" : "true");
+    stringBuffer.append(genFeature.getUpperBound());
     stringBuffer.append(TEXT_158);
-    stringBuffer.append(genFeature.getUnsettableFlag().equals("IS_UNSETTABLE") ? "true": "false");
+    stringBuffer.append(genFeature.getContainerClass());
     stringBuffer.append(TEXT_159);
-    stringBuffer.append(genFeature.getDerivedFlag().equals("IS_DERIVED") ? "true" : "false");
+    stringBuffer.append(genFeature.getChangeableFlag().equals("IS_CHANGEABLE") ? "false" : "true");
     stringBuffer.append(TEXT_160);
-    stringBuffer.append(genFeature.getContainmentFlag().equals("IS_COMPOSITE")? "true": "false");
+    stringBuffer.append(genFeature.getUnsettableFlag().equals("IS_UNSETTABLE") ? "true": "false");
     stringBuffer.append(TEXT_161);
-    stringBuffer.append(reverse);
+    stringBuffer.append(genFeature.getDerivedFlag().equals("IS_DERIVED") ? "true" : "false");
     stringBuffer.append(TEXT_162);
-    }else{
+    stringBuffer.append(genFeature.getContainmentFlag().equals("IS_COMPOSITE")? "true": "false");
     stringBuffer.append(TEXT_163);
-    stringBuffer.append(type);
+    stringBuffer.append(reverse);
     stringBuffer.append(TEXT_164);
-    stringBuffer.append(genFeature.getSafeName());
+    }else{
     stringBuffer.append(TEXT_165);
-    stringBuffer.append(genFeature.getDefaultValue());
+    stringBuffer.append(type);
     stringBuffer.append(TEXT_166);
-    stringBuffer.append(genFeature.getLowerBound());
+    stringBuffer.append(genFeature.getName());
     stringBuffer.append(TEXT_167);
-    stringBuffer.append(genFeature.getUpperBound());
+    stringBuffer.append(genFeature.getDefaultValue());
     stringBuffer.append(TEXT_168);
-    stringBuffer.append(genFeature.getContainerClass());
+    stringBuffer.append(genFeature.getLowerBound());
     stringBuffer.append(TEXT_169);
-    stringBuffer.append(genFeature.getChangeableFlag().equals("IS_CHANGEABLE") ? "false" : "true");
+    stringBuffer.append(genFeature.getUpperBound());
     stringBuffer.append(TEXT_170);
-    stringBuffer.append(genFeature.getUnsettableFlag().equals("IS_UNSETTABLE") ? "true": "false");
+    stringBuffer.append(genFeature.getContainerClass());
     stringBuffer.append(TEXT_171);
-    stringBuffer.append(genFeature.getDerivedFlag().equals("IS_DERIVED") ? "true" : "false");
+    stringBuffer.append(genFeature.getChangeableFlag().equals("IS_CHANGEABLE") ? "false" : "true");
     stringBuffer.append(TEXT_172);
+    stringBuffer.append(genFeature.getUnsettableFlag().equals("IS_UNSETTABLE") ? "true": "false");
+    stringBuffer.append(TEXT_173);
+    stringBuffer.append(genFeature.getDerivedFlag().equals("IS_DERIVED") ? "true" : "false");
+    stringBuffer.append(TEXT_174);
     }
     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(TEXT_175);
     stringBuffer.append(annotationSource);
-    stringBuffer.append(TEXT_174);
+    stringBuffer.append(TEXT_176);
     stringBuffer.append(key);
-    stringBuffer.append(TEXT_175);
+    stringBuffer.append(TEXT_177);
     stringBuffer.append(value);
     stringBuffer.append(genModel.getNonNLS(key + value));
-    stringBuffer.append(TEXT_176);
+    stringBuffer.append(TEXT_178);
     }
     }
     }
-    stringBuffer.append(TEXT_177);
     }
+    stringBuffer.append(TEXT_179);
     }
     }
     if (!genPackage.getGenDataTypes().isEmpty()) {
-    stringBuffer.append(TEXT_178);
+    stringBuffer.append(TEXT_180);
     for (Iterator d=genPackage.getGenDataTypes().iterator(); d.hasNext();) { GenDataType genDataType = (GenDataType)d.next();
-    stringBuffer.append(TEXT_179);
+    stringBuffer.append(TEXT_181);
     stringBuffer.append(genDataType.getSafeUncapName());
-    stringBuffer.append(TEXT_180);
+    stringBuffer.append(TEXT_182);
     stringBuffer.append(genDataType.getImportedInstanceClassName());
-    stringBuffer.append(TEXT_181);
+    stringBuffer.append(TEXT_183);
     stringBuffer.append(genDataType.getName());
-    stringBuffer.append(TEXT_182);
+    stringBuffer.append(TEXT_184);
     stringBuffer.append(genDataType.getSerializableFlag().equals("IS_SERIALIZABLE") ? "true" : "false");
-    stringBuffer.append(TEXT_183);
+    stringBuffer.append(TEXT_185);
     stringBuffer.append(genDataType.getGeneratedInstanceClassFlag().equals("IS_GENERATED_INSTANCE_CLASS") ? "true" : "false" );
-    stringBuffer.append(TEXT_184);
+    stringBuffer.append(TEXT_186);
     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(TEXT_187);
     stringBuffer.append(genDataType.getSafeUncapName());
-    stringBuffer.append(TEXT_186);
+    stringBuffer.append(TEXT_188);
     stringBuffer.append(annotationSource);
-    stringBuffer.append(TEXT_187);
+    stringBuffer.append(TEXT_189);
     stringBuffer.append(key);
-    stringBuffer.append(TEXT_188);
+    stringBuffer.append(TEXT_190);
     stringBuffer.append(value);
     stringBuffer.append(genModel.getNonNLS(key + value));
-    stringBuffer.append(TEXT_189);
+    stringBuffer.append(TEXT_191);
     }
     }
     }
-    stringBuffer.append(TEXT_190);
+    stringBuffer.append(TEXT_192);
     }
     }
-     if(genPackage.getEcorePackage().getEAnnotation(ExtendedMetaData.ANNOTATION_URI) != null) { // if there are XSD annotations
-    stringBuffer.append(TEXT_191);
-    stringBuffer.append(SDOGenUtil.getDependentFactoryArgumentList(genPackage, false));
-    stringBuffer.append(TEXT_192);
-     } 
     stringBuffer.append(TEXT_193);
-     if(genPackage.getEcorePackage().getEAnnotation(ExtendedMetaData.ANNOTATION_URI) != null) { // if there are XSD annotations 
+    stringBuffer.append(SDOGenUtil.getDependentFactoryArgumentList(genPackage, false));
     stringBuffer.append(TEXT_194);
     stringBuffer.append(SDOGenUtil.getDependentFactoryArgumentList(genPackage, true));
     stringBuffer.append(TEXT_195);
@@ -868,69 +867,70 @@
     }
     stringBuffer.append(TEXT_200);
     }
-    stringBuffer.append(TEXT_201);
     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_202);
+    stringBuffer.append(TEXT_201);
     stringBuffer.append(genClassifier.getSafeUncapName());
-    stringBuffer.append(TEXT_203);
+    stringBuffer.append(TEXT_202);
     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_204);
+    stringBuffer.append(TEXT_203);
     stringBuffer.append(key);
-    stringBuffer.append(TEXT_205);
+    stringBuffer.append(TEXT_204);
     stringBuffer.append(value);
     stringBuffer.append(k.hasNext() ? "," : "");
     stringBuffer.append(genModel.getNonNLS(key + value));
     }
-    stringBuffer.append(TEXT_206);
+    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_207);
+    stringBuffer.append(TEXT_206);
     stringBuffer.append(genFeature.getName());
-    stringBuffer.append(TEXT_208);
+    stringBuffer.append(TEXT_207);
     stringBuffer.append(genPackage.getPackageInstanceVariable(genFeature.getTypeGenPackage()));
-    stringBuffer.append(TEXT_209);
+    stringBuffer.append(TEXT_208);
     stringBuffer.append(genFeature.getTypeClassifierAccessorName());
-    stringBuffer.append(TEXT_210);
+    stringBuffer.append(TEXT_209);
     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_211);
+    stringBuffer.append(TEXT_210);
     stringBuffer.append(key);
-    stringBuffer.append(TEXT_212);
+    stringBuffer.append(TEXT_211);
     stringBuffer.append(value);
     stringBuffer.append(k.hasNext() ? "," : "");
     stringBuffer.append(genModel.getNonNLS(key + value));
     }
     if (!genFeature.isReferenceType()) {
-    stringBuffer.append(TEXT_213);
+    stringBuffer.append(TEXT_212);
     } else {
-    stringBuffer.append(TEXT_214);
+    stringBuffer.append(TEXT_213);
     }
-    stringBuffer.append(TEXT_215);
+    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_216);
+    stringBuffer.append(TEXT_215);
     stringBuffer.append(annotationSource);
-    stringBuffer.append(TEXT_217);
+    stringBuffer.append(TEXT_216);
     stringBuffer.append(key);
-    stringBuffer.append(TEXT_218);
+    stringBuffer.append(TEXT_217);
     stringBuffer.append(value);
     stringBuffer.append(genModel.getNonNLS(key + value));
-    stringBuffer.append(TEXT_219);
+    stringBuffer.append(TEXT_218);
     }
-    stringBuffer.append(TEXT_220);
+    stringBuffer.append(TEXT_219);
     }
     }
-    stringBuffer.append(TEXT_221);
+    stringBuffer.append(TEXT_220);
     }
     }
     } else {
+    stringBuffer.append(TEXT_221);
+    stringBuffer.append(genModel.getImportedName("commonj.sdo.Property"));
     stringBuffer.append(TEXT_222);
     stringBuffer.append(genClassifier.getSafeUncapName());
     stringBuffer.append(TEXT_223);
@@ -952,212 +952,210 @@
     }
     }
     stringBuffer.append(TEXT_229);
-     } // TODO check this is in the right place -- end if there are XSD annotations 
-    stringBuffer.append(TEXT_230);
     for (Iterator i=genPackage.getAllGenDataTypes().iterator(); i.hasNext();) { GenDataType genDataType = (GenDataType)i.next();
     if (genDataType.isSerializable()) {
-    stringBuffer.append(TEXT_231);
+    stringBuffer.append(TEXT_230);
     stringBuffer.append(genDataType.getObjectInstanceClassName());
-    stringBuffer.append(TEXT_232);
+    stringBuffer.append(TEXT_231);
     stringBuffer.append(genDataType.getName());
-    stringBuffer.append(TEXT_233);
+    stringBuffer.append(TEXT_232);
     if (genDataType instanceof GenEnum) {
+    stringBuffer.append(TEXT_233);
+    stringBuffer.append(((GenEnum)genDataType).getImportedInstanceClassName());
     stringBuffer.append(TEXT_234);
     stringBuffer.append(((GenEnum)genDataType).getImportedInstanceClassName());
     stringBuffer.append(TEXT_235);
-    stringBuffer.append(((GenEnum)genDataType).getImportedInstanceClassName());
-    stringBuffer.append(TEXT_236);
     stringBuffer.append(genModel.getNonNLS());
     stringBuffer.append(genModel.getNonNLS(2));
     stringBuffer.append(genModel.getNonNLS(3));
-    stringBuffer.append(TEXT_237);
+    stringBuffer.append(TEXT_236);
     } else if (genDataType.getBaseType() != null) { GenDataType genBaseType = genDataType.getBaseType(); 
     if (genBaseType.getGenPackage() == genPackage) {
-    stringBuffer.append(TEXT_238);
+    stringBuffer.append(TEXT_237);
     stringBuffer.append(genDataType.getObjectInstanceClassName());
-    stringBuffer.append(TEXT_239);
+    stringBuffer.append(TEXT_238);
     stringBuffer.append(genBaseType.getName());
-    stringBuffer.append(TEXT_240);
+    stringBuffer.append(TEXT_239);
     } else {
-    stringBuffer.append(TEXT_241);
+    stringBuffer.append(TEXT_240);
     stringBuffer.append(genDataType.getObjectInstanceClassName());
-    stringBuffer.append(TEXT_242);
+    stringBuffer.append(TEXT_241);
     stringBuffer.append(SDOGenUtil.getFactoryImpl(genBaseType.getGenPackage()));
-    stringBuffer.append(TEXT_243);
+    stringBuffer.append(TEXT_242);
     stringBuffer.append(genBaseType.getName());
-    stringBuffer.append(TEXT_244);
+    stringBuffer.append(TEXT_243);
     }
     } else if (genDataType.getItemType() != null) { GenDataType genItemType = genDataType.getItemType(); 
-    stringBuffer.append(TEXT_245);
+    stringBuffer.append(TEXT_244);
     stringBuffer.append(genModel.getImportedName("java.util.List"));
-    stringBuffer.append(TEXT_246);
+    stringBuffer.append(TEXT_245);
     stringBuffer.append(genModel.getImportedName("java.util.ArrayList"));
+    stringBuffer.append(TEXT_246);
+    stringBuffer.append(genModel.getImportedName("java.util.StringTokenizer"));
     stringBuffer.append(TEXT_247);
     stringBuffer.append(genModel.getImportedName("java.util.StringTokenizer"));
     stringBuffer.append(TEXT_248);
-    stringBuffer.append(genModel.getImportedName("java.util.StringTokenizer"));
-    stringBuffer.append(TEXT_249);
     if (genItemType.getGenPackage() == genPackage) {
-    stringBuffer.append(TEXT_250);
+    stringBuffer.append(TEXT_249);
     stringBuffer.append(genItemType.getName());
-    stringBuffer.append(TEXT_251);
+    stringBuffer.append(TEXT_250);
     } else {
-    stringBuffer.append(TEXT_252);
+    stringBuffer.append(TEXT_251);
     stringBuffer.append(SDOGenUtil.getFactoryImpl(genItemType.getGenPackage()));
-    stringBuffer.append(TEXT_253);
+    stringBuffer.append(TEXT_252);
     stringBuffer.append(genItemType.getName());
-    stringBuffer.append(TEXT_254);
+    stringBuffer.append(TEXT_253);
     }
-    stringBuffer.append(TEXT_255);
+    stringBuffer.append(TEXT_254);
     } else if (!genDataType.getMemberTypes().isEmpty()) {
-    stringBuffer.append(TEXT_256);
+    stringBuffer.append(TEXT_255);
     stringBuffer.append(genDataType.getObjectInstanceClassName());
-    stringBuffer.append(TEXT_257);
+    stringBuffer.append(TEXT_256);
     for (Iterator j = genDataType.getMemberTypes().iterator(); j.hasNext(); ) { GenDataType genMemberType = (GenDataType)j.next();
-    stringBuffer.append(TEXT_258);
+    stringBuffer.append(TEXT_257);
     if (genMemberType.getGenPackage() == genPackage) {
-    stringBuffer.append(TEXT_259);
+    stringBuffer.append(TEXT_258);
     stringBuffer.append(genDataType.getObjectInstanceClassName());
-    stringBuffer.append(TEXT_260);
+    stringBuffer.append(TEXT_259);
     stringBuffer.append(genMemberType.getName());
-    stringBuffer.append(TEXT_261);
+    stringBuffer.append(TEXT_260);
     } else {
-    stringBuffer.append(TEXT_262);
+    stringBuffer.append(TEXT_261);
     stringBuffer.append(genDataType.getObjectInstanceClassName());
-    stringBuffer.append(TEXT_263);
+    stringBuffer.append(TEXT_262);
     stringBuffer.append(SDOGenUtil.getFactoryImpl(genMemberType.getGenPackage()));
-    stringBuffer.append(TEXT_264);
+    stringBuffer.append(TEXT_263);
     stringBuffer.append(genMemberType.getName());
+    stringBuffer.append(TEXT_264);
+    }
     stringBuffer.append(TEXT_265);
     }
     stringBuffer.append(TEXT_266);
-    }
-    stringBuffer.append(TEXT_267);
     } else if (genDataType.isArrayType()) {
-    stringBuffer.append(TEXT_268);
+    stringBuffer.append(TEXT_267);
     stringBuffer.append(genModel.getImportedName("java.lang.UnsupportedOperationException"));
-    stringBuffer.append(TEXT_269);
+    stringBuffer.append(TEXT_268);
     } else {
-    stringBuffer.append(TEXT_270);
+    stringBuffer.append(TEXT_269);
     stringBuffer.append(genDataType.getObjectInstanceClassName());
-    stringBuffer.append(TEXT_271);
+    stringBuffer.append(TEXT_270);
     stringBuffer.append(genDataType.getClassifierID());
-    stringBuffer.append(TEXT_272);
+    stringBuffer.append(TEXT_271);
     }
-    stringBuffer.append(TEXT_273);
+    stringBuffer.append(TEXT_272);
     stringBuffer.append(genDataType.getName());
-    stringBuffer.append(TEXT_274);
+    stringBuffer.append(TEXT_273);
     if (genDataType instanceof GenEnum) {
-    stringBuffer.append(TEXT_275);
+    stringBuffer.append(TEXT_274);
     } else if (genDataType.getBaseType() != null) { GenDataType genBaseType = genDataType.getBaseType(); 
     if (genBaseType.getGenPackage() == genPackage) {
-    stringBuffer.append(TEXT_276);
+    stringBuffer.append(TEXT_275);
     stringBuffer.append(genBaseType.getName());
-    stringBuffer.append(TEXT_277);
+    stringBuffer.append(TEXT_276);
     } else {
-    stringBuffer.append(TEXT_278);
+    stringBuffer.append(TEXT_277);
     stringBuffer.append(SDOGenUtil.getFactoryImpl(genBaseType.getGenPackage()));
-    stringBuffer.append(TEXT_279);
+    stringBuffer.append(TEXT_278);
     stringBuffer.append(genBaseType.getName());
-    stringBuffer.append(TEXT_280);
+    stringBuffer.append(TEXT_279);
     }
     } else if (genDataType.getItemType() != null) { GenDataType genItemType = genDataType.getItemType(); 
+    stringBuffer.append(TEXT_280);
+    stringBuffer.append(genModel.getImportedName("java.util.List"));
     stringBuffer.append(TEXT_281);
     stringBuffer.append(genModel.getImportedName("java.util.List"));
     stringBuffer.append(TEXT_282);
-    stringBuffer.append(genModel.getImportedName("java.util.List"));
+    stringBuffer.append(genModel.getImportedName("java.lang.StringBuffer"));
     stringBuffer.append(TEXT_283);
     stringBuffer.append(genModel.getImportedName("java.lang.StringBuffer"));
     stringBuffer.append(TEXT_284);
-    stringBuffer.append(genModel.getImportedName("java.lang.StringBuffer"));
-    stringBuffer.append(TEXT_285);
     stringBuffer.append(genModel.getImportedName("java.util.Iterator"));
-    stringBuffer.append(TEXT_286);
+    stringBuffer.append(TEXT_285);
     if (genItemType.getGenPackage() == genPackage) {
-    stringBuffer.append(TEXT_287);
+    stringBuffer.append(TEXT_286);
     stringBuffer.append(genItemType.getName());
-    stringBuffer.append(TEXT_288);
+    stringBuffer.append(TEXT_287);
     } else {
-    stringBuffer.append(TEXT_289);
+    stringBuffer.append(TEXT_288);
     stringBuffer.append(SDOGenUtil.getFactoryImpl(genItemType.getGenPackage()));
-    stringBuffer.append(TEXT_290);
+    stringBuffer.append(TEXT_289);
     stringBuffer.append(genItemType.getName());
-    stringBuffer.append(TEXT_291);
+    stringBuffer.append(TEXT_290);
     }
-    stringBuffer.append(TEXT_292);
+    stringBuffer.append(TEXT_291);
     } else if (!genDataType.getMemberTypes().isEmpty()) {
-    stringBuffer.append(TEXT_293);
+    stringBuffer.append(TEXT_292);
     for (Iterator j = genDataType.getMemberTypes().iterator(); j.hasNext(); ) { GenDataType genMemberType = (GenDataType)j.next();
-    stringBuffer.append(TEXT_294);
+    stringBuffer.append(TEXT_293);
     stringBuffer.append(SDOGenUtil.getQualifiedTypeAccessor(genMemberType));
-    stringBuffer.append(TEXT_295);
+    stringBuffer.append(TEXT_294);
     if (genMemberType.getGenPackage() == genPackage) {
-    stringBuffer.append(TEXT_296);
+    stringBuffer.append(TEXT_295);
     stringBuffer.append(genMemberType.getName());
-    stringBuffer.append(TEXT_297);
+    stringBuffer.append(TEXT_296);
     } else {
-    stringBuffer.append(TEXT_298);
+    stringBuffer.append(TEXT_297);
     stringBuffer.append(SDOGenUtil.getFactoryImpl(genMemberType.getGenPackage()));
-    stringBuffer.append(TEXT_299);
+    stringBuffer.append(TEXT_298);
     stringBuffer.append(genMemberType.getName());
+    stringBuffer.append(TEXT_299);
+    }
     stringBuffer.append(TEXT_300);
     }
     stringBuffer.append(TEXT_301);
-    }
-    stringBuffer.append(TEXT_302);
     stringBuffer.append(genDataType.getName());
-    stringBuffer.append(TEXT_303);
+    stringBuffer.append(TEXT_302);
     } else if (genDataType.isArrayType()) {
-    stringBuffer.append(TEXT_304);
+    stringBuffer.append(TEXT_303);
     stringBuffer.append(genModel.getImportedName("java.lang.UnsupportedOperationException"));
-    stringBuffer.append(TEXT_305);
+    stringBuffer.append(TEXT_304);
     } else {
-    stringBuffer.append(TEXT_306);
+    stringBuffer.append(TEXT_305);
     stringBuffer.append(genDataType.getClassifierID());
-    stringBuffer.append(TEXT_307);
+    stringBuffer.append(TEXT_306);
     }
-    stringBuffer.append(TEXT_308);
+    stringBuffer.append(TEXT_307);
     }
     }
     } else {
     for (Iterator i=genPackage.getGenClasses().iterator(); i.hasNext();) { GenClass genClass = (GenClass)i.next();
     if (genClass.hasFactoryInterfaceCreateMethod()) {
+    stringBuffer.append(TEXT_308);
+    stringBuffer.append(genClass.getFormattedName());
     stringBuffer.append(TEXT_309);
     stringBuffer.append(genClass.getFormattedName());
     stringBuffer.append(TEXT_310);
-    stringBuffer.append(genClass.getFormattedName());
-    stringBuffer.append(TEXT_311);
     stringBuffer.append(genClass.getImportedInterfaceName());
-    stringBuffer.append(TEXT_312);
+    stringBuffer.append(TEXT_311);
     stringBuffer.append(genClass.getName());
-    stringBuffer.append(TEXT_313);
+    stringBuffer.append(TEXT_312);
     }
     }
-    stringBuffer.append(TEXT_314);
+    stringBuffer.append(TEXT_313);
     if (genPackage.isDataTypeConverters()) {
     for (Iterator i=genPackage.getAllGenDataTypes().iterator(); i.hasNext();) { GenDataType genDataType = (GenDataType)i.next();
     if (genDataType.isSerializable()) {
-    stringBuffer.append(TEXT_315);
+    stringBuffer.append(TEXT_314);
     stringBuffer.append(genDataType.getFormattedName());
-    stringBuffer.append(TEXT_316);
+    stringBuffer.append(TEXT_315);
     stringBuffer.append(genDataType.getImportedInstanceClassName());
-    stringBuffer.append(TEXT_317);
+    stringBuffer.append(TEXT_316);
     stringBuffer.append(genDataType.getName());
-    stringBuffer.append(TEXT_318);
+    stringBuffer.append(TEXT_317);
     stringBuffer.append(genDataType.getFormattedName());
-    stringBuffer.append(TEXT_319);
+    stringBuffer.append(TEXT_318);
     stringBuffer.append(genDataType.getName());
-    stringBuffer.append(TEXT_320);
+    stringBuffer.append(TEXT_319);
     stringBuffer.append(genDataType.getImportedInstanceClassName());
-    stringBuffer.append(TEXT_321);
+    stringBuffer.append(TEXT_320);
     }
     }
     }
     }
-    stringBuffer.append(TEXT_322);
+    stringBuffer.append(TEXT_321);
     stringBuffer.append(isInterface ? genPackage.getFactoryInterfaceName() : genPackage.getFactoryClassName());
     genModel.emitSortedImports();
-    stringBuffer.append(TEXT_323);
+    stringBuffer.append(TEXT_322);
     return stringBuffer.toString();
   }
 }

Modified: incubator/tuscany/java/sdo/tools/src/test/java/com/example/sequences/MixedQuote.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/tools/src/test/java/com/example/sequences/MixedQuote.java?view=diff&rev=509986&r1=509985&r2=509986
==============================================================================
--- incubator/tuscany/java/sdo/tools/src/test/java/com/example/sequences/MixedQuote.java (original)
+++ incubator/tuscany/java/sdo/tools/src/test/java/com/example/sequences/MixedQuote.java Wed Feb 21 04:49:54 2007
@@ -1,8 +1,21 @@
 /**
- * <copyright>
- * </copyright>
  *
- * $Id$
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
  */
 package com.example.sequences;
 
@@ -14,7 +27,6 @@
 
 import java.util.List;
 
-  // EYECATCHER 1
 /**
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Mixed Quote</b></em>'.
@@ -23,25 +35,15 @@
  * <p>
  * The following features are supported:
  * <ul>
-// debug EYECATCHER 2
  *   <li>{@link com.example.sequences.MixedQuote#getMixed <em>Mixed</em>}</li>
-// debug EYECATCHER 2
  *   <li>{@link com.example.sequences.MixedQuote#getSymbol <em>Symbol</em>}</li>
-// debug EYECATCHER 2
  *   <li>{@link com.example.sequences.MixedQuote#getCompanyName <em>Company Name</em>}</li>
-// debug EYECATCHER 2
  *   <li>{@link com.example.sequences.MixedQuote#getPrice <em>Price</em>}</li>
-// debug EYECATCHER 2
  *   <li>{@link com.example.sequences.MixedQuote#getOpen1 <em>Open1</em>}</li>
-// debug EYECATCHER 2
  *   <li>{@link com.example.sequences.MixedQuote#getHigh <em>High</em>}</li>
-// debug EYECATCHER 2
  *   <li>{@link com.example.sequences.MixedQuote#getLow <em>Low</em>}</li>
-// debug EYECATCHER 2
  *   <li>{@link com.example.sequences.MixedQuote#getVolume <em>Volume</em>}</li>
-// debug EYECATCHER 2
  *   <li>{@link com.example.sequences.MixedQuote#getChange1 <em>Change1</em>}</li>
-// debug EYECATCHER 2
  *   <li>{@link com.example.sequences.MixedQuote#getQuotes <em>Quotes</em>}</li>
  * </ul>
  * </p>

Modified: incubator/tuscany/java/sdo/tools/src/test/java/com/example/sequences/MixedRepeatingChoice.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/tools/src/test/java/com/example/sequences/MixedRepeatingChoice.java?view=diff&rev=509986&r1=509985&r2=509986
==============================================================================
--- incubator/tuscany/java/sdo/tools/src/test/java/com/example/sequences/MixedRepeatingChoice.java (original)
+++ incubator/tuscany/java/sdo/tools/src/test/java/com/example/sequences/MixedRepeatingChoice.java Wed Feb 21 04:49:54 2007
@@ -1,8 +1,21 @@
 /**
- * <copyright>
- * </copyright>
  *
- * $Id$
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
  */
 package com.example.sequences;
 
@@ -12,7 +25,6 @@
 
 import java.util.List;
 
-  // EYECATCHER 1
 /**
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Mixed Repeating Choice</b></em>'.
@@ -21,13 +33,9 @@
  * <p>
  * The following features are supported:
  * <ul>
-// debug EYECATCHER 2
  *   <li>{@link com.example.sequences.MixedRepeatingChoice#getMixed <em>Mixed</em>}</li>
-// debug EYECATCHER 2
  *   <li>{@link com.example.sequences.MixedRepeatingChoice#getGroup <em>Group</em>}</li>
-// debug EYECATCHER 2
  *   <li>{@link com.example.sequences.MixedRepeatingChoice#getA <em>A</em>}</li>
-// debug EYECATCHER 2
  *   <li>{@link com.example.sequences.MixedRepeatingChoice#getB <em>B</em>}</li>
  * </ul>
  * </p>

Modified: incubator/tuscany/java/sdo/tools/src/test/java/com/example/sequences/RepeatingChoice.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/tools/src/test/java/com/example/sequences/RepeatingChoice.java?view=diff&rev=509986&r1=509985&r2=509986
==============================================================================
--- incubator/tuscany/java/sdo/tools/src/test/java/com/example/sequences/RepeatingChoice.java (original)
+++ incubator/tuscany/java/sdo/tools/src/test/java/com/example/sequences/RepeatingChoice.java Wed Feb 21 04:49:54 2007
@@ -1,8 +1,21 @@
 /**
- * <copyright>
- * </copyright>
  *
- * $Id$
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
  */
 package com.example.sequences;
 
@@ -12,7 +25,6 @@
 
 import java.util.List;
 
-  // EYECATCHER 1
 /**
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Repeating Choice</b></em>'.
@@ -21,11 +33,8 @@
  * <p>
  * The following features are supported:
  * <ul>
-// debug EYECATCHER 2
  *   <li>{@link com.example.sequences.RepeatingChoice#getGroup <em>Group</em>}</li>
-// debug EYECATCHER 2
  *   <li>{@link com.example.sequences.RepeatingChoice#getA <em>A</em>}</li>
-// debug EYECATCHER 2
  *   <li>{@link com.example.sequences.RepeatingChoice#getB <em>B</em>}</li>
  * </ul>
  * </p>

Modified: incubator/tuscany/java/sdo/tools/src/test/java/com/example/sequences/SequencesFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/tools/src/test/java/com/example/sequences/SequencesFactory.java?view=diff&rev=509986&r1=509985&r2=509986
==============================================================================
--- incubator/tuscany/java/sdo/tools/src/test/java/com/example/sequences/SequencesFactory.java (original)
+++ incubator/tuscany/java/sdo/tools/src/test/java/com/example/sequences/SequencesFactory.java Wed Feb 21 04:49:54 2007
@@ -1,8 +1,21 @@
 /**
- * <copyright>
- * </copyright>
  *
- * $Id$
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
  */
 package com.example.sequences;
 

Modified: incubator/tuscany/java/sdo/tools/src/test/java/com/example/sequences/TwoRCs.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/tools/src/test/java/com/example/sequences/TwoRCs.java?view=diff&rev=509986&r1=509985&r2=509986
==============================================================================
--- incubator/tuscany/java/sdo/tools/src/test/java/com/example/sequences/TwoRCs.java (original)
+++ incubator/tuscany/java/sdo/tools/src/test/java/com/example/sequences/TwoRCs.java Wed Feb 21 04:49:54 2007
@@ -1,8 +1,21 @@
 /**
- * <copyright>
- * </copyright>
  *
- * $Id$
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
  */
 package com.example.sequences;
 
@@ -12,7 +25,6 @@
 
 import java.util.List;
 
-  // EYECATCHER 1
 /**
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Two RCs</b></em>'.
@@ -21,19 +33,12 @@
  * <p>
  * The following features are supported:
  * <ul>
-// debug EYECATCHER 2
  *   <li>{@link com.example.sequences.TwoRCs#getGroup <em>Group</em>}</li>
-// debug EYECATCHER 2
  *   <li>{@link com.example.sequences.TwoRCs#getA <em>A</em>}</li>
-// debug EYECATCHER 2
  *   <li>{@link com.example.sequences.TwoRCs#getB <em>B</em>}</li>
-// debug EYECATCHER 2
  *   <li>{@link com.example.sequences.TwoRCs#getSplit <em>Split</em>}</li>
-// debug EYECATCHER 2
  *   <li>{@link com.example.sequences.TwoRCs#getGroup1 <em>Group1</em>}</li>
-// debug EYECATCHER 2
  *   <li>{@link com.example.sequences.TwoRCs#getY <em>Y</em>}</li>
-// debug EYECATCHER 2
  *   <li>{@link com.example.sequences.TwoRCs#getZ <em>Z</em>}</li>
  * </ul>
  * </p>

Modified: incubator/tuscany/java/sdo/tools/src/test/java/com/example/sequences/TwoRCsMixed.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/tools/src/test/java/com/example/sequences/TwoRCsMixed.java?view=diff&rev=509986&r1=509985&r2=509986
==============================================================================
--- incubator/tuscany/java/sdo/tools/src/test/java/com/example/sequences/TwoRCsMixed.java (original)
+++ incubator/tuscany/java/sdo/tools/src/test/java/com/example/sequences/TwoRCsMixed.java Wed Feb 21 04:49:54 2007
@@ -1,8 +1,21 @@
 /**
- * <copyright>
- * </copyright>
  *
- * $Id$
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
  */
 package com.example.sequences;
 
@@ -12,7 +25,6 @@
 
 import java.util.List;
 
-  // EYECATCHER 1
 /**
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Two RCs Mixed</b></em>'.
@@ -21,21 +33,13 @@
  * <p>
  * The following features are supported:
  * <ul>
-// debug EYECATCHER 2
  *   <li>{@link com.example.sequences.TwoRCsMixed#getMixed <em>Mixed</em>}</li>
-// debug EYECATCHER 2
  *   <li>{@link com.example.sequences.TwoRCsMixed#getGroup <em>Group</em>}</li>
-// debug EYECATCHER 2
  *   <li>{@link com.example.sequences.TwoRCsMixed#getA <em>A</em>}</li>
-// debug EYECATCHER 2
  *   <li>{@link com.example.sequences.TwoRCsMixed#getB <em>B</em>}</li>
-// debug EYECATCHER 2
  *   <li>{@link com.example.sequences.TwoRCsMixed#getSplit <em>Split</em>}</li>
-// debug EYECATCHER 2
  *   <li>{@link com.example.sequences.TwoRCsMixed#getGroup1 <em>Group1</em>}</li>
-// debug EYECATCHER 2
  *   <li>{@link com.example.sequences.TwoRCsMixed#getY <em>Y</em>}</li>
-// debug EYECATCHER 2
  *   <li>{@link com.example.sequences.TwoRCsMixed#getZ <em>Z</em>}</li>
  * </ul>
  * </p>

Modified: incubator/tuscany/java/sdo/tools/src/test/java/com/example/sequences/impl/MixedQuoteImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/tools/src/test/java/com/example/sequences/impl/MixedQuoteImpl.java?view=diff&rev=509986&r1=509985&r2=509986
==============================================================================
--- incubator/tuscany/java/sdo/tools/src/test/java/com/example/sequences/impl/MixedQuoteImpl.java (original)
+++ incubator/tuscany/java/sdo/tools/src/test/java/com/example/sequences/impl/MixedQuoteImpl.java Wed Feb 21 04:49:54 2007
@@ -1,8 +1,21 @@
 /**
- * <copyright>
- * </copyright>
  *
- * $Id$
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
  */
 package com.example.sequences.impl;
 
@@ -19,7 +32,6 @@
 
 import org.apache.tuscany.sdo.impl.DataObjectBase;
 
-  // EYECATCHER 1
 /**
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>Mixed Quote</b></em>'.
@@ -44,149 +56,105 @@
  */
 public class MixedQuoteImpl extends DataObjectBase implements MixedQuote
 {
-
-  public final static int MIXED = -1;
-
-  public final static int SYMBOL = 0;
-
-  public final static int COMPANY_NAME = 1;
-
-  public final static int PRICE = 2;
-
-  public final static int OPEN1 = 3;
-
-  public final static int HIGH = 4;
-
-  public final static int LOW = 5;
-
-  public final static int VOLUME = 6;
-
-  public final static int CHANGE1 = 7;
-
-  public final static int QUOTES = 8;
-
-  public final static int SDO_PROPERTY_COUNT = 9;
-
-  public final static int EXTENDED_PROPERTY_COUNT = -1;
-
-
   /**
-   * The internal feature id for the '<em><b>Mixed</b></em>' attribute list.
+   * The feature id for the '<em><b>Mixed</b></em>' attribute list.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @generated
    * @ordered
-   */ 
-  public final static int INTERNAL_MIXED = 0;
+   */	 
+  public final static int MIXED = 0;
 
   /**
-   * The internal feature id for the '<em><b>Symbol</b></em>' attribute.
+   * The feature id for the '<em><b>Symbol</b></em>' attribute.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @generated
    * @ordered
-   */ 
-  public final static int INTERNAL_SYMBOL = 1;
+   */	 
+  public final static int SYMBOL = 1;
 
   /**
-   * The internal feature id for the '<em><b>Company Name</b></em>' attribute.
+   * The feature id for the '<em><b>Company Name</b></em>' attribute.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @generated
    * @ordered
-   */ 
-  public final static int INTERNAL_COMPANY_NAME = 2;
+   */	 
+  public final static int COMPANY_NAME = 2;
 
   /**
-   * The internal feature id for the '<em><b>Price</b></em>' attribute.
+   * The feature id for the '<em><b>Price</b></em>' attribute.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @generated
    * @ordered
-   */ 
-  public final static int INTERNAL_PRICE = 3;
+   */	 
+  public final static int PRICE = 3;
 
   /**
-   * The internal feature id for the '<em><b>Open1</b></em>' attribute.
+   * The feature id for the '<em><b>Open1</b></em>' attribute.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @generated
    * @ordered
-   */ 
-  public final static int INTERNAL_OPEN1 = 4;
+   */	 
+  public final static int OPEN1 = 4;
 
   /**
-   * The internal feature id for the '<em><b>High</b></em>' attribute.
+   * The feature id for the '<em><b>High</b></em>' attribute.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @generated
    * @ordered
-   */ 
-  public final static int INTERNAL_HIGH = 5;
+   */	 
+  public final static int HIGH = 5;
 
   /**
-   * The internal feature id for the '<em><b>Low</b></em>' attribute.
+   * The feature id for the '<em><b>Low</b></em>' attribute.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @generated
    * @ordered
-   */ 
-  public final static int INTERNAL_LOW = 6;
+   */	 
+  public final static int LOW = 6;
 
   /**
-   * The internal feature id for the '<em><b>Volume</b></em>' attribute.
+   * The feature id for the '<em><b>Volume</b></em>' attribute.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @generated
    * @ordered
-   */ 
-  public final static int INTERNAL_VOLUME = 7;
+   */	 
+  public final static int VOLUME = 7;
 
   /**
-   * The internal feature id for the '<em><b>Change1</b></em>' attribute.
+   * The feature id for the '<em><b>Change1</b></em>' attribute.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @generated
    * @ordered
-   */ 
-  public final static int INTERNAL_CHANGE1 = 8;
+   */	 
+  public final static int CHANGE1 = 8;
 
   /**
-   * The internal feature id for the '<em><b>Quotes</b></em>' containment reference list.
+   * The feature id for the '<em><b>Quotes</b></em>' containment reference list.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @generated
    * @ordered
-   */ 
-  public final static int INTERNAL_QUOTES = 9;
+   */	 
+  public final static int QUOTES = 9;
 
   /**
-   * The number of properties for this type.
+   * This represents the number of properties for this type.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @generated
    * @ordered
    */
-  public final static int INTERNAL_PROPERTY_COUNT = 10;
-
-  protected int internalConvertIndex(int internalIndex)
-  {
-    switch (internalIndex)
-    {
-      case INTERNAL_MIXED: return MIXED;
-      case INTERNAL_SYMBOL: return SYMBOL;
-      case INTERNAL_COMPANY_NAME: return COMPANY_NAME;
-      case INTERNAL_PRICE: return PRICE;
-      case INTERNAL_OPEN1: return OPEN1;
-      case INTERNAL_HIGH: return HIGH;
-      case INTERNAL_LOW: return LOW;
-      case INTERNAL_VOLUME: return VOLUME;
-      case INTERNAL_CHANGE1: return CHANGE1;
-      case INTERNAL_QUOTES: return QUOTES;
-    }
-    return super.internalConvertIndex(internalIndex);
-  }
-
+  
+  public final static int SDO_PROPERTY_COUNT = 10;
 
   /**
    * The cached value of the '{@link #getMixed() <em>Mixed</em>}' attribute list.
@@ -288,7 +256,7 @@
   {
     if (mixed == null)
     {
-      mixed = createSequence(INTERNAL_MIXED);
+      mixed = createSequence(MIXED);
     }
     return mixed;
   }
@@ -299,7 +267,7 @@
    */
   public String getSymbol()
   {
-    return (String)get(getMixed(), getType(), INTERNAL_SYMBOL);
+    return (String)get(getMixed(), getType(), SYMBOL);
   }
   /**
    * <!-- begin-user-doc -->
@@ -308,7 +276,7 @@
    */
   public void setSymbol(String newSymbol)
   {
-    set(getMixed(), getType(), INTERNAL_SYMBOL, newSymbol);
+    set(getMixed(), getType(), SYMBOL, newSymbol);
   }
 
   /**
@@ -318,7 +286,7 @@
    */
   public String getCompanyName()
   {
-    return (String)get(getMixed(), getType(), INTERNAL_COMPANY_NAME);
+    return (String)get(getMixed(), getType(), COMPANY_NAME);
   }
   /**
    * <!-- begin-user-doc -->
@@ -327,7 +295,7 @@
    */
   public void setCompanyName(String newCompanyName)
   {
-    set(getMixed(), getType(), INTERNAL_COMPANY_NAME, newCompanyName);
+    set(getMixed(), getType(), COMPANY_NAME, newCompanyName);
   }
 
   /**
@@ -337,7 +305,7 @@
    */
   public BigDecimal getPrice()
   {
-    return (BigDecimal)get(getMixed(), getType(), INTERNAL_PRICE);
+    return (BigDecimal)get(getMixed(), getType(), PRICE);
   }
   /**
    * <!-- begin-user-doc -->
@@ -346,7 +314,7 @@
    */
   public void setPrice(BigDecimal newPrice)
   {
-    set(getMixed(), getType(), INTERNAL_PRICE, newPrice);
+    set(getMixed(), getType(), PRICE, newPrice);
   }
 
   /**
@@ -356,7 +324,7 @@
    */
   public BigDecimal getOpen1()
   {
-    return (BigDecimal)get(getMixed(), getType(), INTERNAL_OPEN1);
+    return (BigDecimal)get(getMixed(), getType(), OPEN1);
   }
   /**
    * <!-- begin-user-doc -->
@@ -365,7 +333,7 @@
    */
   public void setOpen1(BigDecimal newOpen1)
   {
-    set(getMixed(), getType(), INTERNAL_OPEN1, newOpen1);
+    set(getMixed(), getType(), OPEN1, newOpen1);
   }
 
   /**
@@ -375,7 +343,7 @@
    */
   public BigDecimal getHigh()
   {
-    return (BigDecimal)get(getMixed(), getType(), INTERNAL_HIGH);
+    return (BigDecimal)get(getMixed(), getType(), HIGH);
   }
   /**
    * <!-- begin-user-doc -->
@@ -384,7 +352,7 @@
    */
   public void setHigh(BigDecimal newHigh)
   {
-    set(getMixed(), getType(), INTERNAL_HIGH, newHigh);
+    set(getMixed(), getType(), HIGH, newHigh);
   }
 
   /**
@@ -394,7 +362,7 @@
    */
   public BigDecimal getLow()
   {
-    return (BigDecimal)get(getMixed(), getType(), INTERNAL_LOW);
+    return (BigDecimal)get(getMixed(), getType(), LOW);
   }
   /**
    * <!-- begin-user-doc -->
@@ -403,7 +371,7 @@
    */
   public void setLow(BigDecimal newLow)
   {
-    set(getMixed(), getType(), INTERNAL_LOW, newLow);
+    set(getMixed(), getType(), LOW, newLow);
   }
 
   /**
@@ -413,7 +381,7 @@
    */
   public double getVolume()
   {
-    return ((Double)get(getMixed(), getType(), INTERNAL_VOLUME)).doubleValue();
+    return ((Double)get(getMixed(), getType(), VOLUME)).doubleValue();
   }
   /**
    * <!-- begin-user-doc -->
@@ -422,7 +390,7 @@
    */
   public void setVolume(double newVolume)
   {
-    set(getMixed(), getType(), INTERNAL_VOLUME,  new Double(newVolume));
+    set(getMixed(), getType(), VOLUME,  new Double(newVolume));
   }
 
   /**
@@ -452,7 +420,7 @@
    */
   public double getChange1()
   {
-    return ((Double)get(getMixed(), getType(), INTERNAL_CHANGE1)).doubleValue();
+    return ((Double)get(getMixed(), getType(), CHANGE1)).doubleValue();
   }
   /**
    * <!-- begin-user-doc -->
@@ -461,7 +429,7 @@
    */
   public void setChange1(double newChange1)
   {
-    set(getMixed(), getType(), INTERNAL_CHANGE1,  new Double(newChange1));
+    set(getMixed(), getType(), CHANGE1,  new Double(newChange1));
   }
 
   /**



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org


Mime
View raw message