From 9b600c9d9f31e24560ca460bfe214e15bfe90408 Mon Sep 17 00:00:00 2001 From: gmungoc Date: Wed, 13 Sep 2017 10:01:36 +0100 Subject: [PATCH 1/1] JAL-2727 null additional references on close --- src/jalview/gui/AlignmentPanel.java | 4 ++-- src/jalview/viewmodel/AlignmentViewport.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/jalview/gui/AlignmentPanel.java b/src/jalview/gui/AlignmentPanel.java index 9b74007..c8a0e1a 100644 --- a/src/jalview/gui/AlignmentPanel.java +++ b/src/jalview/gui/AlignmentPanel.java @@ -1621,8 +1621,8 @@ public class AlignmentPanel extends GAlignmentPanel implements if (av != null) { av.removePropertyChangeListener(propertyChangeListener); - jalview.structure.StructureSelectionManager ssm = av - .getStructureSelectionManager(); + propertyChangeListener = null; + StructureSelectionManager ssm = av.getStructureSelectionManager(); ssm.removeStructureViewerListener(getSeqPanel(), null); ssm.removeSelectionListener(getSeqPanel()); ssm.removeCommandListener(av); diff --git a/src/jalview/viewmodel/AlignmentViewport.java b/src/jalview/viewmodel/AlignmentViewport.java index a66855e..a8afe9a 100644 --- a/src/jalview/viewmodel/AlignmentViewport.java +++ b/src/jalview/viewmodel/AlignmentViewport.java @@ -948,11 +948,11 @@ public abstract class AlignmentViewport groupConsensus = null; groupConservation = null; hconsensus = null; + hconservation = null; hcomplementConsensus = null; gapcounts = null; - // colour scheme may hold reference to consensus - residueShading = null; - // TODO remove listeners from changeSupport? + calculator = null; + residueShading = null; // may hold a reference to Consensus changeSupport = null; ranges = null; setAlignment(null); -- 1.7.10.2