[jboss-cvs] JBossAS SVN: r58820 - trunk/varia/src/main/org/jboss/tools

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

Author: scott.stark at jboss.org
Date: 2006-12-03 15:11:29 -0500 (Sun, 03 Dec 2006)
New Revision: 58820

Modified:
   trunk/varia/src/main/org/jboss/tools/SerialVersionUID.java
Log:
Make the generateJBossSerialVersionUIDReport the default. To run the ri report one must specify -rihome home.

Modified: trunk/varia/src/main/org/jboss/tools/SerialVersionUID.java
===================================================================
--- trunk/varia/src/main/org/jboss/tools/SerialVersionUID.java	2006-12-03 18:12:23 UTC (rev 58819)
+++ trunk/varia/src/main/org/jboss/tools/SerialVersionUID.java	2006-12-03 20:11:29 UTC (rev 58820)
@@ -53,7 +53,8 @@
       throws MalformedURLException
    {
       File[] files = dir.listFiles();
-      for(int n = 0; n < files.length; n ++)
+      int count = files != null ? files.length : 0;
+      for(int n = 0; n < count; n ++)
       {
          File child = files[n];
          // Ignore the server tmp directory
@@ -206,15 +207,15 @@
    {
       if( args.length != 1 )
       {
-         System.err.println("Usage: jboss-home");
+         System.err.println("Usage: jboss-home | -rihome ri-home");
          System.exit(1);
       }
       File distHome = new File(args[0]);
       Map classVersionMap = null;
-      if( distHome.getName().startsWith("jboss") )
+      if( args.length == 2 )
+         classVersionMap = generateRISerialVersionUIDReport(distHome);
+      else
          classVersionMap = generateJBossSerialVersionUIDReport(distHome);
-      else
-         classVersionMap = generateRISerialVersionUIDReport(distHome);
       // Write the map out the object file
       log.info("Total classes with serialVersionUID != 0: "+classVersionMap.size());
       FileOutputStream fos = new FileOutputStream("serialuid.ser");