X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fschemes%2FAnnotationColourGradient.java;h=789667e0b2d49296053fa319b45ff933ebf0b319;hb=0125a426aecc7065538a13f48236dc1e8d268044;hp=3cb7e174ebdc895694bf5f9abef58a944e1cebf4;hpb=5963dedafa1af673a588f0d30710f7391eb822c4;p=jalview.git

diff --git a/src/jalview/schemes/AnnotationColourGradient.java b/src/jalview/schemes/AnnotationColourGradient.java
index 3cb7e17..789667e 100755
--- a/src/jalview/schemes/AnnotationColourGradient.java
+++ b/src/jalview/schemes/AnnotationColourGradient.java
@@ -117,11 +117,13 @@ public class AnnotationColourGradient extends ResidueColourScheme
      */
     public Color findColour(String n, int j)
     {
+        currentColour = Color.white;
+
         if ((threshold == 0) || aboveThreshold(n, j))
         {
-          if( j+1>annotation.annotations.length || annotation.annotations[j]==null)
-            currentColour = Color.white;
-          else
+          if( j<annotation.annotations.length
+              && annotation.annotations[j]!=null
+              && !jalview.util.Comparison.isGap(n.charAt(0)))
           {
             if(  aboveAnnotationThreshold==NO_THRESHOLD
                || (annotationThreshold!=null && aboveAnnotationThreshold==ABOVE_THRESHOLD && annotation.annotations[j].value>=annotationThreshold.value)
@@ -148,17 +150,9 @@ public class AnnotationColourGradient extends ResidueColourScheme
 
                 currentColour = new Color( (int) dr, (int) dg, (int) db);
               }
-              else
-                currentColour = Color.white;
             }
-            else
-              currentColour = Color.white;
           }
         }
-        else
-        {
-            return Color.white;
-        }
 
         if(conservationColouring)
          applyConservation(j);