X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fjws2%2FMsaWSClient.java;h=9caa803ede24509a0130c5be73c6c6904c634b34;hb=57738a1f3c19b1c3a00bd3ac5108f8cd0af32f99;hp=9ddc69a56f5f7dcca112b0e6ff9fb0584c21e00c;hpb=057f733ab390518a3641f1dedebd36c028bf03d6;p=jalview.git diff --git a/src/jalview/ws/jws2/MsaWSClient.java b/src/jalview/ws/jws2/MsaWSClient.java index 9ddc69a..9caa803 100644 --- a/src/jalview/ws/jws2/MsaWSClient.java +++ b/src/jalview/ws/jws2/MsaWSClient.java @@ -1,6 +1,6 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2) - * Copyright (C) 2014 The Jalview Authors + * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$) + * Copyright (C) $$Year-Rel$$ The Jalview Authors * * This file is part of Jalview. * @@ -20,16 +20,26 @@ */ package jalview.ws.jws2; +import java.util.Locale; + import java.awt.event.ActionEvent; import java.awt.event.ActionListener; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; import java.util.List; -import javax.swing.*; +import javax.swing.JMenu; +import javax.swing.JMenuItem; +import javax.swing.ToolTipManager; -import jalview.datamodel.*; -import jalview.gui.*; import compbio.data.msa.MsaWS; import compbio.metadata.Argument; +import jalview.datamodel.AlignmentI; +import jalview.datamodel.AlignmentView; +import jalview.gui.AlignFrame; +import jalview.gui.Desktop; +import jalview.gui.JvOptionPane; +import jalview.gui.JvSwingUtils; import jalview.util.MessageManager; import jalview.ws.jws2.jabaws2.Jws2Instance; import jalview.ws.params.WsParamSetI; @@ -49,7 +59,7 @@ public class MsaWSClient extends Jws2Client public MsaWSClient(Jws2Instance sh, String altitle, jalview.datamodel.AlignmentView msa, boolean submitGaps, - boolean preserveOrder, Alignment seqdataset, + boolean preserveOrder, AlignmentI seqdataset, AlignFrame _alignFrame) { this(sh, null, null, false, altitle, msa, submitGaps, preserveOrder, @@ -59,7 +69,7 @@ public class MsaWSClient extends Jws2Client public MsaWSClient(Jws2Instance sh, WsParamSetI preset, String altitle, jalview.datamodel.AlignmentView msa, boolean submitGaps, - boolean preserveOrder, Alignment seqdataset, + boolean preserveOrder, AlignmentI seqdataset, AlignFrame _alignFrame) { this(sh, preset, null, false, altitle, msa, submitGaps, preserveOrder, @@ -86,7 +96,7 @@ public class MsaWSClient extends Jws2Client public MsaWSClient(Jws2Instance sh, WsParamSetI preset, List arguments, boolean editParams, String altitle, jalview.datamodel.AlignmentView msa, boolean submitGaps, - boolean preserveOrder, Alignment seqdataset, + boolean preserveOrder, AlignmentI seqdataset, AlignFrame _alignFrame) { super(_alignFrame, preset, arguments); @@ -98,23 +108,28 @@ public class MsaWSClient extends Jws2Client if (!(sh.service instanceof MsaWS)) { // redundant at mo - but may change - JOptionPane - .showMessageDialog( - Desktop.desktop, - MessageManager.formatMessage("label.service_called_is_not_msa_service", new String[]{sh.serviceType}), - MessageManager.getString("label.internal_jalview_error"), JOptionPane.WARNING_MESSAGE); + JvOptionPane.showMessageDialog(Desktop.desktop, + MessageManager.formatMessage( + "label.service_called_is_not_msa_service", + new String[] + { sh.serviceType }), + MessageManager.getString("label.internal_jalview_error"), + JvOptionPane.WARNING_MESSAGE); return; } server = (MsaWS) sh.service; if ((wsInfo = setWebService(sh, false)) == null) { - JOptionPane.showMessageDialog(Desktop.desktop, - MessageManager.formatMessage("label.msa_service_is_unknown", new String[]{sh.serviceType}), - MessageManager.getString("label.internal_jalview_error"), JOptionPane.WARNING_MESSAGE); + JvOptionPane.showMessageDialog(Desktop.desktop, MessageManager + .formatMessage("label.msa_service_is_unknown", new String[] + { sh.serviceType }), + MessageManager.getString("label.internal_jalview_error"), + JvOptionPane.WARNING_MESSAGE); return; } + startMsaWSClient(altitle, msa, submitGaps, preserveOrder, seqdataset); } @@ -126,7 +141,7 @@ public class MsaWSClient extends Jws2Client } private void startMsaWSClient(String altitle, AlignmentView msa, - boolean submitGaps, boolean preserveOrder, Alignment seqdataset) + boolean submitGaps, boolean preserveOrder, AlignmentI seqdataset) { // if (!locateWebService()) // { @@ -135,12 +150,11 @@ public class MsaWSClient extends Jws2Client wsInfo.setProgressText(((submitGaps) ? "Re-alignment" : "Alignment") + " of " + altitle + "\nJob details\n"); - String jobtitle = WebServiceName.toLowerCase(); + String jobtitle = WebServiceName.toLowerCase(Locale.ROOT); if (jobtitle.endsWith("alignment")) { - if (submitGaps - && (!jobtitle.endsWith("realignment") || jobtitle - .indexOf("profile") == -1)) + if (submitGaps && (!jobtitle.endsWith("realignment") + || jobtitle.indexOf("profile") == -1)) { int pos = jobtitle.indexOf("alignment"); jobtitle = WebServiceName.substring(0, pos) + "re-alignment of " @@ -157,11 +171,23 @@ public class MsaWSClient extends Jws2Client + "alignment of " + altitle; } - MsaWSThread msathread = new MsaWSThread(server, preset, paramset, - WsURL, wsInfo, alignFrame, WebServiceName, jobtitle, msa, - submitGaps, preserveOrder, seqdataset); - wsInfo.setthisService(msathread); - msathread.start(); + MsaWSThread msathread = new MsaWSThread(server, preset, paramset, WsURL, + wsInfo, alignFrame, WebServiceName, jobtitle, msa, submitGaps, + preserveOrder, seqdataset); + if (msathread.hasValidInput()) + { + wsInfo.setthisService(msathread); + wsInfo.setVisible(true); + msathread.start(); + } + else + { + wsInfo.setVisible(false); + JvOptionPane.showMessageDialog(alignFrame, + MessageManager.getString("info.invalid_msa_input_mininfo"), + MessageManager.getString("info.invalid_msa_notenough"), + JvOptionPane.INFORMATION_MESSAGE); + } } protected String getServiceActionKey() @@ -187,10 +213,11 @@ public class MsaWSClient extends Jws2Client return (WebServiceName.indexOf("lustal") > -1); // cheat! } + @Override public void attachWSMenuEntry(JMenu rmsawsmenu, - final Jws2Instance service, final AlignFrame alignFrame) + final Jws2Instance service, final AlignFrame af) { - if (registerAAConWSInstance(rmsawsmenu, service, alignFrame)) + if (registerAAConWSInstance(rmsawsmenu, service, af)) { // Alignment dependent analysis calculation WS gui return; @@ -217,8 +244,8 @@ public class MsaWSClient extends Jws2Client if (submitGaps == true) { action = "Realign "; - msawsmenu = new JMenu(MessageManager.formatMessage( - "label.realign_with_params", new String[] + msawsmenu = new JMenu(MessageManager + .formatMessage("label.realign_with_params", new String[] { svcname })); msawsmenu.setToolTipText(MessageManager .getString("label.align_sequences_to_existing_alignment")); @@ -235,12 +262,16 @@ public class MsaWSClient extends Jws2Client method.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { - AlignmentView msa = alignFrame.gatherSequencesForAlignment(); - new MsaWSClient(service, alignFrame.getTitle(), msa, withGaps, - true, alignFrame.getViewport().getAlignment() - .getDataset(), alignFrame); + AlignmentView msa = af.gatherSequencesForAlignment(); + + if (msa != null) + { + new MsaWSClient(service, af.getTitle(), msa, withGaps, true, + af.getViewport().getAlignment().getDataset(), af); + } } }); @@ -251,17 +282,19 @@ public class MsaWSClient extends Jws2Client // arguments method = new JMenuItem( MessageManager.getString("label.edit_settings_and_run")); - method.setToolTipText(MessageManager - .getString("label.view_and_change_parameters_before_alignment")); + method.setToolTipText(MessageManager.getString( + "label.view_and_change_parameters_before_alignment")); method.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { - AlignmentView msa = alignFrame.gatherSequencesForAlignment(); - new MsaWSClient(service, null, null, true, alignFrame - .getTitle(), msa, withGaps, true, alignFrame - .getViewport().getAlignment().getDataset(), alignFrame); + AlignmentView msa = af.gatherSequencesForAlignment(); + if (msa != null) + { + startJob(service, af, withGaps, msa); + } } }); @@ -273,22 +306,51 @@ public class MsaWSClient extends Jws2Client "label.run_with_preset_params", new String[] { calcName })); - for (final WsParamSetI preset : presets) + final int showToolTipFor = ToolTipManager.sharedInstance() + .getDismissDelay(); + for (final WsParamSetI preSet : presets) { - final JMenuItem methodR = new JMenuItem(preset.getName()); - methodR.setToolTipText(JvSwingUtils.wrapTooltip(true, "

" - + (preset.isModifiable() ? MessageManager.getString("label.user_preset") - : MessageManager.getString("label.service_preset")) + "
" - + preset.getDescription() + "

")); + final JMenuItem methodR = new JMenuItem(preSet.getName()); + final int QUICK_TOOLTIP = 1500; + // JAL-1582 shorten tooltip display time in these menu items as + // they can obscure other options + methodR.addMouseListener(new MouseAdapter() + { + @Override + public void mouseEntered(MouseEvent e) + { + ToolTipManager.sharedInstance() + .setDismissDelay(QUICK_TOOLTIP); + } + + @Override + public void mouseExited(MouseEvent e) + { + ToolTipManager.sharedInstance() + .setDismissDelay(showToolTipFor); + } + + }); + String tooltip = JvSwingUtils.wrapTooltip(true, "" + + (preSet.isModifiable() + ? MessageManager.getString("label.user_preset") + : MessageManager + .getString("label.service_preset")) + + "
" + preSet.getDescription()); + methodR.setToolTipText(tooltip); methodR.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { - AlignmentView msa = alignFrame - .gatherSequencesForAlignment(); - new MsaWSClient(service, preset, alignFrame.getTitle(), - msa, false, true, alignFrame.getViewport() - .getAlignment().getDataset(), alignFrame); + AlignmentView msa = af.gatherSequencesForAlignment(); + + if (msa != null) + { + MsaWSClient msac = new MsaWSClient(service, preSet, + af.getTitle(), msa, false, true, + af.getViewport().getAlignment().getDataset(), af); + } } @@ -309,4 +371,21 @@ public class MsaWSClient extends Jws2Client } } while (!finished); } + + protected void startJob(final Jws2Instance service, final AlignFrame af, + final boolean withGaps, AlignmentView msa) + { + try + { + new MsaWSClient(service, null, null, true, af.getTitle(), msa, + withGaps, true, af.getViewport().getAlignment().getDataset(), + af); + } catch (Exception e) + { + JvOptionPane.showMessageDialog(alignFrame, e.getMessage(), + MessageManager.getString("label.state_job_error"), + JvOptionPane.WARNING_MESSAGE); + + } + } }