Remove some redundant 'throws'; allocate more reasonably sized StringBuffers for...

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

diff --git a/core/src/com/google/zxing/client/result/AddressBookParsedResult.java b/core/src/com/google/zxing/client/result/AddressBookParsedResult.java
index 6ae80b1..7ef889c 100644 (file)
--- a/core/src/com/google/zxing/client/result/AddressBookParsedResult.java
+++ b/core/src/com/google/zxing/client/result/AddressBookParsedResult.java
@@ -105,7 +105,7 @@ public final class AddressBookParsedResult extends ParsedResult {
   }
 
   public String getDisplayResult() {
-    StringBuffer result = new StringBuffer();
+    StringBuffer result = new StringBuffer(100);
     maybeAppend(names, result);
     maybeAppend(pronunciation, result);
     maybeAppend(title, result);

diff --git a/core/src/com/google/zxing/client/result/CalendarParsedResult.java b/core/src/com/google/zxing/client/result/CalendarParsedResult.java
index 0cd3925..00280d3 100644 (file)
--- a/core/src/com/google/zxing/client/result/CalendarParsedResult.java
+++ b/core/src/com/google/zxing/client/result/CalendarParsedResult.java
@@ -84,7 +84,7 @@ public final class CalendarParsedResult extends ParsedResult {
   }
 
   public String getDisplayResult() {
-    StringBuffer result = new StringBuffer();
+    StringBuffer result = new StringBuffer(100);
     maybeAppend(summary, result);
     maybeAppend(start, result);
     maybeAppend(end, result);

diff --git a/core/src/com/google/zxing/client/result/EmailAddressParsedResult.java b/core/src/com/google/zxing/client/result/EmailAddressParsedResult.java
index f3a3442..425e766 100644 (file)
--- a/core/src/com/google/zxing/client/result/EmailAddressParsedResult.java
+++ b/core/src/com/google/zxing/client/result/EmailAddressParsedResult.java
@@ -51,7 +51,7 @@ public final class EmailAddressParsedResult extends ParsedResult {
   }
 
   public String getDisplayResult() {
-    StringBuffer result = new StringBuffer();
+    StringBuffer result = new StringBuffer(30);
     maybeAppend(emailAddress, result);
     maybeAppend(subject, result);
     maybeAppend(body, result);

diff --git a/core/src/com/google/zxing/client/result/SMSParsedResult.java b/core/src/com/google/zxing/client/result/SMSParsedResult.java
index 6b57b79..cccb4bb 100644 (file)
--- a/core/src/com/google/zxing/client/result/SMSParsedResult.java
+++ b/core/src/com/google/zxing/client/result/SMSParsedResult.java
@@ -63,7 +63,7 @@ public final class SMSParsedResult extends ParsedResult {
   }
 
   public String getDisplayResult() {
-    StringBuffer result = new StringBuffer();
+    StringBuffer result = new StringBuffer(100);
     maybeAppend(number, result);
     maybeAppend(via, result);
     maybeAppend(subject, result);

diff --git a/core/src/com/google/zxing/client/result/TelParsedResult.java b/core/src/com/google/zxing/client/result/TelParsedResult.java
index e3fd4fb..a618fe7 100644 (file)
--- a/core/src/com/google/zxing/client/result/TelParsedResult.java
+++ b/core/src/com/google/zxing/client/result/TelParsedResult.java
@@ -45,7 +45,7 @@ public final class TelParsedResult extends ParsedResult {
   }
 
   public String getDisplayResult() {
-    StringBuffer result = new StringBuffer();
+    StringBuffer result = new StringBuffer(20);
     maybeAppend(number, result);
     maybeAppend(title, result);
     return result.toString();

diff --git a/core/src/com/google/zxing/client/result/URIParsedResult.java b/core/src/com/google/zxing/client/result/URIParsedResult.java
index 7a9a9d0..6931c45 100644 (file)
--- a/core/src/com/google/zxing/client/result/URIParsedResult.java
+++ b/core/src/com/google/zxing/client/result/URIParsedResult.java
@@ -68,7 +68,7 @@ public final class URIParsedResult extends ParsedResult {
   }
 
   public String getDisplayResult() {
-    StringBuffer result = new StringBuffer();
+    StringBuffer result = new StringBuffer(30);
     maybeAppend(title, result);
     maybeAppend(uri, result);
     return result.toString();

diff --git a/core/src/com/google/zxing/client/result/VCardResultParser.java b/core/src/com/google/zxing/client/result/VCardResultParser.java
index 2aa423b..98488b5 100644 (file)
--- a/core/src/com/google/zxing/client/result/VCardResultParser.java
+++ b/core/src/com/google/zxing/client/result/VCardResultParser.java
@@ -151,7 +151,7 @@ final class VCardResultParser extends ResultParser {
           start = end + 1;
         }
         components[componentIndex] = name.substring(start);
-        StringBuffer newName = new StringBuffer();
+        StringBuffer newName = new StringBuffer(100);
         maybeAppendComponent(components, 3, newName);
         maybeAppendComponent(components, 1, newName);
         maybeAppendComponent(components, 2, newName);

diff --git a/core/src/com/google/zxing/datamatrix/decoder/DecodedBitStreamParser.java b/core/src/com/google/zxing/datamatrix/decoder/DecodedBitStreamParser.java
index 8265e86..7f6deca 100644 (file)
--- a/core/src/com/google/zxing/datamatrix/decoder/DecodedBitStreamParser.java
+++ b/core/src/com/google/zxing/datamatrix/decoder/DecodedBitStreamParser.java
@@ -77,7 +77,7 @@ final class DecodedBitStreamParser {
 
   static DecoderResult decode(byte[] bytes) throws ReaderException {
     BitSource bits = new BitSource(bytes);
-    StringBuffer result = new StringBuffer();
+    StringBuffer result = new StringBuffer(100);
     StringBuffer resultTrailer = new StringBuffer(0);
     Vector byteSegments = new Vector(1);
     int mode = ASCII_ENCODE;

diff --git a/core/src/com/google/zxing/datamatrix/detector/Detector.java b/core/src/com/google/zxing/datamatrix/detector/Detector.java
index d86a606..a22db60 100644 (file)
--- a/core/src/com/google/zxing/datamatrix/detector/Detector.java
+++ b/core/src/com/google/zxing/datamatrix/detector/Detector.java
@@ -204,8 +204,7 @@ public final class Detector {
   /**
    * Counts the number of black/white transitions between two points, using something like Bresenham's algorithm.
    */
-  private ResultPointsAndTransitions transitionsBetween(ResultPoint from, ResultPoint to)
-      throws ReaderException {
+  private ResultPointsAndTransitions transitionsBetween(ResultPoint from, ResultPoint to) {
     // See QR Code Detector, sizeOfBlackWhiteBlackRun()
     int fromX = (int) from.getX();
     int fromY = (int) from.getY();

diff --git a/core/src/com/google/zxing/oned/Code128Reader.java b/core/src/com/google/zxing/oned/Code128Reader.java
index b921af4..66b9e62 100644 (file)
--- a/core/src/com/google/zxing/oned/Code128Reader.java
+++ b/core/src/com/google/zxing/oned/Code128Reader.java
@@ -259,7 +259,7 @@ public final class Code128Reader extends AbstractOneDReader {
     boolean done = false;
     boolean isNextShifted = false;
 
-    StringBuffer result = new StringBuffer();
+    StringBuffer result = new StringBuffer(20);
     int lastStart = startPatternInfo[0];
     int nextStart = startPatternInfo[1];
     int[] counters = new int[6];

diff --git a/core/src/com/google/zxing/oned/Code39Reader.java b/core/src/com/google/zxing/oned/Code39Reader.java
index fe93251..b696c3f 100644 (file)
--- a/core/src/com/google/zxing/oned/Code39Reader.java
+++ b/core/src/com/google/zxing/oned/Code39Reader.java
@@ -99,7 +99,7 @@ public final class Code39Reader extends AbstractOneDReader {
       nextStart++;
     }
 
-    StringBuffer result = new StringBuffer();
+    StringBuffer result = new StringBuffer(20);
     int[] counters = new int[9];
     char decodedChar;
     int lastStart;

diff --git a/core/src/com/google/zxing/qrcode/decoder/DecodedBitStreamParser.java b/core/src/com/google/zxing/qrcode/decoder/DecodedBitStreamParser.java
index aee1b94..dc6ad78 100644 (file)
--- a/core/src/com/google/zxing/qrcode/decoder/DecodedBitStreamParser.java
+++ b/core/src/com/google/zxing/qrcode/decoder/DecodedBitStreamParser.java
@@ -59,7 +59,7 @@ final class DecodedBitStreamParser {
 
   static DecoderResult decode(byte[] bytes, Version version, ErrorCorrectionLevel ecLevel) throws ReaderException {
     BitSource bits = new BitSource(bytes);
-    StringBuffer result = new StringBuffer();
+    StringBuffer result = new StringBuffer(50);
     CharacterSetECI currentCharacterSetECI = null;
     boolean fc1InEffect = false;
     Vector byteSegments = new Vector(1);

diff --git a/core/src/com/google/zxing/qrcode/detector/Detector.java b/core/src/com/google/zxing/qrcode/detector/Detector.java
index 17c1dd1..9e3cd3d 100644 (file)
--- a/core/src/com/google/zxing/qrcode/detector/Detector.java
+++ b/core/src/com/google/zxing/qrcode/detector/Detector.java
@@ -196,7 +196,7 @@ public class Detector {
    * of the three finder patterns.</p>
    */
   private float calculateModuleSize(ResultPoint topLeft, ResultPoint topRight,
-      ResultPoint bottomLeft) throws ReaderException {
+      ResultPoint bottomLeft) {
     // Take the average
     return (calculateModuleSizeOneWay(topLeft, topRight) +
         calculateModuleSizeOneWay(topLeft, bottomLeft)) / 2.0f;

diff --git a/core/src/com/google/zxing/qrcode/detector/FinderPatternFinder.java b/core/src/com/google/zxing/qrcode/detector/FinderPatternFinder.java
index 1d35e67..1d819ec 100755 (executable)
--- a/core/src/com/google/zxing/qrcode/detector/FinderPatternFinder.java
+++ b/core/src/com/google/zxing/qrcode/detector/FinderPatternFinder.java
@@ -379,7 +379,7 @@ public class FinderPatternFinder {
    * @param j end of possible finder pattern in row\r
    * @return true if a finder pattern candidate was found this time\r
    */\r
-  protected boolean handlePossibleCenter(int[] stateCount, int i, int j) throws ReaderException {\r
+  protected boolean handlePossibleCenter(int[] stateCount, int i, int j) {\r
     int stateCountTotal = stateCount[0] + stateCount[1] + stateCount[2] + stateCount[3] +\r
         stateCount[4];\r
     float centerJ = centerFromEnd(stateCount, j);\r