First patch for * JAL-493

[jalview.git] / src / jalview / ws / JPredThread.java

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