From: jprocter Date: Wed, 24 Jun 2009 08:24:33 +0000 (+0000) Subject: can use whitespace, comma or semicolon to separate IDs X-Git-Tag: Release_2_5~239 X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=39de674fc1a9ae1336846433f16cbf22e60e0a8c;p=jalview.git can use whitespace, comma or semicolon to separate IDs --- diff --git a/src/jalview/gui/SequenceFetcher.java b/src/jalview/gui/SequenceFetcher.java index 2201167..34e8143 100755 --- a/src/jalview/gui/SequenceFetcher.java +++ b/src/jalview/gui/SequenceFetcher.java @@ -372,9 +372,11 @@ public class SequenceFetcher extends JPanel implements Runnable { error += "Please select the source database\n"; } - com.stevesoft.pat.Regex empty = new com.stevesoft.pat.Regex("\\s+", ""); + // TODO: make this transformation optional and configurable + com.stevesoft.pat.Regex empty = new com.stevesoft.pat.Regex("(\\s|[,; ])+",";"); //\\s+", ""); textArea.setText(empty.replaceAll(textArea.getText())); - if (textArea.getText().length() == 0) + // see if there's anthing to search with + if (!new com.stevesoft.pat.Regex("[A-Za-z0-9_.]").search(textArea.getText())) { error += "Please enter a (semi-colon separated list of) database id(s)"; }