X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FScriptWindow.java;h=adebec84d53a6375229941d206376bcfd8210f83;hb=797df64fa2a0a30773d0f48f5494d4155e5a8be3;hp=9b1384743a46089f49805a270afc12fdf1def772;hpb=506d60f0e188723ddc91c26824b41ac7034df3fe;p=jalview.git

diff --git a/src/jalview/gui/ScriptWindow.java b/src/jalview/gui/ScriptWindow.java
index 9b13847..adebec8 100644
--- a/src/jalview/gui/ScriptWindow.java
+++ b/src/jalview/gui/ScriptWindow.java
@@ -1,20 +1,19 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.4)
- * Copyright (C) 2008 AM Waterhouse, J Procter, 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 program 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 2
- * of the License, or (at your option) any later version.
+ * This file is part of Jalview.
  * 
- * This program 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.
+ * 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.
  * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ * 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 <http://www.gnu.org/licenses/>.
  */
 package jalview.gui;
 
@@ -30,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
 {
@@ -54,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());
@@ -231,7 +231,7 @@ public final class ScriptWindow extends JPanel implements ActionListener,
       else
       {
         boolean isScriptExecuting = viewer.isScriptExecuting();
-        if (viewer.checkHalt(strCommand))
+        if (viewer.checkHalt(strCommand, true))
           strErrorMessage = (isScriptExecuting ? "string execution halted with "
                   + strCommand
                   : "no script was executing");
@@ -259,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)
     {
@@ -417,8 +417,8 @@ class ConsoleTextPane extends JTextPane
   /**
    * Recall command history.
    * 
-   * @param up -
-   *                history up or down
+   * @param up
+   *          - history up or down
    */
   void recallCommand(boolean up)
   {
@@ -499,12 +499,14 @@ class ConsoleDocument extends DefaultStyledDocument
   }
 
   Position positionBeforePrompt; // starts at 0, so first time isn't tracked
-                                  // (at least on Mac OS X)
+
+  // (at least on Mac OS X)
 
   Position positionAfterPrompt; // immediately after $, so this will track
 
   int offsetAfterPrompt; // only still needed for the insertString override and
-                          // replaceCommand
+
+  // replaceCommand
 
   /**
    * Removes all content of the script window, and add a new prompt.
@@ -700,9 +702,9 @@ class ConsoleDocument extends DefaultStyledDocument
    * Replaces current command on script.
    * 
    * @param newCommand
-   *                new command value
+   *          new command value
    * @param isError
-   *                true to set error color ends with #??
+   *          true to set error color ends with #??
    * 
    * @throws BadLocationException
    */