X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjson%2Fbinding%2Fbiojs%2FBioJSRepositoryPojo.java;h=ad50305972068c110348b10d8b2c83a0f53b0db4;hb=c9de7d22f36c8866959c8c3ddbad72c2fa841f32;hp=46b4ab8fec41578067ddcc61407c39da068e38b4;hpb=c7d9dbc9b92889077b91bcdb052032fe33fb269e;p=jalview.git

diff --git a/src/jalview/json/binding/biojs/BioJSRepositoryPojo.java b/src/jalview/json/binding/biojs/BioJSRepositoryPojo.java
index 46b4ab8..ad50305 100644
--- a/src/jalview/json/binding/biojs/BioJSRepositoryPojo.java
+++ b/src/jalview/json/binding/biojs/BioJSRepositoryPojo.java
@@ -1,13 +1,34 @@
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
+ * 
+ * This file is part of Jalview.
+ * 
+ * Jalview is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *  
+ * Jalview is distributed in the hope that it will be useful, but 
+ * WITHOUT ANY WARRANTY; without even the implied warranty 
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+ * PURPOSE.  See the GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
 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
@@ -39,18 +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.iterator(); repoIter
-            .hasNext();)
+    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"));
@@ -69,7 +88,6 @@ public class BioJSRepositoryPojo
     this.description = description;
   }
 
-
   public String getLatestReleaseVersion()
   {
     return latestReleaseVersion;