git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f2221ba
)
JAL-1492 formatting and squash NPEs
author
Jim Procter
<jprocter@dundee.ac.uk>
Thu, 1 May 2014 14:41:20 +0000
(15:41 +0100)
committer
Jim Procter
<jprocter@dundee.ac.uk>
Thu, 1 May 2014 14:41:20 +0000
(15:41 +0100)
src/jalview/datamodel/SequenceGroup.java
patch
|
blob
|
history
diff --git
a/src/jalview/datamodel/SequenceGroup.java
b/src/jalview/datamodel/SequenceGroup.java
index
1df45a2
..
a8b0ace
100755
(executable)
--- a/
src/jalview/datamodel/SequenceGroup.java
+++ b/
src/jalview/datamodel/SequenceGroup.java
@@
-1209,11
+1209,15
@@
public class SequenceGroup implements AnnotatedCollectionI
ArrayList<AlignmentAnnotation> annot = new ArrayList<AlignmentAnnotation>();
for (SequenceI seq : (Vector<SequenceI>) sequences)
{
- for (AlignmentAnnotation al : seq.getAnnotation())
+ AlignmentAnnotation[] aa = seq.getAnnotation();
+ if (aa != null)
{
- if (al.groupRef == this)
+ for (AlignmentAnnotation al : aa)
{
- annot.add(al);
+ if (al.groupRef == this)
+ {
+ annot.add(al);
+ }
}
}
}