[Clirr-devel] CVS: clirr/core/src/java/net/sf/clirr/ant AntTask.java,1.7,1.8 PatternSetFilter.java,1.4,1.5

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

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

Modified Files:
	AntTask.java PatternSetFilter.java 
Log Message:
BCEL was leaking into the Clirr API via ClassFilter/ClassSelector

Index: AntTask.java
===================================================================
RCS file: /cvsroot/clirr/clirr/core/src/java/net/sf/clirr/ant/AntTask.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- AntTask.java	13 Sep 2005 03:56:09 -0000	1.7
+++ AntTask.java	2 Oct 2005 09:26:21 -0000	1.8
@@ -35,7 +35,6 @@
 import net.sf.clirr.core.internal.bcel.BcelTypeArrayBuilder;
 import net.sf.clirr.core.spi.JavaType;
 
-import org.apache.bcel.classfile.JavaClass;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.DirectoryScanner;
 import org.apache.tools.ant.Project;
@@ -105,7 +104,7 @@
             this.scopeSelector = scopeSelector;
         }
 
-        public boolean isSelected(JavaClass clazz)
+        public boolean isSelected(JavaType clazz)
         {
             return patternSetFilter.isSelected(clazz) && scopeSelector.isSelected(clazz);
         }

Index: PatternSetFilter.java
===================================================================
RCS file: /cvsroot/clirr/clirr/core/src/java/net/sf/clirr/ant/PatternSetFilter.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- PatternSetFilter.java	27 Aug 2005 10:34:22 -0000	1.4
+++ PatternSetFilter.java	2 Oct 2005 09:26:21 -0000	1.5
@@ -20,11 +20,11 @@
 package net.sf.clirr.ant;
 
 import net.sf.clirr.core.ClassFilter;
+import net.sf.clirr.core.spi.JavaType;
 
 import java.util.List;
 import java.io.File;
 
-import org.apache.bcel.classfile.JavaClass;
 import org.apache.tools.ant.types.selectors.SelectorUtils;
 import org.apache.tools.ant.types.PatternSet;
 import org.apache.tools.ant.Project;
@@ -52,11 +52,11 @@
     }
 
 
-    public boolean isSelected(JavaClass clazz)
+    public boolean isSelected(JavaType clazz)
     {
         // The patternset evaluation code below was copied from Apache Ant's Expand task.
         // I feel this code should be available as a library function inside Ant somewhere...
-        String className = clazz.getClassName();
+        String className = clazz.getName();
         String name = className.replace('.', File.separatorChar);