From: jprocter <Jim Procter>
Date: Wed, 11 Apr 2007 14:16:55 +0000 (+0000)
Subject: fixed for display of 'null' group features
X-Git-Tag: Release_2_3~254
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=50fc0be07fc2672defdcca49c51bf28eb49ffba4;p=jalview.git

fixed for display of 'null' group features
---

diff --git a/src/jalview/gui/FeatureRenderer.java b/src/jalview/gui/FeatureRenderer.java
index c59ec1d..596203b 100755
--- a/src/jalview/gui/FeatureRenderer.java
+++ b/src/jalview/gui/FeatureRenderer.java
@@ -268,8 +268,9 @@ public class FeatureRenderer
 
         if (featureGroups != null
             && sequenceFeatures[sfindex].featureGroup != null
-            &&
-            featureGroups.containsKey(sequenceFeatures[sfindex].featureGroup)
+            && 
+            sequenceFeatures[sfindex].featureGroup.length()!=0
+            && featureGroups.containsKey(sequenceFeatures[sfindex].featureGroup)
             &&
             ! ( (Boolean) featureGroups.get(sequenceFeatures[sfindex].
                                             featureGroup)).
diff --git a/src/jalview/gui/FeatureSettings.java b/src/jalview/gui/FeatureSettings.java
index acd7694..4c0450c 100755
--- a/src/jalview/gui/FeatureSettings.java
+++ b/src/jalview/gui/FeatureSettings.java
@@ -198,9 +198,9 @@ public class FeatureSettings
           if (!allGroups.contains(group))
           {
             allGroups.addElement(group);
-            if (checkGroupState(group))
+            if (group!=null)
             {
-              // continue; // skip this group's feature - we've done it already ? 
+              checkGroupState(group);
             }
           }
         }
@@ -314,7 +314,8 @@ public class FeatureSettings
         if (group == null || fr.featureGroups.get(group) == null ||
             ( (Boolean) fr.featureGroups.get(group)).booleanValue())
         {
-          checkGroupState(group);
+          if (group!=null)
+            checkGroupState(group);
           type = tmpfeatures[index].getType();
           if (!visibleChecks.contains(type))
           {