JAL-2371 CollectionColourScheme wraps ColourSchemeI

[jalview.git] / src / jalview / schemes / UserColourScheme.java

diff --git a/src/jalview/schemes/UserColourScheme.java b/src/jalview/schemes/UserColourScheme.java
index 969e6b3..d95652d 100755 (executable)
--- a/src/jalview/schemes/UserColourScheme.java
+++ b/src/jalview/schemes/UserColourScheme.java
@@ -241,31 +241,19 @@ public class UserColourScheme extends ResidueColourScheme
   @Override
   public Color findColour(char c, int j, SequenceI seq)
   {
-    Color currentColour;
+    Color colour;
     int index = ResidueProperties.aaIndex[c];
 
-    if ((threshold == 0) || aboveThreshold(c, j))
+    if (lowerCaseColours != null && 'a' <= c && c <= 'z')
     {
-      if (lowerCaseColours != null && 'a' <= c && c <= 'z')
-      {
-        currentColour = lowerCaseColours[index];
-      }
-      else
-      {
-        currentColour = colors[index];
-      }
+      colour = lowerCaseColours[index];
     }
     else
     {
-      currentColour = Color.white;
-    }
-
-    if (conservationColouring)
-    {
-      currentColour = applyConservation(currentColour, j);
+      colour = colors[index];
     }
 
-    return currentColour;
+    return colour;
   }
 
   public void setLowerCaseColours(Color[] lcolours)