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

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

Revision: 1443
          http://fb-contrib.svn.sourceforge.net/fb-contrib/?rev=1443&view=rev
Author:   dbrosius
Date:     2010-01-05 07:11:47 +0000 (Tue, 05 Jan 2010)

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

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

Modified: trunk/fb-contrib/src/com/mebigfatguy/fbcontrib/detect/ManualArrayCopy.java
===================================================================
--- trunk/fb-contrib/src/com/mebigfatguy/fbcontrib/detect/ManualArrayCopy.java	2010-01-05 07:09:39 UTC (rev 1442)
+++ trunk/fb-contrib/src/com/mebigfatguy/fbcontrib/detect/ManualArrayCopy.java	2010-01-05 07:11:47 UTC (rev 1443)
@@ -33,12 +33,7 @@
  */
 public class ManualArrayCopy extends BytecodeScanningDetector
 {
-	public static final int SEEN_NOTHING = 0;
-	public static final int SEEN_ARRAY1_LOAD = 1;
-	public static final int SEEN_ARRAY1_INDEX = 2;
-	public static final int SEEN_ARRAY2_LOAD = 3;
-	public static final int SEEN_ARRAY2_INDEX = 4;
-	public static final int SEEN_ELEM_LOAD = 5;
+	enum State {SAW_NOTHING, SAW_ARRAY1_LOAD, SAW_ARRAY1_INDEX, SAW_ARRAY2_LOAD, SAW_ARRAY2_INDEX, SAW_ELEM_LOAD}
 	private static final BitSet arrayLoadOps = new BitSet();
 	static {
 		arrayLoadOps.set(AALOAD);
@@ -51,7 +46,7 @@
 		arrayLoadOps.set(FALOAD);
 	}
 	private BugReporter bugReporter;
-	private int state;
+	private State state;
 	private int arrayIndexReg;
 	private int loadInstruction;
 	
@@ -82,7 +77,7 @@
 	@Override
 	public void visitCode(Code obj) {
 		if (prescreen(getMethod())) {
-			state = SEEN_NOTHING;
+			state = State.SAW_NOTHING;
 			super.visitCode(obj);
 		}
 	}
@@ -90,45 +85,45 @@
 	@Override
 	public void sawOpcode(int seen) {
 		switch (state) {
-			case SEEN_NOTHING:
+			case SAW_NOTHING:
 				if ((seen == ALOAD) || ((seen >= ALOAD_0) && (seen <= ALOAD_3)))
-					state = SEEN_ARRAY1_LOAD;
+					state = State.SAW_ARRAY1_LOAD;
 			break;
 			
-			case SEEN_ARRAY1_LOAD:
+			case SAW_ARRAY1_LOAD:
 				if (seen == ILOAD) {
 					arrayIndexReg = getRegisterOperand();
-					state = SEEN_ARRAY1_INDEX;
+					state = State.SAW_ARRAY1_INDEX;
 				} else if ((seen >= ILOAD_0) && (seen <= ILOAD_3)) {
 					arrayIndexReg = seen - ILOAD_0;
-					state = SEEN_ARRAY1_INDEX;
+					state = State.SAW_ARRAY1_INDEX;
 				} else
-					state = SEEN_NOTHING;
+					state = State.SAW_NOTHING;
 			break;
 			
-			case SEEN_ARRAY1_INDEX:
+			case SAW_ARRAY1_INDEX:
 				if ((seen == ALOAD) || ((seen >= ALOAD_0) && (seen <= ALOAD_3)))
-					state = SEEN_ARRAY2_LOAD;
+					state = State.SAW_ARRAY2_LOAD;
 				else
-					state = SEEN_NOTHING;
+					state = State.SAW_NOTHING;
 			break;
 			
-			case SEEN_ARRAY2_LOAD:
+			case SAW_ARRAY2_LOAD:
 				if (seen == ILOAD) {
 					if (arrayIndexReg == this.getRegisterOperand())
-						state = SEEN_ARRAY2_INDEX;
+						state = State.SAW_ARRAY2_INDEX;
 					else
-						state = SEEN_NOTHING;
+						state = State.SAW_NOTHING;
 				} else if ((seen >= ILOAD_0) && (seen <= ILOAD_3)) {
 					if (arrayIndexReg == (seen - ILOAD_0))
-						state = SEEN_ARRAY2_INDEX;
+						state = State.SAW_ARRAY2_INDEX;
 					else
-						state = SEEN_NOTHING;
+						state = State.SAW_NOTHING;
 				} else
-					state = SEEN_NOTHING;
+					state = State.SAW_NOTHING;
 			break;
 			
-			case SEEN_ARRAY2_INDEX:
+			case SAW_ARRAY2_INDEX:
 				if ((seen == AALOAD) 
 				||  (seen == BALOAD) 
 				||  (seen == CALOAD) 
@@ -138,13 +133,13 @@
 				||  (seen == DALOAD)
 				||  (seen == FALOAD)) {
 					loadInstruction = seen;
-					state = SEEN_ELEM_LOAD;
+					state = State.SAW_ELEM_LOAD;
 				}
 				else
-					state = SEEN_NOTHING;
+					state = State.SAW_NOTHING;
 			break;
 			
-			case SEEN_ELEM_LOAD:
+			case SAW_ELEM_LOAD:
 				if ((seen == AASTORE) 
 				||  (seen == BASTORE) 
 				||  (seen == CASTORE) 
@@ -160,7 +155,7 @@
 							.addSourceLine(this));
 					}
 				}
-				state = SEEN_NOTHING;
+				state = State.SAW_NOTHING;
 			break;
 		}
 	}


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