Author: frankb
Date: Tue Nov  7 11:33:00 2006
New Revision: 472217

URL: http://svn.apache.org/viewvc?view=rev&rev=472217
Log:
Commit TUSCANY-718

Modified:
    
incubator/tuscany/java/sdo/plugin/src/main/java/org/apache/tuscany/sdo/plugin/GeneratorMojo.java
    
incubator/tuscany/java/sdo/plugin/src/main/java/org/apache/tuscany/sdo/plugin/SchemaFileOption.java
    
incubator/tuscany/java/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/Interface2JavaGenerator.java
    
incubator/tuscany/java/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/JavaGenerator.java
    
incubator/tuscany/java/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/XSD2JavaGenerator.java
    
incubator/tuscany/java/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/templates/model/SDOClass.java
    
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/plugin/src/main/java/org/apache/tuscany/sdo/plugin/GeneratorMojo.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/plugin/src/main/java/org/apache/tuscany/sdo/plugin/GeneratorMojo.java?view=diff&rev=472217&r1=472216&r2=472217
==============================================================================
--- 
incubator/tuscany/java/sdo/plugin/src/main/java/org/apache/tuscany/sdo/plugin/GeneratorMojo.java
 (original)
+++ 
incubator/tuscany/java/sdo/plugin/src/main/java/org/apache/tuscany/sdo/plugin/GeneratorMojo.java
 Tue Nov  7 11:33:00 2006
@@ -137,7 +137,7 @@
      * 
      * @parameter
      */
-    private Boolean noEMF;
+    private Boolean useEMFPatterns;
 
     /**
      * With this option, generated interfaces will extend 
commonj.sdo.DataObject.
@@ -187,8 +187,8 @@
                 // if (null == sf.getCompilerSourceRoots()) {
                 // sf.setCompilerSourceRoots(compileSourceRoots);
                 // }
-                if (null == sf.isNoEMF()) {
-                    sf.setNoEMF(noEMF);
+                if (null == sf.isUseEMFPatterns()) {
+                    sf.setUseEMFPatterns(useEMFPatterns);
                 }
                 if (null == sf.isInterfaceDataObject()) {
                     sf.setInterfaceDataObject(interfaceDataObject);
@@ -214,7 +214,7 @@
                     schemaFiles[i].setGenerateLoader(generateLoader);
                     schemaFiles[i].setGenerateSwitch(generateSwitch);
                     schemaFiles[i].setNoContainment(noContainment);
-                    schemaFiles[i].setNoEMF(noEMF);
+                    schemaFiles[i].setUseEMFPatterns(useEMFPatterns);
                     schemaFiles[i].setInterfaceDataObject(interfaceDataObject);
                     schemaFiles[i].setNoInterfaces(noInterfaces);
                     schemaFiles[i].setNoNotification(noNotification);
@@ -230,7 +230,7 @@
                 schemaFiles[0].setGenerateLoader(generateLoader);
                 schemaFiles[0].setGenerateSwitch(generateSwitch);
                 schemaFiles[0].setNoContainment(noContainment);
-                schemaFiles[0].setNoEMF(noEMF);
+                schemaFiles[0].setUseEMFPatterns(useEMFPatterns);
                 schemaFiles[0].setInterfaceDataObject(interfaceDataObject);
                 schemaFiles[0].setNoInterfaces(noInterfaces);
                 schemaFiles[0].setNoNotification(noNotification);
@@ -266,8 +266,8 @@
                 if (schemaFiles[i].isGenerateSwitch() != null && 
schemaFiles[i].isGenerateSwitch().booleanValue()) {
                     genOptions |= JavaGenerator.OPTION_GENERATE_SWITCH;
                 }
-                if (schemaFiles[i].isNoEMF() != null && 
schemaFiles[i].isNoEMF().booleanValue()) {
-                    genOptions |= JavaGenerator.OPTION_NO_EMF;
+                if (schemaFiles[i].isUseEMFPatterns() != null && 
schemaFiles[i].isUseEMFPatterns().booleanValue()) {
+                    genOptions |= JavaGenerator.OPTION_USE_EMF_PATTERNS;
                 }
                 if (schemaFiles[i].isInterfaceDataObject() != null
                         && 
schemaFiles[i].isInterfaceDataObject().booleanValue()) {

Modified: 
incubator/tuscany/java/sdo/plugin/src/main/java/org/apache/tuscany/sdo/plugin/SchemaFileOption.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/plugin/src/main/java/org/apache/tuscany/sdo/plugin/SchemaFileOption.java?view=diff&rev=472217&r1=472216&r2=472217
==============================================================================
--- 
incubator/tuscany/java/sdo/plugin/src/main/java/org/apache/tuscany/sdo/plugin/SchemaFileOption.java
 (original)
+++ 
incubator/tuscany/java/sdo/plugin/src/main/java/org/apache/tuscany/sdo/plugin/SchemaFileOption.java
 Tue Nov  7 11:33:00 2006
@@ -97,7 +97,7 @@
      * 
      * @parameter
      */
-    private Boolean noEMF;
+    private Boolean useEMFPatterns;
     
     /**
      * With this option, generated interfaces will extend 
commonj.sdo.DataObject.
@@ -141,12 +141,12 @@
         this.noContainment = noContainment;
     }
 
-    public Boolean isNoEMF() {
-        return noEMF;
+    public Boolean isUseEMFPatterns() {
+        return useEMFPatterns;
     }
 
-    public void setNoEMF(Boolean noEMF) {
-        this.noEMF = noEMF;
+    public void setUseEMFPatterns(Boolean useEMFPatterns) {
+        this.useEMFPatterns = useEMFPatterns;
     }
     
     public Boolean isNoInterfaces() {

Modified: 
incubator/tuscany/java/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/Interface2JavaGenerator.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/Interface2JavaGenerator.java?view=diff&rev=472217&r1=472216&r2=472217
==============================================================================
--- 
incubator/tuscany/java/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/Interface2JavaGenerator.java
 (original)
+++ 
incubator/tuscany/java/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/Interface2JavaGenerator.java
 Tue Nov  7 11:33:00 2006
@@ -234,7 +234,7 @@
     System.out.println("  [ -arrayAccessors ]");
     System.out.println("  [ -generateLoader ]");
     System.out.println("  [ -noUnsettable ]");
-    System.out.println("  [ -noEMF ]");
+    System.out.println("  [ -useEMFPatterns ]");
     System.out.println("  interface-names");
     System.out.println("");
     System.out.println("For example:");

Modified: 
incubator/tuscany/java/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/JavaGenerator.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/JavaGenerator.java?view=diff&rev=472217&r1=472216&r2=472217
==============================================================================
--- 
incubator/tuscany/java/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/JavaGenerator.java
 (original)
+++ 
incubator/tuscany/java/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/JavaGenerator.java
 Tue Nov  7 11:33:00 2006
@@ -79,7 +79,7 @@
  *     [ -arrayAccessors ]
  *     [ -generateLoader ]
  *     [ -noUnsettable ]
- *     [ -noEMF ]
+ *     [ -useEMFPatterns ]
  *     [ -interfaceDataObject ]
  *     
  *   Basic options:
@@ -102,10 +102,13 @@
  *         implementation. It changes the generator pattern to generate 
accessors which delegate to the
  *         reflective methods (as opposed to the other way around) and changes 
the DataObject base class
  *         to org.apache.tuscany.sdo.impl.StoreDataObjectImpl. Note that this 
option generates classes that
- *         require a Store implementation to be provided before they can be 
run.    
+ *         require a Store implementation to be provided before they can be 
run. 
  *     -noEMF
- *         This option is used to generate static classes that have no 
references to EMF classes.  This 
- *         feature is currently being implemented and is in a preliminary 
state.  
+ *         Deprecated option. It is the default now. Use -useEMFPatterns to 
turn off.
+ *     -useEMFPatterns
+ *         This option is used to generate static classes that use the old 
style EMF generator patterns. Using
+ *         this option introduces EMF dependencies in the generated code, but 
is likely to be less buggy and
+ *         have somewhat better performance than the new EMF-less default 
generator patterns.
  *     -interfaceDataObject
  *         This option is used to generate static interfaces that extend 
commonj.sdo.DataObject  
  *         
@@ -167,7 +170,7 @@
   public static int OPTION_NO_UNSETTABLE=0x80;
   //FIXME Temporary, I need this option for now to get Switch classes 
generated for the SCDL models
   public static int OPTION_GENERATE_SWITCH=0x100;
-  public static int OPTION_NO_EMF=0x200;
+  public static int OPTION_USE_EMF_PATTERNS=0x200;
   public static int OPTION_INTERFACE_DO=0x400;
   
   static 
@@ -272,7 +275,12 @@
     }
     else if (args[index].equalsIgnoreCase("-noEMF"))
     {
-      genOptions |= OPTION_NO_EMF;
+      System.out.println("Warning: -noEMF is deprecated. It is the default 
now. Use -useEMFPatterns to turn off.");
+      //genOptions |= OPTION_NO_EMF;
+    }
+    else if (args[index].equalsIgnoreCase("-useEMFPatterns"))
+    {
+      genOptions |= OPTION_USE_EMF_PATTERNS;
     }
     else if (args[index].equalsIgnoreCase("-interfaceDataObject"))
     {
@@ -440,7 +448,7 @@
     
     Generator generator = new Generator();
 
-    if ((genOptions & OPTION_NO_EMF) != 0)
+    if ((genOptions & OPTION_USE_EMF_PATTERNS) == 0)
     {
        generator.getAdapterFactoryDescriptorRegistry().addDescriptor
         (GenModelPackage.eNS_URI, 
SDOGenModelGeneratorAdapterFactory.DESCRIPTOR);
@@ -515,7 +523,7 @@
       genModel.setSuppressUnsettable(true);
     }
     
-    if ((genOptions & OPTION_NO_EMF) != 0)
+    if ((genOptions & OPTION_USE_EMF_PATTERNS) == 0)
     {
       
genModel.setRootExtendsClass("org.apache.tuscany.sdo.impl.DataObjectBase");
     }
@@ -625,7 +633,8 @@
     System.out.println("  [ -arrayAccessors ]");
     System.out.println("  [ -generateLoader ]");
     System.out.println("  [ -noUnsettable ]");
-    System.out.println("  [ -noEMF ]");
+    System.out.println("  [ -useEMFPatterns ]");
+    System.out.println("  [ -interfaceDataObject ]");
     System.out.println("  <xsd-file> | <wsdl-file>");
     System.out.println("");
     System.out.println("For example:");

Modified: 
incubator/tuscany/java/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/XSD2JavaGenerator.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/XSD2JavaGenerator.java?view=diff&rev=472217&r1=472216&r2=472217
==============================================================================
--- 
incubator/tuscany/java/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/XSD2JavaGenerator.java
 (original)
+++ 
incubator/tuscany/java/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/XSD2JavaGenerator.java
 Tue Nov  7 11:33:00 2006
@@ -171,7 +171,7 @@
     System.out.println("  [ -arrayAccessors ]");
     System.out.println("  [ -generateLoader ]");
     System.out.println("  [ -noUnsettable ]");
-    System.out.println("  [ -noEMF ]");
+    System.out.println("  [ -useEMFPatterns ]");
     System.out.println("  [ -interfaceDataObject ]");
     System.out.println("  <xsd-file> | <wsdl-file>");
     System.out.println("");

Modified: 
incubator/tuscany/java/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/templates/model/SDOClass.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/templates/model/SDOClass.java?view=diff&rev=472217&r1=472216&r2=472217
==============================================================================
--- 
incubator/tuscany/java/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/templates/model/SDOClass.java
 (original)
+++ 
incubator/tuscany/java/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/templates/model/SDOClass.java
 Tue Nov  7 11:33:00 2006
@@ -1,22 +1,3 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
 package org.apache.tuscany.sdo.generate.templates.model;
 
 import org.eclipse.emf.codegen.util.*;
@@ -1281,6 +1262,26 @@
   public String generate(Object argument)
   {
     final StringBuffer stringBuffer = new StringBuffer();
+    
+/**
+ *
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
 
     GenClass genClass = (GenClass)((Object[])argument)[0]; GenPackage 
genPackage = genClass.getGenPackage(); GenModel 
genModel=genPackage.getGenModel();
     boolean isInterface = Boolean.TRUE.equals(((Object[])argument)[1]); 
boolean isImplementation = Boolean.TRUE.equals(((Object[])argument)[2]);

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=472217&r1=472216&r2=472217
==============================================================================
--- 
incubator/tuscany/java/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/templates/model/SDOFactoryClass.java
 (original)
+++ 
incubator/tuscany/java/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/templates/model/SDOFactoryClass.java
 Tue Nov  7 11:33:00 2006
@@ -1,23 +1,3 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-
 package org.apache.tuscany.sdo.generate.templates.model;
 
 import org.apache.tuscany.sdo.generate.util.*;
@@ -132,11 +112,11 @@
   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" + NL + "\t\t";
-  protected final String TEXT_95 = ".registerStaticTypes(";
-  protected final String TEXT_96 = ".class);" + NL + "\t\t";
-  protected final String TEXT_97 = ".registerStaticTypes(";
-  protected final String TEXT_98 = ".class);" + NL + "" + NL + "\t\t// Create 
package meta-data objects" + NL + "\t\tthe";
+  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";
@@ -536,7 +516,26 @@
   public String generate(Object argument)
   {
     final StringBuffer stringBuffer = new StringBuffer();
-   
+    
+/**
+ *
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
 
     GenPackage genPackage = (GenPackage)((Object[])argument)[0]; GenModel 
genModel=genPackage.getGenModel();
     boolean isInterface = Boolean.TRUE.equals(((Object[])argument)[1]); 
boolean isImplementation = Boolean.TRUE.equals(((Object[])argument)[2]);
@@ -759,13 +758,13 @@
     stringBuffer.append(TEXT_93);
     stringBuffer.append(factoryType);
     stringBuffer.append(TEXT_94);
-    
stringBuffer.append(genModel.getImportedName("org.apache.tuscany.sdo.util.SDOUtil"));
+    for (Iterator p=genPackage.getPackageSimpleDependencies().iterator(); 
p.hasNext();) { GenPackage dep = (GenPackage)p.next();
     stringBuffer.append(TEXT_95);
-    
stringBuffer.append(genModel.getImportedName("org.apache.tuscany.sdo.impl.SDOFactoryImpl"));
-    stringBuffer.append(TEXT_96);
     
stringBuffer.append(genModel.getImportedName("org.apache.tuscany.sdo.util.SDOUtil"));
+    stringBuffer.append(TEXT_96);
+    stringBuffer.append(dep.getImportedFactoryInterfaceName());
     stringBuffer.append(TEXT_97);
-    
stringBuffer.append(genModel.getImportedName("org.apache.tuscany.sdo.model.impl.ModelPackageImpl"));
+    }
     stringBuffer.append(TEXT_98);
     stringBuffer.append(factoryType);
     stringBuffer.append(TEXT_99);
@@ -891,7 +890,7 @@
     stringBuffer.append(TEXT_148);
     stringBuffer.append(type);
     stringBuffer.append(TEXT_149);
-    stringBuffer.append(genFeature.getSafeName());
+    stringBuffer.append(genFeature.getName());
     stringBuffer.append(TEXT_150);
     stringBuffer.append(genFeature.getDefaultValue());
     stringBuffer.append(TEXT_151);
@@ -915,7 +914,7 @@
     stringBuffer.append(TEXT_160);
     stringBuffer.append(type);
     stringBuffer.append(TEXT_161);
-    stringBuffer.append(genFeature.getSafeName());
+    stringBuffer.append(genFeature.getName());
     stringBuffer.append(TEXT_162);
     stringBuffer.append(genFeature.getDefaultValue());
     stringBuffer.append(TEXT_163);

Modified: 
incubator/tuscany/java/sdo/tools/templates/models/SDOFactoryClass.javajet
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/tools/templates/models/SDOFactoryClass.javajet?view=diff&rev=472217&r1=472216&r2=472217
==============================================================================
--- incubator/tuscany/java/sdo/tools/templates/models/SDOFactoryClass.javajet 
(original)
+++ incubator/tuscany/java/sdo/tools/templates/models/SDOFactoryClass.javajet 
Tue Nov  7 11:33:00 2006
@@ -224,8 +224,9 @@
                isInited = true;
 
                // Initialize simple dependencies
-               
<%=genModel.getImportedName("org.apache.tuscany.sdo.util.SDOUtil")%>.registerStaticTypes(<%=genModel.getImportedName("org.apache.tuscany.sdo.impl.SDOFactoryImpl")%>.class);
-               
<%=genModel.getImportedName("org.apache.tuscany.sdo.util.SDOUtil")%>.registerStaticTypes(<%=genModel.getImportedName("org.apache.tuscany.sdo.model.impl.ModelPackageImpl")%>.class);
+  <%for (Iterator p=genPackage.getPackageSimpleDependencies().iterator(); 
p.hasNext();) { GenPackage dep = (GenPackage)p.next();%>
+               
<%=genModel.getImportedName("org.apache.tuscany.sdo.util.SDOUtil")%>.registerStaticTypes(<%=dep.getImportedFactoryInterfaceName()%>.class);
+  <%}%>
 
                // Create package meta-data objects
                the<%=factoryType%>.createMetaData();
@@ -312,9 +313,9 @@
                property = 
(<%=genModel.getImportedName("commonj.sdo.Property")%>)<%=genClass.getSafeUncapName()%>Type.getProperties().get(<%=genClass.getClassName()%>.<%=genFeature.getUpperName()%>);
             <%if (genFeature.isReferenceType()) { GenFeature reverseGenFeature 
= genFeature.getReverse();%>
               <%String reverse = reverseGenFeature == null ? "null" : 
genPackage.getPackageInstanceVariable(reverseGenFeature.getGenPackage()) + 
".get" + reverseGenFeature.getFeatureAccessorName() + "()";%>
-               initializeProperty(property, <%=type%>, 
"<%=genFeature.getSafeName()%>", <%=genFeature.getDefaultValue()%>, 
<%=genFeature.getLowerBound()%>, <%=genFeature.getUpperBound()%>, 
<%=genFeature.getContainerClass()%>, 
<%=genFeature.getChangeableFlag().equals("IS_CHANGEABLE") ? "false" : "true"%>, 
<%=genFeature.getUnsettableFlag().equals("IS_UNSETTABLE") ? "true": "false"%>, 
<%=genFeature.getDerivedFlag().equals("IS_DERIVED") ? "true" : "false"%>, 
<%=genFeature.getContainmentFlag().equals("IS_COMPOSITE")? "true": "false"%> , 
<%=reverse%>);
+               initializeProperty(property, <%=type%>, 
"<%=genFeature.getName()%>", <%=genFeature.getDefaultValue()%>, 
<%=genFeature.getLowerBound()%>, <%=genFeature.getUpperBound()%>, 
<%=genFeature.getContainerClass()%>, 
<%=genFeature.getChangeableFlag().equals("IS_CHANGEABLE") ? "false" : "true"%>, 
<%=genFeature.getUnsettableFlag().equals("IS_UNSETTABLE") ? "true": "false"%>, 
<%=genFeature.getDerivedFlag().equals("IS_DERIVED") ? "true" : "false"%>, 
<%=genFeature.getContainmentFlag().equals("IS_COMPOSITE")? "true": "false"%> , 
<%=reverse%>);
             <%}else{%>
-               initializeProperty(property, <%=type%>, 
"<%=genFeature.getSafeName()%>", <%=genFeature.getDefaultValue()%>, 
<%=genFeature.getLowerBound()%>, <%=genFeature.getUpperBound()%>, 
<%=genFeature.getContainerClass()%>, 
<%=genFeature.getChangeableFlag().equals("IS_CHANGEABLE") ? "false" : "true"%>, 
<%=genFeature.getUnsettableFlag().equals("IS_UNSETTABLE") ? "true": "false"%>, 
<%=genFeature.getDerivedFlag().equals("IS_DERIVED") ? "true" : "false"%>);
+               initializeProperty(property, <%=type%>, 
"<%=genFeature.getName()%>", <%=genFeature.getDefaultValue()%>, 
<%=genFeature.getLowerBound()%>, <%=genFeature.getUpperBound()%>, 
<%=genFeature.getContainerClass()%>, 
<%=genFeature.getChangeableFlag().equals("IS_CHANGEABLE") ? "false" : "true"%>, 
<%=genFeature.getUnsettableFlag().equals("IS_UNSETTABLE") ? "true": "false"%>, 
<%=genFeature.getDerivedFlag().equals("IS_DERIVED") ? "true" : "false"%>);
             <%}%>
             <%for (Iterator sources = annotationSources.iterator(); 
sources.hasNext();) { String annotationSource = (String)sources.next();%>
               <%EAnnotation featureAnnotation = 
genFeature.getEcoreFeature().getEAnnotation(annotationSource);%>



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to