[Fb-contrib-commit] fb-contrib/src/com/mebigfatguy/fbcontrib/detect ArrayWrappedCallByReference.java
Brought to you by:
dbrosius
From: Dave B. <dbr...@us...> - 2006-03-12 06:27:21
|
Update of /cvsroot/fb-contrib/fb-contrib/src/com/mebigfatguy/fbcontrib/detect In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11942/src/com/mebigfatguy/fbcontrib/detect Modified Files: ArrayWrappedCallByReference.java BloatedSynchronizedBlock.java ClassEnvy.java ConstantListIndex.java CustomBuiltXML.java JDBCVendorReliance.java LocalSynchronizedCollection.java OrphanedDOMNode.java OverlyConcreteParameter.java SloppyClassReflection.java UnrelatedCollectionContents.java Log Message: simple cleanups Index: SloppyClassReflection.java =================================================================== RCS file: /cvsroot/fb-contrib/fb-contrib/src/com/mebigfatguy/fbcontrib/detect/SloppyClassReflection.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- SloppyClassReflection.java 12 Mar 2006 02:55:34 -0000 1.5 +++ SloppyClassReflection.java 12 Mar 2006 06:27:17 -0000 1.6 @@ -103,8 +103,7 @@ if (lvt != null) { LocalVariable[] lvs = lvt.getLocalVariableTable(); if (lvs != null) { - for (int l = 0; l < lvs.length; l++) { - LocalVariable lv = lvs[l]; + for (LocalVariable lv : lvs) { if (lv != null) { Type t = Type.getType(lv.getSignature()); addType(t); Index: BloatedSynchronizedBlock.java =================================================================== RCS file: /cvsroot/fb-contrib/fb-contrib/src/com/mebigfatguy/fbcontrib/detect/BloatedSynchronizedBlock.java,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- BloatedSynchronizedBlock.java 1 Mar 2006 04:52:03 -0000 1.17 +++ BloatedSynchronizedBlock.java 12 Mar 2006 06:27:17 -0000 1.18 @@ -114,7 +114,7 @@ int parmCount = Type.getArgumentTypes(methodSig).length; if (stack.getStackDepth() > parmCount) { OpcodeStack.Item itm = stack.getStackItem(parmCount); - unsafeCallOccurred = unsafeAliases.contains(itm.getRegisterNumber()); + unsafeCallOccurred = unsafeAliases.contains(new Integer(itm.getRegisterNumber())); } else unsafeCallOccurred = false; } else Index: UnrelatedCollectionContents.java =================================================================== RCS file: /cvsroot/fb-contrib/fb-contrib/src/com/mebigfatguy/fbcontrib/detect/UnrelatedCollectionContents.java,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- UnrelatedCollectionContents.java 1 Mar 2006 05:09:01 -0000 1.14 +++ UnrelatedCollectionContents.java 12 Mar 2006 06:27:17 -0000 1.15 @@ -105,7 +105,7 @@ try { stack.mergeJumps(this); - Set<Integer> regs = localScopeEnds.remove(getPC()); + Set<Integer> regs = localScopeEnds.remove(new Integer(getPC())); if (regs != null) { for (Integer i : regs) { localCollections.remove(i); @@ -170,7 +170,7 @@ regs = new HashSet<Integer>(); localScopeEnds.put(scopeEnd, regs); } - regs.add(reg); + regs.add(new Integer(reg)); } } } else { Index: CustomBuiltXML.java =================================================================== RCS file: /cvsroot/fb-contrib/fb-contrib/src/com/mebigfatguy/fbcontrib/detect/CustomBuiltXML.java,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- CustomBuiltXML.java 6 Feb 2006 01:36:22 -0000 1.8 +++ CustomBuiltXML.java 12 Mar 2006 06:27:17 -0000 1.9 @@ -70,7 +70,7 @@ public CustomBuiltXML(BugReporter bugReporter) { this.bugReporter = bugReporter; - lowReportingThreshold = Integer.getInteger(CBX_MIN_REPORTABLE_ITEMS, 5); + lowReportingThreshold = Integer.getInteger(CBX_MIN_REPORTABLE_ITEMS, 5).intValue(); midReportingThreshold = lowReportingThreshold << 1; highReportingThreshold = lowReportingThreshold << 2; } Index: ConstantListIndex.java =================================================================== RCS file: /cvsroot/fb-contrib/fb-contrib/src/com/mebigfatguy/fbcontrib/detect/ConstantListIndex.java,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- ConstantListIndex.java 6 Feb 2006 01:36:22 -0000 1.8 +++ ConstantListIndex.java 12 Mar 2006 06:27:17 -0000 1.9 @@ -54,7 +54,7 @@ */ public ConstantListIndex(BugReporter bugReporter) { this.bugReporter = bugReporter; - max_iConst0LoopDistance = Integer.getInteger(MAX_ICONST0_LOOP_DISTANCE_PROPERTY, 30); + max_iConst0LoopDistance = Integer.getInteger(MAX_ICONST0_LOOP_DISTANCE_PROPERTY, 30).intValue(); } /** Index: ClassEnvy.java =================================================================== RCS file: /cvsroot/fb-contrib/fb-contrib/src/com/mebigfatguy/fbcontrib/detect/ClassEnvy.java,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- ClassEnvy.java 1 Mar 2006 05:09:01 -0000 1.20 +++ ClassEnvy.java 12 Mar 2006 06:27:17 -0000 1.21 @@ -74,7 +74,7 @@ String percent = System.getProperty(ENVY_PERCENT_PROPERTY); if (percent != null) { try { - envyPercent = Double.valueOf(percent); + envyPercent = Double.valueOf(percent).doubleValue(); } catch (NumberFormatException nfe) { //Stick with original } Index: JDBCVendorReliance.java =================================================================== RCS file: /cvsroot/fb-contrib/fb-contrib/src/com/mebigfatguy/fbcontrib/detect/JDBCVendorReliance.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- JDBCVendorReliance.java 7 Mar 2006 04:58:42 -0000 1.3 +++ JDBCVendorReliance.java 12 Mar 2006 06:27:17 -0000 1.4 @@ -175,7 +175,7 @@ /** * returns whether the class is a jdbc class * - * @param a class name or signature of a class + * @param clsName class name or signature of a class * * @return if the class name is a jdbc one */ Index: ArrayWrappedCallByReference.java =================================================================== RCS file: /cvsroot/fb-contrib/fb-contrib/src/com/mebigfatguy/fbcontrib/detect/ArrayWrappedCallByReference.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- ArrayWrappedCallByReference.java 6 Feb 2006 01:36:22 -0000 1.5 +++ ArrayWrappedCallByReference.java 12 Mar 2006 06:27:17 -0000 1.6 @@ -125,7 +125,7 @@ int reg = getAStoreReg(seen); Integer elReg = (Integer)itm.getUserValue(); if (elReg != null) - wrappers.put(new Integer(reg), new WrapperInfo(elReg)); + wrappers.put(new Integer(reg), new WrapperInfo(elReg.intValue())); } else { Integer elReg = (Integer)itm.getUserValue(); if (elReg != null) { @@ -164,7 +164,7 @@ int arReg = arItm.getRegisterNumber(); WrapperInfo wi = wrappers.get(new Integer(arReg)); if ((wi != null) && wi.wasArg) { - userValue = wi.wrappedReg; + userValue = new Integer(wi.wrappedReg); } } } else if ((seen == ALOAD) || ((seen >= ALOAD_0) && (seen <= ALOAD_3))) { Index: LocalSynchronizedCollection.java =================================================================== RCS file: /cvsroot/fb-contrib/fb-contrib/src/com/mebigfatguy/fbcontrib/detect/LocalSynchronizedCollection.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- LocalSynchronizedCollection.java 12 Mar 2006 04:14:53 -0000 1.4 +++ LocalSynchronizedCollection.java 12 Mar 2006 06:27:17 -0000 1.5 @@ -125,7 +125,7 @@ OpcodeStack.Item item = stack.getStackItem(0); if (item.getUserValue() != null) { int reg = getAStoreReg(seen); - if (!syncRegs.containsKey(reg)) { + if (!syncRegs.containsKey(new Integer(reg))) { CollectionRegInfo cri = new CollectionRegInfo(SourceLineAnnotation.fromVisitedInstruction(this)); syncRegs.put(new Integer(reg), cri); @@ -139,7 +139,7 @@ } else if ((seen == PUTFIELD) || (seen == ARETURN)) { if (stack.getStackDepth() > 0) { OpcodeStack.Item item = stack.getStackItem(0); - syncRegs.remove((Integer)item.getUserValue()); + syncRegs.remove(item.getUserValue()); } } Index: OverlyConcreteParameter.java =================================================================== RCS file: /cvsroot/fb-contrib/fb-contrib/src/com/mebigfatguy/fbcontrib/detect/OverlyConcreteParameter.java,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- OverlyConcreteParameter.java 6 Feb 2006 01:36:23 -0000 1.28 +++ OverlyConcreteParameter.java 12 Mar 2006 06:27:17 -0000 1.29 @@ -193,7 +193,7 @@ if (!methodIsStatic) parm--; if ((parm >= 0) && (parm < parmCount)) - parameterDefiners.remove(reg); + parameterDefiners.remove(new Integer(reg)); } else { parameterDefiners.clear(); } @@ -206,7 +206,7 @@ if (!methodIsStatic) parm--; if ((parm >= 0) && (parm < parmCount)) - parameterDefiners.remove(reg); + parameterDefiners.remove(new Integer(reg)); } else { parameterDefiners.clear(); } @@ -333,9 +333,9 @@ while (it.hasNext()) { boolean methodDefined = false; List<String> methodSigs = it.next(); - Iterator<String> mit = methodSigs.iterator(); - while (mit.hasNext()) { - if (methodInfo.equals(mit.next())) { + + for (String mi : methodSigs) { + if (methodInfo.equals(mi)) { methodDefined = true; break; } Index: OrphanedDOMNode.java =================================================================== RCS file: /cvsroot/fb-contrib/fb-contrib/src/com/mebigfatguy/fbcontrib/detect/OrphanedDOMNode.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- OrphanedDOMNode.java 6 Feb 2006 01:36:23 -0000 1.6 +++ OrphanedDOMNode.java 12 Mar 2006 06:27:17 -0000 1.7 @@ -174,7 +174,7 @@ if (nodeCreations.containsKey(itm)) { int reg = itm.getRegisterNumber(); nodeCreations.remove(itm); - nodeStores.remove(reg); + nodeStores.remove(new Integer(reg)); } } } |