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
/
gui
/
Finder.java
diff --git
a/src/jalview/gui/Finder.java
b/src/jalview/gui/Finder.java
index
84540f4
..
a75c6ff
100755
(executable)
--- a/
src/jalview/gui/Finder.java
+++ b/
src/jalview/gui/Finder.java
@@
-210,8
+210,8
@@
public class Finder extends GFinder
@Override
public void createFeatures_actionPerformed()
{
@Override
public void createFeatures_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 = searchBox.getEditor().getItem().toString().trim();
String desc = "Search Results";
String searchString = searchBox.getEditor().getItem().toString().trim();
String desc = "Search Results";
@@
-268,42
+268,28
@@
public class Finder extends GFinder
finder.setFindAll(doFindAll);
finder.setFindAll(doFindAll);
- finder.find(searchString); // returns true if anything was actually found
+ finder.find(searchString);
seqIndex = finder.getSeqIndex();
resIndex = finder.getResIndex();
seqIndex = finder.getSeqIndex();
resIndex = finder.getResIndex();
- searchResults = finder.getSearchResults(); // find(regex,
- // caseSensitive.isSelected(), )
+ searchResults = finder.getSearchResults();
Vector<SequenceI> idMatch = finder.getIdMatch();
Vector<SequenceI> idMatch = finder.getIdMatch();
- boolean haveResults = false;
- // set or reset the GUI
- if ((idMatch.size() > 0))
- {
- haveResults = true;
- ap.getIdPanel().highlightSearchResults(idMatch);
- }
- else
- {
- ap.getIdPanel().highlightSearchResults(null);
- }
+ ap.getIdPanel().highlightSearchResults(idMatch);
- if (searchResults.getSize() > 0)
+ if (searchResults.isEmpty())
{
{
- haveResults = true;
- createFeatures.setEnabled(true);
+ searchResults = null;
}
else
{
}
else
{
- searchResults = null;
+ createFeatures.setEnabled(true);
}
}
- // if allResults is null, this effectively switches displaySearch flag in
- // seqCanvas
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)
{
JvOptionPane.showInternalMessageDialog(this,
MessageManager.getString("label.finished_searching"), null,
{
JvOptionPane.showInternalMessageDialog(this,
MessageManager.getString("label.finished_searching"), null,