Better treatment of error states and cancellability in wsclient.

diff --git a/src/jalview/gui/WebserviceInfo.java b/src/jalview/gui/WebserviceInfo.java
index 7ce77a3..a7d7fa1 100755 (executable)
--- a/src/jalview/gui/WebserviceInfo.java
+++ b/src/jalview/gui/WebserviceInfo.java
@@ -11,7 +11,8 @@ public class WebserviceInfo extends GWebserviceInfo
   public static final int STATE_QUEUING = 0;\r
   public static final int STATE_RUNNING = 1;\r
   public static final int STATE_STOPPED_OK = 2;\r
-  public static final int STATE_STOPPED_ERROR = 3;\r
+  public static final int STATE_CANCELLED_OK = 3;\r
+  public static final int STATE_STOPPED_ERROR = 4;\r
   int currentStatus = STATE_QUEUING;\r
   Image image;\r
   int angle = 0;\r
@@ -90,7 +91,7 @@ public class WebserviceInfo extends GWebserviceInfo
   {\r
     if (!serviceIsCancellable)\r
       JOptionPane.showInternalMessageDialog(Desktop.desktop,\r
-                                            "Cancel not implemented yet!!" ,\r
+                                            "This job cannot be cancelled." ,\r
                                             "Cancel job"\r
                                             ,JOptionPane.WARNING_MESSAGE);\r
     else\r
@@ -147,6 +148,11 @@ public class WebserviceInfo extends GWebserviceInfo
         case STATE_STOPPED_OK:\r
           g.drawString(title.concat(" - complete"), 60, 30);\r
           break;\r
+\r
+        case STATE_CANCELLED_OK:\r
+          g.drawString(title.concat(" - job cancelled!"), 60, 30);\r
+          break;\r
+\r
         case STATE_STOPPED_ERROR:\r
           g.drawString(title.concat(" - error!"), 60, 30);\r
           break;\r

diff --git a/src/jalview/io/JPredFile.java b/src/jalview/io/JPredFile.java
index 636a8d6..ac181ec 100755 (executable)
--- a/src/jalview/io/JPredFile.java
+++ b/src/jalview/io/JPredFile.java
@@ -18,6 +18,23 @@ public class JPredFile
   Vector conf;
   Hashtable Scores; // Hash of names and score vectors
   Hashtable Symscores; // indexes of symbol annotation properties in sequenceI vector
+  private int QuerySeqPosition = -1;
+  public void setQuerySeqPosition(int QuerySeqPosition)
+  {
+    this.QuerySeqPosition = QuerySeqPosition;
+  }
+
+  public int getQuerySeqPosition()
+  {
+    return QuerySeqPosition;
+  }
+  public Hashtable getScores() {
+    return Scores;
+  }
+  public Hashtable getSymscores() {
+    return Symscores;
+  }
+
   public JPredFile(String inStr)
   {
     super(inStr);
@@ -43,7 +60,6 @@ public class JPredFile
   /**
    * parse a JPred concise file into a sequence-alignment like object.
    */
-  int QuerySeqPosition;
   public void parse()
       throws IOException
   {

diff --git a/src/jalview/ws/MsaWSClient.java b/src/jalview/ws/MsaWSClient.java
index 44ffa11..91f8ebb 100755 (executable)
--- a/src/jalview/ws/MsaWSClient.java
+++ b/src/jalview/ws/MsaWSClient.java
@@ -87,6 +87,7 @@ public class MsaWSClient
           {\r
             // CANCELLED_JOB\r
             cancelledMessage = "Job cancelled.";\r
+            wsInfo.setStatus(WebserviceInfo.STATE_CANCELLED_OK);\r
             jobComplete = true;\r
             jobsRunning--;\r
             result = null;\r