private SearchResultsI searchResults;
/*
- * sequence index and residue position of last match,
+ * sequence index and column position of last match,
* for current search and per viewport
*/
private int seqIndex = 0;
- private int resIndex = -1;
+ private int colIndex = -1;
Map<AlignViewportI, Integer> seqIndices;
- Map<AlignViewportI, Integer> resIndices;
+ Map<AlignViewportI, Integer> colIndices;
public Finder(final AlignmentPanel ap)
{
seqIndices = new HashMap<>();
- resIndices = new HashMap<>();
+ colIndices = new HashMap<>();
try
{
else if (evt.getSource() == findAll)
{
- resIndex = -1;
+ colIndex = -1;
seqIndex = 0;
doSearch(true);
}
ap = ap.av.applet.currentAlignFrame.alignPanel;
av = ap.av;
seqIndex = 0;
- resIndex = -1;
+ colIndex = -1;
if (seqIndices.containsKey(av))
{
seqIndex = seqIndices.get(av).intValue();
}
- if (resIndices.containsKey(av))
+ if (colIndices.containsKey(av))
{
- resIndex = resIndices.get(av).intValue();
+ colIndex = colIndices.get(av).intValue();
}
}
createFeatures.setEnabled(false);
jalview.analysis.Finder finder = new jalview.analysis.Finder(
- av.getAlignment(), av.getSelectionGroup(), seqIndex, resIndex);
+ av.getAlignment(), av.getSelectionGroup(), seqIndex, colIndex);
finder.setCaseSensitive(caseSensitive.getState());
finder.setIncludeDescription(searchDescription.getState());
finder.setFindAll(doFindAll);
finder.find(searchString);
- seqIndex = finder.getSeqIndex();
- resIndex = finder.getResIndex();
+ seqIndex = finder.getSequenceIndex();
+ colIndex = finder.getColumnIndex();
seqIndices.put(av, seqIndex);
- resIndices.put(av, resIndex);
+ colIndices.put(av, colIndex);
searchResults = finder.getSearchResults();
Vector<SequenceI> idMatch = finder.getIdMatch();
{
ap.alignFrame.statusBar.setText(
MessageManager.getString("label.finished_searching"));
- resIndex = -1;
+ colIndex = -1;
seqIndex = 0;
}
else