X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FWebserviceInfo.java;h=a7d7fa19f659e671f45cb5a2e546266a2493ed47;hb=a73f21e87de8310ecd2477f8d29c1967d90bded5;hp=26aa067c1d53d66463e352221a632d4060aaab84;hpb=2d235d86ceb55ebb6b9422b17a4603248e13998d;p=jalview.git

diff --git a/src/jalview/gui/WebserviceInfo.java b/src/jalview/gui/WebserviceInfo.java
index 26aa067..a7d7fa1 100755
--- a/src/jalview/gui/WebserviceInfo.java
+++ b/src/jalview/gui/WebserviceInfo.java
@@ -11,12 +11,22 @@ public class WebserviceInfo extends GWebserviceInfo
   public static final int STATE_QUEUING = 0;
   public static final int STATE_RUNNING = 1;
   public static final int STATE_STOPPED_OK = 2;
-  public static final int STATE_STOPPED_ERROR = 3;
+  public static final int STATE_CANCELLED_OK = 3;
+  public static final int STATE_STOPPED_ERROR = 4;
   int currentStatus = STATE_QUEUING;
   Image image;
   int angle = 0;
 
   String title="";
+  jalview.ws.WSClientI thisService;
+  boolean serviceIsCancellable;
+  public jalview.ws.WSClientI getthisService() {
+    return thisService;
+  }
+  public void setthisService(jalview.ws.WSClientI newservice) {
+    thisService = newservice;
+    serviceIsCancellable = newservice.isCancellable();
+  }
 
   public WebserviceInfo(String title, String info)
   {
@@ -79,10 +89,13 @@ public class WebserviceInfo extends GWebserviceInfo
 
   protected void cancel_actionPerformed(ActionEvent e)
   {
-    JOptionPane.showInternalMessageDialog(Desktop.desktop,
-                                          "Cancel not implemented yet!!" ,
-                                          "Cancel job"
-                                          ,JOptionPane.WARNING_MESSAGE);
+    if (!serviceIsCancellable)
+      JOptionPane.showInternalMessageDialog(Desktop.desktop,
+                                            "This job cannot be cancelled." ,
+                                            "Cancel job"
+                                            ,JOptionPane.WARNING_MESSAGE);
+    else
+      thisService.cancelJob();
   }
 
 
@@ -135,6 +148,11 @@ public class WebserviceInfo extends GWebserviceInfo
         case STATE_STOPPED_OK:
           g.drawString(title.concat(" - complete"), 60, 30);
           break;
+
+        case STATE_CANCELLED_OK:
+          g.drawString(title.concat(" - job cancelled!"), 60, 30);
+          break;
+
         case STATE_STOPPED_ERROR:
           g.drawString(title.concat(" - error!"), 60, 30);
           break;