From 103786c05119655693a504ac92bb7ef295c18cd1 Mon Sep 17 00:00:00 2001 From: srowen Date: Mon, 2 Nov 2009 10:16:03 +0000 Subject: [PATCH] Remove some redundant 'throws'; allocate more reasonably sized StringBuffers for performance git-svn-id: http://zxing.googlecode.com/svn/trunk@1093 59b500cc-1b3d-0410-9834-0bbf25fbcc57 --- .../google/zxing/client/result/AddressBookParsedResult.java | 2 +- .../com/google/zxing/client/result/CalendarParsedResult.java | 2 +- .../google/zxing/client/result/EmailAddressParsedResult.java | 2 +- core/src/com/google/zxing/client/result/SMSParsedResult.java | 2 +- core/src/com/google/zxing/client/result/TelParsedResult.java | 2 +- core/src/com/google/zxing/client/result/URIParsedResult.java | 2 +- core/src/com/google/zxing/client/result/VCardResultParser.java | 2 +- .../zxing/datamatrix/decoder/DecodedBitStreamParser.java | 2 +- core/src/com/google/zxing/datamatrix/detector/Detector.java | 3 +-- core/src/com/google/zxing/oned/Code128Reader.java | 2 +- core/src/com/google/zxing/oned/Code39Reader.java | 2 +- .../google/zxing/qrcode/decoder/DecodedBitStreamParser.java | 2 +- core/src/com/google/zxing/qrcode/detector/Detector.java | 2 +- .../com/google/zxing/qrcode/detector/FinderPatternFinder.java | 2 +- 14 files changed, 14 insertions(+), 15 deletions(-) diff --git a/core/src/com/google/zxing/client/result/AddressBookParsedResult.java b/core/src/com/google/zxing/client/result/AddressBookParsedResult.java index 6ae80b19..7ef889c5 100644 --- 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 0cd39251..00280d3b 100644 --- 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 f3a34428..425e7664 100644 --- 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 6b57b790..cccb4bbc 100644 --- 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 e3fd4fbe..a618fe7a 100644 --- 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 7a9a9d02..6931c455 100644 --- 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 2aa423bc..98488b5b 100644 --- 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 8265e86a..7f6decab 100644 --- 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 d86a6063..a22db604 100644 --- 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 b921af4d..66b9e62e 100644 --- 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 fe932513..b696c3f0 100644 --- 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 aee1b943..dc6ad78c 100644 --- 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 17c1dd19..9e3cd3da 100644 --- 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.

*/ 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 1d35e671..1d819ec2 100755 --- 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 * @return true if a finder pattern candidate was found this time */ - protected boolean handlePossibleCenter(int[] stateCount, int i, int j) throws ReaderException { + protected boolean handlePossibleCenter(int[] stateCount, int i, int j) { int stateCountTotal = stateCount[0] + stateCount[1] + stateCount[2] + stateCount[3] + stateCount[4]; float centerJ = centerFromEnd(stateCount, j); -- 2.20.1