import javax.swing.SwingUtilities;
-@SuppressWarnings("serial")
public class OverviewPanel extends Panel implements Runnable,
MouseMotionListener, MouseListener, ViewportListenerI
{
- OverviewDimensions od;
+ private OverviewDimensions od;
- OverviewCanvas canvas;
+ private OverviewCanvas oviewCanvas;
private AlignViewport av;
- AlignmentPanel ap;
+ private AlignmentPanel ap;
private boolean showHidden = true;
(av.isShowAnnotation()
&& av.getSequenceConsensusHash() != null));
- canvas = new OverviewCanvas(this, od, av);
+ oviewCanvas = new OverviewCanvas(od, av);
setLayout(new BorderLayout());
- add(canvas, BorderLayout.CENTER);
+ add(oviewCanvas, BorderLayout.CENTER);
setSize(new Dimension(od.getWidth(), od.getHeight()));
@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);
}
@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
{
@Override
public void mouseDragged(MouseEvent evt)
{
- if (Platform.isWinRightButton(evt))
+ if (Platform.isWinRightButton(evt))
{
- showPopupMenu(evt);
- return;
+ if ((evt.getModifiersEx()
+ & InputEvent.BUTTON3_DOWN_MASK) == InputEvent.BUTTON3_DOWN_MASK)
+ {
+ showPopupMenu(evt);
+ return;
+ }
}
if (SwingUtilities.isRightMouseButton(evt))
*/
public void updateOverviewImage()
{
- if (canvas == null)
+ if (oviewCanvas == null)
{
/*
* panel has been disposed
{
if (updateRunning)
{
- canvas.restartDraw();
+ oviewCanvas.restartDraw();
return;
}
@Override
public void run()
{
- canvas.draw(av.isShowSequenceFeatures(),
+ oviewCanvas.draw(av.isShowSequenceFeatures(),
(av.isShowAnnotation()
&& av.getAlignmentConservationAnnotation() != null),
ap.seqPanel.seqCanvas.getFeatureRenderer());
(av.isShowAnnotation()
&& av.getAlignmentConservationAnnotation() != null));
}
- canvas.resetOviewDims(od);
+ oviewCanvas.resetOviewDims(od);
updateOverviewImage();
}
} finally
{
av = null;
- if (canvas != null)
+ if (oviewCanvas != null)
{
- canvas.dispose();
+ oviewCanvas.dispose();
}
- canvas = null;
+ oviewCanvas = null;
ap = null;
od = null;
}