[Fb-contrib-commit] fb-contrib/src/com/mebigfatguy/fbcontrib/detect ClassEnvy.java,1.19,1.20 Floatin
Brought to you by:
dbrosius
|
From: Dave B. <dbr...@us...> - 2006-03-01 05:09:08
|
Update of /cvsroot/fb-contrib/fb-contrib/src/com/mebigfatguy/fbcontrib/detect In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17661/src/com/mebigfatguy/fbcontrib/detect Modified Files: ClassEnvy.java FloatingPointLoops.java SloppyClassReflection.java SyncCollectionIterators.java UnnecessaryStoreBeforeReturn.java UnrelatedCollectionContents.java Log Message: various cleanups Index: SloppyClassReflection.java =================================================================== RCS file: /cvsroot/fb-contrib/fb-contrib/src/com/mebigfatguy/fbcontrib/detect/SloppyClassReflection.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- SloppyClassReflection.java 12 Feb 2006 03:47:53 -0000 1.3 +++ SloppyClassReflection.java 1 Mar 2006 05:09:01 -0000 1.4 @@ -131,9 +131,9 @@ switch (state) { case COLLECT: if ((seen == INVOKESTATIC) - && (seen == INVOKEVIRTUAL) - && (seen == INVOKEINTERFACE) - && (seen == INVOKESPECIAL)) { + || (seen == INVOKEVIRTUAL) + || (seen == INVOKEINTERFACE) + || (seen == INVOKESPECIAL)) { refClasses.add(getClassConstantOperand()); String signature = getSigConstantOperand(); Type[] argTypes = Type.getArgumentTypes(signature); Index: UnrelatedCollectionContents.java =================================================================== RCS file: /cvsroot/fb-contrib/fb-contrib/src/com/mebigfatguy/fbcontrib/detect/UnrelatedCollectionContents.java,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- UnrelatedCollectionContents.java 6 Feb 2006 01:36:23 -0000 1.13 +++ UnrelatedCollectionContents.java 1 Mar 2006 05:09:01 -0000 1.14 @@ -56,7 +56,7 @@ COLLECTION_CLASSES.add("java/util/Set"); COLLECTION_CLASSES.add("java/util/SortedMap"); COLLECTION_CLASSES.add("java/util/SortedSet"); - }; + } private BugReporter bugReporter; private OpcodeStack stack; private Map<String, Set<String>> memberCollections; Index: SyncCollectionIterators.java =================================================================== RCS file: /cvsroot/fb-contrib/fb-contrib/src/com/mebigfatguy/fbcontrib/detect/SyncCollectionIterators.java,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- SyncCollectionIterators.java 6 Feb 2006 01:36:23 -0000 1.12 +++ SyncCollectionIterators.java 1 Mar 2006 05:09:01 -0000 1.13 @@ -51,13 +51,13 @@ synchCollectionNames.add("synchronizedList"); synchCollectionNames.add("synchronizedSortedSet"); synchCollectionNames.add("synchronizedSortedMap"); - }; + } private static Set<String> mapToSetMethods = new HashSet<String>(); static { mapToSetMethods.add("keySet"); mapToSetMethods.add("entrySet"); mapToSetMethods.add("values"); - }; + } private static final int SEEN_NOTHING = 0; private static final int SEEN_SYNC = 1; Index: ClassEnvy.java =================================================================== RCS file: /cvsroot/fb-contrib/fb-contrib/src/com/mebigfatguy/fbcontrib/detect/ClassEnvy.java,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- ClassEnvy.java 31 Jan 2006 02:14:26 -0000 1.19 +++ ClassEnvy.java 1 Mar 2006 05:09:01 -0000 1.20 @@ -51,7 +51,7 @@ ignorableInterfaces.add("java.io.Serializable"); ignorableInterfaces.add("java.lang.Cloneable"); ignorableInterfaces.add("java.lang.Comparable"); - }; + } private BugReporter bugReporter; private OpcodeStack stack; @@ -374,11 +374,9 @@ int dot1 = packName1.indexOf("."); int dot2 = packName2.indexOf("."); - if (dot1 < 0) { - if (dot2 < 0) - return true; - return false; - } else if (dot2 < 0) + if (dot1 < 0) + return (dot2 < 0); + else if (dot2 < 0) return false; String s1 = packName1.substring(0, dot1); Index: UnnecessaryStoreBeforeReturn.java =================================================================== RCS file: /cvsroot/fb-contrib/fb-contrib/src/com/mebigfatguy/fbcontrib/detect/UnnecessaryStoreBeforeReturn.java,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- UnnecessaryStoreBeforeReturn.java 1 Mar 2006 02:58:19 -0000 1.8 +++ UnnecessaryStoreBeforeReturn.java 1 Mar 2006 05:09:01 -0000 1.9 @@ -63,7 +63,6 @@ private Set<Integer> branchTargets = new HashSet<Integer>(); private int state; private int storeReg; - private int loadReg; /** * constructs a USBR detector given the reporter to report bugs on @@ -91,7 +90,8 @@ @Override public void sawOpcode(int seen) { - switch (state) { + int loadReg; + switch (state) { case SEEN_NOTHING: if ((seen >= ISTORE) && (seen <= ASTORE)) { storeReg = getRegisterOperand(); Index: FloatingPointLoops.java =================================================================== RCS file: /cvsroot/fb-contrib/fb-contrib/src/com/mebigfatguy/fbcontrib/detect/FloatingPointLoops.java,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- FloatingPointLoops.java 6 Feb 2006 01:36:23 -0000 1.9 +++ FloatingPointLoops.java 1 Mar 2006 05:09:01 -0000 1.10 @@ -126,9 +126,7 @@ if ((seen >= IFEQ) && (seen <= IFLE)) { state = SEEN_IFX; gotoPC = getBranchTarget() - 3; - if (gotoPC <= getPC()) - return false; - return true; + return (gotoPC > getPC()); } break; |