X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGWebserviceInfo.java;h=8f21f63d749d51c33ec71a35b970c2804c5c802e;hb=3b20f512421e707431c326189dbf7d8755968baa;hp=6f8bbd70a638b35370996ebcd856e368dc0e1d09;hpb=efc31b4a8d5cee63555586804a2b79c06bdb5a14;p=jalview.git

diff --git a/src/jalview/jbgui/GWebserviceInfo.java b/src/jalview/jbgui/GWebserviceInfo.java
index 6f8bbd7..8f21f63 100755
--- a/src/jalview/jbgui/GWebserviceInfo.java
+++ b/src/jalview/jbgui/GWebserviceInfo.java
@@ -1,20 +1,20 @@
-/*
-* Jalview - A Sequence Alignment Editor and Viewer
-* Copyright (C) 2005 AM Waterhouse, J Procter, 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 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.
-*
-* 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 - A Sequence Alignment Editor and Viewer
+* Copyright (C) 2006 AM Waterhouse, J Procter, 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 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.
+*
+* 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
 */
 package jalview.jbgui;
 
@@ -23,7 +23,6 @@ import java.awt.event.*;
 
 import javax.swing.*;
 
-
 /**
  * DOCUMENT ME!
  *
@@ -34,18 +33,17 @@ public class GWebserviceInfo extends JPanel
 {
     protected JTextArea infoText = new JTextArea();
     JScrollPane jScrollPane1 = new JScrollPane();
-    JScrollPane jScrollPane2 = new JScrollPane();
-    protected JTextArea progressText = new JTextArea();
     JPanel jPanel1 = new JPanel();
     BorderLayout borderLayout1 = new BorderLayout();
     BorderLayout borderLayout2 = new BorderLayout();
     protected JPanel titlePanel = new JPanel();
     BorderLayout borderLayout3 = new BorderLayout();
-    JPanel jPanel2 = new JPanel();
-    protected JButton cancel = new JButton();
+    protected JPanel buttonPanel = new JPanel();
+    public JButton cancel = new JButton();
+    public JButton showResultsNewFrame = new JButton();
+    public JButton mergeResults = new JButton();
     GridBagLayout gridBagLayout1 = new GridBagLayout();
-
-    /**
+  /**
      * Creates a new GWebserviceInfo object.
      */
     public GWebserviceInfo()
@@ -74,17 +72,10 @@ public class GWebserviceInfo extends JPanel
         infoText.setLineWrap(true);
         infoText.setWrapStyleWord(true);
         this.setLayout(borderLayout1);
-        progressText.setFont(new java.awt.Font("Verdana", 0, 10));
-        progressText.setBorder(null);
-        progressText.setEditable(false);
-        progressText.setText("");
-        progressText.setLineWrap(true);
-        progressText.setWrapStyleWord(true);
         jPanel1.setLayout(borderLayout2);
         titlePanel.setBackground(Color.white);
         titlePanel.setPreferredSize(new Dimension(0, 60));
         titlePanel.setLayout(borderLayout3);
-        jScrollPane2.setBorder(null);
         jScrollPane1.setBorder(null);
         jScrollPane1.setPreferredSize(new Dimension(400, 70));
         cancel.setFont(new java.awt.Font("Verdana", 0, 11));
@@ -96,20 +87,21 @@ public class GWebserviceInfo extends JPanel
                     cancel_actionPerformed(e);
                 }
             });
-        jPanel2.setLayout(gridBagLayout1);
-        jPanel2.setOpaque(false);
-        this.add(jScrollPane2, BorderLayout.CENTER);
-        this.add(jPanel1, BorderLayout.NORTH);
+    buttonPanel.setLayout(gridBagLayout1);
+    buttonPanel.setOpaque(false);
+    showResultsNewFrame.setText("New Window");
+    mergeResults.setText("Merge Results");
+    this.setBackground(Color.white);
+    this.add(jPanel1, BorderLayout.NORTH);
         jPanel1.add(jScrollPane1, BorderLayout.CENTER);
         jScrollPane1.getViewport().add(infoText, null);
-        jScrollPane2.getViewport().add(progressText, null);
         jPanel1.add(titlePanel, BorderLayout.NORTH);
-        titlePanel.add(jPanel2, BorderLayout.EAST);
-        jPanel2.add(cancel,
-            new GridBagConstraints(0, 0, 1, 1, 0.0, 0.0,
-                GridBagConstraints.SOUTH, GridBagConstraints.NONE,
-                new Insets(24, 5, 21, 5), 0, 0));
-    }
+        titlePanel.add(buttonPanel, BorderLayout.EAST);
+    buttonPanel.add(cancel, new GridBagConstraints(0, 0, 1, 1, 0.0, 0.0
+                                               , GridBagConstraints.CENTER,
+                                               GridBagConstraints.NONE,
+                                               new Insets(19, 6, 16, 4), 0, 0));
+  }
 
     /**
      * DOCUMENT ME!