*\r
* @return DOCUMENT ME!\r
*/\r
- public Color findColour(String s, int j)\r
+ public Color findColour(char c, int j)\r
{\r
if (threshold > 0)\r
{\r
- if (!aboveThreshold(s, j))\r
+ if (!aboveThreshold(c, j))\r
{\r
return Color.white;\r
}\r
}\r
\r
- char c = s.charAt(0);\r
-\r
- if (jalview.util.Comparison.isGap((c)))\r
+ if (jalview.util.Comparison.isGap(c))\r
{\r
return Color.white;\r
}\r
\r
- currentColour = colors[((Integer) ResidueProperties.aaHash.get(s)).intValue()];\r
+ Color currentColour = colors[ ResidueProperties.aaIndex[c] ];\r
\r
if(conservationColouring)\r
- applyConservation(j);\r
+ currentColour = applyConservation(currentColour, j);\r
\r
return currentColour;\r
}\r