Farm out beep/vibrate stuff to class to try to reduce CaptureActivity complexity

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

diff --git a/core/src/com/google/zxing/qrcode/decoder/ErrorCorrectionLevel.java b/core/src/com/google/zxing/qrcode/decoder/ErrorCorrectionLevel.java
index 3d1f2d0..400611a 100644 (file)
--- a/core/src/com/google/zxing/qrcode/decoder/ErrorCorrectionLevel.java
+++ b/core/src/com/google/zxing/qrcode/decoder/ErrorCorrectionLevel.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,54 +16,68 @@
 
 package com.google.zxing.qrcode.decoder;
 
-import com.google.zxing.ReaderException;
-
 /**
  * <p>See ISO 18004:2006, 6.5.1. This enum encapsulates the four error correction levels
  * defined by the QR code standard.</p>
  *
- * @author srowen@google.com (Sean Owen)
+ * @author Sean Owen
  */
-final class ErrorCorrectionLevel {
+public final class ErrorCorrectionLevel {
 
   // No, we can't use an enum here. J2ME doesn't support it.
 
   /**
    * L = ~7% correction
    */
-  static final ErrorCorrectionLevel L = new ErrorCorrectionLevel(0);
+  public static final ErrorCorrectionLevel L = new ErrorCorrectionLevel(0, 0x01, "L");
   /**
    * M = ~15% correction
    */
-  static final ErrorCorrectionLevel M = new ErrorCorrectionLevel(1);
+  public static final ErrorCorrectionLevel M = new ErrorCorrectionLevel(1, 0x00, "M");
   /**
    * Q = ~25% correction
    */
-  static final ErrorCorrectionLevel Q = new ErrorCorrectionLevel(2);
+  public static final ErrorCorrectionLevel Q = new ErrorCorrectionLevel(2, 0x03, "Q");
   /**
    * H = ~30% correction
    */
-  static final ErrorCorrectionLevel H = new ErrorCorrectionLevel(3);
+  public static final ErrorCorrectionLevel H = new ErrorCorrectionLevel(3, 0x02, "H");
 
   private static final ErrorCorrectionLevel[] FOR_BITS = {M, L, H, Q};
 
   private final int ordinal;
+  private final int bits;
+  private final String name;
 
-  private ErrorCorrectionLevel(int ordinal) {
+  private ErrorCorrectionLevel(int ordinal, int bits, String name) {
     this.ordinal = ordinal;
+    this.bits = bits;
+    this.name = name;
   }
 
-  int ordinal() {
+  public int ordinal() {
     return ordinal;
   }
 
+  public int getBits() {
+    return bits;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public String toString() {
+    return name;
+  }
+
   /**
    * @param bits int containing the two bits encoding a QR Code's error correction level
    * @return {@link ErrorCorrectionLevel} representing the encoded error correction level
    */
-  static ErrorCorrectionLevel forBits(int bits) throws ReaderException {
+  public static ErrorCorrectionLevel forBits(int bits) {
     if (bits < 0 || bits >= FOR_BITS.length) {
-      throw new ReaderException("Illegal error correction level bits" + bits);
+      throw new IllegalArgumentException();
     }
     return FOR_BITS[bits];
   }