X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fslivkaws%2FSlivkaMsaServiceInstance.java;h=374d2eb97cc8a56b13a62198267e335522079c6c;hb=49db0dff1da16c3355b43a41498c1fc93ef47e91;hp=a04cff589b58051143e95449bb42a6dc879b98f8;hpb=992a0adb0deed8313fde7cad88837355336e58a5;p=jalview.git

diff --git a/src/jalview/ws/slivkaws/SlivkaMsaServiceInstance.java b/src/jalview/ws/slivkaws/SlivkaMsaServiceInstance.java
index a04cff5..374d2eb 100644
--- a/src/jalview/ws/slivkaws/SlivkaMsaServiceInstance.java
+++ b/src/jalview/ws/slivkaws/SlivkaMsaServiceInstance.java
@@ -1,17 +1,22 @@
 package jalview.ws.slivkaws;
 
-import java.io.IOError;
-import java.io.IOException;
-import java.rmi.ServerError;
-import java.util.List;
 
 import jalview.datamodel.AlignmentI;
 import jalview.datamodel.SequenceI;
+import jalview.io.DataSourceType;
+import jalview.io.FileFormat;
+import jalview.io.FormatAdapter;
 import jalview.ws.api.JobId;
 import jalview.ws.api.MultipleSequenceAlignmentI;
 import jalview.ws.params.ArgumentI;
 import jalview.ws.params.InvalidArgumentException;
 import jalview.ws.params.WsParamSetI;
+import java.io.IOError;
+import java.io.IOException;
+import java.rmi.ServerError;
+import java.util.Collection;
+import java.util.List;
+
 import uk.ac.dundee.compbio.slivkaclient.RemoteFile;
 import uk.ac.dundee.compbio.slivkaclient.SlivkaClient;
 import uk.ac.dundee.compbio.slivkaclient.SlivkaService;
@@ -32,13 +37,21 @@ public class SlivkaMsaServiceInstance extends SlivkaWSInstance implements Multip
   @Override
   public AlignmentI getAlignmentFor(JobId jobId) throws InvalidArgumentException, ServerError, IOError
   {
-    List<RemoteFile> files;
+    Collection<RemoteFile> files;
     try
     {
-      files = client.getJobResults(jobId.getJobId());
+      var slivkaJob = client.getJob(jobId.getJobId());
+      files = slivkaJob.getResults();
       for (RemoteFile f : files)
       {
-        return readAlignment(f);
+        if (f.getMediaType().equals("application/clustal"))
+        {
+          return new FormatAdapter().readFile(f.getContentUrl().toString(), DataSourceType.URL, FileFormat.Clustal);
+        }
+        else if (f.getMediaType().equals("application/fasta"))
+        {
+          return new FormatAdapter().readFile(f.getContentUrl().toString(), DataSourceType.URL, FileFormat.Fasta);
+        }
       }
     } catch (IOException e)
     {