From: jprocter Date: Fri, 4 Nov 2011 15:39:27 +0000 (+0000) Subject: (JAL-980,JAL-982) - applet console only allows console to be popped up in own window X-Git-Tag: Archived_Release_2_7~20^2~1 X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=commitdiff_plain;h=966863a176d02eb6182ff5df1e755ec8757b9899 (JAL-980,JAL-982) - applet console only allows console to be popped up in own window --- diff --git a/appletlib/JmolApplet-12.2.16452.jar b/appletlib/JmolApplet-12.2.16452.jar deleted file mode 100644 index 697c8ce..0000000 Binary files a/appletlib/JmolApplet-12.2.16452.jar and /dev/null differ diff --git a/lib/Jmol-12.2.16452.jar b/lib/Jmol-12.2.16452.jar deleted file mode 100644 index 7ed37f1..0000000 Binary files a/lib/Jmol-12.2.16452.jar and /dev/null differ diff --git a/src/jalview/appletgui/AppletJmolBinding.java b/src/jalview/appletgui/AppletJmolBinding.java index 3750c20..808e30b 100644 --- a/src/jalview/appletgui/AppletJmolBinding.java +++ b/src/jalview/appletgui/AppletJmolBinding.java @@ -149,7 +149,9 @@ class AppletJmolBinding extends jalview.ext.jmol.JalviewJmolBinding protected JmolAppConsoleInterface createJmolConsole(JmolViewer viewer2, Container consolePanel, String buttonsToShow) { - return new AppletConsole(viewer2, consolePanel); + //return new org.jmol.console.AppletConsole(viewer2, consolePanel); + JmolAppConsoleInterface appc = new org.jmol.console.AppletConsole().getAppConsole(viewer2); + return appc; } @Override