X-Git-Url: http://git.rot13.org/?p=zxing.git;a=blobdiff_plain;f=javame%2Fsrc%2Fcom%2Fgoogle%2Fzxing%2Fclient%2Fj2me%2FVideoCanvas.java;h=a24d802e67798c2eb913af0edd3d6bcf140f4324;hp=d156b20a7dac81e3ec4d650b70fb256c14fb37de;hb=8b782218f97df1dca51c24ed783333ff96967028;hpb=70367e61773d80a4654f37bbfcf6c0104e97ebaf

diff --git a/javame/src/com/google/zxing/client/j2me/VideoCanvas.java b/javame/src/com/google/zxing/client/j2me/VideoCanvas.java
index d156b20a..a24d802e 100644
--- a/javame/src/com/google/zxing/client/j2me/VideoCanvas.java
+++ b/javame/src/com/google/zxing/client/j2me/VideoCanvas.java
@@ -1,66 +1,71 @@
-/*
- * 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.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.zxing.client.j2me;
-
-import javax.microedition.lcdui.Canvas;
-import javax.microedition.lcdui.Command;
-import javax.microedition.lcdui.CommandListener;
-import javax.microedition.lcdui.Displayable;
-import javax.microedition.lcdui.Graphics;
-
-/**
- * The main {@link Canvas} onto which the camera's field of view is painted.
- * This class manages decoding via {@link SnapshotThread}.
- *
- * @author Sean Owen
- */
-final class VideoCanvas extends Canvas implements CommandListener {
-
-  private static final Command exit = new Command("Exit", Command.EXIT, 1);
-
-  private final ZXingMIDlet zXingMIDlet;
-  private final SnapshotThread snapshotThread;
-
-  VideoCanvas(ZXingMIDlet zXingMIDlet) {
-    this.zXingMIDlet = zXingMIDlet;
-    addCommand(exit);
-    setCommandListener(this);
-    snapshotThread = new SnapshotThread(zXingMIDlet);
-    new Thread(snapshotThread).start();
-  }
-
-  protected void paint(Graphics graphics) {
-    // do nothing
-  }
-
-  protected void keyPressed(int keyCode) {
-    // Any valid game key will trigger a capture
-    if (getGameAction(keyCode) != 0) {
-      snapshotThread.continueRun();
-    } else {
-      super.keyPressed(keyCode);
-    }
-  }
-
-  public void commandAction(Command command, Displayable displayable) {
-    int type = command.getCommandType();
-    if (type == Command.EXIT || type == Command.STOP || type == Command.BACK || type == Command.CANCEL) {
-      snapshotThread.stop();
-      zXingMIDlet.stop();
-    }
-  }
-}
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.zxing.client.j2me;
+
+import javax.microedition.lcdui.Canvas;
+import javax.microedition.lcdui.Command;
+import javax.microedition.lcdui.CommandListener;
+import javax.microedition.lcdui.Displayable;
+import javax.microedition.lcdui.Graphics;
+
+/**
+ * The main {@link Canvas} onto which the camera's field of view is painted.
+ * This class manages decoding via {@link SnapshotThread}.
+ *
+ * @author Sean Owen
+ * @author Simon Flannery
+ */
+final class VideoCanvas extends Canvas implements CommandListener {
+
+  private static final Command exit = new Command("Exit", Command.EXIT, 1);
+  private static final Command history = new Command("History", Command.ITEM, 0);
+
+  private final ZXingMIDlet zXingMIDlet;
+  private final SnapshotThread snapshotThread;
+
+  VideoCanvas(ZXingMIDlet zXingMIDlet) {
+    this.zXingMIDlet = zXingMIDlet;
+    addCommand(exit);
+    addCommand(history);
+    setCommandListener(this);
+    snapshotThread = new SnapshotThread(zXingMIDlet);
+    new Thread(snapshotThread).start();
+  }
+
+  protected void paint(Graphics graphics) {
+    // do nothing
+  }
+
+  protected void keyPressed(int keyCode) {
+    // Any valid game key will trigger a capture
+    if (getGameAction(keyCode) != 0) {
+      snapshotThread.continueRun();
+    } else {
+      super.keyPressed(keyCode);
+    }
+  }
+
+  public void commandAction(Command command, Displayable displayable) {
+    int type = command.getCommandType();
+    if (command == history) {
+      zXingMIDlet.historyRequest();
+    } else if (type == Command.EXIT || type == Command.STOP || type == Command.BACK || type == Command.CANCEL) {
+      snapshotThread.stop();
+      zXingMIDlet.stop();
+    }
+  }
+}