cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aadamc...@apache.org
Subject svn commit: r602247 - in /cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/gen: ClassGenerationAction.java ClassGenerationAction1_1.java ClientClassGenerationAction.java
Date Fri, 07 Dec 2007 22:26:11 GMT
Author: aadamchik
Date: Fri Dec  7 14:26:10 2007
New Revision: 602247

URL: http://svn.apache.org/viewvc?rev=602247&view=rev
Log:
CAY-933 Embeddable classes - support class generation
(more preliminary cleanup)

Modified:
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/gen/ClassGenerationAction.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/gen/ClassGenerationAction1_1.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/gen/ClientClassGenerationAction.java

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/gen/ClassGenerationAction.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/gen/ClassGenerationAction.java?rev=602247&r1=602246&r2=602247&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/gen/ClassGenerationAction.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/gen/ClassGenerationAction.java
Fri Dec  7 14:26:10 2007
@@ -119,7 +119,7 @@
             }
             String fqnSuperClass = superPackageName + "." + superClassName;
 
-            Writer superOut = openWriter(ent, superPackageName, superClassName);
+            Writer superOut = openWriter(superPackageName, superClassName);
 
             if (superOut != null) {
                 superGenSetup.generateClass(
@@ -132,7 +132,7 @@
                 superOut.close();
             }
 
-            Writer mainOut = openWriter(ent, subPackageName, subClassName);
+            Writer mainOut = openWriter(subPackageName, subClassName);
             if (mainOut != null) {
                 mainGenSetup.generateClass(
                         mainOut,
@@ -183,7 +183,7 @@
             String superPackageName = this.superPkg;
             String fqnSuperClass = superPackageName + "." + superClassName;
 
-            Writer out = openWriter(ent, subPackageName, subClassName);
+            Writer out = openWriter(subPackageName, subClassName);
             if (out == null) {
                 continue;
             }
@@ -287,8 +287,7 @@
      * Opens a Writer to write generated output. Writer encoding is determined from the
      * value of the "encoding" property.
      */
-    protected Writer openWriter(ObjEntity entity, String pkgName, String className)
-            throws Exception {
+    protected Writer openWriter(String pkgName, String className) throws Exception {
 
         boolean superclass = className.startsWith(SUPERCLASS_PREFIX);
         File outFile = (superclass)

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/gen/ClassGenerationAction1_1.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/gen/ClassGenerationAction1_1.java?rev=602247&r1=602246&r2=602247&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/gen/ClassGenerationAction1_1.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/gen/ClassGenerationAction1_1.java
Fri Dec  7 14:26:10 2007
@@ -71,7 +71,7 @@
             // 1. do the superclass
             initClassGenerator(superGen, entity, true);
 
-            Writer superOut = openWriter(entity, superGen.getPackageName(), superPrefix
+            Writer superOut = openWriter(superGen.getPackageName(), superPrefix
                     + superGen.getClassName());
 
             if (superOut != null) {
@@ -87,7 +87,7 @@
 
             // 2. do the main class
             initClassGenerator(mainGen, entity, false);
-            Writer mainOut = openWriter(entity, mainGen.getPackageName(), mainGen
+            Writer mainOut = openWriter(mainGen.getPackageName(), mainGen
                     .getClassName());
             if (mainOut != null) {
                 mainGenerator.generateClass(
@@ -111,7 +111,7 @@
         for (ObjEntity entity : entitiesForCurrentMode()) {
 
             initClassGenerator(generator.getClassGenerationInfo(), entity, false);
-            Writer out = openWriter(entity, generator
+            Writer out = openWriter(generator
                     .getClassGenerationInfo()
                     .getPackageName(), generator.getClassGenerationInfo().getClassName());
             if (out == null) {

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/gen/ClientClassGenerationAction.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/gen/ClientClassGenerationAction.java?rev=602247&r1=602246&r2=602247&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/gen/ClientClassGenerationAction.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/gen/ClientClassGenerationAction.java
Fri Dec  7 14:26:10 2007
@@ -87,7 +87,7 @@
             String superPackageName = this.superPkg;
             String fqnSuperClass = superPackageName + "." + superClassName;
 
-            Writer superOut = openWriter(entity, superPackageName, superClassName);
+            Writer superOut = openWriter(superPackageName, superClassName);
 
             if (superOut != null) {
                 superGenSetup.generateClass(
@@ -100,7 +100,7 @@
                 superOut.close();
             }
 
-            Writer mainOut = openWriter(entity, subPackageName, subClassName);
+            Writer mainOut = openWriter(subPackageName, subClassName);
             if (mainOut != null) {
                 mainGenSetup.generateClass(
                         mainOut,



Mime
View raw message