JAL-2388 Minor refactoring

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

diff --git a/src/jalview/appletgui/OverviewPanel.java b/src/jalview/appletgui/OverviewPanel.java
index 743d217..1b6df1d 100755 (executable)
--- a/src/jalview/appletgui/OverviewPanel.java
+++ b/src/jalview/appletgui/OverviewPanel.java
@@ -123,33 +123,23 @@ public class OverviewPanel extends Panel implements Runnable,
   @Override
   public void mousePressed(MouseEvent evt)
   {
-    od.setBoxX(evt.getX());
-    od.setBoxY(evt.getY());
-    checkValid();
+    od.setBoxPositionByMouse(evt.getX(), evt.getY());
+    ap.setScrollValues(od.getScrollCol(), od.getScrollRow());
+    ap.paintAlignment(false);
   }
 
   @Override
   public void mouseReleased(MouseEvent evt)
   {
-    od.setBoxX(evt.getX());
-    od.setBoxY(evt.getY());
-    checkValid();
+    od.setBoxPositionByMouse(evt.getX(), evt.getY());
+    ap.setScrollValues(od.getScrollCol(), od.getScrollRow());
+    ap.paintAlignment(false);
   }
 
   @Override
   public void mouseDragged(MouseEvent evt)
   {
-    od.setBoxX(evt.getX());
-    od.setBoxY(evt.getY());
-    checkValid();
-  }
-
-  /**
-   * Check box dimensions and scroll positions and correct if necessary
-   */
-  private void checkValid()
-  {
-    od.checkValid();
+    od.setBoxPositionByMouse(evt.getX(), evt.getY());
     ap.setScrollValues(od.getScrollCol(), od.getScrollRow());
     ap.paintAlignment(false);
   }
@@ -383,10 +373,7 @@ public class OverviewPanel extends Panel implements Runnable,
     {
       og.drawImage(miniMe, 0, 0, this);
       og.setColor(Color.red);
-      og.drawRect(od.getBoxX(), od.getBoxY(), od.getBoxWidth(),
-              od.getBoxHeight());
-      og.drawRect(od.getBoxX() + 1, od.getBoxY() + 1, od.getBoxWidth() - 2,
-              od.getBoxHeight() - 2);
+      od.drawBox(og);
       g.drawImage(offscreen, 0, 0, this);
     }
   }