X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fappletgui%2FAppletJmolBinding.java;h=ff1f5b22ca1ad974011508320456795e7eb458d1;hb=c94c1390298db2e80abc04b371d3e7767f5e5968;hp=923f3b248dfa9c168d99598ca9d307a1ae65ef6b;hpb=b2f9a8d7bce642ff4011bc6d49e02bb0569fbb11;p=jalview.git
diff --git a/src/jalview/appletgui/AppletJmolBinding.java b/src/jalview/appletgui/AppletJmolBinding.java
index 923f3b2..ff1f5b2 100644
--- a/src/jalview/appletgui/AppletJmolBinding.java
+++ b/src/jalview/appletgui/AppletJmolBinding.java
@@ -1,19 +1,21 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.1)
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
* Copyright (C) 2014 The Jalview Authors
*
* 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.
+ * 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 .
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview. If not, see .
* The Jalview Authors are detailed in the 'AUTHORS' file.
*/
package jalview.appletgui;
@@ -50,7 +52,7 @@ class AppletJmolBinding extends jalview.ext.jmol.JalviewJmolBinding
AlignmentViewPanel alignment)
{
AlignmentPanel ap = (AlignmentPanel) alignment;
- if (appletJmolBinding.ap.av.showSequenceFeatures)
+ if (appletJmolBinding.ap.av.isShowSequenceFeatures())
{
if (appletJmolBinding.fr == null)
{
@@ -75,7 +77,9 @@ class AppletJmolBinding extends jalview.ext.jmol.JalviewJmolBinding
public void sendConsoleEcho(String strEcho)
{
if (appletJmolBinding.scriptWindow == null)
+ {
appletJmolBinding.showConsole(true);
+ }
appletJmolBinding.history.append("\n" + strEcho);
}
@@ -103,7 +107,7 @@ class AppletJmolBinding extends jalview.ext.jmol.JalviewJmolBinding
public void updateColours(Object source)
{
AlignmentPanel ap = (AlignmentPanel) source;
- colourBySequence(ap.av.getShowSequenceFeatures(), ap);
+ colourBySequence(ap.av.isShowSequenceFeatures(), ap);
}
public void showUrl(String url)
@@ -136,10 +140,10 @@ class AppletJmolBinding extends jalview.ext.jmol.JalviewJmolBinding
}
+ @Override
public void refreshPdbEntries()
{
- // TODO Auto-generated method stub
-
+ // noop
}
@Override
@@ -162,20 +166,7 @@ class AppletJmolBinding extends jalview.ext.jmol.JalviewJmolBinding
protected void releaseUIResources()
{
appletJmolBinding = null;
- if (console != null)
- {
- try
- {
- console.setVisible(false);
- } catch (Error e)
- {
- } catch (Exception x)
- {
- }
- ;
- console = null;
- }
-
+ closeConsole();
}
@Override