Merge branch 'feature/JAL-654_dssp' into Release_2_8_2_Branch

[jalview.git] / src / jalview / ws / jws2 / Jws2Discoverer.java

diff --git a/src/jalview/ws/jws2/Jws2Discoverer.java b/src/jalview/ws/jws2/Jws2Discoverer.java
index f14e3c4..910b749 100644 (file)
--- a/src/jalview/ws/jws2/Jws2Discoverer.java
+++ b/src/jalview/ws/jws2/Jws2Discoverer.java
@@ -24,6 +24,7 @@ import jalview.bin.Cache;
 import jalview.gui.AlignFrame;
 import jalview.gui.Desktop;
 import jalview.gui.JvSwingUtils;
+import jalview.util.MessageManager;
 import jalview.ws.WSMenuEntryProviderI;
 import jalview.ws.jws2.jabaws2.Jws2Instance;
 import jalview.ws.params.ParamDatastoreI;
@@ -131,15 +132,16 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
       Cache.log.debug("Old discovery thread has finished.");
     }
     running = true;
-    
+
     // first set up exclusion list if needed
     final Set<String> ignoredServices = new HashSet<String>();
-    for (String ignored:jalview.bin.Cache.getDefault("IGNORED_JABAWS_SERVICETYPES", Services.JpredWS.toString()).split("\\|"))
+    for (String ignored : jalview.bin.Cache.getDefault(
+            "IGNORED_JABAWS_SERVICETYPES", "")
+            .split("\\|"))
     {
       ignoredServices.add(ignored);
     }
 
-    
     changeSupport.firePropertyChange("services", services, new Vector());
     oldthread = Thread.currentThread();
     try
@@ -206,8 +208,9 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
       ;
       for (JabaWsServerQuery squery : qrys)
       {
-        if (squery.isRunning()){
-          finished=false;
+        if (squery.isRunning())
+        {
+          finished = false;
         }
       }
       if (aborted)
@@ -385,14 +388,14 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
         }
       });
       hitm.setToolTipText(JvSwingUtils
-              .wrapTooltip("Opens the JABAWS server's homepage in web browser"));
+              .wrapTooltip(false, MessageManager.getString("label.open_jabaws_web_page ")));
 
       service.attachWSMenuEntry(atpoint, alignFrame);
       if (alternates.containsKey(service.serviceType))
       {
-        atpoint.add(hitm = new JMenu("Switch server"));
+        atpoint.add(hitm = new JMenu(MessageManager.getString("label.switch_server")));
         hitm.setToolTipText(JvSwingUtils
-                .wrapTooltip("Choose a server for running this service"));
+                .wrapTooltip(false, MessageManager.getString("label.choose_jabaws_server")));
         for (final Jws2Instance sv : alternates.get(service.serviceType))
         {
           JMenuItem itm;
@@ -481,7 +484,7 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
           atpoint = JvSwingUtils.findOrCreateMenu(atpoint, host);
           if (atpoint.getToolTipText() == null)
           {
-            atpoint.setToolTipText("Services at " + host);
+            atpoint.setToolTipText(MessageManager.formatMessage("label.services_at", new String[]{host}));
           }
         }
         if (bytype)
@@ -526,7 +529,7 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
               }
             });
             hitm.setToolTipText(JvSwingUtils
-                    .wrapTooltip("Opens the JABAWS server's homepage in web browser"));
+                    .wrapTooltip(true, MessageManager.getString("label.open_jabaws_web_page")));
             lasthostFor.put(service.action, host);
           }
           hostLabels.add(host + service.serviceType