git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-3210 Barebones gradle/buildship/eclipse. See README
[jalview.git]
/
src
/
jalview
/
appletgui
/
OverviewPanel.java
diff --git
a/src/jalview/appletgui/OverviewPanel.java
b/src/jalview/appletgui/OverviewPanel.java
index
328841c
..
ddb49f1
100755
(executable)
--- a/
src/jalview/appletgui/OverviewPanel.java
+++ b/
src/jalview/appletgui/OverviewPanel.java
@@
-46,17
+46,16
@@
import java.beans.PropertyChangeEvent;
import javax.swing.SwingUtilities;
import javax.swing.SwingUtilities;
-@SuppressWarnings("serial")
public class OverviewPanel extends Panel implements Runnable,
MouseMotionListener, MouseListener, ViewportListenerI
{
public class OverviewPanel extends Panel implements Runnable,
MouseMotionListener, MouseListener, ViewportListenerI
{
- OverviewDimensions od;
+ private OverviewDimensions od;
- OverviewCanvas canvas;
+ private OverviewCanvas oviewCanvas;
private AlignViewport av;
private AlignViewport av;
- AlignmentPanel ap;
+ private AlignmentPanel ap;
private boolean showHidden = true;
private boolean showHidden = true;
@@
-74,9
+73,9
@@
public class OverviewPanel extends Panel implements Runnable,
(av.isShowAnnotation()
&& av.getSequenceConsensusHash() != null));
(av.isShowAnnotation()
&& av.getSequenceConsensusHash() != null));
- canvas = new OverviewCanvas(this, od, av);
+ oviewCanvas = new OverviewCanvas(od, av);
setLayout(new BorderLayout());
setLayout(new BorderLayout());
- add(canvas, BorderLayout.CENTER);
+ add(oviewCanvas, BorderLayout.CENTER);
setSize(new Dimension(od.getWidth(), od.getHeight()));
setSize(new Dimension(od.getWidth(), od.getHeight()));
@@
-117,8
+116,8
@@
public class OverviewPanel extends Panel implements Runnable,
@Override
public void mouseClicked(MouseEvent evt)
{
@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);
}
{
showPopupMenu(evt);
}
@@
-143,8
+142,8
@@
public class OverviewPanel extends Panel implements Runnable,
@Override
public void mousePressed(MouseEvent 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
{
{
if (!Platform.isMac()) // BH was excluding JavaScript
{
@@
-188,10
+187,14
@@
public class OverviewPanel extends Panel implements Runnable,
@Override
public void mouseDragged(MouseEvent evt)
{
@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))
}
if (SwingUtilities.isRightMouseButton(evt))
@@
-221,7
+224,7
@@
public class OverviewPanel extends Panel implements Runnable,
*/
public void updateOverviewImage()
{
*/
public void updateOverviewImage()
{
- if (canvas == null)
+ if (oviewCanvas == null)
{
/*
* panel has been disposed
{
/*
* panel has been disposed
@@
-240,7
+243,7
@@
public class OverviewPanel extends Panel implements Runnable,
{
if (updateRunning)
{
{
if (updateRunning)
{
- canvas.restartDraw();
+ oviewCanvas.restartDraw();
return;
}
return;
}
@@
-255,11
+258,11
@@
public class OverviewPanel extends Panel implements Runnable,
@Override
public void run()
{
@Override
public void run()
{
- setBoxPosition();
- canvas.draw(av.isShowSequenceFeatures(),
+ oviewCanvas.draw(av.isShowSequenceFeatures(),
(av.isShowAnnotation()
&& av.getAlignmentConservationAnnotation() != null),
ap.seqPanel.seqCanvas.getFeatureRenderer());
(av.isShowAnnotation()
&& av.getAlignmentConservationAnnotation() != null),
ap.seqPanel.seqCanvas.getFeatureRenderer());
+ setBoxPosition();
}
/**
}
/**
@@
-322,7
+325,7
@@
public class OverviewPanel extends Panel implements Runnable,
(av.isShowAnnotation()
&& av.getAlignmentConservationAnnotation() != null));
}
(av.isShowAnnotation()
&& av.getAlignmentConservationAnnotation() != null));
}
- canvas.resetOviewDims(od);
+ oviewCanvas.resetOviewDims(od);
updateOverviewImage();
}
updateOverviewImage();
}
@@
-340,11
+343,11
@@
public class OverviewPanel extends Panel implements Runnable,
} finally
{
av = null;
} finally
{
av = null;
- if (canvas != null)
+ if (oviewCanvas != null)
{
{
- canvas.dispose();
+ oviewCanvas.dispose();
}
}
- canvas = null;
+ oviewCanvas = null;
ap = null;
od = null;
}
ap = null;
od = null;
}