[Clirr-devel] CVS: clirr/src/java/net/sf/clirr Checker.java,1.16,1.17

[Simon K. <s_k...@us...>]

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

Modified Files:
	Checker.java 
Log Message:
No longer use scopeSelector when building ClassSets. Filtering by scope
is now done in the new ClassScopeCheck class.


Index: Checker.java
===================================================================
RCS file: /cvsroot/clirr/clirr/src/java/net/sf/clirr/Checker.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Checker.java	18 Jun 2004 06:52:09 -0000	1.16
+++ Checker.java	18 Jun 2004 07:33:20 -0000	1.17
@@ -182,10 +182,10 @@
         }
 
         final ClassSet origClasses = createClassSet(
-            origJars, origThirdPartyLoader, scopeSelector, classSelector);
+            origJars, origThirdPartyLoader, classSelector);
 
         final ClassSet newClasses = createClassSet(
-            newJars, newThirdPartyLoader, scopeSelector, classSelector);
+            newJars, newThirdPartyLoader, classSelector);
 
         reportDiffs(origClasses, newClasses);
     }
@@ -198,8 +198,6 @@
      * @param thirdPartyClasses loads classes that are referenced
      * by the classes in the jarFiles
      *
-     * @param scopeSelector scope of classes that should be included
-     *
      * @param classSelector is an object which determines which classes from the
      * old and new jars are to be compared. This parameter may be null, in
      * which case all classes in the old and new jars are compared.
@@ -207,7 +205,6 @@
     private static ClassSet createClassSet(
             File[] jarFiles,
             ClassLoader thirdPartyClasses,
-            ScopeSelector scopeSelector,
             ClassSelector classSelector)
             throws CheckerException
     {
@@ -242,7 +239,7 @@
                 if (!zipEntry.isDirectory() && zipEntry.getName().endsWith(".class"))
                 {
                     JavaClass clazz = extractClass(zipEntry, zip, repository);
-                    if (scopeSelector.isSelected(clazz) && classSelector.isSelected(clazz))
+                    if (classSelector.isSelected(clazz))
                     {
                         ret.add(clazz);
                     }