git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-1683 replace year/version strings with tokens in source
[jalview.git]
/
src
/
jalview
/
appletgui
/
AppletJmolBinding.java
diff --git
a/src/jalview/appletgui/AppletJmolBinding.java
b/src/jalview/appletgui/AppletJmolBinding.java
index
650693d
..
80fafe3
100644
(file)
--- a/
src/jalview/appletgui/AppletJmolBinding.java
+++ b/
src/jalview/appletgui/AppletJmolBinding.java
@@
-1,6
+1,6
@@
/*
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
- * Copyright (C) 2014 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
*
* This file is part of Jalview.
*
*
* This file is part of Jalview.
*
@@
-52,7
+52,7
@@
class AppletJmolBinding extends jalview.ext.jmol.JalviewJmolBinding
AlignmentViewPanel alignment)
{
AlignmentPanel ap = (AlignmentPanel) alignment;
AlignmentViewPanel alignment)
{
AlignmentPanel ap = (AlignmentPanel) alignment;
- if (appletJmolBinding.ap.av.showSequenceFeatures)
+ if (appletJmolBinding.ap.av.isShowSequenceFeatures())
{
if (appletJmolBinding.fr == null)
{
{
if (appletJmolBinding.fr == null)
{
@@
-77,7
+77,9
@@
class AppletJmolBinding extends jalview.ext.jmol.JalviewJmolBinding
public void sendConsoleEcho(String strEcho)
{
if (appletJmolBinding.scriptWindow == null)
public void sendConsoleEcho(String strEcho)
{
if (appletJmolBinding.scriptWindow == null)
+ {
appletJmolBinding.showConsole(true);
appletJmolBinding.showConsole(true);
+ }
appletJmolBinding.history.append("\n" + strEcho);
}
appletJmolBinding.history.append("\n" + strEcho);
}
@@
-105,7
+107,7
@@
class AppletJmolBinding extends jalview.ext.jmol.JalviewJmolBinding
public void updateColours(Object source)
{
AlignmentPanel ap = (AlignmentPanel) source;
public void updateColours(Object source)
{
AlignmentPanel ap = (AlignmentPanel) source;
- colourBySequence(ap.av.getShowSequenceFeatures(), ap);
+ colourBySequence(ap.av.isShowSequenceFeatures(), ap);
}
public void showUrl(String url)
}
public void showUrl(String url)
@@
-138,10
+140,10
@@
class AppletJmolBinding extends jalview.ext.jmol.JalviewJmolBinding
}
}
+ @Override
public void refreshPdbEntries()
{
public void refreshPdbEntries()
{
- // TODO Auto-generated method stub
-
+ // noop
}
@Override
}
@Override
@@
-164,20
+166,7
@@
class AppletJmolBinding extends jalview.ext.jmol.JalviewJmolBinding
protected void releaseUIResources()
{
appletJmolBinding = null;
protected void releaseUIResources()
{
appletJmolBinding = null;
- if (console != null)
- {
- try
- {
- console.setVisible(false);
- } catch (Error e)
- {
- } catch (Exception x)
- {
- }
- ;
- console = null;
- }
-
+ closeConsole();
}
@Override
}
@Override