*/
package jalview.appletgui;
-import jalview.api.AlignViewportI;
-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;
-
import java.awt.Button;
import java.awt.Checkbox;
import java.awt.Font;
import java.util.List;
import java.util.Map;
+import jalview.api.AlignViewportI;
+import jalview.api.FinderI;
+import jalview.datamodel.SearchResultMatchI;
+import jalview.datamodel.SearchResultsI;
+import jalview.datamodel.SequenceFeature;
+import jalview.datamodel.SequenceI;
+import jalview.util.MessageManager;
+
public class Finder extends Panel implements ActionListener
{
private AlignViewportI av;
/*
* 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,
+ false, false);
}
else
{
- finder.findNext(searchString, selectionGroup, isCaseSensitive,
- doSearchDescription);
+ finder.findNext(searchString, isCaseSensitive, doSearchDescription,
+ false, false);
}
searchResults = finder.getSearchResults();
{
if (doFindAll)
{
- String message = (idMatches.size() > 0) ? "" + idMatches.size() + " IDs"
+ String message = (idMatches.size() > 0)
+ ? "" + idMatches.size() + " IDs"
: "";
if (idMatches.size() > 0 && searchResults != null
- && searchResults.getSize() > 0)
+ && searchResults.getCount() > 0)
{
message += " and ";
}
if (searchResults != null)
{
- message += searchResults.getSize() + " subsequence matches.";
+ message += searchResults.getCount() + " subsequence matches.";
}
ap.alignFrame.statusBar.setText(MessageManager
.formatMessage("label.search_results", new String[]