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
JAL-2839 Finder refactoring prior to fixing the defect
[jalview.git]
/
src
/
jalview
/
appletgui
/
Finder.java
diff --git
a/src/jalview/appletgui/Finder.java
b/src/jalview/appletgui/Finder.java
index
675b862
..
ee0d4a0
100644
(file)
--- a/
src/jalview/appletgui/Finder.java
+++ b/
src/jalview/appletgui/Finder.java
@@
-115,8
+115,8
@@
public class Finder extends Panel implements ActionListener
public void createNewGroup_actionPerformed()
{
public void createNewGroup_actionPerformed()
{
- List<SequenceI> seqs = new ArrayList<SequenceI>();
- List<SequenceFeature> features = new ArrayList<SequenceFeature>();
+ List<SequenceI> seqs = new ArrayList<>();
+ List<SequenceFeature> features = new ArrayList<>();
String searchString = textfield.getText().trim();
for (SearchResultMatchI match : searchResults.getResults())
String searchString = textfield.getText().trim();
for (SearchResultMatchI match : searchResults.getResults())
@@
-156,27
+156,15
@@
public class Finder extends Panel implements ActionListener
resIndex = finder.getResIndex();
searchResults = finder.getSearchResults();
Vector<SequenceI> idMatch = finder.getIdMatch();
resIndex = finder.getResIndex();
searchResults = finder.getSearchResults();
Vector<SequenceI> idMatch = finder.getIdMatch();
- boolean haveResults = false;
- // set or reset the GUI
- if ((idMatch.size() > 0))
- {
- haveResults = true;
- ap.idPanel.highlightSearchResults(idMatch);
- }
- else
- {
- ap.idPanel.highlightSearchResults(null);
- }
+ ap.idPanel.highlightSearchResults(idMatch);
- if (searchResults.getSize() > 0)
+ if (searchResults.isEmpty())
{
{
- haveResults = true;
- createNewGroup.setEnabled(true);
-
+ searchResults = null;
}
else
{
}
else
{
- searchResults = null;
+ createNewGroup.setEnabled(true);
}
// if allResults is null, this effectively switches displaySearch flag in
}
// if allResults is null, this effectively switches displaySearch flag in
@@
-184,7
+172,7
@@
public class Finder extends Panel implements ActionListener
ap.highlightSearchResults(searchResults);
// TODO: add enablers for 'SelectSequences' or 'SelectColumns' or
// 'SelectRegion' selection
ap.highlightSearchResults(searchResults);
// TODO: add enablers for 'SelectSequences' or 'SelectColumns' or
// 'SelectRegion' selection
- if (!haveResults)
+ if (idMatch.isEmpty() && searchResults == null)
{
ap.alignFrame.statusBar.setText(
MessageManager.getString("label.finished_searching"));
{
ap.alignFrame.statusBar.setText(
MessageManager.getString("label.finished_searching"));