[Clirr-devel] CVS: clirr/core/src/java/net/sf/clirr/core Checker.java,1.6,1.7

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

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

Modified Files:
	Checker.java 
Log Message:
avoid false alarms when package visible classes are removed

Index: Checker.java
===================================================================
RCS file: /cvsroot/clirr/clirr/core/src/java/net/sf/clirr/core/Checker.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Checker.java	3 Aug 2005 17:16:10 -0000	1.6
+++ Checker.java	7 Aug 2005 13:54:03 -0000	1.7
@@ -77,7 +77,10 @@
      */
     Checker(ClassChangeCheck ccc)
     {
-        classChecks.add(ccc);
+        if (ccc != null)
+        {
+            classChecks.add(ccc);
+        }
     }
 
     /**
@@ -336,6 +339,10 @@
 
             if (compatBaselineClass == null)
             {
+                if (!scopeSelector.isSelected(ScopeSelector.getClassScope(currentClass)))
+                {
+                    continue;   
+                }
                 final String className = currentClass.getClassName();
                 final ApiDifference diff =
                     new ApiDifference(
@@ -345,10 +352,17 @@
             }
             else if (currentClass == null)
             {
+                final ScopeSelector.Scope classScope = ScopeSelector.getClassScope(compatBaselineClass);
+                if (!scopeSelector.isSelected(classScope))
+                {
+                    continue;   
+                }
                 final String className = compatBaselineClass.getClassName();
+                final Severity severity = classScope.isLessVisibleThan(
+                        ScopeSelector.SCOPE_PROTECTED) ? Severity.INFO : Severity.ERROR;
                 final ApiDifference diff =
                     new ApiDifference(
-                        MSG_CLASS_REMOVED, Severity.ERROR, className,
+                        MSG_CLASS_REMOVED, severity, className,
                         null, null, null);
                 fireDiff(diff);
             }