[jboss-cvs] JBossAS SVN: r110461 - projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code.

[jboss-cvs-commits at lists.jboss.org]

Author: jeff.zhang
Date: 2011-01-26 18:19:44 -0500 (Wed, 26 Jan 2011)
New Revision: 110461

Modified:
   projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/AoImplCodeGen.java
   projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/AsCodeGen.java
   projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/McfCodeGen.java
   projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/PropsCodeGen.java
   projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/RaCodeGen.java
Log:
[JBJCA-460] seperate writeConfigProps to variables declare and method definition to correct constructor and variables order

Modified: projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/AoImplCodeGen.java
===================================================================
--- projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/AoImplCodeGen.java	2011-01-26 22:26:56 UTC (rev 110460)
+++ projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/AoImplCodeGen.java	2011-01-26 23:19:44 UTC (rev 110461)
@@ -95,6 +95,8 @@
 
       int indent = 1;
 
+      writeConfigPropsDeclare(def, out, indent);
+      
       writeDefaultConstructor(def, out, indent);
       
       writeConfigProps(def, out, indent);

Modified: projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/AsCodeGen.java
===================================================================
--- projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/AsCodeGen.java	2011-01-26 22:26:56 UTC (rev 110460)
+++ projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/AsCodeGen.java	2011-01-26 23:19:44 UTC (rev 110461)
@@ -73,9 +73,12 @@
       writeEol(out);
       writeEol(out);
 
+      writeConfigPropsDeclare(def, out, indent);
+      
       writeDefaultConstructor(def, out, indent);
       
       writeConfigProps(def, out, indent);
+      
       writeValidate(def, out, indent);
       writeResourceAdapter(def, out, indent);
       

Modified: projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/McfCodeGen.java
===================================================================
--- projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/McfCodeGen.java	2011-01-26 22:26:56 UTC (rev 110460)
+++ projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/McfCodeGen.java	2011-01-26 23:19:44 UTC (rev 110461)
@@ -114,6 +114,7 @@
       writeEol(out);
       writeEol(out);
       
+      writeConfigPropsDeclare(def, out, indent);
       
       writeDefaultConstructor(def, out, indent);
       

Modified: projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/PropsCodeGen.java
===================================================================
--- projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/PropsCodeGen.java	2011-01-26 22:26:56 UTC (rev 110460)
+++ projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/PropsCodeGen.java	2011-01-26 23:19:44 UTC (rev 110461)
@@ -37,13 +37,13 @@
 public abstract class PropsCodeGen extends AbstractCodeGen
 {
    /**
-    * Output Configuration Properties
+    * Output Configuration Properties Declare
     * @param def definition
     * @param out Writer
     * @param indent space number
     * @throws IOException ioException
     */
-   void writeConfigProps(Definition def, Writer out, int indent) throws IOException
+   void writeConfigPropsDeclare(Definition def, Writer out, int indent) throws IOException
    {
       if (getConfigProps(def) == null)
          return;
@@ -69,6 +69,19 @@
          writeEol(out);
          writeEol(out);
       }
+   }
+   
+   /**
+    * Output Configuration Properties
+    * @param def definition
+    * @param out Writer
+    * @param indent space number
+    * @throws IOException ioException
+    */
+   void writeConfigProps(Definition def, Writer out, int indent) throws IOException
+   {
+      if (getConfigProps(def) == null)
+         return;
 
       for (int i = 0; i < getConfigProps(def).size(); i++)
       {

Modified: projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/RaCodeGen.java
===================================================================
--- projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/RaCodeGen.java	2011-01-26 22:26:56 UTC (rev 110460)
+++ projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/RaCodeGen.java	2011-01-26 23:19:44 UTC (rev 110461)
@@ -143,6 +143,8 @@
          writeEol(out);
       }
       
+      writeConfigPropsDeclare(def, out, indent);
+      
       writeIndent(out, indent);
       out.write("/**");
       writeEol(out);