git://source.jalview.org / jalview.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge branch 'hotfix/JAL-1521' into Release_2_8_2_Branch
[jalview.git] / src / jalview / ws / jws2 / Jws2Client.java
diff --git a/src/jalview/ws/jws2/Jws2Client.java b/src/jalview/ws/jws2/Jws2Client.java
index b2b676f..afefe65 100644 (file)
--- a/src/jalview/ws/jws2/Jws2Client.java
+++ b/src/jalview/ws/jws2/Jws2Client.java
@@ -77,8 +77,7 @@ public abstract class Jws2Client extends jalview.ws.WSClient
          * arguments. for (Argument opt : arguments) { newargs.add(opt); } }
          * paramset = newargs; } else {
          */
-        throw new Error(
-                "Implementation error: Can only instantiate Jaba parameter sets.");
+        throw new Error(MessageManager.getString("error.implementation_error_can_only_instantiate_jaba_param_sets"));
       }
     }
     else
@@ -231,9 +230,7 @@ public abstract class Jws2Client extends jalview.ws.WSClient
       final JCheckBoxMenuItem aaConEnabled = new JCheckBoxMenuItem(
               aaui.getAAconToggle());
 
-      aaConEnabled.setToolTipText("<html><p>"
-              + JvSwingUtils.wrapTooltip(aaui.getAAconToggleTooltip()
-                      + "</p>") + "</html>");
+      aaConEnabled.setToolTipText(JvSwingUtils.wrapTooltip(true, aaui.getAAconToggleTooltip()));
       aaConEnabled.addActionListener(new ActionListener()
       {
         @Override
@@ -257,7 +254,7 @@ public abstract class Jws2Client extends jalview.ws.WSClient
       wsmenu.add(aaConEnabled);
       final JMenuItem modifyParams = new JMenuItem(aaui.getAAeditSettings());
       modifyParams.setToolTipText("<html><p>"
-              + JvSwingUtils.wrapTooltip(aaui.getAAeditSettingsTooltip()
+              + JvSwingUtils.wrapTooltip(false, aaui.getAAeditSettingsTooltip()
                       + "</p>") + "</html>");
       modifyParams.addActionListener(new ActionListener()
       {
@@ -410,7 +407,7 @@ public abstract class Jws2Client extends jalview.ws.WSClient
     {
       // TODO raise dialog box explaining error, and/or open the JABA
       // preferences menu.
-      throw new Error("No AACon service found.");
+      throw new Error(MessageManager.getString("error.no_aacon_service_found"));
     }
     return new AAConSettings(true, service, null, null);
   }