(JAL-978) refactored JABAWS2 service handle class to own package

[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 9a3796d..8907b58 100644 (file)
--- a/src/jalview/ws/jws2/Jws2Discoverer.java
+++ b/src/jalview/ws/jws2/Jws2Discoverer.java
@@ -22,7 +22,6 @@ import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
-import java.io.Closeable;
 import java.net.ConnectException;
 import java.net.URL;
 import java.util.ArrayList;
@@ -46,13 +45,10 @@ import jalview.gui.Desktop;
 import jalview.gui.JalviewChangeSupport;
 import jalview.gui.JvSwingUtils;
 import jalview.ws.WSMenuEntryProviderI;
-import jalview.ws.jws2.Jws2Discoverer.Jws2Instance;
-import jalview.ws.params.ParamDatastoreI;
-import compbio.data.msa.MsaWS;
+import jalview.ws.jws2.jabaws2.Jws2Instance;
+import compbio.data.msa.JABAService;
 import compbio.metadata.Option;
 import compbio.metadata.Preset;
-import compbio.metadata.PresetManager;
-import compbio.metadata.RunnerConfig;
 import compbio.ws.client.Jws2Client;
 import compbio.ws.client.Services;
 
@@ -227,142 +223,6 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
     service.hasParameters();
   }
 
-  public class Jws2Instance
-  {
-    public String hosturl;
-
-    public String serviceType;
-
-    public MsaWS service;
-
-    public Jws2Instance(String hosturl, String serviceType, MsaWS service)
-    {
-      super();
-      this.hosturl = hosturl;
-      this.serviceType = serviceType;
-      this.service = service;
-    }
-
-    PresetManager presets = null;
-
-    public JabaParamStore paramStore = null;
-
-    /**
-     * non thread safe - gets the presets for this service (blocks whilst it
-     * calls the service to get the preset set)
-     * 
-     * @return service presets or null if exceptions were raised.
-     */
-    public PresetManager getPresets()
-    {
-      if (presets == null)
-      {
-        try
-        {
-          presets = service.getPresets();
-        } catch (Exception ex)
-        {
-          System.err
-                  .println("Exception when retrieving presets for service "
-                          + serviceType + " at " + hosturl);
-        }
-      }
-      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 "Align with " + serviceType;
-    }
-
-    /**
-     * non-thread safe - blocks whilst accessing service to get complete set of
-     * available options and parameters
-     * 
-     * @return
-     */
-    public RunnerConfig getRunnerConfig()
-    {
-      return service.getRunnerOptions();
-    }
-
-    @Override
-    protected void finalize() throws Throwable
-    {
-      if (service != null)
-      {
-        try
-        {
-          Closeable svc = (Closeable) service;
-          service = null;
-          svc.close();
-        } catch (Exception e)
-        {
-        }
-        ;
-      }
-      super.finalize();
-    }
-
-    public ParamDatastoreI getParamStore()
-    {
-      if (paramStore == null)
-      {
-        try
-        {
-          paramStore = new JabaParamStore(this,
-                  (Desktop.instance != null ? Desktop
-                          .getUserParameterStore() : null));
-        } catch (Exception ex)
-        {
-        }
-
-      }
-      return paramStore;
-    }
-
-    public String getUri()
-    {
-      // this is only valid for Jaba 1.0 - this formula might have to change!
-      return hosturl
-              + (hosturl.lastIndexOf("/") == (hosturl.length() - 1) ? ""
-                      : "/") + serviceType;
-    }
-
-    private boolean hasParams = false, lookedForParams = false;
-
-    public boolean hasParameters()
-    {
-      if (!lookedForParams)
-      {
-        lookedForParams = true;
-        try
-        {
-          hasParams = (getRunnerConfig().getArguments().size() > 0);
-        } catch (Exception e)
-        {
-
-        }
-      }
-      return hasParams;
-    }
-  };
-
   /**
    * holds list of services.
    */