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

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

Revision: 955
          http://fb-contrib.svn.sourceforge.net/fb-contrib/?rev=955&view=rev
Author:   dbrosius
Date:     2007-11-06 23:01:26 -0800 (Tue, 06 Nov 2007)

Log Message:
-----------
get rid of java 5 dependencies

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

Modified: trunk/fb-contrib/src/com/mebigfatguy/fbcontrib/detect/SillynessPotPourri.java
===================================================================
--- trunk/fb-contrib/src/com/mebigfatguy/fbcontrib/detect/SillynessPotPourri.java	2007-11-03 04:27:00 UTC (rev 954)
+++ trunk/fb-contrib/src/com/mebigfatguy/fbcontrib/detect/SillynessPotPourri.java	2007-11-07 07:01:26 UTC (rev 955)
@@ -29,6 +29,7 @@
 import org.apache.bcel.classfile.ConstantDouble;
 import org.apache.bcel.classfile.JavaClass;
 
+import com.mebigfatguy.fbcontrib.utils.Integer14;
 import com.mebigfatguy.fbcontrib.utils.RegisterUtils;
 
 import edu.umd.cs.findbugs.BugInstance;
@@ -102,14 +103,14 @@
 			stack.mergeJumps(this);
 			
 			if (((seen >= IFEQ) && (seen <= GOTO)) || (seen == IFNULL) || (seen == IFNONNULL) || (seen == GOTO_W)) {
-				Integer branchTarget = Integer.valueOf(getBranchTarget());
+				Integer branchTarget = Integer14.valueOf(getBranchTarget());
 				Set<Integer> branchInsSet = branchTargets.get(branchTarget);
 				if (branchInsSet == null)
 				{
 					branchInsSet = new HashSet<Integer>();
 					branchTargets.put(branchTarget, branchInsSet);
 				}
-				branchInsSet.add(Integer.valueOf(getPC()));
+				branchInsSet.add(Integer14.valueOf(getPC()));
 			}
 			
 			if (seen == IFEQ) {
@@ -126,10 +127,10 @@
 				&&  ((0x00FF & bytes[lastPCs[0]]) == IFEQ)) {
 					if (getMethod().getSignature().endsWith("Z")) {
 						boolean bug = true;
-						Set<Integer> branchInsSet = branchTargets.get(Integer.valueOf(lastPCs[1]));
+						Set<Integer> branchInsSet = branchTargets.get(Integer14.valueOf(lastPCs[1]));
 						if (branchInsSet != null)
 							bug = false;
-						branchInsSet = branchTargets.get(Integer.valueOf(lastPCs[3]));
+						branchInsSet = branchTargets.get(Integer14.valueOf(lastPCs[3]));
 						if ((branchInsSet != null) && branchInsSet.size() > 1)
 							bug = false;
 							


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