streamlined app and applet jmol console + event handling via component listener

[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 31f91ee..09303c7 100644 (file)
--- a/src/jalview/ext/jmol/JalviewJmolBinding.java
+++ b/src/jalview/ext/jmol/JalviewJmolBinding.java
@@ -43,7 +43,7 @@ import org.jmol.viewer.Viewer;
 import jalview.schemes.*;
 
 public abstract class JalviewJmolBinding implements StructureListener,
-        JmolStatusListener, SequenceStructureBinding, JmolSelectionListener
+        JmolStatusListener, SequenceStructureBinding, JmolSelectionListener, ComponentListener
 
 {
   /**
@@ -1348,75 +1348,44 @@ public abstract class JalviewJmolBinding implements StructureListener,
             commandOptions, this);
 
     console = createJmolConsole(viewer, consolePanel, buttonsToShow);
-    if (console != null)
+    if (consolePanel != null)
     {
-      viewer.setConsole(new JmolAppConsoleInterface()
-      {
-
-        @Override
-        public JmolScriptEditorInterface getScriptEditor()
-        {
-          return console.getScriptEditor();
-        }
-
-        @Override
-        public JmolAppConsoleInterface getAppConsole(Viewer viewer,
-                Component display)
-        {
-          return console;
-        }
-
-        public String getText()
-        {
-          return console.getText();
-        }
-
-        @Override
-        public Object getMyMenuBar()
-        {
-          return console.getMyMenuBar();
-        }
-
-        @Override
-        public void setVisible(boolean b)
-        {
-          showConsole(b);
-        }
+      consolePanel.addComponentListener(this);
+      
+    }
 
-        @Override
-        public void sendConsoleEcho(String strEcho)
-        {
-          console.sendConsoleEcho(strEcho);
 
-        }
+  }
 
-        @Override
-        public void sendConsoleMessage(String strInfo)
-        {
-          console.sendConsoleMessage(strInfo);
-        }
+  protected abstract JmolAppConsoleInterface createJmolConsole(
+          JmolViewer viewer2, Container consolePanel, String buttonsToShow);
 
-        @Override
-        public void zap()
-        {
-          console.zap();
-        }
+  protected org.jmol.api.JmolAppConsoleInterface console = null;
 
-        @Override
-        public void dispose()
-        {
-          console.dispose();
-        }
+@Override
+public void componentResized(ComponentEvent e)
+{
+  
+}
 
-      });
-    }
+@Override
+public void componentMoved(ComponentEvent e)
+{
+  
+}
 
-  }
+@Override
+public void componentShown(ComponentEvent e)
+{
+  showConsole(true);
+}
 
-  protected abstract JmolAppConsoleInterface createJmolConsole(
-          JmolViewer viewer2, Container consolePanel, String buttonsToShow);
+@Override
+public void componentHidden(ComponentEvent e)
+{
+  showConsole(false);
+}
 
-  protected org.jmol.api.JmolAppConsoleInterface console = null;
 
   public void setLoadingFromArchive(boolean loadingFromArchive)
   {