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 54bb4ee..8219c6a 100644 (file)
--- a/src/jalview/viewmodel/seqfeatures/FeatureRendererModel.java
+++ b/src/jalview/viewmodel/seqfeatures/FeatureRendererModel.java
@@ -653,7 +653,7 @@ public abstract class FeatureRendererModel
     {
       featureOrder = new Hashtable<>();
     }
-    featureOrder.put(type, Float.valueOf(position));
+    featureOrder.put(type, new Float(position));
     return position;
   }
 
@@ -853,7 +853,7 @@ public abstract class FeatureRendererModel
     }
     if (newGroupsVisible)
     {
-      featureGroups.put(group, Boolean.valueOf(true));
+      featureGroups.put(group, new Boolean(true));
       return true;
     }
     return false;
@@ -889,7 +889,7 @@ public abstract class FeatureRendererModel
   @Override
   public void setGroupVisibility(String group, boolean visible)
   {
-    featureGroups.put(group, Boolean.valueOf(visible));
+    featureGroups.put(group, new Boolean(visible));
   }
 
   @Override
@@ -901,7 +901,7 @@ public abstract class FeatureRendererModel
       for (String gst : toset)
       {
         Boolean st = featureGroups.get(gst);
-        featureGroups.put(gst, Boolean.valueOf(visible));
+        featureGroups.put(gst, new Boolean(visible));
         if (st != null)
         {
           rdrw = rdrw || (visible != st.booleanValue());
@@ -986,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();
   }
 
   /**