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-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
4e69399
..
ef684f7
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;
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
{
- private OverviewDimensions od;
+ OverviewDimensions od;
- private OverviewCanvas oviewCanvas;
+ OverviewCanvas canvas;
private AlignViewport av;
private AlignViewport av;
- private AlignmentPanel ap;
+ AlignmentPanel ap;
private boolean showHidden = true;
private boolean showHidden = true;
@@
-73,9
+74,9
@@
public class OverviewPanel extends Panel implements Runnable,
(av.isShowAnnotation()
&& av.getSequenceConsensusHash() != null));
(av.isShowAnnotation()
&& av.getSequenceConsensusHash() != null));
- oviewCanvas = new OverviewCanvas(od, av);
+ canvas = new OverviewCanvas(this, od, av);
setLayout(new BorderLayout());
setLayout(new BorderLayout());
- add(oviewCanvas, BorderLayout.CENTER);
+ add(canvas, BorderLayout.CENTER);
setSize(new Dimension(od.getWidth(), od.getHeight()));
setSize(new Dimension(od.getWidth(), od.getHeight()));
@@
-220,7
+221,7
@@
public class OverviewPanel extends Panel implements Runnable,
*/
public void updateOverviewImage()
{
*/
public void updateOverviewImage()
{
- if (oviewCanvas == null)
+ if (canvas == null)
{
/*
* panel has been disposed
{
/*
* panel has been disposed
@@
-239,7
+240,7
@@
public class OverviewPanel extends Panel implements Runnable,
{
if (updateRunning)
{
{
if (updateRunning)
{
- oviewCanvas.restartDraw();
+ canvas.restartDraw();
return;
}
return;
}
@@
-254,7
+255,7
@@
public class OverviewPanel extends Panel implements Runnable,
@Override
public void run()
{
@Override
public void run()
{
- oviewCanvas.draw(av.isShowSequenceFeatures(),
+ canvas.draw(av.isShowSequenceFeatures(),
(av.isShowAnnotation()
&& av.getAlignmentConservationAnnotation() != null),
ap.seqPanel.seqCanvas.getFeatureRenderer());
(av.isShowAnnotation()
&& av.getAlignmentConservationAnnotation() != null),
ap.seqPanel.seqCanvas.getFeatureRenderer());
@@
-321,7
+322,7
@@
public class OverviewPanel extends Panel implements Runnable,
(av.isShowAnnotation()
&& av.getAlignmentConservationAnnotation() != null));
}
(av.isShowAnnotation()
&& av.getAlignmentConservationAnnotation() != null));
}
- oviewCanvas.resetOviewDims(od);
+ canvas.resetOviewDims(od);
updateOverviewImage();
}
updateOverviewImage();
}
@@
-339,11
+340,11
@@
public class OverviewPanel extends Panel implements Runnable,
} finally
{
av = null;
} finally
{
av = null;
- if (oviewCanvas != null)
+ if (canvas != null)
{
{
- oviewCanvas.dispose();
+ canvas.dispose();
}
}
- oviewCanvas = null;
+ canvas = null;
ap = null;
od = null;
}
ap = null;
od = null;
}