JAL-3438 spotless for 2.11.2.0

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

diff --git a/src/jalview/appletgui/OverviewPanel.java b/src/jalview/appletgui/OverviewPanel.java
index fa30819..71b3ac7 100755 (executable)
--- a/src/jalview/appletgui/OverviewPanel.java
+++ b/src/jalview/appletgui/OverviewPanel.java
@@ -116,8 +116,8 @@ public class OverviewPanel extends Panel implements Runnable,
   @Override
   public void mouseClicked(MouseEvent evt)
   {
-    if ((evt.getModifiers()
-            & InputEvent.BUTTON3_MASK) == InputEvent.BUTTON3_MASK)
+    if ((evt.getModifiersEx()
+            & InputEvent.BUTTON3_DOWN_MASK) == InputEvent.BUTTON3_DOWN_MASK)
     {
       showPopupMenu(evt);
     }
@@ -128,21 +128,21 @@ public class OverviewPanel extends Panel implements Runnable,
   {
     if (od.isPositionInBox(evt.getX(), evt.getY()))
     {
-      // display drag cursor at mouse position
-      setCursor(Cursor.getPredefinedCursor(Cursor.MOVE_CURSOR));
+      this.getParent()
+              .setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
     }
     else
     {
-      // reset cursor
-      setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
+      this.getParent().setCursor(
+              Cursor.getPredefinedCursor(Cursor.CROSSHAIR_CURSOR));
     }
   }
 
   @Override
   public void mousePressed(MouseEvent evt)
   {
-    if ((evt.getModifiers()
-            & InputEvent.BUTTON3_MASK) == InputEvent.BUTTON3_MASK)
+    if ((evt.getModifiersEx()
+            & InputEvent.BUTTON3_DOWN_MASK) == InputEvent.BUTTON3_DOWN_MASK)
     {
       if (!Platform.isMac()) // BH was excluding JavaScript
       {
@@ -155,8 +155,8 @@ public class OverviewPanel extends Panel implements Runnable,
       // (wait to see if it's a drag instead)
       // otherwise update the viewport
       if (!od.isPositionInBox(evt.getX(), evt.getY()))
-      { 
-       draggingBox = false;
+      {
+        draggingBox = false;
 
         // display drag cursor at mouse position
         setCursor(Cursor.getPredefinedCursor(Cursor.MOVE_CURSOR));
@@ -164,6 +164,8 @@ public class OverviewPanel extends Panel implements Runnable,
         od.updateViewportFromMouse(evt.getX(), evt.getY(),
                 av.getAlignment().getHiddenSequences(),
                 av.getAlignment().getHiddenColumns());
+        getParent()
+                .setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
       }
       else
       {
@@ -184,32 +186,32 @@ public class OverviewPanel extends Panel implements Runnable,
   @Override
   public void mouseDragged(MouseEvent evt)
   {
-    if (Platform.isWinRightButton(evt)) 
+    if (Platform.isWinRightButton(evt))
     {
-       showPopupMenu(evt);
-       return;
+      showPopupMenu(evt);
+      return;
     }
 
     if (SwingUtilities.isRightMouseButton(evt))
-    { 
-       return;
+    {
+      return;
+    }
+
+    if (draggingBox)
+    {
+      // set the mouse position as a fixed point in the box
+      // and drag relative to that position
+      od.adjustViewportFromMouse(evt.getX(), evt.getY(),
+              av.getAlignment().getHiddenSequences(),
+              av.getAlignment().getHiddenColumns());
+    }
+    else
+    {
+      od.updateViewportFromMouse(evt.getX(), evt.getY(),
+              av.getAlignment().getHiddenSequences(),
+              av.getAlignment().getHiddenColumns());
     }
-    
-         if (draggingBox)
-         {
-           // set the mouse position as a fixed point in the box
-           // and drag relative to that position
-           od.adjustViewportFromMouse(evt.getX(), evt.getY(),
-                   av.getAlignment().getHiddenSequences(),
-                   av.getAlignment().getHiddenColumns());
-         }
-         else
-         {
-           od.updateViewportFromMouse(evt.getX(), evt.getY(),
-                   av.getAlignment().getHiddenSequences(),
-                   av.getAlignment().getHiddenColumns());
-         }
-         ap.paintAlignment(false, false);
+    ap.paintAlignment(false, false);
   }
 
   /**