Merge branch 'Jalview-BH/JAL-3026-JAL-3063-JAXB' of

https://source.jalview.org/git/jalview.git into
Jalview-BH/JAL-3026-JAL-3063-JAXB

Conflicts:
	src/jalview/gui/SequenceFetcher.java

diff --combined src/jalview/gui/SequenceFetcher.java
index 323fef9,71539ba..646a7f1
--- 1/src/jalview/gui/SequenceFetcher.java
--- 2/src/jalview/gui/SequenceFetcher.java
+++ b/src/jalview/gui/SequenceFetcher.java
@@@ -417,17 -417,15 +417,17 @@@ public class SequenceFetcher extends JP
      /*
       * tidy inputs and check there is something to search for
       */
-     String text = textArea.getText();
-     final String t0 = text;
+     String t0 = textArea.getText();
 -    String text = t0.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
@@@ -466,8 -464,9 +466,8 @@@
      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;