X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws2%2Factions%2Fannotation%2FAnnotationTask.java;h=8a3b09174dd313f68b66e6ede026ca130a67aa11;hb=53169837abf9866f446a73315796c004a381640f;hp=e2a05a0cecb93271e7ac461373750a8956521071;hpb=5af246a3cd82fca26c0f96437f2b5299f33e58c1;p=jalview.git diff --git a/src/jalview/ws2/actions/annotation/AnnotationTask.java b/src/jalview/ws2/actions/annotation/AnnotationTask.java index e2a05a0..8a3b091 100644 --- a/src/jalview/ws2/actions/annotation/AnnotationTask.java +++ b/src/jalview/ws2/actions/annotation/AnnotationTask.java @@ -2,19 +2,13 @@ package jalview.ws2.actions.annotation; import java.io.IOException; import java.util.ArrayList; -import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; import jalview.analysis.AlignmentAnnotationUtils; -import jalview.api.AlignCalcManagerI2; -import jalview.api.AlignCalcWorkerI; import jalview.api.AlignViewportI; import jalview.api.FeatureColourI; -import jalview.api.PollableAlignCalcWorkerI; -import jalview.bin.Cache; -import jalview.bin.Console; import jalview.datamodel.AlignmentAnnotation; import jalview.datamodel.AlignmentI; import jalview.datamodel.AnnotatedCollectionI; @@ -23,25 +17,13 @@ import jalview.datamodel.ContiguousI; import jalview.datamodel.Mapping; import jalview.datamodel.SequenceI; import jalview.datamodel.features.FeatureMatcherSetI; -import jalview.schemes.FeatureSettingsAdapter; -import jalview.util.ArrayUtils; import jalview.util.MapList; -import jalview.util.MathUtils; -import jalview.util.Pair; -import jalview.workers.AlignCalcWorker; import jalview.ws.params.ArgumentI; -import jalview.ws2.actions.BaseJob; import jalview.ws2.actions.BaseTask; import jalview.ws2.actions.ServiceInputInvalidException; -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; -import jalview.ws2.api.WebServiceJobHandle; import jalview.ws2.client.api.AnnotationWebServiceClientI; -import jalview.ws2.helpers.DelegateJobEventListener; -import jalview.ws2.helpers.TaskEventSupport; public class AnnotationTask extends BaseTask { @@ -51,12 +33,6 @@ public class AnnotationTask extends BaseTask private final AlignViewportI viewport; - private JobStatus taskStatus = null; - - private AlignCalcWorkerAdapter worker = null; - - private DelegateJobEventListener jobEventHandler; - public AnnotationTask(AnnotationWebServiceClientI client, AnnotationAction action, List args, Credentials credentials, AlignViewportI viewport)