X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fschemes%2FResidueColourScheme.java;h=b905c452ba87dcce2683ded2f74c2ec0fdc5cd36;hb=4966d9f4569d7f2b46aca6ff4629e9a1b1120c98;hp=bf8366547f6d93fb38e857de28994fd5c3b3b758;hpb=3d941a02a998676a12f8ff43fa98d9e1f4c27142;p=jalview.git

diff --git a/src/jalview/schemes/ResidueColourScheme.java b/src/jalview/schemes/ResidueColourScheme.java
index bf83665..b905c45 100755
--- a/src/jalview/schemes/ResidueColourScheme.java
+++ b/src/jalview/schemes/ResidueColourScheme.java
@@ -97,7 +97,7 @@ public class ResidueColourScheme implements ColourSchemeI
        }
 
        if(conservationColouring)
-         applyConservation(currentColour, j);
+         currentColour = applyConservation(currentColour, j);
 
 
        return currentColour;
@@ -221,7 +221,7 @@ public class ResidueColourScheme implements ColourSchemeI
     * @return DOCUMENT ME!
     */
 
-   void applyConservation(Color currentColour, int i)
+   Color applyConservation(Color currentColour, int i)
    {
 
      if ((conservation[i] != '*') && (conservation[i] != '+'))
@@ -235,8 +235,7 @@ public class ResidueColourScheme implements ColourSchemeI
          float t = 11 - (conservation[i] - '0');
          if(t==0)
          {
-           currentColour = Color.white;
-           return;
+           return Color.white;
          }
 
          int red = currentColour.getRed();
@@ -261,6 +260,7 @@ public class ResidueColourScheme implements ColourSchemeI
            currentColour = new Color(red, green, blue);
        }
        }
+       return currentColour;
    }