[Clirr-devel] CVS: clirr/core/src/java/net/sf/clirr/cli Clirr.java, 1.12, 1.13

[Lars Küh. <lk...@us...>]

Update of /cvsroot/clirr/clirr/core/src/java/net/sf/clirr/cli
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv2150/core/src/java/net/sf/clirr/cli

Modified Files:
	Clirr.java 
Log Message:
added support for using class directories instead of jars in TypeArrayBuilder, request from Jochen Wiedmann (clirr-maven-plugin team) in private mail

Index: Clirr.java
===================================================================
RCS file: /cvsroot/clirr/clirr/core/src/java/net/sf/clirr/cli/Clirr.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Clirr.java	23 Sep 2008 22:39:17 -0000	1.12
+++ Clirr.java	29 May 2009 20:06:25 -0000	1.13
@@ -138,8 +138,8 @@
         }
 
 
-        File[] origJars = pathToFileArray(oldPath);
-        File[] newJars = pathToFileArray(newPath);
+        File[] origClassPathEntries = pathToFileArray(oldPath);
+        File[] newClassPathEntries = pathToFileArray(newPath);
 
         checker.addDiffListener(diffListener);
 
@@ -149,18 +149,18 @@
             ClassLoader loader2 = new URLClassLoader(convertFilesToURLs(pathToFileArray(newClassPath)));
 
             DefaultTypeArrayBuilderFactory tabFactory = new DefaultTypeArrayBuilderFactory();
-            
+
             TypeArrayBuilder tab1 = tabFactory.build();
             TypeArrayBuilder tab2 = tabFactory.build();
 
             final JavaType[] origClasses =
-                tab1.createClassSet(origJars, loader1, classSelector);
-            
+                tab1.createClassSet(origClassPathEntries, loader1, classSelector);
+
             final JavaType[] newClasses =
-                tab2.createClassSet(newJars, loader2, classSelector);
-            
+                tab2.createClassSet(newClassPathEntries, loader2, classSelector);
+
             checker.reportDiffs(origClasses, newClasses);
-            
+
             System.exit(0);
         }
         catch (CheckerException ex)
@@ -193,7 +193,7 @@
      * @param options
      * @return
      */
-    private CommandLine parseCommandLine(String[] args, Options options) 
+    private CommandLine parseCommandLine(String[] args, Options options)
     {
         BasicParser parser = new BasicParser();
         CommandLine cmdline = null;
@@ -245,9 +245,9 @@
     {
         if (path == null)
         {
-            return new File[0];            
+            return new File[0];
         }
-        
+
         ArrayList files = new ArrayList();
 
         int pos = 0;
@@ -266,7 +266,7 @@
 
         return (File[]) files.toArray(new File[files.size()]);
     }
-    
+
     private URL[] convertFilesToURLs(File[] files) throws MalformedURLException
     {
         URL[] ret = new URL[files.length];