X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGWebserviceInfo.java;h=d2153074f024f0b2dc1b4bafc24d3f14c7d383f5;hb=c19d2a91ca05e052e3408bf5852d88eb5d0608f1;hp=00806ed1ccc48fb499211f337bbe685698d82a87;hpb=7796bc87c98b21f199f9dc195401223984619091;p=jalview.git diff --git a/src/jalview/jbgui/GWebserviceInfo.java b/src/jalview/jbgui/GWebserviceInfo.java index 00806ed..d215307 100755 --- a/src/jalview/jbgui/GWebserviceInfo.java +++ b/src/jalview/jbgui/GWebserviceInfo.java @@ -1,25 +1,41 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7) - * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b2) + * 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. - * + * 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 . + * You should have received a copy of the GNU General Public License + * along with Jalview. If not, see . + * The Jalview Authors are detailed in the 'AUTHORS' file. */ package jalview.jbgui; -import java.awt.*; -import java.awt.event.*; -import javax.swing.*; +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! @@ -52,8 +68,9 @@ public class GWebserviceInfo extends JPanel public JButton mergeResults = new JButton(); GridBagLayout gridBagLayout1 = new GridBagLayout(); - + public JPanel statusPanel = new JPanel(new GridLayout()); + public JLabel statusBar = new JLabel(); /** @@ -92,7 +109,7 @@ public class GWebserviceInfo extends JPanel 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) @@ -102,8 +119,9 @@ public class GWebserviceInfo extends JPanel }); buttonPanel.setLayout(gridBagLayout1); buttonPanel.setOpaque(false); - showResultsNewFrame.setText("New Window"); - mergeResults.setText("Merge Results"); + 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);