X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FFinder.java;h=2579d91be3600a4af25d184ebe128b07a95afc7f;hb=10eedfb43dacd4cf32d4b5fe27d8d5987c70eaf8;hp=d18295cf334e061fca98c2ee4c203cbf70085637;hpb=29c4cd117483f6bbeaab21a24c4a5811b7fcf915;p=jalview.git diff --git a/src/jalview/appletgui/Finder.java b/src/jalview/appletgui/Finder.java index d18295c..2579d91 100644 --- a/src/jalview/appletgui/Finder.java +++ b/src/jalview/appletgui/Finder.java @@ -20,6 +20,7 @@ */ package jalview.appletgui; +import jalview.datamodel.SearchResultMatchI; import jalview.datamodel.SearchResultsI; import jalview.datamodel.SequenceFeature; import jalview.datamodel.SequenceI; @@ -115,18 +116,21 @@ public class Finder extends Panel implements ActionListener SequenceI[] seqs = new SequenceI[searchResults.getSize()]; SequenceFeature[] features = new SequenceFeature[searchResults .getSize()]; + String searchString = textfield.getText().trim(); - for (int i = 0; i < searchResults.getSize(); i++) + int i = 0; + for (SearchResultMatchI match : searchResults.getResults()) { - seqs[i] = searchResults.getResultSequence(i); + seqs[i] = match.getSequence().getDatasetSequence(); - features[i] = new SequenceFeature(textfield.getText().trim(), - "Search Results", null, searchResults.getResultStart(i), - searchResults.getResultEnd(i), "Search Results"); + features[i] = new SequenceFeature(searchString, + "Search Results", null, match.getStart(), match.getEnd(), + "Search Results"); + i++; } if (ap.seqPanel.seqCanvas.getFeatureRenderer().amendFeatures(seqs, - features, true, ap)) + features, true, ap, searchString)) { ap.alignFrame.sequenceFeatures.setState(true); av.setShowSequenceFeatures(true);