X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fext%2Fjmol%2FJalviewJmolBinding.java;h=8e723807051d6bc0460792f7059ca10e75bea361;hb=e683768e084c5e2999846de881b3903f62417919;hp=c852a1a677f5c651807c0f1aa1d3c42bcc8422be;hpb=aac22d1fe816d7f0399e227a3a2e6ad87a94beea;p=jalview.git diff --git a/src/jalview/ext/jmol/JalviewJmolBinding.java b/src/jalview/ext/jmol/JalviewJmolBinding.java index c852a1a..8e72380 100644 --- a/src/jalview/ext/jmol/JalviewJmolBinding.java +++ b/src/jalview/ext/jmol/JalviewJmolBinding.java @@ -39,7 +39,6 @@ import org.jmol.adapter.smarter.SmarterJmolAdapter; import org.jmol.popup.*; import org.jmol.viewer.JmolConstants; import org.jmol.viewer.Viewer; -import org.openscience.jmol.app.jmolpanel.AppConsole; import jalview.schemes.*; @@ -1333,8 +1332,10 @@ public abstract class JalviewJmolBinding implements StructureListener, (jmolfileio ? new SmarterJmolAdapter() : null), htmlName + ((Object) this).toString(), documentBase, codeBase, commandOptions, this); - console = new AppConsole(viewer, null, consolePanel, + + console = createJmolConsole(viewer, consolePanel, buttonsToShow); + viewer.setConsole(new JmolAppConsoleInterface() { @Override @@ -1398,6 +1399,9 @@ public abstract class JalviewJmolBinding implements StructureListener, } + protected abstract JmolAppConsoleInterface createJmolConsole(JmolViewer viewer2, + Container consolePanel, String buttonsToShow); + protected org.jmol.api.JmolAppConsoleInterface console = null; public void setLoadingFromArchive(boolean loadingFromArchive)