JAL-4199 Tidy up imports

[jalview.git] / src / jalview / ws2 / actions / alignment / AlignmentTask.java

diff --git a/src/jalview/ws2/actions/alignment/AlignmentTask.java b/src/jalview/ws2/actions/alignment/AlignmentTask.java
index 6a0c4dd..0ac84ee 100644 (file)
--- a/src/jalview/ws2/actions/alignment/AlignmentTask.java
+++ b/src/jalview/ws2/actions/alignment/AlignmentTask.java
@@ -5,7 +5,6 @@ import static java.lang.String.format;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -14,7 +13,6 @@ import jalview.analysis.AlignmentSorter;
 import jalview.analysis.SeqsetUtils;
 import jalview.analysis.SeqsetUtils.SequenceInfo;
 import jalview.api.AlignViewportI;
-import jalview.bin.Cache;
 import jalview.bin.Console;
 import jalview.datamodel.AlignedCodonFrame;
 import jalview.datamodel.Alignment;
@@ -25,9 +23,8 @@ import jalview.datamodel.HiddenColumns;
 import jalview.datamodel.Sequence;
 import jalview.datamodel.SequenceI;
 import jalview.ws.params.ArgumentI;
-import jalview.ws2.actions.AbstractPollableTask;
+import jalview.ws2.actions.BaseTask;
 import jalview.ws2.actions.ServiceInputInvalidException;
-import jalview.ws2.actions.api.TaskEventListener;
 import jalview.ws2.api.Credentials;
 import jalview.ws2.api.JobStatus;
 import jalview.ws2.client.api.AlignmentWebServiceClientI;
@@ -39,7 +36,7 @@ import jalview.ws2.client.api.AlignmentWebServiceClientI;
  * @author mmwarowny
  *
  */
-class AlignmentTask extends AbstractPollableTask<AlignmentJob, AlignmentResult>
+class AlignmentTask extends BaseTask<AlignmentJob, AlignmentResult>
 {
   /* task parameters set in the constructor */
   private final AlignmentWebServiceClientI client;
@@ -62,13 +59,12 @@ class AlignmentTask extends AbstractPollableTask<AlignmentJob, AlignmentResult>
 
   AlignmentTask(AlignmentWebServiceClientI client, AlignmentAction action,
       List<ArgumentI> args, Credentials credentials,
-      AlignmentView msa, AlignViewportI viewport, boolean submitGaps,
-      TaskEventListener<AlignmentResult> eventListener)
+      AlignViewportI viewport, boolean submitGaps)
   {
-    super(client, args, credentials, eventListener);
+    super(client, args, credentials);
     this.client = client;
     this.action = action;
-    this.msa = msa;
+    this.msa = viewport.getAlignmentView(true);
     this.viewport = viewport;
     this.submitGaps = submitGaps;
     this.currentView = viewport.getAlignment();
@@ -80,7 +76,7 @@ class AlignmentTask extends AbstractPollableTask<AlignmentJob, AlignmentResult>
   }
   
   @Override
-  protected List<AlignmentJob> prepare() throws ServiceInputInvalidException
+  protected List<AlignmentJob> prepareJobs() throws ServiceInputInvalidException
   { 
     Console.info(format("starting alignment service %s:%s",
         client.getClientName(), action.getName()));
@@ -107,7 +103,7 @@ class AlignmentTask extends AbstractPollableTask<AlignmentJob, AlignmentResult>
   }
 
   @Override
-  protected AlignmentResult done() throws IOException
+  protected AlignmentResult collectResult(List<AlignmentJob> jobs) throws IOException
   {
     IOException lastIOE = null;
     for (AlignmentJob job : jobs)