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

[Lars K?h. <lk...@us...>]

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

Modified Files:
	FieldSetCheck.java 
Log Message:
Fixed Copy and Paste error in FieldSetCheck, reported by Stephen Colebourne

Index: FieldSetCheck.java
===================================================================
RCS file: /cvsroot/clirr/clirr/src/java/net/sf/clirr/checks/FieldSetCheck.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FieldSetCheck.java	22 May 2004 13:26:03 -0000	1.3
+++ FieldSetCheck.java	23 May 2004 05:41:27 -0000	1.4
@@ -49,11 +49,6 @@
             final String name1 = f1.getName();
             final String name2 = f2.getName();
 
-            if (name1 == null || name2 == null)
-            {
-                System.out.println("name2 = " + name2);
-                System.out.println("name1 = " + name1);
-            }
             return name1.compareTo(name2);
         }
     }
@@ -135,12 +130,12 @@
             fireDiff("Field " + bField.getName() + " is now final", Severity.ERROR, clazz, cField);
         }
 
-        if (!bField.isStatic() && cField.isStatic())
+        if (bField.isStatic() && !cField.isStatic())
         {
             fireDiff("Field " + bField.getName() + " is now non-static", Severity.ERROR, clazz, cField);
         }
 
-        if (!bField.isFinal() && cField.isFinal())
+        if (!bField.isStatic() && cField.isStatic())
         {
             fireDiff("Field " + bField.getName() + " is now static", Severity.ERROR, clazz, cField);
         }