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 2006/11/18 23:15:23 UTC

svn commit: r476622 [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/ tools/src/main/java/org/apache/tuscany/sdo/generate/templates/model/ tools/src/main/java/org/a...

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=476622&r1=476621&r2=476622
==============================================================================
--- 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 Sat Nov 18 14:15:22 2006
@@ -69,144 +69,144 @@
   protected final String TEXT_48 = ")create";
   protected final String TEXT_49 = "();";
   protected final String TEXT_50 = NL + "\t\t\tdefault:" + NL + "\t\t\t\treturn super.create(typeNumber);" + NL + "\t\t}" + NL + "\t}" + NL;
-  protected final String TEXT_51 = NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic Object createFromString(";
-  protected final String TEXT_52 = " type, String initialValue, int propertyValue)" + NL + "\t{" + NL + "\t\tswitch (propertyValue)" + NL + "\t\t{";
-  protected final String TEXT_53 = NL + "\t\t\tcase ";
-  protected final String TEXT_54 = ":" + NL + "\t\t\t\treturn create";
-  protected final String TEXT_55 = "FromString(type, initialValue);";
-  protected final String TEXT_56 = NL + "\t\t\tdefault:" + NL + "\t\t\t\tthrow new IllegalArgumentException(\"The datatype '\" + type.getName() + \"' is not a valid property value\");";
-  protected final String TEXT_57 = NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic String convertToString(";
-  protected final String TEXT_58 = " type, Object instanceValue, int propertyValue)" + NL + "\t{" + NL + "\t\tswitch (propertyValue)" + NL + "\t\t{";
-  protected final String TEXT_59 = NL + "\t\t\tcase ";
-  protected final String TEXT_60 = ":" + NL + "\t\t\t\treturn convert";
-  protected final String TEXT_61 = "ToString(type, instanceValue);";
-  protected final String TEXT_62 = NL + "\t\t\tdefault:" + NL + "\t\t\t\tthrow new IllegalArgumentException(\"The datatype '\" + type.getName() + \"' is not a valid property value\");";
-  protected final String TEXT_63 = NL + "\t\t}" + NL + "\t}";
-  protected final String TEXT_64 = NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic ";
-  protected final String TEXT_65 = " create";
-  protected final String TEXT_66 = "()" + NL + "\t{";
-  protected final String TEXT_67 = NL + "\t\t";
-  protected final String TEXT_68 = " ";
-  protected final String TEXT_69 = " = ";
-  protected final String TEXT_70 = "super.create(";
-  protected final String TEXT_71 = ");";
-  protected final String TEXT_72 = NL + "\t\t";
-  protected final String TEXT_73 = " ";
-  protected final String TEXT_74 = " = new ";
-  protected final String TEXT_75 = "()";
-  protected final String TEXT_76 = "{}";
-  protected final String TEXT_77 = ";";
-  protected final String TEXT_78 = NL + "\t\treturn ";
-  protected final String TEXT_79 = ";" + NL + "\t}";
-  protected final String TEXT_80 = NL + "\t" + NL + "\t// Following creates and initializes SDO metadata for the supported types.";
-  protected final String TEXT_81 = "\t";
-  protected final String TEXT_82 = "\t" + NL + "\tprotected ";
-  protected final String TEXT_83 = " ";
-  protected final String TEXT_84 = "Type = null;" + NL + "" + NL + "\tpublic ";
-  protected final String TEXT_85 = " get";
-  protected final String TEXT_86 = "()" + NL + "\t{" + NL + "\t\treturn ";
-  protected final String TEXT_87 = "Type;" + NL + "\t}" + NL;
-  protected final String TEXT_88 = "\t" + NL + "" + NL + "\tprivate static boolean isInited = false;" + NL + "" + NL + "\tpublic static ";
-  protected final String TEXT_89 = " init()" + NL + "\t{" + NL + "\t\tif (isInited) return (";
-  protected final String TEXT_90 = ")FactoryBase.getStaticFactory(";
-  protected final String TEXT_91 = ".NAMESPACE_URI);" + NL + "\t\t";
-  protected final String TEXT_92 = " the";
-  protected final String TEXT_93 = " = new ";
-  protected final String TEXT_94 = "();" + NL + "\t\tisInited = true;" + NL + "" + NL + "\t\t// Initialize simple dependencies";
-  protected final String TEXT_95 = NL + "\t\t";
-  protected final String TEXT_96 = ".registerStaticTypes(";
-  protected final String TEXT_97 = ".class);";
-  protected final String TEXT_98 = NL + NL + "\t\t// Create package meta-data objects" + NL + "\t\tthe";
-  protected final String TEXT_99 = ".createMetaData();" + NL + "" + NL + "\t\t// Initialize created meta-data" + NL + "\t\tthe";
-  protected final String TEXT_100 = ".initializeMetaData();" + NL + "" + NL + "\t\t// Mark meta-data to indicate it can't be changed" + NL + "\t\t//the";
-  protected final String TEXT_101 = ".freeze(); //FB do we need to freeze / should we freeze ????" + NL + "" + NL + "\t\treturn the";
-  protected final String TEXT_102 = ";" + NL + "\t}" + NL + "  " + NL + "\tprivate boolean isCreated = false;" + NL + "" + NL + "\tpublic void createMetaData()" + NL + "\t{" + NL + "\t\tif (isCreated) return;" + NL + "\t\tisCreated = true;";
-  protected final String TEXT_103 = "\t";
-  protected final String TEXT_104 = NL;
-  protected final String TEXT_105 = NL + "\t\t";
-  protected final String TEXT_106 = "Type = createType(false, ";
-  protected final String TEXT_107 = ");";
-  protected final String TEXT_108 = NL + "\t\tcreateProperty(";
-  protected final String TEXT_109 = ", ";
-  protected final String TEXT_110 = "Type, ";
-  protected final String TEXT_111 = ".";
-  protected final String TEXT_112 = ");";
-  protected final String TEXT_113 = NL + "\t\t// Create enums" + NL + "\t\t// todo";
-  protected final String TEXT_114 = NL + "\t\t";
-  protected final String TEXT_115 = " = createEEnum(";
-  protected final String TEXT_116 = ");";
-  protected final String TEXT_117 = NL + "\t\t";
-  protected final String TEXT_118 = "Type = createType(true, ";
-  protected final String TEXT_119 = " );";
-  protected final String TEXT_120 = 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_121 = NL + NL + "\t\t// Obtain other dependent packages";
-  protected final String TEXT_122 = NL + "\t\t";
-  protected final String TEXT_123 = " ";
-  protected final String TEXT_124 = " = (";
-  protected final String TEXT_125 = ")FactoryBase.getStaticFactory(";
-  protected final String TEXT_126 = ".NAMESPACE_URI);";
-  protected final String TEXT_127 = NL + "\t\t";
-  protected final String TEXT_128 = " property = null;" + NL + "" + NL + "\t\t// Add supertypes to classes";
-  protected final String TEXT_129 = NL + "\t\taddSuperType(";
-  protected final String TEXT_130 = "Type, ";
-  protected final String TEXT_131 = "Type);";
-  protected final String TEXT_132 = NL + NL + "\t\t// Initialize classes and features; add operations and parameters";
-  protected final String TEXT_133 = NL + "\t\tinitializeType(";
-  protected final String TEXT_134 = "Type, ";
-  protected final String TEXT_135 = ".class, \"";
-  protected final String TEXT_136 = "\");";
-  protected final String TEXT_137 = NL + "\t\tsetInstanceProperty (";
-  protected final String TEXT_138 = "Type, \"";
-  protected final String TEXT_139 = "\", ";
-  protected final String TEXT_140 = ", ";
-  protected final String TEXT_141 = ");";
-  protected final String TEXT_142 = NL;
-  protected final String TEXT_143 = NL + "\t\tproperty = (";
-  protected final String TEXT_144 = ")";
-  protected final String TEXT_145 = "Type.getProperties().get(";
-  protected final String TEXT_146 = ".";
-  protected final String TEXT_147 = ");";
-  protected final String TEXT_148 = NL + "\t\tinitializeProperty(property, ";
-  protected final String TEXT_149 = ", \"";
-  protected final String TEXT_150 = "\", ";
+  protected final String TEXT_51 = NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic Object createFromString(int typeNumber, String initialValue)" + NL + "\t{" + NL + "\t\tswitch (typeNumber)" + NL + "\t\t{";
+  protected final String TEXT_52 = NL + "\t\t\tcase ";
+  protected final String TEXT_53 = ":" + NL + "\t\t\t\treturn create";
+  protected final String TEXT_54 = "FromString(initialValue);";
+  protected final String TEXT_55 = NL + "\t\t\tdefault:" + NL + "\t\t\t\tthrow new IllegalArgumentException(\"The type number '\" + typeNumber + \"' is not a valid datatype\");";
+  protected final String TEXT_56 = NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic String convertToString(int typeNumber, Object instanceValue)" + NL + "\t{" + NL + "\t\tswitch (typeNumber)" + NL + "\t\t{";
+  protected final String TEXT_57 = NL + "\t\t\tcase ";
+  protected final String TEXT_58 = ":" + NL + "\t\t\t\treturn convert";
+  protected final String TEXT_59 = "ToString(instanceValue);";
+  protected final String TEXT_60 = NL + "\t\t\tdefault:" + NL + "\t\t\t\tthrow new IllegalArgumentException(\"The type number '\" + typeNumber + \"' is not a valid datatype\");";
+  protected final String TEXT_61 = NL + "\t\t}" + NL + "\t}";
+  protected final String TEXT_62 = NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic ";
+  protected final String TEXT_63 = " create";
+  protected final String TEXT_64 = "()" + NL + "\t{";
+  protected final String TEXT_65 = NL + "\t\t";
+  protected final String TEXT_66 = " ";
+  protected final String TEXT_67 = " = ";
+  protected final String TEXT_68 = "super.create(";
+  protected final String TEXT_69 = ");";
+  protected final String TEXT_70 = NL + "\t\t";
+  protected final String TEXT_71 = " ";
+  protected final String TEXT_72 = " = new ";
+  protected final String TEXT_73 = "()";
+  protected final String TEXT_74 = "{}";
+  protected final String TEXT_75 = ";";
+  protected final String TEXT_76 = NL + "\t\treturn ";
+  protected final String TEXT_77 = ";" + NL + "\t}";
+  protected final String TEXT_78 = NL + "\t" + NL + "\t// Following creates and initializes SDO metadata for the supported types.";
+  protected final String TEXT_79 = "\t";
+  protected final String TEXT_80 = "\t" + NL + "\tprotected ";
+  protected final String TEXT_81 = " ";
+  protected final String TEXT_82 = "Type = null;" + NL + "" + NL + "\tpublic ";
+  protected final String TEXT_83 = " get";
+  protected final String TEXT_84 = "()" + NL + "\t{" + NL + "\t\treturn ";
+  protected final String TEXT_85 = "Type;" + NL + "\t}" + NL;
+  protected final String TEXT_86 = "\t" + NL + "" + NL + "\tprivate static boolean isInited = false;" + NL + "" + NL + "\tpublic static ";
+  protected final String TEXT_87 = " init()" + NL + "\t{" + NL + "\t\tif (isInited) return (";
+  protected final String TEXT_88 = ")FactoryBase.getStaticFactory(";
+  protected final String TEXT_89 = ".NAMESPACE_URI);" + NL + "\t\t";
+  protected final String TEXT_90 = " the";
+  protected final String TEXT_91 = " = new ";
+  protected final String TEXT_92 = "();" + NL + "\t\tisInited = true;" + NL + "" + NL + "\t\t// Initialize simple dependencies";
+  protected final String TEXT_93 = NL + "\t\t";
+  protected final String TEXT_94 = ".registerStaticTypes(";
+  protected final String TEXT_95 = ".class);";
+  protected final String TEXT_96 = NL + NL + "\t\t// Create package meta-data objects" + NL + "\t\tthe";
+  protected final String TEXT_97 = ".createMetaData();" + NL + "" + NL + "\t\t// Initialize created meta-data" + NL + "\t\tthe";
+  protected final String TEXT_98 = ".initializeMetaData();" + NL + "" + NL + "\t\t// Mark meta-data to indicate it can't be changed" + NL + "\t\t//the";
+  protected final String TEXT_99 = ".freeze(); //FB do we need to freeze / should we freeze ????" + NL + "" + NL + "\t\treturn the";
+  protected final String TEXT_100 = ";" + NL + "\t}" + NL + "  " + NL + "\tprivate boolean isCreated = false;" + NL + "" + NL + "\tpublic void createMetaData()" + NL + "\t{" + NL + "\t\tif (isCreated) return;" + NL + "\t\tisCreated = true;";
+  protected final String TEXT_101 = "\t";
+  protected final String TEXT_102 = NL;
+  protected final String TEXT_103 = NL + "\t\t";
+  protected final String TEXT_104 = "Type = createType(false, ";
+  protected final String TEXT_105 = ");";
+  protected final String TEXT_106 = NL + "\t\tcreateProperty(";
+  protected final String TEXT_107 = ", ";
+  protected final String TEXT_108 = "Type, ";
+  protected final String TEXT_109 = ".";
+  protected final String TEXT_110 = ");";
+  protected final String TEXT_111 = NL + "\t\t// Create enums" + NL + "\t\t// todo";
+  protected final String TEXT_112 = NL + "\t\t";
+  protected final String TEXT_113 = " = createEEnum(";
+  protected final String TEXT_114 = ");";
+  protected final String TEXT_115 = NL + "\t\t";
+  protected final String TEXT_116 = "Type = createType(true, ";
+  protected final String TEXT_117 = " );";
+  protected final String TEXT_118 = 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_119 = NL + NL + "\t\t// Obtain other dependent packages";
+  protected final String TEXT_120 = NL + "\t\t";
+  protected final String TEXT_121 = " ";
+  protected final String TEXT_122 = " = (";
+  protected final String TEXT_123 = ")FactoryBase.getStaticFactory(";
+  protected final String TEXT_124 = ".NAMESPACE_URI);";
+  protected final String TEXT_125 = NL + "\t\t";
+  protected final String TEXT_126 = " property = null;" + NL + "" + NL + "\t\t// Add supertypes to classes";
+  protected final String TEXT_127 = NL + "\t\taddSuperType(";
+  protected final String TEXT_128 = "Type, ";
+  protected final String TEXT_129 = "Type);";
+  protected final String TEXT_130 = NL + NL + "\t\t// Initialize classes and features; add operations and parameters";
+  protected final String TEXT_131 = NL + "\t\tinitializeType(";
+  protected final String TEXT_132 = "Type, ";
+  protected final String TEXT_133 = ".class, \"";
+  protected final String TEXT_134 = "\");";
+  protected final String TEXT_135 = NL + "\t\tsetInstanceProperty (";
+  protected final String TEXT_136 = "Type, \"";
+  protected final String TEXT_137 = "\", ";
+  protected final String TEXT_138 = ", ";
+  protected final String TEXT_139 = ");";
+  protected final String TEXT_140 = NL;
+  protected final String TEXT_141 = NL + "\t\tproperty = (";
+  protected final String TEXT_142 = ")";
+  protected final String TEXT_143 = "Type.getProperties().get(";
+  protected final String TEXT_144 = ".";
+  protected final String TEXT_145 = ");";
+  protected final String TEXT_146 = NL + "\t\tinitializeProperty(property, ";
+  protected final String TEXT_147 = ", \"";
+  protected final String TEXT_148 = "\", ";
+  protected final String TEXT_149 = ", ";
+  protected final String TEXT_150 = ", ";
   protected final String TEXT_151 = ", ";
   protected final String TEXT_152 = ", ";
   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 = NL + "\t\tinitializeProperty(property, ";
-  protected final String TEXT_161 = ", \"";
-  protected final String TEXT_162 = "\", ";
+  protected final String TEXT_156 = " , ";
+  protected final String TEXT_157 = ");";
+  protected final String TEXT_158 = NL + "\t\tinitializeProperty(property, ";
+  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 = ", ";
   protected final String TEXT_164 = ", ";
   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 = NL + "\t\tsetInstanceProperty (property, \"";
-  protected final String TEXT_171 = "\", ";
-  protected final String TEXT_172 = ", ";
-  protected final String TEXT_173 = ");";
-  protected final String TEXT_174 = NL;
-  protected final String TEXT_175 = NL + "\t\t// Initialize data types";
-  protected final String TEXT_176 = NL + "\t\tinitializeType(";
-  protected final String TEXT_177 = "Type, ";
-  protected final String TEXT_178 = ".class, \"";
-  protected final String TEXT_179 = "\", ";
-  protected final String TEXT_180 = ", ";
-  protected final String TEXT_181 = ");";
-  protected final String TEXT_182 = NL + "\t\tsetInstanceProperty (";
-  protected final String TEXT_183 = "Type, \"";
-  protected final String TEXT_184 = "\", ";
-  protected final String TEXT_185 = ", ";
-  protected final String TEXT_186 = ");";
-  protected final String TEXT_187 = NL;
-  protected final String TEXT_188 = NL + "\t\tcreateXSDMetaData(theModelPackageImpl);" + NL + "\t}" + NL + "\t  " + NL + "\tprotected void createXSDMetaData(ModelFactoryImpl theModelPackageImpl)" + NL + "\t{" + NL + "\t\tsuper.createXSDMetaData();" + NL + "\t\t" + NL + "\t\t";
+  protected final String TEXT_167 = ");";
+  protected final String TEXT_168 = NL + "\t\tsetInstanceProperty (property, \"";
+  protected final String TEXT_169 = "\", ";
+  protected final String TEXT_170 = ", ";
+  protected final String TEXT_171 = ");";
+  protected final String TEXT_172 = NL;
+  protected final String TEXT_173 = NL + "\t\t// Initialize data types";
+  protected final String TEXT_174 = NL + "\t\tinitializeType(";
+  protected final String TEXT_175 = "Type, ";
+  protected final String TEXT_176 = ".class, \"";
+  protected final String TEXT_177 = "\", ";
+  protected final String TEXT_178 = ", ";
+  protected final String TEXT_179 = ");";
+  protected final String TEXT_180 = NL + "\t\tsetInstanceProperty (";
+  protected final String TEXT_181 = "Type, \"";
+  protected final String TEXT_182 = "\", ";
+  protected final String TEXT_183 = ", ";
+  protected final String TEXT_184 = ");";
+  protected final String TEXT_185 = NL;
+  protected final String TEXT_186 = NL + "\t\tcreateXSDMetaData(";
+  protected final String TEXT_187 = ");" + NL + "\t}" + NL + "\t  " + NL + "\tprotected void createXSDMetaData(";
+  protected final String TEXT_188 = ")" + NL + "\t{" + NL + "\t\tsuper.createXSDMetaData();" + NL + "\t\t" + NL + "\t\t";
   protected final String TEXT_189 = " property = null;" + NL + "\t\t";
   protected final String TEXT_190 = NL + "\t\taddXSDMapping" + NL + "\t\t  (new String[]" + NL + "\t\t\t {";
   protected final String TEXT_191 = NL + "\t\t\t ";
@@ -243,275 +243,96 @@
   protected final String TEXT_222 = NL + "  }" + NL + "  ";
   protected final String TEXT_223 = NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic ";
   protected final String TEXT_224 = " create";
-  protected final String TEXT_225 = "(String literal)" + NL + "\t{";
+  protected final String TEXT_225 = "FromString(String initialValue)" + NL + "\t{";
   protected final String TEXT_226 = NL + "\t\t";
   protected final String TEXT_227 = " result = ";
-  protected final String TEXT_228 = ".get(literal);" + NL + "\t\tif (result == null) throw new IllegalArgumentException(\"The value '\" + literal + \"' is not a valid enumerator of '\" + ";
-  protected final String TEXT_229 = ".getName() + \"'\");";
-  protected final String TEXT_230 = NL + "\t\treturn result;";
-  protected final String TEXT_231 = NL + "\t\treturn new ";
-  protected final String TEXT_232 = "(create";
-  protected final String TEXT_233 = "(literal));";
-  protected final String TEXT_234 = NL + "\t\treturn create";
-  protected final String TEXT_235 = "(literal);";
-  protected final String TEXT_236 = NL + "\t\treturn new ";
-  protected final String TEXT_237 = "(";
-  protected final String TEXT_238 = ".create";
-  protected final String TEXT_239 = "(literal));";
-  protected final String TEXT_240 = NL + "\t\treturn ";
-  protected final String TEXT_241 = ".create";
-  protected final String TEXT_242 = "(literal);";
-  protected final String TEXT_243 = NL + "\t\treturn (";
-  protected final String TEXT_244 = ")";
-  protected final String TEXT_245 = ".createFromString(";
-  protected final String TEXT_246 = ", literal);";
-  protected final String TEXT_247 = NL + "\t\tif (literal == null) return null;" + NL + "\t\t";
-  protected final String TEXT_248 = " result = new ";
-  protected final String TEXT_249 = "();" + NL + "\t\tfor (";
-  protected final String TEXT_250 = " stringTokenizer = new ";
-  protected final String TEXT_251 = "(literal); stringTokenizer.hasMoreTokens(); )" + NL + "\t\t{" + NL + "\t\t\tString item = stringTokenizer.nextToken();";
-  protected final String TEXT_252 = NL + "\t\t\tresult.add(create";
-  protected final String TEXT_253 = "(item));";
-  protected final String TEXT_254 = NL + "\t\t\tresult.add(create";
-  protected final String TEXT_255 = "FromString(";
-  protected final String TEXT_256 = ", item));";
-  protected final String TEXT_257 = NL + "\t\t\tresult.add(";
-  protected final String TEXT_258 = ".create";
-  protected final String TEXT_259 = "(item));";
-  protected final String TEXT_260 = NL + "\t\t\tresult.add(";
-  protected final String TEXT_261 = ".createFromString(";
-  protected final String TEXT_262 = ", item));";
-  protected final String TEXT_263 = NL + "\t\t}" + NL + "\t\treturn result;";
-  protected final String TEXT_264 = NL + "\t\tif (literal == null) return ";
-  protected final String TEXT_265 = ";" + NL + "\t\t";
-  protected final String TEXT_266 = " result = ";
-  protected final String TEXT_267 = ";" + NL + "\t\tRuntimeException exception = null;";
-  protected final String TEXT_268 = NL + "\t\ttry" + NL + "\t\t{";
-  protected final String TEXT_269 = NL + "\t\t\tresult = create";
-  protected final String TEXT_270 = "(literal);";
-  protected final String TEXT_271 = NL + "\t\t\tresult = (";
-  protected final String TEXT_272 = ")create";
-  protected final String TEXT_273 = "FromString(";
-  protected final String TEXT_274 = ", literal);";
-  protected final String TEXT_275 = NL + "\t\t\tresult = ";
-  protected final String TEXT_276 = ".create";
-  protected final String TEXT_277 = "(literal);";
-  protected final String TEXT_278 = NL + "\t\t\tresult = (";
-  protected final String TEXT_279 = ")";
-  protected final String TEXT_280 = ".createFromString(";
-  protected final String TEXT_281 = ", literal);";
-  protected final String TEXT_282 = NL + "\t\t\tif (";
-  protected final String TEXT_283 = "result != null && ";
-  protected final String TEXT_284 = ".INSTANCE.validate(";
-  protected final String TEXT_285 = ", ";
-  protected final String TEXT_286 = "new ";
-  protected final String TEXT_287 = "(result)";
-  protected final String TEXT_288 = "result";
-  protected final String TEXT_289 = ", 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_290 = NL + "\t\tif (";
-  protected final String TEXT_291 = "result != null || ";
-  protected final String TEXT_292 = "exception == null) return result;" + NL + "    " + NL + "\t\tthrow exception;";
-  protected final String TEXT_293 = 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_294 = "();";
-  protected final String TEXT_295 = NL + "\t\treturn ((";
-  protected final String TEXT_296 = ")super.createFromString(";
-  protected final String TEXT_297 = ", literal)).";
-  protected final String TEXT_298 = "();";
-  protected final String TEXT_299 = NL + "\t\treturn (";
-  protected final String TEXT_300 = ")super.createFromString(";
-  protected final String TEXT_301 = ", literal);";
-  protected final String TEXT_302 = NL + "\t}" + NL;
-  protected final String TEXT_303 = NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic ";
+  protected final String TEXT_228 = ".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_229 = NL + "\t\treturn result;";
+  protected final String TEXT_230 = NL + "\t\treturn (";
+  protected final String TEXT_231 = ")create";
+  protected final String TEXT_232 = "FromString(initialValue);";
+  protected final String TEXT_233 = NL + "\t\treturn (";
+  protected final String TEXT_234 = ")";
+  protected final String TEXT_235 = ".create";
+  protected final String TEXT_236 = "FromString(initialValue);";
+  protected final String TEXT_237 = NL + "\t\tif (initialValue == null) return null;" + NL + "\t\t";
+  protected final String TEXT_238 = " result = new ";
+  protected final String TEXT_239 = "();" + NL + "\t\tfor (";
+  protected final String TEXT_240 = " stringTokenizer = new ";
+  protected final String TEXT_241 = "(initialValue); stringTokenizer.hasMoreTokens(); )" + NL + "\t\t{" + NL + "\t\t\tString item = stringTokenizer.nextToken();";
+  protected final String TEXT_242 = NL + "\t\t\tresult.add(create";
+  protected final String TEXT_243 = "FromString(item));";
+  protected final String TEXT_244 = NL + "\t\t\tresult.add(";
+  protected final String TEXT_245 = ".create";
+  protected final String TEXT_246 = "FromString(item));";
+  protected final String TEXT_247 = NL + "\t\t}" + NL + "\t\treturn result;";
+  protected final String TEXT_248 = NL + "\t\tif (initialValue == null) return null;" + NL + "\t\t";
+  protected final String TEXT_249 = " result = null;" + NL + "\t\tRuntimeException exception = null;";
+  protected final String TEXT_250 = NL + "\t\ttry" + NL + "\t\t{";
+  protected final String TEXT_251 = NL + "\t\t\tresult = (";
+  protected final String TEXT_252 = ")create";
+  protected final String TEXT_253 = "FromString(initialValue);";
+  protected final String TEXT_254 = NL + "\t\t\tresult = (";
+  protected final String TEXT_255 = ")";
+  protected final String TEXT_256 = ".create";
+  protected final String TEXT_257 = "FromString(initialValue);";
+  protected final String TEXT_258 = 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_259 = NL + "\t\tif (result != null || exception == null) return result;" + NL + "    " + NL + "\t\tthrow exception;";
+  protected final String TEXT_260 = 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_261 = "();";
+  protected final String TEXT_262 = NL + "\t\treturn (";
+  protected final String TEXT_263 = ")super.createFromString(";
+  protected final String TEXT_264 = ", initialValue);";
+  protected final String TEXT_265 = 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_266 = "ToString(Object instanceValue)" + NL + "\t{";
+  protected final String TEXT_267 = NL + "\t\treturn instanceValue == null ? null : instanceValue.toString();";
+  protected final String TEXT_268 = NL + "\t\treturn convert";
+  protected final String TEXT_269 = "ToString(instanceValue);";
+  protected final String TEXT_270 = NL + "\t\treturn ";
+  protected final String TEXT_271 = ".convert";
+  protected final String TEXT_272 = "ToString(instanceValue);";
+  protected final String TEXT_273 = NL + "\t\tif (instanceValue == null) return null;" + NL + "\t\t";
+  protected final String TEXT_274 = " list = (";
+  protected final String TEXT_275 = ")instanceValue;" + NL + "\t\tif (list.isEmpty()) return \"\";" + NL + "\t\t";
+  protected final String TEXT_276 = " result = new ";
+  protected final String TEXT_277 = "();" + NL + "\t\tfor (";
+  protected final String TEXT_278 = " i = list.iterator(); i.hasNext(); )" + NL + "\t\t{";
+  protected final String TEXT_279 = NL + "\t\t\tresult.append(convert";
+  protected final String TEXT_280 = "ToString(i.next()));";
+  protected final String TEXT_281 = NL + "\t\t\tresult.append(";
+  protected final String TEXT_282 = ".convert";
+  protected final String TEXT_283 = "ToString(i.next()));";
+  protected final String TEXT_284 = NL + "\t\t\tresult.append(' ');" + NL + "\t\t}" + NL + "\t\treturn result.substring(0, result.length() - 1);";
+  protected final String TEXT_285 = NL + "\t\tif (instanceValue == null) return null;";
+  protected final String TEXT_286 = NL + "\t\tif (";
+  protected final String TEXT_287 = ".isInstance(instanceValue))" + NL + "\t\t{" + NL + "\t\t\ttry" + NL + "\t\t\t{";
+  protected final String TEXT_288 = NL + "\t\t\t\tString value = convert";
+  protected final String TEXT_289 = "ToString(instanceValue);";
+  protected final String TEXT_290 = NL + "\t\t\t\tString value = ";
+  protected final String TEXT_291 = ".convert";
+  protected final String TEXT_292 = "ToString(instanceValue);";
+  protected final String TEXT_293 = 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_294 = NL + "\t\tthrow new IllegalArgumentException(\"Invalid value: '\"+instanceValue+\"' for datatype :";
+  protected final String TEXT_295 = "\");";
+  protected final String TEXT_296 = 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_297 = "();";
+  protected final String TEXT_298 = NL + "\t\treturn super.convertToString(";
+  protected final String TEXT_299 = ", instanceValue);";
+  protected final String TEXT_300 = NL + "\t}" + NL;
+  protected final String TEXT_301 = NL + "\t/**" + NL + "\t * Returns a new object of class '<em>";
+  protected final String TEXT_302 = "</em>'." + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @return a new object of class '<em>";
+  protected final String TEXT_303 = "</em>'." + NL + "\t * @generated" + NL + "\t */" + NL + "\t";
   protected final String TEXT_304 = " create";
-  protected final String TEXT_305 = "FromString(";
-  protected final String TEXT_306 = " type, String initialValue)" + NL + "\t{";
-  protected final String TEXT_307 = NL + "\t\treturn create";
-  protected final String TEXT_308 = "(initialValue);";
-  protected final String TEXT_309 = NL + "\t\t";
-  protected final String TEXT_310 = " result = ";
-  protected final String TEXT_311 = ".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_312 = NL + "\t\treturn result;";
-  protected final String TEXT_313 = NL + "\t\treturn (";
-  protected final String TEXT_314 = ")create";
-  protected final String TEXT_315 = "FromString(";
-  protected final String TEXT_316 = ", initialValue);";
-  protected final String TEXT_317 = NL + "\t\treturn (";
-  protected final String TEXT_318 = ")";
-  protected final String TEXT_319 = ".createFromString(";
-  protected final String TEXT_320 = ", initialValue);";
-  protected final String TEXT_321 = NL + "\t\treturn create";
-  protected final String TEXT_322 = "(initialValue);";
-  protected final String TEXT_323 = NL + "\t\tif (initialValue == null) return null;" + NL + "\t\t";
-  protected final String TEXT_324 = " result = new ";
-  protected final String TEXT_325 = "();" + NL + "\t\tfor (";
-  protected final String TEXT_326 = " stringTokenizer = new ";
-  protected final String TEXT_327 = "(initialValue); stringTokenizer.hasMoreTokens(); )" + NL + "\t\t{" + NL + "\t\t\tString item = stringTokenizer.nextToken();";
-  protected final String TEXT_328 = NL + "\t\t\tresult.add(create";
-  protected final String TEXT_329 = "FromString(";
-  protected final String TEXT_330 = ", item));";
-  protected final String TEXT_331 = NL + "\t\t\tresult.add(";
-  protected final String TEXT_332 = ".createFromString(";
-  protected final String TEXT_333 = ", item));";
-  protected final String TEXT_334 = NL + "\t\t}" + NL + "\t\treturn result;";
-  protected final String TEXT_335 = NL + "\t\treturn new ";
-  protected final String TEXT_336 = "(create";
-  protected final String TEXT_337 = "(initialValue));";
-  protected final String TEXT_338 = NL + "\t\treturn create";
-  protected final String TEXT_339 = "(initialValue);";
-  protected final String TEXT_340 = NL + "\t\tif (initialValue == null) return null;" + NL + "\t\t";
-  protected final String TEXT_341 = " result = null;" + NL + "\t\tRuntimeException exception = null;";
-  protected final String TEXT_342 = NL + "\t\ttry" + NL + "\t\t{";
-  protected final String TEXT_343 = NL + "\t\t\tresult = (";
-  protected final String TEXT_344 = ")create";
-  protected final String TEXT_345 = "FromString(";
-  protected final String TEXT_346 = ", initialValue);";
-  protected final String TEXT_347 = NL + "\t\t\tresult = (";
-  protected final String TEXT_348 = ")";
-  protected final String TEXT_349 = ".createFromString(";
-  protected final String TEXT_350 = ", initialValue);";
-  protected final String TEXT_351 = NL + "\t\t\tif (result != null && ";
-  protected final String TEXT_352 = ".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_353 = NL + "\t\tif (result != null || exception == null) return result;" + NL + "    " + NL + "\t\tthrow exception;";
-  protected final String TEXT_354 = 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_355 = "();";
-  protected final String TEXT_356 = NL + "\t\treturn (";
-  protected final String TEXT_357 = ")super.createFromString(type, initialValue);";
-  protected final String TEXT_358 = NL + "\t}" + NL;
-  protected final String TEXT_359 = 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_360 = "(";
-  protected final String TEXT_361 = " instanceValue)" + NL + "\t{";
-  protected final String TEXT_362 = NL + "\t\treturn instanceValue == null ? null : instanceValue.toString();";
-  protected final String TEXT_363 = NL + "\t\treturn instanceValue == null ? null : convert";
-  protected final String TEXT_364 = "(instanceValue.";
-  protected final String TEXT_365 = "());";
-  protected final String TEXT_366 = NL + "\t\treturn convert";
-  protected final String TEXT_367 = "(instanceValue);";
-  protected final String TEXT_368 = NL + "\t\treturn ";
-  protected final String TEXT_369 = ".convert";
-  protected final String TEXT_370 = "(instanceValue);";
-  protected final String TEXT_371 = NL + "\t\treturn ";
-  protected final String TEXT_372 = ".convertToString(";
-  protected final String TEXT_373 = ", instanceValue);";
-  protected final String TEXT_374 = NL + "\t\tif (instanceValue == null) return null;" + NL + "\t\tif (instanceValue.isEmpty()) return \"\";" + NL + "\t\t";
-  protected final String TEXT_375 = " result = new ";
-  protected final String TEXT_376 = "();" + NL + "\t\tfor (";
-  protected final String TEXT_377 = " i = instanceValue.iterator(); i.hasNext(); )" + NL + "\t\t{";
-  protected final String TEXT_378 = NL + "\t\t\tresult.append(convert";
-  protected final String TEXT_379 = "((";
-  protected final String TEXT_380 = ")i.next()));";
-  protected final String TEXT_381 = NL + "\t\t\tresult.append(convert";
-  protected final String TEXT_382 = "ToString(";
-  protected final String TEXT_383 = ", i.next()));";
-  protected final String TEXT_384 = NL + "\t\t\tresult.append(";
-  protected final String TEXT_385 = ".convert";
-  protected final String TEXT_386 = "((";
-  protected final String TEXT_387 = ")i.next()));";
-  protected final String TEXT_388 = NL + "\t\t\tresult.append(";
-  protected final String TEXT_389 = ".convertToString(";
-  protected final String TEXT_390 = ", i.next()));";
-  protected final String TEXT_391 = NL + "\t\t\tresult.append(' ');" + NL + "\t\t}" + NL + "\t\treturn result.substring(0, result.length() - 1);";
-  protected final String TEXT_392 = NL + "\t\tif (instanceValue == null) return null;";
-  protected final String TEXT_393 = NL + "\t\tif (";
-  protected final String TEXT_394 = ".isInstance(instanceValue))" + NL + "\t\t{" + NL + "\t\t\ttry" + NL + "\t\t\t{";
-  protected final String TEXT_395 = NL + "\t\t\t\tString value = convert";
-  protected final String TEXT_396 = "(instanceValue);";
-  protected final String TEXT_397 = NL + "\t\t\t\tString value = convert";
-  protected final String TEXT_398 = "ToString(";
-  protected final String TEXT_399 = ", instanceValue);";
-  protected final String TEXT_400 = NL + "\t\t\t\tString value = ";
-  protected final String TEXT_401 = ".convert";
-  protected final String TEXT_402 = "((";
-  protected final String TEXT_403 = ")instanceValue);";
-  protected final String TEXT_404 = NL + "\t\t\t\tString value = ";
-  protected final String TEXT_405 = ".convertToString(";
-  protected final String TEXT_406 = ", instanceValue);";
-  protected final String TEXT_407 = 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_408 = NL + "\t\ttry" + NL + "\t\t{";
-  protected final String TEXT_409 = NL + "\t\t\tString value = convert";
-  protected final String TEXT_410 = "(instanceValue);";
-  protected final String TEXT_411 = NL + "\t\t\tString value = convert";
-  protected final String TEXT_412 = "ToString(";
-  protected final String TEXT_413 = ", new ";
-  protected final String TEXT_414 = "(instanceValue));";
-  protected final String TEXT_415 = NL + "\t\t\tString value = ";
-  protected final String TEXT_416 = ".convert";
-  protected final String TEXT_417 = "(instanceValue);";
-  protected final String TEXT_418 = NL + "\t\t\tString value = ";
-  protected final String TEXT_419 = ".convertToString(";
-  protected final String TEXT_420 = ", new ";
-  protected final String TEXT_421 = "(instanceValue));";
-  protected final String TEXT_422 = NL + "\t\t\tif (value != null) return value;" + NL + "\t\t}" + NL + "\t\tcatch (Exception e)" + NL + "\t\t{" + NL + "\t\t}";
-  protected final String TEXT_423 = NL + "\t\tthrow new IllegalArgumentException(\"Invalid value: '\"+instanceValue+\"' for datatype :\"+";
-  protected final String TEXT_424 = ".getName());";
-  protected final String TEXT_425 = 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_426 = "();";
-  protected final String TEXT_427 = NL + "\t\treturn super.convertToString(";
-  protected final String TEXT_428 = ", new ";
-  protected final String TEXT_429 = "(instanceValue));";
-  protected final String TEXT_430 = NL + "\t\treturn super.convertToString(";
-  protected final String TEXT_431 = ", instanceValue);";
-  protected final String TEXT_432 = NL + "\t}" + NL;
-  protected final String TEXT_433 = 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_434 = "ToString(";
-  protected final String TEXT_435 = " type, Object instanceValue)" + NL + "\t{";
-  protected final String TEXT_436 = NL + "\t\treturn instanceValue == null ? null : instanceValue.toString();";
-  protected final String TEXT_437 = NL + "\t\treturn convert";
-  protected final String TEXT_438 = "ToString(";
-  protected final String TEXT_439 = ", instanceValue);";
-  protected final String TEXT_440 = NL + "\t\treturn ";
-  protected final String TEXT_441 = ".convertToString(";
-  protected final String TEXT_442 = ", instanceValue);";
-  protected final String TEXT_443 = NL + "\t\treturn convert";
-  protected final String TEXT_444 = "((";
-  protected final String TEXT_445 = ")instanceValue);";
-  protected final String TEXT_446 = NL + "\t\tif (instanceValue == null) return null;" + NL + "\t\t";
-  protected final String TEXT_447 = " list = (";
-  protected final String TEXT_448 = ")instanceValue;" + NL + "\t\tif (list.isEmpty()) return \"\";" + NL + "\t\t";
-  protected final String TEXT_449 = " result = new ";
-  protected final String TEXT_450 = "();" + NL + "\t\tfor (";
-  protected final String TEXT_451 = " i = list.iterator(); i.hasNext(); )" + NL + "\t\t{";
-  protected final String TEXT_452 = NL + "\t\t\tresult.append(convert";
-  protected final String TEXT_453 = "ToString(";
-  protected final String TEXT_454 = ", i.next()));";
-  protected final String TEXT_455 = NL + "\t\t\tresult.append(";
-  protected final String TEXT_456 = ".convertToString(";
-  protected final String TEXT_457 = ", i.next()));";
-  protected final String TEXT_458 = NL + "\t\t\tresult.append(' ');" + NL + "\t\t}" + NL + "\t\treturn result.substring(0, result.length() - 1);";
-  protected final String TEXT_459 = NL + "\t\treturn instanceValue == null ? null : convert";
-  protected final String TEXT_460 = "(((";
-  protected final String TEXT_461 = ")instanceValue).";
-  protected final String TEXT_462 = "());";
-  protected final String TEXT_463 = NL + "\t\treturn convert";
-  protected final String TEXT_464 = "(instanceValue);";
-  protected final String TEXT_465 = NL + "\t\tif (instanceValue == null) return null;";
-  protected final String TEXT_466 = NL + "\t\tif (";
-  protected final String TEXT_467 = ".isInstance(instanceValue))" + NL + "\t\t{" + NL + "\t\t\ttry" + NL + "\t\t\t{";
-  protected final String TEXT_468 = NL + "\t\t\t\tString value = convert";
-  protected final String TEXT_469 = "ToString(";
-  protected final String TEXT_470 = ", instanceValue);";
-  protected final String TEXT_471 = NL + "\t\t\t\tString value = ";
-  protected final String TEXT_472 = ".convertToString(";
-  protected final String TEXT_473 = ", instanceValue);";
-  protected final String TEXT_474 = 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_475 = NL + "\t\tthrow new IllegalArgumentException(\"Invalid value: '\"+instanceValue+\"' for datatype :\"+type.getName());";
-  protected final String TEXT_476 = 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_477 = "();";
-  protected final String TEXT_478 = NL + "\t\treturn super.convertToString(type, instanceValue);";
-  protected final String TEXT_479 = NL + "\t}" + NL;
-  protected final String TEXT_480 = NL + "\t/**" + NL + "\t * Returns a new object of class '<em>";
-  protected final String TEXT_481 = "</em>'." + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @return a new object of class '<em>";
-  protected final String TEXT_482 = "</em>'." + NL + "\t * @generated" + NL + "\t */" + NL + "\t";
-  protected final String TEXT_483 = " create";
-  protected final String TEXT_484 = "();" + NL;
-  protected final String TEXT_485 = NL + "\t/**" + NL + "\t * Returns an instance of data type '<em>";
-  protected final String TEXT_486 = "</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_487 = " create";
-  protected final String TEXT_488 = "(String literal);" + NL + "" + NL + "\t/**" + NL + "\t * Returns a literal representation of an instance of data type '<em>";
-  protected final String TEXT_489 = "</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_490 = "(";
-  protected final String TEXT_491 = " instanceValue);" + NL;
-  protected final String TEXT_492 = NL + "} //";
-  protected final String TEXT_493 = NL;
+  protected final String TEXT_305 = "();" + NL;
+  protected final String TEXT_306 = NL + "\t/**" + NL + "\t * Returns an instance of data type '<em>";
+  protected final String TEXT_307 = "</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_308 = " create";
+  protected final String TEXT_309 = "(String literal);" + NL + "" + NL + "\t/**" + NL + "\t * Returns a literal representation of an instance of data type '<em>";
+  protected final String TEXT_310 = "</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_311 = "(";
+  protected final String TEXT_312 = " instanceValue);" + NL;
+  protected final String TEXT_313 = NL + "} //";
+  protected final String TEXT_314 = NL;
 
   public String generate(Object argument)
   {
@@ -663,88 +484,88 @@
     stringBuffer.append(TEXT_50);
     if (!genPackage.getAllGenDataTypes().isEmpty()) {
     stringBuffer.append(TEXT_51);
-    stringBuffer.append(genModel.getImportedName("commonj.sdo.Type"));
-    stringBuffer.append(TEXT_52);
     for (Iterator i=genPackage.getAllGenDataTypes().iterator(); i.hasNext();) { GenDataType genDataType = (GenDataType)i.next();
     if (genDataType.isSerializable()) {
-    stringBuffer.append(TEXT_53);
+    stringBuffer.append(TEXT_52);
     stringBuffer.append(genDataType.getClassifierID());
-    stringBuffer.append(TEXT_54);
+    stringBuffer.append(TEXT_53);
     stringBuffer.append(genDataType.getName());
-    stringBuffer.append(TEXT_55);
+    stringBuffer.append(TEXT_54);
     }
     }
-    stringBuffer.append(TEXT_56);
+    stringBuffer.append(TEXT_55);
     stringBuffer.append(genModel.getNonNLS());
     stringBuffer.append(genModel.getNonNLS(2));
-    stringBuffer.append(TEXT_57);
-    stringBuffer.append(genModel.getImportedName("commonj.sdo.Type"));
-    stringBuffer.append(TEXT_58);
+    stringBuffer.append(TEXT_56);
     for (Iterator i=genPackage.getAllGenDataTypes().iterator(); i.hasNext();) { GenDataType genDataType = (GenDataType)i.next();
     if (genDataType.isSerializable()) {
-    stringBuffer.append(TEXT_59);
+    stringBuffer.append(TEXT_57);
     stringBuffer.append(genDataType.getClassifierID());
-    stringBuffer.append(TEXT_60);
+    stringBuffer.append(TEXT_58);
     stringBuffer.append(genDataType.getName());
-    stringBuffer.append(TEXT_61);
+    stringBuffer.append(TEXT_59);
     }
     }
-    stringBuffer.append(TEXT_62);
+    stringBuffer.append(TEXT_60);
     stringBuffer.append(genModel.getNonNLS());
     stringBuffer.append(genModel.getNonNLS(2));
-    stringBuffer.append(TEXT_63);
+    stringBuffer.append(TEXT_61);
     }
     for (Iterator i=genPackage.getGenClasses().iterator(); i.hasNext();) { GenClass genClass = (GenClass)i.next();
     if (!genClass.isAbstract() && !genClass.isDynamic()) {
-    stringBuffer.append(TEXT_64);
+    stringBuffer.append(TEXT_62);
     stringBuffer.append(genClass.getImportedInterfaceName());
-    stringBuffer.append(TEXT_65);
+    stringBuffer.append(TEXT_63);
     stringBuffer.append(genClass.getName());
-    stringBuffer.append(TEXT_66);
+    stringBuffer.append(TEXT_64);
     if (genClass.isDynamic()) {
-    stringBuffer.append(TEXT_67);
+    stringBuffer.append(TEXT_65);
     stringBuffer.append(genClass.getImportedInterfaceName());
-    stringBuffer.append(TEXT_68);
+    stringBuffer.append(TEXT_66);
     stringBuffer.append(genClass.getSafeUncapName());
-    stringBuffer.append(TEXT_69);
+    stringBuffer.append(TEXT_67);
     stringBuffer.append(genClass.getCastFromEObject());
-    stringBuffer.append(TEXT_70);
+    stringBuffer.append(TEXT_68);
     stringBuffer.append(genClass.getQualifiedClassifierAccessor());
-    stringBuffer.append(TEXT_71);
+    stringBuffer.append(TEXT_69);
     } else {
+    stringBuffer.append(TEXT_70);
+    stringBuffer.append(genClass.getImportedClassName());
+    stringBuffer.append(TEXT_71);
+    stringBuffer.append(genClass.getSafeUncapName());
     stringBuffer.append(TEXT_72);
     stringBuffer.append(genClass.getImportedClassName());
     stringBuffer.append(TEXT_73);
-    stringBuffer.append(genClass.getSafeUncapName());
+    if (genModel.isSuppressInterfaces() && !genPackage.getReflectionPackageName().equals(genPackage.getInterfacePackageName())) {
     stringBuffer.append(TEXT_74);
-    stringBuffer.append(genClass.getImportedClassName());
+    }
     stringBuffer.append(TEXT_75);
-    if (genModel.isSuppressInterfaces() && !genPackage.getReflectionPackageName().equals(genPackage.getInterfacePackageName())) {
-    stringBuffer.append(TEXT_76);
     }
+    stringBuffer.append(TEXT_76);
+    stringBuffer.append(genClass.getSafeUncapName());
     stringBuffer.append(TEXT_77);
     }
+    }
     stringBuffer.append(TEXT_78);
-    stringBuffer.append(genClass.getSafeUncapName());
+    for (Iterator i=genPackage.getOrderedGenClassifiers().iterator(); i.hasNext();) { GenClassifier genClassifier = (GenClassifier)i.next();
     stringBuffer.append(TEXT_79);
-    }
-    }
+    if (!genPackage.getClassifierID(genClassifier).equals("DOCUMENT_ROOT")) { 
     stringBuffer.append(TEXT_80);
-    for (Iterator i=genPackage.getOrderedGenClassifiers().iterator(); i.hasNext();) { GenClassifier genClassifier = (GenClassifier)i.next();
+    stringBuffer.append(genModel.getImportedName("commonj.sdo.Type"));
     stringBuffer.append(TEXT_81);
-    if (!genPackage.getClassifierID(genClassifier).equals("DOCUMENT_ROOT")) { 
+    stringBuffer.append(genClassifier.getSafeUncapName());
     stringBuffer.append(TEXT_82);
     stringBuffer.append(genModel.getImportedName("commonj.sdo.Type"));
     stringBuffer.append(TEXT_83);
-    stringBuffer.append(genClassifier.getSafeUncapName());
+    stringBuffer.append(genClassifier.getClassifierAccessorName());
     stringBuffer.append(TEXT_84);
-    stringBuffer.append(genModel.getImportedName("commonj.sdo.Type"));
+    stringBuffer.append(genClassifier.getSafeUncapName());
     stringBuffer.append(TEXT_85);
-    stringBuffer.append(genClassifier.getClassifierAccessorName());
+    } }
     stringBuffer.append(TEXT_86);
-    stringBuffer.append(genClassifier.getSafeUncapName());
+    stringBuffer.append(factoryType);
     stringBuffer.append(TEXT_87);
-    } }
+    stringBuffer.append(factoryType);
     stringBuffer.append(TEXT_88);
     stringBuffer.append(factoryType);
     stringBuffer.append(TEXT_89);
@@ -754,237 +575,237 @@
     stringBuffer.append(TEXT_91);
     stringBuffer.append(factoryType);
     stringBuffer.append(TEXT_92);
-    stringBuffer.append(factoryType);
+    for (Iterator p=genPackage.getPackageSimpleDependencies().iterator(); p.hasNext();) { GenPackage dep = (GenPackage)p.next();
     stringBuffer.append(TEXT_93);
-    stringBuffer.append(factoryType);
+    stringBuffer.append(genModel.getImportedName("org.apache.tuscany.sdo.util.SDOUtil"));
     stringBuffer.append(TEXT_94);
-    for (Iterator p=genPackage.getPackageSimpleDependencies().iterator(); p.hasNext();) { GenPackage dep = (GenPackage)p.next();
+    stringBuffer.append(dep.getImportedFactoryInterfaceName());
     stringBuffer.append(TEXT_95);
-    stringBuffer.append(genModel.getImportedName("org.apache.tuscany.sdo.util.SDOUtil"));
+    }
     stringBuffer.append(TEXT_96);
-    stringBuffer.append(dep.getImportedFactoryInterfaceName());
+    stringBuffer.append(factoryType);
     stringBuffer.append(TEXT_97);
-    }
+    stringBuffer.append(factoryType);
     stringBuffer.append(TEXT_98);
     stringBuffer.append(factoryType);
     stringBuffer.append(TEXT_99);
     stringBuffer.append(factoryType);
     stringBuffer.append(TEXT_100);
-    stringBuffer.append(factoryType);
-    stringBuffer.append(TEXT_101);
-    stringBuffer.append(factoryType);
-    stringBuffer.append(TEXT_102);
     if (!genPackage.getGenClasses().isEmpty()) {
-    stringBuffer.append(TEXT_103);
+    stringBuffer.append(TEXT_101);
     for (Iterator i=genPackage.getGenClasses().iterator(); i.hasNext();) { GenClass genClass = (GenClass)i.next();
-    stringBuffer.append(TEXT_104);
+    stringBuffer.append(TEXT_102);
     if (!genClass.isAbstract() && !genClass.isDynamic()) {
-    stringBuffer.append(TEXT_105);
+    stringBuffer.append(TEXT_103);
     stringBuffer.append(genClass.getSafeUncapName());
-    stringBuffer.append(TEXT_106);
+    stringBuffer.append(TEXT_104);
     stringBuffer.append(genPackage.getClassifierID(genClass));
-    stringBuffer.append(TEXT_107);
+    stringBuffer.append(TEXT_105);
     for (Iterator j=genClass.getGenFeatures().iterator(); j.hasNext();) { GenFeature genFeature = (GenFeature)j.next();
-    stringBuffer.append(TEXT_108);
+    stringBuffer.append(TEXT_106);
     stringBuffer.append(!genFeature.isReferenceType());
-    stringBuffer.append(TEXT_109);
+    stringBuffer.append(TEXT_107);
     stringBuffer.append(genClass.getSafeUncapName());
-    stringBuffer.append(TEXT_110);
+    stringBuffer.append(TEXT_108);
     stringBuffer.append(genClass.getClassName());
-    stringBuffer.append(TEXT_111);
+    stringBuffer.append(TEXT_109);
     stringBuffer.append(genFeature.getUpperName());
-    stringBuffer.append(TEXT_112);
+    stringBuffer.append(TEXT_110);
     }
     }
     }
     }
     if (!genPackage.getGenEnums().isEmpty()) {
-    stringBuffer.append(TEXT_113);
+    stringBuffer.append(TEXT_111);
     for (Iterator e=genPackage.getGenEnums().iterator(); e.hasNext();) { GenEnum genEnum = (GenEnum)e.next();
-    stringBuffer.append(TEXT_114);
+    stringBuffer.append(TEXT_112);
     stringBuffer.append(genEnum.getClassifierInstanceName());
-    stringBuffer.append(TEXT_115);
+    stringBuffer.append(TEXT_113);
     stringBuffer.append(genEnum.getClassifierID());
-    stringBuffer.append(TEXT_116);
+    stringBuffer.append(TEXT_114);
     }
     }
     if (!genPackage.getGenDataTypes().isEmpty()) {
     for (Iterator d=genPackage.getGenDataTypes().iterator(); d.hasNext();) { GenDataType genDataType = (GenDataType)d.next();
-    stringBuffer.append(TEXT_117);
+    stringBuffer.append(TEXT_115);
     stringBuffer.append(genDataType.getSafeUncapName());
-    stringBuffer.append(TEXT_118);
+    stringBuffer.append(TEXT_116);
     stringBuffer.append(genPackage.getClassifierID(genDataType));
-    stringBuffer.append(TEXT_119);
+    stringBuffer.append(TEXT_117);
     }
     }
-    stringBuffer.append(TEXT_120);
+    stringBuffer.append(TEXT_118);
     if (!genPackage.getPackageInitializationDependencies().isEmpty()) {
-    stringBuffer.append(TEXT_121);
+    stringBuffer.append(TEXT_119);
     for (Iterator p=genPackage.getPackageInitializationDependencies().iterator(); p.hasNext();) { GenPackage dep = (GenPackage)p.next();
-    stringBuffer.append(TEXT_122);
+    stringBuffer.append(TEXT_120);
     stringBuffer.append(dep.getImportedFactoryClassName());
-    stringBuffer.append(TEXT_123);
+    stringBuffer.append(TEXT_121);
     stringBuffer.append(genPackage.getPackageInstanceVariable(dep));
-    stringBuffer.append(TEXT_124);
+    stringBuffer.append(TEXT_122);
     stringBuffer.append(dep.getImportedFactoryClassName());
-    stringBuffer.append(TEXT_125);
+    stringBuffer.append(TEXT_123);
     stringBuffer.append(dep.getImportedFactoryClassName());
-    stringBuffer.append(TEXT_126);
+    stringBuffer.append(TEXT_124);
     }
     }
     List annotationSources = genPackage.getAnnotationSources();
     annotationSources.remove(ExtendedMetaData.ANNOTATION_URI);
-    stringBuffer.append(TEXT_127);
+    stringBuffer.append(TEXT_125);
     stringBuffer.append(genModel.getImportedName("commonj.sdo.Property"));
-    stringBuffer.append(TEXT_128);
+    stringBuffer.append(TEXT_126);
     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_129);
+    stringBuffer.append(TEXT_127);
     stringBuffer.append(genClass.getSafeUncapName());
-    stringBuffer.append(TEXT_130);
+    stringBuffer.append(TEXT_128);
     stringBuffer.append(baseGenClass.getSafeUncapName());
-    stringBuffer.append(TEXT_131);
+    stringBuffer.append(TEXT_129);
     }
     }
-    stringBuffer.append(TEXT_132);
+    stringBuffer.append(TEXT_130);
     for (Iterator i=genPackage.getGenClasses().iterator(); i.hasNext();) { GenClass genClass = (GenClass)i.next();
     if (!genClass.isAbstract() && !genClass.isDynamic()) {
-    stringBuffer.append(TEXT_133);
+    stringBuffer.append(TEXT_131);
     stringBuffer.append(genClass.getSafeUncapName());
-    stringBuffer.append(TEXT_134);
+    stringBuffer.append(TEXT_132);
     stringBuffer.append(genClass.getImportedInterfaceName());
-    stringBuffer.append(TEXT_135);
+    stringBuffer.append(TEXT_133);
     stringBuffer.append(genClass.getName());
-    stringBuffer.append(TEXT_136);
+    stringBuffer.append(TEXT_134);
     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_137);
+    stringBuffer.append(TEXT_135);
     stringBuffer.append(genClass.getSafeUncapName());
-    stringBuffer.append(TEXT_138);
+    stringBuffer.append(TEXT_136);
     stringBuffer.append(annotationSource);
-    stringBuffer.append(TEXT_139);
+    stringBuffer.append(TEXT_137);
     stringBuffer.append(key);
-    stringBuffer.append(TEXT_140);
+    stringBuffer.append(TEXT_138);
     stringBuffer.append(value);
     stringBuffer.append(genModel.getNonNLS(key + value));
-    stringBuffer.append(TEXT_141);
+    stringBuffer.append(TEXT_139);
     }
     }
     }
-    stringBuffer.append(TEXT_142);
+    stringBuffer.append(TEXT_140);
     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_143);
+    stringBuffer.append(TEXT_141);
     stringBuffer.append(genModel.getImportedName("commonj.sdo.Property"));
-    stringBuffer.append(TEXT_144);
+    stringBuffer.append(TEXT_142);
     stringBuffer.append(genClass.getSafeUncapName());
-    stringBuffer.append(TEXT_145);
+    stringBuffer.append(TEXT_143);
     stringBuffer.append(genClass.getClassName());
-    stringBuffer.append(TEXT_146);
+    stringBuffer.append(TEXT_144);
     stringBuffer.append(genFeature.getUpperName());
-    stringBuffer.append(TEXT_147);
+    stringBuffer.append(TEXT_145);
     if (genFeature.isReferenceType()) { GenFeature reverseGenFeature = genFeature.getReverse();
     String reverse = reverseGenFeature == null ? "null" : genPackage.getPackageInstanceVariable(reverseGenFeature.getGenPackage()) + ".get" + reverseGenFeature.getFeatureAccessorName() + "()";
-    stringBuffer.append(TEXT_148);
+    stringBuffer.append(TEXT_146);
     stringBuffer.append(type);
-    stringBuffer.append(TEXT_149);
+    stringBuffer.append(TEXT_147);
     stringBuffer.append(genFeature.getName());
-    stringBuffer.append(TEXT_150);
+    stringBuffer.append(TEXT_148);
     stringBuffer.append(genFeature.getDefaultValue());
-    stringBuffer.append(TEXT_151);
+    stringBuffer.append(TEXT_149);
     stringBuffer.append(genFeature.getLowerBound());
-    stringBuffer.append(TEXT_152);
+    stringBuffer.append(TEXT_150);
     stringBuffer.append(genFeature.getUpperBound());
-    stringBuffer.append(TEXT_153);
+    stringBuffer.append(TEXT_151);
     stringBuffer.append(genFeature.getContainerClass());
-    stringBuffer.append(TEXT_154);
+    stringBuffer.append(TEXT_152);
     stringBuffer.append(genFeature.getChangeableFlag().equals("IS_CHANGEABLE") ? "false" : "true");
-    stringBuffer.append(TEXT_155);
+    stringBuffer.append(TEXT_153);
     stringBuffer.append(genFeature.getUnsettableFlag().equals("IS_UNSETTABLE") ? "true": "false");
-    stringBuffer.append(TEXT_156);
+    stringBuffer.append(TEXT_154);
     stringBuffer.append(genFeature.getDerivedFlag().equals("IS_DERIVED") ? "true" : "false");
-    stringBuffer.append(TEXT_157);
+    stringBuffer.append(TEXT_155);
     stringBuffer.append(genFeature.getContainmentFlag().equals("IS_COMPOSITE")? "true": "false");
-    stringBuffer.append(TEXT_158);
+    stringBuffer.append(TEXT_156);
     stringBuffer.append(reverse);
-    stringBuffer.append(TEXT_159);
+    stringBuffer.append(TEXT_157);
     }else{
-    stringBuffer.append(TEXT_160);
+    stringBuffer.append(TEXT_158);
     stringBuffer.append(type);
-    stringBuffer.append(TEXT_161);
+    stringBuffer.append(TEXT_159);
     stringBuffer.append(genFeature.getName());
-    stringBuffer.append(TEXT_162);
+    stringBuffer.append(TEXT_160);
     stringBuffer.append(genFeature.getDefaultValue());
-    stringBuffer.append(TEXT_163);
+    stringBuffer.append(TEXT_161);
     stringBuffer.append(genFeature.getLowerBound());
-    stringBuffer.append(TEXT_164);
+    stringBuffer.append(TEXT_162);
     stringBuffer.append(genFeature.getUpperBound());
-    stringBuffer.append(TEXT_165);
+    stringBuffer.append(TEXT_163);
     stringBuffer.append(genFeature.getContainerClass());
-    stringBuffer.append(TEXT_166);
+    stringBuffer.append(TEXT_164);
     stringBuffer.append(genFeature.getChangeableFlag().equals("IS_CHANGEABLE") ? "false" : "true");
-    stringBuffer.append(TEXT_167);
+    stringBuffer.append(TEXT_165);
     stringBuffer.append(genFeature.getUnsettableFlag().equals("IS_UNSETTABLE") ? "true": "false");
-    stringBuffer.append(TEXT_168);
+    stringBuffer.append(TEXT_166);
     stringBuffer.append(genFeature.getDerivedFlag().equals("IS_DERIVED") ? "true" : "false");
-    stringBuffer.append(TEXT_169);
+    stringBuffer.append(TEXT_167);
     }
     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_170);
+    stringBuffer.append(TEXT_168);
     stringBuffer.append(annotationSource);
-    stringBuffer.append(TEXT_171);
+    stringBuffer.append(TEXT_169);
     stringBuffer.append(key);
-    stringBuffer.append(TEXT_172);
+    stringBuffer.append(TEXT_170);
     stringBuffer.append(value);
     stringBuffer.append(genModel.getNonNLS(key + value));
-    stringBuffer.append(TEXT_173);
+    stringBuffer.append(TEXT_171);
     }
     }
     }
-    stringBuffer.append(TEXT_174);
+    stringBuffer.append(TEXT_172);
     }
     }
     }
     if (!genPackage.getGenDataTypes().isEmpty()) {
-    stringBuffer.append(TEXT_175);
+    stringBuffer.append(TEXT_173);
     for (Iterator d=genPackage.getGenDataTypes().iterator(); d.hasNext();) { GenDataType genDataType = (GenDataType)d.next();
-    stringBuffer.append(TEXT_176);
+    stringBuffer.append(TEXT_174);
     stringBuffer.append(genDataType.getSafeUncapName());
-    stringBuffer.append(TEXT_177);
+    stringBuffer.append(TEXT_175);
     stringBuffer.append(genDataType.getImportedInstanceClassName());
-    stringBuffer.append(TEXT_178);
+    stringBuffer.append(TEXT_176);
     stringBuffer.append(genDataType.getName());
-    stringBuffer.append(TEXT_179);
+    stringBuffer.append(TEXT_177);
     stringBuffer.append(genDataType.getSerializableFlag().equals("IS_SERIALIZABLE") ? "true" : "false");
-    stringBuffer.append(TEXT_180);
+    stringBuffer.append(TEXT_178);
     stringBuffer.append(genDataType.getGeneratedInstanceClassFlag().equals("IS_GENERATED_INSTANCE_CLASS") ? "true" : "false" );
-    stringBuffer.append(TEXT_181);
+    stringBuffer.append(TEXT_179);
     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_182);
+    stringBuffer.append(TEXT_180);
     stringBuffer.append(genDataType.getSafeUncapName());
-    stringBuffer.append(TEXT_183);
+    stringBuffer.append(TEXT_181);
     stringBuffer.append(annotationSource);
-    stringBuffer.append(TEXT_184);
+    stringBuffer.append(TEXT_182);
     stringBuffer.append(key);
-    stringBuffer.append(TEXT_185);
+    stringBuffer.append(TEXT_183);
     stringBuffer.append(value);
     stringBuffer.append(genModel.getNonNLS(key + value));
-    stringBuffer.append(TEXT_186);
+    stringBuffer.append(TEXT_184);
     }
     }
     }
-    stringBuffer.append(TEXT_187);
+    stringBuffer.append(TEXT_185);
     }
     }
+    stringBuffer.append(TEXT_186);
+    stringBuffer.append(SDOGenUtil.getDependentFactoryArgumentList(genPackage, false));
+    stringBuffer.append(TEXT_187);
+    stringBuffer.append(SDOGenUtil.getDependentFactoryArgumentList(genPackage, true));
     stringBuffer.append(TEXT_188);
     stringBuffer.append(genModel.getImportedName("commonj.sdo.Property"));
     stringBuffer.append(TEXT_189);
@@ -1089,617 +910,207 @@
     stringBuffer.append(TEXT_222);
     for (Iterator i=genPackage.getAllGenDataTypes().iterator(); i.hasNext();) { GenDataType genDataType = (GenDataType)i.next();
     if (genDataType.isSerializable()) {
-    if (genPackage.isDataTypeConverters()) { String eDataType = genDataType.getQualifiedClassifierAccessor();
     stringBuffer.append(TEXT_223);
-    stringBuffer.append(genDataType.getImportedInstanceClassName());
+    stringBuffer.append(genDataType.getObjectInstanceClassName());
     stringBuffer.append(TEXT_224);
     stringBuffer.append(genDataType.getName());
     stringBuffer.append(TEXT_225);
     if (genDataType instanceof GenEnum) {
     stringBuffer.append(TEXT_226);
-    stringBuffer.append(genDataType.getImportedInstanceClassName());
+    stringBuffer.append(((GenEnum)genDataType).getImportedInstanceClassName());
     stringBuffer.append(TEXT_227);
-    stringBuffer.append(genDataType.getImportedInstanceClassName());
+    stringBuffer.append(((GenEnum)genDataType).getImportedInstanceClassName());
     stringBuffer.append(TEXT_228);
-    stringBuffer.append(eDataType);
-    stringBuffer.append(TEXT_229);
     stringBuffer.append(genModel.getNonNLS());
     stringBuffer.append(genModel.getNonNLS(2));
     stringBuffer.append(genModel.getNonNLS(3));
-    stringBuffer.append(TEXT_230);
-    } else if (genDataType.getBaseType() != null) { GenDataType genBaseType = genDataType.getBaseType(); boolean isPrimitiveConversion = !genDataType.isPrimitiveType() && genBaseType.isPrimitiveType();
+    stringBuffer.append(TEXT_229);
+    } else if (genDataType.getBaseType() != null) { GenDataType genBaseType = genDataType.getBaseType(); 
     if (genBaseType.getGenPackage() == genPackage) {
-    if (isPrimitiveConversion) {
-    stringBuffer.append(TEXT_231);
+    stringBuffer.append(TEXT_230);
     stringBuffer.append(genDataType.getObjectInstanceClassName());
-    stringBuffer.append(TEXT_232);
+    stringBuffer.append(TEXT_231);
     stringBuffer.append(genBaseType.getName());
-    stringBuffer.append(TEXT_233);
+    stringBuffer.append(TEXT_232);
     } else {
+    stringBuffer.append(TEXT_233);
+    stringBuffer.append(genDataType.getObjectInstanceClassName());
     stringBuffer.append(TEXT_234);
-    stringBuffer.append(genBaseType.getName());
+    stringBuffer.append(SDOGenUtil.getFactoryImpl(genBaseType.getGenPackage()));
     stringBuffer.append(TEXT_235);
-    }
-    } else if (genBaseType.getGenPackage().isDataTypeConverters()) {
-    if (isPrimitiveConversion) {
+    stringBuffer.append(genBaseType.getName());
     stringBuffer.append(TEXT_236);
-    stringBuffer.append(genDataType.getObjectInstanceClassName());
+    }
+    } else if (genDataType.getItemType() != null) { GenDataType genItemType = genDataType.getItemType(); 
     stringBuffer.append(TEXT_237);
-    stringBuffer.append(genBaseType.getGenPackage().getQualifiedEFactoryInternalInstanceAccessor());
+    stringBuffer.append(genModel.getImportedName("java.util.List"));
     stringBuffer.append(TEXT_238);
-    stringBuffer.append(genBaseType.getName());
+    stringBuffer.append(genModel.getImportedName("java.util.ArrayList"));
     stringBuffer.append(TEXT_239);
-    } else {
+    stringBuffer.append(genModel.getImportedName("java.util.StringTokenizer"));
     stringBuffer.append(TEXT_240);
-    stringBuffer.append(genBaseType.getGenPackage().getQualifiedEFactoryInternalInstanceAccessor());
+    stringBuffer.append(genModel.getImportedName("java.util.StringTokenizer"));
     stringBuffer.append(TEXT_241);
-    stringBuffer.append(genBaseType.getName());
+    if (genItemType.getGenPackage() == genPackage) {
     stringBuffer.append(TEXT_242);
-    }
-    } else {
+    stringBuffer.append(genItemType.getName());
     stringBuffer.append(TEXT_243);
-    stringBuffer.append(genDataType.getObjectInstanceClassName());
+    } else {
     stringBuffer.append(TEXT_244);
-    stringBuffer.append(genBaseType.getGenPackage().getQualifiedEFactoryInternalInstanceAccessor());
+    stringBuffer.append(SDOGenUtil.getFactoryImpl(genItemType.getGenPackage()));
     stringBuffer.append(TEXT_245);
-    stringBuffer.append(genBaseType.getQualifiedClassifierAccessor());
+    stringBuffer.append(genItemType.getName());
     stringBuffer.append(TEXT_246);
     }
-    } else if (genDataType.getItemType() != null) { GenDataType genItemType = genDataType.getItemType(); 
     stringBuffer.append(TEXT_247);
-    stringBuffer.append(genModel.getImportedName("java.util.List"));
+    } else if (!genDataType.getMemberTypes().isEmpty()) {
     stringBuffer.append(TEXT_248);
-    stringBuffer.append(genModel.getImportedName("java.util.ArrayList"));
+    stringBuffer.append(genDataType.getObjectInstanceClassName());
     stringBuffer.append(TEXT_249);
-    stringBuffer.append(genModel.getImportedName("java.util.StringTokenizer"));
+    for (Iterator j = genDataType.getMemberTypes().iterator(); j.hasNext(); ) { GenDataType genMemberType = (GenDataType)j.next();
     stringBuffer.append(TEXT_250);
-    stringBuffer.append(genModel.getImportedName("java.util.StringTokenizer"));
+    if (genMemberType.getGenPackage() == genPackage) {
     stringBuffer.append(TEXT_251);
-    if (genItemType.getGenPackage() == genPackage) {
-    if (genPackage.isDataTypeConverters()) { genItemType = genItemType.getObjectType();
+    stringBuffer.append(genDataType.getObjectInstanceClassName());
     stringBuffer.append(TEXT_252);
-    stringBuffer.append(genItemType.getName());
+    stringBuffer.append(genMemberType.getName());
     stringBuffer.append(TEXT_253);
     } else {
     stringBuffer.append(TEXT_254);
-    stringBuffer.append(genItemType.getName());
+    stringBuffer.append(genDataType.getObjectInstanceClassName());
     stringBuffer.append(TEXT_255);
-    stringBuffer.append(genItemType.getQualifiedClassifierAccessor());
+    stringBuffer.append(SDOGenUtil.getFactoryImpl(genMemberType.getGenPackage()));
     stringBuffer.append(TEXT_256);
-    }
-    } else {
-    if (genItemType.getGenPackage().isDataTypeConverters()) { genItemType = genItemType.getObjectType();
+    stringBuffer.append(genMemberType.getName());
     stringBuffer.append(TEXT_257);
-    stringBuffer.append(genItemType.getGenPackage().getQualifiedEFactoryInternalInstanceAccessor());
+    }
     stringBuffer.append(TEXT_258);
-    stringBuffer.append(genItemType.getName());
+    }
     stringBuffer.append(TEXT_259);
-    } else {
+    } else if (genDataType.isArrayType()) {
     stringBuffer.append(TEXT_260);
-    stringBuffer.append(genItemType.getGenPackage().getQualifiedEFactoryInternalInstanceAccessor());
+    stringBuffer.append(genModel.getImportedName("java.lang.UnsupportedOperationException"));
     stringBuffer.append(TEXT_261);
-    stringBuffer.append(genItemType.getQualifiedClassifierAccessor());
+    } else {
     stringBuffer.append(TEXT_262);
-    }
-    }
+    stringBuffer.append(genDataType.getObjectInstanceClassName());
     stringBuffer.append(TEXT_263);
-    } else if (!genDataType.getMemberTypes().isEmpty()) {
+    stringBuffer.append(genDataType.getClassifierID());
     stringBuffer.append(TEXT_264);
-    stringBuffer.append(genDataType.getStaticValue(null));
+    }
     stringBuffer.append(TEXT_265);
-    stringBuffer.append(genDataType.getImportedInstanceClassName());
+    stringBuffer.append(genDataType.getName());
     stringBuffer.append(TEXT_266);
-    stringBuffer.append(genDataType.getStaticValue(null));
+    if (genDataType instanceof GenEnum) {
     stringBuffer.append(TEXT_267);
-    for (Iterator j = genDataType.getMemberTypes().iterator(); j.hasNext(); ) { GenDataType genMemberType = (GenDataType)j.next();
+    } else if (genDataType.getBaseType() != null) { GenDataType genBaseType = genDataType.getBaseType(); 
+    if (genBaseType.getGenPackage() == genPackage) {
     stringBuffer.append(TEXT_268);
-    if (genMemberType.getGenPackage() == genPackage) {
-    if (genPackage.isDataTypeConverters()) { if (!genDataType.isPrimitiveType()) genMemberType = genMemberType.getObjectType();
+    stringBuffer.append(genBaseType.getName());
     stringBuffer.append(TEXT_269);
-    stringBuffer.append(genMemberType.getName());
-    stringBuffer.append(TEXT_270);
     } else {
+    stringBuffer.append(TEXT_270);
+    stringBuffer.append(SDOGenUtil.getFactoryImpl(genBaseType.getGenPackage()));
     stringBuffer.append(TEXT_271);
-    stringBuffer.append(genDataType.getObjectInstanceClassName());
+    stringBuffer.append(genBaseType.getName());
     stringBuffer.append(TEXT_272);
-    stringBuffer.append(genMemberType.getName());
+    }
+    } else if (genDataType.getItemType() != null) { GenDataType genItemType = genDataType.getItemType(); 
     stringBuffer.append(TEXT_273);
-    stringBuffer.append(genMemberType.getQualifiedClassifierAccessor());
+    stringBuffer.append(genModel.getImportedName("java.util.List"));
     stringBuffer.append(TEXT_274);
-    }
-    } else {
-    if (genPackage.isDataTypeConverters()) { if (!genDataType.isPrimitiveType()) genMemberType = genMemberType.getObjectType();
+    stringBuffer.append(genModel.getImportedName("java.util.List"));
     stringBuffer.append(TEXT_275);
-    stringBuffer.append(genMemberType.getGenPackage().getQualifiedEFactoryInternalInstanceAccessor());
+    stringBuffer.append(genModel.getImportedName("java.lang.StringBuffer"));
     stringBuffer.append(TEXT_276);
-    stringBuffer.append(genMemberType.getName());
+    stringBuffer.append(genModel.getImportedName("java.lang.StringBuffer"));
     stringBuffer.append(TEXT_277);
-    } else {
+    stringBuffer.append(genModel.getImportedName("java.util.Iterator"));
     stringBuffer.append(TEXT_278);
-    stringBuffer.append(genDataType.getObjectInstanceClassName());
+    if (genItemType.getGenPackage() == genPackage) {
     stringBuffer.append(TEXT_279);
-    stringBuffer.append(genMemberType.getGenPackage().getQualifiedEFactoryInternalInstanceAccessor());
+    stringBuffer.append(genItemType.getName());
     stringBuffer.append(TEXT_280);
-    stringBuffer.append(genMemberType.getQualifiedClassifierAccessor());
+    } else {
     stringBuffer.append(TEXT_281);
-    }
-    }
+    stringBuffer.append(SDOGenUtil.getFactoryImpl(genItemType.getGenPackage()));
     stringBuffer.append(TEXT_282);
-    if (!genDataType.isPrimitiveType()) {
+    stringBuffer.append(genItemType.getName());
     stringBuffer.append(TEXT_283);
     }
-    stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.Diagnostician"));
     stringBuffer.append(TEXT_284);
-    stringBuffer.append(eDataType);
+    } else if (!genDataType.getMemberTypes().isEmpty()) {
     stringBuffer.append(TEXT_285);
-    if (genDataType.isPrimitiveType()) {
+    for (Iterator j = genDataType.getMemberTypes().iterator(); j.hasNext(); ) { GenDataType genMemberType = (GenDataType)j.next();
     stringBuffer.append(TEXT_286);
-    stringBuffer.append(genDataType.getObjectInstanceClassName());
+    stringBuffer.append(SDOGenUtil.getQualifiedTypeAccessor(genMemberType));
     stringBuffer.append(TEXT_287);
-    } else {
+    if (genMemberType.getGenPackage() == genPackage) {
     stringBuffer.append(TEXT_288);
-    }
+    stringBuffer.append(genMemberType.getName());
     stringBuffer.append(TEXT_289);
-    }
+    } else {
     stringBuffer.append(TEXT_290);
-    if (!genDataType.isPrimitiveType()) {
+    stringBuffer.append(SDOGenUtil.getFactoryImpl(genMemberType.getGenPackage()));
     stringBuffer.append(TEXT_291);
-    }
+    stringBuffer.append(genMemberType.getName());
     stringBuffer.append(TEXT_292);
-    } else if (genDataType.isArrayType()) {
+    }
     stringBuffer.append(TEXT_293);
-    stringBuffer.append(genModel.getImportedName("java.lang.UnsupportedOperationException"));
+    }
     stringBuffer.append(TEXT_294);
-    } else if (genDataType.isPrimitiveType()) {
+    stringBuffer.append(genDataType.getName());
     stringBuffer.append(TEXT_295);
-    stringBuffer.append(genDataType.getObjectInstanceClassName());
+    } else if (genDataType.isArrayType()) {
     stringBuffer.append(TEXT_296);
-    stringBuffer.append(eDataType);
+    stringBuffer.append(genModel.getImportedName("java.lang.UnsupportedOperationException"));
     stringBuffer.append(TEXT_297);
-    stringBuffer.append(genDataType.getPrimitiveValueFunction());
-    stringBuffer.append(TEXT_298);
     } else {
+    stringBuffer.append(TEXT_298);
+    stringBuffer.append(genDataType.getClassifierID());
     stringBuffer.append(TEXT_299);
-    stringBuffer.append(genDataType.getObjectInstanceClassName());
-    stringBuffer.append(TEXT_300);
-    stringBuffer.append(eDataType);
-    stringBuffer.append(TEXT_301);
-    }
-    stringBuffer.append(TEXT_302);
-    }
-    stringBuffer.append(TEXT_303);
-    stringBuffer.append(genDataType.getObjectInstanceClassName());
-    stringBuffer.append(TEXT_304);
-    stringBuffer.append(genDataType.getName());
-    stringBuffer.append(TEXT_305);
-    stringBuffer.append(genModel.getImportedName("commonj.sdo.Type"));
-    stringBuffer.append(TEXT_306);
-    if (genDataType instanceof GenEnum) {
-    if (genPackage.isDataTypeConverters()) {
-    stringBuffer.append(TEXT_307);
-    stringBuffer.append(genDataType.getName());
-    stringBuffer.append(TEXT_308);
-    } else {
-    stringBuffer.append(TEXT_309);
-    stringBuffer.append(((GenEnum)genDataType).getImportedInstanceClassName());
-    stringBuffer.append(TEXT_310);
-    stringBuffer.append(((GenEnum)genDataType).getImportedInstanceClassName());
-    stringBuffer.append(TEXT_311);
-    stringBuffer.append(genModel.getNonNLS());
-    stringBuffer.append(genModel.getNonNLS(2));
-    stringBuffer.append(genModel.getNonNLS(3));
-    stringBuffer.append(TEXT_312);
-    }
-    } else if (genDataType.getBaseType() != null) { GenDataType genBaseType = genDataType.getBaseType(); 
-    if (genBaseType.getGenPackage() == genPackage) {
-    stringBuffer.append(TEXT_313);
-    stringBuffer.append(genDataType.getObjectInstanceClassName());
-    stringBuffer.append(TEXT_314);
-    stringBuffer.append(genBaseType.getName());
-    stringBuffer.append(TEXT_315);
-    stringBuffer.append(SDOGenUtil.getQualifiedTypeAccessor(genDataType));
-    stringBuffer.append(TEXT_316);
-    } else {
-    stringBuffer.append(TEXT_317);
-    stringBuffer.append(genDataType.getObjectInstanceClassName());
-    stringBuffer.append(TEXT_318);
-    stringBuffer.append(genBaseType.getGenPackage().getQualifiedEFactoryInternalInstanceAccessor());
-    stringBuffer.append(TEXT_319);
-    stringBuffer.append(genBaseType.getQualifiedClassifierAccessor());
-    stringBuffer.append(TEXT_320);
-    }
-    } else if (genDataType.getItemType() != null) { GenDataType genItemType = genDataType.getItemType(); 
-    if (genPackage.isDataTypeConverters()) {
-    stringBuffer.append(TEXT_321);
-    stringBuffer.append(genDataType.getName());
-    stringBuffer.append(TEXT_322);
-    } else {
-    stringBuffer.append(TEXT_323);
-    stringBuffer.append(genModel.getImportedName("java.util.List"));
-    stringBuffer.append(TEXT_324);
-    stringBuffer.append(genModel.getImportedName("java.util.ArrayList"));
-    stringBuffer.append(TEXT_325);
-    stringBuffer.append(genModel.getImportedName("java.util.StringTokenizer"));
-    stringBuffer.append(TEXT_326);
-    stringBuffer.append(genModel.getImportedName("java.util.StringTokenizer"));
-    stringBuffer.append(TEXT_327);
-    if (genItemType.getGenPackage() == genPackage) {
-    stringBuffer.append(TEXT_328);
-    stringBuffer.append(genItemType.getName());
-    stringBuffer.append(TEXT_329);
-    stringBuffer.append(genItemType.getQualifiedClassifierAccessor());
-    stringBuffer.append(TEXT_330);
-    } else {
-    stringBuffer.append(TEXT_331);
-    stringBuffer.append(genItemType.getGenPackage().getQualifiedEFactoryInternalInstanceAccessor());
-    stringBuffer.append(TEXT_332);
-    stringBuffer.append(genItemType.getQualifiedClassifierAccessor());
-    stringBuffer.append(TEXT_333);
-    }
-    stringBuffer.append(TEXT_334);
-    }
-    } else if (!genDataType.getMemberTypes().isEmpty()) {
-    if (genPackage.isDataTypeConverters()) {
-    if (genDataType.isPrimitiveType()) {
-    stringBuffer.append(TEXT_335);
-    stringBuffer.append(genDataType.getObjectInstanceClassName());
-    stringBuffer.append(TEXT_336);
-    stringBuffer.append(genDataType.getName());
-    stringBuffer.append(TEXT_337);
-    } else {
-    stringBuffer.append(TEXT_338);
-    stringBuffer.append(genDataType.getName());
-    stringBuffer.append(TEXT_339);
-    }
-    } else {
-    stringBuffer.append(TEXT_340);
-    stringBuffer.append(genDataType.getObjectInstanceClassName());
-    stringBuffer.append(TEXT_341);
-    for (Iterator j = genDataType.getMemberTypes().iterator(); j.hasNext(); ) { GenDataType genMemberType = (GenDataType)j.next();
-    stringBuffer.append(TEXT_342);
-    if (genMemberType.getGenPackage() == genPackage) {
-    stringBuffer.append(TEXT_343);
-    stringBuffer.append(genDataType.getObjectInstanceClassName());
-    stringBuffer.append(TEXT_344);
-    stringBuffer.append(genMemberType.getName());
-    stringBuffer.append(TEXT_345);
-    stringBuffer.append(genMemberType.getQualifiedClassifierAccessor());
-    stringBuffer.append(TEXT_346);
-    } else {
-    stringBuffer.append(TEXT_347);
-    stringBuffer.append(genDataType.getObjectInstanceClassName());
-    stringBuffer.append(TEXT_348);
-    stringBuffer.append(genMemberType.getGenPackage().getQualifiedEFactoryInternalInstanceAccessor());
-    stringBuffer.append(TEXT_349);
-    stringBuffer.append(genMemberType.getQualifiedClassifierAccessor());
-    stringBuffer.append(TEXT_350);
-    }
-    stringBuffer.append(TEXT_351);
-    stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.Diagnostician"));
-    stringBuffer.append(TEXT_352);
-    }
-    stringBuffer.append(TEXT_353);
-    }
-    } else if (genDataType.isArrayType()) {
-    stringBuffer.append(TEXT_354);
-    stringBuffer.append(genModel.getImportedName("java.lang.UnsupportedOperationException"));
-    stringBuffer.append(TEXT_355);
-    } else {
-    stringBuffer.append(TEXT_356);
-    stringBuffer.append(genDataType.getObjectInstanceClassName());
-    stringBuffer.append(TEXT_357);
-    }
-    stringBuffer.append(TEXT_358);
-    if (genPackage.isDataTypeConverters()) { String eDataType = genDataType.getQualifiedClassifierAccessor();
-    stringBuffer.append(TEXT_359);
-    stringBuffer.append(genDataType.getName());
-    stringBuffer.append(TEXT_360);
-    stringBuffer.append(genDataType.getImportedInstanceClassName());
-    stringBuffer.append(TEXT_361);
-    if (genDataType instanceof GenEnum) {
-    stringBuffer.append(TEXT_362);
-    } else if (genDataType.getBaseType() != null) { GenDataType genBaseType = genDataType.getBaseType(); boolean isPrimitiveConversion = !genDataType.isPrimitiveType() && genBaseType.isPrimitiveType();
-    if (genBaseType.getGenPackage() == genPackage) {
-    if (isPrimitiveConversion) {
-    stringBuffer.append(TEXT_363);
-    stringBuffer.append(genBaseType.getName());
-    stringBuffer.append(TEXT_364);
-    stringBuffer.append(genBaseType.getPrimitiveValueFunction());
-    stringBuffer.append(TEXT_365);
-    } else {
-    stringBuffer.append(TEXT_366);
-    stringBuffer.append(genBaseType.getName());
-    stringBuffer.append(TEXT_367);
-    }
-    } else if (genBaseType.getGenPackage().isDataTypeConverters()) {
-    stringBuffer.append(TEXT_368);
-    stringBuffer.append(genBaseType.getGenPackage().getQualifiedFactoryInstanceAccessor());
-    stringBuffer.append(TEXT_369);
-    stringBuffer.append(genBaseType.getName());
-    stringBuffer.append(TEXT_370);
-    } else {
-    stringBuffer.append(TEXT_371);
-    stringBuffer.append(genBaseType.getGenPackage().getQualifiedEFactoryInternalInstanceAccessor());
-    stringBuffer.append(TEXT_372);
-    stringBuffer.append(genBaseType.getQualifiedClassifierAccessor());
-    stringBuffer.append(TEXT_373);
-    }
-    } else if (genDataType.getItemType() != null) { GenDataType genItemType = genDataType.getItemType(); 
-    stringBuffer.append(TEXT_374);
-    stringBuffer.append(genModel.getImportedName("java.lang.StringBuffer"));
-    stringBuffer.append(TEXT_375);
-    stringBuffer.append(genModel.getImportedName("java.lang.StringBuffer"));
-    stringBuffer.append(TEXT_376);
-    stringBuffer.append(genModel.getImportedName("java.util.Iterator"));
-    stringBuffer.append(TEXT_377);
-    if (genItemType.getGenPackage() == genPackage) {
-    if (genPackage.isDataTypeConverters()) { genItemType = genItemType.getObjectType();
-    stringBuffer.append(TEXT_378);
-    stringBuffer.append(genItemType.getName());
-    stringBuffer.append(TEXT_379);
-    stringBuffer.append(genItemType.getObjectInstanceClassName());
-    stringBuffer.append(TEXT_380);
-    } else {
-    stringBuffer.append(TEXT_381);
-    stringBuffer.append(genItemType.getName());
-    stringBuffer.append(TEXT_382);
-    stringBuffer.append(genItemType.getQualifiedClassifierAccessor());
-    stringBuffer.append(TEXT_383);
-    }

[... 273 lines stripped ...]


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