JAL-1551 JAL-962 formatting and code change ripples from changing HiddenColumns ...

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

diff --git a/src/jalview/gui/ScalePanel.java b/src/jalview/gui/ScalePanel.java
index 01e4284..32773b9 100755 (executable)
--- a/src/jalview/gui/ScalePanel.java
+++ b/src/jalview/gui/ScalePanel.java
@@ -128,7 +128,7 @@ public class ScalePanel extends JPanel implements MouseMotionListener,
         });
         pop.add(item);
 
-        if (av.getColumnSelection().getHiddenColumns().size() > 1)
+        if (av.getColumnSelection().hasHiddenColumns())
         {
           item = new JMenuItem(
                   MessageManager.getString("action.reveal_all"));
@@ -371,24 +371,21 @@ public class ScalePanel extends JPanel implements MouseMotionListener,
     reveal = null;
     if (av.getColumnSelection().getHiddenColumns() != null)
     {
-    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;
-        ToolTipManager.sharedInstance().registerComponent(this);
-        this.setToolTipText(MessageManager
-                .getString("label.reveal_hidden_columns"));
-        break;
-      }
-      else
+      for (int[] region : av.getColumnSelection().getHiddenColumns())
       {
-        this.setToolTipText(null);
+        if (res + 1 == region[0] || res - 1 == region[1])
+        {
+          reveal = region;
+          ToolTipManager.sharedInstance().registerComponent(this);
+          this.setToolTipText(MessageManager
+                  .getString("label.reveal_hidden_columns"));
+          break;
+        }
+        else
+        {
+          this.setToolTipText(null);
+        }
       }
-
-    }
     }
     repaint();
   }