[jboss-cvs] JBossAS SVN: r110819 - in projects/jboss-jca/trunk: codegenerator/src/main/java/org/jboss/jca/codegenerator and 1 other directories.

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

Author: jesper.pedersen
Date: 2011-03-02 14:11:57 -0500 (Wed, 02 Mar 2011)
New Revision: 110819

Modified:
   projects/jboss-jca/trunk/build.xml
   projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/Main.java
   projects/jboss-jca/trunk/validator/src/main/java/org/jboss/jca/validator/rules/ao/AONull.java
Log:
Fix a couple of findbugs warnings

Modified: projects/jboss-jca/trunk/build.xml
===================================================================
--- projects/jboss-jca/trunk/build.xml	2011-03-02 18:56:56 UTC (rev 110818)
+++ projects/jboss-jca/trunk/build.xml	2011-03-02 19:11:57 UTC (rev 110819)
@@ -521,6 +521,9 @@
         <fileset dir="${lib.dir}/mail">
           <include name="*.jar"/>
         </fileset>
+        <fileset dir="${lib.dir}/rhq">
+          <include name="*.jar"/>
+        </fileset>
         <fileset dir="${lib.dir}/test">
           <include name="*.jar"/>
         </fileset>
@@ -540,6 +543,7 @@
       <class location="${target.dir}/${name}-deployers-fungal.jar" />
       <class location="${target.dir}/${name}-embedded.jar" />
       <class location="${target.dir}/${name}-embedded-arquillian.jar" />
+      <class location="${target.dir}/${name}-rhq.jar" />
       <class location="${target.dir}/${name}-sjc.jar" />
       <class location="${target.dir}/${name}-spec-api.jar" />
       <class location="${target.dir}/${name}-validator.jar" />
@@ -577,6 +581,9 @@
         <fileset dir="${lib.dir}/mail">
           <include name="*.jar"/>
         </fileset>
+        <fileset dir="${lib.dir}/rhq">
+          <include name="*.jar"/>
+        </fileset>
         <fileset dir="${lib.dir}/test">
           <include name="*.jar"/>
         </fileset>
@@ -596,6 +603,7 @@
       <class location="${target.dir}/${name}-deployers-fungal.jar" />
       <class location="${target.dir}/${name}-embedded.jar" />
       <class location="${target.dir}/${name}-embedded-arquillian.jar" />
+      <class location="${target.dir}/${name}-rhq.jar" />
       <class location="${target.dir}/${name}-sjc.jar" />
       <class location="${target.dir}/${name}-spec-api.jar" />
       <class location="${target.dir}/${name}-validator.jar" />

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	2011-03-02 18:56:56 UTC (rev 110818)
+++ projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/Main.java	2011-03-02 19:11:57 UTC (rev 110819)
@@ -449,7 +449,7 @@
       int numOfAo = 0;
       while (numOfAo >= 0 && def.isGenAdminObject())
       {
-         String strOrder = numOfAo > 0 ? new Integer(numOfAo).toString() : "";
+         String strOrder = numOfAo > 0 ? Integer.valueOf(numOfAo).toString() : "";
          AdminObjectType aoType = new AdminObjectType();
          System.out.print(rb.getString("adminobject.interface.name"));
          System.out.print("[" + def.getDefaultValue() + strOrder + "AdminObjectInterface]: ");

Modified: projects/jboss-jca/trunk/validator/src/main/java/org/jboss/jca/validator/rules/ao/AONull.java
===================================================================
--- projects/jboss-jca/trunk/validator/src/main/java/org/jboss/jca/validator/rules/ao/AONull.java	2011-03-02 18:56:56 UTC (rev 110818)
+++ projects/jboss-jca/trunk/validator/src/main/java/org/jboss/jca/validator/rules/ao/AONull.java	2011-03-02 19:11:57 UTC (rev 110819)
@@ -79,7 +79,8 @@
             {
                failure = new Failure(Severity.ERROR,
                                      SECTION,
-                                     rb.getString("ao.AONull"));
+                                     rb.getString("ao.AONull"),
+                                     code);
             }
             else
             {