X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fschemes%2FClustalxColourScheme.java;h=f13a90cfa84961c1103314ecb6ea341040a6c0a9;hb=b5579849960a79b7fc111bdc8f84c8b933632ef0;hp=49260a4448647785c54e6c8713f25d565a12e4f1;hpb=8e1be43e250107a4d86898bd554cf03098fa5957;p=jalview.git

diff --git a/src/jalview/schemes/ClustalxColourScheme.java b/src/jalview/schemes/ClustalxColourScheme.java
index 49260a4..f13a90c 100755
--- a/src/jalview/schemes/ClustalxColourScheme.java
+++ b/src/jalview/schemes/ClustalxColourScheme.java
@@ -23,6 +23,7 @@ package jalview.schemes;
 import jalview.datamodel.AnnotatedCollectionI;
 import jalview.datamodel.SequenceCollectionI;
 import jalview.datamodel.SequenceI;
+import jalview.util.Comparison;
 
 import java.awt.Color;
 import java.util.List;
@@ -278,10 +279,8 @@ public class ClustalxColourScheme extends ResidueColourScheme
   @Override
   protected Color findColour(char c, int j, SequenceI seq)
   {
-    Color currentColour;
-
     // TODO why the test for includeGaps here?
-    if (cons2.length <= j
+    if (cons2.length <= j || Comparison.isGap(c)
     /*|| (includeGaps && threshold != 0 && !aboveThreshold(c, j))*/)
     {
       return Color.white;
@@ -289,11 +288,11 @@ public class ClustalxColourScheme extends ResidueColourScheme
 
     int i = ResidueProperties.aaIndex[c];
 
-    currentColour = Color.white;
+    Color colour = Color.white;
 
     if (i > 19)
     {
-      return currentColour;
+      return colour;
     }
 
     for (int k = 0; k < residueColour[i].cons.length; k++)
@@ -301,22 +300,22 @@ public class ClustalxColourScheme extends ResidueColourScheme
       if (residueColour[i].cons[k].isConserved(cons2, j, size,
               includeGaps))
       {
-        currentColour = residueColour[i].c;
+        colour = residueColour[i].c;
       }
     }
 
     if (i == 4)
     {
       /*
-       * override to colour C pink if 100% conserved
+       * override to colour C pink if >85% conserved
        */
       if (conses[27].isConserved(cons2, j, size, includeGaps))
       {
-        currentColour = ClustalColour.PINK.colour;
+        colour = ClustalColour.PINK.colour;
       }
     }
 
-    return currentColour;
+    return colour;
   }
 
   /**