Merge branch 'JAL-1397' into develop

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

diff --git a/src/jalview/jbgui/GRestServiceEditorPane.java b/src/jalview/jbgui/GRestServiceEditorPane.java
index 6779488..92747b5 100644 (file)
--- a/src/jalview/jbgui/GRestServiceEditorPane.java
+++ b/src/jalview/jbgui/GRestServiceEditorPane.java
@@ -18,17 +18,14 @@
 package jalview.jbgui;
 
 import jalview.gui.JvSwingUtils;
 package jalview.jbgui;
 
 import jalview.gui.JvSwingUtils;

+import jalview.util.MessageManager;

 
 import java.awt.BorderLayout;
 
 import java.awt.BorderLayout;

-import java.awt.Dimension;
-import java.awt.FlowLayout;
-import java.awt.GridLayout;

 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
 

-import javax.swing.BoxLayout;

 import javax.swing.JButton;
 import javax.swing.JCheckBox;
 import javax.swing.JComboBox;
 import javax.swing.JButton;
 import javax.swing.JCheckBox;
 import javax.swing.JComboBox;

@@ -38,15 +35,8 @@ import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 import javax.swing.JTabbedPane;
 import javax.swing.JTextArea;
 import javax.swing.JScrollPane;
 import javax.swing.JTabbedPane;
 import javax.swing.JTextArea;

-import javax.swing.JViewport;

 import javax.swing.ListSelectionModel;
 import javax.swing.ListSelectionModel;

-import javax.swing.UIManager;

 import javax.swing.border.TitledBorder;
 import javax.swing.border.TitledBorder;

-import javax.swing.event.CaretEvent;
-import javax.swing.event.CaretListener;
-import javax.swing.event.DocumentEvent;
-import javax.swing.event.DocumentListener;
-import javax.swing.event.ListSelectionListener;

 
 import net.miginfocom.swing.MigLayout;
 
 
 import net.miginfocom.swing.MigLayout;
 

@@ -117,14 +107,14 @@ public class GRestServiceEditorPane extends JPanel
     name = new JTextArea(1, 12);
 
     JvSwingUtils.mgAddtoLayout(cpanel,
     name = new JTextArea(1, 12);
 
     JvSwingUtils.mgAddtoLayout(cpanel,

-            "Short descriptive name for service", new JLabel("Name:"),
+            "Short descriptive name for service", new JLabel(MessageManager.getString("label.name")),

             name, "wrap");
     action = new JComboBox();
     JvSwingUtils
             .mgAddtoLayout(
                     cpanel,
                     "What kind of function the service performs (e.g. alignment, analysis, search, etc).",
             name, "wrap");
     action = new JComboBox();
     JvSwingUtils
             .mgAddtoLayout(
                     cpanel,
                     "What kind of function the service performs (e.g. alignment, analysis, search, etc).",

-                    new JLabel("Service Action:"), action, "wrap");
+                    new JLabel(MessageManager.getString("label.service_action")), action, "wrap");

     descr = new JTextArea(4, 60);
     descrVp = new JScrollPane();
     descrVp.setViewportView(descr);
     descr = new JTextArea(4, 60);
     descrVp = new JScrollPane();
     descrVp.setViewportView(descr);

@@ -138,7 +128,7 @@ public class GRestServiceEditorPane extends JPanel
             .mgAddtoLayout(
                     cpanel,
                     "URL to post data to service. Include any special parameters needed here",
             .mgAddtoLayout(
                     cpanel,
                     "URL to post data to service. Include any special parameters needed here",

-                    new JLabel("POST URL:"), urlVp, "wrap");
+                    new JLabel(MessageManager.getString("label.post_url")), urlVp, "wrap");

 
     urlsuff = new JTextArea();
     urlsuff.setColumns(60);
 
     urlsuff = new JTextArea();
     urlsuff.setColumns(60);

@@ -147,12 +137,12 @@ public class GRestServiceEditorPane extends JPanel
             .mgAddtoLayout(
                     cpanel,
                     "Optional suffix added to URL when retrieving results from service",
             .mgAddtoLayout(
                     cpanel,
                     "Optional suffix added to URL when retrieving results from service",

-                    new JLabel("URL Suffix:"), urlsuff, "wrap");
+                    new JLabel(MessageManager.getString("label.url_suffix")), urlsuff, "wrap");

 
     // input options
     // details.add(cpanel = new JPanel(), BorderLayout.CENTER);
     // cpanel.setLayout(new FlowLayout());
 
     // input options
     // details.add(cpanel = new JPanel(), BorderLayout.CENTER);
     // cpanel.setLayout(new FlowLayout());

-    hSeparable = new JCheckBox("per Sequence");
+    hSeparable = new JCheckBox(MessageManager.getString("label.per_seq"));

     hSeparable
             .setToolTipText("<html>"
                     + JvSwingUtils
     hSeparable
             .setToolTipText("<html>"
                     + JvSwingUtils

@@ -168,7 +158,7 @@ public class GRestServiceEditorPane extends JPanel
 
       }
     });
 
       }
     });

-    vSeparable = new JCheckBox("Results are vertically separable");
+    vSeparable = new JCheckBox(MessageManager.getString("label.result_vertically_separable"));

     vSeparable
             .setToolTipText("<html>"
                     + JvSwingUtils
     vSeparable
             .setToolTipText("<html>"
                     + JvSwingUtils