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

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

Revision: 1450
          http://fb-contrib.svn.sourceforge.net/fb-contrib/?rev=1450&view=rev
Author:   dbrosius
Date:     2010-01-05 09:04:32 +0000 (Tue, 05 Jan 2010)

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

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

Modified: trunk/fb-contrib/src/com/mebigfatguy/fbcontrib/detect/PoorlyDefinedParameter.java
===================================================================
--- trunk/fb-contrib/src/com/mebigfatguy/fbcontrib/detect/PoorlyDefinedParameter.java	2010-01-05 09:03:16 UTC (rev 1449)
+++ trunk/fb-contrib/src/com/mebigfatguy/fbcontrib/detect/PoorlyDefinedParameter.java	2010-01-05 09:04:32 UTC (rev 1450)
@@ -43,16 +43,14 @@
  */
 public class PoorlyDefinedParameter extends BytecodeScanningDetector
 {
-    private static final int SAW_NOTHING = 0;
-    private static final int SAW_LOAD = 1;
-    private static final int SAW_CHECKCAST = 2;
+	enum State {SAW_NOTHING, SAW_LOAD, SAW_CHECKCAST}
     
     BugReporter bugReporter;
     Map<Integer, String> parmSigs;
     Map<Integer, BugInfo> bugs;
     int loadedReg;
     String parmSig;
-    int state;
+    State state;
     String castClass;
     int downwardBranchTarget;
     
@@ -76,7 +74,7 @@
             if (m.isStatic() || m.isPrivate() || "<init>".equals(m.getName())) {
                 parmSigs = SignatureUtils.getParameterSignatures(m);
                 if ((parmSigs.size() > 0) && prescreen(m)) {
-                    state = SAW_NOTHING;
+                    state = State.SAW_NOTHING;
                     bugs = new HashMap<Integer, BugInfo>();
                     downwardBranchTarget = -1;
                     super.visitCode(obj);
@@ -117,7 +115,7 @@
 	                    parmSig = parmSigs.get(Integer.valueOf(loadedReg));
 	                    if (parmSig != null) {
 	                        parmSig = parmSig.substring(1, parmSig.length() - 1);
-	                        state = SAW_LOAD;
+	                        state = State.SAW_LOAD;
 	                    }
 	                }
 	            break;
@@ -126,14 +124,14 @@
 	                if (seen == CHECKCAST) {
 	                    castClass = getClassConstantOperand();
 	                    if (!castClass.equals(parmSig)) {
-	                        state = SAW_CHECKCAST;
+	                        state = State.SAW_CHECKCAST;
 	                        return;
 	                    }
 	                } else if (seen == INSTANCEOF) {
 	                    // probably an if guard... assume the code is reasonable
 	                    parmSigs.remove(Integer.valueOf(loadedReg));
 	                }
-	                state = SAW_NOTHING;
+	                state = State.SAW_NOTHING;
 	            break;
 	            
 	            case SAW_CHECKCAST:
@@ -168,7 +166,7 @@
 	                    
 	                }
 	                    
-	                state = SAW_NOTHING;
+	                state = State.SAW_NOTHING;
 	            break;
 	        }
 	        if ((seen >= IFEQ) && (seen <= IF_ACMPNE)) {
@@ -177,7 +175,7 @@
 	        		downwardBranchTarget = -1;
 	        }
 	    } else {
-    		state = SAW_NOTHING;
+    		state = State.SAW_NOTHING;
     		if (getPC() >= downwardBranchTarget)
     			downwardBranchTarget = -1;
     	}


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