Merge branch 'improvement/JAL-3848_slivka_0.8' into alpha/JAL-3066_Jalview_212_slivka...

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

diff --git a/src/jalview/ws/slivkaws/SlivkaJPredServiceInstance.java b/src/jalview/ws/slivkaws/SlivkaJPredServiceInstance.java
index 462be28..3958198 100644 (file)
--- a/src/jalview/ws/slivkaws/SlivkaJPredServiceInstance.java
+++ b/src/jalview/ws/slivkaws/SlivkaJPredServiceInstance.java
@@ -2,6 +2,7 @@ package jalview.ws.slivkaws;
 
 import java.io.IOError;
 import java.io.IOException;
+import java.util.Collection;
 import java.util.List;
 
 import jalview.datamodel.AlignmentI;
@@ -63,9 +64,10 @@ public class SlivkaJPredServiceInstance extends SlivkaWSInstance
   @Override
   public AlignmentI getAlignment(JobId jobId) throws Exception
   {
-    List<RemoteFile> files;
+    Collection<RemoteFile> files;
     try {
-      files = client.getJobResults(jobId.getJobId());
+      var job = client.getJob(jobId.getJobId());
+      files = job.getResults();
       for (RemoteFile f : files) {
         var alignment = readAlignment(f);
         if (alignment != null)
@@ -83,12 +85,12 @@ public class SlivkaJPredServiceInstance extends SlivkaWSInstance
   @Override
   public JPredFile getPrediction(JobId jobId) throws Exception
   {
-    List<RemoteFile> files = client.getJobResults(jobId.getJobId());
+    Collection<RemoteFile> files = client.getJob(jobId.getJobId()).getResults();
     for (RemoteFile f : files)
     {
       if (f.getLabel().equals("concise"))
       {
-        return new JPredFile(f.getURL(), DataSourceType.URL);
+        return new JPredFile(f.getContentUrl(), DataSourceType.URL);
       }
     }
     return null;