git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c61be14 654df20)
Merge branch 'Jalview-BH/JAL-3026-JAL-3063-JAXB' of
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 30 Jan 2019 16:05:51 +0000 (16:05 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 30 Jan 2019 16:05:51 +0000 (16:05 +0000)
https://source.jalview.org/git/jalview.git into
Jalview-BH/JAL-3026-JAL-3063-JAXB

Conflicts:
src/jalview/gui/SequenceFetcher.java

1  2 
src/jalview/gui/SequenceFetcher.java patch | diff1 | diff2 | blob | history

diff --cc 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,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(",", ";");