X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fjws2%2FSequenceAnnotationWSClient.java;h=39217bbc13d32883156481ad75d08d63e8487606;hb=304e64fb34b32659be1bbfd39fb4e15b2f79586e;hp=a30a09ce7a363d7a3b6d6be79a7c9e257dbb2f00;hpb=61ff8fb4efa315c35149c9d11850d99e3d00c441;p=jalview.git diff --git a/src/jalview/ws/jws2/SequenceAnnotationWSClient.java b/src/jalview/ws/jws2/SequenceAnnotationWSClient.java index a30a09c..39217bb 100644 --- a/src/jalview/ws/jws2/SequenceAnnotationWSClient.java +++ b/src/jalview/ws/jws2/SequenceAnnotationWSClient.java @@ -20,21 +20,21 @@ */ package jalview.ws.jws2; -import java.util.Locale; - import jalview.api.AlignCalcWorkerI; import jalview.gui.AlignFrame; import jalview.gui.Desktop; import jalview.gui.JvSwingUtils; import jalview.util.MessageManager; -import jalview.ws.jws2.dm.AAConSettings; -import jalview.ws.jws2.jabaws2.Jws2Instance; +import jalview.ws.api.ServiceWithParameters; +import jalview.ws.params.AutoCalcSetting; import jalview.ws.params.WsParamSetI; import jalview.ws.uimodel.AlignAnalysisUIText; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.util.List; +import java.util.Locale; + import javax.swing.JMenu; import javax.swing.JMenuItem; @@ -53,7 +53,7 @@ public class SequenceAnnotationWSClient extends Jws2Client // TODO Auto-generated constructor stub } - public SequenceAnnotationWSClient(final Jws2Instance sh, + public SequenceAnnotationWSClient(final ServiceWithParameters sh, AlignFrame alignFrame, WsParamSetI preset, boolean editParams) { super(alignFrame, preset, null); @@ -63,8 +63,8 @@ public class SequenceAnnotationWSClient extends Jws2Client // dan think. Do I need to change this method to run RNAalifold through the // GUI - public void initSequenceAnnotationWSClient(final Jws2Instance sh, - AlignFrame alignFrame, WsParamSetI preset, boolean editParams) + private void initSequenceAnnotationWSClient(final ServiceWithParameters sh, + AlignFrame alignFrame, final WsParamSetI preset, boolean editParams) { // dan changed! dan test. comment out if conditional // if (alignFrame.getViewport().getAlignment().isNucleotide()) @@ -84,70 +84,96 @@ public class SequenceAnnotationWSClient extends Jws2Client // columns List clnts = alignFrame.getViewport() - .getCalcManager().getRegisteredWorkersOfClass(clientClass); - AbstractJabaCalcWorker worker; - if (clnts == null || clnts.size() == 0) + .getCalcManager() + .getWorkersOfClass(SeqAnnotationServiceCalcWorker.class); + + SeqAnnotationServiceCalcWorker tmpworker = null; + if (clnts != null) { - if (!processParams(sh, editParams)) + for (AlignCalcWorkerI _worker : clnts) { - return; + tmpworker = (SeqAnnotationServiceCalcWorker) _worker; + if (tmpworker.hasService() + && tmpworker.getService().getClass().equals(clientClass)) + { + break; + } + tmpworker = null; } - try - { - worker = (AbstractJabaCalcWorker) (clientClass - .getConstructor(new Class[] - { Jws2Instance.class, AlignFrame.class, WsParamSetI.class, - List.class }) - .newInstance(new Object[] - { sh, alignFrame, this.preset, paramset })); - } catch (Exception x) - { - x.printStackTrace(); - throw new Error( + } + final var worker = tmpworker; + if (worker == null) + { + processParams(sh, editParams).thenAccept((startJob) -> { + if (startJob) + { + final SeqAnnotationServiceCalcWorker worker_; + try + { + worker_ = new SeqAnnotationServiceCalcWorker(sh, alignFrame, this.preset, + paramset); + } catch (Exception x) + { + x.printStackTrace(); + throw new Error( MessageManager.getString("error.implementation_error"), x); - } - alignFrame.getViewport().getCalcManager().registerWorker(worker); - alignFrame.getViewport().getCalcManager().startWorker(worker); + } + alignFrame.getViewport().getCalcManager().registerWorker(worker_); + // also starts the worker + startSeqAnnotationWorker(sh, alignFrame, preset, editParams); + } + }); } else { - worker = (AbstractJabaCalcWorker) clnts.get(0); + WsParamSetI preset_; if (editParams) { paramset = worker.getArguments(); - preset = worker.getPreset(); + preset_ = worker.getPreset(); + } + else + { + preset_ = preset; } + processParams(sh, editParams, true).thenAccept((startJob) -> { + if (startJob) + { + // reinstate worker if it was blacklisted (might have happened due + // to + // invalid parameters) + alignFrame.getViewport().getCalcManager().enableWorker(worker); + worker.updateParameters(this.preset, paramset); + startSeqAnnotationWorker(sh, alignFrame, preset_, editParams); + } + }); - if (!processParams(sh, editParams, true)) + if (!processParams(sh, editParams, true).toCompletableFuture().join()) { return; } - // reinstate worker if it was blacklisted (might have happened due to - // invalid parameters) - alignFrame.getViewport().getCalcManager().enableWorker(worker); - worker.updateParameters(this.preset, paramset); } } if (sh.action.toLowerCase(Locale.ROOT).contains("disorder")) { // build IUPred style client. take sequences, returns annotation per // sequence. - if (!processParams(sh, editParams)) - { - return; - } - - alignFrame.getViewport().getCalcManager().startWorker( - new AADisorderClient(sh, alignFrame, preset, paramset)); + processParams(sh, editParams).thenAccept((startJob) -> { + if (startJob) + { + alignFrame.getViewport().getCalcManager().startWorker( + new SeqAnnotationServiceCalcWorker(sh, alignFrame, preset, paramset)); + } + }); } } - public SequenceAnnotationWSClient(AAConSettings fave, + public SequenceAnnotationWSClient(AutoCalcSetting fave, AlignFrame alignFrame, boolean b) { - super(alignFrame, fave.getPreset(), fave.getJobArgset()); + super(alignFrame, fave.getPreset(), fave.getArgumentSet()); initSequenceAnnotationWSClient(fave.getService(), alignFrame, fave.getPreset(), b); } @@ -158,18 +184,24 @@ public class SequenceAnnotationWSClient extends Jws2Client * @see jalview.ws.jws2.Jws2Client#attachWSMenuEntry(javax.swing.JMenu, * jalview.ws.jws2.jabaws2.Jws2Instance, jalview.gui.AlignFrame) */ - public void attachWSMenuEntry(JMenu wsmenu, final Jws2Instance service, + @Override + public void attachWSMenuEntry(JMenu wsmenu, + final ServiceWithParameters service, final AlignFrame alignFrame) { - if (registerAAConWSInstance(wsmenu, service, alignFrame)) + if (Jws2ClientFactory.registerAAConWSInstance(wsmenu, + service, alignFrame)) { // Alignment dependent analysis calculation WS gui return; } boolean hasparams = service.hasParameters(); - // Assume name ends in WS - String calcName = service.serviceType.substring(0, - service.serviceType.length() - 2); + String calcName = service.getName(); + if (calcName.endsWith("WS")) + { + // Remove "WS" suffix + calcName = calcName.substring(0, calcName.length() - 2); + } JMenuItem annotservice = new JMenuItem(MessageManager.formatMessage( "label.calcname_with_default_settings", new String[] @@ -180,7 +212,8 @@ public class SequenceAnnotationWSClient extends Jws2Client @Override public void actionPerformed(ActionEvent e) { - new SequenceAnnotationWSClient(service, alignFrame, null, false); + new SequenceAnnotationWSClient(service, alignFrame, + null, false); } }); wsmenu.add(annotservice); @@ -195,9 +228,11 @@ public class SequenceAnnotationWSClient extends Jws2Client annotservice.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { - new SequenceAnnotationWSClient(service, alignFrame, null, true); + new SequenceAnnotationWSClient(service, alignFrame, + null, true); } }); wsmenu.add(annotservice); @@ -219,9 +254,11 @@ public class SequenceAnnotationWSClient extends Jws2Client + "
" + preset.getDescription())); methodR.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { - new SequenceAnnotationWSClient(service, alignFrame, preset, + new SequenceAnnotationWSClient(service, + alignFrame, preset, false); } @@ -236,7 +273,7 @@ public class SequenceAnnotationWSClient extends Jws2Client { annotservice = new JMenuItem( MessageManager.getString("label.view_documentation")); - if (service.docUrl != null) + if (service != null && service.hasDocumentationUrl()) { annotservice.addActionListener(new ActionListener() { @@ -244,13 +281,14 @@ public class SequenceAnnotationWSClient extends Jws2Client @Override public void actionPerformed(ActionEvent arg0) { - Desktop.instance.showUrl(service.docUrl); + Desktop.getInstance().showUrl(service.getDocumentationUrl()); } }); annotservice.setToolTipText( JvSwingUtils.wrapTooltip(true, MessageManager.formatMessage( "label.view_service_doc_url", new String[] - { service.docUrl, service.docUrl }))); + { service.getDocumentationUrl(), + service.getDocumentationUrl() }))); wsmenu.add(annotservice); } }