[Fb-contrib-commit] SF.net SVN: fb-contrib:[1475] trunk/fb-contrib/src/com/mebigfatguy/ fbcontrib/detect/UnnecessaryStoreBeforeReturn.java

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

Revision: 1475
          http://fb-contrib.svn.sourceforge.net/fb-contrib/?rev=1475&view=rev
Author:   dbrosius
Date:     2010-01-11 04:14:19 +0000 (Mon, 11 Jan 2010)

Log Message:
-----------
using 1.5 now --> use enums

Modified Paths:
--------------
    trunk/fb-contrib/src/com/mebigfatguy/fbcontrib/detect/UnnecessaryStoreBeforeReturn.java

Modified: trunk/fb-contrib/src/com/mebigfatguy/fbcontrib/detect/UnnecessaryStoreBeforeReturn.java
===================================================================
--- trunk/fb-contrib/src/com/mebigfatguy/fbcontrib/detect/UnnecessaryStoreBeforeReturn.java	2010-01-11 04:12:47 UTC (rev 1474)
+++ trunk/fb-contrib/src/com/mebigfatguy/fbcontrib/detect/UnnecessaryStoreBeforeReturn.java	2010-01-11 04:14:19 UTC (rev 1475)
@@ -37,9 +37,8 @@
  */
 public class UnnecessaryStoreBeforeReturn extends BytecodeScanningDetector
 {
-	private static final int SEEN_NOTHING = 0;
-	private static final int SEEN_STORE = 1;
-	private static final int SEEN_LOAD = 2;
+	enum State {SEEN_NOTHING, SEEN_STORE, SEEN_LOAD }
+	
 	private static final Set<Integer> branchInstructions = new HashSet<Integer>();
 	static {
 		branchInstructions.add(Integer.valueOf(GOTO));
@@ -65,7 +64,7 @@
 	private final BugReporter bugReporter;
 	private Set<Integer> branchTargets;
 	private Set<Integer> catchTargets;
-	private int state;
+	private State state;
 	private int storeReg;
 	
 	/**
@@ -103,7 +102,7 @@
 		String sig = m.getSignature();
 		Type t = Type.getReturnType(sig);
 		if (!t.equals(Type.VOID)) {
-			state = SEEN_NOTHING;
+			state = State.SEEN_NOTHING;
 			branchTargets.clear();
 			CodeException[] ces = obj.getExceptionTable();
 			catchTargets.clear();
@@ -128,17 +127,17 @@
 			case SEEN_NOTHING:
 				if (!catchTargets.contains(Integer.valueOf(getPC()))) {
 					if (lookForStore(seen))
-						state = SEEN_STORE;
+						state = State.SEEN_STORE;
 				}
 			break;
 			
 			case SEEN_STORE:
 				if (branchTargets.contains(Integer.valueOf(getPC()))) {
-					state = SEEN_NOTHING;
+					state = State.SEEN_NOTHING;
 					break;
 				}
 
-				state = lookForLoad(seen) ? SEEN_LOAD : SEEN_NOTHING;
+				state = lookForLoad(seen) ? State.SEEN_LOAD : State.SEEN_NOTHING;
 			break;
 			
 			case SEEN_LOAD:
@@ -148,7 +147,7 @@
 						.addMethod(this)
 						.addSourceLine(this));
 				}
-				state = SEEN_NOTHING;
+				state = State.SEEN_NOTHING;
 			break;
 		}
 		


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.