Added ECI for values 0-2 and also standardize character encoding names throughout...

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

diff --git a/core/src/com/google/zxing/client/result/optional/NDEFTextParsedResult.java b/core/src/com/google/zxing/client/result/optional/NDEFTextParsedResult.java
index 26dffb4..02083c9 100644 (file)
--- a/core/src/com/google/zxing/client/result/optional/NDEFTextParsedResult.java
+++ b/core/src/com/google/zxing/client/result/optional/NDEFTextParsedResult.java
@@ -58,7 +58,7 @@ public final class NDEFTextParsedResult extends AbstractNDEFParsedResult {
     int languageLength = statusByte & 0x1F;
     // language is always ASCII-encoded:
     String language = bytesToString(payload, 1, languageLength, "US-ASCII");
-    String encoding = isUTF16 ? "UTF-16" : "UTF-8";
+    String encoding = isUTF16 ? "UTF-16" : "UTF8";
     String text = bytesToString(payload, 1 + languageLength, payload.length - languageLength - 1, encoding);
     return new String[] { language, text };
   }

diff --git a/core/src/com/google/zxing/client/result/optional/NDEFURIParsedResult.java b/core/src/com/google/zxing/client/result/optional/NDEFURIParsedResult.java
index f7cb9dd..12d5e16 100644 (file)
--- a/core/src/com/google/zxing/client/result/optional/NDEFURIParsedResult.java
+++ b/core/src/com/google/zxing/client/result/optional/NDEFURIParsedResult.java
@@ -95,7 +95,7 @@ public final class NDEFURIParsedResult extends AbstractNDEFParsedResult {
     if (identifierCode < URI_PREFIXES.length) {
       prefix = URI_PREFIXES[identifierCode];
     }
-    String restOfURI = bytesToString(payload, 1, payload.length - 1, "UTF-8");
+    String restOfURI = bytesToString(payload, 1, payload.length - 1, "UTF8");
     return prefix == null ? restOfURI : prefix + restOfURI;
   }
 

diff --git a/core/src/com/google/zxing/qrcode/decoder/CharacterSetECI.java b/core/src/com/google/zxing/qrcode/decoder/CharacterSetECI.java
index 674e992..3d2d582 100644 (file)
--- a/core/src/com/google/zxing/qrcode/decoder/CharacterSetECI.java
+++ b/core/src/com/google/zxing/qrcode/decoder/CharacterSetECI.java
@@ -29,6 +29,9 @@ final class CharacterSetECI extends ECI {
   static {
     VALUE_TO_ECI = new Hashtable(29);
     // TODO figure out if these values are even right!
+    addCharacterSet(0, "Cp437");
+    addCharacterSet(1, "ISO8859_1");
+    addCharacterSet(2, "Cp437");
     addCharacterSet(3, "ISO8859_1");
     addCharacterSet(4, "ISO8859_2");
     addCharacterSet(5, "ISO8859_3");
@@ -44,7 +47,7 @@ final class CharacterSetECI extends ECI {
     addCharacterSet(16, "ISO8859_14");
     addCharacterSet(17, "ISO8859_15");
     addCharacterSet(18, "ISO8859_16");
-    addCharacterSet(20, "Shift_JIS");
+    addCharacterSet(20, "SJIS");
   }
 
   private final String encodingName;

diff --git a/core/src/com/google/zxing/qrcode/decoder/DecodedBitStreamParser.java b/core/src/com/google/zxing/qrcode/decoder/DecodedBitStreamParser.java
index 3343705..1998752 100644 (file)
--- a/core/src/com/google/zxing/qrcode/decoder/DecodedBitStreamParser.java
+++ b/core/src/com/google/zxing/qrcode/decoder/DecodedBitStreamParser.java
@@ -40,11 +40,11 @@ final class DecodedBitStreamParser {
       'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
       ' ', '$', '%', '*', '+', '-', '.', '/', ':'
   };
-  private static final String SHIFT_JIS = "Shift_JIS";
-  private static final String EUC_JP = "EUC-JP";
+  private static final String SHIFT_JIS = "SJIS";
+  private static final String EUC_JP = "EUC_JP";
   private static final boolean ASSUME_SHIFT_JIS;
-  private static final String UTF8 = "UTF-8";
-  private static final String ISO88591 = "ISO-8859-1";
+  private static final String UTF8 = "UTF8";
+  private static final String ISO88591 = "ISO8859_1";
 
   static {
     String platformDefault = System.getProperty("file.encoding");

diff --git a/core/test/src/com/google/zxing/common/AbstractBlackBoxTestCase.java b/core/test/src/com/google/zxing/common/AbstractBlackBoxTestCase.java
index d3e1570..e2b5631 100644 (file)
--- a/core/test/src/com/google/zxing/common/AbstractBlackBoxTestCase.java
+++ b/core/test/src/com/google/zxing/common/AbstractBlackBoxTestCase.java
@@ -180,7 +180,7 @@ public abstract class AbstractBlackBoxTestCase extends TestCase {
 
   private static String readFileAsString(File file) throws IOException {
     StringBuilder result = new StringBuilder((int) file.length());
-    InputStreamReader reader = new InputStreamReader(new FileInputStream(file), "UTF-8");
+    InputStreamReader reader = new InputStreamReader(new FileInputStream(file), "UTF8");
     try {
       char[] buffer = new char[256];
       int charsRead;