[jboss-cvs] JBossAS SVN: r104188 - in projects/jboss-jca/trunk/codegenerator/src: test/java/org/jboss/jca/codegenerator and 1 other directory.

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

Author: jeff.zhang
Date: 2010-04-23 05:33:40 -0400 (Fri, 23 Apr 2010)
New Revision: 104188

Modified:
   projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/Main.java
   projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/SimpleTemplate.java
   projects/jboss-jca/trunk/codegenerator/src/test/java/org/jboss/jca/codegenerator/SimpleTemplateTestCase.java
Log:
[JBJCA-306] support output directory

Modified: projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/Main.java
===================================================================
--- projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/Main.java	2010-04-23 09:19:30 UTC (rev 104187)
+++ projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/Main.java	2010-04-23 09:33:40 UTC (rev 104188)
@@ -22,7 +22,9 @@
 package org.jboss.jca.codegenerator;
 
 import java.io.BufferedReader;
+import java.io.File;
 import java.io.FileWriter;
+import java.io.IOException;
 import java.io.InputStreamReader;
 import java.util.ArrayList;
 import java.util.List;
@@ -76,7 +78,18 @@
          }
          def.setRaConfigProps(props);
          
-         FileWriter fw = new FileWriter(className + ".java");
+         System.out.print("Please input output directory: ");
+         String output = in.readLine();
+         
+         File outDir = new File(output);
+
+         if (!outDir.mkdirs())
+         {
+            throw new IOException(output + " can't be created");
+         }
+         
+         File report = new File(outDir, className + ".java");
+         FileWriter fw = new FileWriter(report);
          template.process(def, fw);
          fw.close();
          System.out.println("Java file wrote");

Modified: projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/SimpleTemplate.java
===================================================================
--- projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/SimpleTemplate.java	2010-04-23 09:19:30 UTC (rev 104187)
+++ projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/SimpleTemplate.java	2010-04-23 09:33:40 UTC (rev 104188)
@@ -302,9 +302,9 @@
 
       writeIndent(out, indent);
       out.write("@Override");
+      writeEol(out);
       writeIndent(out, indent);
       out.write("public boolean equals(Object other)");
-      writeEol(out);
       writeLeftCurlyBracket(out, indent);
       writeIndent(out, indent + 1);
       out.write("if (other == null)");
@@ -362,7 +362,6 @@
 
       writeIndent(out, indent);
       out.write("public void stop()");
-      writeEol(out);
       writeLeftCurlyBracket(out, indent);
       writeIndent(out, indent + 1);
       out.write("log.debug(\"call stop\");");

Modified: projects/jboss-jca/trunk/codegenerator/src/test/java/org/jboss/jca/codegenerator/SimpleTemplateTestCase.java
===================================================================
--- projects/jboss-jca/trunk/codegenerator/src/test/java/org/jboss/jca/codegenerator/SimpleTemplateTestCase.java	2010-04-23 09:19:30 UTC (rev 104187)
+++ projects/jboss-jca/trunk/codegenerator/src/test/java/org/jboss/jca/codegenerator/SimpleTemplateTestCase.java	2010-04-23 09:33:40 UTC (rev 104188)
@@ -62,6 +62,6 @@
       StringWriter writer = new StringWriter();
       template.process(def, writer);
       assertTrue(writer.toString().indexOf("org.jboss.jca.test") > 0);
-      System.out.println(writer.toString());
+      //System.out.println(writer.toString());
    }
 }