type = en.nextElement().toString();\r
Color col = fr.getColour(type);\r
\r
-\r
//This will ignore any features which are in groups not shown\r
- if(fr.featureGroups==null\r
- || ((Boolean)fr.featureGroups.get(allFeatures.get(type))).booleanValue())\r
+ Object visibleGroup = fr.featureGroups.get(allFeatures.get(type));\r
+ if(visibleGroup == null\r
+ || ((Boolean)(visibleGroup)).booleanValue())\r
{\r
tmp[tmpIndex][0] = type;\r
tmp[tmpIndex][1] = col;\r