Merge branch 'alpha/merge_212_JalviewJS_2112' into spike/JAL-3622_Scanner_swingjs_J21...

[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 d11174e..30c1cb7 100644 (file)
--- a/src/jalview/ws/jws2/Jws2Discoverer.java
+++ b/src/jalview/ws/jws2/Jws2Discoverer.java
@@ -23,7 +23,7 @@ package jalview.ws.jws2;
 import jalview.bin.Cache;
 import jalview.gui.AlignFrame;
 import jalview.util.MessageManager;
-import jalview.ws.WSMenuEntryProviderI;
+import jalview.ws.WSDiscovererI;
 import jalview.ws.api.ServiceWithParameters;
 import jalview.ws.jws2.jabaws2.Jws2Instance;
 import jalview.ws.params.ParamDatastoreI;
@@ -51,7 +51,7 @@ import compbio.ws.client.Services;
  * @author JimP
  * 
  */
-public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
+public class Jws2Discoverer implements WSDiscovererI, Runnable
 {
   public static final String COMPBIO_JABAWS = "http://www.compbio.dundee.ac.uk/jabaws";
 
@@ -240,7 +240,6 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
       } catch (Exception e)
       {
       }
-      ;
       for (JabaWsServerQuery squery : qrys)
       {
         if (squery.isRunning())
@@ -349,6 +348,11 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
             alignFrame, typeFilter);
   }
 
+  /**
+   * 
+   * @param args
+   * @j2sIgnore
+   */
   public static void main(String[] args)
   {
     if (args.length > 0)
@@ -358,7 +362,6 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
       {
         testUrls.add(url);
       }
-      ;
     }
     Thread runner = getDiscoverer()
             .startDiscoverer(new PropertyChangeListener()
@@ -391,7 +394,6 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
       } catch (InterruptedException e)
       {
       }
-      ;
     }
     try
     {
@@ -415,16 +417,19 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
     return discoverer;
   }
 
+  @Override
   public boolean hasServices()
   {
     return !running && services != null && services.size() > 0;
   }
 
+  @Override
   public boolean isRunning()
   {
     return running;
   }
 
+  @Override
   public void setServiceUrls(List<String> wsUrls)
   {
     if (wsUrls != null && !wsUrls.isEmpty())
@@ -451,6 +456,7 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
    * 
    * @return
    */
+  @Override
   public List<String> getServiceUrls()
   {
     if (testUrls != null)
@@ -504,6 +510,7 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
     return urls;
   }
 
+  @Override
   public Vector<ServiceWithParameters> getServices()
   {
     return (services == null) ? new Vector<>()
@@ -516,7 +523,8 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
    * @param foo
    * @return
    */
-  public static boolean testServiceUrl(URL foo)
+  @Override
+  public boolean testServiceUrl(URL foo)
   {
     try
     {
@@ -564,6 +572,7 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
    * @param changeSupport2
    * @return new thread
    */
+  @Override
   public Thread startDiscoverer(PropertyChangeListener changeSupport2)
   {
     /*    if (restart())
@@ -645,6 +654,7 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
    * @return a human readable report of any problems with the service URLs used
    *         for discovery
    */
+  @Override
   public String getErrorMessages()
   {
     if (!isRunning() && !isAborted())
@@ -693,21 +703,22 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
     return null;
   }
 
+  @Override
   public int getServerStatusFor(String url)
   {
     if (validServiceUrls != null && validServiceUrls.contains(url))
     {
-      return 1;
+      return STATUS_OK;
     }
     if (urlsWithoutServices != null && urlsWithoutServices.contains(url))
     {
-      return 0;
+      return STATUS_NO_SERVICES;
     }
     if (invalidServiceUrls != null && invalidServiceUrls.contains(url))
     {
-      return -1;
+      return STATUS_INVALID;
     }
-    return -2;
+    return STATUS_UNKNOWN;
   }
 
   /**