git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'Release_2_9_0b1_Branch' of https://source.jalview.org/git/jalview.git...
[jalview.git]
/
src
/
jalview
/
datamodel
/
Annotation.java
diff --git
a/src/jalview/datamodel/Annotation.java
b/src/jalview/datamodel/Annotation.java
index
8e5c490
..
63ef590
100755
(executable)
--- 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.2b1)
- * Copyright (C) 2014 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b1)
+ * Copyright (C) 2015 The Jalview Authors
*
* This file is part of Jalview.
*
*
* This file is part of Jalview.
*
@@
-107,9
+107,13
@@
public class Annotation
return;
}
if (that.displayCharacter != null)
return;
}
if (that.displayCharacter != null)
+ {
displayCharacter = new String(that.displayCharacter);
displayCharacter = new String(that.displayCharacter);
+ }
if (that.description != null)
if (that.description != null)
+ {
description = new String(that.description);
description = new String(that.description);
+ }
secondaryStructure = that.secondaryStructure;
value = that.value;
colour = that.colour;
secondaryStructure = that.secondaryStructure;
value = that.value;
colour = that.colour;
@@
-168,7
+172,7
@@
public class Annotation
{
sb.append(",");
}
{
sb.append(",");
}
- if (value != Float.NaN)
+ if (!Float.isNaN(value))
{
sb.append(value);
}
{
sb.append(value);
}