[Clirr-devel] CVS: clirr/src/java/net/sf/clirr/checks FieldSetCheck.java,1.9,1.10

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

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

Modified Files:
	FieldSetCheck.java 
Log Message:
Minor changes due to new ScopeSelector class API.


Index: FieldSetCheck.java
===================================================================
RCS file: /cvsroot/clirr/clirr/src/java/net/sf/clirr/checks/FieldSetCheck.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- FieldSetCheck.java	18 Jun 2004 06:52:10 -0000	1.9
+++ FieldSetCheck.java	18 Jun 2004 07:36:06 -0000	1.10
@@ -198,25 +198,25 @@
 
     private void checkForVisibilityChange(Field bField, Field cField, JavaClass clazz)
     {
-        int bVisibility = ScopeSelector.getVisibilityRating(bField);
-        int cVisibility = ScopeSelector.getVisibilityRating(cField);
+        ScopeSelector.Scope bScope = ScopeSelector.getScope(bField);
+        ScopeSelector.Scope cScope = ScopeSelector.getScope(cField);
 
-        if (cVisibility > bVisibility)
+        if (cScope.isMoreVisibleThan(bScope))
         {
             fireDiff(
                 "Accessability of field " + bField.getName()
                 + " has been increased"
-                + " from " + ScopeSelector.getScopeDesc(bField)
-                + " to " + ScopeSelector.getScopeDesc(cField),
+                + " from " + bScope.getDesc()
+                + " to " + cScope.getDesc(),
                 Severity.INFO, clazz, cField);
         }
-        else if (cVisibility < bVisibility)
+        else if (cScope.isLessVisibleThan(bScope))
         {
             fireDiff(
                 "Accessibility of field " + bField.getName()
                 + " has been weakened"
-                + " from " + ScopeSelector.getScopeDesc(bField)
-                + " to " + ScopeSelector.getScopeDesc(cField),
+                + " from " + bScope.getDesc()
+                + " to " + cScope.getDesc(),
                 Severity.ERROR, clazz, cField);
         }
     }