Merge branch 'releases/Release_2_11_3_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 d624c5c..2e4631f 100644 (file)
--- a/src/jalview/ws/jws2/Jws2Discoverer.java
+++ b/src/jalview/ws/jws2/Jws2Discoverer.java
@@ -195,7 +195,7 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
               .loadClass("compbio.ws.client.Jws2Client");
     } catch (ClassNotFoundException e)
     {
-      System.err.println(
+      jalview.bin.Console.errPrintln(
               "Not enabling JABA Webservices : client jar is not available."
                       + "\nPlease check that your webstart JNLP file is up to date!");
       running = false;
@@ -314,7 +314,7 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
     {
       services = new Vector<>();
     }
-    System.out.println(
+    jalview.bin.Console.outPrintln(
             "Discovered service: " + jwsservers + " " + service.toString());
     // Jws2Instance service = new Jws2Instance(jwsservers, srv.toString(),
     // service2);
@@ -492,8 +492,7 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
       ArrayList<Jws2Instance> hostservices = hosts.get(service.getHost());
       if (hostservices == null)
       {
-        hosts.put(service.getHost(),
-                hostservices = new ArrayList<>());
+        hosts.put(service.getHost(), hostservices = new ArrayList<>());
         hostlist.add(service.getHost());
       }
       hostservices.add(service);
@@ -601,12 +600,14 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
               {
                 if (getDiscoverer().services != null)
                 {
-                  System.out.println("Changesupport: There are now "
-                          + getDiscoverer().services.size() + " services");
+                  jalview.bin.Console
+                          .outPrintln("Changesupport: There are now "
+                                  + getDiscoverer().services.size()
+                                  + " services");
                   int i = 1;
                   for (Jws2Instance instance : getDiscoverer().services)
                   {
-                    System.out.println("Service " + i++ + " "
+                    jalview.bin.Console.outPrintln("Service " + i++ + " "
                             + instance.getClass() + "@" + instance.getHost()
                             + ": " + instance.getActionText());
                   }
@@ -736,8 +737,7 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
 
   public Vector<Jws2Instance> getServices()
   {
-    return (services == null) ? new Vector<>()
-            : new Vector<>(services);
+    return (services == null) ? new Vector<>() : new Vector<>(services);
   }
 
   /**