*\r
* @return DOCUMENT ME!\r
*/\r
- public Color findColour(String n)\r
+ public Color findColour(char c)\r
{\r
return Color.red;\r
}\r
*\r
* @return DOCUMENT ME!\r
*/\r
- public Color findColour(String n, int j)\r
+ public Color findColour(char c, int j)\r
{\r
- currentColour = Color.white;\r
+ Color currentColour = Color.white;\r
\r
- if ((threshold == 0) || aboveThreshold(n, j))\r
+ if ((threshold == 0) || aboveThreshold(c, j))\r
{\r
if( j<annotation.annotations.length\r
&& annotation.annotations[j]!=null\r
- && !jalview.util.Comparison.isGap(n.charAt(0)))\r
+ && !jalview.util.Comparison.isGap(c))\r
{\r
if( aboveAnnotationThreshold==NO_THRESHOLD\r
|| (annotationThreshold!=null && aboveAnnotationThreshold==ABOVE_THRESHOLD && annotation.annotations[j].value>=annotationThreshold.value)\r
{\r
if(colourScheme!=null)\r
{\r
- currentColour = colourScheme.findColour(n, j);\r
+ currentColour = colourScheme.findColour(c, j);\r
}\r
else if(range!=0)\r
{\r
}\r
\r
if(conservationColouring)\r
- applyConservation(j);\r
+ currentColour = applyConservation(currentColour, j);\r
\r
return currentColour;\r
}\r