Merge branch 'tasks/JAL-3070_wsinterfaces' into alpha/JAL-3362_Jalview_212_alpha

diff --cc src/jalview/gui/AlignFrame.java
Simple merge

diff --cc src/jalview/ws/jws2/AADisorderClient.java
Simple merge

diff --cc src/jalview/ws/jws2/RNAalifoldClient.java
Simple merge

diff --cc src/jalview/ws/jws2/jabaws2/Jws2Instance.java
index e092192,3c409af..143bc1c
--- 1/src/jalview/ws/jws2/jabaws2/Jws2Instance.java
--- 2/src/jalview/ws/jws2/jabaws2/Jws2Instance.java
+++ b/src/jalview/ws/jws2/jabaws2/Jws2Instance.java
@@@ -38,13 -41,9 +41,9 @@@ import compbio.data.msa.SequenceAnnotat
  import compbio.metadata.PresetManager;
  import compbio.metadata.RunnerConfig;
  
- public class Jws2Instance implements AutoCloseable
+ public class Jws2Instance extends ServiceWithParameters
 -        implements JalviewServiceEndpointProviderI
++        implements JalviewServiceEndpointProviderI, AutoCloseable
  {
-   public String hosturl;
- 
-   public String serviceType;
- 
-   public String action;
  
    public JABAService service;
  
@@@ -176,9 -149,10 +149,10 @@@
          // ignore
        }
      }
 -    super.finalize();
 +    // super.finalize();
    }
  
+   @Override
    public ParamDatastoreI getParamStore()
    {
      if (paramStore == null)

diff --cc src/jalview/ws/rest/RestClient.java
Simple merge

diff --cc src/jalview/ws/rest/RestJobThread.java
Simple merge

diff --cc test/jalview/gui/PopupMenuTest.java
Simple merge

diff --cc test/jalview/ws/jabaws/RNAStructExportImport.java
index 889c003,d5a7e99..3c83b71
--- 1/test/jalview/ws/jabaws/RNAStructExportImport.java
--- 2/test/jalview/ws/jabaws/RNAStructExportImport.java
+++ b/test/jalview/ws/jabaws/RNAStructExportImport.java
@@@ -32,7 -33,7 +32,8 @@@ import jalview.io.DataSourceType
  import jalview.io.FileFormat;
  import jalview.io.FormatAdapter;
  import jalview.io.StockholmFileTest;
 +import jalview.project.Jalview2XML;
+ import jalview.ws.jws2.JabaParamStore;
  import jalview.ws.jws2.Jws2Discoverer;
  import jalview.ws.jws2.RNAalifoldClient;
  import jalview.ws.jws2.SequenceAnnotationWSClient;

diff --cc test/jalview/ws/rest/ShmmrRSBSService.java
Simple merge