Menus

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

diff --git a/src/jalview/schemes/PIDColourScheme.java b/src/jalview/schemes/PIDColourScheme.java
index cc050d5..eadf09b 100755 (executable)
--- a/src/jalview/schemes/PIDColourScheme.java
+++ b/src/jalview/schemes/PIDColourScheme.java
@@ -16,17 +16,14 @@ public class PIDColourScheme extends ResidueColourScheme {
     }\r
 \r
 \r
-  public Color findColour(String s, int j,Vector aa) {\r
-      Color     c    = Color.white;\r
-      Hashtable hash = null;\r
 \r
+  public Color findColour(String s, int j) {\r
 \r
-      if (aa != null)\r
-         hash = (Hashtable)aa.elementAt(j);\r
-      else\r
-        return c;\r
+    if( threshold!=0 && !aboveThreshold(s,j))\r
+      return Color.white;\r
 \r
-      String    max  = (String)hash.get("maxResidue");\r
+    Color     c    = Color.white;\r
+      Hashtable hash =  (Hashtable)consensus.elementAt(j);\r
 \r
       double sc = 0;\r
       if ( Integer.parseInt( hash.get("maxCount").toString() ) != -1 && hash.contains(s))\r