X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FJSONFile.java;h=7e7052f7be1ecf681d96155818e6f0a04b1a6d9d;hb=bc85369667c2665d81631e96f0701038f04f9bb3;hp=4e293dbe2a17366ff7534f9bbe228e45bdd757c4;hpb=384e43c561fbc2446923dd2ed227e2931a8ac406;p=jalview.git diff --git a/src/jalview/io/JSONFile.java b/src/jalview/io/JSONFile.java index 4e293db..7e7052f 100644 --- a/src/jalview/io/JSONFile.java +++ b/src/jalview/io/JSONFile.java @@ -374,7 +374,10 @@ public class JSONFile extends AlignFile implements ComplexAlignFile AlignmentAnnotationPojo alignAnnotPojo = new AlignmentAnnotationPojo(); alignAnnotPojo.setDescription(annot.description); alignAnnotPojo.setLabel(annot.label); - alignAnnotPojo.setScore(annot.score); + if (!Double.isNaN(annot.score)) + { + alignAnnotPojo.setScore(annot.score); + } alignAnnotPojo.setCalcId(annot.getCalcId()); alignAnnotPojo.setGraphType(annot.graph); @@ -528,11 +531,6 @@ public class JSONFile extends AlignFile implements ComplexAlignFile .hasNext();) { JSONObject alAnnot = alAnnotIter.next(); - if (alAnnot == null) - { - continue; - } - JSONArray annotJsonArray = (JSONArray) alAnnot.get("annotations"); Annotation[] annotations = new Annotation[annotJsonArray.size()]; int count = 0;