Client threads for discovered web services.

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

diff --git a/src/jalview/ws/JPredClient.java b/src/jalview/ws/JPredClient.java
index e6f3899..c7508df 100755 (executable)
--- a/src/jalview/ws/JPredClient.java
+++ b/src/jalview/ws/JPredClient.java
@@ -33,10 +33,27 @@ public class JPredClient
   ext.vamsas.JPredWS server;\r
   String altitle = "";\r
   java.util.Hashtable SequenceInfo = null;\r
+  public JPredClient(ext.vamsas.ServiceHandle sh, String title, SequenceI seq) {\r
+    wsInfo = setWebService(sh);\r
+    startJPredClient(title, seq);\r
+  }\r
+  public JPredClient(ext.vamsas.ServiceHandle sh, String title, SequenceI[] msa) {\r
+    wsInfo = setWebService(sh);\r
+    startJPredClient(title, msa);\r
+  }\r
+\r
+  public JPredClient(String title, SequenceI[] msf) {\r
+    startJPredClient(title, msf);\r
+  }\r
 \r
-  public JPredClient(String title, SequenceI[] msf)\r
+  public JPredClient(String title, SequenceI seq) {\r
+    startJPredClient(title, seq);\r
+  }\r
+\r
+  private void startJPredClient(String title, SequenceI[] msf)\r
   {\r
-    wsInfo = setWebService();\r
+    if (wsInfo==null)\r
+      wsInfo = setWebService();\r
 \r
     SequenceI seq = msf[0];\r
     altitle = "JNet prediction on " + seq.getName() +\r
@@ -58,9 +75,10 @@ public class JPredClient
     jthread.start();\r
   }\r
 \r
-  public JPredClient(String title, SequenceI seq)\r
+  public void startJPredClient(String title, SequenceI seq)\r
   {\r
-    wsInfo = setWebService();\r
+    if (wsInfo==null)\r
+      wsInfo = setWebService();\r
     wsInfo.setProgressText("Job details for prediction on sequence :\n>" +\r
                            seq.getName() + "\n" +\r
                            AlignSeq.extractGaps("-. ", seq.getSequence()) +\r
@@ -284,6 +302,8 @@ public class JPredClient
       }\r
     }\r
 \r
+\r
+\r
     private void addFloatAnnotations(Alignment al, int[] gapmap,\r
                                      Vector values, String Symname,\r
                                      String Visname, float min,\r