X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FScriptWindow.java;h=f329b006c79d95311225fa28f88238a973a25945;hb=ab43013b7e357b84b4abade0dba949668dfb2a0e;hp=de31fcfcb13d07b8f16e7ff897f59b8ec75b56a4;hpb=ea990f32cf34a867377d25f7fc05bfbfb15f6fb3;p=jalview.git
diff --git a/src/jalview/gui/ScriptWindow.java b/src/jalview/gui/ScriptWindow.java
index de31fcf..f329b00 100644
--- a/src/jalview/gui/ScriptWindow.java
+++ b/src/jalview/gui/ScriptWindow.java
@@ -1,19 +1,22 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.5)
- * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2b1)
+ * 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.gui;
@@ -29,6 +32,7 @@ import org.jmol.i18n.GT;
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
{
@@ -53,7 +57,7 @@ public final class ScriptWindow extends JPanel implements ActionListener,
public ScriptWindow(AppJmol appJmol)
{
- this.viewer = appJmol.viewer;
+ this.viewer = appJmol.jmb.viewer;
this.appJmol = appJmol;
setLayout(new BorderLayout());
@@ -258,7 +262,7 @@ public final class ScriptWindow extends JPanel implements ActionListener,
Object source = e.getSource();
if (source == closeButton)
{
- appJmol.showConsole(false);
+ // appJmol.showConsole(false);
}
else if (source == runButton)
{