Merge branch 'features/mchmmer' into merge/wsinterfaces_mchmmer_JAL-3070_JAL-1950

[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 0f1a25e..3e4cc97 100644 (file)
--- a/src/jalview/ws/jws2/Jws2Client.java
+++ b/src/jalview/ws/jws2/Jws2Client.java
@@ -28,9 +28,11 @@ import jalview.gui.JvSwingUtils;
 import jalview.gui.WebserviceInfo;
 import jalview.gui.WsJobParameters;
 import jalview.util.MessageManager;
+import jalview.ws.api.UIinfo;
 import jalview.ws.jws2.dm.AAConSettings;
 import jalview.ws.jws2.dm.JabaWsParamSet;
 import jalview.ws.jws2.jabaws2.Jws2Instance;
+import jalview.ws.params.ParamDatastoreI;
 import jalview.ws.params.WsParamSetI;
 import jalview.ws.uimodel.AlignAnalysisUIText;
 
@@ -108,8 +110,12 @@ public abstract class Jws2Client extends jalview.ws.WSClient
       }
       WsJobParameters jobParams = (preset == null && paramset != null
               && paramset.size() > 0)
-                      ? new WsJobParameters(null, sh, null, paramset)
-                      : new WsJobParameters(sh, preset);
+                      ? new WsJobParameters((ParamDatastoreI) null, sh,
+                              (WsParamSetI) null,
+                              paramset)
+                      : new WsJobParameters((ParamDatastoreI) null, sh,
+                              preset,
+                              (List<Argument>) null);
       if (adjustingExisting)
       {
         jobParams.setName(MessageManager
@@ -117,8 +123,9 @@ public abstract class Jws2Client extends jalview.ws.WSClient
       }
       if (!jobParams.showRunDialog())
       {
-        return false;
+        return false; // dialog cancelled
       }
+
       WsParamSetI prset = jobParams.getPreset();
       if (prset == null)
       {
@@ -142,19 +149,20 @@ public abstract class Jws2Client extends jalview.ws.WSClient
     // anonymous constructor - used for headless method calls only
   }
 
-  protected WebserviceInfo setWebService(Jws2Instance serv, boolean b)
+  protected WebserviceInfo setWebService(UIinfo serv, boolean b)
   {
-    // serviceHandle = serv;
-    String serviceInstance = serv.action; // serv.service.getClass().getName();
-    WebServiceName = serv.serviceType;
+    // TODO pullup
+    WebServiceName = serv.getName();
     WebServiceJobTitle = serv.getActionText();
-    WsURL = serv.hosturl;
+    WsURL = serv.getHostURL();
     if (!b)
     {
       return new WebserviceInfo(WebServiceJobTitle,
               WebServiceJobTitle + " using service hosted at "
-                      + serv.hosturl + "\n"
-                      + (serv.description != null ? serv.description : ""),
+                      + WsURL + "\n"
+                      + (serv.getDescription() != null
+                              ? serv.getDescription()
+                              : ""),
               false);
     }
     return null;
@@ -181,7 +189,7 @@ public abstract class Jws2Client extends jalview.ws.WSClient
   abstract void attachWSMenuEntry(JMenu wsmenu, final Jws2Instance service,
           final AlignFrame alignFrame);
 
-  protected boolean registerAAConWSInstance(final JMenu wsmenu,
+  static boolean registerAAConWSInstance(final JMenu wsmenu,
           final Jws2Instance service, final AlignFrame alignFrame)
   {
     final AlignAnalysisUIText aaui = service.getAlignAnalysisUI(); // null ; //
@@ -214,7 +222,7 @@ public abstract class Jws2Client extends jalview.ws.WSClient
       {
         AbstractJabaCalcWorker worker = (AbstractJabaCalcWorker) aaconClient
                 .get(0);
-        if (!worker.service.hosturl.equals(service.hosturl))
+        if (!worker.service.getHostURL().equals(service.getHostURL()))
         {
           // javax.swing.SwingUtilities.invokeLater(new Runnable()
           {
@@ -365,10 +373,11 @@ public abstract class Jws2Client extends jalview.ws.WSClient
     else
     {
       if (service != null
-              && !fave.getService().hosturl.equals(service.hosturl))
+              && !fave.getService().getHostURL()
+                      .equals(service.getHostURL()))
       {
-        Cache.log.debug("Changing AACon service to " + service.hosturl
-                + " from " + fave.getService().hosturl);
+        Cache.log.debug("Changing AACon service to " + service.getHostURL()
+                + " from " + fave.getService().getHostURL());
         fave.setService(service);
       }
     }
@@ -386,12 +395,12 @@ public abstract class Jws2Client extends jalview.ws.WSClient
   {
     if (service != null)
     {
-      if (!service.serviceType.toString()
+      if (!service.getServiceType()
               .equals(compbio.ws.client.Services.AAConWS.toString()))
       {
         Cache.log.warn(
                 "Ignoring invalid preferred service for AACon calculations (service type was "
-                        + service.serviceType + ")");
+                        + service.getServiceType() + ")");
         service = null;
       }
       else