From f811970db4f21e8cd1b3a0cb435a711e66d8bcd9 Mon Sep 17 00:00:00 2001 From: Jim Procter Date: Thu, 26 Sep 2019 16:38:12 +0100 Subject: [PATCH 1/1] =?utf8?q?JAL-3070=20oops=20-=20refactor=20Slivka=E2=80=99?= =?utf8?q?s=20service=20stub=20too=20:)?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/jalview/ws/slivkaws/SlivkaAnnotationServiceInstance.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/jalview/ws/slivkaws/SlivkaAnnotationServiceInstance.java b/src/jalview/ws/slivkaws/SlivkaAnnotationServiceInstance.java index 4d2c4fb..4fb35a0 100644 --- a/src/jalview/ws/slivkaws/SlivkaAnnotationServiceInstance.java +++ b/src/jalview/ws/slivkaws/SlivkaAnnotationServiceInstance.java @@ -1,11 +1,11 @@ package jalview.ws.slivkaws; +import jalview.api.FeatureColourI; import jalview.datamodel.AlignmentAnnotation; import jalview.datamodel.SequenceI; +import jalview.datamodel.features.FeatureMatcherSetI; import jalview.ws.api.JobId; import jalview.ws.api.SequenceAnnotationServiceI; -import jalview.ws.gui.AnnotationWsJob; -import jalview.ws.jws2.SeqAnnotationServiceCalcWorker; import jalview.ws.params.ArgumentI; import jalview.ws.params.WsParamSetI; @@ -13,6 +13,7 @@ import java.io.ByteArrayInputStream; import java.io.InputStream; import java.util.HashMap; import java.util.List; +import java.util.Map; import uk.ac.dundee.compbio.slivkaclient.FormField; import uk.ac.dundee.compbio.slivkaclient.RemoteFile; @@ -66,8 +67,9 @@ public class SlivkaAnnotationServiceInstance extends SlivkaWSInstance implements } @Override - public List getAlignmentAnnotation(AnnotationWsJob running, - SeqAnnotationServiceCalcWorker abstractJabaCalcWorker) throws Throwable + public List getAnnotationResult(JobId job, + List seqs, Map featureColours, + Map featureFilters) throws Throwable { // TODO Auto-generated method stub return null; -- 1.7.10.2