From c0bf7be8f74d296a751836ee33bc328e2ff6d1b5 Mon Sep 17 00:00:00 2001 From: amwaterhouse Date: Wed, 8 Mar 2006 16:54:28 +0000 Subject: [PATCH] Check for visibleGroup==null --- src/jalview/gui/FeatureSettings.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/jalview/gui/FeatureSettings.java b/src/jalview/gui/FeatureSettings.java index 3979ebe..7c95ed7 100755 --- a/src/jalview/gui/FeatureSettings.java +++ b/src/jalview/gui/FeatureSettings.java @@ -231,10 +231,10 @@ public class FeatureSettings extends JPanel type = en.nextElement().toString(); Color col = fr.getColour(type); - //This will ignore any features which are in groups not shown - if(fr.featureGroups==null - || ((Boolean)fr.featureGroups.get(allFeatures.get(type))).booleanValue()) + Object visibleGroup = fr.featureGroups.get(allFeatures.get(type)); + if(visibleGroup == null + || ((Boolean)(visibleGroup)).booleanValue()) { tmp[tmpIndex][0] = type; tmp[tmpIndex][1] = col; -- 1.7.10.2