X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FAppletJmolBinding.java;h=009cefd90f6c8bd38ab42c2420724924ff2276ac;hb=3b37db6ed63140990a6cf5a7d36875b94e90a5df;hp=9299af23d52eae0b2080899f6fee5ba1d590a3bc;hpb=8449a33e712dfec13771d4e1b8be20bf625f190b;p=jalview.git

diff --git a/src/jalview/appletgui/AppletJmolBinding.java b/src/jalview/appletgui/AppletJmolBinding.java
index 9299af2..009cefd 100644
--- a/src/jalview/appletgui/AppletJmolBinding.java
+++ b/src/jalview/appletgui/AppletJmolBinding.java
@@ -1,13 +1,31 @@
-/**
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.6)
+ * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
  * 
+ * This file is part of Jalview.
+ * 
+ * Jalview is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * 
+ * Jalview is distributed in the hope that it will be useful, but 
+ * WITHOUT ANY WARRANTY; without even the implied warranty 
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+ * PURPOSE.  See the GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
  */
 package jalview.appletgui;
 
+import java.awt.Container;
 import java.util.BitSet;
 
 import jalview.datamodel.PDBEntry;
 import jalview.datamodel.SequenceI;
 
+import org.jmol.api.JmolAppConsoleInterface;
+import org.jmol.api.JmolViewer;
+import org.jmol.applet.AppletConsole;
 import org.jmol.popup.JmolPopup;
 
 class AppletJmolBinding extends jalview.ext.jmol.JalviewJmolBinding
@@ -18,8 +36,8 @@ class AppletJmolBinding extends jalview.ext.jmol.JalviewJmolBinding
    */
   private AppletJmol appletJmolBinding;
 
-  public AppletJmolBinding(AppletJmol appletJmol, PDBEntry[] pdbentry, SequenceI[] seq,
-          String[] chains, String protocol)
+  public AppletJmolBinding(AppletJmol appletJmol, PDBEntry[] pdbentry,
+          SequenceI[][] seq, String[][] chains, String protocol)
   {
     super(pdbentry, seq, chains, protocol);
     appletJmolBinding = appletJmol;
@@ -31,10 +49,13 @@ class AppletJmolBinding extends jalview.ext.jmol.JalviewJmolBinding
     {
       if (appletJmolBinding.fr == null)
       {
-        appletJmolBinding.fr = new jalview.appletgui.FeatureRenderer(appletJmolBinding.ap.av);
+        appletJmolBinding.fr = new jalview.appletgui.FeatureRenderer(
+                appletJmolBinding.ap.av);
       }
 
-      appletJmolBinding.fr.transferSettings(appletJmolBinding.ap.seqPanel.seqCanvas.getFeatureRenderer());
+      appletJmolBinding.fr
+              .transferSettings(appletJmolBinding.ap.seqPanel.seqCanvas
+                      .getFeatureRenderer());
     }
 
     return appletJmolBinding.fr;
@@ -72,7 +93,7 @@ class AppletJmolBinding extends jalview.ext.jmol.JalviewJmolBinding
   {
     appletJmolBinding.updateTitleAndMenus();
   }
-  
+
   public void updateColours(Object source)
   {
     AlignmentPanel ap = (AlignmentPanel) source;
@@ -83,17 +104,19 @@ class AppletJmolBinding extends jalview.ext.jmol.JalviewJmolBinding
   {
     try
     {
-      appletJmolBinding.ap.av.applet.getAppletContext().showDocument(new java.net.URL(url),
-              "jmol");
+      appletJmolBinding.ap.av.applet.getAppletContext().showDocument(
+              new java.net.URL(url), "jmol");
     } catch (java.net.MalformedURLException ex)
     {
     }
   }
 
-  public void newJmolPopup(boolean translateLocale, String menuName, boolean asPopup)
+  public void newJmolPopup(boolean translateLocale, String menuName,
+          boolean asPopup)
   {
-    
-    jmolpopup = JmolPopup.newJmolPopup(viewer,translateLocale, menuName,asPopup);
+
+    jmolpopup = JmolPopup.newJmolPopup(viewer, translateLocale, menuName,
+            asPopup);
   }
 
   public void notifyScriptTermination(String strStatus, int msWalltime)
@@ -104,13 +127,46 @@ class AppletJmolBinding extends jalview.ext.jmol.JalviewJmolBinding
   public void selectionChanged(BitSet arg0)
   {
     // TODO Auto-generated method stub
-    
+
   }
 
   public void refreshPdbEntries()
   {
     // TODO Auto-generated method stub
-    
+
+  }
+
+  @Override
+  public void showConsole(boolean show)
+  {
+    appletJmolBinding.showConsole(show);
+  }
+
+  @Override
+  protected JmolAppConsoleInterface createJmolConsole(JmolViewer viewer2,
+          Container consolePanel, String buttonsToShow)
+  {
+    return new AppletConsole(viewer2, consolePanel);
+  }
+
+  @Override
+  protected void releaseUIResources()
+  {
+    appletJmolBinding = null;
+    if (console != null)
+    {
+      try
+      {
+        console.setVisible(false);
+      } catch (Error e)
+      {
+      } catch (Exception x)
+      {
+      }
+      ;
+      console = null;
+    }
+
   }
 
-}
\ No newline at end of file
+}