X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FAppJmolBinding.java;h=ed56ebb00b2ce935ccaaa517e2e423db66a463fe;hb=c2240c3de557b1845565cc458b5738e88103c3aa;hp=38c9e704720b144c2e45c8547d82d5631a967c85;hpb=153dd62dc91da13ae732600e6ea55ddbe15eab39;p=jalview.git diff --git a/src/jalview/gui/AppJmolBinding.java b/src/jalview/gui/AppJmolBinding.java index 38c9e70..ed56ebb 100644 --- a/src/jalview/gui/AppJmolBinding.java +++ b/src/jalview/gui/AppJmolBinding.java @@ -35,7 +35,7 @@ import org.jmol.api.JmolViewer; import org.jmol.popup.JmolPopup; import org.openscience.jmol.app.jmolpanel.AppConsole; -public class AppJmolBinding extends jalview.ext.jmol.JalviewJmolBinding +public class AppJmolBinding extends jalview.ext.jmol.JalviewJmolBinding { /** @@ -110,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) @@ -129,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) @@ -159,7 +162,8 @@ public class AppJmolBinding extends jalview.ext.jmol.JalviewJmolBinding } - public void showConsole(boolean b) { + public void showConsole(boolean b) + { appJmolWindow.showConsole(b); } @@ -193,12 +197,19 @@ public class AppJmolBinding extends jalview.ext.jmol.JalviewJmolBinding protected void releaseUIResources() { appJmolWindow = null; - if (console!=null) { - try { + if (console != null) + { + try + { console.setVisible(false); - } catch (Error e) {} catch (Exception x) {}; - console=null; + } catch (Error e) + { + } catch (Exception x) + { + } + ; + console = null; } - + } }