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

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

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

Modified Files:
	Checker.java 
Log Message:
Build added/removed class check into Checker class
Removed ClassSetCheck-related stuff as it is no longer used.


Index: Checker.java
===================================================================
RCS file: /cvsroot/clirr/clirr/src/java/net/sf/clirr/Checker.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- Checker.java	18 Jun 2004 07:57:53 -0000	1.18
+++ Checker.java	22 Jun 2004 02:56:59 -0000	1.19
@@ -32,22 +32,20 @@
 import java.net.MalformedURLException;
 import java.net.URLClassLoader;
 
-import net.sf.clirr.checks.AddedClassCheck;
 import net.sf.clirr.checks.ClassHierarchyCheck;
 import net.sf.clirr.checks.ClassScopeCheck;
 import net.sf.clirr.checks.ClassModifierCheck;
 import net.sf.clirr.checks.GenderChangeCheck;
 import net.sf.clirr.checks.InterfaceSetCheck;
-import net.sf.clirr.checks.RemovedClassCheck;
 import net.sf.clirr.checks.FieldSetCheck;
 import net.sf.clirr.checks.MethodSetCheck;
 import net.sf.clirr.event.ApiDifference;
 import net.sf.clirr.event.DiffListener;
 import net.sf.clirr.event.ScopeSelector;
+import net.sf.clirr.event.Severity;
 import net.sf.clirr.framework.ApiDiffDispatcher;
 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;
@@ -73,7 +71,6 @@
 
     private List listeners = new ArrayList();
 
-    private List classSetChecks = new ArrayList();
     private List classChecks = new ArrayList();
 
     private ScopeSelector scopeSelector = new ScopeSelector();
@@ -81,14 +78,6 @@
     /**
      * Package visible constructor for unit testing.
      */
-    Checker(ClassSetChangeCheck cscc)
-    {
-        classSetChecks.add(cscc);
-    }
-
-    /**
-     * Package visible constructor for unit testing.
-     */
     Checker(ClassChangeCheck ccc)
     {
         classChecks.add(ccc);
@@ -99,9 +88,6 @@
      */
     public Checker()
     {
-        classSetChecks.add(new RemovedClassCheck(this));
-        classSetChecks.add(new AddedClassCheck(this));
-
         classChecks.add(new ClassScopeCheck(this, scopeSelector));
         classChecks.add(new GenderChangeCheck(this));
         classChecks.add(new ClassModifierCheck(this));
@@ -325,11 +311,6 @@
     private void reportDiffs(ClassSet compatibilityBaseline, ClassSet currentVersion)
     {
         fireStart();
-        for (Iterator it = classSetChecks.iterator(); it.hasNext();)
-        {
-            ClassSetChangeCheck check = (ClassSetChangeCheck) it.next();
-            check.check(compatibilityBaseline, currentVersion);
-        }
         runClassChecks(compatibilityBaseline, currentVersion);
         fireStop();
     }
@@ -348,7 +329,22 @@
 
             JavaClass compatBaselineClass = (JavaClass) iter.getLeft();
             JavaClass currentClass = (JavaClass) iter.getRight();
-            if ((compatBaselineClass != null) && (currentClass != null))
+
+            if (compatBaselineClass == null)
+            {
+                final String className = compatBaselineClass.getClassName();
+                final ApiDifference diff = new ApiDifference(
+                    "Added " + className, Severity.INFO, className, null, null);
+                fireDiff(diff);
+            }
+            else if (currentClass == null)
+            {
+                final String className = currentClass.getClassName();
+                final ApiDifference diff = new ApiDifference(
+                    "Removed " + className, Severity.ERROR, className, null, null);
+                fireDiff(diff);
+            }
+            else
             {
                 // class is available in both releases
                 boolean continueTesting = true;