Improve handling of MultimediaManager to make it a bit easier to make a 'basic' build

[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 b1aa9be..7e8c2bc 100644 (file)
--- a/javame/src/com/google/zxing/client/j2me/ZXingMIDlet.java
+++ b/javame/src/com/google/zxing/client/j2me/ZXingMIDlet.java
@@ -23,7 +23,7 @@ import com.google.zxing.client.result.ParsedResultType;
 import com.google.zxing.client.result.ResultParser;
 import com.google.zxing.client.result.SMSParsedResult;
 import com.google.zxing.client.result.TelParsedResult;
-import com.google.zxing.client.result.UPCParsedResult;
+import com.google.zxing.client.result.ProductParsedResult;
 import com.google.zxing.client.result.URIParsedResult;
 
 import javax.microedition.io.ConnectionNotFoundException;
@@ -45,10 +45,12 @@ import java.io.IOException;
 /**
  * <p>The actual reader application {@link MIDlet}.</p>
  *
- * @author Sean Owen (srowen@google.com)
+ * @author Sean Owen
  */
 public final class ZXingMIDlet extends MIDlet {
 
+  private static final int ALERT_TIMEOUT_MS = 5 * 1000;
+
   private Canvas canvas;
   private Player player;
   private VideoControl videoControl;
@@ -65,11 +67,17 @@ public final class ZXingMIDlet extends MIDlet {
     return videoControl;
   }
 
+  static MultimediaManager buildMultimediaManager() {
+    return new AdvancedMultimediaManager();
+    // Comment line above / uncomment below to make the basic version
+    // return new DefaultMultimediaManager();
+  }
+
   protected void startApp() throws MIDletStateChangeException {
     try {
       player = createPlayer();
       player.realize();
-      MultimediaManager multimediaManager = new DefaultMultimediaManager();
+      MultimediaManager multimediaManager = buildMultimediaManager();
       multimediaManager.setZoom(player);
       multimediaManager.setExposure(player);
       videoControl = (VideoControl) player.getControl("VideoControl");
@@ -142,7 +150,7 @@ public final class ZXingMIDlet extends MIDlet {
 
   private void showOpenURL(String title, String display, final String uri) {
     Alert alert = new Alert(title, display, null, AlertType.CONFIRMATION);
-    alert.setTimeout(Alert.FOREVER);
+    alert.setTimeout(ALERT_TIMEOUT_MS);
     Command yes = new Command("Yes", Command.OK, 1);
     alert.addCommand(yes);
     Command no = new Command("No", Command.CANCEL, 1);
@@ -169,7 +177,7 @@ public final class ZXingMIDlet extends MIDlet {
 
   private void showAlert(String title, String text) {
     Alert alert = new Alert(title, text, null, AlertType.INFO);
-    alert.setTimeout(Alert.FOREVER);
+    alert.setTimeout(ALERT_TIMEOUT_MS);
     showAlert(alert);
   }
 
@@ -192,7 +200,7 @@ public final class ZXingMIDlet extends MIDlet {
   }
 
   void handleDecodedText(Result theResult) {
-    ParsedResult result = ResultParser.parseReaderResult(theResult);
+    ParsedResult result = ResultParser.parseResult(theResult);
     ParsedResultType type = result.getType();
     if (type.equals(ParsedResultType.URI)) {
       String uri = ((URIParsedResult) result).getURI();
@@ -203,10 +211,10 @@ public final class ZXingMIDlet extends MIDlet {
     } else if (type.equals(ParsedResultType.SMS)) {
       SMSParsedResult smsResult = (SMSParsedResult) result;
       showOpenURL("Compose SMS?", smsResult.getNumber(), smsResult.getSMSURI());
-    } else if (type.equals(ParsedResultType.UPC)) {
-      String upc = ((UPCParsedResult) result).getUPC();
-      String uri = "http://www.upcdatabase.com/item.asp?upc=" + upc;
-      showOpenURL("Look Up Barcode Online?", upc, uri);
+    } else if (type.equals(ParsedResultType.PRODUCT)) {
+      ProductParsedResult productResult = (ProductParsedResult) result;
+      String uri = "http://www.upcdatabase.com/item.asp?upc=" + productResult.getNormalizedProductID();
+      showOpenURL("Look Up Barcode Online?", productResult.getProductID(), uri);
     } else if (type.equals(ParsedResultType.TEL)) {
       TelParsedResult telResult = (TelParsedResult) result;
       showOpenURL("Dial Number?", telResult.getNumber(), telResult.getTelURI());