char res = s.charAt(0);\r
if ('a' <= res && res <= 'z')\r
{\r
- s = Character.toString(res -= ('a' - 'A'));\r
+ s = String.valueOf(res -= ('a' - 'A'));\r
}\r
\r
\r
return Color.white;\r
}\r
\r
-\r
-\r
- Color c = Color.white;\r
+ currentColour = Color.white;\r
\r
double sc = 0;\r
\r
{\r
if (sc > thresholds[i])\r
{\r
- c = pidColours[i];\r
+ currentColour = pidColours[i];\r
\r
break;\r
}\r
}\r
}\r
\r
- return c;\r
+ if(conservationColouring)\r
+ applyConservation(j);\r
+\r
+ return currentColour;\r
}\r
}\r