X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fdatamodel%2FAnnotation.java;h=19008269800cc27be59e70c9dd44f768c27c43df;hb=17e77c3f2949a0729322b4a8d907f3f34b6a9914;hp=e3588b039fe9ac90d09e1e87d54d85b769954491;hpb=47168f025aefdaa044802bd5f8f510ffe43a4808;p=jalview.git diff --git a/src/jalview/datamodel/Annotation.java b/src/jalview/datamodel/Annotation.java index e3588b0..1900826 100755 --- a/src/jalview/datamodel/Annotation.java +++ b/src/jalview/datamodel/Annotation.java @@ -1,6 +1,6 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2) - * Copyright (C) 2014 The Jalview Authors + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9) + * Copyright (C) 2015 The Jalview Authors * * This file is part of Jalview. * @@ -47,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; @@ -69,7 +69,7 @@ public class Annotation description = desc; secondaryStructure = ss; value = val; - + } /** @@ -107,9 +107,13 @@ public class Annotation return; } if (that.displayCharacter != null) + { displayCharacter = new String(that.displayCharacter); + } if (that.description != null) + { description = new String(that.description); + } secondaryStructure = that.secondaryStructure; value = that.value; colour = that.colour; @@ -124,15 +128,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 */ @@ -168,7 +172,7 @@ public class Annotation { sb.append(","); } - if (value != Float.NaN) + if (!Float.isNaN(value)) { sb.append(value); }