X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fschemes%2FAnnotationColourGradient.java;h=4a78aa12e6d2be61938ba1d82e4515525a9ed951;hb=d587f1aa61946dc14f6f089cf1dc2a3116cfb773;hp=ac88d96b81898a2467db6bdfb7d6f6e22d73f62b;hpb=47cd4dfeb4dac56591da8f31a50d310b69236c7b;p=jalview.git

diff --git a/src/jalview/schemes/AnnotationColourGradient.java b/src/jalview/schemes/AnnotationColourGradient.java
index ac88d96..4a78aa1 100755
--- a/src/jalview/schemes/AnnotationColourGradient.java
+++ b/src/jalview/schemes/AnnotationColourGradient.java
@@ -1,6 +1,6 @@
 /*
 * Jalview - A Sequence Alignment Editor and Viewer
-* Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+* Copyright (C) 2006 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
 *
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
@@ -141,7 +141,7 @@ public class AnnotationColourGradient extends ResidueColourScheme
      */
     public Color findColour(String n, int j)
     {
-        currentColour = Color.white;
+        Color currentColour = Color.white;
 
         if ((threshold == 0) || aboveThreshold(n, j))
         {
@@ -179,7 +179,7 @@ public class AnnotationColourGradient extends ResidueColourScheme
         }
 
         if(conservationColouring)
-         applyConservation(j);
+         currentColour = applyConservation(currentColour, j);
 
        return currentColour;
     }