}\r
\r
if(conservationColouring)\r
- applyConservation(currentColour, j);\r
+ currentColour = applyConservation(currentColour, j);\r
\r
return currentColour;\r
}\r
}\r
\r
if(conservationColouring)\r
- applyConservation(currentColour, j);\r
+ currentColour = applyConservation(currentColour, j);\r
}\r
else\r
{\r
}\r
\r
if(conservationColouring)\r
- applyConservation(currentColour, j);\r
+ currentColour = applyConservation(currentColour, j);\r
\r
return currentColour;\r
}\r
}\r
\r
if(conservationColouring)\r
- applyConservation(currentColour, j);\r
+ currentColour = applyConservation(currentColour, j);\r
\r
return currentColour;\r
}\r
}\r
\r
if(conservationColouring)\r
- applyConservation(currentColour, j);\r
+ currentColour = applyConservation(currentColour, j);\r
\r
return currentColour;\r
}\r
}\r
\r
if(conservationColouring)\r
- applyConservation(currentColour, j);\r
+ currentColour = applyConservation(currentColour, j);\r
\r
\r
return currentColour;\r
* @return DOCUMENT ME!\r
*/\r
\r
- void applyConservation(Color currentColour, int i)\r
+ Color applyConservation(Color currentColour, int i)\r
{\r
\r
if ((conservation[i] != '*') && (conservation[i] != '+'))\r
float t = 11 - (conservation[i] - '0');\r
if(t==0)\r
{\r
- currentColour = Color.white;\r
- return;\r
+ return Color.white;\r
}\r
\r
int red = currentColour.getRed();\r
currentColour = new Color(red, green, blue);\r
}\r
}\r
+ return currentColour;\r
}\r
\r
\r
Color currentColour = colors[ ResidueProperties.aaIndex[c] ];\r
\r
if(conservationColouring)\r
- applyConservation(currentColour, j);\r
+ currentColour = applyConservation(currentColour, j);\r
\r
return currentColour;\r
}\r
}\r
\r
if(conservationColouring)\r
- applyConservation(currentColour, j);\r
+ currentColour = applyConservation(currentColour, j);\r
\r
\r
return currentColour;\r