"Split" ReaderException into subclasses to enable more useful error reporting

[zxing.git] / core / src / com / google / zxing / multi / qrcode / detector / MultiFinderPatternFinder.java

diff --git a/core/src/com/google/zxing/multi/qrcode/detector/MultiFinderPatternFinder.java b/core/src/com/google/zxing/multi/qrcode/detector/MultiFinderPatternFinder.java
index d133400..0eb8ea1 100644 (file)
--- a/core/src/com/google/zxing/multi/qrcode/detector/MultiFinderPatternFinder.java
+++ b/core/src/com/google/zxing/multi/qrcode/detector/MultiFinderPatternFinder.java
@@ -17,12 +17,12 @@
 package com.google.zxing.multi.qrcode.detector;\r
 \r
 import com.google.zxing.DecodeHintType;\r
-import com.google.zxing.ReaderException;\r
+import com.google.zxing.NotFoundException;\r
 import com.google.zxing.ResultPoint;\r
 import com.google.zxing.ResultPointCallback;\r
+import com.google.zxing.common.BitMatrix;\r
 import com.google.zxing.common.Collections;\r
 import com.google.zxing.common.Comparator;\r
-import com.google.zxing.common.BitMatrix;\r
 import com.google.zxing.qrcode.detector.FinderPattern;\r
 import com.google.zxing.qrcode.detector.FinderPatternFinder;\r
 import com.google.zxing.qrcode.detector.FinderPatternInfo;\r
@@ -99,15 +99,15 @@ final class MultiFinderPatternFinder extends FinderPatternFinder {
    * @return the 3 best {@link FinderPattern}s from our list of candidates. The "best" are\r
    *         those that have been detected at least {@link #CENTER_QUORUM} times, and whose module\r
    *         size differs from the average among those patterns the least\r
-   * @throws ReaderException if 3 such finder patterns do not exist\r
+   * @throws NotFoundException if 3 such finder patterns do not exist\r
    */\r
-  private FinderPattern[][] selectBestPatterns() throws ReaderException {\r
+  private FinderPattern[][] selectBestPatterns() throws NotFoundException {\r
     Vector possibleCenters = getPossibleCenters();\r
     int size = possibleCenters.size();\r
 \r
     if (size < 3) {\r
       // Couldn't find enough finder patterns\r
-      throw ReaderException.getInstance();\r
+      throw NotFoundException.getNotFoundInstance();\r
     }\r
 \r
     /*\r
@@ -227,10 +227,10 @@ final class MultiFinderPatternFinder extends FinderPatternFinder {
     }\r
 \r
     // Nothing found!\r
-    throw ReaderException.getInstance();\r
+    throw NotFoundException.getNotFoundInstance();\r
   }\r
 \r
-  public FinderPatternInfo[] findMulti(Hashtable hints) throws ReaderException {\r
+  public FinderPatternInfo[] findMulti(Hashtable hints) throws NotFoundException {\r
     boolean tryHarder = hints != null && hints.containsKey(DecodeHintType.TRY_HARDER);\r
     BitMatrix image = getImage();\r
     int maxI = image.getHeight();\r