Changes to be consistent with Android client, including a rename

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

diff --git a/javame/BarcodeReader.jad.template b/javame/BarcodeReader.jad.template
new file mode 100644 (file)
index 0000000..e77bdc8
--- /dev/null
+++ b/javame/BarcodeReader.jad.template
@@ -0,0 +1,12 @@
+MIDlet-1: @APP_NAME@, /res/zxing-icon.png, com.google.zxing.client.j2me.ZXingMIDlet\r
+MIDlet-Description: ZXing Barcode Reader\r
+MIDlet-Icon: /res/zxing-icon.png\r
+MIDlet-Info-URL: code.google.com/p/zxing\r
+MIDlet-Jar-Size: @JAR_SIZE@\r
+MIDlet-Jar-URL: @APP_NAME@.jar\r
+MIDlet-Name: @APP_NAME@\r
+MIDlet-Permissions: javax.microedition.media.control.VideoControl.getSnapshot\r
+MIDlet-Vendor: ZXing Project\r
+MIDlet-Version: @VERSION@\r
+MicroEdition-Configuration: CLDC-1.1\r
+MicroEdition-Profile: MIDP-2.0\r

diff --git a/javame/ZXingReader.jad.template b/javame/ZXingReader.jad.template
deleted file mode 100644 (file)
index 18c9b25..0000000
--- a/javame/ZXingReader.jad.template
+++ /dev/null
@@ -1,12 +0,0 @@
-MIDlet-1: @APP_NAME@, /res/zxing-icon.png, com.google.zxing.client.j2me.ZXingMIDlet\r
-MIDlet-Description: Bar Code Reader\r
-MIDlet-Icon: /res/zxing-icon.png\r
-MIDlet-Info-URL: code.google.com/p/zxing\r
-MIDlet-Jar-Size: @JAR_SIZE@\r
-MIDlet-Jar-URL: @APP_NAME@.jar\r
-MIDlet-Name: @APP_NAME@\r
-MIDlet-Permissions: javax.microedition.media.control.VideoControl.getSnapshot\r
-MIDlet-Vendor: ZXing Project\r
-MIDlet-Version: @VERSION@\r
-MicroEdition-Configuration: CLDC-1.1\r
-MicroEdition-Profile: MIDP-2.0\r

diff --git a/javame/build.xml b/javame/build.xml
index d8b0e4b..c9ef5c3 100644 (file)
--- a/javame/build.xml
+++ b/javame/build.xml
@@ -153,7 +153,7 @@
     <!-- get .jar size to include it in the .jad file -->
     <length file="${jar-name}.jar" property="jar-size"/>
 
-    <copy file="ZXingReader.jad.template" tofile="${jar-name}.jad" overwrite="true">
+    <copy file="BarcodeReader.jad.template" tofile="${jar-name}.jad" overwrite="true">
       <filterset>
         <filter token="JAR_SIZE" value="${jar-size}"/>
         <filter token="APP_NAME" value="${jar-name}"/>
@@ -165,7 +165,7 @@
 
   <target name="build">
     <description>Builds the main reader .jar file</description>
-    <property name="jar-name" value="ZXingReader"/>
+    <property name="jar-name" value="BarcodeReader"/>
     <antcall target="clean"/>
     <antcall target="compile"/>
     <antcall target="package"/>
@@ -173,7 +173,7 @@
 
   <target name="build-basic">
     <description>Builds the basic reader .jar file</description>
-    <property name="jar-name" value="ZXingReaderBasic"/>
+    <property name="jar-name" value="BarcodeReaderBasic"/>
     <antcall target="clean"/>
     <antcall target="compile-basic"/>
     <antcall target="package"/>

diff --git a/javame/src/com/google/zxing/client/j2me/MANIFEST.MF.template b/javame/src/com/google/zxing/client/j2me/MANIFEST.MF.template
index 90b9de3..28b3f68 100644 (file)
--- a/javame/src/com/google/zxing/client/j2me/MANIFEST.MF.template
+++ b/javame/src/com/google/zxing/client/j2me/MANIFEST.MF.template
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 MIDlet-1: @APP_NAME@, , com.google.zxing.client.j2me.ZXingMIDlet
-MIDlet-Description: Bar Code Reader
+MIDlet-Description: ZXing Barcode Reader
 MIDlet-Icon: /res/zxing-icon.png
 MIDlet-Info-URL: code.google.com/p/zxing
 MIDlet-Name: @APP_NAME@

diff --git a/javame/src/com/google/zxing/client/j2me/SnapshotThread.java b/javame/src/com/google/zxing/client/j2me/SnapshotThread.java
index b24eb78..d9df80e 100644 (file)
--- a/javame/src/com/google/zxing/client/j2me/SnapshotThread.java
+++ b/javame/src/com/google/zxing/client/j2me/SnapshotThread.java
@@ -64,7 +64,7 @@ final class SnapshotThread extends Thread {
       zXingMIDlet.handleDecodedText(result.getText());
     } catch (ReaderException re) {
            // Show a friendlier message on a mere failure to read the barcode
-           zXingMIDlet.showError("No barcode was detected in this image. Try again.");
+           zXingMIDlet.showError("Sorry, no barcode was found.");
     } catch (Throwable t) {
       zXingMIDlet.showError(t);
     } finally {

diff --git a/javame/src/com/google/zxing/client/j2me/ZXingMIDlet.java b/javame/src/com/google/zxing/client/j2me/ZXingMIDlet.java
index 9c9f5a3..a934825 100644 (file)
--- a/javame/src/com/google/zxing/client/j2me/ZXingMIDlet.java
+++ b/javame/src/com/google/zxing/client/j2me/ZXingMIDlet.java
@@ -185,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());
     }
   }