svn commit: r575731 - in /incubator/tuscany/java/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate: JavaGenerator.java adapter/SDOGenClassGeneratorAdapter.java adapter/SDOGenPackageGeneratorAdapter.java

[kelvingoodson]

Author: kelvingoodson
Date: Fri Sep 14 08:59:14 2007
New Revision: 575731

URL: http://svn.apache.org/viewvc?rev=575731&view=rev
Log:
fix for TUSCANY-1638

Modified:
    
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/adapter/SDOGenClassGeneratorAdapter.java
    
incubator/tuscany/java/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/adapter/SDOGenPackageGeneratorAdapter.java

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?rev=575731&r1=575730&r2=575731&view=diff
==============================================================================
--- 
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
 Fri Sep 14 08:59:14 2007
@@ -50,6 +50,7 @@
 import org.eclipse.emf.codegen.ecore.genmodel.GenResourceKind;
 import 
org.eclipse.emf.codegen.ecore.genmodel.generator.GenBaseGeneratorAdapter;
 import 
org.eclipse.emf.codegen.ecore.genmodel.generator.GenModelGeneratorAdapterFactory;
+import org.eclipse.emf.codegen.merge.java.JControlModel;
 import org.eclipse.emf.codegen.util.CodeGenUtil;
 import org.eclipse.emf.common.util.BasicMonitor;
 import org.eclipse.emf.common.util.Diagnostic;
@@ -508,7 +509,19 @@
     GeneratorAdapterFactory.Descriptor.Registry.INSTANCE.addDescriptor
     (GenModelPackage.eNS_URI, GenModelGeneratorAdapterFactory.DESCRIPTOR);
     
-    Generator generator = new Generator();
+    //Generator generator = new Generator();
+    Generator generator = new Generator()
+    {
+      public JControlModel getJControlModel()
+      {
+        if (jControlModel == null)
+        {
+          jControlModel = new JControlModel();
+        }
+        return jControlModel;
+      }
+    };
+
 
     //if ((genOptions & OPTION_USE_EMF_PATTERNS) == 0)
     {

Modified: 
incubator/tuscany/java/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/adapter/SDOGenClassGeneratorAdapter.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/adapter/SDOGenClassGeneratorAdapter.java?rev=575731&r1=575730&r2=575731&view=diff
==============================================================================
--- 
incubator/tuscany/java/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/adapter/SDOGenClassGeneratorAdapter.java
 (original)
+++ 
incubator/tuscany/java/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/adapter/SDOGenClassGeneratorAdapter.java
 Fri Sep 14 08:59:14 2007
@@ -21,6 +21,7 @@
 
 import org.eclipse.emf.codegen.ecore.generator.GeneratorAdapterFactory;
 import 
org.eclipse.emf.codegen.ecore.genmodel.generator.GenClassGeneratorAdapter;
+import org.eclipse.emf.common.util.Monitor;
 
 public class SDOGenClassGeneratorAdapter extends GenClassGeneratorAdapter {
        
@@ -42,5 +43,11 @@
          }
            return jetEmitterDescriptors;
        }
-       
+
+        protected void ensureProjectExists(String workspacePath, Object object,
+                                           Object projectType, boolean force, 
Monitor monitor) 
+        {
+              // Do nothing -- this avoids differential behaviour according to 
whether we
+              // are running in Eclipse or not
+        }        
 }

Modified: 
incubator/tuscany/java/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/adapter/SDOGenPackageGeneratorAdapter.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/adapter/SDOGenPackageGeneratorAdapter.java?rev=575731&r1=575730&r2=575731&view=diff
==============================================================================
--- 
incubator/tuscany/java/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/adapter/SDOGenPackageGeneratorAdapter.java
 (original)
+++ 
incubator/tuscany/java/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/adapter/SDOGenPackageGeneratorAdapter.java
 Fri Sep 14 08:59:14 2007
@@ -49,4 +49,11 @@
        {
                // do nothing
        }
+        
+        protected void ensureProjectExists(String workspacePath, Object object,
+                                           Object projectType, boolean force, 
Monitor monitor) 
+        {
+                // Do nothing -- this avoids differential behaviour according 
to whether we
+                // are running in Eclipse or not
+        }        
 }



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