update of javajs package; adds org.apache.harmony, org.xml.sax.helpers

[jalview.git] / src / javajs / util / JSJSONParser.java

diff --git a/src/javajs/util/JSJSONParser.java b/src/javajs/util/JSJSONParser.java
index ce580e0..552270d 100644 (file)
--- a/src/javajs/util/JSJSONParser.java
+++ b/src/javajs/util/JSJSONParser.java
@@ -4,9 +4,6 @@ import java.util.HashMap;
 import java.util.Hashtable;
 import java.util.Map;
 
-import javajs.J2SIgnoreImport;
-
-
 
 /**
  * a very simple JSON parser for JSON objects that are compatible with JavaScript
@@ -23,7 +20,6 @@ import javajs.J2SIgnoreImport;
  *  @author Bob Hanson
  *  
  */
-@J2SIgnoreImport({ HashMap.class })
 public class JSJSONParser {
 
   private String str;
@@ -59,11 +55,13 @@ public class JSJSONParser {
    * Could return Integer, Float, Boolean, String, Map<String, Object>, Lst<Object>, or null
    * 
    * @param str
+   * @param asHashTable 
    * @return a object equivalent to the JSON string str
    * 
    */
-  public Object parse(String str) {
+  public Object parse(String str, boolean asHashTable) {
     index = 0;
+    this.asHashTable = asHashTable;
     this.str = str;
     len = str.length();
     return getValue(false);
@@ -143,7 +141,7 @@ public class JSJSONParser {
     if (isKey && c == 0)
       throw new JSONException("invalid key");
 
-    String string = str.substring(i, index);
+    String string = str.substring(i, index).trim();
 
     // check for the only valid simple words: true, false, null (lower case)
     // and in this case, only for 
@@ -160,7 +158,6 @@ public class JSJSONParser {
       }
     }
     //  only numbers from here on:
-
     c = string.charAt(0);
     if (c >= '0' && c <= '9' || c == '-')
       try {
@@ -280,7 +277,7 @@ public class JSJSONParser {
     switch (getChar()) {
     case ']':
       return l;
-    case 0:
+    case '\0':
       throw new JSONException("invalid array");
     }
     returnChar();