Replace IllegalStateException; still want to make it WriterException

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

diff --git a/core/src/com/google/zxing/qrcode/QRCodeWriter.java b/core/src/com/google/zxing/qrcode/QRCodeWriter.java
index 25ca2b5..f223935 100644 (file)
--- a/core/src/com/google/zxing/qrcode/QRCodeWriter.java
+++ b/core/src/com/google/zxing/qrcode/QRCodeWriter.java
@@ -27,14 +27,12 @@ import java.util.Hashtable;
 
 public final class QRCodeWriter implements Writer {
 
-  public ByteMatrix encode(byte[] contents, BarcodeFormat format, int width,
-      int height) throws Exception {
+  public ByteMatrix encode(byte[] contents, BarcodeFormat format, int width, int height) {
 
     return encode(contents, format, width, height, null);
   }
 
-  public ByteMatrix encode(byte[] contents, BarcodeFormat format, int width, int height,
-      Hashtable hints) throws Exception {
+  public ByteMatrix encode(byte[] contents, BarcodeFormat format, int width, int height, Hashtable hints) {
 
     if (contents == null || contents.length == 0) {
       throw new IllegalArgumentException("Found empty contents");
@@ -55,7 +53,8 @@ public final class QRCodeWriter implements Writer {
     if (Encoder.Encode(new ByteArray(contents), errorCorrectionLevel, code)) {
       return renderResult(code, width, height);
     } else {
-      throw new IllegalStateException("Could not generate a QR Code");
+      // TODO need a "WriterException" or something
+      throw new RuntimeException("Could not generate a QR Code");
     }
   }
 

diff --git a/core/src/com/google/zxing/qrcode/encoder/Debug.java b/core/src/com/google/zxing/qrcode/encoder/Debug.java
index 6977460..1538eb3 100644 (file)
--- a/core/src/com/google/zxing/qrcode/encoder/Debug.java
+++ b/core/src/com/google/zxing/qrcode/encoder/Debug.java
@@ -25,16 +25,18 @@ package com.google.zxing.qrcode.encoder;
 public class Debug {
 
   public static void LOG_ERROR(String message) {
-    throw new IllegalStateException(message);
+    // Can't use IllegalStateException unfortunately in J2ME
+    // TODO do something else with this anyway
+    throw new RuntimeException(message);
   }
 
   public static void LOG_INFO(String message) {
-    throw new IllegalStateException(message);
+    throw new RuntimeException(message);
   }
 
   public static void DCHECK(boolean condition) {
     if (!condition) {
-      throw new IllegalStateException();
+      throw new RuntimeException();
     }
   }