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

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

diff --git a/src/jalview/appletgui/Finder.java b/src/jalview/appletgui/Finder.java
index 4b55574..2fc3441 100644 (file)
--- a/src/jalview/appletgui/Finder.java
+++ b/src/jalview/appletgui/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.util.MessageManager;
 
@@ -163,23 +162,20 @@ public class Finder extends Panel implements ActionListener
       /*
        * first time we searched this viewport
        */
-      finder = new jalview.analysis.Finder(av.getAlignment());
+      finder = new jalview.analysis.Finder(av);
       finders.put(av, finder);
     }
 
     String searchString = textfield.getText();
-    SequenceGroup selectionGroup = av.getSelectionGroup();
     boolean isCaseSensitive = caseSensitive.getState();
     boolean doSearchDescription = searchDescription.getState();
     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();