X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fanalysis%2FAlignmentAnnotationUtils.java;fp=src%2Fjalview%2Fanalysis%2FAlignmentAnnotationUtils.java;h=e02aa9ea3254ac13f96953291869305dccf1e118;hb=c4609f79463d463d471b207a092f4d5af807391d;hp=9bdbf7352a57513df57587766dc930e0243d5ebc;hpb=8fe789715bfbea0db5869a55e37252a0dee06ea7;p=jalview.git diff --git a/src/jalview/analysis/AlignmentAnnotationUtils.java b/src/jalview/analysis/AlignmentAnnotationUtils.java index 9bdbf73..e02aa9e 100644 --- a/src/jalview/analysis/AlignmentAnnotationUtils.java +++ b/src/jalview/analysis/AlignmentAnnotationUtils.java @@ -1,9 +1,5 @@ package jalview.analysis; -import jalview.datamodel.AlignmentAnnotation; -import jalview.datamodel.SequenceI; -import jalview.renderer.AnnotationRenderer; - import java.util.ArrayList; import java.util.Arrays; import java.util.BitSet; @@ -12,6 +8,10 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import jalview.datamodel.AlignmentAnnotation; +import jalview.datamodel.SequenceI; +import jalview.renderer.AnnotationRenderer; + public class AlignmentAnnotationUtils { @@ -63,6 +63,14 @@ public class AlignmentAnnotationUtils for (AlignmentAnnotation aa : annotations) { + /* + * Ignore non-positional annotations, can't render these against an + * alignment + */ + if (aa.annotations == null) + { + continue; + } if (forSequences != null && (aa.sequenceRef != null && forSequences .contains(aa.sequenceRef)))