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

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

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

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

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

Modified: trunk/fb-contrib/src/com/mebigfatguy/fbcontrib/detect/StaticArrayCreatedInMethod.java
===================================================================
--- trunk/fb-contrib/src/com/mebigfatguy/fbcontrib/detect/StaticArrayCreatedInMethod.java	2010-01-11 04:08:55 UTC (rev 1472)
+++ trunk/fb-contrib/src/com/mebigfatguy/fbcontrib/detect/StaticArrayCreatedInMethod.java	2010-01-11 04:10:58 UTC (rev 1473)
@@ -33,18 +33,12 @@
  */
 public class StaticArrayCreatedInMethod extends BytecodeScanningDetector 
 {
-	private static final int SEEN_NOTHING = 0;
-	private static final int SEEN_ARRAY_SIZE = 1;
-	private static final int SEEN_NEWARRAY = 2;
-	private static final int SEEN_DUP = 3;
-	private static final int SEEN_INDEX = 4;
-	private static final int SEEN_LDC = 5;
-	private static final int SEEN_INDEX_STORE = 6;
+	enum State {SEEN_NOTHING, SEEN_ARRAY_SIZE, SEEN_NEWARRAY, SEEN_DUP, SEEN_INDEX, SEEN_LDC, SEEN_INDEX_STORE}
 	
 	private BugReporter bugReporter;
 	private int arraySize;
 	private int storeCount;
-	private int state;
+	private State state;
 	
 	public StaticArrayCreatedInMethod(BugReporter bugReporter) {
 		this.bugReporter = bugReporter;
@@ -67,7 +61,7 @@
 	@Override
 	public void visitCode(Code obj) {
 		if (!"<clinit>".equals(getMethodName())) {
-			state = SEEN_NOTHING;
+			state = State.SEEN_NOTHING;
 			super.visitCode(obj);
 		}
 	}
@@ -86,28 +80,28 @@
 				if (seen == BIPUSH) {
 					arraySize = getIntConstant();
 					if (arraySize > 0)
-						state = SEEN_ARRAY_SIZE;
+						state = State.SEEN_ARRAY_SIZE;
 				}else if ((seen >= ICONST_M1) && (seen <= ICONST_5)) {
 					arraySize = seen - ICONST_M1 - 1;
 					if (arraySize > 0)
-						state = SEEN_ARRAY_SIZE;
+						state = State.SEEN_ARRAY_SIZE;
 				}
 			break;
 			
 			case SEEN_ARRAY_SIZE:
 				if ((seen == ANEWARRAY) || (seen == NEWARRAY)) {
-					state = SEEN_NEWARRAY;
+					state = State.SEEN_NEWARRAY;
 					storeCount = 0;
 				}
 				else
-					state = SEEN_NOTHING;
+					state = State.SEEN_NOTHING;
 			break;
 			
 			case SEEN_NEWARRAY:
 				if (seen == DUP)
-					state = SEEN_DUP;
+					state = State.SEEN_DUP;
 				else
-					state = SEEN_NOTHING;
+					state = State.SEEN_NOTHING;
 			break;
 				
 			case SEEN_DUP:
@@ -116,28 +110,28 @@
 				else if ((seen >= ICONST_M1) && (seen <= ICONST_5))
 					index = seen - ICONST_M1 - 1;
 				else {
-					state = SEEN_NOTHING;
+					state = State.SEEN_NOTHING;
 					return;
 				}
 				if (index != storeCount)
-					state = SEEN_NOTHING;
+					state = State.SEEN_NOTHING;
 				else
-					state = SEEN_INDEX;
+					state = State.SEEN_INDEX;
 			break;
 			
 			case SEEN_INDEX:
 				if ((seen == LDC) || (seen == LDC_W))
-					state = SEEN_LDC;
+					state = State.SEEN_LDC;
 				else
-					state = SEEN_NOTHING;
+					state = State.SEEN_NOTHING;
 			break;
 			
 			case SEEN_LDC:
 				if ((seen >= IASTORE) && (seen <= SASTORE)) {
 					if ((++storeCount) == arraySize)
-						state = SEEN_INDEX_STORE;
+						state = State.SEEN_INDEX_STORE;
 					else
-						state = SEEN_NEWARRAY;
+						state = State.SEEN_NEWARRAY;
 				}
 			break;
 			
@@ -149,7 +143,7 @@
 							   .addMethod(this)
 							   .addSourceLine(this, getPC()));
 				}
-				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.