X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fdatamodel%2FAnnotation.java;h=19008269800cc27be59e70c9dd44f768c27c43df;hb=17e77c3f2949a0729322b4a8d907f3f34b6a9914;hp=f692234497a217b17b1d44278c5727d94c8b1ebc;hpb=323663120848253cb367f13d7e470790ec451219;p=jalview.git
diff --git a/src/jalview/datamodel/Annotation.java b/src/jalview/datamodel/Annotation.java
index f692234..1900826 100755
--- a/src/jalview/datamodel/Annotation.java
+++ b/src/jalview/datamodel/Annotation.java
@@ -1,19 +1,22 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8)
- * Copyright (C) 2012 J Procter, AM Waterhouse, LM Lui, J Engelhardt, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9)
+ * Copyright (C) 2015 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;
@@ -66,6 +69,7 @@ public class Annotation
description = desc;
secondaryStructure = ss;
value = val;
+
}
/**
@@ -103,12 +107,17 @@ 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;
+
}
/**
@@ -119,15 +128,15 @@ public class Annotation
*/
public Annotation(float val)
{
- this(null, null, ' ', val);
+ 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
*/
@@ -163,7 +172,7 @@ public class Annotation
{
sb.append(",");
}
- if (value != Float.NaN)
+ if (!Float.isNaN(value))
{
sb.append(value);
}