Merge branch 'develop' into feature_29/JAL-1372_referenceseq

[jalview.git] / src / jalview / appletgui / ScalePanel.java

diff --git a/src/jalview/appletgui/ScalePanel.java b/src/jalview/appletgui/ScalePanel.java
index bc5b3e7..2b6f37a 100755 (executable)
--- a/src/jalview/appletgui/ScalePanel.java
+++ b/src/jalview/appletgui/ScalePanel.java
@@ -108,7 +108,7 @@ public class ScalePanel extends Panel implements MouseMotionListener,
         });
         pop.add(item);
 
-        if (av.getColumnSelection().getHiddenColumns().size() > 1)
+        if (av.getColumnSelection().hasManyHiddenColumns())
         {
           item = new MenuItem(MessageManager.getString("action.reveal_all"));
           item.addActionListener(new ActionListener()
@@ -334,19 +334,14 @@ public class ScalePanel extends Panel implements MouseMotionListener,
     res = av.getColumnSelection().adjustForHiddenColumns(res);
 
     reveal = null;
-    if (av.getColumnSelection().getHiddenColumns() != null)
+    for (int[] region : av.getColumnSelection().getHiddenColumns())
     {
-    for (int i = 0; i < av.getColumnSelection().getHiddenColumns().size(); i++)
-    {
-      int[] region = (int[]) av.getColumnSelection().getHiddenColumns()
-              .elementAt(i);
       if (res + 1 == region[0] || res - 1 == region[1])
       {
         reveal = region;
         break;
       }
     }
-    }
 
     repaint();
   }
@@ -441,8 +436,7 @@ public class ScalePanel extends Panel implements MouseMotionListener,
     {
       gg.setColor(Color.blue);
       int res;
-      if (av.getColumnSelection().getHiddenColumns() != null
-              && av.getShowHiddenMarkers())
+      if (av.getShowHiddenMarkers())
       {
         for (int i = 0; i < av.getColumnSelection().getHiddenColumns()
                 .size(); i++)