X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FScalePanel.java;h=8a24937cdf9a53540a338d7b88457b24b4dd447a;hb=0af3213cac54f10113b6fa2cbfb4523dae61b5b7;hp=cb195392bf8e3900e818db342859df836b6093f1;hpb=defcce0ef74ffc0923b4387bcb5f0d867bf64831;p=jalview.git diff --git a/src/jalview/gui/ScalePanel.java b/src/jalview/gui/ScalePanel.java index cb19539..8a24937 100755 --- 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++)