JSON refactoring

[jalview.git] / src / jalview / json / binding / biojs / BioJSRepositoryPojo.java

diff --git a/src/jalview/json/binding/biojs/BioJSRepositoryPojo.java b/src/jalview/json/binding/biojs/BioJSRepositoryPojo.java
index 62fb20a..ad50305 100644 (file)
--- a/src/jalview/json/binding/biojs/BioJSRepositoryPojo.java
+++ b/src/jalview/json/binding/biojs/BioJSRepositoryPojo.java
@@ -20,14 +20,15 @@
  */
 package jalview.json.binding.biojs;
 
+import jalview.util.JSONUtils;
+
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 
-import org.json.simple.JSONArray;
-import org.json.simple.JSONObject;
-import org.json.simple.parser.JSONParser;
 import org.json.simple.parser.ParseException;
 
 public class BioJSRepositoryPojo
@@ -59,17 +60,16 @@ public class BioJSRepositoryPojo
   {
     Objects.requireNonNull(jsonString,
             "Supplied jsonString must not be null");
-    JSONParser jsonParser = new JSONParser();
-    JSONObject JsonObj = (JSONObject) jsonParser.parse(jsonString);
+    Map<String, Object> JsonObj = (Map<String, Object>) JSONUtils.parse(jsonString);
     this.description = (String) JsonObj.get("description");
     this.latestReleaseVersion = (String) JsonObj
             .get("latestReleaseVersion");
 
-    JSONArray repositoriesJsonArray = (JSONArray) JsonObj.get("releases");
-    for (Iterator<JSONObject> repoIter = repositoriesJsonArray
+    List<Object> repositoriesJsonArray = (List<Object>) JsonObj.get("releases");
+    for (Iterator<Object> repoIter = repositoriesJsonArray
             .iterator(); repoIter.hasNext();)
     {
-      JSONObject repoObj = repoIter.next();
+      Map<String, Object> repoObj = (Map<String, Object>) repoIter.next();
       BioJSReleasePojo repo = new BioJSReleasePojo();
       repo.setType((String) repoObj.get("type"));
       repo.setUrl((String) repoObj.get("url"));