[Fb-contrib-commit] fb-contrib/src/com/mebigfatguy/fbcontrib/detect FieldCouldBeLocal.java,1.2,1.3

[Dave B. <dbr...@us...>]

Update of /cvsroot/fb-contrib/fb-contrib/src/com/mebigfatguy/fbcontrib/detect
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29521/src/com/mebigfatguy/fbcontrib/detect

Modified Files:
	FieldCouldBeLocal.java 
Log Message:
don't report fields that have $ in them (internals)

Index: FieldCouldBeLocal.java
===================================================================
RCS file: /cvsroot/fb-contrib/fb-contrib/src/com/mebigfatguy/fbcontrib/detect/FieldCouldBeLocal.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- FieldCouldBeLocal.java	27 Mar 2006 06:21:56 -0000	1.2
+++ FieldCouldBeLocal.java	27 Mar 2006 06:26:18 -0000	1.3
@@ -94,7 +94,7 @@
 		boolean clsIsFinal = cls.isFinal();
 		Field[] fields = cls.getFields();
 		for (Field f : fields) {
-			if ((!f.isStatic()) && (f.isPrivate() || (clsIsFinal && f.isProtected()))) {
+			if ((!f.isStatic() && f.getName().indexOf("$") < 0) && (f.isPrivate() || (clsIsFinal && f.isProtected()))) {
 				FieldAnnotation fa = new FieldAnnotation(cls.getClassName(), f.getName(), f.getSignature(), false);
 				localizableFields.put(f.getName(), fa);
 			}
@@ -164,13 +164,13 @@
 				FieldInstruction fi = (FieldInstruction) ins;
 				String fieldName = fi.getFieldName(cpg);
 				uncheckedFields.remove(fieldName);
-				if (uncheckedFields.size() == 0)
-					return;
 				if (ins instanceof GETFIELD) {
 					localizableFields.remove(fieldName);
 					if (localizableFields.size() == 0)
 						return;
 				}
+				if (uncheckedFields.size() == 0)
+					return;
 			} 
 		}