Changes to be consistent with Android client, including a rename

[zxing.git] / javame / src / com / google / zxing / client / j2me / ZXingMIDlet.java

diff --git a/javame/src/com/google/zxing/client/j2me/ZXingMIDlet.java b/javame/src/com/google/zxing/client/j2me/ZXingMIDlet.java
index bba7271..a934825 100644 (file)
--- a/javame/src/com/google/zxing/client/j2me/ZXingMIDlet.java
+++ b/javame/src/com/google/zxing/client/j2me/ZXingMIDlet.java
@@ -163,7 +163,12 @@ public final class ZXingMIDlet extends MIDlet {
   }
 
   void showError(Throwable t) {
-         showError(t.getMessage());
+    String message = t.getMessage();
+    if (message != null && message.length() > 0) {
+      showError(message);
+    } else {
+      showError(t.toString());
+    }
   }
 
        void showError(String message) {
@@ -180,22 +185,22 @@ public final class ZXingMIDlet extends MIDlet {
     ParsedReaderResultType type = result.getType();
     if (type.equals(ParsedReaderResultType.URI)) {
       String uri = ((URIParsedResult) result).getURI();
-      showOpenURL("Open web page?", uri, uri);
+      showOpenURL("Open Web Page?", uri, uri);
     } else if (type.equals(ParsedReaderResultType.BOOKMARK)) {
       String uri = ((BookmarkDoCoMoResult) result).getURI();
-      showOpenURL("Open web page?", uri, uri);
+      showOpenURL("Open Web Page?", uri, uri);
     } else if (type.equals(ParsedReaderResultType.EMAIL)) {
       String email = ((EmailDoCoMoResult) result).getTo();
-      showOpenURL("Compose e-mail?", email, "mailto:" + email);
+      showOpenURL("Compose E-mail?", email, "mailto:" + email);
     } else if (type.equals(ParsedReaderResultType.EMAIL_ADDRESS)) {
       String email = ((EmailAddressResult) result).getEmailAddress();
-      showOpenURL("Compose e-mail?", email, "mailto:" + email);
+      showOpenURL("Compose E-mail?", email, "mailto:" + email);
     } else if (type.equals(ParsedReaderResultType.UPC)) {
            String upc = ((UPCParsedResult) result).getUPC();
            String uri = "http://www.upcdatabase.com/item.asp?upc=" + upc;
-           showOpenURL("Look up UPC?", upc, uri);
+           showOpenURL("Look Up Barcode Online?", upc, uri);
     } else {
-      showAlert("Barcode detected", result.getDisplayResult());
+      showAlert("Barcode Detected", result.getDisplayResult());
     }
   }