Merge branch 'jpred-fix' into bug/JAL-3807_jpred-with-slivka

[jalview.git] / src / jalview / ws / slivkaws / SlivkaMsaServiceInstance.java

diff --git a/src/jalview/ws/slivkaws/SlivkaMsaServiceInstance.java b/src/jalview/ws/slivkaws/SlivkaMsaServiceInstance.java
index 93c0bdb..8d6332c 100644 (file)
--- a/src/jalview/ws/slivkaws/SlivkaMsaServiceInstance.java
+++ b/src/jalview/ws/slivkaws/SlivkaMsaServiceInstance.java
@@ -2,9 +2,6 @@ package jalview.ws.slivkaws;
 
 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;
@@ -16,7 +13,6 @@ import java.io.IOException;
 import java.rmi.ServerError;
 import java.util.List;
 
-import compbio.data.msa.Category;
 import uk.ac.dundee.compbio.slivkaclient.RemoteFile;
 import uk.ac.dundee.compbio.slivkaclient.SlivkaClient;
 import uk.ac.dundee.compbio.slivkaclient.SlivkaService;
@@ -42,10 +38,10 @@ public class SlivkaMsaServiceInstance extends SlivkaWSInstance implements Multip
       List<RemoteFile> files = client.getJobResults(jobId.getJobId());
       for (RemoteFile f : files)
       {
-        if (f.getMimeType().equals("application/clustal") 
-            || f.getMimeType().equals("application/fasta"))
+        var aln = readAlignment(f);
+        if (aln != null)
         {
-          return readAlignment(f);
+          return aln;
         }
       }
     } catch (IOException e)