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
Merge branch 'documentation/JAL-2418_release2102' into develop
[jalview.git]
/
src
/
jalview
/
gui
/
OverviewPanel.java
diff --git
a/src/jalview/gui/OverviewPanel.java
b/src/jalview/gui/OverviewPanel.java
index
a5441a2
..
7a4456e
100755
(executable)
--- a/
src/jalview/gui/OverviewPanel.java
+++ b/
src/jalview/gui/OverviewPanel.java
@@
-80,6
+80,8
@@
public class OverviewPanel extends JPanel implements Runnable,
(av.isShowAnnotation() && av
.getAlignmentConservationAnnotation() != null));
(av.isShowAnnotation() && av
.getAlignmentConservationAnnotation() != null));
+ setSize(od.getWidth(), od.getHeight());
+
oviewCanvas = new OverviewCanvas(od, av);
setLayout(new BorderLayout());
add(oviewCanvas, BorderLayout.CENTER);
oviewCanvas = new OverviewCanvas(od, av);
setLayout(new BorderLayout());
add(oviewCanvas, BorderLayout.CENTER);
@@
-105,13
+107,11
@@
public class OverviewPanel extends JPanel implements Runnable,
@Override
public void mouseDragged(MouseEvent evt)
{
@Override
public void mouseDragged(MouseEvent evt)
{
- if (!SwingUtilities.isRightMouseButton(evt)
- && !av.getWrapAlignment())
+ if (!SwingUtilities.isRightMouseButton(evt))
{
od.updateViewportFromMouse(evt.getX(), evt.getY(), av
.getAlignment().getHiddenSequences(), av.getAlignment()
.getHiddenColumns());
{
od.updateViewportFromMouse(evt.getX(), evt.getY(), av
.getAlignment().getHiddenSequences(), av.getAlignment()
.getHiddenColumns());
-
}
}
});
}
}
});
@@
-128,7
+128,8
@@
public class OverviewPanel extends JPanel implements Runnable,
showPopupMenu(evt);
}
}
showPopupMenu(evt);
}
}
- else if (!av.getWrapAlignment())
+ else
+ // if (!av.getWrapAlignment())
{
od.updateViewportFromMouse(evt.getX(), evt.getY(), av
.getAlignment().getHiddenSequences(), av.getAlignment()
{
od.updateViewportFromMouse(evt.getX(), evt.getY(), av
.getAlignment().getHiddenSequences(), av.getAlignment()
@@
-146,7
+147,6
@@
public class OverviewPanel extends JPanel implements Runnable,
}
});
}
});
-
updateOverviewImage();
}
updateOverviewImage();
}
@@
-204,6
+204,14
@@
public class OverviewPanel extends JPanel implements Runnable,
*/
public void updateOverviewImage()
{
*/
public void updateOverviewImage()
{
+ if (oviewCanvas == null)
+ {
+ /*
+ * panel has been disposed
+ */
+ return;
+ }
+
if ((getWidth() > 0) && (getHeight() > 0))
{
od.setWidth(getWidth());
if ((getWidth() > 0) && (getHeight() > 0))
{
od.setWidth(getWidth());
@@
-220,7
+228,6
@@
public class OverviewPanel extends JPanel implements Runnable,
Thread thread = new Thread(this);
thread.start();
repaint();
Thread thread = new Thread(this);
thread.start();
repaint();
-
}
@Override
}
@Override
@@
-250,4
+257,21
@@
public class OverviewPanel extends JPanel implements Runnable,
{
setBoxPosition();
}
{
setBoxPosition();
}
+
+ /**
+ * Removes this object as a property change listener, and nulls references
+ */
+ protected void dispose()
+ {
+ try
+ {
+ av.getRanges().removePropertyChangeListener(this);
+ } finally
+ {
+ av = null;
+ oviewCanvas = null;
+ ap = null;
+ od = null;
+ }
+ }
}
}