JAL-2591 Removed getHiddenRegions()==null checks which are always false

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

diff --git a/src/jalview/gui/ScalePanel.java b/src/jalview/gui/ScalePanel.java
index cb19539..8a24937 100755 (executable)
--- a/src/jalview/gui/ScalePanel.java
+++ b/src/jalview/gui/ScalePanel.java
@@ -403,20 +403,17 @@ public class ScalePanel extends JPanel implements MouseMotionListener,
 
     res = av.getAlignment().getHiddenColumns().adjustForHiddenColumns(res);
 
-    if (av.getAlignment().getHiddenColumns().getHiddenRegions() != null)
+    for (int[] region : av.getAlignment().getHiddenColumns()
+            .getHiddenRegions())
     {
-      for (int[] region : av.getAlignment().getHiddenColumns()
-              .getHiddenRegions())
+      if (res + 1 == region[0] || res - 1 == region[1])
       {
-        if (res + 1 == region[0] || res - 1 == region[1])
-        {
-          reveal = region;
-          ToolTipManager.sharedInstance().registerComponent(this);
-          this.setToolTipText(MessageManager
-                  .getString("label.reveal_hidden_columns"));
-          repaint();
-          return;
-        }
+        reveal = region;
+        ToolTipManager.sharedInstance().registerComponent(this);
+        this.setToolTipText(
+                MessageManager.getString("label.reveal_hidden_columns"));
+        repaint();
+        return;
       }
     }
   }
@@ -499,7 +496,7 @@ public class ScalePanel extends JPanel implements MouseMotionListener,
       gg.setColor(Color.blue);
       int res;
 
-      if (av.getShowHiddenMarkers() && hidden.getHiddenRegions() != null)
+      if (av.getShowHiddenMarkers())
       {
         for (int i = 0; i < hidden.getHiddenRegions()
                 .size(); i++)