From: amwaterhouse <Andrew Waterhouse>
Date: Wed, 15 Dec 2004 17:17:16 +0000 (+0000)
Subject: ColourScheme findColour no longer needs sequence
X-Git-Tag: Release_2_0~815
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=df8c2839df78b06fce3353145ee86d14c00e5c5e;p=jalview.git

ColourScheme findColour no longer needs sequence
---

diff --git a/src/jalview/gui/ColourKey.java b/src/jalview/gui/ColourKey.java
index ab399ec..6d6646e 100755
--- 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];
   HydrophobicColourScheme cs = new HydrophobicColourScheme();
   for (int i=0; i<res.length; i++)
-    col[i] = cs.findColour(null,  res[i], -1,  null);
+    col[i] = cs.findColour( res[i], -1,  null);
 
   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.");
 
@@ -147,7 +147,7 @@ protected void helixMenuItem_actionPerformed(ActionEvent e)
   Color[] col = new Color[res.length];
   HelixColourScheme cs = new HelixColourScheme();
   for (int i = 0; i < res.length; i++)
-    col[i] = cs.findColour(null, res[i], -1, null);
+    col[i] = cs.findColour( res[i], -1, null);
 
   displayKey(res, null, col, null);
 }
@@ -160,7 +160,7 @@ protected void strandMenuItem_actionPerformed(ActionEvent e)
 Color[] col = new Color[res.length];
 StrandColourScheme cs = new StrandColourScheme();
 for (int i = 0; i < res.length; i++)
-  col[i] = cs.findColour(null, res[i], -1, null);
+  col[i] = cs.findColour( res[i], -1, null);
   displayKey(res, null, col, null);
 }
 
@@ -172,7 +172,7 @@ protected void turnMenuItem_actionPerformed(ActionEvent e)
 Color[] col = new Color[res.length];
 TurnColourScheme cs = new TurnColourScheme();
 for (int i = 0; i < res.length; i++)
-  col[i] = cs.findColour(null, res[i], -1, null);
+  col[i] = cs.findColour( res[i], -1, null);
 
   displayKey(res, null, col, null);
 }
@@ -185,7 +185,7 @@ protected void buriedMenuItem_actionPerformed(ActionEvent e)
 Color[] col = new Color[res.length];
 BuriedColourScheme cs = new BuriedColourScheme();
 for (int i = 0; i < res.length; i++)
-  col[i] = cs.findColour(null, res[i], -1, null);
+  col[i] = cs.findColour( res[i], -1, null);
 
   displayKey(res, null, col, null);
 }
diff --git a/src/jalview/gui/DrawableSequence.java b/src/jalview/gui/DrawableSequence.java
index 8b7eec1..32e8d1c 100755
--- a/src/jalview/gui/DrawableSequence.java
+++ b/src/jalview/gui/DrawableSequence.java
@@ -33,7 +33,7 @@ public class DrawableSequence implements SequenceI {
   }
 
   public Color getResidueBoxColour(int i) {
-    Color c = cs.findColour(this,sequence.getSequence(i,i+1),i,null);
+    Color c = cs.findColour( sequence.getSequence(i,i+1),i,null);
     return c;
   }