X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjson%2Fbinding%2Fbiojs%2FBioJSRepositoryPojo.java;h=daf28f540376034195a4010c2170e73c0066cff6;hb=57738a1f3c19b1c3a00bd3ac5108f8cd0af32f99;hp=5c79e51ff24d7ebf86760a7e4d182becca5b3ced;hpb=4d7f98a6dd54d9863ba449ec79dcd95d25ed863d;p=jalview.git

diff --git a/src/jalview/json/binding/biojs/BioJSRepositoryPojo.java b/src/jalview/json/binding/biojs/BioJSRepositoryPojo.java
index 5c79e51..daf28f5 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,17 +60,18 @@ 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"));