JAL-3210 Improvements to eclipse detection. New src tree and SwingJS updated from...

[jalview.git] / src / jalview / viewmodel / seqfeatures / FeatureRendererModel.java

diff --git a/src/jalview/viewmodel/seqfeatures/FeatureRendererModel.java b/src/jalview/viewmodel/seqfeatures/FeatureRendererModel.java
index 5923e1f..8219c6a 100644 (file)
--- a/src/jalview/viewmodel/seqfeatures/FeatureRendererModel.java
+++ b/src/jalview/viewmodel/seqfeatures/FeatureRendererModel.java
@@ -266,14 +266,11 @@ public abstract class FeatureRendererModel
 
   boolean findingFeatures = false;
 
-  int nup;
-
   protected boolean updateFeatures()
   {
     if (av.getFeaturesDisplayed() == null || renderOrder == null
             || newFeatureAdded)
     {
-      System.out.println("updateFeatures " + ++nup);
       findAllFeatures();
       if (av.getFeaturesDisplayed().getVisibleFeatureCount() < 1)
       {
@@ -989,12 +986,12 @@ public abstract class FeatureRendererModel
    */
   protected boolean featureGroupNotShown(final SequenceFeature sequenceFeature)
   {
+    Boolean b;
     return featureGroups != null
             && sequenceFeature.featureGroup != null
-            && sequenceFeature.featureGroup.length() != 0
-            && featureGroups.containsKey(sequenceFeature.featureGroup)
-            && !featureGroups.get(sequenceFeature.featureGroup)
-                    .booleanValue();
+            && sequenceFeature.featureGroup.length() > 0
+            && (b = featureGroups.get(sequenceFeature.featureGroup)) != null
+            && !b.booleanValue();
   }
 
   /**