From: amwaterhouse <Andrew Waterhouse>
Date: Thu, 22 Mar 2007 18:32:12 +0000 (+0000)
Subject: Now a JPanel, plus some modifications
X-Git-Tag: Release_2_3~314
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=5b16b5a383d06bbe7ed7844eed4248f69cd1cc21;p=jalview.git

Now a JPanel, plus some modifications
---

diff --git a/src/jalview/gui/ScriptWindow.java b/src/jalview/gui/ScriptWindow.java
index a3a3f42..ba8570e 100644
--- a/src/jalview/gui/ScriptWindow.java
+++ b/src/jalview/gui/ScriptWindow.java
@@ -40,7 +40,7 @@ import org.jmol.i18n.GT;
 import org.jmol.util.Logger;
 import org.jmol.util.CommandHistory;
 
-public final class ScriptWindow extends JInternalFrame
+public final class ScriptWindow extends JPanel
     implements ActionListener, EnterListener{
 
   private ConsoleTextPane console;
@@ -52,22 +52,25 @@ public final class ScriptWindow extends JInternalFrame
   private JButton stateButton;
   private JButton helpButton;
   JmolViewer viewer;
+  AppJMol appJmol;
 
-  public ScriptWindow(JmolViewer viewer)
+  public ScriptWindow(AppJMol appJmol)
   {
-    this.viewer = viewer;
+    this.viewer = appJmol.viewer;
+    this.appJmol = appJmol;
 
-    getContentPane().setLayout(new BorderLayout());
+
+    setLayout(new BorderLayout());
 
     console = new ConsoleTextPane(this);
 
 
     console.setPrompt();
-    getContentPane().add(new JScrollPane(console)
+    add(new JScrollPane(console)
                          , BorderLayout.CENTER);
 
     JPanel buttonPanel = new JPanel();
-    getContentPane().add(buttonPanel, BorderLayout.SOUTH);
+    add(buttonPanel, BorderLayout.SOUTH);
 
     runButton = new JButton(GT._("Run"));
     runButton.addActionListener(this);
@@ -98,6 +101,12 @@ public final class ScriptWindow extends JInternalFrame
     closeButton.addActionListener(this);
     buttonPanel.add(closeButton);
 
+    for(int i=0; i<buttonPanel.getComponentCount(); i++)
+    {
+      ((JButton)buttonPanel.getComponent(i))
+          .setMargin(new Insets(0, 0, 0, 0));
+    }
+
   }
 
   public void sendConsoleEcho(String strEcho) {
@@ -222,7 +231,7 @@ public final class ScriptWindow extends JInternalFrame
   public void actionPerformed(ActionEvent e) {
     Object source = e.getSource();
     if (source == closeButton) {
-      hide();
+      appJmol.showConsole(false);
     } else if (source == runButton) {
       executeCommandAsThread();
     } else if (source == clearButton) {