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 remote-tracking branch 'origin/develop' into
[jalview.git]
/
src
/
jalview
/
gui
/
AlignmentPanel.java
diff --git
a/src/jalview/gui/AlignmentPanel.java
b/src/jalview/gui/AlignmentPanel.java
index
6517e70
..
949376d
100644
(file)
--- a/
src/jalview/gui/AlignmentPanel.java
+++ b/
src/jalview/gui/AlignmentPanel.java
@@
-94,9
+94,7
@@
public class AlignmentPanel extends GAlignmentPanel implements
* Creates a new AlignmentPanel object.
*
* @param af
* Creates a new AlignmentPanel object.
*
* @param af
- * DOCUMENT ME!
* @param av
* @param av
- * DOCUMENT ME!
*/
public AlignmentPanel(AlignFrame af, final AlignViewport av)
{
*/
public AlignmentPanel(AlignFrame af, final AlignViewport av)
{
@@
-652,7
+650,6
@@
public class AlignmentPanel extends GAlignmentPanel implements
*/
public void adjustmentValueChanged(AdjustmentEvent evt)
{
*/
public void adjustmentValueChanged(AdjustmentEvent evt)
{
-
int oldX = av.getStartRes();
int oldY = av.getStartSeq();
int oldX = av.getStartRes();
int oldY = av.getStartSeq();
@@
-1149,8
+1146,7
@@
public class AlignmentPanel extends GAlignmentPanel implements
if (alignFrame != null && !headless)
{
alignFrame.setProgressBar(MessageManager.formatMessage(
if (alignFrame != null && !headless)
{
alignFrame.setProgressBar(MessageManager.formatMessage(
- "status.saving_file",
- new String[]
+ "status.saving_file", new Object[]
{ type.getLabel() }), progress);
}
try
{ type.getLabel() }), progress);
}
try
@@
-1474,6
+1470,9
@@
public class AlignmentPanel extends GAlignmentPanel implements
.getStructureSelectionManager();
ssm.removeStructureViewerListener(getSeqPanel(), null);
ssm.removeSelectionListener(getSeqPanel());
.getStructureSelectionManager();
ssm.removeStructureViewerListener(getSeqPanel(), null);
ssm.removeSelectionListener(getSeqPanel());
+ ssm.removeEditListener(av);
+ ssm.removeStructureViewerListener(getSeqPanel(), null);
+ ssm.removeSelectionListener(getSeqPanel());
av.setAlignment(null);
av = null;
}
av.setAlignment(null);
av = null;
}