[Clirr-devel] CVS: clirr/core/src/java/net/sf/clirr/core/spi TypeArrayBuilderSupport.java, 1.3, 1.4 TypeArrayBuilder.java, 1.1, 1.2

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

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

Modified Files:
	TypeArrayBuilderSupport.java TypeArrayBuilder.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: TypeArrayBuilderSupport.java
===================================================================
RCS file: /cvsroot/clirr/clirr/core/src/java/net/sf/clirr/core/spi/TypeArrayBuilderSupport.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TypeArrayBuilderSupport.java	17 Aug 2008 11:13:08 -0000	1.3
+++ TypeArrayBuilderSupport.java	29 May 2009 20:06:25 -0000	1.4
@@ -8,26 +8,27 @@
 public abstract class TypeArrayBuilderSupport implements TypeArrayBuilder
 {
 
-    protected ClassLoader createClassLoader(File[] jarFiles, ClassLoader thirdPartyClasses)
+    protected ClassLoader createClassLoader(File[] classPathEntries, ClassLoader thirdPartyClasses)
     {
-        final URL[] jarUrls = new URL[jarFiles.length];
-        for (int i = 0; i < jarFiles.length; i++)
+        final URL[] entryUrls = new URL[classPathEntries.length];
+        for (int i = 0; i < classPathEntries.length; i++)
         {
-            File jarFile = jarFiles[i];
+            File entry = classPathEntries[i];
             try
             {
-                URL url = jarFile.toURI().toURL();
-                jarUrls[i] = url;
+                URL url = entry.toURI().toURL();
+                entryUrls[i] = url;
             }
             catch (MalformedURLException ex)
             {
+                String fileType = entry.isDirectory() ? "directory" : "jar file";
                 throw new IllegalArgumentException(
-				        "Cannot create classloader with jar file " + jarFile, ex);
+                        "Cannot create classloader with " + fileType + " " + entry, ex);
             }
         }
-        final URLClassLoader jarsLoader = new URLClassLoader(jarUrls, thirdPartyClasses);
-        
-        return jarsLoader;
+        final URLClassLoader loader = new URLClassLoader(entryUrls, thirdPartyClasses);
+
+        return loader;
     }
 
 }

Index: TypeArrayBuilder.java
===================================================================
RCS file: /cvsroot/clirr/clirr/core/src/java/net/sf/clirr/core/spi/TypeArrayBuilder.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TypeArrayBuilder.java	16 Mar 2006 22:30:19 -0000	1.1
+++ TypeArrayBuilder.java	29 May 2009 20:06:25 -0000	1.2
@@ -10,17 +10,17 @@
     /**
      * Creates a set of classes to check.
      *
-     * @param jarFiles a set of jar filed to scan for class files.
+     * @param classPathEntries a set of jar files and directories to scan for class files.
      *
      * @param thirdPartyClasses loads classes that are referenced
-     * by the classes in the jarFiles
+     * by the classes in the classPathEntries
      *
-     * @param classSelector is an object which determines which classes from the
-     * old and new jars are to be compared. This parameter may be null, in
+     * @param classSelector is an object that determines which classes reachable via the
+     * classPathEntries are to be compared. This parameter may be null, in
      * which case all classes in the old and new jars are compared.
      */
     JavaType[] createClassSet(
-            File[] jarFiles, ClassLoader thirdPartyClasses, ClassFilter classSelector)
+            File[] classPathEntries, ClassLoader thirdPartyClasses, ClassFilter classSelector)
             throws CheckerException;
 
 }