X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fslivkaws%2FSlivkaMsaServiceInstance.java;fp=src%2Fjalview%2Fws%2Fslivkaws%2FSlivkaMsaServiceInstance.java;h=8d6332c13311a1da0f5e67578bec37901189df96;hb=b6bd3fa646b6728cd59c8d0de91270ab6c70f86f;hp=93c0bdbb744813007abbd01dddb59272b3d22d96;hpb=7e4b1da6e7cba557bb9d8e78fcd82b836d5f2d98;p=jalview.git diff --git a/src/jalview/ws/slivkaws/SlivkaMsaServiceInstance.java b/src/jalview/ws/slivkaws/SlivkaMsaServiceInstance.java index 93c0bdb..8d6332c 100644 --- 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 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)