/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.5)
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.6)
* Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
*
* This file is part of Jalview.
void doSearch(boolean findAll)
{
- if (jalview.bin.JalviewLite.currentAlignFrame != null)
+ if (ap.av.applet.currentAlignFrame != null)
{
- ap = jalview.bin.JalviewLite.currentAlignFrame.alignPanel;
+ ap = ap.av.applet.currentAlignFrame.alignPanel;
av = ap.av;
}
createNewGroup.setEnabled(false);
- jalview.analysis.Finder finder = new jalview.analysis.Finder(av
- .getAlignment(), av.getSelectionGroup(), seqIndex, resIndex);
+ jalview.analysis.Finder finder = new jalview.analysis.Finder(
+ av.getAlignment(), av.getSelectionGroup(), seqIndex, resIndex);
finder.setCaseSensitive(caseSensitive.getState());
finder.setFindAll(findAll);
ap.alignFrame.statusBar.setText("Finished searching.");
resIndex = -1;
seqIndex = 0;
- }
- if (findAll)
- {
- String message = (idMatch.size() > 0) ? "" + idMatch.size() + " IDs"
- : "";
- if (idMatch.size() > 0 && searchResults != null
- && searchResults.getSize() > 0)
+ } else {
+ if (findAll)
{
- message += " and ";
+ String message = (idMatch.size() > 0) ? "" + idMatch.size()
+ + " IDs" : "";
+ if (idMatch.size() > 0 && searchResults != null
+ && searchResults.getSize() > 0)
+ {
+ message += " and ";
+ }
+ if (searchResults != null)
+ {
+ message += searchResults.getSize() + " subsequence matches.";
+ }
+ ap.alignFrame.statusBar.setText("Search results: " + searchString
+ + " : " + message);
+
}
- if (searchResults != null)
+ else
{
- message += searchResults.getSize() + " subsequence matches.";
+ // TODO: indicate sequence and matching position in status bar
+ ap.alignFrame.statusBar.setText("Found match for " + searchString);
}
- ap.alignFrame.statusBar.setText("Search results: " + searchString
- + " : " + message);
-
}
-
}
Label jLabel1 = new Label();