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
Pull from develop
[jalview.git]
/
src
/
jalview
/
appletgui
/
Finder.java
diff --git
a/src/jalview/appletgui/Finder.java
b/src/jalview/appletgui/Finder.java
index
5412472
..
d2fe69c
100644
(file)
--- a/
src/jalview/appletgui/Finder.java
+++ b/
src/jalview/appletgui/Finder.java
@@
-20,7
+20,8
@@
*/
package jalview.appletgui;
*/
package jalview.appletgui;
-import jalview.datamodel.SearchResults;
+import jalview.datamodel.SearchResultMatchI;
+import jalview.datamodel.SearchResultsI;
import jalview.datamodel.SequenceFeature;
import jalview.datamodel.SequenceI;
import jalview.util.MessageManager;
import jalview.datamodel.SequenceFeature;
import jalview.datamodel.SequenceI;
import jalview.util.MessageManager;
@@
-50,7
+51,7
@@
public class Finder extends Panel implements ActionListener
Frame frame;
Frame frame;
- SearchResults searchResults;
+ SearchResultsI searchResults;
int seqIndex = 0;
int seqIndex = 0;
@@
-76,6
+77,7
@@
public class Finder extends Panel implements ActionListener
frame.repaint();
frame.addWindowListener(new WindowAdapter()
{
frame.repaint();
frame.addWindowListener(new WindowAdapter()
{
+ @Override
public void windowClosing(WindowEvent evt)
{
ap.highlightSearchResults(null);
public void windowClosing(WindowEvent evt)
{
ap.highlightSearchResults(null);
@@
-84,6
+86,7
@@
public class Finder extends Panel implements ActionListener
textfield.requestFocus();
}
textfield.requestFocus();
}
+ @Override
public void actionPerformed(ActionEvent evt)
{
if (evt.getSource() == textfield)
public void actionPerformed(ActionEvent evt)
{
if (evt.getSource() == textfield)
@@
-114,13
+117,15
@@
public class Finder extends Panel implements ActionListener
SequenceFeature[] features = new SequenceFeature[searchResults
.getSize()];
SequenceFeature[] features = new SequenceFeature[searchResults
.getSize()];
- for (int i = 0; i < searchResults.getSize(); i++)
+ int i = 0;
+ for (SearchResultMatchI match : searchResults.getResults())
{
{
- seqs[i] = searchResults.getResultSequence(i);
+ seqs[i] = match.getSequence().getDatasetSequence();
features[i] = new SequenceFeature(textfield.getText().trim(),
features[i] = new SequenceFeature(textfield.getText().trim(),
- "Search Results", null, searchResults.getResultStart(i),
- searchResults.getResultEnd(i), "Search Results");
+ "Search Results", null, match.getStart(), match.getEnd(),
+ "Search Results");
+ i++;
}
if (ap.seqPanel.seqCanvas.getFeatureRenderer().amendFeatures(seqs,
}
if (ap.seqPanel.seqCanvas.getFeatureRenderer().amendFeatures(seqs,
@@
-152,7
+157,7
@@
public class Finder extends Panel implements ActionListener
seqIndex = finder.getSeqIndex();
resIndex = finder.getResIndex();
searchResults = finder.getSearchResults();
seqIndex = finder.getSeqIndex();
resIndex = finder.getResIndex();
searchResults = finder.getSearchResults();
- Vector idMatch = finder.getIdMatch();
+ Vector<SequenceI> idMatch = finder.getIdMatch();
boolean haveResults = false;
// set or reset the GUI
if ((idMatch.size() > 0))
boolean haveResults = false;
// set or reset the GUI
if ((idMatch.size() > 0))
@@
-204,16
+209,15
@@
public class Finder extends Panel implements ActionListener
message += searchResults.getSize() + " subsequence matches.";
}
ap.alignFrame.statusBar.setText(MessageManager.formatMessage(
message += searchResults.getSize() + " subsequence matches.";
}
ap.alignFrame.statusBar.setText(MessageManager.formatMessage(
- "label.search_results", new String[]
- { searchString, message }));
+ "label.search_results", new String[] { searchString,
+ message }));
}
else
{
// TODO: indicate sequence and matching position in status bar
ap.alignFrame.statusBar.setText(MessageManager.formatMessage(
}
else
{
// TODO: indicate sequence and matching position in status bar
ap.alignFrame.statusBar.setText(MessageManager.formatMessage(
- "label.found_match_for", new String[]
- { searchString }));
+ "label.found_match_for", new String[] { searchString }));
}
}
}
}
}
}
@@
-247,6
+251,7
@@
public class Finder extends Panel implements ActionListener
textfield.setBounds(new Rectangle(40, 17, 133, 21));
textfield.addKeyListener(new java.awt.event.KeyAdapter()
{
textfield.setBounds(new Rectangle(40, 17, 133, 21));
textfield.addKeyListener(new java.awt.event.KeyAdapter()
{
+ @Override
public void keyTyped(KeyEvent e)
{
textfield_keyTyped(e);
public void keyTyped(KeyEvent e)
{
textfield_keyTyped(e);