From: amwaterhouse <Andrew Waterhouse>
Date: Thu, 16 Feb 2006 16:51:36 +0000 (+0000)
Subject: Dont colour gaps
X-Git-Tag: Root_VamJalview_2_07b+~114
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=2bdd8fe3e044068769ca42c57bfa1ef5f52e2f2d;p=jalview.git

Dont colour gaps
---

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);