From e21e6d438e301aefb7dfe4c10361beec8e4a9f78 Mon Sep 17 00:00:00 2001 From: Jim Procter Date: Mon, 21 Apr 2014 10:07:24 +0100 Subject: [PATCH] avoid potential NPE --- src/jalview/schemes/AnnotationColourGradient.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/jalview/schemes/AnnotationColourGradient.java b/src/jalview/schemes/AnnotationColourGradient.java index 1b23d13..d92bb46 100755 --- a/src/jalview/schemes/AnnotationColourGradient.java +++ b/src/jalview/schemes/AnnotationColourGradient.java @@ -199,7 +199,7 @@ public class AnnotationColourGradient extends ResidueColourScheme public Color findColour(char c, int j, SequenceI seq) { Color currentColour = Color.white; - AlignmentAnnotation annotation = (seqAssociated ? seqannot.get(seq) + AlignmentAnnotation annotation = (seqAssociated && seqannot!=null ? seqannot.get(seq) : this.annotation); if (annotation == null) { -- 1.7.10.2