apply jalview code style

[jalview.git] / src / jalview / gui / AppJmolBinding.java

diff --git a/src/jalview/gui/AppJmolBinding.java b/src/jalview/gui/AppJmolBinding.java
index 2a0e2a7..ed56ebb 100644 (file)
--- a/src/jalview/gui/AppJmolBinding.java
+++ b/src/jalview/gui/AppJmolBinding.java
@@ -1,8 +1,27 @@
-/**
+/*
+ * 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.gui;
 
+import java.awt.Container;
+import java.awt.event.ComponentEvent;
+import java.awt.event.ComponentListener;
+import java.awt.event.ContainerEvent;
+import java.awt.event.ContainerListener;
 import java.util.BitSet;
 
 import javax.swing.JPanel;
@@ -11,6 +30,8 @@ import jalview.bin.Cache;
 import jalview.datamodel.PDBEntry;
 import jalview.datamodel.SequenceI;
 
+import org.jmol.api.JmolAppConsoleInterface;
+import org.jmol.api.JmolViewer;
 import org.jmol.popup.JmolPopup;
 import org.openscience.jmol.app.jmolpanel.AppConsole;
 
@@ -89,11 +110,14 @@ public class AppJmolBinding extends jalview.ext.jmol.JalviewJmolBinding
   public void refreshGUI()
   {
     // appJmolWindow.repaint();
-    javax.swing.SwingUtilities.invokeLater(new Runnable() {
-      public void run() {
+    javax.swing.SwingUtilities.invokeLater(new Runnable()
+    {
+      public void run()
+      {
         appJmolWindow.updateTitleAndMenus();
         appJmolWindow.revalidate();
-      }});
+      }
+    });
   }
 
   public void updateColours(Object source)
@@ -108,9 +132,9 @@ public class AppJmolBinding extends jalview.ext.jmol.JalviewJmolBinding
   public void notifyScriptTermination(String strStatus, int msWalltime)
   {
     // todo - script termination doesn't happen ?
-    //if (console != null)
-      //console.notifyScriptTermination(strStatus,
-      //        msWalltime);
+    // if (console != null)
+    // console.notifyScriptTermination(strStatus,
+    // msWalltime);
   }
 
   public void showUrl(String url)
@@ -138,7 +162,8 @@ public class AppJmolBinding extends jalview.ext.jmol.JalviewJmolBinding
 
   }
 
-  public void showConsole(boolean b) {
+  public void showConsole(boolean b)
+  {
     appJmolWindow.showConsole(b);
   }
 
@@ -160,4 +185,31 @@ public class AppJmolBinding extends jalview.ext.jmol.JalviewJmolBinding
       }
     }
   }
-}
\ No newline at end of file
+
+  @Override
+  protected JmolAppConsoleInterface createJmolConsole(JmolViewer viewer2,
+          Container consolePanel, String buttonsToShow)
+  {
+    return new AppConsole(viewer, consolePanel, buttonsToShow);
+  }
+
+  @Override
+  protected void releaseUIResources()
+  {
+    appJmolWindow = null;
+    if (console != null)
+    {
+      try
+      {
+        console.setVisible(false);
+      } catch (Error e)
+      {
+      } catch (Exception x)
+      {
+      }
+      ;
+      console = null;
+    }
+
+  }
+}