From 231e656ad21658b53eda2237b61547db74894e51 Mon Sep 17 00:00:00 2001 From: gmungoc Date: Thu, 3 Sep 2015 14:36:50 +0100 Subject: [PATCH] JAL-1859 removed unneeded dependency on package not in Jmol applet lib --- src/jalview/ext/jmol/PDBFileWithJmol.java | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/src/jalview/ext/jmol/PDBFileWithJmol.java b/src/jalview/ext/jmol/PDBFileWithJmol.java index cb19769..ddfa1b0 100644 --- a/src/jalview/ext/jmol/PDBFileWithJmol.java +++ b/src/jalview/ext/jmol/PDBFileWithJmol.java @@ -45,7 +45,6 @@ import org.jmol.modelset.ModelSet; import org.jmol.modelsetbio.BioModel; import org.jmol.modelsetbio.BioPolymer; import org.jmol.viewer.Viewer; -import org.openscience.jmol.app.JmolApp; /** * Import and process PDB files with Jmol @@ -56,9 +55,6 @@ import org.openscience.jmol.app.JmolApp; public class PDBFileWithJmol extends AlignFile implements JmolStatusListener { - - JmolApp jmolApp = null; - Viewer viewer = null; public PDBFileWithJmol(String inFile, String type) throws IOException @@ -73,7 +69,6 @@ public class PDBFileWithJmol extends AlignFile implements public PDBFileWithJmol() { - // TODO Auto-generated constructor stub } /** @@ -84,18 +79,11 @@ public class PDBFileWithJmol extends AlignFile implements private Viewer getJmolData() { if (viewer == null) - { // note that -o -n -x are all implied // TODO check for Jmol 14.2 - jmolApp = new JmolApp(); - jmolApp.isDataOnly = true; - jmolApp.haveConsole = false; - jmolApp.haveDisplay = false; + { try { viewer = (Viewer) JmolViewer.allocateViewer(null, null, null, null, null, "-x -o -n", this); - viewer.setScreenDimension(jmolApp.startupWidth, - jmolApp.startupHeight); - jmolApp.startViewer(viewer, null, false); } catch (ClassCastException x) { throw new Error(MessageManager.formatMessage("error.jmol_version_not_compatible_with_jalview_version", new String[]{JmolViewer.getJmolVersion()}), -- 1.7.10.2