X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FColourKey.java;h=6d6646ef39d457657ec426e74499527b0433d5c5;hb=ecb5ebdc2d8d549eeb63214bff868a8968fde50d;hp=4dd62a2f798a941d9b3a16caae7594b243129ca8;hpb=1ecf6419aba86993b3c223bf5ec0fa79427baf85;p=jalview.git

diff --git a/src/jalview/gui/ColourKey.java b/src/jalview/gui/ColourKey.java
index 4dd62a2..6d6646e 100755
--- a/src/jalview/gui/ColourKey.java
+++ b/src/jalview/gui/ColourKey.java
@@ -116,8 +116,8 @@ protected void taylorMenuItem_actionPerformed(ActionEvent e)
 {
   menu.setText("Taylor colour scheme");
   String [] res = new String[]{"A","V","I","L","M","F","Y","W","H","R","K","N","Q","E","D","S","T","G","P","C"};
-  Color [] col = new Color[20];
-  for (int i=0; i<20; i++)
+  Color [] col = new Color[res.length];
+  for (int i=0; i<res.length; i++)
     col[i] = ResidueProperties.taylor[ ((Integer)ResidueProperties.aaHash.get(res[i])).intValue() ];
 
 
@@ -130,10 +130,10 @@ protected void hydroMenuItem_actionPerformed(ActionEvent e)
 
   menu.setText("Hydrophobicity colour scheme");
   String [] res = new String[]{"I","V","L","F","C","M","A","G","X","T","S","W","Y","P","H","E","Z","Q","D","B","N","K","R"};
-  Color [] col = new Color[20];
+  Color [] col = new Color[res.length];
   HydrophobicColourScheme cs = new HydrophobicColourScheme();
-  for (int i=0; i<20; i++)
-    col[i] = cs.findColour(null,  res[i], -1,  null);
+  for (int i=0; i<res.length; i++)
+    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);
 }