git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
ed671cc
be29912
)
Merge branch 'features/JAL-2608closeOverview' into develop
author
Jim Procter
<jprocter@issues.jalview.org>
Tue, 24 Oct 2017 16:09:42 +0000
(17:09 +0100)
committer
Jim Procter
<jprocter@issues.jalview.org>
Tue, 24 Oct 2017 16:09:42 +0000
(17:09 +0100)
1
2
src/jalview/appletgui/AlignFrame.java
patch
|
diff1
|
diff2
|
blob
|
history
src/jalview/appletgui/OverviewPanel.java
patch
|
diff1
|
diff2
|
blob
|
history
src/jalview/gui/AlignmentPanel.java
patch
|
diff1
|
diff2
|
blob
|
history
src/jalview/gui/OverviewPanel.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/jalview/appletgui/AlignFrame.java
Simple merge
diff --cc
src/jalview/appletgui/OverviewPanel.java
Simple merge
diff --cc
src/jalview/gui/AlignmentPanel.java
Simple merge
diff --cc
src/jalview/gui/OverviewPanel.java
index
51d7a84
,
7cbe8b7
..
9ddb751
---
1
/
src/jalview/gui/OverviewPanel.java
---
2
/
src/jalview/gui/OverviewPanel.java
+++ b/
src/jalview/gui/OverviewPanel.java
@@@
-350,11
-318,22
+352,25
@@@
public class OverviewPanel extends JPan
{
try
{
- av.getRanges().removePropertyChangeListener(this);
+ if (av != null)
+ {
+ av.getRanges().removePropertyChangeListener(this);
+ }
+
+ oviewCanvas.dispose();
++
+ /*
+ * close the parent frame (which also removes it from the
+ * Desktop Windows menu)
+ */
+ ((JInternalFrame) SwingUtilities.getAncestorOfClass(
+ JInternalFrame.class, (this))).setClosed(true);
+ } catch (PropertyVetoException e)
+ {
+ // ignore
} finally
{
+ progressPanel = null;
av = null;
oviewCanvas = null;
ap = null;