/*
- * 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.
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 ScriptWindow(AppJmol appJmol)
{
- this.viewer = appJmol.viewer;
+ this.viewer = appJmol.jmb.viewer;
this.appJmol = appJmol;
setLayout(new BorderLayout());
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");
Object source = e.getSource();
if (source == closeButton)
{
- appJmol.showConsole(false);
+ // appJmol.showConsole(false);
}
else if (source == runButton)
{