[Clirr-devel] CVS: clirr/core/src/java/net/sf/clirr/core ClassSelector.java,1.3,1.4 ClassFilter.java,1.3,1.4

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

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

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

Index: ClassSelector.java
===================================================================
RCS file: /cvsroot/clirr/clirr/core/src/java/net/sf/clirr/core/ClassSelector.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ClassSelector.java	3 Aug 2005 17:16:11 -0000	1.3
+++ ClassSelector.java	2 Oct 2005 09:26:21 -0000	1.4
@@ -18,7 +18,7 @@
 //////////////////////////////////////////////////////////////////////////////
 package net.sf.clirr.core;
 
-import org.apache.bcel.classfile.JavaClass;
+import net.sf.clirr.core.spi.JavaType;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -97,7 +97,7 @@
      * Return true if this class is one selected by the criteria stored
      * in this object.
      */
-    public boolean isSelected(JavaClass clazz)
+    public boolean isSelected(JavaType clazz)
     {
         if (isAnonymousInnerClass(clazz))
         {
@@ -120,9 +120,9 @@
      * Not even developers working on a package would be interested
      * in API changes in these classes...
      */
-    private boolean isAnonymousInnerClass(JavaClass clazz)
+    private boolean isAnonymousInnerClass(JavaType clazz)
     {
-        String name = clazz.getClassName();
+        String name = clazz.getName();
         int dollarPos = name.indexOf('$');
         if (dollarPos == -1)
         {
@@ -146,9 +146,12 @@
      * Return true if this class matches one of the criteria stored
      * in this object.
      */
-    private boolean matchesCriteria(JavaClass clazz)
+    private boolean matchesCriteria(JavaType clazz)
     {
-        String packageName = clazz.getPackageName();
+        String className = clazz.getName();
+        int index = className.lastIndexOf('.');
+        String packageName = (index < 0) ? "" : className.substring(0, index);
+        
         if (packages.contains(packageName))
         {
             return true;
@@ -175,7 +178,6 @@
             }
         }
 
-        String className = clazz.getClassName();
         for (Iterator i = classes.iterator(); i.hasNext();)
         {
             String entry = (String) i.next();

Index: ClassFilter.java
===================================================================
RCS file: /cvsroot/clirr/clirr/core/src/java/net/sf/clirr/core/ClassFilter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ClassFilter.java	3 Aug 2005 17:16:11 -0000	1.3
+++ ClassFilter.java	2 Oct 2005 09:26:21 -0000	1.4
@@ -19,7 +19,7 @@
 
 package net.sf.clirr.core;
 
-import org.apache.bcel.classfile.JavaClass;
+import net.sf.clirr.core.spi.JavaType;
 
 /**
  * A filter for Java classes.
@@ -42,5 +42,5 @@
      * @return true if clazz should be considered by the Checker
      * in this object.
      */
-    boolean isSelected(JavaClass clazz);
+    boolean isSelected(JavaType clazz);
 }