X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGWebserviceInfo.java;h=f64568a394bbc9646be51bf3109ad9527d717edd;hb=17e77c3f2949a0729322b4a8d907f3f34b6a9914;hp=4d3aab651fa84b1cfc198e6e9ce921e284a5956c;hpb=99c58ee0ae2a848f982552e53feaf6d5cb9925e5;p=jalview.git

diff --git a/src/jalview/jbgui/GWebserviceInfo.java b/src/jalview/jbgui/GWebserviceInfo.java
index 4d3aab6..f64568a 100755
--- a/src/jalview/jbgui/GWebserviceInfo.java
+++ b/src/jalview/jbgui/GWebserviceInfo.java
@@ -1,54 +1,98 @@
 /*
-* 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 (Version 2.9)
+ * Copyright (C) 2015 The Jalview Authors
+ * 
+ * This file is part of Jalview.
+ * 
+ * Jalview 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 3
+ * of the License, or (at your option) any later version.
+ *  
+ * Jalview 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 Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
 package jalview.jbgui;
 
-import java.awt.*;
-import javax.swing.*;
-import java.awt.event.*;
+import jalview.util.MessageManager;
+
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.GridLayout;
+import java.awt.Insets;
+import java.awt.event.ActionEvent;
+
+import javax.swing.JButton;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JTextArea;
 
+/**
+ * DOCUMENT ME!
+ * 
+ * @author $author$
+ * @version $Revision$
+ */
 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();
 
+  public JPanel statusPanel = new JPanel(new GridLayout());
+
+  public JLabel statusBar = new JLabel();
+
+  /**
+   * Creates a new GWebserviceInfo object.
+   */
   public GWebserviceInfo()
   {
     try
     {
       jbInit();
-    }
-    catch(Exception e)
+    } 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));
@@ -58,21 +102,14 @@ 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));
-    cancel.setText("Cancel");
+    cancel.setText(MessageManager.getString("action.cancel"));
     cancel.addActionListener(new java.awt.event.ActionListener()
     {
       public void actionPerformed(ActionEvent e)
@@ -80,21 +117,31 @@ public class GWebserviceInfo extends JPanel
         cancel_actionPerformed(e);
       }
     });
-    jPanel2.setLayout(gridBagLayout1);
-    jPanel2.setOpaque(false);
-    this.add(jScrollPane2, BorderLayout.CENTER);
+    buttonPanel.setLayout(gridBagLayout1);
+    buttonPanel.setOpaque(false);
+    showResultsNewFrame.setText(MessageManager
+            .getString("label.new_window"));
+    mergeResults.setText(MessageManager.getString("action.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));
+    this.add(statusPanel, java.awt.BorderLayout.SOUTH);
+    statusPanel.add(statusBar, null);
   }
 
+  /**
+   * DOCUMENT ME!
+   * 
+   * @param e
+   *          DOCUMENT ME!
+   */
   protected void cancel_actionPerformed(ActionEvent e)
   {
-
   }
 }