X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fgui%2FWebserviceInfo.java;h=7ce77a30598cc03a404745f5c4e481233e70f7fe;hb=e7ed63f1ea56432246a6ed1553f0fe56d26f56ea;hp=63a289f0ecb0e9d5e981407ce161399990ec81bf;hpb=615b41750fca2811d8e26a22c71224725383c218;p=jalview.git

diff --git a/src/jalview/gui/WebserviceInfo.java b/src/jalview/gui/WebserviceInfo.java
index 63a289f..7ce77a3 100755
--- a/src/jalview/gui/WebserviceInfo.java
+++ b/src/jalview/gui/WebserviceInfo.java
@@ -17,6 +17,15 @@ public class WebserviceInfo extends GWebserviceInfo
   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,24 +88,33 @@ 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,
+                                            "Cancel not implemented yet!!" ,
+                                            "Cancel job"
+                                            ,JOptionPane.WARNING_MESSAGE);
+    else
+      thisService.cancelJob();
   }
 
 
   class AnimatedPanel extends JPanel implements Runnable
   {
+    long startTime=0;
     public void run()
     {
+      startTime = System.currentTimeMillis();
       while(currentStatus<STATE_STOPPED_OK)
       try
       {
-        Thread.sleep(10);
-        angle += 1;
+        Thread.sleep(50);
+
+        int units =  (int)((System.currentTimeMillis()-startTime)/10f);
+        angle += units;
         angle %= 360;
+        startTime = System.currentTimeMillis();
         repaint();
+
       }
       catch (Exception ex)
       {}
@@ -105,7 +123,7 @@ public class WebserviceInfo extends GWebserviceInfo
 
     }
 
-    public void paintComponent(Graphics g1)
+   synchronized public void  paintComponent(Graphics g1)
     {
       Graphics2D g = (Graphics2D) g1;
       g.setColor(Color.white);