/*\r
* Jalview - A Sequence Alignment Editor and Viewer\r
-* Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle\r
+* Copyright (C) 2006 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle\r
*\r
* This program is free software; you can redistribute it and/or\r
* modify it under the terms of the GNU General Public License\r
{\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