X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fext%2Fjmol%2FJmolParser.java;h=180da8f449f8044e4f522fb5f758a5dc1b4fd277;hb=2681593fa6810815547b688b89424c837cac1240;hp=c73657f8e3e1fc2e9f007f8a426b81eb1be30d73;hpb=e97cd6659f6bcac55dc030e770192b0044960dc5;p=jalview.git diff --git a/src/jalview/ext/jmol/JmolParser.java b/src/jalview/ext/jmol/JmolParser.java index c73657f..180da8f 100644 --- a/src/jalview/ext/jmol/JmolParser.java +++ b/src/jalview/ext/jmol/JmolParser.java @@ -38,8 +38,6 @@ import java.util.List; import java.util.Map; import java.util.Vector; -import javajs.awt.Dimension; - import org.jmol.api.JmolStatusListener; import org.jmol.api.JmolViewer; import org.jmol.c.CBK; @@ -124,12 +122,11 @@ public class JmolParser extends StructureFile implements JmolStatusListener try { /* - * params -o (output to sysout) -i (no info logging, less verbose) - * -n (nodisplay) -x (exit when finished) + * params -o (output to sysout) -n (nodisplay) -x (exit when finished) * see http://wiki.jmol.org/index.php/Jmol_Application */ viewer = (Viewer) JmolViewer.allocateViewer(null, null, null, null, - null, "-x -o -n -i", this); + null, "-x -o -n", this); // ensure the 'new' (DSSP) not 'old' (Ramachandran) SS method is used viewer.setBooleanProperty("defaultStructureDSSP", true); } catch (ClassCastException x) @@ -155,10 +152,12 @@ public class JmolParser extends StructureFile implements JmolStatusListener if (pdbId == null) { setId(safeName(getDataName())); + setPDBIdAvailable(false); } else { setId(pdbId); + setPDBIdAvailable(true); } List significantAtoms = convertSignificantAtoms(ms); for (Atom tmpatom : significantAtoms) @@ -625,7 +624,7 @@ public class JmolParser extends StructureFile implements JmolStatusListener * Not implemented - returns null */ @Override - public Dimension resizeInnerPanel(String data) + public int[] resizeInnerPanel(String data) { return null; }