tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fuh...@apache.org
Subject svn commit: r575081 - in /incubator/tuscany/java/sdo: tools-test/pom.xml tools/src/main/java/org/apache/tuscany/sdo/generate/templates/model/SDOFactoryClass.java tools/templates/models/SDOFactoryClass.javajet
Date Wed, 12 Sep 2007 21:19:56 GMT
Author: fuhwei
Date: Wed Sep 12 14:19:55 2007
New Revision: 575081

URL: http://svn.apache.org/viewvc?rev=575081&view=rev
Log:
Fixed TUSCANY-1505

Modified:
    incubator/tuscany/java/sdo/tools-test/pom.xml
    incubator/tuscany/java/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/templates/model/SDOFactoryClass.java
    incubator/tuscany/java/sdo/tools/templates/models/SDOFactoryClass.javajet

Modified: incubator/tuscany/java/sdo/tools-test/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/tools-test/pom.xml?rev=575081&r1=575080&r2=575081&view=diff
==============================================================================
--- incubator/tuscany/java/sdo/tools-test/pom.xml (original)
+++ incubator/tuscany/java/sdo/tools-test/pom.xml Wed Sep 12 14:19:55 2007
@@ -111,6 +111,15 @@
                         </goals>
                     </execution>
                     <execution>
+                        <id>extensible_infostreet</id>
+                        <configuration>
+                            <schemaFile>${basedir}/src/main/resources/extensible/infostreet.xsd</schemaFile>
+                        </configuration>
+                        <goals>
+                            <goal>generate</goal>
+                        </goals>
+                    </execution>
+                    <execution>
                         <id>subgroup</id>
                         <configuration>
                             <schemaFile>${basedir}/src/main/resources/subgroup.xsd</schemaFile>

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?rev=575081&r1=575080&r2=575081&view=diff
==============================================================================
--- 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 Sep 12 14:19:55 2007
@@ -46,7 +46,7 @@
   protected final String TEXT_6 = ";";
   protected final String TEXT_7 = NL + "package ";
   protected final String TEXT_8 = ";";
-  protected final String TEXT_9 = NL + NL + "import commonj.sdo.helper.HelperContext;";
+  protected final String TEXT_9 = NL + NL + "import commonj.sdo.helper.HelperContext;" + NL + "import org.apache.tuscany.sdo.helper.HelperContextImpl;";
   protected final String TEXT_10 = NL + "import org.apache.tuscany.sdo.helper.TypeHelperImpl;";
   protected final String TEXT_11 = NL;
   protected final String TEXT_12 = NL;
@@ -91,10 +91,10 @@
   protected final String TEXT_51 = NL + "\t";
   protected final String TEXT_52 = NL + "\t/**" + NL + "\t * Creates an instance of the factory." + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic ";
   protected final String TEXT_53 = "()" + NL + "\t{" + NL + "\t\tsuper(NAMESPACE_URI, NAMESPACE_PREFIX, \"";
-  protected final String TEXT_54 = "\");" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * Registers the Factory instance so that it is available within the supplied scope." + NL + "   * @argument scope a HelperContext instance that will make the types supported by this Factory available." + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic void register(HelperContext scope) " + NL + "\t{" + NL + "\t\tif(scope == null) {" + NL + "\t\t\tthrow new IllegalArgumentException(\"Scope can not be null\");" + NL + "\t\t}" + NL + "    " + NL + "\t\t//Register dependent packages with provided scope";
+  protected final String TEXT_54 = "\");" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * Registers the Factory instance so that it is available within the supplied scope." + NL + "   * @argument scope a HelperContext instance that will make the types supported by this Factory available." + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic void register(HelperContext scope) " + NL + "\t{" + NL + "\t\tif(scope == null) {" + NL + "\t\t\tthrow new IllegalArgumentException(\"Scope can not be null\");" + NL + "\t\t}" + NL + "" + NL + "\t\tif (((HelperContextImpl)scope).getExtendedMetaData().getPackage(NAMESPACE_URI) != null)" + NL + "\t\t\treturn;" + NL + "    " + NL + "\t\t// Register this package with provided scope   " + NL + "\t\t((HelperContextImpl)scope).getExtendedMetaData().putPackage(NAMESPACE_URI, this);" + NL + "\t\t" + NL + "\t\t//Register dependent packages with provided scope";
   protected final String TEXT_55 = NL + "\t\t";
   protected final String TEXT_56 = ".INSTANCE.register(scope);";
-  protected final String TEXT_57 = NL + "    " + NL + "\t\t// Initialize this package   " + NL + "\t\tTypeHelperImpl th = (TypeHelperImpl)scope.getTypeHelper();" + NL + "\t\tth.getExtendedMetaData().putPackage(NAMESPACE_URI, this);" + NL + "  }" + NL + "\t" + NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic ";
+  protected final String TEXT_57 = NL + "  }" + NL + "\t" + NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic ";
   protected final String TEXT_58 = " create(int typeNumber)" + NL + "\t{" + NL + "\t\tswitch (typeNumber)" + NL + "\t\t{";
   protected final String TEXT_59 = NL + "\t\t\tcase ";
   protected final String TEXT_60 = ": return (";
@@ -139,223 +139,218 @@
   protected final String TEXT_99 = "\t" + NL + "" + NL + "\tprivate static ";
   protected final String TEXT_100 = " instance = null; " + NL + "\tpublic static ";
   protected final String TEXT_101 = " init()" + NL + "\t{" + NL + "\t\tif (instance != null ) return instance;" + NL + "\t\tinstance = new ";
-  protected final String TEXT_102 = "();" + NL + "" + NL + "\t\t// Initialize dependent packages";
-  protected final String TEXT_103 = NL + "\t\t";
-  protected final String TEXT_104 = " ";
-  protected final String TEXT_105 = "Instance = ";
-  protected final String TEXT_106 = ".INSTANCE;";
-  protected final String TEXT_107 = NL + "\t\t" + NL + "\t\t// Create package meta-data objects" + NL + "\t\tinstance.createMetaData();" + NL + "" + NL + "\t\t// Initialize created meta-data" + NL + "\t\tinstance.initializeMetaData();" + NL + "\t\t" + NL + "\t\t// Mark meta-data to indicate it can't be changed" + NL + "\t\t//the";
-  protected final String TEXT_108 = ".freeze(); //FB do we need to freeze / should we freeze ????" + NL + "" + NL + "\t\treturn instance;" + 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_109 = "\t" + NL + "" + NL + "\t\t// Create types and their properties";
-  protected final String TEXT_110 = NL + "\t\t";
-  protected final String TEXT_111 = "Type = createType(false, ";
-  protected final String TEXT_112 = ");";
-  protected final String TEXT_113 = NL + "\t\tcreateProperty(";
-  protected final String TEXT_114 = ", ";
-  protected final String TEXT_115 = "Type,";
-  protected final String TEXT_116 = ".INTERNAL_";
-  protected final String TEXT_117 = "); ";
-  protected final String TEXT_118 = NL + NL + "\t\t// Create data types";
+  protected final String TEXT_102 = "();" + NL + "" + NL + "\t\t// Create package meta-data objects" + NL + "\t\tinstance.createMetaData();" + NL + "" + NL + "\t\t// Initialize created meta-data" + NL + "\t\tinstance.initializeMetaData();" + NL + "\t\t" + NL + "\t\t// Mark meta-data to indicate it can't be changed" + NL + "\t\t//the";
+  protected final String TEXT_103 = ".freeze(); //FB do we need to freeze / should we freeze ????" + NL + "" + NL + "\t\treturn instance;" + 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_104 = "\t" + NL + "" + NL + "\t\t// Create types and their properties";
+  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 = ".INTERNAL_";
+  protected final String TEXT_112 = "); ";
+  protected final String TEXT_113 = NL + NL + "\t\t// Create data types";
+  protected final String TEXT_114 = NL + "\t\t";
+  protected final String TEXT_115 = "Type = createType(true, ";
+  protected final String TEXT_116 = " );";
+  protected final String TEXT_117 = 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_118 = NL + NL + "\t\t// Obtain other dependent packages";
   protected final String TEXT_119 = NL + "\t\t";
-  protected final String TEXT_120 = "Type = createType(true, ";
-  protected final String TEXT_121 = " );";
-  protected final String TEXT_122 = 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_123 = NL + NL + "\t\t// Obtain other dependent packages";
+  protected final String TEXT_120 = " ";
+  protected final String TEXT_121 = " = (";
+  protected final String TEXT_122 = ")";
+  protected final String TEXT_123 = ".init();";
   protected final String TEXT_124 = NL + "\t\t";
-  protected final String TEXT_125 = " ";
-  protected final String TEXT_126 = " = (";
-  protected final String TEXT_127 = ")";
-  protected final String TEXT_128 = ".INSTANCE;";
-  protected final String TEXT_129 = NL + "\t\t";
-  protected final String TEXT_130 = " property = null;" + NL + "" + NL + "\t\t// Add supertypes to types";
-  protected final String TEXT_131 = NL + "\t\taddSuperType(";
+  protected final String TEXT_125 = " property = null;" + NL + "" + NL + "\t\t// Add supertypes to types";
+  protected final String TEXT_126 = NL + "\t\taddSuperType(";
+  protected final String TEXT_127 = "Type, ";
+  protected final String TEXT_128 = ".get";
+  protected final String TEXT_129 = "());";
+  protected final String TEXT_130 = NL + NL + "\t\t// Initialize types and properties";
+  protected final String TEXT_131 = NL + "\t\tinitializeType(";
   protected final String TEXT_132 = "Type, ";
-  protected final String TEXT_133 = ".get";
-  protected final String TEXT_134 = "());";
-  protected final String TEXT_135 = NL + NL + "\t\t// Initialize types and properties";
-  protected final String TEXT_136 = NL + "\t\tinitializeType(";
-  protected final String TEXT_137 = "Type, ";
-  protected final String TEXT_138 = ".class, \"";
-  protected final String TEXT_139 = "\", ";
+  protected final String TEXT_133 = ".class, \"";
+  protected final String TEXT_134 = "\", ";
+  protected final String TEXT_135 = ");";
+  protected final String TEXT_136 = NL + "\t\tsetInstanceProperty (";
+  protected final String TEXT_137 = "Type, \"";
+  protected final String TEXT_138 = "\", ";
+  protected final String TEXT_139 = ", ";
   protected final String TEXT_140 = ");";
-  protected final String TEXT_141 = NL + "\t\tsetInstanceProperty (";
-  protected final String TEXT_142 = "Type, \"";
-  protected final String TEXT_143 = "\", ";
-  protected final String TEXT_144 = ", ";
-  protected final String TEXT_145 = ");";
-  protected final String TEXT_146 = NL + "\t\tproperty = getLocalProperty(";
-  protected final String TEXT_147 = "Type, ";
-  protected final String TEXT_148 = ");";
-  protected final String TEXT_149 = NL + "\t\tinitializeProperty(property, ";
-  protected final String TEXT_150 = ", \"";
-  protected final String TEXT_151 = "\", ";
+  protected final String TEXT_141 = NL + "\t\tproperty = getLocalProperty(";
+  protected final String TEXT_142 = "Type, ";
+  protected final String TEXT_143 = ");";
+  protected final String TEXT_144 = NL + "\t\tinitializeProperty(property, ";
+  protected final String TEXT_145 = ", \"";
+  protected final String TEXT_146 = "\", ";
+  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 = ");";
-  protected final String TEXT_161 = NL + "\t\tinitializeProperty(property, ";
-  protected final String TEXT_162 = ", \"";
-  protected final String TEXT_163 = "\", ";
+  protected final String TEXT_154 = " , ";
+  protected final String TEXT_155 = ");";
+  protected final String TEXT_156 = NL + "\t\tinitializeProperty(property, ";
+  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 = ", ";
   protected final String TEXT_164 = ", ";
-  protected final String TEXT_165 = ", ";
-  protected final String TEXT_166 = ", ";
-  protected final String TEXT_167 = ", ";
+  protected final String TEXT_165 = ");";
+  protected final String TEXT_166 = NL + "\t\tsetInstanceProperty (property, \"";
+  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 = NL + "\t\tsetInstanceProperty (property, \"";
-  protected final String TEXT_172 = "\", ";
-  protected final String TEXT_173 = ", ";
-  protected final String TEXT_174 = ");";
-  protected final String TEXT_175 = NL;
-  protected final String TEXT_176 = NL + "\t\t// Initialize data types";
-  protected final String TEXT_177 = NL + "\t\tinitializeType(";
-  protected final String TEXT_178 = "Type, ";
-  protected final String TEXT_179 = ".class, \"";
+  protected final String TEXT_169 = ");";
+  protected final String TEXT_170 = NL;
+  protected final String TEXT_171 = NL + "\t\t// Initialize data types";
+  protected final String TEXT_172 = NL + "\t\tinitializeType(";
+  protected final String TEXT_173 = "Type, ";
+  protected final String TEXT_174 = ".class, \"";
+  protected final String TEXT_175 = "\", ";
+  protected final String TEXT_176 = ", ";
+  protected final String TEXT_177 = ");";
+  protected final String TEXT_178 = NL + "\t\tsetInstanceProperty (";
+  protected final String TEXT_179 = "Type, \"";
   protected final String TEXT_180 = "\", ";
   protected final String TEXT_181 = ", ";
   protected final String TEXT_182 = ");";
-  protected final String TEXT_183 = NL + "\t\tsetInstanceProperty (";
-  protected final String TEXT_184 = "Type, \"";
-  protected final String TEXT_185 = "\", ";
-  protected final String TEXT_186 = ", ";
-  protected final String TEXT_187 = ");";
-  protected final String TEXT_188 = NL;
-  protected final String TEXT_189 = NL + "\t\tcreateXSDMetaData(";
-  protected final String TEXT_190 = ");" + NL + "\t}" + NL + "\t  " + NL + "\tprotected void createXSDMetaData(";
-  protected final String TEXT_191 = ")" + NL + "\t{" + NL + "\t\tsuper.initXSD();" + NL + "\t\t" + NL + "\t\t";
-  protected final String TEXT_192 = " property = null;" + NL + "\t\t";
-  protected final String TEXT_193 = NL + "\t\taddXSDMapping" + NL + "\t\t  (new String[]" + NL + "\t\t\t {";
-  protected final String TEXT_194 = NL + "\t\t\t ";
-  protected final String TEXT_195 = ", ";
-  protected final String TEXT_196 = NL + "\t\t\t }," + NL + "\t\t\t \"";
-  protected final String TEXT_197 = "\");" + NL;
-  protected final String TEXT_198 = NL;
-  protected final String TEXT_199 = NL + "\t\taddXSDMapping" + NL + "\t\t  (";
-  protected final String TEXT_200 = "Type," + NL + "\t\t\t new String[] " + NL + "\t\t\t {";
-  protected final String TEXT_201 = NL + "\t\t\t ";
-  protected final String TEXT_202 = ", ";
-  protected final String TEXT_203 = NL + "\t\t\t });" + NL;
-  protected final String TEXT_204 = NL + "\t\tproperty = createGlobalProperty" + NL + "\t\t  (\"";
-  protected final String TEXT_205 = "\"," + NL + "\t\t  ";
-  protected final String TEXT_206 = ".get";
-  protected final String TEXT_207 = "()," + NL + "\t\t\t new String[]" + NL + "\t\t\t {";
-  protected final String TEXT_208 = NL + "\t\t\t ";
-  protected final String TEXT_209 = ", ";
-  protected final String TEXT_210 = NL + "\t\t\t }," + NL + "\t\t\t IS_ATTRIBUTE);";
-  protected final String TEXT_211 = NL + "\t\t\t });";
-  protected final String TEXT_212 = NL + "              ";
-  protected final String TEXT_213 = NL + "\t\tsetInstanceProperty" + NL + "\t\t  (property," + NL + "\t\t\t \"";
-  protected final String TEXT_214 = "\"," + NL + "\t\t\t ";
-  protected final String TEXT_215 = ", ";
-  protected final String TEXT_216 = ");";
-  protected final String TEXT_217 = NL + "                  ";
-  protected final String TEXT_218 = "  ";
-  protected final String TEXT_219 = NL + "\t\taddXSDMapping" + NL + "\t\t\t(getLocalProperty(";
-  protected final String TEXT_220 = "Type, ";
-  protected final String TEXT_221 = ")," + NL + "\t\t\t new String[]" + NL + "\t\t\t {";
-  protected final String TEXT_222 = NL + "\t\t\t ";
-  protected final String TEXT_223 = ", ";
-  protected final String TEXT_224 = NL + "\t\t\t });" + NL;
-  protected final String TEXT_225 = NL + "  }" + NL + "    ";
-  protected final String TEXT_226 = NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic ";
-  protected final String TEXT_227 = " create";
-  protected final String TEXT_228 = "FromString(String initialValue)" + NL + "\t{";
-  protected final String TEXT_229 = NL + "\t\t";
-  protected final String TEXT_230 = " result = ";
-  protected final String TEXT_231 = ".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_232 = NL + "\t\treturn result;";
-  protected final String TEXT_233 = NL + "\t\treturn (";
-  protected final String TEXT_234 = ")create";
-  protected final String TEXT_235 = "FromString(initialValue);";
-  protected final String TEXT_236 = NL + "\t\treturn (";
-  protected final String TEXT_237 = ")";
-  protected final String TEXT_238 = ".create";
-  protected final String TEXT_239 = "FromString(initialValue);";
-  protected final String TEXT_240 = NL + "\t\tif (initialValue == null) return null;" + NL + "\t\t";
-  protected final String TEXT_241 = " result = new ";
-  protected final String TEXT_242 = "();" + NL + "\t\tfor (";
-  protected final String TEXT_243 = " stringTokenizer = new ";
-  protected final String TEXT_244 = "(initialValue); stringTokenizer.hasMoreTokens(); )" + NL + "\t\t{" + NL + "\t\t\tString item = stringTokenizer.nextToken();";
-  protected final String TEXT_245 = NL + "\t\t\tresult.add(create";
-  protected final String TEXT_246 = "FromString(item));";
-  protected final String TEXT_247 = NL + "\t\t\tresult.add(";
-  protected final String TEXT_248 = ".create";
-  protected final String TEXT_249 = "FromString(item));";
-  protected final String TEXT_250 = NL + "\t\t}" + NL + "\t\treturn result;";
-  protected final String TEXT_251 = NL + "\t\tif (initialValue == null) return null;" + NL + "\t\t";
-  protected final String TEXT_252 = " result = null;" + NL + "\t\tRuntimeException exception = null;";
-  protected final String TEXT_253 = NL + "\t\ttry" + NL + "\t\t{";
-  protected final String TEXT_254 = NL + "\t\t\tresult = (";
-  protected final String TEXT_255 = ")create";
-  protected final String TEXT_256 = "FromString(initialValue);";
-  protected final String TEXT_257 = NL + "\t\t\tresult = (";
-  protected final String TEXT_258 = ")";
-  protected final String TEXT_259 = ".create";
-  protected final String TEXT_260 = "FromString(initialValue);";
-  protected final String TEXT_261 = 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_262 = NL + "\t\tif (result != null || exception == null) return result;" + NL + "    " + NL + "\t\tthrow exception;";
-  protected final String TEXT_263 = 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_264 = "();";
-  protected final String TEXT_265 = NL + "\t\treturn (";
-  protected final String TEXT_266 = ")super.createFromString(";
-  protected final String TEXT_267 = ", initialValue);";
-  protected final String TEXT_268 = 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_269 = "ToString(Object instanceValue)" + NL + "\t{";
-  protected final String TEXT_270 = NL + "\t\treturn instanceValue == null ? null : instanceValue.toString();";
-  protected final String TEXT_271 = NL + "\t\treturn convert";
-  protected final String TEXT_272 = "ToString(instanceValue);";
-  protected final String TEXT_273 = NL + "\t\treturn ";
-  protected final String TEXT_274 = ".convert";
-  protected final String TEXT_275 = "ToString(instanceValue);";
-  protected final String TEXT_276 = NL + "\t\tif (instanceValue == null) return null;" + NL + "\t\t";
-  protected final String TEXT_277 = " list = (";
-  protected final String TEXT_278 = ")instanceValue;" + NL + "\t\tif (list.isEmpty()) return \"\";" + NL + "\t\t";
-  protected final String TEXT_279 = " result = new ";
-  protected final String TEXT_280 = "();" + NL + "\t\tfor (";
-  protected final String TEXT_281 = " i = list.iterator(); i.hasNext(); )" + NL + "\t\t{";
-  protected final String TEXT_282 = NL + "\t\t\tresult.append(convert";
-  protected final String TEXT_283 = "ToString(i.next()));";
-  protected final String TEXT_284 = NL + "\t\t\tresult.append(";
-  protected final String TEXT_285 = ".convert";
-  protected final String TEXT_286 = "ToString(i.next()));";
-  protected final String TEXT_287 = NL + "\t\t\tresult.append(' ');" + NL + "\t\t}" + NL + "\t\treturn result.substring(0, result.length() - 1);";
-  protected final String TEXT_288 = NL + "\t\tif (instanceValue == null) return null;";
-  protected final String TEXT_289 = NL + "\t\tif (";
-  protected final String TEXT_290 = ".isInstance(instanceValue))" + NL + "\t\t{" + NL + "\t\t\ttry" + NL + "\t\t\t{";
-  protected final String TEXT_291 = NL + "\t\t\t\tString value = convert";
-  protected final String TEXT_292 = "ToString(instanceValue);";
-  protected final String TEXT_293 = NL + "\t\t\t\tString value = ";
-  protected final String TEXT_294 = ".convert";
-  protected final String TEXT_295 = "ToString(instanceValue);";
-  protected final String TEXT_296 = 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_297 = NL + "\t\tthrow new IllegalArgumentException(\"Invalid value: '\"+instanceValue+\"' for datatype :";
-  protected final String TEXT_298 = "\");";
-  protected final String TEXT_299 = 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_300 = "();";
-  protected final String TEXT_301 = NL + "\t\treturn super.convertToString(";
-  protected final String TEXT_302 = ", instanceValue);";
-  protected final String TEXT_303 = NL + "\t}" + NL;
-  protected final String TEXT_304 = NL + "\t/**" + NL + "\t * Returns a new object of class '<em>";
-  protected final String TEXT_305 = "</em>'." + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @return a new object of class '<em>";
-  protected final String TEXT_306 = "</em>'." + NL + "\t * @generated" + NL + "\t */" + NL + "\t";
+  protected final String TEXT_183 = NL;
+  protected final String TEXT_184 = NL + "\t\tcreateXSDMetaData(";
+  protected final String TEXT_185 = ");" + NL + "\t}" + NL + "\t  " + NL + "\tprotected void createXSDMetaData(";
+  protected final String TEXT_186 = ")" + NL + "\t{" + NL + "\t\tsuper.initXSD();" + NL + "\t\t" + NL + "\t\t";
+  protected final String TEXT_187 = " property = null;" + NL + "\t\t";
+  protected final String TEXT_188 = NL + "\t\taddXSDMapping" + NL + "\t\t  (new String[]" + NL + "\t\t\t {";
+  protected final String TEXT_189 = NL + "\t\t\t ";
+  protected final String TEXT_190 = ", ";
+  protected final String TEXT_191 = NL + "\t\t\t }," + NL + "\t\t\t \"";
+  protected final String TEXT_192 = "\");" + NL;
+  protected final String TEXT_193 = NL;
+  protected final String TEXT_194 = NL + "\t\taddXSDMapping" + NL + "\t\t  (";
+  protected final String TEXT_195 = "Type," + NL + "\t\t\t new String[] " + NL + "\t\t\t {";
+  protected final String TEXT_196 = NL + "\t\t\t ";
+  protected final String TEXT_197 = ", ";
+  protected final String TEXT_198 = NL + "\t\t\t });" + NL;
+  protected final String TEXT_199 = NL + "\t\tproperty = createGlobalProperty" + NL + "\t\t  (\"";
+  protected final String TEXT_200 = "\"," + NL + "\t\t  ";
+  protected final String TEXT_201 = ".get";
+  protected final String TEXT_202 = "()," + 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 + "\t\t\t IS_ATTRIBUTE);";
+  protected final String TEXT_206 = NL + "\t\t\t });";
+  protected final String TEXT_207 = NL + "              ";
+  protected final String TEXT_208 = NL + "\t\tsetInstanceProperty" + NL + "\t\t  (property," + NL + "\t\t\t \"";
+  protected final String TEXT_209 = "\"," + NL + "\t\t\t ";
+  protected final String TEXT_210 = ", ";
+  protected final String TEXT_211 = ");";
+  protected final String TEXT_212 = NL + "                  ";
+  protected final String TEXT_213 = "  ";
+  protected final String TEXT_214 = NL + "\t\taddXSDMapping" + NL + "\t\t\t(getLocalProperty(";
+  protected final String TEXT_215 = "Type, ";
+  protected final String TEXT_216 = ")," + NL + "\t\t\t new String[]" + NL + "\t\t\t {";
+  protected final String TEXT_217 = NL + "\t\t\t ";
+  protected final String TEXT_218 = ", ";
+  protected final String TEXT_219 = NL + "\t\t\t });" + NL;
+  protected final String TEXT_220 = NL + "  }" + NL + "    ";
+  protected final String TEXT_221 = NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic ";
+  protected final String TEXT_222 = " create";
+  protected final String TEXT_223 = "FromString(String initialValue)" + NL + "\t{";
+  protected final String TEXT_224 = NL + "\t\t";
+  protected final String TEXT_225 = " result = ";
+  protected final String TEXT_226 = ".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_227 = NL + "\t\treturn result;";
+  protected final String TEXT_228 = NL + "\t\treturn (";
+  protected final String TEXT_229 = ")create";
+  protected final String TEXT_230 = "FromString(initialValue);";
+  protected final String TEXT_231 = NL + "\t\treturn (";
+  protected final String TEXT_232 = ")";
+  protected final String TEXT_233 = ".create";
+  protected final String TEXT_234 = "FromString(initialValue);";
+  protected final String TEXT_235 = NL + "\t\tif (initialValue == null) return null;" + NL + "\t\t";
+  protected final String TEXT_236 = " result = new ";
+  protected final String TEXT_237 = "();" + NL + "\t\tfor (";
+  protected final String TEXT_238 = " stringTokenizer = new ";
+  protected final String TEXT_239 = "(initialValue); stringTokenizer.hasMoreTokens(); )" + NL + "\t\t{" + NL + "\t\t\tString item = stringTokenizer.nextToken();";
+  protected final String TEXT_240 = NL + "\t\t\tresult.add(create";
+  protected final String TEXT_241 = "FromString(item));";
+  protected final String TEXT_242 = NL + "\t\t\tresult.add(";
+  protected final String TEXT_243 = ".create";
+  protected final String TEXT_244 = "FromString(item));";
+  protected final String TEXT_245 = NL + "\t\t}" + NL + "\t\treturn result;";
+  protected final String TEXT_246 = NL + "\t\tif (initialValue == null) return null;" + NL + "\t\t";
+  protected final String TEXT_247 = " result = null;" + NL + "\t\tRuntimeException exception = null;";
+  protected final String TEXT_248 = NL + "\t\ttry" + NL + "\t\t{";
+  protected final String TEXT_249 = NL + "\t\t\tresult = (";
+  protected final String TEXT_250 = ")create";
+  protected final String TEXT_251 = "FromString(initialValue);";
+  protected final String TEXT_252 = NL + "\t\t\tresult = (";
+  protected final String TEXT_253 = ")";
+  protected final String TEXT_254 = ".create";
+  protected final String TEXT_255 = "FromString(initialValue);";
+  protected final String TEXT_256 = 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_257 = NL + "\t\tif (result != null || exception == null) return result;" + NL + "    " + NL + "\t\tthrow exception;";
+  protected final String TEXT_258 = 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_259 = "();";
+  protected final String TEXT_260 = NL + "\t\treturn (";
+  protected final String TEXT_261 = ")super.createFromString(";
+  protected final String TEXT_262 = ", initialValue);";
+  protected final String TEXT_263 = 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_264 = "ToString(Object instanceValue)" + NL + "\t{";
+  protected final String TEXT_265 = NL + "\t\treturn instanceValue == null ? null : instanceValue.toString();";
+  protected final String TEXT_266 = NL + "\t\treturn convert";
+  protected final String TEXT_267 = "ToString(instanceValue);";
+  protected final String TEXT_268 = NL + "\t\treturn ";
+  protected final String TEXT_269 = ".convert";
+  protected final String TEXT_270 = "ToString(instanceValue);";
+  protected final String TEXT_271 = NL + "\t\tif (instanceValue == null) return null;" + NL + "\t\t";
+  protected final String TEXT_272 = " list = (";
+  protected final String TEXT_273 = ")instanceValue;" + NL + "\t\tif (list.isEmpty()) return \"\";" + NL + "\t\t";
+  protected final String TEXT_274 = " result = new ";
+  protected final String TEXT_275 = "();" + NL + "\t\tfor (";
+  protected final String TEXT_276 = " i = list.iterator(); i.hasNext(); )" + NL + "\t\t{";
+  protected final String TEXT_277 = NL + "\t\t\tresult.append(convert";
+  protected final String TEXT_278 = "ToString(i.next()));";
+  protected final String TEXT_279 = NL + "\t\t\tresult.append(";
+  protected final String TEXT_280 = ".convert";
+  protected final String TEXT_281 = "ToString(i.next()));";
+  protected final String TEXT_282 = NL + "\t\t\tresult.append(' ');" + NL + "\t\t}" + NL + "\t\treturn result.substring(0, result.length() - 1);";
+  protected final String TEXT_283 = NL + "\t\tif (instanceValue == null) return null;";
+  protected final String TEXT_284 = NL + "\t\tif (";
+  protected final String TEXT_285 = ".isInstance(instanceValue))" + NL + "\t\t{" + NL + "\t\t\ttry" + NL + "\t\t\t{";
+  protected final String TEXT_286 = NL + "\t\t\t\tString value = convert";
+  protected final String TEXT_287 = "ToString(instanceValue);";
+  protected final String TEXT_288 = NL + "\t\t\t\tString value = ";
+  protected final String TEXT_289 = ".convert";
+  protected final String TEXT_290 = "ToString(instanceValue);";
+  protected final String TEXT_291 = 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_292 = NL + "\t\tthrow new IllegalArgumentException(\"Invalid value: '\"+instanceValue+\"' for datatype :";
+  protected final String TEXT_293 = "\");";
+  protected final String TEXT_294 = 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_295 = "();";
+  protected final String TEXT_296 = NL + "\t\treturn super.convertToString(";
+  protected final String TEXT_297 = ", instanceValue);";
+  protected final String TEXT_298 = NL + "\t}" + NL;
+  protected final String TEXT_299 = NL + "\t/**" + NL + "\t * Returns a new object of class '<em>";
+  protected final String TEXT_300 = "</em>'." + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @return a new object of class '<em>";
+  protected final String TEXT_301 = "</em>'." + NL + "\t * @generated" + NL + "\t */" + NL + "\t";
+  protected final String TEXT_302 = " create";
+  protected final String TEXT_303 = "();" + NL;
+  protected final String TEXT_304 = 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_305 = NL + "\t/**" + NL + "\t * Returns an instance of data type '<em>";
+  protected final String TEXT_306 = "</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_307 = " create";
-  protected final String TEXT_308 = "();" + NL;
-  protected final String TEXT_309 = 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_310 = NL + "\t/**" + NL + "\t * Returns an instance of data type '<em>";
-  protected final String TEXT_311 = "</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_312 = " create";
-  protected final String TEXT_313 = "(String literal);" + NL + "" + NL + "\t/**" + NL + "\t * Returns a literal representation of an instance of data type '<em>";
-  protected final String TEXT_314 = "</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_315 = "(";
-  protected final String TEXT_316 = " instanceValue);" + NL;
-  protected final String TEXT_317 = NL + "} //";
-  protected final String TEXT_318 = NL;
+  protected final String TEXT_308 = "(String literal);" + NL + "" + NL + "\t/**" + NL + "\t * Returns a literal representation of an instance of data type '<em>";
+  protected final String TEXT_309 = "</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_310 = "(";
+  protected final String TEXT_311 = " instanceValue);" + NL;
+  protected final String TEXT_312 = NL + "} //";
+  protected final String TEXT_313 = NL;
 
    public String generate(Object argument)
   {
@@ -621,527 +616,517 @@
     stringBuffer.append(TEXT_101);
     stringBuffer.append(factoryType);
     stringBuffer.append(TEXT_102);
-    for (Iterator p=genPackage.getPackageInitializationDependencies().iterator(); p.hasNext();) { GenPackage dep = (GenPackage)p.next();
-    stringBuffer.append(TEXT_103);
-    stringBuffer.append(dep.getImportedFactoryInterfaceName());
-    stringBuffer.append(TEXT_104);
-    stringBuffer.append(dep.getImportedFactoryInterfaceName());
-    stringBuffer.append(TEXT_105);
-    stringBuffer.append(dep.getImportedFactoryInterfaceName());
-    stringBuffer.append(TEXT_106);
-    }
-    stringBuffer.append(TEXT_107);
     stringBuffer.append(factoryType);
-    stringBuffer.append(TEXT_108);
+    stringBuffer.append(TEXT_103);
     if (!genPackage.getGenClasses().isEmpty()) {
-    stringBuffer.append(TEXT_109);
+    stringBuffer.append(TEXT_104);
     for (Iterator c=genPackage.getGenClasses().iterator(); c.hasNext();) { GenClass genClass = (GenClass)c.next();
     if (!genClass.isDynamic()) {
-    stringBuffer.append(TEXT_110);
+    stringBuffer.append(TEXT_105);
     stringBuffer.append(genClass.getSafeUncapName());
-    stringBuffer.append(TEXT_111);
+    stringBuffer.append(TEXT_106);
     stringBuffer.append(genPackage.getClassifierID(genClass));
-    stringBuffer.append(TEXT_112);
+    stringBuffer.append(TEXT_107);
     for (Iterator j=genClass.getGenFeatures().iterator(); j.hasNext();) { GenFeature genFeature = (GenFeature)j.next();
-    stringBuffer.append(TEXT_113);
+    stringBuffer.append(TEXT_108);
     stringBuffer.append(!genFeature.isReferenceType());
-    stringBuffer.append(TEXT_114);
+    stringBuffer.append(TEXT_109);
     stringBuffer.append(genClass.getSafeUncapName());
-    stringBuffer.append(TEXT_115);
+    stringBuffer.append(TEXT_110);
     stringBuffer.append(genClass.getClassName());
-    stringBuffer.append(TEXT_116);
+    stringBuffer.append(TEXT_111);
     stringBuffer.append(genFeature.getUpperName());
-    stringBuffer.append(TEXT_117);
+    stringBuffer.append(TEXT_112);
     }
     }
     }
     }
     if (!genPackage.getGenDataTypes().isEmpty()) {
-    stringBuffer.append(TEXT_118);
+    stringBuffer.append(TEXT_113);
     for (Iterator d=genPackage.getGenDataTypes().iterator(); d.hasNext();) { GenDataType genDataType = (GenDataType)d.next();
-    stringBuffer.append(TEXT_119);
+    stringBuffer.append(TEXT_114);
     stringBuffer.append(genDataType.getSafeUncapName());
-    stringBuffer.append(TEXT_120);
+    stringBuffer.append(TEXT_115);
     stringBuffer.append(genPackage.getClassifierID(genDataType));
-    stringBuffer.append(TEXT_121);
+    stringBuffer.append(TEXT_116);
     }
     }
-    stringBuffer.append(TEXT_122);
+    stringBuffer.append(TEXT_117);
     if (!genPackage.getPackageInitializationDependencies().isEmpty()) {
-    stringBuffer.append(TEXT_123);
+    stringBuffer.append(TEXT_118);
     for (Iterator p=genPackage.getPackageInitializationDependencies().iterator(); p.hasNext();) { GenPackage dep = (GenPackage)p.next();
-    stringBuffer.append(TEXT_124);
+    stringBuffer.append(TEXT_119);
     stringBuffer.append(dep.getImportedFactoryClassName());
-    stringBuffer.append(TEXT_125);
+    stringBuffer.append(TEXT_120);
     stringBuffer.append(genPackage.getPackageInstanceVariable(dep));
-    stringBuffer.append(TEXT_126);
+    stringBuffer.append(TEXT_121);
     stringBuffer.append(dep.getImportedFactoryClassName());
-    stringBuffer.append(TEXT_127);
-    stringBuffer.append(dep.getImportedFactoryInterfaceName());
-    stringBuffer.append(TEXT_128);
+    stringBuffer.append(TEXT_122);
+    stringBuffer.append(dep.getImportedFactoryClassName());
+    stringBuffer.append(TEXT_123);
     }
     }
     List annotationSources = genPackage.getAnnotationSources();
     annotationSources.remove(ExtendedMetaData.ANNOTATION_URI);
-    stringBuffer.append(TEXT_129);
+    stringBuffer.append(TEXT_124);
     stringBuffer.append(genModel.getImportedName("commonj.sdo.Property"));
-    stringBuffer.append(TEXT_130);
+    stringBuffer.append(TEXT_125);
     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_131);
+    stringBuffer.append(TEXT_126);
     stringBuffer.append(genClass.getSafeUncapName());
-    stringBuffer.append(TEXT_132);
+    stringBuffer.append(TEXT_127);
     stringBuffer.append(genPackage.getPackageInstanceVariable(baseGenClass.getGenPackage()));
-    stringBuffer.append(TEXT_133);
+    stringBuffer.append(TEXT_128);
     stringBuffer.append(baseGenClass.getClassifierAccessorName());
-    stringBuffer.append(TEXT_134);
+    stringBuffer.append(TEXT_129);
     }
     }
-    stringBuffer.append(TEXT_135);
+    stringBuffer.append(TEXT_130);
     for (Iterator i=genPackage.getGenClasses().iterator(); i.hasNext();) { GenClass genClass = (GenClass)i.next();
     if (!genClass.isDynamic()) {
-    stringBuffer.append(TEXT_136);
+    stringBuffer.append(TEXT_131);
     stringBuffer.append(genClass.getSafeUncapName());
-    stringBuffer.append(TEXT_137);
+    stringBuffer.append(TEXT_132);
     stringBuffer.append(genClass.getImportedInterfaceName());
-    stringBuffer.append(TEXT_138);
+    stringBuffer.append(TEXT_133);
     stringBuffer.append(genClass.getName());
-    stringBuffer.append(TEXT_139);
+    stringBuffer.append(TEXT_134);
     stringBuffer.append(genClass.isAbstract());
-    stringBuffer.append(TEXT_140);
+    stringBuffer.append(TEXT_135);
     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_141);
+    stringBuffer.append(TEXT_136);
     stringBuffer.append(genClass.getSafeUncapName());
-    stringBuffer.append(TEXT_142);
+    stringBuffer.append(TEXT_137);
     stringBuffer.append(annotationSource);
-    stringBuffer.append(TEXT_143);
+    stringBuffer.append(TEXT_138);
     stringBuffer.append(key);
-    stringBuffer.append(TEXT_144);
+    stringBuffer.append(TEXT_139);
     stringBuffer.append(value);
     stringBuffer.append(genModel.getNonNLS(key + value));
-    stringBuffer.append(TEXT_145);
+    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_146);
+    stringBuffer.append(TEXT_141);
     stringBuffer.append(genClass.getSafeUncapName());
-    stringBuffer.append(TEXT_147);
+    stringBuffer.append(TEXT_142);
     stringBuffer.append(genClass.getLocalFeatureIndex(genFeature));
-    stringBuffer.append(TEXT_148);
+    stringBuffer.append(TEXT_143);
     if (genFeature.isReferenceType()) { GenFeature reverseGenFeature = genFeature.getReverse();
     String reverse = reverseGenFeature == null ? "null" : genPackage.getPackageInstanceVariable(reverseGenFeature.getGenPackage()) + ".get" + reverseGenFeature.getFeatureAccessorName() + "()";
-    stringBuffer.append(TEXT_149);
+    stringBuffer.append(TEXT_144);
     stringBuffer.append(type);
-    stringBuffer.append(TEXT_150);
+    stringBuffer.append(TEXT_145);
     stringBuffer.append(genFeature.getName());
-    stringBuffer.append(TEXT_151);
+    stringBuffer.append(TEXT_146);
     stringBuffer.append(genFeature.getDefaultValue());
-    stringBuffer.append(TEXT_152);
+    stringBuffer.append(TEXT_147);
     stringBuffer.append(genFeature.getLowerBound());
-    stringBuffer.append(TEXT_153);
+    stringBuffer.append(TEXT_148);
     stringBuffer.append(genFeature.getUpperBound());
-    stringBuffer.append(TEXT_154);
+    stringBuffer.append(TEXT_149);
     stringBuffer.append(genFeature.getContainerClass());
-    stringBuffer.append(TEXT_155);
+    stringBuffer.append(TEXT_150);
     stringBuffer.append(genFeature.getChangeableFlag().equals("IS_CHANGEABLE") ? "false" : "true");
-    stringBuffer.append(TEXT_156);
+    stringBuffer.append(TEXT_151);
     stringBuffer.append(genFeature.getUnsettableFlag().equals("IS_UNSETTABLE") ? "true": "false");
-    stringBuffer.append(TEXT_157);
+    stringBuffer.append(TEXT_152);
     stringBuffer.append(genFeature.getDerivedFlag().equals("IS_DERIVED") ? "true" : "false");
-    stringBuffer.append(TEXT_158);
+    stringBuffer.append(TEXT_153);
     stringBuffer.append(genFeature.getContainmentFlag().equals("IS_COMPOSITE")? "true": "false");
-    stringBuffer.append(TEXT_159);
+    stringBuffer.append(TEXT_154);
     stringBuffer.append(reverse);
-    stringBuffer.append(TEXT_160);
+    stringBuffer.append(TEXT_155);
     }else{
-    stringBuffer.append(TEXT_161);
+    stringBuffer.append(TEXT_156);
     stringBuffer.append(type);
-    stringBuffer.append(TEXT_162);
+    stringBuffer.append(TEXT_157);
     stringBuffer.append(genFeature.getName());
-    stringBuffer.append(TEXT_163);
+    stringBuffer.append(TEXT_158);
     stringBuffer.append(genFeature.getDefaultValue());
-    stringBuffer.append(TEXT_164);
+    stringBuffer.append(TEXT_159);
     stringBuffer.append(genFeature.getLowerBound());
-    stringBuffer.append(TEXT_165);
+    stringBuffer.append(TEXT_160);
     stringBuffer.append(genFeature.getUpperBound());
-    stringBuffer.append(TEXT_166);
+    stringBuffer.append(TEXT_161);
     stringBuffer.append(genFeature.getContainerClass());
-    stringBuffer.append(TEXT_167);
+    stringBuffer.append(TEXT_162);
     stringBuffer.append(genFeature.getChangeableFlag().equals("IS_CHANGEABLE") ? "false" : "true");
-    stringBuffer.append(TEXT_168);
+    stringBuffer.append(TEXT_163);
     stringBuffer.append(genFeature.getUnsettableFlag().equals("IS_UNSETTABLE") ? "true": "false");
-    stringBuffer.append(TEXT_169);
+    stringBuffer.append(TEXT_164);
     stringBuffer.append(genFeature.getDerivedFlag().equals("IS_DERIVED") ? "true" : "false");
-    stringBuffer.append(TEXT_170);
+    stringBuffer.append(TEXT_165);
     }
     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_171);
+    stringBuffer.append(TEXT_166);
     stringBuffer.append(annotationSource);
-    stringBuffer.append(TEXT_172);
+    stringBuffer.append(TEXT_167);
     stringBuffer.append(key);
-    stringBuffer.append(TEXT_173);
+    stringBuffer.append(TEXT_168);
     stringBuffer.append(value);
     stringBuffer.append(genModel.getNonNLS(key + value));
-    stringBuffer.append(TEXT_174);
+    stringBuffer.append(TEXT_169);
     }
     }
     }
-    stringBuffer.append(TEXT_175);
+    stringBuffer.append(TEXT_170);
     }
     }
     }
     if (!genPackage.getGenDataTypes().isEmpty()) {
-    stringBuffer.append(TEXT_176);
+    stringBuffer.append(TEXT_171);
     for (Iterator d=genPackage.getGenDataTypes().iterator(); d.hasNext();) { GenDataType genDataType = (GenDataType)d.next();
-    stringBuffer.append(TEXT_177);
+    stringBuffer.append(TEXT_172);
     stringBuffer.append(genDataType.getSafeUncapName());
-    stringBuffer.append(TEXT_178);
+    stringBuffer.append(TEXT_173);
     stringBuffer.append(genDataType.getImportedInstanceClassName());
-    stringBuffer.append(TEXT_179);
+    stringBuffer.append(TEXT_174);
     stringBuffer.append(genDataType.getName());
-    stringBuffer.append(TEXT_180);
+    stringBuffer.append(TEXT_175);
     stringBuffer.append(genDataType.getSerializableFlag().equals("IS_SERIALIZABLE") ? "true" : "false");
-    stringBuffer.append(TEXT_181);
+    stringBuffer.append(TEXT_176);
     stringBuffer.append(genDataType.getGeneratedInstanceClassFlag().equals("IS_GENERATED_INSTANCE_CLASS") ? "true" : "false" );
-    stringBuffer.append(TEXT_182);
+    stringBuffer.append(TEXT_177);
     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_183);
+    stringBuffer.append(TEXT_178);
     stringBuffer.append(genDataType.getSafeUncapName());
-    stringBuffer.append(TEXT_184);
+    stringBuffer.append(TEXT_179);
     stringBuffer.append(annotationSource);
-    stringBuffer.append(TEXT_185);
+    stringBuffer.append(TEXT_180);
     stringBuffer.append(key);
-    stringBuffer.append(TEXT_186);
+    stringBuffer.append(TEXT_181);
     stringBuffer.append(value);
     stringBuffer.append(genModel.getNonNLS(key + value));
-    stringBuffer.append(TEXT_187);
+    stringBuffer.append(TEXT_182);
     }
     }
     }
-    stringBuffer.append(TEXT_188);
+    stringBuffer.append(TEXT_183);
     }
     }
-    stringBuffer.append(TEXT_189);
+    stringBuffer.append(TEXT_184);
     stringBuffer.append(SDOGenUtil.getDependentFactoryArgumentList(genPackage, false));
-    stringBuffer.append(TEXT_190);
+    stringBuffer.append(TEXT_185);
     stringBuffer.append(SDOGenUtil.getDependentFactoryArgumentList(genPackage, true));
-    stringBuffer.append(TEXT_191);
+    stringBuffer.append(TEXT_186);
     stringBuffer.append(genModel.getImportedName("commonj.sdo.Property"));
-    stringBuffer.append(TEXT_192);
+    stringBuffer.append(TEXT_187);
     String extendedMetaDataSource = ExtendedMetaData.ANNOTATION_URI;
     EAnnotation packageAnnotation = genPackage.getEcorePackage().getEAnnotation(extendedMetaDataSource);
     if (packageAnnotation != null){ 
-    stringBuffer.append(TEXT_193);
+    stringBuffer.append(TEXT_188);
     for (Iterator k = packageAnnotation.getDetails().iterator(); k.hasNext();) { Map.Entry detail = (Map.Entry)k.next(); String key = Literals.toStringLiteral((String)detail.getKey(), genModel); String value = Literals.toStringLiteral((String)detail.getValue(), genModel);
-    stringBuffer.append(TEXT_194);
+    stringBuffer.append(TEXT_189);
     stringBuffer.append(key);
-    stringBuffer.append(TEXT_195);
+    stringBuffer.append(TEXT_190);
     stringBuffer.append(value);
     stringBuffer.append(k.hasNext() ? "," : "");
     stringBuffer.append(genModel.getNonNLS(key + value));
     }
-    stringBuffer.append(TEXT_196);
+    stringBuffer.append(TEXT_191);
     stringBuffer.append(packageAnnotation.getSource());
-    stringBuffer.append(TEXT_197);
+    stringBuffer.append(TEXT_192);
     }
-    stringBuffer.append(TEXT_198);
+    stringBuffer.append(TEXT_193);
     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_199);
+    stringBuffer.append(TEXT_194);
     stringBuffer.append(genClassifier.getSafeUncapName());
-    stringBuffer.append(TEXT_200);
+    stringBuffer.append(TEXT_195);
     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_201);
+    stringBuffer.append(TEXT_196);
     stringBuffer.append(key);
-    stringBuffer.append(TEXT_202);
+    stringBuffer.append(TEXT_197);
     stringBuffer.append(value);
     stringBuffer.append(k.hasNext() ? "," : "");
     stringBuffer.append(genModel.getNonNLS(key + value));
     }
-    stringBuffer.append(TEXT_203);
+    stringBuffer.append(TEXT_198);
     }
     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_204);
+    stringBuffer.append(TEXT_199);
     stringBuffer.append(genFeature.getName());
-    stringBuffer.append(TEXT_205);
+    stringBuffer.append(TEXT_200);
     stringBuffer.append(genPackage.getPackageInstanceVariable(genFeature.getTypeGenPackage()));
-    stringBuffer.append(TEXT_206);
+    stringBuffer.append(TEXT_201);
     stringBuffer.append(genFeature.getTypeClassifierAccessorName());
-    stringBuffer.append(TEXT_207);
+    stringBuffer.append(TEXT_202);
     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_208);
+    stringBuffer.append(TEXT_203);
     stringBuffer.append(key);
-    stringBuffer.append(TEXT_209);
+    stringBuffer.append(TEXT_204);
     stringBuffer.append(value);
     stringBuffer.append(k.hasNext() ? "," : "");
     stringBuffer.append(genModel.getNonNLS(key + value));
     }
     if (!genFeature.isReferenceType()) {
-    stringBuffer.append(TEXT_210);
+    stringBuffer.append(TEXT_205);
     } else {
-    stringBuffer.append(TEXT_211);
+    stringBuffer.append(TEXT_206);
     }
-    stringBuffer.append(TEXT_212);
+    stringBuffer.append(TEXT_207);
     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_213);
+    stringBuffer.append(TEXT_208);
     stringBuffer.append(annotationSource);
-    stringBuffer.append(TEXT_214);
+    stringBuffer.append(TEXT_209);
     stringBuffer.append(key);
-    stringBuffer.append(TEXT_215);
+    stringBuffer.append(TEXT_210);
     stringBuffer.append(value);
     stringBuffer.append(genModel.getNonNLS(key + value));
-    stringBuffer.append(TEXT_216);
+    stringBuffer.append(TEXT_211);
     }
-    stringBuffer.append(TEXT_217);
+    stringBuffer.append(TEXT_212);
     }
     }
-    stringBuffer.append(TEXT_218);
+    stringBuffer.append(TEXT_213);
     }
     }
     } else {
-    stringBuffer.append(TEXT_219);
+    stringBuffer.append(TEXT_214);
     stringBuffer.append(genClassifier.getSafeUncapName());
-    stringBuffer.append(TEXT_220);
+    stringBuffer.append(TEXT_215);
     stringBuffer.append(genClass.getLocalFeatureIndex(genFeature));
-    stringBuffer.append(TEXT_221);
+    stringBuffer.append(TEXT_216);
     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_222);
+    stringBuffer.append(TEXT_217);
     stringBuffer.append(key);
-    stringBuffer.append(TEXT_223);
+    stringBuffer.append(TEXT_218);
     stringBuffer.append(value);
     stringBuffer.append(k.hasNext() ? "," : "");
     stringBuffer.append(genModel.getNonNLS(key + value));
     }
-    stringBuffer.append(TEXT_224);
+    stringBuffer.append(TEXT_219);
     }
     }
     }
     }
-    stringBuffer.append(TEXT_225);
+    stringBuffer.append(TEXT_220);
     for (Iterator i=genPackage.getAllGenDataTypes().iterator(); i.hasNext();) { GenDataType genDataType = (GenDataType)i.next();
     if (genDataType.isSerializable()) {
-    stringBuffer.append(TEXT_226);
+    stringBuffer.append(TEXT_221);
     stringBuffer.append(genDataType.getObjectInstanceClassName());
-    stringBuffer.append(TEXT_227);
+    stringBuffer.append(TEXT_222);
     stringBuffer.append(genDataType.getName());
-    stringBuffer.append(TEXT_228);
+    stringBuffer.append(TEXT_223);
     if (genDataType instanceof GenEnum) {
-    stringBuffer.append(TEXT_229);
+    stringBuffer.append(TEXT_224);
     stringBuffer.append(((GenEnum)genDataType).getImportedInstanceClassName());
-    stringBuffer.append(TEXT_230);
+    stringBuffer.append(TEXT_225);
     stringBuffer.append(((GenEnum)genDataType).getImportedInstanceClassName());
-    stringBuffer.append(TEXT_231);
+    stringBuffer.append(TEXT_226);
     stringBuffer.append(genModel.getNonNLS());
     stringBuffer.append(genModel.getNonNLS(2));
     stringBuffer.append(genModel.getNonNLS(3));
-    stringBuffer.append(TEXT_232);
+    stringBuffer.append(TEXT_227);
     } else if (genDataType.getBaseType() != null) { GenDataType genBaseType = genDataType.getBaseType(); 
     if (genBaseType.getGenPackage() == genPackage) {
-    stringBuffer.append(TEXT_233);
+    stringBuffer.append(TEXT_228);
     stringBuffer.append(genDataType.getObjectInstanceClassName());
-    stringBuffer.append(TEXT_234);
+    stringBuffer.append(TEXT_229);
     stringBuffer.append(genBaseType.getName());
-    stringBuffer.append(TEXT_235);
+    stringBuffer.append(TEXT_230);
     } else {
-    stringBuffer.append(TEXT_236);
+    stringBuffer.append(TEXT_231);
     stringBuffer.append(genDataType.getObjectInstanceClassName());
-    stringBuffer.append(TEXT_237);
+    stringBuffer.append(TEXT_232);
     stringBuffer.append(SDOGenUtil.getFactoryImpl(genBaseType.getGenPackage()));
-    stringBuffer.append(TEXT_238);
+    stringBuffer.append(TEXT_233);
     stringBuffer.append(genBaseType.getName());
-    stringBuffer.append(TEXT_239);
+    stringBuffer.append(TEXT_234);
     }
     } else if (genDataType.getItemType() != null) { GenDataType genItemType = genDataType.getItemType(); 
-    stringBuffer.append(TEXT_240);
+    stringBuffer.append(TEXT_235);
     stringBuffer.append(genModel.getImportedName("java.util.List"));
-    stringBuffer.append(TEXT_241);
+    stringBuffer.append(TEXT_236);
     stringBuffer.append(genModel.getImportedName("java.util.ArrayList"));
-    stringBuffer.append(TEXT_242);
+    stringBuffer.append(TEXT_237);
     stringBuffer.append(genModel.getImportedName("java.util.StringTokenizer"));
-    stringBuffer.append(TEXT_243);
+    stringBuffer.append(TEXT_238);
     stringBuffer.append(genModel.getImportedName("java.util.StringTokenizer"));
-    stringBuffer.append(TEXT_244);
+    stringBuffer.append(TEXT_239);
     if (genItemType.getGenPackage() == genPackage) {
-    stringBuffer.append(TEXT_245);
+    stringBuffer.append(TEXT_240);
     stringBuffer.append(genItemType.getName());
-    stringBuffer.append(TEXT_246);
+    stringBuffer.append(TEXT_241);
     } else {
-    stringBuffer.append(TEXT_247);
+    stringBuffer.append(TEXT_242);
     stringBuffer.append(SDOGenUtil.getFactoryImpl(genItemType.getGenPackage()));
-    stringBuffer.append(TEXT_248);
+    stringBuffer.append(TEXT_243);
     stringBuffer.append(genItemType.getName());
-    stringBuffer.append(TEXT_249);
+    stringBuffer.append(TEXT_244);
     }
-    stringBuffer.append(TEXT_250);
+    stringBuffer.append(TEXT_245);
     } else if (!genDataType.getMemberTypes().isEmpty()) {
-    stringBuffer.append(TEXT_251);
+    stringBuffer.append(TEXT_246);
     stringBuffer.append(genDataType.getObjectInstanceClassName());
-    stringBuffer.append(TEXT_252);
+    stringBuffer.append(TEXT_247);
     for (Iterator j = genDataType.getMemberTypes().iterator(); j.hasNext(); ) { GenDataType genMemberType = (GenDataType)j.next();
-    stringBuffer.append(TEXT_253);
+    stringBuffer.append(TEXT_248);
     if (genMemberType.getGenPackage() == genPackage) {
-    stringBuffer.append(TEXT_254);
+    stringBuffer.append(TEXT_249);
     stringBuffer.append(genDataType.getObjectInstanceClassName());
-    stringBuffer.append(TEXT_255);
+    stringBuffer.append(TEXT_250);
     stringBuffer.append(genMemberType.getName());
-    stringBuffer.append(TEXT_256);
+    stringBuffer.append(TEXT_251);
     } else {
-    stringBuffer.append(TEXT_257);
+    stringBuffer.append(TEXT_252);
     stringBuffer.append(genDataType.getObjectInstanceClassName());
-    stringBuffer.append(TEXT_258);
+    stringBuffer.append(TEXT_253);
     stringBuffer.append(SDOGenUtil.getFactoryImpl(genMemberType.getGenPackage()));
-    stringBuffer.append(TEXT_259);
+    stringBuffer.append(TEXT_254);
     stringBuffer.append(genMemberType.getName());
-    stringBuffer.append(TEXT_260);
+    stringBuffer.append(TEXT_255);
     }
-    stringBuffer.append(TEXT_261);
+    stringBuffer.append(TEXT_256);
     }
-    stringBuffer.append(TEXT_262);
+    stringBuffer.append(TEXT_257);
     } else if (genDataType.isArrayType()) {
-    stringBuffer.append(TEXT_263);
+    stringBuffer.append(TEXT_258);
     stringBuffer.append(genModel.getImportedName("java.lang.UnsupportedOperationException"));
-    stringBuffer.append(TEXT_264);
+    stringBuffer.append(TEXT_259);
     } else {
-    stringBuffer.append(TEXT_265);
+    stringBuffer.append(TEXT_260);
     stringBuffer.append(genDataType.getObjectInstanceClassName());
-    stringBuffer.append(TEXT_266);
+    stringBuffer.append(TEXT_261);
     stringBuffer.append(genDataType.getClassifierID());
-    stringBuffer.append(TEXT_267);
+    stringBuffer.append(TEXT_262);
     }
-    stringBuffer.append(TEXT_268);
+    stringBuffer.append(TEXT_263);
     stringBuffer.append(genDataType.getName());
-    stringBuffer.append(TEXT_269);
+    stringBuffer.append(TEXT_264);
     if (genDataType instanceof GenEnum) {
-    stringBuffer.append(TEXT_270);
+    stringBuffer.append(TEXT_265);
     } else if (genDataType.getBaseType() != null) { GenDataType genBaseType = genDataType.getBaseType(); 
     if (genBaseType.getGenPackage() == genPackage) {
-    stringBuffer.append(TEXT_271);
+    stringBuffer.append(TEXT_266);
     stringBuffer.append(genBaseType.getName());
-    stringBuffer.append(TEXT_272);
+    stringBuffer.append(TEXT_267);
     } else {
-    stringBuffer.append(TEXT_273);
+    stringBuffer.append(TEXT_268);
     stringBuffer.append(SDOGenUtil.getFactoryImpl(genBaseType.getGenPackage()));
-    stringBuffer.append(TEXT_274);
+    stringBuffer.append(TEXT_269);
     stringBuffer.append(genBaseType.getName());
-    stringBuffer.append(TEXT_275);
+    stringBuffer.append(TEXT_270);
     }
     } else if (genDataType.getItemType() != null) { GenDataType genItemType = genDataType.getItemType(); 
-    stringBuffer.append(TEXT_276);
+    stringBuffer.append(TEXT_271);
     stringBuffer.append(genModel.getImportedName("java.util.List"));
-    stringBuffer.append(TEXT_277);
+    stringBuffer.append(TEXT_272);
     stringBuffer.append(genModel.getImportedName("java.util.List"));
-    stringBuffer.append(TEXT_278);
+    stringBuffer.append(TEXT_273);
     stringBuffer.append(genModel.getImportedName("java.lang.StringBuffer"));
-    stringBuffer.append(TEXT_279);
+    stringBuffer.append(TEXT_274);
     stringBuffer.append(genModel.getImportedName("java.lang.StringBuffer"));
-    stringBuffer.append(TEXT_280);
+    stringBuffer.append(TEXT_275);
     stringBuffer.append(genModel.getImportedName("java.util.Iterator"));
-    stringBuffer.append(TEXT_281);
+    stringBuffer.append(TEXT_276);
     if (genItemType.getGenPackage() == genPackage) {
-    stringBuffer.append(TEXT_282);
+    stringBuffer.append(TEXT_277);
     stringBuffer.append(genItemType.getName());
-    stringBuffer.append(TEXT_283);
+    stringBuffer.append(TEXT_278);
     } else {
-    stringBuffer.append(TEXT_284);
+    stringBuffer.append(TEXT_279);
     stringBuffer.append(SDOGenUtil.getFactoryImpl(genItemType.getGenPackage()));
-    stringBuffer.append(TEXT_285);
+    stringBuffer.append(TEXT_280);
     stringBuffer.append(genItemType.getName());
-    stringBuffer.append(TEXT_286);
+    stringBuffer.append(TEXT_281);
     }
-    stringBuffer.append(TEXT_287);
+    stringBuffer.append(TEXT_282);
     } else if (!genDataType.getMemberTypes().isEmpty()) {
-    stringBuffer.append(TEXT_288);
+    stringBuffer.append(TEXT_283);
     for (Iterator j = genDataType.getMemberTypes().iterator(); j.hasNext(); ) { GenDataType genMemberType = (GenDataType)j.next();
-    stringBuffer.append(TEXT_289);
+    stringBuffer.append(TEXT_284);
     stringBuffer.append(SDOGenUtil.getQualifiedTypeAccessor(genMemberType));
-    stringBuffer.append(TEXT_290);
+    stringBuffer.append(TEXT_285);
     if (genMemberType.getGenPackage() == genPackage) {
-    stringBuffer.append(TEXT_291);
+    stringBuffer.append(TEXT_286);
     stringBuffer.append(genMemberType.getName());
-    stringBuffer.append(TEXT_292);
+    stringBuffer.append(TEXT_287);
     } else {
-    stringBuffer.append(TEXT_293);
+    stringBuffer.append(TEXT_288);
     stringBuffer.append(SDOGenUtil.getFactoryImpl(genMemberType.getGenPackage()));
-    stringBuffer.append(TEXT_294);
+    stringBuffer.append(TEXT_289);
     stringBuffer.append(genMemberType.getName());
-    stringBuffer.append(TEXT_295);
+    stringBuffer.append(TEXT_290);
     }
-    stringBuffer.append(TEXT_296);
+    stringBuffer.append(TEXT_291);
     }
-    stringBuffer.append(TEXT_297);
+    stringBuffer.append(TEXT_292);
     stringBuffer.append(genDataType.getName());
-    stringBuffer.append(TEXT_298);
+    stringBuffer.append(TEXT_293);
     } else if (genDataType.isArrayType()) {
-    stringBuffer.append(TEXT_299);
+    stringBuffer.append(TEXT_294);
     stringBuffer.append(genModel.getImportedName("java.lang.UnsupportedOperationException"));
-    stringBuffer.append(TEXT_300);
+    stringBuffer.append(TEXT_295);
     } else {
-    stringBuffer.append(TEXT_301);
+    stringBuffer.append(TEXT_296);
     stringBuffer.append(genDataType.getClassifierID());
-    stringBuffer.append(TEXT_302);
+    stringBuffer.append(TEXT_297);
     }
-    stringBuffer.append(TEXT_303);
+    stringBuffer.append(TEXT_298);
     }
     }
     } else {
     for (Iterator i=genPackage.getGenClasses().iterator(); i.hasNext();) { GenClass genClass = (GenClass)i.next();
     if (genClass.hasFactoryInterfaceCreateMethod()) {
-    stringBuffer.append(TEXT_304);
+    stringBuffer.append(TEXT_299);
     stringBuffer.append(genClass.getFormattedName());
-    stringBuffer.append(TEXT_305);
+    stringBuffer.append(TEXT_300);
     stringBuffer.append(genClass.getFormattedName());
-    stringBuffer.append(TEXT_306);
+    stringBuffer.append(TEXT_301);
     stringBuffer.append(genClass.getImportedInterfaceName());
-    stringBuffer.append(TEXT_307);
+    stringBuffer.append(TEXT_302);
     stringBuffer.append(genClass.getName());
-    stringBuffer.append(TEXT_308);
+    stringBuffer.append(TEXT_303);
     }
     }
-    stringBuffer.append(TEXT_309);
+    stringBuffer.append(TEXT_304);
     if (genPackage.isDataTypeConverters()) {
     for (Iterator i=genPackage.getAllGenDataTypes().iterator(); i.hasNext();) { GenDataType genDataType = (GenDataType)i.next();
     if (genDataType.isSerializable()) {
-    stringBuffer.append(TEXT_310);
+    stringBuffer.append(TEXT_305);
     stringBuffer.append(genDataType.getFormattedName());
-    stringBuffer.append(TEXT_311);
+    stringBuffer.append(TEXT_306);
     stringBuffer.append(genDataType.getImportedInstanceClassName());
-    stringBuffer.append(TEXT_312);
+    stringBuffer.append(TEXT_307);
     stringBuffer.append(genDataType.getName());
-    stringBuffer.append(TEXT_313);
+    stringBuffer.append(TEXT_308);
     stringBuffer.append(genDataType.getFormattedName());
-    stringBuffer.append(TEXT_314);
+    stringBuffer.append(TEXT_309);
     stringBuffer.append(genDataType.getName());
-    stringBuffer.append(TEXT_315);
+    stringBuffer.append(TEXT_310);
     stringBuffer.append(genDataType.getImportedInstanceClassName());
-    stringBuffer.append(TEXT_316);
+    stringBuffer.append(TEXT_311);
     }
     }
     }
     }
-    stringBuffer.append(TEXT_317);
+    stringBuffer.append(TEXT_312);
     stringBuffer.append(isInterface ? genPackage.getFactoryInterfaceName() : genPackage.getFactoryClassName());
     genModel.emitSortedImports();
-    stringBuffer.append(TEXT_318);
+    stringBuffer.append(TEXT_313);
     return stringBuffer.toString();
   }
-}
\ No newline at end of file
+}

Modified: incubator/tuscany/java/sdo/tools/templates/models/SDOFactoryClass.javajet
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/tools/templates/models/SDOFactoryClass.javajet?rev=575081&r1=575080&r2=575081&view=diff
==============================================================================
--- incubator/tuscany/java/sdo/tools/templates/models/SDOFactoryClass.javajet (original)
+++ incubator/tuscany/java/sdo/tools/templates/models/SDOFactoryClass.javajet Wed Sep 12 14:19:55 2007
@@ -32,6 +32,7 @@
 <%}%>
 
 import commonj.sdo.helper.HelperContext;
+import org.apache.tuscany.sdo.helper.HelperContextImpl;
 <%if (!isInterface || genModel.isSuppressInterfaces()) {%>
 import org.apache.tuscany.sdo.helper.TypeHelperImpl;
 <%}%>
@@ -156,15 +157,17 @@
 		if(scope == null) {
 			throw new IllegalArgumentException("Scope can not be null");
 		}
+
+		if (((HelperContextImpl)scope).getExtendedMetaData().getPackage(NAMESPACE_URI) != null)
+			return;
     
+		// Register this package with provided scope   
+		((HelperContextImpl)scope).getExtendedMetaData().putPackage(NAMESPACE_URI, this);
+		
 		//Register dependent packages with provided scope
         <%for (Iterator p=genPackage.getPackageInitializationDependencies().iterator(); p.hasNext();) { GenPackage dep = (GenPackage)p.next();%>
 		<%=dep.getImportedFactoryInterfaceName()%>.INSTANCE.register(scope);
         <%}%>
-    
-		// Initialize this package   
-		TypeHelperImpl th = (TypeHelperImpl)scope.getTypeHelper();
-		th.getExtendedMetaData().putPackage(NAMESPACE_URI, this);
   }
 	
 	/**
@@ -264,11 +267,6 @@
 		if (instance != null ) return instance;
 		instance = new <%=factoryType%>();
 
-		// Initialize dependent packages
-        <%for (Iterator p=genPackage.getPackageInitializationDependencies().iterator(); p.hasNext();) { GenPackage dep = (GenPackage)p.next();%>
-		<%=dep.getImportedFactoryInterfaceName()%> <%=dep.getImportedFactoryInterfaceName()%>Instance = <%=dep.getImportedFactoryInterfaceName()%>.INSTANCE;
-        <%}%>
-		
 		// Create package meta-data objects
 		instance.createMetaData();
 
@@ -318,7 +316,7 @@
 
 		// Obtain other dependent packages
         <%for (Iterator p=genPackage.getPackageInitializationDependencies().iterator(); p.hasNext();) { GenPackage dep = (GenPackage)p.next();%>
-		<%=dep.getImportedFactoryClassName()%> <%=genPackage.getPackageInstanceVariable(dep)%> = (<%=dep.getImportedFactoryClassName()%>)<%=dep.getImportedFactoryInterfaceName()%>.INSTANCE;
+		<%=dep.getImportedFactoryClassName()%> <%=genPackage.getPackageInstanceVariable(dep)%> = (<%=dep.getImportedFactoryClassName()%>)<%=dep.getImportedFactoryClassName()%>.init();
         <%}%>
       <%}%>
       <%List annotationSources = genPackage.getAnnotationSources();%>



---------------------------------------------------------------------
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