X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FFinder.java;h=fd8eb0c9264763a6a6d90dfcaf7847fbd721b729;hb=b3ec8456ea631e97597568e9bc66ec546eb0417f;hp=84540f4aa341666ab3d390642d62b79ddf68d6e3;hpb=be762d8d9c71a7aa3121e845c45911c7192b7827;p=jalview.git diff --git a/src/jalview/gui/Finder.java b/src/jalview/gui/Finder.java index 84540f4..fd8eb0c 100755 --- a/src/jalview/gui/Finder.java +++ b/src/jalview/gui/Finder.java @@ -223,22 +223,25 @@ public class Finder extends GFinder for (SearchResultMatchI match : searchResults.getResults()) { seqs.add(match.getSequence().getDatasetSequence()); - features.add(new SequenceFeature(searchString, desc, - match - .getStart(), match.getEnd(), desc)); + features.add(new SequenceFeature(searchString, desc, match.getStart(), + match.getEnd(), desc)); } - if (ap.getSeqPanel().seqCanvas.getFeatureRenderer().amendFeatures(seqs, - features, true, ap)) + new FeatureEditor(ap).createFeatures(seqs, features, new Runnable() { - /* - * ensure feature display is turned on to show the new features, - * and remove them as highlighted regions - */ - ap.alignFrame.showSeqFeatures.setSelected(true); - av.setShowSequenceFeatures(true); - ap.highlightSearchResults(null); - } + @Override + public void run() + { + + /* + * ensure feature display is turned on to show the new features, + * and remove them as highlighted regions + */ + ap.alignFrame.showSeqFeatures.setSelected(true); + av.setShowSequenceFeatures(true); + ap.highlightSearchResults(null); + } + }); } /** @@ -298,6 +301,8 @@ public class Finder extends GFinder searchResults = null; } + searchBox.updateCache(); + // if allResults is null, this effectively switches displaySearch flag in // seqCanvas ap.highlightSearchResults(searchResults); @@ -305,11 +310,11 @@ public class Finder extends GFinder // 'SelectRegion' selection if (!haveResults) { + resIndex = -1; + seqIndex = 0; JvOptionPane.showInternalMessageDialog(this, MessageManager.getString("label.finished_searching"), null, JvOptionPane.INFORMATION_MESSAGE); - resIndex = -1; - seqIndex = 0; } else { @@ -327,13 +332,12 @@ public class Finder extends GFinder message += searchResults.getSize() + " subsequence matches found."; } - JvOptionPane.showInternalMessageDialog(this, message, null, - JvOptionPane.INFORMATION_MESSAGE); resIndex = -1; seqIndex = 0; + JvOptionPane.showInternalMessageDialog(this, message, null, + JvOptionPane.INFORMATION_MESSAGE); } } - searchBox.updateCache(); } /**