X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjson%2Fbinding%2Fbiojs%2FBioJSRepositoryPojo.java;h=ad50305972068c110348b10d8b2c83a0f53b0db4;hb=8e7cf85a7f61f425e808cac53ead7bc27e402242;hp=62fb20aeb0512dd324d5c84a4baaf44d1748e31f;hpb=6f1a50917d60504ae3eb46377d3020271accacaf;p=jalview.git diff --git a/src/jalview/json/binding/biojs/BioJSRepositoryPojo.java b/src/jalview/json/binding/biojs/BioJSRepositoryPojo.java index 62fb20a..ad50305 100644 --- 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 JsonObj = (Map) JSONUtils.parse(jsonString); this.description = (String) JsonObj.get("description"); this.latestReleaseVersion = (String) JsonObj .get("latestReleaseVersion"); - JSONArray repositoriesJsonArray = (JSONArray) JsonObj.get("releases"); - for (Iterator repoIter = repositoriesJsonArray + List repositoriesJsonArray = (List) JsonObj.get("releases"); + for (Iterator repoIter = repositoriesJsonArray .iterator(); repoIter.hasNext();) { - JSONObject repoObj = repoIter.next(); + Map repoObj = (Map) repoIter.next(); BioJSReleasePojo repo = new BioJSReleasePojo(); repo.setType((String) repoObj.get("type")); repo.setUrl((String) repoObj.get("url"));