/*\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
public Color findColour(String n, int j)\r
{\r
- currentColour = Color.white;\r
+ Color currentColour = Color.white;\r
\r
if ((threshold == 0) || aboveThreshold(n, j))\r
{\r
}\r
\r
if(conservationColouring)\r
- applyConservation(j);\r
+ applyConservation(currentColour, j);\r
\r
return currentColour;\r
}\r