X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FScriptWindow.java;h=adebec84d53a6375229941d206376bcfd8210f83;hb=797df64fa2a0a30773d0f48f5494d4155e5a8be3;hp=de31fcfcb13d07b8f16e7ff897f59b8ec75b56a4;hpb=ea990f32cf34a867377d25f7fc05bfbfb15f6fb3;p=jalview.git diff --git a/src/jalview/gui/ScriptWindow.java b/src/jalview/gui/ScriptWindow.java index de31fcf..adebec8 100644 --- a/src/jalview/gui/ScriptWindow.java +++ b/src/jalview/gui/ScriptWindow.java @@ -1,6 +1,6 @@ /* - * 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.7) + * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, 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; +// 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 +54,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 +259,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) {