*/
package jalview.appletgui;
+import jalview.datamodel.SearchResultMatchI;
import jalview.datamodel.SearchResultsI;
import jalview.datamodel.SequenceFeature;
import jalview.datamodel.SequenceI;
import java.awt.event.KeyEvent;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
+import java.util.ArrayList;
+import java.util.List;
import java.util.Vector;
public class Finder extends Panel implements ActionListener
public void createNewGroup_actionPerformed()
{
- SequenceI[] seqs = new SequenceI[searchResults.getSize()];
- SequenceFeature[] features = new SequenceFeature[searchResults
- .getSize()];
+ List<SequenceI> seqs = new ArrayList<SequenceI>();
+ List<SequenceFeature> features = new ArrayList<SequenceFeature>();
+ String searchString = textfield.getText().trim();
- for (int i = 0; i < searchResults.getSize(); i++)
+ for (SearchResultMatchI match : searchResults.getResults())
{
- seqs[i] = searchResults.getResultSequence(i);
-
- features[i] = new SequenceFeature(textfield.getText().trim(),
- "Search Results", null, searchResults.getResultStart(i),
- searchResults.getResultEnd(i), "Search Results");
+ seqs.add(match.getSequence().getDatasetSequence());
+ features.add(new SequenceFeature(searchString, "Search Results",
+ match.getStart(), match.getEnd(), "Search Results"));
}
if (ap.seqPanel.seqCanvas.getFeatureRenderer().amendFeatures(seqs,
// 'SelectRegion' selection
if (!haveResults)
{
- ap.alignFrame.statusBar.setText(MessageManager
- .getString("label.finished_searching"));
+ ap.alignFrame.statusBar.setText(
+ MessageManager.getString("label.finished_searching"));
resIndex = -1;
seqIndex = 0;
}
{
if (findAll)
{
- String message = (idMatch.size() > 0) ? "" + idMatch.size()
- + " IDs" : "";
+ String message = (idMatch.size() > 0) ? "" + idMatch.size() + " IDs"
+ : "";
if (idMatch.size() > 0 && searchResults != null
&& searchResults.getSize() > 0)
{
{
message += searchResults.getSize() + " subsequence matches.";
}
- ap.alignFrame.statusBar.setText(MessageManager.formatMessage(
- "label.search_results", new String[] { searchString,
- message }));
+ ap.alignFrame.statusBar.setText(MessageManager
+ .formatMessage("label.search_results", new String[]
+ { searchString, message }));
}
else
{
// TODO: indicate sequence and matching position in status bar
- ap.alignFrame.statusBar.setText(MessageManager.formatMessage(
- "label.found_match_for", new String[] { searchString }));
+ ap.alignFrame.statusBar.setText(MessageManager
+ .formatMessage("label.found_match_for", new String[]
+ { searchString }));
}
}
}
caseSensitive.setLabel(MessageManager.getString("label.match_case"));
caseSensitive.setBounds(new Rectangle(30, 39, 126, 23));
- searchDescription.setLabel(MessageManager
- .getString("label.include_description"));
+ searchDescription.setLabel(
+ MessageManager.getString("label.include_description"));
searchDescription.setBounds(new Rectangle(30, 59, 170, 23));
actionsPanel.add(findNext, null);
actionsPanel.add(findAll, null);