\r
int i = ( (Integer) ResidueProperties.aaHash.get(s)).intValue();\r
\r
- Color c = Color.white;\r
+ currentColour = Color.white;\r
\r
if (i > 19)\r
{\r
- return c;\r
+ return currentColour;\r
}\r
\r
for (int k = 0; k < ResidueColour[i].conses.length; k++)\r
{\r
if (ResidueColour[i].conses[k].isConserved(cons2, j, size))\r
{\r
- c = ResidueColour[i].c;\r
+ currentColour = ResidueColour[i].c;\r
}\r
}\r
\r
{\r
if (conses[27].isConserved(cons2, j, size))\r
{\r
- c = (Color) colhash.get("PINK");\r
+ currentColour = (Color) colhash.get("PINK");\r
}\r
}\r
\r
- return c;\r
+ if(conservationColouring)\r
+ applyConservation(j);\r
+\r
+ return currentColour;\r
}\r
}\r
\r