git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'alpha/update_2_12_for_2_11_2_series_merge^2' into HEAD
[jalview.git]
/
src
/
jalview
/
appletgui
/
Finder.java
diff --git
a/src/jalview/appletgui/Finder.java
b/src/jalview/appletgui/Finder.java
index
2fc3441
..
a78e41c
100644
(file)
--- a/
src/jalview/appletgui/Finder.java
+++ b/
src/jalview/appletgui/Finder.java
@@
-171,11
+171,13
@@
public class Finder extends Panel implements ActionListener
boolean doSearchDescription = searchDescription.getState();
if (doFindAll)
{
boolean doSearchDescription = searchDescription.getState();
if (doFindAll)
{
- finder.findAll(searchString, isCaseSensitive, doSearchDescription);
+ finder.findAll(searchString, isCaseSensitive, doSearchDescription,
+ false);
}
else
{
}
else
{
- finder.findNext(searchString, isCaseSensitive, doSearchDescription);
+ finder.findNext(searchString, isCaseSensitive, doSearchDescription,
+ false);
}
searchResults = finder.getSearchResults();
}
searchResults = finder.getSearchResults();
@@
-209,13
+211,13
@@
public class Finder extends Panel implements ActionListener
String message = (idMatches.size() > 0) ? "" + idMatches.size() + " IDs"
: "";
if (idMatches.size() > 0 && searchResults != null
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 += " 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[]
}
ap.alignFrame.statusBar.setText(MessageManager
.formatMessage("label.search_results", new String[]