JAL-3070 pull up logic for offering a parameters dialog for a service to base client...

[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 334f3c3..b4d498d 100644 (file)
--- a/src/jalview/ws/jws2/Jws2Client.java
+++ b/src/jalview/ws/jws2/Jws2Client.java
@@ -23,15 +23,12 @@ package jalview.ws.jws2;
 import jalview.api.AlignCalcWorkerI;
 import jalview.bin.Cache;
 import jalview.gui.AlignFrame;
-import jalview.gui.Desktop;
 import jalview.gui.JvSwingUtils;
-import jalview.gui.WsJobParameters;
 import jalview.util.MessageManager;
 import jalview.ws.jws2.dm.AAConSettings;
 import jalview.ws.jws2.dm.JabaWsParamSet;
 import jalview.ws.jws2.jabaws2.Jws2Instance;
 import jalview.ws.params.ArgumentI;
-import jalview.ws.params.ParamDatastoreI;
 import jalview.ws.params.WsParamSetI;
 import jalview.ws.uimodel.AlignAnalysisUIText;
 
@@ -53,15 +50,10 @@ import javax.swing.event.MenuListener;
  */
 public abstract class Jws2Client extends jalview.ws.WSClient
 {
-  protected WsParamSetI preset;
-
-  protected List<ArgumentI> paramset;
-
   public Jws2Client(AlignFrame _alignFrame, WsParamSetI preset,
           List<ArgumentI> arguments)
   {
-    alignFrame = _alignFrame;
-    this.preset = preset;
+    super(_alignFrame, preset, arguments);
     if (preset != null)
     {
       if (!((preset instanceof JabaPreset)
@@ -82,63 +74,11 @@ public abstract class Jws2Client extends jalview.ws.WSClient
     }
     else
     {
-      // just provided with a bunch of arguments
-      this.paramset = arguments;
+      // TODO: verify that paramset is compatible with the service being
+      // contacted
     }
   }
 
-  boolean processParams(Jws2Instance sh, boolean editParams)
-  {
-    return processParams(sh, editParams, false);
-  }
-
-  protected boolean processParams(Jws2Instance sh, boolean editParams,
-          boolean adjustingExisting)
-  {
-
-    if (editParams)
-    {
-      if (sh.paramStore == null)
-      {
-        sh.paramStore = new JabaParamStore(sh,
-                Desktop.getUserParameterStore());
-      }
-      WsJobParameters jobParams = (preset == null && paramset != null
-              && paramset.size() > 0)
-                      ? new WsJobParameters((ParamDatastoreI) null, sh,
-                              (WsParamSetI) null,
-                              JabaParamStore.getJwsArgsfromJaba(paramset))
-                      : new WsJobParameters((ParamDatastoreI) null, sh,
-                              preset,
-                              (List<ArgumentI>) null);
-      if (adjustingExisting)
-      {
-        jobParams.setName(MessageManager
-                .getString("label.adjusting_parameters_for_calculation"));
-      }
-      if (!jobParams.showRunDialog())
-      {
-        return false; // dialog cancelled
-      }
-
-      WsParamSetI prset = jobParams.getPreset();
-      if (prset == null)
-      {
-        paramset = jobParams.isServiceDefaults() ? null
-                : JabaParamStore
-                        .getJabafromJwsArgs(jobParams.getJobParams());
-        this.preset = null;
-      }
-      else
-      {
-        this.preset = prset; // ((JabaPreset) prset).p;
-        paramset = null; // no user supplied parameters.
-      }
-    }
-    return true;
-
-  }
-
   public Jws2Client()
   {
     // anonymous constructor - used for headless method calls only