temp push

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

diff --git a/src/jalview/appletgui/OverviewPanel.java b/src/jalview/appletgui/OverviewPanel.java
index 9cbdd36..328841c 100755 (executable)
--- a/src/jalview/appletgui/OverviewPanel.java
+++ b/src/jalview/appletgui/OverviewPanel.java
@@ -46,16 +46,17 @@ import java.beans.PropertyChangeEvent;
 
 import javax.swing.SwingUtilities;
 
+@SuppressWarnings("serial")
 public class OverviewPanel extends Panel implements Runnable,
         MouseMotionListener, MouseListener, ViewportListenerI
 {
-  private OverviewDimensions od;
+  OverviewDimensions od;
 
-  private OverviewCanvas oviewCanvas;
+  OverviewCanvas canvas;
 
   private AlignViewport av;
 
-  private AlignmentPanel ap;
+  AlignmentPanel ap;
 
   private boolean showHidden = true;
 
@@ -73,9 +74,9 @@ 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()));
 
@@ -116,8 +117,8 @@ public class OverviewPanel extends Panel implements Runnable,
   @Override
   public void mouseClicked(MouseEvent evt)
   {
-    if ((evt.getModifiersEx()
-            & InputEvent.BUTTON3_DOWN_MASK) == InputEvent.BUTTON3_DOWN_MASK)
+    if ((evt.getModifiers()
+            & InputEvent.BUTTON3_MASK) == InputEvent.BUTTON3_MASK)
     {
       showPopupMenu(evt);
     }
@@ -142,8 +143,8 @@ public class OverviewPanel extends Panel implements Runnable,
   @Override
   public void mousePressed(MouseEvent evt)
   {
-    if ((evt.getModifiersEx()
-            & InputEvent.BUTTON3_DOWN_MASK) == InputEvent.BUTTON3_DOWN_MASK)
+    if ((evt.getModifiers()
+            & InputEvent.BUTTON3_MASK) == InputEvent.BUTTON3_MASK)
     {
       if (!Platform.isMac()) // BH was excluding JavaScript
       {
@@ -220,7 +221,7 @@ public class OverviewPanel extends Panel implements Runnable,
    */
   public void updateOverviewImage()
   {
-    if (oviewCanvas == null)
+    if (canvas == null)
     {
       /*
        * panel has been disposed
@@ -239,7 +240,7 @@ public class OverviewPanel extends Panel implements Runnable,
     {
       if (updateRunning)
       {
-        oviewCanvas.restartDraw();
+        canvas.restartDraw();
         return;
       }
 
@@ -254,11 +255,11 @@ public class OverviewPanel extends Panel implements Runnable,
   @Override
   public void run()
   {
-    oviewCanvas.draw(av.isShowSequenceFeatures(),
+    setBoxPosition();
+    canvas.draw(av.isShowSequenceFeatures(),
             (av.isShowAnnotation()
                     && av.getAlignmentConservationAnnotation() != null),
             ap.seqPanel.seqCanvas.getFeatureRenderer());
-    setBoxPosition();
   }
 
   /**
@@ -321,7 +322,7 @@ public class OverviewPanel extends Panel implements Runnable,
               (av.isShowAnnotation()
                       && av.getAlignmentConservationAnnotation() != null));
     }
-    oviewCanvas.resetOviewDims(od);
+    canvas.resetOviewDims(od);
     updateOverviewImage();
   }
 
@@ -339,11 +340,11 @@ public class OverviewPanel extends Panel implements Runnable,
     } finally
     {
       av = null;
-      if (oviewCanvas != null)
+      if (canvas != null)
       {
-        oviewCanvas.dispose();
+        canvas.dispose();
       }
-      oviewCanvas = null;
+      canvas = null;
       ap = null;
       od = null;
     }