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

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

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

Modified Files:
	AntTask.java 
Log Message:
Moved BCEL out of core Checker and only use the JavaType interface there.
Using BCEL is now an implementation detail of the Ant and CLI frontends, and IDE plugins might use a completely different implementation.

Index: AntTask.java
===================================================================
RCS file: /cvsroot/clirr/clirr/core/src/java/net/sf/clirr/ant/AntTask.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AntTask.java	3 Aug 2005 17:16:06 -0000	1.5
+++ AntTask.java	5 Sep 2005 21:14:52 -0000	1.6
@@ -35,6 +35,8 @@
 import net.sf.clirr.core.ClassSelector;
 import net.sf.clirr.core.ClassFilter;
 import net.sf.clirr.core.internal.ExceptionUtil;
+import net.sf.clirr.core.internal.bcel.BcelTypeArrayBuilder;
+import net.sf.clirr.core.spi.JavaType;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.DirectoryScanner;
@@ -294,8 +296,14 @@
         checker.addDiffListener(counter);
         try
         {
-            checker.reportDiffs(
-                origJars, newJars, origThirdPartyLoader, newThirdPartyLoader, buildClassFilter());
+            ClassFilter classSelector = buildClassFilter();
+            final JavaType[] origClasses =
+                BcelTypeArrayBuilder.createClassSet(origJars, origThirdPartyLoader, classSelector);
+            
+            final JavaType[] newClasses =
+                BcelTypeArrayBuilder.createClassSet(newJars, newThirdPartyLoader, classSelector);
+            
+            checker.reportDiffs(origClasses, newClasses);
         }
         catch (CheckerException ex)
         {