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
JAL-2110 TODO for JAL-2131
[jalview.git]
/
src
/
jalview
/
io
/
JSONFile.java
diff --git
a/src/jalview/io/JSONFile.java
b/src/jalview/io/JSONFile.java
index
36980f8
..
3cda444
100644
(file)
--- a/
src/jalview/io/JSONFile.java
+++ b/
src/jalview/io/JSONFile.java
@@
-744,11
+744,14
@@
public class JSONFile extends AlignFile implements ComplexAlignFile
fr = avpanel.cloneFeatureRenderer();
// Add non auto calculated annotation to AlignFile
fr = avpanel.cloneFeatureRenderer();
// Add non auto calculated annotation to AlignFile
- for (AlignmentAnnotation annot : annots)
+ if (annots != null)
{
{
- if (annot != null && !annot.autoCalculated)
+ for (AlignmentAnnotation annot : annots)
{
{
- annotations.add(annot);
+ if (annot != null && !annot.autoCalculated)
+ {
+ annotations.add(annot);
+ }
}
}
globalColourScheme = ColourSchemeProperty.getColourName(viewport
}
}
globalColourScheme = ColourSchemeProperty.getColourName(viewport