JAL-724

[jalview.git] / src / jalview / ws / jws2 / MsaWSClient.java

diff --git a/src/jalview/ws/jws2/MsaWSClient.java b/src/jalview/ws/jws2/MsaWSClient.java
index 92f0a3e..8a352bf 100644 (file)
--- a/src/jalview/ws/jws2/MsaWSClient.java
+++ b/src/jalview/ws/jws2/MsaWSClient.java
@@ -50,7 +50,7 @@ public class MsaWSClient extends Jws2Client
 
   AlignFrame alignFrame;
 
-  private Preset preset;
+  private WsParamSetI preset;
 
   private List<Argument> paramset;
 
@@ -112,10 +112,11 @@ public class MsaWSClient extends Jws2Client
       return;
     }
     server = sh.service;
+    this.preset=preset;
     if (preset != null)
     {
-      if (preset instanceof JabaPreset)
-      {
+      if (!((preset instanceof JabaPreset) || preset instanceof JabaWsParamSet)) {
+      /*{
         this.preset = ((JabaPreset) preset).p;
       }
       else if (preset instanceof JabaWsParamSet)
@@ -137,7 +138,7 @@ public class MsaWSClient extends Jws2Client
         paramset = newargs;
       }
       else
-      {
+      {*/
         throw new Error(
                 "Implementation error: Can only instantiate Jaba parameter sets.");
       }
@@ -167,7 +168,7 @@ public class MsaWSClient extends Jws2Client
       }
       else
       {
-        this.preset = ((JabaPreset) prset).p;
+        this.preset = prset; // ((JabaPreset) prset).p;
         paramset = null; // no user supplied parameters.
       }
     }