From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Wed, 30 Jan 2019 16:05:51 +0000 (+0000)
Subject: Merge branch 'Jalview-BH/JAL-3026-JAL-3063-JAXB' of
X-Git-Tag: Develop-2_11_2_0-d20201215~24^2~68^2~266
X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=commitdiff_plain;h=c4cf7aa546ede43930f9a17fec5060119984da41

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
---

c4cf7aa546ede43930f9a17fec5060119984da41
diff --cc src/jalview/gui/SequenceFetcher.java
index 323fef9,71539ba..646a7f1
--- a/src/jalview/gui/SequenceFetcher.java
+++ b/src/jalview/gui/SequenceFetcher.java
@@@ -417,8 -417,8 +417,8 @@@ 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(",", ";");