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

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

Update of /cvsroot/clirr/clirr/core/src/java/net/sf/clirr/cli
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6735/src/java/net/sf/clirr/cli

Modified Files:
	Clirr.java 
Log Message:
Replaced BCEL with ASM.
This lays the groundwork for the Java5 RFEs and also fixes bug 1373831, which was caused by a bug in BCEL.
As an added bonus, the uberjar file size drops by several hundred KB.

Index: Clirr.java
===================================================================
RCS file: /cvsroot/clirr/clirr/core/src/java/net/sf/clirr/cli/Clirr.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Clirr.java	8 Sep 2005 08:36:33 -0000	1.7
+++ Clirr.java	16 Mar 2006 22:30:19 -0000	1.8
@@ -25,9 +25,10 @@
 import net.sf.clirr.core.PlainDiffListener;
 import net.sf.clirr.core.XmlDiffListener;
 import net.sf.clirr.core.DiffListener;
-import net.sf.clirr.core.internal.bcel.BcelTypeArrayBuilder;
+import net.sf.clirr.core.internal.asm.AsmTypeArrayBuilder;
 import net.sf.clirr.core.spi.JavaType;
 import net.sf.clirr.core.spi.Scope;
+import net.sf.clirr.core.spi.TypeArrayBuilder;
 
 import org.apache.commons.cli.BasicParser;
 import org.apache.commons.cli.CommandLine;
@@ -146,11 +147,14 @@
             ClassLoader loader1 = new URLClassLoader(convertFilesToURLs(pathToFileArray(oldClassPath)));
             ClassLoader loader2 = new URLClassLoader(convertFilesToURLs(pathToFileArray(newClassPath)));
 
+            TypeArrayBuilder tab1 = new AsmTypeArrayBuilder();
+            TypeArrayBuilder tab2 = new AsmTypeArrayBuilder();
+
             final JavaType[] origClasses =
-                BcelTypeArrayBuilder.createClassSet(origJars, loader1, classSelector);
+                tab1.createClassSet(origJars, loader1, classSelector);
             
             final JavaType[] newClasses =
-                BcelTypeArrayBuilder.createClassSet(newJars, loader2, classSelector);
+                tab2.createClassSet(newJars, loader2, classSelector);
             
             checker.reportDiffs(origClasses, newClasses);