[Clirr-devel] CVS: clirr/core/src/java/net/sf/clirr/ant AntTask.java,1.8,1.9

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

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

Modified Files:
	AntTask.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: AntTask.java
===================================================================
RCS file: /cvsroot/clirr/clirr/core/src/java/net/sf/clirr/ant/AntTask.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- AntTask.java	2 Oct 2005 09:26:21 -0000	1.8
+++ AntTask.java	16 Mar 2006 22:30:19 -0000	1.9
@@ -32,8 +32,9 @@
 import net.sf.clirr.core.PlainDiffListener;
 import net.sf.clirr.core.XmlDiffListener;
 import net.sf.clirr.core.internal.ClassLoaderUtil;
-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.TypeArrayBuilder;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.DirectoryScanner;
@@ -293,11 +294,15 @@
         try
         {
             ClassFilter classSelector = buildClassFilter();
+            
+            TypeArrayBuilder tab1 = new AsmTypeArrayBuilder();
+            TypeArrayBuilder tab2 = new AsmTypeArrayBuilder();
+
             final JavaType[] origClasses =
-                BcelTypeArrayBuilder.createClassSet(origJars, origThirdPartyLoader, classSelector);
+                tab1.createClassSet(origJars, origThirdPartyLoader, classSelector);
             
             final JavaType[] newClasses =
-                BcelTypeArrayBuilder.createClassSet(newJars, newThirdPartyLoader, classSelector);
+                tab2.createClassSet(newJars, newThirdPartyLoader, classSelector);
             
             checker.reportDiffs(origClasses, newClasses);
         }