From 5af8112b583306236ff312b22a9a5c011b4761a9 Mon Sep 17 00:00:00 2001 From: gmungoc Date: Thu, 23 Jun 2016 15:26:03 +0100 Subject: [PATCH] JAL-2130 now simply viewer.dispose() to close down Jmol threads --- src/jalview/ext/jmol/JalviewJmolBinding.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/jalview/ext/jmol/JalviewJmolBinding.java b/src/jalview/ext/jmol/JalviewJmolBinding.java index 2133f2b..2ccf118 100644 --- a/src/jalview/ext/jmol/JalviewJmolBinding.java +++ b/src/jalview/ext/jmol/JalviewJmolBinding.java @@ -57,7 +57,6 @@ import org.jmol.api.JmolStatusListener; import org.jmol.api.JmolViewer; import org.jmol.c.CBK; import org.jmol.script.T; -import org.jmol.viewer.JC; import org.jmol.viewer.Viewer; public abstract class JalviewJmolBinding extends AAStructureBindingModel @@ -170,13 +169,9 @@ public abstract class JalviewJmolBinding extends AAStructureBindingModel public void closeViewer() { - viewer.acm.setModeMouse(JC.MOUSE_NONE); // remove listeners for all structures in viewer getSsm().removeStructureViewerListener(this, this.getPdbFile()); - // and shut down jmol - viewer.evalStringQuiet("zap"); - viewer.setJmolStatusListener(null); - viewer.dispose(); + viewer.dispose(); lastCommand = null; viewer = null; releaseUIResources(); -- 1.7.10.2