JAL-3369 JAL-3253-applet adds embedded dim checking for overview frame

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

diff --git a/src/jalview/appletgui/OverviewPanel.java b/src/jalview/appletgui/OverviewPanel.java
index 334310f..ef684f7 100755 (executable)
--- a/src/jalview/appletgui/OverviewPanel.java
+++ b/src/jalview/appletgui/OverviewPanel.java
@@ -32,11 +32,8 @@ import java.awt.CheckboxMenuItem;
 import java.awt.Cursor;
 import java.awt.Dimension;
 import java.awt.Frame;
-import java.awt.Image;
 import java.awt.Panel;
-import java.awt.Point;
 import java.awt.PopupMenu;
-import java.awt.Toolkit;
 import java.awt.event.ComponentAdapter;
 import java.awt.event.ComponentEvent;
 import java.awt.event.InputEvent;
@@ -47,21 +44,19 @@ import java.awt.event.MouseListener;
 import java.awt.event.MouseMotionListener;
 import java.beans.PropertyChangeEvent;
 
-import javax.swing.ImageIcon;
+import javax.swing.SwingUtilities;
 
+@SuppressWarnings("serial")
 public class OverviewPanel extends Panel implements Runnable,
         MouseMotionListener, MouseListener, ViewportListenerI
 {
-  protected Image dragImage = new ImageIcon(
-          getClass().getResource("/images/dragcursor.png")).getImage();
+  OverviewDimensions od;
 
-  private OverviewDimensions od;
-
-  private OverviewCanvas oviewCanvas;
+  OverviewCanvas canvas;
 
   private AlignViewport av;
 
-  private AlignmentPanel ap;
+  AlignmentPanel ap;
 
   private boolean showHidden = true;
 
@@ -69,8 +64,6 @@ public class OverviewPanel extends Panel implements Runnable,
 
   private boolean draggingBox = false;
 
-  private Cursor dragCursor;
-
   public OverviewPanel(AlignmentPanel alPanel)
   {
     this.av = alPanel.av;
@@ -81,27 +74,14 @@ public class OverviewPanel extends Panel implements Runnable,
             (av.isShowAnnotation()
                     && av.getSequenceConsensusHash() != null));
 
-    oviewCanvas = new OverviewCanvas(od, av);
+    canvas = new OverviewCanvas(this, od, av);
     setLayout(new BorderLayout());
-    add(oviewCanvas, BorderLayout.CENTER);
+    add(canvas, BorderLayout.CENTER);
 
     setSize(new Dimension(od.getWidth(), od.getHeight()));
 
     av.getRanges().addPropertyChangeListener(this);
 
-    Toolkit toolkit = Toolkit.getDefaultToolkit();
-    Image image = toolkit.getImage("images/dragcursor.png");
-
-    if (Platform.isAMac())
-    {
-      dragCursor = toolkit.createCustomCursor(image, new Point(15, 15),
-              "drag cursor");
-    }
-    else
-    {
-      dragCursor = Cursor.getPredefinedCursor(Cursor.MOVE_CURSOR);
-    }
-
     addComponentListener(new ComponentAdapter()
     {
 
@@ -142,33 +122,21 @@ public class OverviewPanel extends Panel implements Runnable,
     {
       showPopupMenu(evt);
     }
-    else if (od.isPositionInBox(evt.getX(), evt.getY()))
-    {
-      // display drag cursor at mouse position
-      this.getParent().setCursor(dragCursor);
-    }
-    else
-    {
-      // reset cursor
-      this.getParent()
-              .setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
-    }
   }
 
   @Override
   public void mouseMoved(MouseEvent evt)
   {
-    System.out.println(evt.getY());
     if (od.isPositionInBox(evt.getX(), evt.getY()))
     {
-      // display drag cursor at mouse position
-      this.getParent().setCursor(dragCursor);
+      this.getParent()
+              .setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
     }
     else
     {
-      // reset cursor
       this.getParent()
-              .setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
+              .setCursor(
+                      Cursor.getPredefinedCursor(Cursor.CROSSHAIR_CURSOR));
     }
   }
 
@@ -178,7 +146,7 @@ public class OverviewPanel extends Panel implements Runnable,
     if ((evt.getModifiers()
             & InputEvent.BUTTON3_MASK) == InputEvent.BUTTON3_MASK)
     {
-      if (!Platform.isAMac())
+      if (!Platform.isMac()) // BH was excluding JavaScript
       {
         showPopupMenu(evt);
       }
@@ -191,9 +159,15 @@ public class OverviewPanel extends Panel implements Runnable,
       if (!od.isPositionInBox(evt.getX(), evt.getY()))
       { 
        draggingBox = false;
+
+        // display drag cursor at mouse position
+        setCursor(Cursor.getPredefinedCursor(Cursor.MOVE_CURSOR));
+
         od.updateViewportFromMouse(evt.getX(), evt.getY(),
                 av.getAlignment().getHiddenSequences(),
                 av.getAlignment().getHiddenColumns());
+        getParent()
+                .setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
       }
       else
       {
@@ -208,37 +182,38 @@ public class OverviewPanel extends Panel implements Runnable,
   @Override
   public void mouseReleased(MouseEvent evt)
   {
+    draggingBox = false;
   }
 
   @Override
   public void mouseDragged(MouseEvent evt)
   {
-    if ((evt.getModifiers()
-            & InputEvent.BUTTON3_MASK) == InputEvent.BUTTON3_MASK)
+    if (Platform.isWinRightButton(evt)) 
     {
-      if (!Platform.isAMac())
-      {
-        showPopupMenu(evt);
-      }
+       showPopupMenu(evt);
+       return;
     }
-    else
-    {
-      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);
+
+    if (SwingUtilities.isRightMouseButton(evt))
+    { 
+       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());
+         }
+         ap.paintAlignment(false, false);
   }
 
   /**
@@ -246,7 +221,7 @@ public class OverviewPanel extends Panel implements Runnable,
    */
   public void updateOverviewImage()
   {
-    if (oviewCanvas == null)
+    if (canvas == null)
     {
       /*
        * panel has been disposed
@@ -265,7 +240,7 @@ public class OverviewPanel extends Panel implements Runnable,
     {
       if (updateRunning)
       {
-        oviewCanvas.restartDraw();
+        canvas.restartDraw();
         return;
       }
 
@@ -280,7 +255,7 @@ public class OverviewPanel extends Panel implements Runnable,
   @Override
   public void run()
   {
-    oviewCanvas.draw(av.isShowSequenceFeatures(),
+    canvas.draw(av.isShowSequenceFeatures(),
             (av.isShowAnnotation()
                     && av.getAlignmentConservationAnnotation() != null),
             ap.seqPanel.seqCanvas.getFeatureRenderer());
@@ -347,7 +322,7 @@ public class OverviewPanel extends Panel implements Runnable,
               (av.isShowAnnotation()
                       && av.getAlignmentConservationAnnotation() != null));
     }
-    oviewCanvas.resetOviewDims(od);
+    canvas.resetOviewDims(od);
     updateOverviewImage();
   }
 
@@ -365,7 +340,11 @@ public class OverviewPanel extends Panel implements Runnable,
     } finally
     {
       av = null;
-      oviewCanvas = null;
+      if (canvas != null)
+      {
+        canvas.dispose();
+      }
+      canvas = null;
       ap = null;
       od = null;
     }