X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FSequenceFetcher.java;h=8b5d3b743b5bb065c1e96d2db7bc56c880e91e29;hb=fb616bbaa70ca0f8bbae7e076f3c403a737205a9;hp=f06bd97ebbf0db6f451874d80c940b344eb0a9f4;hpb=1a7a229e4e1a3f6960a34543333748477022c234;p=jalview.git

diff --git a/src/jalview/gui/SequenceFetcher.java b/src/jalview/gui/SequenceFetcher.java
index f06bd97..8b5d3b7 100755
--- a/src/jalview/gui/SequenceFetcher.java
+++ b/src/jalview/gui/SequenceFetcher.java
@@ -418,14 +418,16 @@ public class SequenceFetcher extends JPanel implements Runnable
      * tidy inputs and check there is something to search for
      */
     String t0 = textArea.getText();
-    String text = text.trim(); // BH 2019.01.30
+    String text = t0.trim();
     if (replacePunctuation.isEnabled() && replacePunctuation.isSelected())
     {
       text = text.replace(",", ";");
     }
-    text = text.replaceAll("(\\s|[,; ])+", ";");
-    if (!t0.equals(text)) // BH 2019.01.30 no need to do setting if it is the same
-    	textArea.setText(text);
+    text = text.replaceAll("(\\s|[; ])+", ";");
+    if (!t0.equals(text)) 
+    {
+   	  textArea.setText(text);
+    }
     if (text.isEmpty())
     {
       // todo i18n
@@ -434,6 +436,14 @@ public class SequenceFetcher extends JPanel implements Runnable
       resetDialog();
       return;
     }
+    if (database.getSelectedIndex() == 0)
+    {
+      // todo i18n
+      showErrorMessage("Please choose a database");
+      resetDialog();
+      return;
+    }
+
     exampleBtn.setEnabled(false);
     textArea.setEnabled(false);
     okBtn.setEnabled(false);
@@ -464,9 +474,8 @@ public class SequenceFetcher extends JPanel implements Runnable
     List<DbSourceProxy> sources = sfetch
             .getSourceProxy((String) database.getSelectedItem());
     Iterator<DbSourceProxy> proxies = sources.iterator();
-    String[] qries;
-    List<String> nextFetch = Arrays
-            .asList(qries = textArea.getText().split(";"));
+    String[] qries = textArea.getText().trim().split(";");
+    List<String> nextFetch = Arrays.asList(qries);
     Iterator<String> en = Arrays.asList(new String[0]).iterator();
     int nqueries = qries.length;