X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fdatamodel%2FAnnotation.java;h=0230e7ad75d69d8b436dfcd4a4d23d3b9713f474;hb=0873fd1ab406be7ef121f466c7b53e4b6315bbca;hp=aa933b743dcad73b4c7bae97f78a32220d7f5b21;hpb=0e2054d29bc49351f000d478659dc3c4371b251c;p=jalview.git diff --git a/src/jalview/datamodel/Annotation.java b/src/jalview/datamodel/Annotation.java index aa933b7..0230e7a 100755 --- a/src/jalview/datamodel/Annotation.java +++ b/src/jalview/datamodel/Annotation.java @@ -1,19 +1,21 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.1) - * Copyright (C) 2014 The Jalview Authors + * 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. + * 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 . + * You should have received a copy of the GNU General Public License + * along with Jalview. If not, see . * The Jalview Authors are detailed in the 'AUTHORS' file. */ package jalview.datamodel; @@ -45,7 +47,7 @@ public class Annotation /** Score for the position - used in histograms, line graphs and for shading */ public float value; - + /** Colour for position */ public Color colour; @@ -67,7 +69,7 @@ public class Annotation description = desc; secondaryStructure = ss; value = val; - + } /** @@ -122,15 +124,15 @@ public class Annotation */ public Annotation(float val) { - this(null, null, ' ', val,null); + this(null, null, ' ', val, null); } /** * human readable representation of an annotation row element. - * + * * Format is 'display Char','secondary Structure * Char',"description",score,[colourstring] - * + * * fields may be missing if they are null, whitespace, or equivalent to * Float.NaN */ @@ -166,7 +168,7 @@ public class Annotation { sb.append(","); } - if (value != Float.NaN) + if (!Float.isNaN(value)) { sb.append(value); }