/*
- * 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 2.9.0b1)
+ * Copyright (C) 2015 The Jalview Authors
*
* This file is part of Jalview.
*
import jalview.datamodel.Alignment;
import jalview.datamodel.AlignmentView;
-import jalview.datamodel.SequenceI;
import jalview.gui.AlignFrame;
import jalview.gui.Desktop;
import jalview.gui.JvSwingUtils;
// redundant at mo - but may change
JOptionPane.showMessageDialog(Desktop.desktop, MessageManager
.formatMessage("label.service_called_is_not_msa_service",
- new String[]
- { sh.serviceType }), MessageManager
+ new String[] { sh.serviceType }), MessageManager
.getString("label.internal_jalview_error"),
JOptionPane.WARNING_MESSAGE);
if ((wsInfo = setWebService(sh, false)) == null)
{
JOptionPane.showMessageDialog(Desktop.desktop, MessageManager
- .formatMessage("label.msa_service_is_unknown", new String[]
- { sh.serviceType }), MessageManager
+ .formatMessage("label.msa_service_is_unknown",
+ new String[] { sh.serviceType }), MessageManager
.getString("label.internal_jalview_error"),
JOptionPane.WARNING_MESSAGE);
startMsaWSClient(altitle, msa, submitGaps, preserveOrder, seqdataset);
-
}
public MsaWSClient()
MsaWSThread msathread = new MsaWSThread(server, preset, paramset,
WsURL, wsInfo, alignFrame, WebServiceName, jobtitle, msa,
submitGaps, preserveOrder, seqdataset);
- wsInfo.setthisService(msathread);
-
- msathread.start();
-
- }
-
- private boolean isValidAlignment(AlignmentView av)
- {
- int validSeqCount = 0;
- List<SequenceI> seqs = av.getVisibleAlignment('c').getSequences(); // .getSequences();
- if (seqs.size() < 2)
+ if (msathread.hasValidInput())
{
- JOptionPane
- .showMessageDialog(
- alignFrame,
- "A minimum of two sequences is required to perform this operation",
- "Invalid selection", JOptionPane.INFORMATION_MESSAGE);
-
- return false;
+ wsInfo.setthisService(msathread);
+ wsInfo.setVisible(true);
+ msathread.start();
}
-
- for (SequenceI seq : seqs)
+ else
{
-
- if (seq.getSequenceAsString().matches("(-*[a-zA-Z]-*){3}[a-zA-Z-]*"))
- {
- ++validSeqCount;
- }
- if (validSeqCount > 1)
- {
- return true;
- }
+ JOptionPane.showMessageDialog(alignFrame,
+ MessageManager.getString("info.invalid_msa_input_mininfo"),
+ MessageManager.getString("info.invalid_msa_notenough"),
+ JOptionPane.INFORMATION_MESSAGE);
+ wsInfo.setVisible(false);
}
-
- JOptionPane
- .showMessageDialog(
- alignFrame,
- "A minimum of two sequences with at least three non-gap character \nis required to perform this operation",
- "Invalid selection", JOptionPane.INFORMATION_MESSAGE);
-
- return false;
}
public static void main(String[] args)
System.out.println("A".matches("(-*[a-zA-Z]-*){1}[a-zA-Z-]*"));
}
-
-
protected String getServiceActionKey()
{
return "MsaWS";
{
action = "Realign ";
msawsmenu = new JMenu(MessageManager.formatMessage(
- "label.realign_with_params", new String[]
- { svcname }));
+ "label.realign_with_params", new String[] { svcname }));
msawsmenu.setToolTipText(MessageManager
.getString("label.align_sequences_to_existing_alignment"));
rmsawsmenu.add(msawsmenu);
final boolean withGaps = submitGaps;
JMenuItem method = new JMenuItem(MessageManager.formatMessage(
- "label.calcname_with_default_settings", new String[]
- { calcName }));
- method.setToolTipText(MessageManager.formatMessage(
- "label.action_with_default_settings", new String[]
- { action }));
+ "label.calcname_with_default_settings",
+ new String[] { calcName }));
+ method.setToolTipText(MessageManager
+ .formatMessage("label.action_with_default_settings",
+ new String[] { action }));
method.addActionListener(new ActionListener()
{
{
AlignmentView msa = alignFrame.gatherSequencesForAlignment();
- if (isValidAlignment(msa))
+ if (msa != null)
{
- new MsaWSClient(service, alignFrame.getTitle(), msa, withGaps,
- true, alignFrame.getViewport().getAlignment()
- .getDataset(), alignFrame);
+ new MsaWSClient(service, alignFrame.getTitle(), msa, withGaps,
+ true, alignFrame.getViewport().getAlignment()
+ .getDataset(), alignFrame);
}
}
public void actionPerformed(ActionEvent e)
{
AlignmentView msa = alignFrame.gatherSequencesForAlignment();
-
- if (isValidAlignment(msa))
+ if (msa != null)
{
- new MsaWSClient(service, null, null, true, alignFrame
- .getTitle(), msa, withGaps, true, alignFrame
- .getViewport().getAlignment().getDataset(), alignFrame);
+ new MsaWSClient(service, null, null, true, alignFrame
+ .getTitle(), msa, withGaps, true, alignFrame
+ .getViewport().getAlignment().getDataset(),
+ alignFrame);
}
}
List<WsParamSetI> presets = service.getParamStore().getPresets();
if (presets != null && presets.size() > 0)
{
- JMenu presetlist = new JMenu(MessageManager.formatMessage(
- "label.run_with_preset_params", new String[]
- { calcName }));
+ JMenu presetlist = new JMenu(
+ MessageManager.formatMessage(
+ "label.run_with_preset_params",
+ new String[] { calcName }));
final int showToolTipFor = ToolTipManager.sharedInstance()
.getDismissDelay();
@Override
public void mouseExited(MouseEvent e)
{
- ToolTipManager.sharedInstance().setDismissDelay(showToolTipFor);
+ ToolTipManager.sharedInstance().setDismissDelay(
+ showToolTipFor);
}
});
AlignmentView msa = alignFrame
.gatherSequencesForAlignment();
- if (isValidAlignment(msa))
+ if (msa != null)
{
- new MsaWSClient(service, preset, alignFrame.getTitle(),
- msa, false, true, alignFrame.getViewport()
- .getAlignment().getDataset(), alignFrame);
+ MsaWSClient msac = new MsaWSClient(service, preset,
+ alignFrame.getTitle(), msa, false, true,
+ alignFrame.getViewport().getAlignment()
+ .getDataset(), alignFrame);
}
}