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 'develop' into trialMerge
[jalview.git]
/
src
/
jalview
/
datamodel
/
Annotation.java
diff --git
a/src/jalview/datamodel/Annotation.java
b/src/jalview/datamodel/Annotation.java
index
0230e7a
..
71ebbb3
100755
(executable)
--- a/
src/jalview/datamodel/Annotation.java
+++ b/
src/jalview/datamodel/Annotation.java
@@
-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;