JAL-3184 restore group visibility on Cancel in Feature Settings

[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 553f813..186b57b 100644 (file)
--- a/src/jalview/viewmodel/seqfeatures/FeatureRendererModel.java
+++ b/src/jalview/viewmodel/seqfeatures/FeatureRendererModel.java
@@ -43,6 +43,7 @@ import java.util.Hashtable;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -859,30 +860,27 @@ public abstract class FeatureRendererModel
   }
 
   /**
-   * get visible or invisible groups
+   * Answers a (possibly empty) list of visible or invisible feature groups
    * 
    * @param visible
-   *          true to return visible groups, false to return hidden ones.
-   * @return list of groups
+   *          true to return visible groups, false to return hidden ones
+   * @return
    */
   @Override
   public List<String> getGroups(boolean visible)
   {
+    List<String> groups = new ArrayList<>();
     if (featureGroups != null)
     {
-      List<String> gp = new ArrayList<>();
-
-      for (String grp : featureGroups.keySet())
+      for (Entry<String, Boolean> grp : featureGroups.entrySet())
       {
-        Boolean state = featureGroups.get(grp);
-        if (state.booleanValue() == visible)
+        if (grp.getValue() == visible)
         {
-          gp.add(grp);
+          groups.add(grp.getKey());
         }
       }
-      return gp;
     }
-    return null;
+    return groups;
   }
 
   @Override