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

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

Author: jeff.zhang
Date: 2012-01-29 01:40:46 -0500 (Sun, 29 Jan 2012)
New Revision: 112585

Modified:
   projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/Main.java
Log:
[JBJCA-736] Have to write class name instead of selecting the default name

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	2012-01-19 15:03:51 UTC (rev 112584)
+++ projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/Main.java	2012-01-29 06:40:46 UTC (rev 112585)
@@ -335,7 +335,7 @@
                System.out.print("[" + mcfdef.getMcfClass() + "]: ");
                mcfClassName = in.readLine();
             }
-            while (classes.contains(mcfClassName));
+            while (classes.contains(mcfClassName) && !mcfClassName.equals(""));
             classes.add(mcfClassName);
             if (mcfClassName != null && !mcfClassName.equals(""))
             {
@@ -369,7 +369,7 @@
                System.out.print("[" + mcfdef.getMcClass() + "]: ");
                mcClassName = in.readLine();
             }
-            while (classes.contains(mcClassName));
+            while (classes.contains(mcClassName) && !mcClassName.equals(""));
             classes.add(mcClassName);
 
             if (mcClassName != null && !mcClassName.equals(""))
@@ -396,7 +396,7 @@
                   System.out.print("[" + mcfdef.getCfInterfaceClass() + "]: ");
                   cfInterfaceName = in.readLine();
                }
-               while (classes.contains(cfInterfaceName));
+               while (classes.contains(cfInterfaceName) && !cfInterfaceName.equals(""));
                classes.add(cfInterfaceName);
                if (cfInterfaceName != null && !cfInterfaceName.equals(""))
                   mcfdef.setCfInterfaceClass(cfInterfaceName);
@@ -408,7 +408,7 @@
                   System.out.print("[" + mcfdef.getCfClass() + "]: ");
                   cfClassName = in.readLine();
                }
-               while (classes.contains(cfClassName));
+               while (classes.contains(cfClassName) && !cfClassName.equals(""));
                classes.add(cfClassName);
                if (cfClassName != null && !cfClassName.equals(""))
                   mcfdef.setCfClass(cfClassName);
@@ -420,7 +420,7 @@
                   System.out.print("[" + mcfdef.getConnInterfaceClass() + "]: ");
                   connInterfaceName = in.readLine();
                }
-               while (classes.contains(connInterfaceName));
+               while (classes.contains(connInterfaceName) && !connInterfaceName.equals(""));
                classes.add(connInterfaceName);
                if (connInterfaceName != null && !connInterfaceName.equals(""))
                   mcfdef.setConnInterfaceClass(connInterfaceName);
@@ -432,7 +432,7 @@
                   System.out.print("[" + mcfdef.getConnImplClass() + "]: ");
                   connImplName = in.readLine();
                }
-               while (classes.contains(connImplName));
+               while (classes.contains(connImplName) && !connImplName.equals(""));
                classes.add(connImplName);
                if (connImplName != null && !connImplName.equals(""))
                   mcfdef.setConnImplClass(connImplName);
@@ -479,7 +479,7 @@
             System.out.print("[" + def.getMlClass() + "]: ");
             mlClassName = in.readLine();
          }
-         while (classes.contains(mlClassName));
+         while (classes.contains(mlClassName) && !mlClassName.equals(""));
          classes.add(mlClassName);
          boolean defaultPackage = true;
          if (mlClassName != null && !mlClassName.equals(""))
@@ -502,7 +502,7 @@
             System.out.print("[" + def.getAsClass() + "]: ");
             asClassName = in.readLine();
          }
-         while (classes.contains(asClassName));
+         while (classes.contains(asClassName) && !asClassName.equals(""));
          classes.add(asClassName);
          if (asClassName != null && !asClassName.equals(""))
             def.setAsClass(asClassName);
@@ -517,7 +517,7 @@
             System.out.print("[" + def.getActivationClass() + "]: ");
             actiClassName = in.readLine();
          }
-         while (classes.contains(actiClassName));
+         while (classes.contains(actiClassName) && !actiClassName.equals(""));
          classes.add(actiClassName);
          if (actiClassName != null && !actiClassName.equals(""))
             def.setActivationClass(actiClassName);
@@ -563,7 +563,7 @@
             System.out.print("[" + def.getDefaultValue() + strOrder + "AdminObjectInterface]: ");
             aoInterfaceName = in.readLine();
          }
-         while (classes.contains(aoInterfaceName));
+         while (classes.contains(aoInterfaceName) && !aoInterfaceName.equals(""));
          classes.add(aoInterfaceName);
          
          if (aoInterfaceName != null && !aoInterfaceName.equals(""))
@@ -582,7 +582,7 @@
             System.out.print("[" + def.getDefaultValue() + strOrder + "AdminObjectImpl]: ");
             aoClassName = in.readLine();
          }
-         while (classes.contains(aoClassName));
+         while (classes.contains(aoClassName) && !aoClassName.equals(""));
          classes.add(aoClassName);
          if (aoClassName != null && !aoClassName.equals(""))
          {