\r
public Color findColour(String s, int j)\r
{\r
+ Color currentColour;\r
int index = ResidueProperties.aaIndex[s.charAt(0)];\r
\r
if ((threshold == 0) || aboveThreshold(ResidueProperties.aa[index], j))\r
}\r
\r
if(conservationColouring)\r
- applyConservation(j);\r
+ applyConservation(currentColour, j);\r
\r
\r
return currentColour;\r