From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Wed, 30 Jan 2019 15:40:53 +0000 (+0000)
Subject: JAL-3144 don't change comma to semi-colon if not requested!
X-Git-Tag: Release_2_11_4_0~45^2~18^2~267
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=c61be14a14793f4b5b6fab7099ee8a0e0b9da12b;p=jalview.git

JAL-3144 don't change comma to semi-colon if not requested!
---

diff --git a/src/jalview/gui/SequenceFetcher.java b/src/jalview/gui/SequenceFetcher.java
index f06bd97..323fef9 100755
--- a/src/jalview/gui/SequenceFetcher.java
+++ b/src/jalview/gui/SequenceFetcher.java
@@ -417,15 +417,17 @@ 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 = textArea.getText();
+    final String t0 = text;
     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
@@ -464,9 +466,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;