Chopped up into several classes, made into beans, etc for a bit of clarity

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

javase/src/com/google/zxing/client/j2se/CommandLineRunner.java

@@ -17,139 +17,25 @@
 package com.google.zxing.client.j2se;
 
 import com.google.zxing.BarcodeFormat;
-import com.google.zxing.BinaryBitmap;
 import com.google.zxing.DecodeHintType;
-import com.google.zxing.LuminanceSource;
-import com.google.zxing.MultiFormatReader;
-import com.google.zxing.NotFoundException;
-import com.google.zxing.Result;
-import com.google.zxing.ResultPoint;
-import com.google.zxing.client.result.ParsedResult;
-import com.google.zxing.client.result.ResultParser;
-import com.google.zxing.common.BitArray;
-import com.google.zxing.common.BitMatrix;
-import com.google.zxing.common.HybridBinarizer;
-import com.google.zxing.multi.GenericMultipleBarcodeReader;
 
-import java.awt.image.BufferedImage;
 import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.Writer;
-import java.net.URI;
-import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.Hashtable;
+import java.util.List;
+import java.util.Locale;
 import java.util.Vector;
 
-import javax.imageio.ImageIO;
-
 /**
  * This simple command line utility decodes files, directories of files, or URIs which are passed
  * as arguments. By default it uses the normal decoding algorithms, but you can pass --try_harder
  * to request that hint. The raw text of each barcode is printed, and when running against
  * directories, summary statistics are also displayed.
  *
- * @author Sean Owen
  * @author dswitkin@google.com (Daniel Switkin)
  */
 public final class CommandLineRunner {
 
-  private static class Config {
-    public Hashtable<DecodeHintType, Object> hints = null;
-    public boolean tryHarder = false;
-    public boolean pureBarcode = false;
-    public boolean productsOnly = false;
-    public boolean dumpResults = false;
-    public boolean dumpBlackPoint = false;
-    public boolean multi = false;
-    public boolean brief = false;
-    public boolean recursive = false;
-    public int[] crop = null;
-    public int threads = 1;
-  }
-
-  // Represents the collection of all images files/URLs to decode.
-  private static class Inputs {
-    Vector<String> inputs = new Vector<String>(10);
-    int position = 0;
-
-    public synchronized void addInput(String pathOrUrl) {
-      inputs.add(pathOrUrl);
-    }
-
-    public synchronized String getNextInput() {
-      if (position < inputs.size()) {
-        String result = inputs.get(position);
-        position++;
-        return result;
-      } else {
-        return null;
-      }
-    }
-
-    public synchronized int getInputCount() {
-      return inputs.size();
-    }
-  }
-
-  // One of a pool of threads which pulls images off the Inputs queue and decodes them in parallel.
-  private static class DecodeThread extends Thread {
-    private int successful = 0;
-
-    @Override
-    public void run() {
-      while (true) {
-        String input = inputs.getNextInput();
-        if (input == null) {
-          break;
-        }
-
-        File inputFile = new File(input);
-        if (inputFile.exists()) {
-          try {
-            if (config.multi) {
-              Result[] results = decodeMulti(inputFile.toURI(), config.hints);
-              if (results != null) {
-                successful++;
-                if (config.dumpResults) {
-                  dumpResultMulti(inputFile, results);
-                }
-              }
-            } else {
-              Result result = decode(inputFile.toURI(), config.hints);
-              if (result != null) {
-                successful++;
-                if (config.dumpResults) {
-                  dumpResult(inputFile, result);
-                }
-              }
-            }
-          } catch (IOException e) {
-          }
-        } else {
-          try {
-            Result result = decode(new URI(input), config.hints);
-            if (result != null) {
-              successful++;
-            }
-          } catch (Exception e) {
-          }
-        }
-      }
-    }
-
-    public int getSuccessful() {
-      return successful;
-    }
-  }
-
-  private static Config config = new Config();
-  private static Inputs inputs = new Inputs();
-
   private CommandLineRunner() {
   }
 
@@ -159,33 +45,37 @@ public final class CommandLineRunner {
       return;
     }
 
+    Config config = new Config();
+    Inputs inputs = new Inputs();
+
     for (String arg : args) {
       if ("--try_harder".equals(arg)) {
-        config.tryHarder = true;
+        config.setTryHarder(true);
       } else if ("--pure_barcode".equals(arg)) {
-        config.pureBarcode = true;
+        config.setPureBarcode(true);
       } else if ("--products_only".equals(arg)) {
-        config.productsOnly = true;
+        config.setProductsOnly(true);
       } else if ("--dump_results".equals(arg)) {
-        config.dumpResults = true;
+        config.setDumpResults(true);
       } else if ("--dump_black_point".equals(arg)) {
-        config.dumpBlackPoint = true;
+        config.setDumpBlackPoint(true);
       } else if ("--multi".equals(arg)) {
-        config.multi = true;
+        config.setMulti(true);
       } else if ("--brief".equals(arg)) {
-        config.brief = true;
+        config.setBrief(true);
       } else if ("--recursive".equals(arg)) {
-        config.recursive = true;
+        config.setRecursive(true);
       } else if (arg.startsWith("--crop")) {
-        config.crop = new int[4];
+        int[] crop = new int[4];
         String[] tokens = arg.substring(7).split(",");
-        for (int i = 0; i < config.crop.length; i++) {
+        for (int i = 0; i < config.getCrop().length; i++) {
-          config.crop[i] = Integer.parseInt(tokens[i]);
+          crop[i] = Integer.parseInt(tokens[i]);
         }
+        config.setCrop(crop);
       } else if (arg.startsWith("--threads") && arg.length() >= 10) {
         int threads = Integer.parseInt(arg.substring(10));
         if (threads > 1) {
-          config.threads = threads;
+          config.setThreads(threads);
         }
       } else if (arg.startsWith("-")) {
         System.err.println("Unknown command line option " + arg);
@@ -193,23 +83,23 @@ public final class CommandLineRunner {
         return;
       }
     }
-    config.hints = buildHints();
+    config.setHints(buildHints(config));
 
     for (String arg : args) {
       if (!arg.startsWith("--")) {
-        addArgumentToInputs(arg);
+        addArgumentToInputs(arg, config, inputs);
       }
     }
 
-    ArrayList<DecodeThread> threads = new ArrayList<DecodeThread>(config.threads);
+    List<DecodeThread> threads = new ArrayList<DecodeThread>(config.getThreads());
-    for (int x = 0; x < config.threads; x++) {
+    for (int x = 0; x < config.getThreads(); x++) {
-      DecodeThread thread = new DecodeThread();
+      DecodeThread thread = new DecodeThread(config, inputs);
       threads.add(thread);
       thread.start();
     }
 
     int successful = 0;
-    for (int x = 0; x < config.threads; x++) {
+    for (int x = 0; x < config.getThreads(); x++) {
       threads.get(x).join();
       successful += threads.get(x).getSuccessful();
     }
@@ -222,20 +112,20 @@ public final class CommandLineRunner {
 
   // Build all the inputs up front into a single flat list, so the threads can atomically pull
   // paths/URLs off the queue.
-  private static void addArgumentToInputs(String argument) {
+  private static void addArgumentToInputs(String argument, Config config, Inputs inputs) {
     File inputFile = new File(argument);
     if (inputFile.exists()) {
       if (inputFile.isDirectory()) {
         for (File singleFile : inputFile.listFiles()) {
-          String filename = singleFile.getName().toLowerCase();
+          String filename = singleFile.getName().toLowerCase(Locale.ENGLISH);
           // Skip hidden files and directories (e.g. svn stuff).
           if (filename.startsWith(".")) {
             continue;
           }
           // Recurse on nested directories if requested, otherwise skip them.
           if (singleFile.isDirectory()) {
-            if (config.recursive) {
+            if (config.isRecursive()) {
-              addArgumentToInputs(singleFile.getAbsolutePath());
+              addArgumentToInputs(singleFile.getAbsolutePath(), config, inputs);
             }
             continue;
           }
@@ -254,7 +144,7 @@ public final class CommandLineRunner {
   }
 
   // Manually turn on all formats, even those not yet considered production quality.
-  private static Hashtable<DecodeHintType, Object> buildHints() {
+  private static Hashtable<DecodeHintType, Object> buildHints(Config config) {
     Hashtable<DecodeHintType, Object> hints = new Hashtable<DecodeHintType, Object>(3);
     Vector<BarcodeFormat> vector = new Vector<BarcodeFormat>(8);
     vector.addElement(BarcodeFormat.UPC_A);
@@ -262,7 +152,7 @@ public final class CommandLineRunner {
     vector.addElement(BarcodeFormat.EAN_13);
     vector.addElement(BarcodeFormat.EAN_8);
     vector.addElement(BarcodeFormat.RSS14);
-    if (!config.productsOnly) {
+    if (!config.isProductsOnly()) {
       vector.addElement(BarcodeFormat.CODE_39);
       vector.addElement(BarcodeFormat.CODE_93);
       vector.addElement(BarcodeFormat.CODE_128);
@@ -274,10 +164,10 @@ public final class CommandLineRunner {
       vector.addElement(BarcodeFormat.CODABAR);
     }
     hints.put(DecodeHintType.POSSIBLE_FORMATS, vector);
-    if (config.tryHarder) {
+    if (config.isTryHarder()) {
       hints.put(DecodeHintType.TRY_HARDER, Boolean.TRUE);
     }
-    if (config.pureBarcode) {
+    if (config.isPureBarcode()) {
       hints.put(DecodeHintType.PURE_BARCODE, Boolean.TRUE);
     }
     return hints;
@@ -298,254 +188,4 @@ public final class CommandLineRunner {
     System.err.println("  --threads=n: The number of threads to use while decoding");
   }
 
-  private static void dumpResult(File input, Result result) throws IOException {
-    String name = input.getAbsolutePath();
-    int pos = name.lastIndexOf('.');
-    if (pos > 0) {
-      name = name.substring(0, pos);
-    }
-    File dump = new File(name + ".txt");
-    writeStringToFile(result.getText(), dump);
-  }
-
-  private static void dumpResultMulti(File input, Result[] results) throws IOException {
-    String name = input.getAbsolutePath();
-    int pos = name.lastIndexOf('.');
-    if (pos > 0) {
-      name = name.substring(0, pos);
-    }
-    File dump = new File(name + ".txt");
-    writeResultsToFile(results, dump);
-  }
-
-  private static void writeStringToFile(String value, File file) throws IOException {
-    Writer out = new OutputStreamWriter(new FileOutputStream(file), Charset.forName("UTF8"));
-    try {
-      out.write(value);
-    } finally {
-      out.close();
-    }
-  }
-
-  private static void writeResultsToFile(Result[] results, File file) throws IOException {
-    String newline = System.getProperty("line.separator");
-    Writer out = new OutputStreamWriter(new FileOutputStream(file), Charset.forName("UTF8"));
-    try {
-      for (Result result : results) {
-        out.write(result.getText());
-        out.write(newline);
-      }
-    } finally {
-      out.close();
-    }
-  }
-
-  private static Result decode(URI uri, Hashtable<DecodeHintType, Object> hints)
-      throws IOException {
-    BufferedImage image;
-    try {
-      image = ImageIO.read(uri.toURL());
-    } catch (IllegalArgumentException iae) {
-      throw new FileNotFoundException("Resource not found: " + uri);
-    }
-    if (image == null) {
-      System.err.println(uri.toString() + ": Could not load image");
-      return null;
-    }
-    try {
-      LuminanceSource source;
-      if (config.crop == null) {
-        source = new BufferedImageLuminanceSource(image);
-      } else {
-        source = new BufferedImageLuminanceSource(image, config.crop[0], config.crop[1],
-            config.crop[2], config.crop[3]);
-      }
-      BinaryBitmap bitmap = new BinaryBitmap(new HybridBinarizer(source));
-      if (config.dumpBlackPoint) {
-        dumpBlackPoint(uri, image, bitmap);
-      }
-      Result result = new MultiFormatReader().decode(bitmap, hints);
-      if (config.brief) {
-        System.out.println(uri.toString() + ": Success");
-      } else {
-        ParsedResult parsedResult = ResultParser.parseResult(result);
-        System.out.println(uri.toString() + " (format: " + result.getBarcodeFormat() + ", type: " +
-            parsedResult.getType() + "):\nRaw result:\n" + result.getText() + "\nParsed result:\n" +
-            parsedResult.getDisplayResult());
-
-        System.out.println("Found " + result.getResultPoints().length + " result points.");
-        for (int i = 0; i < result.getResultPoints().length; i++) {
-          ResultPoint rp = result.getResultPoints()[i];
-          System.out.println("  Point " + i + ": (" + rp.getX() + ',' + rp.getY() + ')');
-        }
-      }
-
-      return result;
-    } catch (NotFoundException nfe) {
-      System.out.println(uri.toString() + ": No barcode found");
-      return null;
-      // } finally {
-      // Uncomment these lines when turning on exception tracking in ReaderException.
-      //System.out.println("Threw " + ReaderException.getExceptionCountAndReset() + " exceptions");
-      //System.out.println("Throwers:\n" + ReaderException.getThrowersAndReset());
-    }
-  }
-
-  private static Result[] decodeMulti(URI uri, Hashtable<DecodeHintType, Object> hints)
-      throws IOException {
-    BufferedImage image;
-    try {
-      image = ImageIO.read(uri.toURL());
-    } catch (IllegalArgumentException iae) {
-      throw new FileNotFoundException("Resource not found: " + uri);
-    }
-    if (image == null) {
-      System.err.println(uri.toString() + ": Could not load image");
-      return null;
-    }
-    try {
-      LuminanceSource source;
-      if (config.crop == null) {
-        source = new BufferedImageLuminanceSource(image);
-      } else {
-        source = new BufferedImageLuminanceSource(image, config.crop[0], config.crop[1],
-            config.crop[2], config.crop[3]);
-      }
-      BinaryBitmap bitmap = new BinaryBitmap(new HybridBinarizer(source));
-      if (config.dumpBlackPoint) {
-        dumpBlackPoint(uri, image, bitmap);
-      }
-
-      MultiFormatReader multiFormatReader = new MultiFormatReader();
-      GenericMultipleBarcodeReader reader = new GenericMultipleBarcodeReader(
-          multiFormatReader);
-      Result[] results = reader.decodeMultiple(bitmap, hints);
-
-      if (config.brief) {
-        System.out.println(uri.toString() + ": Success");
-      } else {
-        for (Result result : results) {
-          ParsedResult parsedResult = ResultParser.parseResult(result);
-          System.out.println(uri.toString() + " (format: "
-              + result.getBarcodeFormat() + ", type: "
-              + parsedResult.getType() + "):\nRaw result:\n"
-              + result.getText() + "\nParsed result:\n"
-              + parsedResult.getDisplayResult());
-          System.out.println("Found " + result.getResultPoints().length + " result points.");
-          for (int i = 0; i < result.getResultPoints().length; i++) {
-            ResultPoint rp = result.getResultPoints()[i];
-            System.out.println("  Point " + i + ": (" + rp.getX() + ',' + rp.getY() + ')');
-          }
-        }
-      }
-      return results;
-    } catch (NotFoundException nfe) {
-      System.out.println(uri.toString() + ": No barcode found");
-      return null;
-    }
-  }
-
-  // Writes out a single PNG which is three times the width of the input image, containing from left
-  // to right: the original image, the row sampling monochrome version, and the 2D sampling
-  // monochrome version.
-  // TODO: Update to compare different Binarizer implementations.
-  private static void dumpBlackPoint(URI uri, BufferedImage image, BinaryBitmap bitmap) {
-    String inputName = uri.getPath();
-    if (inputName.contains(".mono.png")) {
-      return;
-    }
-
-    int width = bitmap.getWidth();
-    int height = bitmap.getHeight();
-    int stride = width * 3;
-    int[] pixels = new int[stride * height];
-
-    // The original image
-    int[] argb = new int[width];
-    for (int y = 0; y < height; y++) {
-      image.getRGB(0, y, width, 1, argb, 0, width);
-      System.arraycopy(argb, 0, pixels, y * stride, width);
-    }
-
-    // Row sampling
-    BitArray row = new BitArray(width);
-    for (int y = 0; y < height; y++) {
-      try {
-        row = bitmap.getBlackRow(y, row);
-      } catch (NotFoundException nfe) {
-        // If fetching the row failed, draw a red line and keep going.
-        int offset = y * stride + width;
-        for (int x = 0; x < width; x++) {
-          pixels[offset + x] = 0xffff0000;
-        }
-        continue;
-      }
-
-      int offset = y * stride + width;
-      for (int x = 0; x < width; x++) {
-        if (row.get(x)) {
-          pixels[offset + x] = 0xff000000;
-        } else {
-          pixels[offset + x] = 0xffffffff;
-        }
-      }
-    }
-
-    // 2D sampling
-    try {
-      for (int y = 0; y < height; y++) {
-        BitMatrix matrix = bitmap.getBlackMatrix();
-        int offset = y * stride + width * 2;
-        for (int x = 0; x < width; x++) {
-          if (matrix.get(x, y)) {
-            pixels[offset + x] = 0xff000000;
-          } else {
-            pixels[offset + x] = 0xffffffff;
-          }
-        }
-      }
-    } catch (NotFoundException nfe) {
-    }
-
-    writeResultImage(stride, height, pixels, uri, inputName, ".mono.png");
-  }
-
-  private static void writeResultImage(int stride, int height, int[] pixels, URI uri,
-      String inputName, String suffix) {
-    // Write the result
-    BufferedImage result = new BufferedImage(stride, height, BufferedImage.TYPE_INT_ARGB);
-    result.setRGB(0, 0, stride, height, pixels, 0, stride);
-
-    // Use the current working directory for URLs
-    String resultName = inputName;
-    if ("http".equals(uri.getScheme())) {
-      int pos = resultName.lastIndexOf('/');
-      if (pos > 0) {
-        resultName = '.' + resultName.substring(pos);
-      }
-    }
-    int pos = resultName.lastIndexOf('.');
-    if (pos > 0) {
-      resultName = resultName.substring(0, pos);
-    }
-    resultName += suffix;
-    OutputStream outStream = null;
-    try {
-      outStream = new FileOutputStream(resultName);
-      ImageIO.write(result, "png", outStream);
-    } catch (FileNotFoundException e) {
-      System.err.println("Could not create " + resultName);
-    } catch (IOException e) {
-      System.err.println("Could not write to " + resultName);
-    } finally {
-      try {
-        if (outStream != null) {
-          outStream.close();
-        }
-      } catch (IOException ioe) {
-        // continue
-      }
-    }
-  }
-
 }

javase/src/com/google/zxing/client/j2se/Config.java

@@ -0,0 +1,124 @@
+/*
+ * Copyright 2011 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.zxing.client.j2se;
+
+import com.google.zxing.DecodeHintType;
+
+import java.util.Hashtable;
+
+final class Config {
+
+  private Hashtable<DecodeHintType, Object> hints;
+  private boolean tryHarder;
+  private boolean pureBarcode;
+  private boolean productsOnly;
+  private boolean dumpResults;
+  private boolean dumpBlackPoint;
+  private boolean multi;
+  private boolean brief;
+  private boolean recursive;
+  private int[] crop;
+  private int threads = 1;
+
+  Hashtable<DecodeHintType, Object> getHints() {
+    return hints;
+  }
+
+  void setHints(Hashtable<DecodeHintType, Object> hints) {
+    this.hints = hints;
+  }
+
+  boolean isTryHarder() {
+    return tryHarder;
+  }
+
+  void setTryHarder(boolean tryHarder) {
+    this.tryHarder = tryHarder;
+  }
+
+  boolean isPureBarcode() {
+    return pureBarcode;
+  }
+
+  void setPureBarcode(boolean pureBarcode) {
+    this.pureBarcode = pureBarcode;
+  }
+
+  boolean isProductsOnly() {
+    return productsOnly;
+  }
+
+  void setProductsOnly(boolean productsOnly) {
+    this.productsOnly = productsOnly;
+  }
+
+  boolean isDumpResults() {
+    return dumpResults;
+  }
+
+  void setDumpResults(boolean dumpResults) {
+    this.dumpResults = dumpResults;
+  }
+
+  boolean isDumpBlackPoint() {
+    return dumpBlackPoint;
+  }
+
+  void setDumpBlackPoint(boolean dumpBlackPoint) {
+    this.dumpBlackPoint = dumpBlackPoint;
+  }
+
+  boolean isMulti() {
+    return multi;
+  }
+
+  void setMulti(boolean multi) {
+    this.multi = multi;
+  }
+
+  boolean isBrief() {
+    return brief;
+  }
+
+  void setBrief(boolean brief) {
+    this.brief = brief;
+  }
+
+  boolean isRecursive() {
+    return recursive;
+  }
+
+  void setRecursive(boolean recursive) {
+    this.recursive = recursive;
+  }
+
+  int[] getCrop() {
+    return crop;
+  }
+
+  void setCrop(int[] crop) {
+    this.crop = crop;
+  }
+
+  int getThreads() {
+    return threads;
+  }
+
+  void setThreads(int threads) {
+    this.threads = threads;
+  }
+}

javase/src/com/google/zxing/client/j2se/DecodeThread.java

@@ -0,0 +1,360 @@
+/*
+ * Copyright 2011 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.zxing.client.j2se;
+
+import com.google.zxing.BinaryBitmap;
+import com.google.zxing.DecodeHintType;
+import com.google.zxing.LuminanceSource;
+import com.google.zxing.MultiFormatReader;
+import com.google.zxing.NotFoundException;
+import com.google.zxing.Result;
+import com.google.zxing.ResultPoint;
+import com.google.zxing.client.result.ParsedResult;
+import com.google.zxing.client.result.ResultParser;
+import com.google.zxing.common.BitArray;
+import com.google.zxing.common.BitMatrix;
+import com.google.zxing.common.HybridBinarizer;
+import com.google.zxing.multi.GenericMultipleBarcodeReader;
+
+import javax.imageio.ImageIO;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
+import java.net.URI;
+import java.nio.charset.Charset;
+import java.util.Hashtable;
+
+/**
+ * One of a pool of threads which pulls images off the Inputs queue and decodes them in parallel.
+ *
+ * @see CommandLineRunner
+ */
+final class DecodeThread extends Thread {
+
+  private int successful;
+  private final Config config;
+  private final Inputs inputs;
+
+  DecodeThread(Config config, Inputs inputs) {
+    this.config = config;
+    this.inputs = inputs;
+  }
+
+  @Override
+  public void run() {
+    while (true) {
+      String input = inputs.getNextInput();
+      if (input == null) {
+        break;
+      }
+
+      File inputFile = new File(input);
+      if (inputFile.exists()) {
+        try {
+          if (config.isMulti()) {
+            Result[] results = decodeMulti(inputFile.toURI(), config.getHints());
+            if (results != null) {
+              successful++;
+              if (config.isDumpResults()) {
+                dumpResultMulti(inputFile, results);
+              }
+            }
+          } else {
+            Result result = decode(inputFile.toURI(), config.getHints());
+            if (result != null) {
+              successful++;
+              if (config.isDumpResults()) {
+                dumpResult(inputFile, result);
+              }
+            }
+          }
+        } catch (IOException e) {
+        }
+      } else {
+        try {
+          Result result = decode(new URI(input), config.getHints());
+          if (result != null) {
+            successful++;
+          }
+        } catch (Exception e) {
+        }
+      }
+    }
+  }
+
+  public int getSuccessful() {
+    return successful;
+  }
+
+  private static void dumpResult(File input, Result result) throws IOException {
+    String name = input.getAbsolutePath();
+    int pos = name.lastIndexOf('.');
+    if (pos > 0) {
+      name = name.substring(0, pos);
+    }
+    File dump = new File(name + ".txt");
+    writeStringToFile(result.getText(), dump);
+  }
+
+  private static void dumpResultMulti(File input, Result[] results) throws IOException {
+    String name = input.getAbsolutePath();
+    int pos = name.lastIndexOf('.');
+    if (pos > 0) {
+      name = name.substring(0, pos);
+    }
+    File dump = new File(name + ".txt");
+    writeResultsToFile(results, dump);
+  }
+
+    private static void writeStringToFile(String value, File file) throws IOException {
+    Writer out = new OutputStreamWriter(new FileOutputStream(file), Charset.forName("UTF8"));
+    try {
+      out.write(value);
+    } finally {
+      out.close();
+    }
+  }
+
+  private static void writeResultsToFile(Result[] results, File file) throws IOException {
+    String newline = System.getProperty("line.separator");
+    Writer out = new OutputStreamWriter(new FileOutputStream(file), Charset.forName("UTF8"));
+    try {
+      for (Result result : results) {
+        out.write(result.getText());
+        out.write(newline);
+      }
+    } finally {
+      out.close();
+    }
+  }
+
+  private Result decode(URI uri, Hashtable<DecodeHintType, Object> hints)
+      throws IOException {
+    BufferedImage image;
+    try {
+      image = ImageIO.read(uri.toURL());
+    } catch (IllegalArgumentException iae) {
+      throw new FileNotFoundException("Resource not found: " + uri);
+    }
+    if (image == null) {
+      System.err.println(uri.toString() + ": Could not load image");
+      return null;
+    }
+    try {
+      LuminanceSource source;
+      if (config.getCrop() == null) {
+        source = new BufferedImageLuminanceSource(image);
+      } else {
+        int[] crop = config.getCrop();
+        source = new BufferedImageLuminanceSource(image, crop[0], crop[1], crop[2], crop[3]);
+      }
+      BinaryBitmap bitmap = new BinaryBitmap(new HybridBinarizer(source));
+      if (config.isDumpBlackPoint()) {
+        dumpBlackPoint(uri, image, bitmap);
+      }
+      Result result = new MultiFormatReader().decode(bitmap, hints);
+      if (config.isBrief()) {
+        System.out.println(uri.toString() + ": Success");
+      } else {
+        ParsedResult parsedResult = ResultParser.parseResult(result);
+        System.out.println(uri.toString() + " (format: " + result.getBarcodeFormat() + ", type: " +
+            parsedResult.getType() + "):\nRaw result:\n" + result.getText() + "\nParsed result:\n" +
+            parsedResult.getDisplayResult());
+
+        System.out.println("Found " + result.getResultPoints().length + " result points.");
+        for (int i = 0; i < result.getResultPoints().length; i++) {
+          ResultPoint rp = result.getResultPoints()[i];
+          System.out.println("  Point " + i + ": (" + rp.getX() + ',' + rp.getY() + ')');
+        }
+      }
+
+      return result;
+    } catch (NotFoundException nfe) {
+      System.out.println(uri.toString() + ": No barcode found");
+      return null;
+      // } finally {
+      // Uncomment these lines when turning on exception tracking in ReaderException.
+      //System.out.println("Threw " + ReaderException.getExceptionCountAndReset() + " exceptions");
+      //System.out.println("Throwers:\n" + ReaderException.getThrowersAndReset());
+    }
+  }
+
+  private Result[] decodeMulti(URI uri, Hashtable<DecodeHintType, Object> hints)
+      throws IOException {
+    BufferedImage image;
+    try {
+      image = ImageIO.read(uri.toURL());
+    } catch (IllegalArgumentException iae) {
+      throw new FileNotFoundException("Resource not found: " + uri);
+    }
+    if (image == null) {
+      System.err.println(uri.toString() + ": Could not load image");
+      return null;
+    }
+    try {
+      LuminanceSource source;
+      if (config.getCrop() == null) {
+        source = new BufferedImageLuminanceSource(image);
+      } else {
+        int[] crop = config.getCrop();
+        source = new BufferedImageLuminanceSource(image, crop[0], crop[1], crop[2], crop[3]);
+      }
+      BinaryBitmap bitmap = new BinaryBitmap(new HybridBinarizer(source));
+      if (config.isDumpBlackPoint()) {
+        dumpBlackPoint(uri, image, bitmap);
+      }
+
+      MultiFormatReader multiFormatReader = new MultiFormatReader();
+      GenericMultipleBarcodeReader reader = new GenericMultipleBarcodeReader(
+          multiFormatReader);
+      Result[] results = reader.decodeMultiple(bitmap, hints);
+
+      if (config.isBrief()) {
+        System.out.println(uri.toString() + ": Success");
+      } else {
+        for (Result result : results) {
+          ParsedResult parsedResult = ResultParser.parseResult(result);
+          System.out.println(uri.toString() + " (format: "
+              + result.getBarcodeFormat() + ", type: "
+              + parsedResult.getType() + "):\nRaw result:\n"
+              + result.getText() + "\nParsed result:\n"
+              + parsedResult.getDisplayResult());
+          System.out.println("Found " + result.getResultPoints().length + " result points.");
+          for (int i = 0; i < result.getResultPoints().length; i++) {
+            ResultPoint rp = result.getResultPoints()[i];
+            System.out.println("  Point " + i + ": (" + rp.getX() + ',' + rp.getY() + ')');
+          }
+        }
+      }
+      return results;
+    } catch (NotFoundException nfe) {
+      System.out.println(uri.toString() + ": No barcode found");
+      return null;
+    }
+  }
+
+  /**
+   * Writes out a single PNG which is three times the width of the input image, containing from left
+   * to right: the original image, the row sampling monochrome version, and the 2D sampling
+   * monochrome version.
+   */
+  private static void dumpBlackPoint(URI uri, BufferedImage image, BinaryBitmap bitmap) {
+    // TODO: Update to compare different Binarizer implementations.
+    String inputName = uri.getPath();
+    if (inputName.contains(".mono.png")) {
+      return;
+    }
+
+    int width = bitmap.getWidth();
+    int height = bitmap.getHeight();
+    int stride = width * 3;
+    int[] pixels = new int[stride * height];
+
+    // The original image
+    int[] argb = new int[width];
+    for (int y = 0; y < height; y++) {
+      image.getRGB(0, y, width, 1, argb, 0, width);
+      System.arraycopy(argb, 0, pixels, y * stride, width);
+    }
+
+    // Row sampling
+    BitArray row = new BitArray(width);
+    for (int y = 0; y < height; y++) {
+      try {
+        row = bitmap.getBlackRow(y, row);
+      } catch (NotFoundException nfe) {
+        // If fetching the row failed, draw a red line and keep going.
+        int offset = y * stride + width;
+        for (int x = 0; x < width; x++) {
+          pixels[offset + x] = 0xffff0000;
+        }
+        continue;
+      }
+
+      int offset = y * stride + width;
+      for (int x = 0; x < width; x++) {
+        if (row.get(x)) {
+          pixels[offset + x] = 0xff000000;
+        } else {
+          pixels[offset + x] = 0xffffffff;
+        }
+      }
+    }
+
+    // 2D sampling
+    try {
+      for (int y = 0; y < height; y++) {
+        BitMatrix matrix = bitmap.getBlackMatrix();
+        int offset = y * stride + width * 2;
+        for (int x = 0; x < width; x++) {
+          if (matrix.get(x, y)) {
+            pixels[offset + x] = 0xff000000;
+          } else {
+            pixels[offset + x] = 0xffffffff;
+          }
+        }
+      }
+    } catch (NotFoundException nfe) {
+    }
+
+    writeResultImage(stride, height, pixels, uri, inputName, ".mono.png");
+  }
+
+  private static void writeResultImage(int stride, int height, int[] pixels, URI uri,
+      String inputName, String suffix) {
+    // Write the result
+    BufferedImage result = new BufferedImage(stride, height, BufferedImage.TYPE_INT_ARGB);
+    result.setRGB(0, 0, stride, height, pixels, 0, stride);
+
+    // Use the current working directory for URLs
+    String resultName = inputName;
+    if ("http".equals(uri.getScheme())) {
+      int pos = resultName.lastIndexOf('/');
+      if (pos > 0) {
+        resultName = '.' + resultName.substring(pos);
+      }
+    }
+    int pos = resultName.lastIndexOf('.');
+    if (pos > 0) {
+      resultName = resultName.substring(0, pos);
+    }
+    resultName += suffix;
+    OutputStream outStream = null;
+    try {
+      outStream = new FileOutputStream(resultName);
+      ImageIO.write(result, "png", outStream);
+    } catch (FileNotFoundException e) {
+      System.err.println("Could not create " + resultName);
+    } catch (IOException e) {
+      System.err.println("Could not write to " + resultName);
+    } finally {
+      try {
+        if (outStream != null) {
+          outStream.close();
+        }
+      } catch (IOException ioe) {
+        // continue
+      }
+    }
+  }
+
+}

javase/src/com/google/zxing/client/j2se/ImageConverter.java

@@ -27,6 +27,7 @@ import java.awt.image.BufferedImage;
 import java.io.File;
 import java.io.IOException;
 import java.net.URI;
+import java.util.Locale;
 
 import javax.imageio.ImageIO;
 
@@ -71,7 +72,7 @@ public final class ImageConverter {
       if (inputFile.exists()) {
         if (inputFile.isDirectory()) {
           for (File input : inputFile.listFiles()) {
-            String filename = input.getName().toLowerCase();
+            String filename = input.getName().toLowerCase(Locale.ENGLISH);
             // Skip hidden files and text files (the latter is found in the blackbox tests).
             if (filename.startsWith(".") || filename.endsWith(".txt")) {
               continue;

javase/src/com/google/zxing/client/j2se/Inputs.java

@@ -0,0 +1,47 @@
+/*
+ * Copyright 2011 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.zxing.client.j2se;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Represents the collection of all images files/URLs to decode.
+ */
+final class Inputs {
+
+  private final List<String> inputs = new ArrayList<String>(10);
+  private int position = 0;
+
+  public synchronized void addInput(String pathOrUrl) {
+    inputs.add(pathOrUrl);
+  }
+
+  public synchronized String getNextInput() {
+    if (position < inputs.size()) {
+      String result = inputs.get(position);
+      position++;
+      return result;
+    } else {
+      return null;
+    }
+  }
+
+  public synchronized int getInputCount() {
+    return inputs.size();
+  }
+}