X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fjws2%2FMsaWSClient.java;h=7e68d3bf240f1634828dd88f5bda7a8593b12ae3;hb=48040645e199f64d0bd396cc3a6137035a697737;hp=09a6d8df0c0b6ad6568daa5809fc993722eb7ac3;hpb=6a5133ef486df71c9559e7493e0db4b569d8ddf2;p=jalview.git diff --git a/src/jalview/ws/jws2/MsaWSClient.java b/src/jalview/ws/jws2/MsaWSClient.java index 09a6d8d..7e68d3b 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,10 +20,11 @@ */ package jalview.ws.jws2; -import jalview.datamodel.Alignment; +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; @@ -37,7 +38,6 @@ import java.util.List; import javax.swing.JMenu; import javax.swing.JMenuItem; -import javax.swing.JOptionPane; import javax.swing.ToolTipManager; import compbio.data.msa.MsaWS; @@ -58,7 +58,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, @@ -68,7 +68,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, @@ -95,7 +95,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); @@ -107,26 +107,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", + JvOptionPane.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); + { 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 + JvOptionPane.showMessageDialog(Desktop.desktop, MessageManager .formatMessage("label.msa_service_is_unknown", new String[] - { sh.serviceType }), MessageManager - .getString("label.internal_jalview_error"), - JOptionPane.WARNING_MESSAGE); + { sh.serviceType }), + MessageManager.getString("label.internal_jalview_error"), + JvOptionPane.WARNING_MESSAGE); return; } + startMsaWSClient(altitle, msa, submitGaps, preserveOrder, seqdataset); } @@ -138,7 +140,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()) // { @@ -150,9 +152,8 @@ public class MsaWSClient extends Jws2Client String jobtitle = WebServiceName.toLowerCase(); 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 " @@ -169,11 +170,28 @@ 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 + { + JvOptionPane.showMessageDialog(alignFrame, + MessageManager.getString("info.invalid_msa_input_mininfo"), + MessageManager.getString("info.invalid_msa_notenough"), + JvOptionPane.INFORMATION_MESSAGE); + wsInfo.setVisible(false); + } + } + + public static void main(String[] args) + { + System.out.println("A".matches("(-*[a-zA-Z]-*){1}[a-zA-Z-]*")); } protected String getServiceActionKey() @@ -199,6 +217,7 @@ public class MsaWSClient extends Jws2Client return (WebServiceName.indexOf("lustal") > -1); // cheat! } + @Override public void attachWSMenuEntry(JMenu rmsawsmenu, final Jws2Instance service, final AlignFrame alignFrame) { @@ -229,8 +248,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")); @@ -247,12 +266,18 @@ 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); + + if (msa != null) + { + new MsaWSClient(service, alignFrame.getTitle(), msa, withGaps, + true, + alignFrame.getViewport().getAlignment().getDataset(), + alignFrame); + } } }); @@ -263,17 +288,22 @@ 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); + if (msa != null) + { + new MsaWSClient(service, null, null, true, + alignFrame.getTitle(), msa, withGaps, true, + alignFrame.getViewport().getAlignment().getDataset(), + alignFrame); + } } }); @@ -298,35 +328,41 @@ public class MsaWSClient extends Jws2Client @Override public void mouseEntered(MouseEvent e) { - ToolTipManager.sharedInstance().setDismissDelay( - QUICK_TOOLTIP); + ToolTipManager.sharedInstance() + .setDismissDelay(QUICK_TOOLTIP); } @Override public void mouseExited(MouseEvent e) { - ToolTipManager.sharedInstance().setDismissDelay(showToolTipFor); + ToolTipManager.sharedInstance() + .setDismissDelay(showToolTipFor); } }); - methodR.setToolTipText(JvSwingUtils.wrapTooltip( - true, - "

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

")); + 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); + + if (msa != null) + { + MsaWSClient msac = new MsaWSClient(service, preset, + alignFrame.getTitle(), msa, false, true, + alignFrame.getViewport().getAlignment() + .getDataset(), + alignFrame); + } }