X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FPCAPanel.java;h=3512e4277b988002ce91af4b4098fff52b416854;hb=8dadf27423ca69874dc6a3c9d416974ba5ae767f;hp=3388d4df340b16d43aea53cd79b0505f2a17418c;hpb=5f7330e5fb8a2c16ff6543bc492cce458fb8274f;p=jalview.git diff --git a/src/jalview/gui/PCAPanel.java b/src/jalview/gui/PCAPanel.java index 3388d4d..3512e42 100644 --- a/src/jalview/gui/PCAPanel.java +++ b/src/jalview/gui/PCAPanel.java @@ -141,6 +141,12 @@ public class PCAPanel extends GPCAPanel protected void close_actionPerformed() { setPcaModel(null); + if (this.rc != null) + { + this.rc.sequencePoints = null; + this.rc.setAxisEndPoints(null); + this.rc = null; + } } @Override @@ -601,11 +607,11 @@ public class PCAPanel extends GPCAPanel // } // // JPanel progressPanel; - // Long lId = new Long(id); + // Long lId = Long.valueOf(id); // GridLayout layout = (GridLayout) statusPanel.getLayout(); // if (progressBars.get(lId) != null) // { - // progressPanel = (JPanel) progressBars.get(new Long(id)); + // progressPanel = (JPanel) progressBars.get(Long.valueOf(id)); // statusPanel.remove(progressPanel); // progressBars.remove(lId); // progressPanel = null; @@ -644,13 +650,13 @@ public class PCAPanel extends GPCAPanel final IProgressIndicatorHandler handler) { progressBar.registerHandler(id, handler); - // if (progressBarHandlers == null || !progressBars.contains(new Long(id))) + // if (progressBarHandlers == null || !progressBars.contains(Long.valueOf(id))) // { // throw new // Error(MessageManager.getString("error.call_setprogressbar_before_registering_handler")); // } - // progressBarHandlers.put(new Long(id), handler); - // final JPanel progressPanel = (JPanel) progressBars.get(new Long(id)); + // progressBarHandlers.put(Long.valueOf(id), handler); + // final JPanel progressPanel = (JPanel) progressBars.get(Long.valueOf(id)); // if (handler.canCancel()) // { // JButton cancel = new JButton(