Merge new frame buttons added

[jalview.git] / src / jalview / jbgui / GWebserviceInfo.java

diff --git a/src/jalview/jbgui/GWebserviceInfo.java b/src/jalview/jbgui/GWebserviceInfo.java
index 6f8bbd7..e5a163c 100755 (executable)
--- 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
+/*\r
+* Jalview - A Sequence Alignment Editor and Viewer\r
+* Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle\r
+*\r
+* This program is free software; you can redistribute it and/or\r
+* modify it under the terms of the GNU General Public License\r
+* as published by the Free Software Foundation; either version 2\r
+* of the License, or (at your option) any later version.\r
+*\r
+* This program is distributed in the hope that it will be useful,\r
+* but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
+* GNU General Public License for more details.\r
+*\r
+* You should have received a copy of the GNU General Public License\r
+* along with this program; if not, write to the Free Software\r
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA\r
 */\r
 package jalview.jbgui;\r
 \r
@@ -23,7 +23,6 @@ import java.awt.event.*;
 \r
 import javax.swing.*;\r
 \r
-\r
 /**\r
  * DOCUMENT ME!\r
  *\r
@@ -41,11 +40,12 @@ public class GWebserviceInfo extends JPanel
     BorderLayout borderLayout2 = new BorderLayout();\r
     protected JPanel titlePanel = new JPanel();\r
     BorderLayout borderLayout3 = new BorderLayout();\r
-    JPanel jPanel2 = new JPanel();\r
-    protected JButton cancel = new JButton();\r
+    protected JPanel buttonPanel = new JPanel();\r
+    public JButton cancel = new JButton();\r
+    public JButton showResultsNewFrame = new JButton();\r
+    public JButton mergeResults = new JButton();\r
     GridBagLayout gridBagLayout1 = new GridBagLayout();\r
-\r
-    /**\r
+  /**\r
      * Creates a new GWebserviceInfo object.\r
      */\r
     public GWebserviceInfo()\r
@@ -96,20 +96,22 @@ public class GWebserviceInfo extends JPanel
                     cancel_actionPerformed(e);\r
                 }\r
             });\r
-        jPanel2.setLayout(gridBagLayout1);\r
-        jPanel2.setOpaque(false);\r
-        this.add(jScrollPane2, BorderLayout.CENTER);\r
+    buttonPanel.setLayout(gridBagLayout1);\r
+    buttonPanel.setOpaque(false);\r
+    showResultsNewFrame.setText("New Frame");\r
+    mergeResults.setText("Merge Results");\r
+    this.add(jScrollPane2, BorderLayout.CENTER);\r
         this.add(jPanel1, BorderLayout.NORTH);\r
         jPanel1.add(jScrollPane1, BorderLayout.CENTER);\r
         jScrollPane1.getViewport().add(infoText, null);\r
         jScrollPane2.getViewport().add(progressText, null);\r
         jPanel1.add(titlePanel, BorderLayout.NORTH);\r
-        titlePanel.add(jPanel2, BorderLayout.EAST);\r
-        jPanel2.add(cancel,\r
-            new GridBagConstraints(0, 0, 1, 1, 0.0, 0.0,\r
-                GridBagConstraints.SOUTH, GridBagConstraints.NONE,\r
-                new Insets(24, 5, 21, 5), 0, 0));\r
-    }\r
+        titlePanel.add(buttonPanel, BorderLayout.EAST);\r
+    buttonPanel.add(cancel, new GridBagConstraints(0, 0, 1, 1, 0.0, 0.0\r
+                                               , GridBagConstraints.CENTER,\r
+                                               GridBagConstraints.NONE,\r
+                                               new Insets(19, 6, 16, 4), 0, 0));\r
+  }\r
 \r
     /**\r
      * DOCUMENT ME!\r