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 'develop' of https://source.jalview.org/git/jalview into develop
[jalview.git]
/
src
/
jalview
/
analysis
/
Finder.java
diff --git
a/src/jalview/analysis/Finder.java
b/src/jalview/analysis/Finder.java
index
224c60a
..
72097e0
100644
(file)
--- a/
src/jalview/analysis/Finder.java
+++ b/
src/jalview/analysis/Finder.java
@@
-1,6
+1,6
@@
/*
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
- * Copyright (C) 2014 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
*
* This file is part of Jalview.
*
*
* This file is part of Jalview.
*
@@
-152,7
+152,8
@@
public class Finder
}
}
}
}
- if (isIncludeDescription() && regex.search(seq.getDescription()))
+ if (isIncludeDescription() && seq.getDescription() != null
+ && regex.search(seq.getDescription()))
{
idMatch.addElement(seq);
hasResults = true;
{
idMatch.addElement(seq);
hasResults = true;
@@
-205,7
+206,7
@@
public class Finder
{
continue;
}
{
continue;
}
-
+ // if invalid string used, then regex has no matched to/from
int sres = seq
.findPosition(resIndex
+ Integer.parseInt(spaces.elementAt(resIndex)
int sres = seq
.findPosition(resIndex
+ Integer.parseInt(spaces.elementAt(resIndex)