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

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

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

Modified Files:
	Checker.java 
Log Message:
Use CoIterator class.


Index: Checker.java
===================================================================
RCS file: /cvsroot/clirr/clirr/src/java/net/sf/clirr/Checker.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Checker.java	13 Jun 2004 11:00:59 -0000	1.14
+++ Checker.java	18 Jun 2004 06:36:22 -0000	1.15
@@ -47,12 +47,15 @@
 import net.sf.clirr.framework.ClassChangeCheck;
 import net.sf.clirr.framework.ClassSelector;
 import net.sf.clirr.framework.ClassSetChangeCheck;
+import net.sf.clirr.framework.CoIterator;
+import net.sf.clirr.framework.JavaClassNameComparator;
+import net.sf.clirr.framework.CheckerException;
+
 import org.apache.bcel.classfile.JavaClass;
 import org.apache.bcel.classfile.ClassParser;
 import org.apache.bcel.util.ClassSet;
 import org.apache.bcel.util.Repository;
 import org.apache.bcel.util.ClassLoaderRepository;
-import net.sf.clirr.framework.CheckerException;
 
 /**
  * This is the main class to be used by Clirr frontends,
@@ -336,13 +339,18 @@
         JavaClass[] compat = compatBaseline.toArray();
         JavaClass[] current = currentVersion.toArray();
 
-        for (int i = 0; i < compat.length; i++)
+        CoIterator iter = new CoIterator(
+            JavaClassNameComparator.COMPARATOR, compat, current);
+
+        while (iter.hasNext())
         {
-            JavaClass compatBaselineClass = compat[i];
-            JavaClass currentClass = findClass(compatBaselineClass.getClassName(), current);
-            if (currentClass != null)
+            iter.next();
+
+            JavaClass compatBaselineClass = (JavaClass) iter.getLeft();
+            JavaClass currentClass = (JavaClass) iter.getRight();
+            if ((compatBaselineClass != null) && (currentClass != null))
             {
-                // class still available in current release
+                // class is available in both releases
                 for (Iterator it = classChecks.iterator(); it.hasNext();)
                 {
                     ClassChangeCheck classChangeCheck = (ClassChangeCheck) it.next();
@@ -351,18 +359,4 @@
             }
         }
     }
-
-    private JavaClass findClass(String className, JavaClass[] javaClasses)
-    {
-        for (int i = 0; i < javaClasses.length; i++)
-        {
-            JavaClass javaClass = javaClasses[i];
-            if (javaClass.getClassName().equals(className))
-            {
-                return javaClass;
-            }
-        }
-        return null;
-    }
-
 }