JAL-2089 patch broken merge to master for Release 2.10.0b1
[jalview.git] / src / jalview / jbgui / GRestServiceEditorPane.java
index 259824a..3329780 100644 (file)
@@ -1,6 +1,6 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
- * Copyright (C) 2014 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
@@ -146,11 +146,8 @@ public class GRestServiceEditorPane extends JPanel
     // details.add(cpanel = new JPanel(), BorderLayout.CENTER);
     // cpanel.setLayout(new FlowLayout());
     hSeparable = new JCheckBox(MessageManager.getString("label.per_seq"));
-    hSeparable
-            .setToolTipText("<html>"
-                    + JvSwingUtils
-                            .wrapTooltip("When checked, a job is created for every sequence in the current selection.")
-                    + "<html>");
+    hSeparable.setToolTipText(JvSwingUtils.wrapTooltip(true,
+            MessageManager.getString("label.job_created_when_checked")));
     hSeparable.addActionListener(new ActionListener()
     {
 
@@ -164,13 +161,10 @@ public class GRestServiceEditorPane extends JPanel
     vSeparable = new JCheckBox(
             MessageManager.getString("label.result_vertically_separable"));
     vSeparable
-            .setToolTipText("<html>"
-                    + JvSwingUtils
-                            .wrapTooltip("When checked, a single job is created for the visible region and results"
-                                    + " mapped back onto their location in the alignment. Otherwise, a job would be"
-                                    + " created for every contiguous region visible in the alignment or current"
-                                    + " selection (e.g. a multiple alignment).")
-                    + "</html>");
+            .setToolTipText(JvSwingUtils.wrapTooltip(
+                    true,
+                    MessageManager
+                            .getString("label.when_checked_job_visible_region_and_results")));
     vSeparable.addActionListener(new ActionListener()
     {
 
@@ -400,10 +394,8 @@ public class GRestServiceEditorPane extends JPanel
             .getString("label.rsbs_encoded_service")));
     urldescPane.add(urldescVp, "span");
     paste.add(urldescPane, "span");
-    urldescPane
-            .setToolTipText("<html>"
-                    + JvSwingUtils
-                            .wrapTooltip("Flat file representation of this rest service using the Really Simple Bioinformatics Service formalism"));
+    urldescPane.setToolTipText(JvSwingUtils.wrapTooltip(true,
+            MessageManager.getString("label.flat_file_representation")));
 
     parseRes = new JTextArea();
     parseResVp = new JScrollPane();
@@ -414,11 +406,8 @@ public class GRestServiceEditorPane extends JPanel
             "[grow 100, fill]"));
     parseWarnings.setBorder(new TitledBorder(MessageManager
             .getString("label.parsing_errors")));
-    parseWarnings
-            .setToolTipText("<html>"
-                    + JvSwingUtils
-                            .wrapTooltip("Results of parsing the RSBS representation")
-                    + "</html>");
+    parseWarnings.setToolTipText(JvSwingUtils.wrapTooltip(true,
+            MessageManager.getString("label.result_of_parsing_rsbs")));
     parseWarnings.add(parseResVp, "center");
     parseRes.setEditable(false);
     paste.add(parseWarnings, "span");