JAL-3070 pull up hostURL and postURL to UIinfo and getter for action ext

[jalview.git] / src / jalview / ws / jws2 / jabaws2 / Jws2Instance.java

diff --git a/src/jalview/ws/jws2/jabaws2/Jws2Instance.java b/src/jalview/ws/jws2/jabaws2/Jws2Instance.java
index 69f9072..85ac238 100644 (file)
--- a/src/jalview/ws/jws2/jabaws2/Jws2Instance.java
+++ b/src/jalview/ws/jws2/jabaws2/Jws2Instance.java
@@ -41,7 +41,6 @@ import compbio.metadata.RunnerConfig;
 
 public class Jws2Instance extends UIinfo
 {
-  public String hosturl;
 
   public JABAService service;
 
@@ -64,8 +63,7 @@ public class Jws2Instance extends UIinfo
   public Jws2Instance(String hosturl, String serviceType, String action,
           String description, JABAService service)
   {
-    super(action, action, serviceType, description);
-    this.hosturl = hosturl;
+    super(action, action, serviceType, description, hosturl);
     this.service = service;
     int p = description.indexOf("MORE INFORMATION:");
     if (p > -1)
@@ -107,32 +105,12 @@ public class Jws2Instance extends UIinfo
       } catch (Exception ex)
       {
         System.err.println("Exception when retrieving presets for service "
-                + getServiceType() + " at " + hosturl);
+                + getServiceType() + " at " + getHostURL());
       }
     }
     return presets;
   }
 
-  public String getHost()
-  {
-    return hosturl;
-    /*
-     * try { URL serviceurl = new URL(hosturl); if (serviceurl.getPort()!=80) {
-     * return serviceurl.getHost()+":"+serviceurl.getPort(); } return
-     * serviceurl.getHost(); } catch (Exception e) {
-     * System.err.println("Failed to parse service URL '" + hosturl +
-     * "' as a valid URL!"); } return null;
-     */
-  }
-
-  /**
-   * @return short description of what the service will do
-   */
-  public String getActionText()
-  {
-    return getAction() + " with " + getServiceType();
-  }
-
   /**
    * non-thread safe - blocks whilst accessing service to get complete set of
    * available options and parameters
@@ -192,11 +170,14 @@ public class Jws2Instance extends UIinfo
 
   public String getUri()
   {
+    // TODO verify that service parameter sets in projects are consistent with
+    // Jalview 2.10.4
     // this is only valid for Jaba 1.0 - this formula might have to change!
-    return hosturl
-            + (hosturl.lastIndexOf("/") == (hosturl.length() - 1) ? ""
+    return getHostURL()
+            + (getHostURL().lastIndexOf("/") == (getHostURL().length() - 1)
+                    ? ""
                     : "/")
-            + getServiceType();
+            + getName();
   }
 
   private boolean hasParams = false, lookedForParams = false;