\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[ ResidueProperties.aaIndex[s.charAt(0)] ];\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