{\r
try\r
{\r
- return colors[((Integer) (ResidueProperties.nucleotideHash.get(n))).intValue()];\r
+ currentColour = colors[((Integer) (ResidueProperties.nucleotideHash.get(n))).intValue()];\r
}\r
catch (Exception ex)\r
{\r
{\r
return Color.white;\r
}\r
+\r
+ if(conservationColouring)\r
+ applyConservation(j);\r
+\r
+ return currentColour;\r
}\r
}\r