j2sNative clean-up. Fixes problem with second try of sequence fetching

[jalview.git] / src / jalview / util / JSONUtils.java

diff --git a/src/jalview/util/JSONUtils.java b/src/jalview/util/JSONUtils.java
index 127a085..dde1662 100644 (file)
--- a/src/jalview/util/JSONUtils.java
+++ b/src/jalview/util/JSONUtils.java
@@ -1,14 +1,9 @@
 package jalview.util;
 
-import jalview.javascript.json.JSON;
-import jalview.json.binding.biojson.v1.AlignmentPojo;
-
-import java.io.FileReader;
 import java.io.IOException;
 import java.io.Reader;
 import java.util.List;
 
-import org.json.simple.parser.JSONParser;
 import org.json.simple.parser.ParseException;
 
 public class JSONUtils
@@ -23,70 +18,56 @@ public class JSONUtils
    */
   public static String arrayToStringList(List<Object> jsonArray)
   {
-       int n;
-       
+    int n;
+
     if (jsonArray == null || (n = jsonArray.size()) == 0)
     {
       return null;
     }
 
     /**
+     * BH TODO to Platform?
+     * 
      * @j2sNative
      * 
-     * return jsonArray.elementData.slice(0, n).join(",");
+     *            return jsonArray.elementData.slice(0, n).join(",");
      */
     {
-           StringBuilder sb = new StringBuilder();
-           for (int i = 0; i < n; i++)
-           {
-             if (i > 0)
-             {
-               sb.append(",");
-             }
-             sb.append(jsonArray.get(i).toString());
-           }
-           return sb.toString();
+      StringBuilder sb = new StringBuilder();
+      for (int i = 0; i < n; i++)
+      {
+        if (i > 0)
+        {
+          sb.append(",");
+        }
+        sb.append(jsonArray.get(i).toString());
+      }
+      return sb.toString();
     }
   }
 
   /**
-   * The method all JSON parsing must go through for JavaScript. 
-   * @param r a BufferedReader or a javascript.json.JSON.JSONReader
+   * The method all JSON parsing must go through for JavaScript.
+   * 
+   * @param r
+   *          a BufferedReader or a javascript.json.JSON.JSONReader
    * @return
    * @throws IOException
    * @throws ParseException
    */
-  public static Object parse(Reader r) throws IOException, ParseException 
+  public static Object parse(Reader r) throws IOException, ParseException
   {
-      // Using a file reader is not currently supported in SwingJS JavaScript
-
-         if (r == null)
-                 return null;
-//       
-//             Platform.timeCheck("JSONUtils.parse0 ", Platform.TIME_MARK);
-
-       Object ret;    
-       if (Platform.isJS()) 
-       {
-         if (r instanceof FileReader) 
-         {
-           throw new IOException("StringJS does not support FileReader parsing for JSON -- but it could...");
-         }
-         return JSON.parse(r);
-       } else {
-        ret = new JSONParser().parse(r);
-       }
-//     Platform.timeCheck("JSONUtils.parse1 ", Platform.TIME_MARK);
-       return ret;
+    return Platform.parseJSON(r);
   }
 
-  public static Object parse(String json) throws ParseException 
+  public static Object parse(String json) throws ParseException
   {
-       return (Platform.isJS() ? JSON.parse(json) : new JSONParser().parse(json));
+    return Platform.parseJSON(json);
   }
 
-public static String stringify(Object obj) {
-       return new org.json.JSONObject(obj).toString();
-}
+  public static String stringify(Object obj)
+  {
+    return new org.json.JSONObject(obj).toString();
+  }
 
 }