JAL-2933 pass viewport in Finder constructor, find acts on viewport selection if any

[jalview.git] / src / jalview / gui / Finder.java

diff --git a/src/jalview/gui/Finder.java b/src/jalview/gui/Finder.java
index dcc3518..a4d7ad0 100755 (executable)
--- a/src/jalview/gui/Finder.java
+++ b/src/jalview/gui/Finder.java
@@ -25,7 +25,6 @@ import jalview.api.FinderI;
 import jalview.datamodel.SearchResultMatchI;
 import jalview.datamodel.SearchResultsI;
 import jalview.datamodel.SequenceFeature;
-import jalview.datamodel.SequenceGroup;
 import jalview.datamodel.SequenceI;
 import jalview.jbgui.GFinder;
 import jalview.util.MessageManager;
@@ -269,22 +268,19 @@ public class Finder extends GFinder
       /*
        * first time we've searched this viewport
        */
-      finder = new jalview.analysis.Finder(av.getAlignment());
+      finder = new jalview.analysis.Finder(av);
       finders.put(av, finder);
     }
 
-    SequenceGroup selectionGroup = av.getSelectionGroup();
     boolean isCaseSensitive = caseSensitive.isSelected();
     boolean doSearchDescription = searchDescription.isSelected();
     if (doFindAll)
     {
-      finder.findAll(searchString, selectionGroup, isCaseSensitive,
-              doSearchDescription);
+      finder.findAll(searchString, isCaseSensitive, doSearchDescription);
     }
     else
     {
-      finder.findNext(searchString, selectionGroup, isCaseSensitive,
-              doSearchDescription);
+      finder.findNext(searchString, isCaseSensitive, doSearchDescription);
     }
 
     searchResults = finder.getSearchResults();