From 39de674fc1a9ae1336846433f16cbf22e60e0a8c Mon Sep 17 00:00:00 2001 From: jprocter Date: Wed, 24 Jun 2009 08:24:33 +0000 Subject: [PATCH] can use whitespace, comma or semicolon to separate IDs --- src/jalview/gui/SequenceFetcher.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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)"; } -- 1.7.10.2