X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fslivkaws%2FSlivkaMsaServiceInstance.java;h=a04cff589b58051143e95449bb42a6dc879b98f8;hb=95f4ae66fbaecbbdc1c3ab3c6c9c611a3a9a3e46;hp=a65e93ee07c3be996fe6a1a5bab2e41b61dde287;hpb=5d9222f19e4fbdd9b396853a0442b0e6c5eb98a4;p=jalview.git

diff --git a/src/jalview/ws/slivkaws/SlivkaMsaServiceInstance.java b/src/jalview/ws/slivkaws/SlivkaMsaServiceInstance.java
index a65e93e..a04cff5 100644
--- a/src/jalview/ws/slivkaws/SlivkaMsaServiceInstance.java
+++ b/src/jalview/ws/slivkaws/SlivkaMsaServiceInstance.java
@@ -1,29 +1,25 @@
 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.List;
-
 import uk.ac.dundee.compbio.slivkaclient.RemoteFile;
 import uk.ac.dundee.compbio.slivkaclient.SlivkaClient;
 import uk.ac.dundee.compbio.slivkaclient.SlivkaService;
 
 public class SlivkaMsaServiceInstance extends SlivkaWSInstance implements MultipleSequenceAlignmentI
 {
-  SlivkaMsaServiceInstance(SlivkaClient client, SlivkaService service) {
-    super(client, service, "Sequence Alignment");
+  SlivkaMsaServiceInstance(SlivkaClient client, SlivkaService service, String category) {
+    super(client, service, category);
     style = ServiceClient.MSAWSCLIENT;
   }
 
@@ -42,14 +38,7 @@ public class SlivkaMsaServiceInstance extends SlivkaWSInstance implements Multip
       files = client.getJobResults(jobId.getJobId());
       for (RemoteFile f : files)
       {
-        if (f.getMimeType().equals("application/clustal"))
-        {
-          return new FormatAdapter().readFile(f.getURL().toString(), DataSourceType.URL, FileFormat.Clustal);
-        }
-        else if (f.getMimeType().equals("application/fasta"))
-        {
-          return new FormatAdapter().readFile(f.getURL().toString(), DataSourceType.URL, FileFormat.Fasta);
-        }
+        return readAlignment(f);
       }
     } catch (IOException e)
     {