git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 2:
f2b86d7
)
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
author
gmungoc
<g.m.carstairs@dundee.ac.uk>
Wed, 22 Jun 2016 13:00:08 +0000
(14:00 +0100)
committer
gmungoc
<g.m.carstairs@dundee.ac.uk>
Wed, 22 Jun 2016 13:00:08 +0000
(14:00 +0100)
src/jalview/gui/AlignFrame.java
patch
|
blob
|
history
diff --git
a/src/jalview/gui/AlignFrame.java
b/src/jalview/gui/AlignFrame.java
index
bfbc969
..
133aab4
100644
(file)
--- a/
src/jalview/gui/AlignFrame.java
+++ b/
src/jalview/gui/AlignFrame.java
@@
-5960,8
+5960,13
@@
public class AlignFrame extends GAlignFrame implements DropTargetListener,
protected void setAnnotationsVisibility(boolean visible,
boolean forSequences, boolean forAlignment)
{
- for (AlignmentAnnotation aa : alignPanel.getAlignment()
- .getAlignmentAnnotation())
+ AlignmentAnnotation[] anns = alignPanel.getAlignment()
+ .getAlignmentAnnotation();
+ if (anns == null)
+ {
+ return;
+ }
+ for (AlignmentAnnotation aa : anns)
{
/*
* don't display non-positional annotations on an alignment