X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fext%2Fparadise%2FAnnotate3D.java;fp=src%2Fjalview%2Fext%2Fparadise%2FAnnotate3D.java;h=3b7044bb18fa5a1c8d14af9fadc60d04f119f925;hb=8e7cf85a7f61f425e808cac53ead7bc27e402242;hp=d50ad878f1b1857666001ba4f500aac466c77416;hpb=6f1a50917d60504ae3eb46377d3020271accacaf;p=jalview.git

diff --git a/src/jalview/ext/paradise/Annotate3D.java b/src/jalview/ext/paradise/Annotate3D.java
index d50ad87..3b7044b 100644
--- a/src/jalview/ext/paradise/Annotate3D.java
+++ b/src/jalview/ext/paradise/Annotate3D.java
@@ -20,6 +20,7 @@
  */
 package jalview.ext.paradise;
 
+import jalview.util.JSONUtils;
 import jalview.util.MessageManager;
 import jalview.ws.HttpClientUtils;
 
@@ -32,11 +33,10 @@ import java.net.URL;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 
 import org.apache.http.NameValuePair;
 import org.apache.http.message.BasicNameValuePair;
-import org.json.simple.JSONArray;
-import org.json.simple.JSONObject;
 import org.json.simple.parser.ContentHandler;
 import org.json.simple.parser.ParseException;
 
@@ -151,14 +151,19 @@ public class Annotate3D
 
   }
 
+  /**
+   * @param respons
+   * @return
+   * @throws Exception
+   */
   public static Iterator<Reader> processJsonResponseFor(Reader respons)
           throws Exception
   {
-    org.json.simple.parser.JSONParser jp = new org.json.simple.parser.JSONParser();
+	  // BH 2019 never called?
     try
     {
-      final JSONArray responses = (JSONArray) jp.parse(respons);
-      final Iterator rvals = responses.iterator();
+      @SuppressWarnings("unchecked")
+	final Iterator<Object> rvals = ((List<Object>) JSONUtils.parse(respons)).iterator();
       return new Iterator<Reader>()
       {
         @Override
@@ -167,10 +172,11 @@ public class Annotate3D
           return rvals.hasNext();
         }
 
-        @Override
+        @SuppressWarnings("unchecked")
+		@Override
         public Reader next()
         {
-          JSONObject val = (JSONObject) rvals.next();
+          Map<String, Object> val = (Map<String, Object>) rvals.next();
 
           Object sval = null;
           try
@@ -189,9 +195,7 @@ public class Annotate3D
 
             sval = "";
           }
-          return new StringReader((sval instanceof JSONObject)
-                  ? ((JSONObject) sval).toString()
-                  : sval.toString());
+          return new StringReader(sval.toString());
 
         }