Merge branch 'develop' into features/JAL-1705_ensembl

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

diff --git a/src/jalview/json/binding/v1/BioJSRepositoryPojo.java b/src/jalview/json/binding/biojs/BioJSRepositoryPojo.java
similarity index 64%
rename from src/jalview/json/binding/v1/BioJSRepositoryPojo.java
rename to src/jalview/json/binding/biojs/BioJSRepositoryPojo.java
index 4028a9d..c526302 100644 (file)
--- a/src/jalview/json/binding/v1/BioJSRepositoryPojo.java
+++ b/src/jalview/json/binding/biojs/BioJSRepositoryPojo.java
@@ -1,8 +1,29 @@
-package jalview.json.binding.v1;
+/*
+ * 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 java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
+import java.util.Objects;
 
 import org.json.simple.JSONArray;
 import org.json.simple.JSONObject;
@@ -36,14 +57,15 @@ public class BioJSRepositoryPojo
   @SuppressWarnings("unchecked")
   private void parse(String jsonString) throws ParseException
   {
+    Objects.requireNonNull(jsonString,
+            "Supplied jsonString must not be null");
     JSONParser jsonParser = new JSONParser();
     JSONObject JsonObj = (JSONObject) jsonParser.parse(jsonString);
     this.description = (String) JsonObj.get("description");
     this.latestReleaseVersion = (String) JsonObj
             .get("latestReleaseVersion");
 
-    JSONArray repositoriesJsonArray = (JSONArray) JsonObj
-.get("releases");
+    JSONArray repositoriesJsonArray = (JSONArray) JsonObj.get("releases");
     for (Iterator<JSONObject> repoIter = repositoriesJsonArray.iterator(); repoIter
             .hasNext();)
     {
@@ -66,7 +88,6 @@ public class BioJSRepositoryPojo
     this.description = description;
   }
 
-
   public String getLatestReleaseVersion()
   {
     return latestReleaseVersion;