X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2FJPredThread.java;h=3589c165b48f1a8bb8d06b3adea3ef06d9db05cb;hb=39c0b5e5d2ff4352d36bb6705121dc5ed14ba81b;hp=98c9506b7f9fbca668d20a3fb60fe1fd796da81c;hpb=fe66b18b34201857669c2b5b44435a397af202d8;p=jalview.git

diff --git a/src/jalview/ws/JPredThread.java b/src/jalview/ws/JPredThread.java
index 98c9506..3589c16 100644
--- a/src/jalview/ws/JPredThread.java
+++ b/src/jalview/ws/JPredThread.java
@@ -22,17 +22,16 @@ import java.util.*;
 import jalview.analysis.*;
 import jalview.bin.*;
 import jalview.datamodel.*;
-import jalview.datamodel.Alignment;
 import jalview.gui.*;
 import jalview.io.*;
 import jalview.util.*;
 import vamsas.objects.simple.JpredResult;
 
-class JPredThread extends WSThread implements WSClientI
+class JPredThread extends JWS1Thread implements WSClientI
 {
   // TODO: put mapping between JPredJob input and input data here -
   // JNetAnnotation adding is done after result parsing.
-  class JPredJob extends WSThread.WSJob
+  class JPredJob extends WSJob
   {
     // TODO: make JPredJob deal only with what was sent to and received from a
     // JNet service
@@ -67,7 +66,7 @@ class JPredThread extends WSThread implements WSClientI
       return false;
     }
 
-    boolean hasValidInput()
+    public boolean hasValidInput()
     {
       if (sequence != null)
       {
@@ -421,7 +420,7 @@ class JPredThread extends WSThread implements WSClientI
     }
   }
 
-  void StartJob(WSJob j)
+  public void StartJob(AWsJob j)
   {
     if (!(j instanceof JPredJob))
     {
@@ -499,7 +498,7 @@ class JPredThread extends WSThread implements WSClientI
     }
   }
 
-  void parseResult()
+  public void parseResult()
   {
     int results = 0; // number of result sets received
     JobStateSummary finalState = new JobStateSummary();
@@ -642,9 +641,9 @@ class JPredThread extends WSThread implements WSClientI
     }
   }
 
-  void pollJob(WSJob job) throws Exception
+  public void pollJob(AWsJob job) throws Exception
   {
-    job.result = server.getresult(job.jobId);
+    ((JPredJob)job).result = server.getresult(job.jobId);
   }
 
   public boolean isCancellable()