updated to jalview 2.1 and begun ArchiveClient/VamsasClient/VamsasStore updates.
[jalview.git] / src / jalview / jbgui / GWebserviceInfo.java
index 6f8bbd7..9a00c57 100755 (executable)
@@ -1,6 +1,6 @@
 /*
 * Jalview - A Sequence Alignment Editor and Viewer
-* Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+* 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
 * 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
-package jalview.jbgui;\r
-\r
-import java.awt.*;\r
-import java.awt.event.*;\r
-\r
-import javax.swing.*;\r
-\r
-\r
-/**\r
- * DOCUMENT ME!\r
- *\r
- * @author $author$\r
- * @version $Revision$\r
- */\r
-public class GWebserviceInfo extends JPanel\r
-{\r
-    protected JTextArea infoText = new JTextArea();\r
-    JScrollPane jScrollPane1 = new JScrollPane();\r
-    JScrollPane jScrollPane2 = new JScrollPane();\r
-    protected JTextArea progressText = new JTextArea();\r
-    JPanel jPanel1 = new JPanel();\r
-    BorderLayout borderLayout1 = new BorderLayout();\r
-    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
-    GridBagLayout gridBagLayout1 = new GridBagLayout();\r
-\r
-    /**\r
-     * Creates a new GWebserviceInfo object.\r
-     */\r
-    public GWebserviceInfo()\r
-    {\r
-        try\r
-        {\r
-            jbInit();\r
-        }\r
-        catch (Exception e)\r
-        {\r
-            e.printStackTrace();\r
-        }\r
-    }\r
-\r
-    /**\r
-     * DOCUMENT ME!\r
-     *\r
-     * @throws Exception DOCUMENT ME!\r
-     */\r
-    private void jbInit() throws Exception\r
-    {\r
-        infoText.setFont(new java.awt.Font("Verdana", 0, 10));\r
-        infoText.setBorder(null);\r
-        infoText.setEditable(false);\r
-        infoText.setText("");\r
-        infoText.setLineWrap(true);\r
-        infoText.setWrapStyleWord(true);\r
-        this.setLayout(borderLayout1);\r
-        progressText.setFont(new java.awt.Font("Verdana", 0, 10));\r
-        progressText.setBorder(null);\r
-        progressText.setEditable(false);\r
-        progressText.setText("");\r
-        progressText.setLineWrap(true);\r
-        progressText.setWrapStyleWord(true);\r
-        jPanel1.setLayout(borderLayout2);\r
-        titlePanel.setBackground(Color.white);\r
-        titlePanel.setPreferredSize(new Dimension(0, 60));\r
-        titlePanel.setLayout(borderLayout3);\r
-        jScrollPane2.setBorder(null);\r
-        jScrollPane1.setBorder(null);\r
-        jScrollPane1.setPreferredSize(new Dimension(400, 70));\r
-        cancel.setFont(new java.awt.Font("Verdana", 0, 11));\r
-        cancel.setText("Cancel");\r
-        cancel.addActionListener(new java.awt.event.ActionListener()\r
-            {\r
-                public void actionPerformed(ActionEvent e)\r
-                {\r
-                    cancel_actionPerformed(e);\r
-                }\r
-            });\r
-        jPanel2.setLayout(gridBagLayout1);\r
-        jPanel2.setOpaque(false);\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
-\r
-    /**\r
-     * DOCUMENT ME!\r
-     *\r
-     * @param e DOCUMENT ME!\r
-     */\r
-    protected void cancel_actionPerformed(ActionEvent e)\r
-    {\r
-    }\r
-}\r
+*/
+package jalview.jbgui;
+
+import java.awt.*;
+import java.awt.event.*;
+
+import javax.swing.*;
+
+/**
+ * DOCUMENT ME!
+ *
+ * @author $author$
+ * @version $Revision$
+ */
+public class GWebserviceInfo extends JPanel
+{
+    protected JTextArea infoText = new JTextArea();
+    JScrollPane jScrollPane1 = new JScrollPane();
+    JPanel jPanel1 = new JPanel();
+    BorderLayout borderLayout1 = new BorderLayout();
+    BorderLayout borderLayout2 = new BorderLayout();
+    protected JPanel titlePanel = new JPanel();
+    BorderLayout borderLayout3 = new BorderLayout();
+    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()
+    {
+        try
+        {
+            jbInit();
+        }
+        catch (Exception e)
+        {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * DOCUMENT ME!
+     *
+     * @throws Exception DOCUMENT ME!
+     */
+    private void jbInit() throws Exception
+    {
+        infoText.setFont(new java.awt.Font("Verdana", 0, 10));
+        infoText.setBorder(null);
+        infoText.setEditable(false);
+        infoText.setText("");
+        infoText.setLineWrap(true);
+        infoText.setWrapStyleWord(true);
+        this.setLayout(borderLayout1);
+        jPanel1.setLayout(borderLayout2);
+        titlePanel.setBackground(Color.white);
+        titlePanel.setPreferredSize(new Dimension(0, 60));
+        titlePanel.setLayout(borderLayout3);
+        jScrollPane1.setBorder(null);
+        jScrollPane1.setPreferredSize(new Dimension(400, 70));
+        cancel.setFont(new java.awt.Font("Verdana", 0, 11));
+        cancel.setText("Cancel");
+        cancel.addActionListener(new java.awt.event.ActionListener()
+            {
+                public void actionPerformed(ActionEvent e)
+                {
+                    cancel_actionPerformed(e);
+                }
+            });
+    buttonPanel.setLayout(gridBagLayout1);
+    buttonPanel.setOpaque(false);
+    showResultsNewFrame.setText("New Frame");
+    mergeResults.setText("Merge Results");
+    this.setBackground(Color.white);
+    this.add(jPanel1, BorderLayout.NORTH);
+        jPanel1.add(jScrollPane1, BorderLayout.CENTER);
+        jScrollPane1.getViewport().add(infoText, null);
+        jPanel1.add(titlePanel, BorderLayout.NORTH);
+        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!
+     *
+     * @param e DOCUMENT ME!
+     */
+    protected void cancel_actionPerformed(ActionEvent e)
+    {
+    }
+}