X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fappletgui%2FFinder.java;h=167d8995453bb8a23d6c355001e23c1868242019;hb=refs%2Fheads%2Ffeatures%2Fr2_11_2_alphafold%2FJAL-2349_JAL-3855;hp=4772580e9a640161fee3a92d3ab6809fee85e5ff;hpb=b7014049e421026d0f2d57179af9688472cd78f2;p=jalview.git diff --git a/src/jalview/appletgui/Finder.java b/src/jalview/appletgui/Finder.java index 4772580..167d899 100644 --- a/src/jalview/appletgui/Finder.java +++ b/src/jalview/appletgui/Finder.java @@ -20,14 +20,6 @@ */ 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.SequenceI; -import jalview.util.MessageManager; - import java.awt.Button; import java.awt.Checkbox; import java.awt.Font; @@ -47,6 +39,14 @@ import java.util.HashMap; 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; @@ -172,12 +172,12 @@ public class Finder extends Panel implements ActionListener if (doFindAll) { finder.findAll(searchString, isCaseSensitive, doSearchDescription, - false); + false, false); } else { finder.findNext(searchString, isCaseSensitive, doSearchDescription, - false); + false, false); } searchResults = finder.getSearchResults(); @@ -208,16 +208,17 @@ public class Finder extends Panel implements ActionListener { 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[]