ColourScheme findColour no longer needs sequence

diff --git a/src/jalview/gui/ColourKey.java b/src/jalview/gui/ColourKey.java
index ab399ec..6d6646e 100755 (executable)
--- a/src/jalview/gui/ColourKey.java
+++ b/src/jalview/gui/ColourKey.java
@@ -133,7 +133,7 @@ protected void hydroMenuItem_actionPerformed(ActionEvent e)
   Color [] col = new Color[res.length];\r
   HydrophobicColourScheme cs = new HydrophobicColourScheme();\r
   for (int i=0; i<res.length; i++)\r
-    col[i] = cs.findColour(null,  res[i], -1,  null);\r
+    col[i] = cs.findColour( res[i], -1,  null);\r
 \r
   displayKey( res, null, col, "According to the hydrophobicity table of  Kyte, J., and Doolittle, R.F., J. Mol. Biol. 1157, 105-132, 1982.  The most hydrophobic residues according to this table are coloured red and the most hydrophilic ones are coloured blue.");\r
 \r
@@ -147,7 +147,7 @@ protected void helixMenuItem_actionPerformed(ActionEvent e)
   Color[] col = new Color[res.length];\r
   HelixColourScheme cs = new HelixColourScheme();\r
   for (int i = 0; i < res.length; i++)\r
-    col[i] = cs.findColour(null, res[i], -1, null);\r
+    col[i] = cs.findColour( res[i], -1, null);\r
 \r
   displayKey(res, null, col, null);\r
 }\r
@@ -160,7 +160,7 @@ protected void strandMenuItem_actionPerformed(ActionEvent e)
 Color[] col = new Color[res.length];\r
 StrandColourScheme cs = new StrandColourScheme();\r
 for (int i = 0; i < res.length; i++)\r
-  col[i] = cs.findColour(null, res[i], -1, null);\r
+  col[i] = cs.findColour( res[i], -1, null);\r
   displayKey(res, null, col, null);\r
 }\r
 \r
@@ -172,7 +172,7 @@ protected void turnMenuItem_actionPerformed(ActionEvent e)
 Color[] col = new Color[res.length];\r
 TurnColourScheme cs = new TurnColourScheme();\r
 for (int i = 0; i < res.length; i++)\r
-  col[i] = cs.findColour(null, res[i], -1, null);\r
+  col[i] = cs.findColour( res[i], -1, null);\r
 \r
   displayKey(res, null, col, null);\r
 }\r
@@ -185,7 +185,7 @@ protected void buriedMenuItem_actionPerformed(ActionEvent e)
 Color[] col = new Color[res.length];\r
 BuriedColourScheme cs = new BuriedColourScheme();\r
 for (int i = 0; i < res.length; i++)\r
-  col[i] = cs.findColour(null, res[i], -1, null);\r
+  col[i] = cs.findColour( res[i], -1, null);\r
 \r
   displayKey(res, null, col, null);\r
 }\r

diff --git a/src/jalview/gui/DrawableSequence.java b/src/jalview/gui/DrawableSequence.java
index 8b7eec1..32e8d1c 100755 (executable)
--- a/src/jalview/gui/DrawableSequence.java
+++ b/src/jalview/gui/DrawableSequence.java
@@ -33,7 +33,7 @@ public class DrawableSequence implements SequenceI {
   }\r
 \r
   public Color getResidueBoxColour(int i) {\r
-    Color c = cs.findColour(this,sequence.getSequence(i,i+1),i,null);\r
+    Color c = cs.findColour( sequence.getSequence(i,i+1),i,null);\r
     return c;\r
   }\r
 \r