Added UPC support to the result types, and added a build target without J2ME.

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

diff --git a/build.properties b/build.properties
index 9c86d0f..bf67ff6 100644 (file)
--- a/build.properties
+++ b/build.properties
@@ -5,8 +5,9 @@ version=0.1.2
 # On Windows the default install directory is C:\WTK2.5.2
 # Mac users: there is no WTK for Mac at the moment. The installer for Linux may work on Intel-based
 # Macs (haven't tried it) but I believe the preverify binary will not run.
-WTK-home=/usr/local/WTK2.5.2
+#WTK-home=/usr/local/WTK2.5.2
 #WTK-home=C:\\WTK2.5.2
+WTK-home=/usr/local/J2ME
 
 # Set this to the location where you have installed RIM's BlackBerry JDE in order to
 # create the 'rim' client. There is no Mac or Linux version, but, these platforms can still

diff --git a/build.xml b/build.xml
index 7779c6f..26428ab 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -26,6 +26,12 @@
     <ant dir="core-ext" target="build"/>
     <ant dir="javase" target="build"/>
   </target>
+       
+       <target name="buildwithoutj2me">
+         <ant dir="core" target="build"/>
+         <ant dir="core-ext" target="build"/>
+         <ant dir="javase" target="build"/>
+       </target>
 
   <target name="clean">
     <ant dir="core" target="clean"/>

diff --git a/core-ext/src/com/google/zxing/client/result/ParsedReaderResultType.java b/core-ext/src/com/google/zxing/client/result/ParsedReaderResultType.java
index bee9d63..d1b1c54 100644 (file)
--- a/core-ext/src/com/google/zxing/client/result/ParsedReaderResultType.java
+++ b/core-ext/src/com/google/zxing/client/result/ParsedReaderResultType.java
@@ -26,6 +26,7 @@ public enum ParsedReaderResultType {
   BOOKMARK(BookmarkDoCoMoResult.class),
   ADDRESSBOOK(AddressBookDoCoMoResult.class),
   EMAIL(EmailDoCoMoResult.class),
+  UPC(UPCParsedResult.class),
   URI(URIParsedResult.class),
   TEXT(TextParsedResult.class);
 

diff --git a/core-ext/src/com/google/zxing/client/result/UPCParsedResult.java b/core-ext/src/com/google/zxing/client/result/UPCParsedResult.java
new file mode 100644 (file)
index 0000000..7ace113
--- /dev/null
+++ b/core-ext/src/com/google/zxing/client/result/UPCParsedResult.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2007 Google Inc.
+ *
+ * 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.result;
+
+/**
+ * @author dswitkin@google.com (Daniel Switkin)
+ */
+public final class UPCParsedResult extends ParsedReaderResult {
+
+  private final String upc;
+
+  public UPCParsedResult(String rawText) {
+    super(ParsedReaderResultType.UPC);
+    if (rawText.length() != 12) {
+      throw new IllegalArgumentException("Wrong number of digits for UPC");
+    }
+    for (int x = 0; x < 12; x++) {
+      char c = rawText.charAt(x);
+      if (c < '0' || c > '9') {
+        throw new IllegalArgumentException("Invalid character found in UPC");
+      }
+    }
+    upc = rawText;
+  }
+
+  public String getUPC() {
+    return upc;
+  }
+
+  @Override
+  public String getDisplayResult() {
+    return upc;
+  }
+
+}