JAL-4199 Fix interactive jobs not being stopped

[jalview.git] / src / jalview / ws2 / actions / annotation / AlignCalcWorkerAdapter.java

diff --git a/src/jalview/ws2/actions/annotation/AlignCalcWorkerAdapter.java b/src/jalview/ws2/actions/annotation/AlignCalcWorkerAdapter.java
index 7e8724a..7a58a89 100644 (file)
--- a/src/jalview/ws2/actions/annotation/AlignCalcWorkerAdapter.java
+++ b/src/jalview/ws2/actions/annotation/AlignCalcWorkerAdapter.java
@@ -1,6 +1,5 @@
 package jalview.ws2.actions.annotation;
 
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
@@ -8,17 +7,13 @@ import java.util.concurrent.CopyOnWriteArrayList;
 import jalview.api.AlignViewportI;
 import jalview.api.AlignmentViewPanel;
 import jalview.api.PollableAlignCalcWorkerI;
-import jalview.datamodel.Alignment;
 import jalview.datamodel.AlignmentAnnotation;
 import jalview.datamodel.AlignmentI;
 import jalview.workers.AlignCalcWorker;
 import jalview.ws.params.ArgumentI;
-import jalview.ws2.actions.alignment.AlignmentResult;
-import jalview.ws2.actions.api.JobI;
 import jalview.ws2.actions.api.TaskEventListener;
 import jalview.ws2.actions.api.TaskI;
 import jalview.ws2.api.Credentials;
-import jalview.ws2.api.JobStatus;
 
 public class AlignCalcWorkerAdapter extends AlignCalcWorker implements PollableAlignCalcWorkerI
 {
@@ -55,6 +50,12 @@ public class AlignCalcWorkerAdapter extends AlignCalcWorker implements PollableA
   }
 
   @Override
+  public String getCalcName()
+  {
+    return action.getWebService().getName();
+  }
+
+  @Override
   public void updateAnnotation()
   {
 
@@ -135,4 +136,10 @@ public class AlignCalcWorkerAdapter extends AlignCalcWorker implements PollableA
     if (currentTask != null)
       currentTask.removeTaskEventListener(listener);
   }
+
+  @Override
+  public String toString()
+  {
+    return "AlignCalcWorkerAdapter for " + getCalcName();
+  }
 }