refactored to remove App reference in Applet (JAL-638)

[jalview.git] / src / jalview / ext / jmol / JalviewJmolBinding.java

diff --git a/src/jalview/ext/jmol/JalviewJmolBinding.java b/src/jalview/ext/jmol/JalviewJmolBinding.java
index c852a1a..8e72380 100644 (file)
--- 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)