Issue 249, fix references to methods not in MIDP 2

git-svn-id: http://zxing.googlecode.com/svn/trunk@1073 59b500cc-1b3d-0410-9834-0bbf25fbcc57

diff --git a/core/src/com/google/zxing/common/CharacterSetECI.java b/core/src/com/google/zxing/common/CharacterSetECI.java
index 44f05c3..26a1518 100644 (file)
--- a/core/src/com/google/zxing/common/CharacterSetECI.java
+++ b/core/src/com/google/zxing/common/CharacterSetECI.java
@@ -67,13 +67,13 @@ public final class CharacterSetECI extends ECI {
 
   private static void addCharacterSet(int value, String encodingName) {
     CharacterSetECI eci = new CharacterSetECI(value, encodingName);
-    VALUE_TO_ECI.put(Integer.valueOf(value), eci);
+    VALUE_TO_ECI.put(new Integer(value), eci); // can't use valueOf
     NAME_TO_ECI.put(encodingName, eci);
   }
 
   private static void addCharacterSet(int value, String[] encodingNames) {
     CharacterSetECI eci = new CharacterSetECI(value, encodingNames[0]);
-    VALUE_TO_ECI.put(Integer.valueOf(value), eci);
+    VALUE_TO_ECI.put(new Integer(value), eci); // can't use valueOf
     for (int i = 0; i < encodingNames.length; i++) {
       NAME_TO_ECI.put(encodingNames[i], eci);
     }
@@ -92,7 +92,7 @@ public final class CharacterSetECI extends ECI {
     if (value < 0 || value >= 900) {
       throw new IllegalArgumentException("Bad ECI value: " + value);
     }
-    return (CharacterSetECI) VALUE_TO_ECI.get(Integer.valueOf(value));
+    return (CharacterSetECI) VALUE_TO_ECI.get(new Integer(value));
   }
 
   /**

diff --git a/core/src/com/google/zxing/datamatrix/detector/Detector.java b/core/src/com/google/zxing/datamatrix/detector/Detector.java
index f140aff..d86a606 100644 (file)
--- a/core/src/com/google/zxing/datamatrix/detector/Detector.java
+++ b/core/src/com/google/zxing/datamatrix/detector/Detector.java
@@ -42,7 +42,8 @@ public final class Detector {
   // Trick to avoid creating new Integer objects below -- a sort of crude copy of
   // the Integer.valueOf(int) optimization added in Java 5, not in J2ME
   private static final Integer[] INTEGERS =
-      { Integer.valueOf(0), Integer.valueOf(1), Integer.valueOf(2), Integer.valueOf(3), Integer.valueOf(4) };
+      { new Integer(0), new Integer(1), new Integer(2), new Integer(3), new Integer(4) };
+  // No, can't use valueOf()
 
   private final BitMatrix image;
   private final MonochromeRectangleDetector rectangleDetector;

diff --git a/core/src/com/google/zxing/qrcode/detector/FinderPatternFinder.java b/core/src/com/google/zxing/qrcode/detector/FinderPatternFinder.java
index 199b895..1d35e67 100755 (executable)
--- a/core/src/com/google/zxing/qrcode/detector/FinderPatternFinder.java
+++ b/core/src/com/google/zxing/qrcode/detector/FinderPatternFinder.java
@@ -492,13 +492,13 @@ public class FinderPatternFinder {
       // But we can only afford to do so if we have at least 4 possibilities to choose from\r
       float totalModuleSize = 0.0f;\r
       for (int i = 0; i < startSize; i++) {\r
-        totalModuleSize += ((FinderPattern) possibleCenters.get(i)).getEstimatedModuleSize();\r
+        totalModuleSize += ((FinderPattern) possibleCenters.elementAt(i)).getEstimatedModuleSize();\r
       }\r
       float average = totalModuleSize / (float) startSize;\r
       for (int i = 0; i < possibleCenters.size() && possibleCenters.size() > 3; i++) {\r
-        FinderPattern pattern = (FinderPattern) possibleCenters.get(i);\r
+        FinderPattern pattern = (FinderPattern) possibleCenters.elementAt(i);\r
         if (Math.abs(pattern.getEstimatedModuleSize() - average) > 0.2f * average) {\r
-          possibleCenters.remove(i);\r
+          possibleCenters.removeElementAt(i);\r
           i--;\r
         }\r
       }\r