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
Merge branch 'bug/JAL-1644_Finder-logic-improvement' into develop
[jalview.git]
/
src
/
jalview
/
analysis
/
Finder.java
diff --git
a/src/jalview/analysis/Finder.java
b/src/jalview/analysis/Finder.java
index
b87c170
..
61e5709
100644
(file)
--- a/
src/jalview/analysis/Finder.java
+++ b/
src/jalview/analysis/Finder.java
@@
-20,9
+20,12
@@
*/
package jalview.analysis;
*/
package jalview.analysis;
-import java.util.*;
+import jalview.datamodel.AlignmentI;
+import jalview.datamodel.SearchResults;
+import jalview.datamodel.Sequence;
+import jalview.datamodel.SequenceGroup;
-import jalview.datamodel.*;
+import java.util.Vector;
public class Finder
{
public class Finder
{
@@
-146,6
+149,18
@@
public class Finder
break;
}
}
break;
}
}
+
+ if (regex.search(seq.getDescription()))
+ {
+ idMatch.addElement(seq);
+ hasResults = true;
+ if (!findAll)
+ {
+ // stop and return the match
+ found = true;
+ break;
+ }
+ }
}
item = seq.getSequenceAsString();
}
item = seq.getSequenceAsString();