JAL-1989 more unit tests and encapsulation for ColumnSelection

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

diff --git a/src/jalview/appletgui/ScalePanel.java b/src/jalview/appletgui/ScalePanel.java
index 769ac8b..cd50f3f 100755 (executable)
--- a/src/jalview/appletgui/ScalePanel.java
+++ b/src/jalview/appletgui/ScalePanel.java
@@ -70,6 +70,7 @@ public class ScalePanel extends Panel implements MouseMotionListener,
 
   }
 
+  @Override
   public void mousePressed(MouseEvent evt)
   {
     int x = (evt.getX() / av.getCharWidth()) + av.getStartRes();
@@ -95,6 +96,7 @@ public class ScalePanel extends Panel implements MouseMotionListener,
                 MessageManager.getString("label.reveal"));
         item.addActionListener(new ActionListener()
         {
+          @Override
           public void actionPerformed(ActionEvent e)
           {
             av.showColumn(reveal[0]);
@@ -113,6 +115,7 @@ public class ScalePanel extends Panel implements MouseMotionListener,
           item = new MenuItem(MessageManager.getString("action.reveal_all"));
           item.addActionListener(new ActionListener()
           {
+            @Override
             public void actionPerformed(ActionEvent e)
             {
               av.showAllHiddenColumns();
@@ -135,6 +138,7 @@ public class ScalePanel extends Panel implements MouseMotionListener,
                 MessageManager.getString("label.hide_columns"));
         item.addActionListener(new ActionListener()
         {
+          @Override
           public void actionPerformed(ActionEvent e)
           {
             av.hideColumns(res, res);
@@ -193,6 +197,7 @@ public class ScalePanel extends Panel implements MouseMotionListener,
     av.sendSelection();
   }
 
+  @Override
   public void mouseReleased(MouseEvent evt)
   {
     mouseDragging = false;
@@ -232,6 +237,7 @@ public class ScalePanel extends Panel implements MouseMotionListener,
     av.sendSelection();
   }
 
+  @Override
   public void mouseDragged(MouseEvent evt)
   {
     mouseDragging = true;
@@ -301,6 +307,7 @@ public class ScalePanel extends Panel implements MouseMotionListener,
     }
   }
 
+  @Override
   public void mouseEntered(MouseEvent evt)
   {
     if (mouseDragging)
@@ -309,6 +316,7 @@ public class ScalePanel extends Panel implements MouseMotionListener,
     }
   }
 
+  @Override
   public void mouseExited(MouseEvent evt)
   {
     if (mouseDragging)
@@ -317,11 +325,13 @@ public class ScalePanel extends Panel implements MouseMotionListener,
     }
   }
 
+  @Override
   public void mouseClicked(MouseEvent evt)
   {
 
   }
 
+  @Override
   public void mouseMoved(MouseEvent evt)
   {
     if (!av.hasHiddenColumns())
@@ -346,11 +356,13 @@ public class ScalePanel extends Panel implements MouseMotionListener,
     repaint();
   }
 
+  @Override
   public void update(Graphics g)
   {
     paint(g);
   }
 
+  @Override
   public void paint(Graphics g)
   {
     drawScale(g, av.getStartRes(), av.getEndRes(), getSize().width,
@@ -371,9 +383,8 @@ public class ScalePanel extends Panel implements MouseMotionListener,
     ColumnSelection cs = av.getColumnSelection();
     gg.setColor(new Color(220, 0, 0));
     int avcharWidth = av.getCharWidth(), avcharHeight = av.getCharHeight();
-    for (int i = 0; i < cs.size(); i++)
+    for (int sel : cs.getSelected())
     {
-      int sel = cs.columnAt(i);
       if (av.hasHiddenColumns())
       {
         sel = av.getColumnSelection().findColumnPosition(sel);