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
remove name of progress bar when stopping ws refresh progress.
[jalview.git]
/
src
/
jalview
/
gui
/
ScriptWindow.java
diff --git
a/src/jalview/gui/ScriptWindow.java
b/src/jalview/gui/ScriptWindow.java
index
de31fcf
..
c80248f
100644
(file)
--- a/
src/jalview/gui/ScriptWindow.java
+++ b/
src/jalview/gui/ScriptWindow.java
@@
-1,5
+1,5
@@
/*
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.5)
+ * 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.
* Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
*
* This file is part of Jalview.
@@
-29,6
+29,7
@@
import org.jmol.i18n.GT;
import org.jmol.util.Logger;
import org.jmol.util.CommandHistory;
import org.jmol.util.Logger;
import org.jmol.util.CommandHistory;
+// TODO: this class is copied in from jmol 11.0.2 - upgrade to 12.0.2 ?
public final class ScriptWindow extends JPanel implements ActionListener,
EnterListener
{
public final class ScriptWindow extends JPanel implements ActionListener,
EnterListener
{
@@
-53,7
+54,7
@@
public final class ScriptWindow extends JPanel implements ActionListener,
public ScriptWindow(AppJmol appJmol)
{
public ScriptWindow(AppJmol appJmol)
{
- this.viewer = appJmol.viewer;
+ this.viewer = appJmol.jmb.viewer;
this.appJmol = appJmol;
setLayout(new BorderLayout());
this.appJmol = appJmol;
setLayout(new BorderLayout());
@@
-258,7
+259,7
@@
public final class ScriptWindow extends JPanel implements ActionListener,
Object source = e.getSource();
if (source == closeButton)
{
Object source = e.getSource();
if (source == closeButton)
{
- appJmol.showConsole(false);
+ // appJmol.showConsole(false);
}
else if (source == runButton)
{
}
else if (source == runButton)
{