all can threshold

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

diff --git a/src/jalview/schemes/ClustalxColourScheme.java b/src/jalview/schemes/ClustalxColourScheme.java
index 1bf8567..c6b63dd 100755 (executable)
--- a/src/jalview/schemes/ClustalxColourScheme.java
+++ b/src/jalview/schemes/ClustalxColourScheme.java
@@ -22,7 +22,7 @@ import jalview.datamodel.*;
 import java.util.*;\r
 import java.awt.*;\r
 \r
-public class ClustalxColourScheme implements ColourSchemeI\r
+public class ClustalxColourScheme extends ResidueColourScheme\r
 {\r
   Hashtable[] cons;\r
   int[][] cons2;\r
@@ -227,6 +227,10 @@ public class ClustalxColourScheme implements ColourSchemeI
 \r
   public Color findColour(String s, int j)\r
    {\r
+     if( threshold!=0 && !aboveThreshold(s,j))\r
+      return Color.white;\r
+\r
+\r
      int i = ((Integer)ResidueProperties.aaHash.get(s)).intValue();\r
 \r
      Color c = Color.white;\r
@@ -248,23 +252,6 @@ public class ClustalxColourScheme implements ColourSchemeI
      return c;\r
 \r
    }\r
-\r
-  public void setConsensus(Vector consensus)\r
-  {\r
-    // Clustal colouring cannot be coloured by PID\r
-  }\r
-\r
-  public boolean canThreshold()\r
-  {\r
-    return false;\r
-  }\r
-\r
-  public boolean isUserDefinable()\r
-  {\r
-    return false;\r
-  }\r
-\r
-\r
 }\r
 \r
 class ConsensusColour {\r