Improved datamatrix reader with new algorithm

[zxing.git] / core / src / com / google / zxing / BarcodeFormat.java

diff --git a/core/src/com/google/zxing/BarcodeFormat.java b/core/src/com/google/zxing/BarcodeFormat.java
index a0c5a1a..73e3cd0 100644 (file)
--- a/core/src/com/google/zxing/BarcodeFormat.java
+++ b/core/src/com/google/zxing/BarcodeFormat.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 Google Inc.
+ * Copyright 2007 ZXing authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,22 +16,88 @@
 
 package com.google.zxing;
 
+import java.util.Hashtable;
+
 /**
  * Enumerates barcode formats known to this package.
  *
- * @author srowen@google.com (Sean Owen)
+ * @author Sean Owen
  */
 public final class BarcodeFormat {
 
   // No, we can't use an enum here. J2ME doesn't support it.
 
-  /** 1D barcode format family. */
-  public static final BarcodeFormat ONED = new BarcodeFormat();
-  /** QR Code 2D barcode format */
-  public static final BarcodeFormat QR_CODE = new BarcodeFormat();
-  /** DataMatrix 2D barcode format */
-  public static final BarcodeFormat DATAMATRIX = new BarcodeFormat();
-    
-  private BarcodeFormat() {}
+  private static final Hashtable VALUES = new Hashtable();
+
+  /** QR Code 2D barcode format. */
+  public static final BarcodeFormat QR_CODE = new BarcodeFormat("QR_CODE");
+
+  /** DataMatrix 2D barcode format. */
+  public static final BarcodeFormat DATA_MATRIX = new BarcodeFormat("DATA_MATRIX");
+
+  /** UPC-E 1D format. */
+  public static final BarcodeFormat UPC_E = new BarcodeFormat("UPC_E");
+
+  /** UPC-A 1D format. */
+  public static final BarcodeFormat UPC_A = new BarcodeFormat("UPC_A");
+
+  /** EAN-8 1D format. */
+  public static final BarcodeFormat EAN_8 = new BarcodeFormat("EAN_8");
+
+  /** EAN-13 1D format. */
+  public static final BarcodeFormat EAN_13 = new BarcodeFormat("EAN_13");
+
+  /** UPC/EAN extension format. Not a stand-alone format. */
+  public static final BarcodeFormat UPC_EAN_EXTENSION = new BarcodeFormat("UPC_EAN_EXTENSION");
+
+  /** Code 128 1D format. */
+  public static final BarcodeFormat CODE_128 = new BarcodeFormat("CODE_128");
+
+  /** Code 39 1D format. */
+  public static final BarcodeFormat CODE_39 = new BarcodeFormat("CODE_39");
+
+  /** Code 93 1D format. */
+  public static final BarcodeFormat CODE_93 = new BarcodeFormat("CODE_93");
+
+  /** CODABAR 1D format. */
+  public static final BarcodeFormat CODABAR = new BarcodeFormat("CODABAR");
+
+  /** ITF (Interleaved Two of Five) 1D format. */
+  public static final BarcodeFormat ITF = new BarcodeFormat("ITF");
+
+  /** RSS 14 */
+  public static final BarcodeFormat RSS14 = new BarcodeFormat("RSS14");
+
+  /** PDF417 format. */
+  public static final BarcodeFormat PDF417 = new BarcodeFormat("PDF417");
+
+  /** RSS EXPANDED */
+  public static final BarcodeFormat RSS_EXPANDED = new BarcodeFormat("RSS_EXPANDED");
+
+  private final String name;
+
+  private BarcodeFormat(String name) {
+    this.name = name;
+    VALUES.put(name, this);
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public String toString() {
+    return name;
+  }
+
+  public static BarcodeFormat valueOf(String name) {
+    if (name == null || name.length() == 0) {
+      throw new IllegalArgumentException();
+    }
+    BarcodeFormat format = (BarcodeFormat) VALUES.get(name);
+    if (format == null) {
+      throw new IllegalArgumentException();
+    }
+    return format;
+  }
 
-}
\ No newline at end of file
+}