Small style stuff

[zxing.git] / core / src / com / google / zxing / qrcode / decoder / Mode.java

diff --git a/core/src/com/google/zxing/qrcode/decoder/Mode.java b/core/src/com/google/zxing/qrcode/decoder/Mode.java
index f1d369d..24117dc 100644 (file)
--- a/core/src/com/google/zxing/qrcode/decoder/Mode.java
+++ b/core/src/com/google/zxing/qrcode/decoder/Mode.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,36 +16,42 @@
 
 package com.google.zxing.qrcode.decoder;
 
-import com.google.zxing.ReaderException;
-
 /**
  * <p>See ISO 18004:2006, 6.4.1, Tables 2 and 3. This enum encapsulates the various modes in which
  * data can be encoded to bits in the QR code standard.</p>
  *
- * @author srowen@google.com (Sean Owen)
+ * @author Sean Owen
  */
-final class Mode {
+public final class Mode {
 
   // No, we can't use an enum here. J2ME doesn't support it.
 
-  static final Mode TERMINATOR = new Mode(new int[]{0, 0, 0}); // Not really a mode...
-  static final Mode NUMERIC = new Mode(new int[]{10, 12, 14});
-  static final Mode ALPHANUMERIC = new Mode(new int[]{9, 11, 13});
-  static final Mode BYTE = new Mode(new int[]{8, 16, 16});
-  static final Mode KANJI = new Mode(new int[]{8, 10, 12});
+  public static final Mode TERMINATOR = new Mode(new int[]{0, 0, 0}, 0x00, "TERMINATOR"); // Not really a mode...
+  public static final Mode NUMERIC = new Mode(new int[]{10, 12, 14}, 0x01, "NUMERIC");
+  public static final Mode ALPHANUMERIC = new Mode(new int[]{9, 11, 13}, 0x02, "ALPHANUMERIC");
+  public static final Mode STRUCTURED_APPEND = new Mode(new int[]{0, 0, 0}, 0x03, "STRUCTURED_APPEND"); // Not supported
+  public static final Mode BYTE = new Mode(new int[]{8, 16, 16}, 0x04, "BYTE");
+  public static final Mode ECI = new Mode(null, 0x07, "ECI"); // character counts don't apply
+  public static final Mode KANJI = new Mode(new int[]{8, 10, 12}, 0x08, "KANJI");
+  public static final Mode FNC1_FIRST_POSITION = new Mode(null, 0x05, "FNC1_FIRST_POSITION");
+  public static final Mode FNC1_SECOND_POSITION = new Mode(null, 0x09, "FNC1_SECOND_POSITION");
 
-  private int[] characterCountBitsForVersions;
+  private final int[] characterCountBitsForVersions;
+  private final int bits;
+  private final String name;
 
-  private Mode(int[] characterCountBitsForVersions) {
+  private Mode(int[] characterCountBitsForVersions, int bits, String name) {
     this.characterCountBitsForVersions = characterCountBitsForVersions;
+    this.bits = bits;
+    this.name = name;
   }
 
   /**
    * @param bits four bits encoding a QR Code data mode
    * @return {@link Mode} encoded by these bits
-   * @throws ReaderException if bits do not correspond to a known mode
+   * @throws IllegalArgumentException if bits do not correspond to a known mode
    */
-  static Mode forBits(int bits) throws ReaderException {
+  public static Mode forBits(int bits) {
     switch (bits) {
       case 0x0:
         return TERMINATOR;
@@ -53,12 +59,20 @@ final class Mode {
         return NUMERIC;
       case 0x2:
         return ALPHANUMERIC;
+      case 0x3:
+        return STRUCTURED_APPEND;
       case 0x4:
         return BYTE;
+      case 0x5:
+        return FNC1_FIRST_POSITION;
+      case 0x7:
+        return ECI;
       case 0x8:
         return KANJI;
+      case 0x9:
+        return FNC1_SECOND_POSITION;
       default:
-        throw new ReaderException("Illegal mode bits: " + bits);
+        throw new IllegalArgumentException();
     }
   }
 
@@ -67,7 +81,10 @@ final class Mode {
    * @return number of bits used, in this QR Code symbol {@link Version}, to encode the
    *         count of characters that will follow encoded in this {@link Mode}
    */
-  int getCharacterCountBits(Version version) {
+  public int getCharacterCountBits(Version version) {
+    if (characterCountBitsForVersions == null) {
+      throw new IllegalArgumentException("Character count doesn't apply to this mode");
+    }
     int number = version.getVersionNumber();
     int offset;
     if (number <= 9) {
@@ -80,4 +97,16 @@ final class Mode {
     return characterCountBitsForVersions[offset];
   }
 
+  public int getBits() {
+    return bits;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public String toString() {
+    return name;
+  }
+
 }