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' into imp/JAL-2775
[jalview.git]
/
src
/
ext
/
edu
/
ucsf
/
rbvi
/
strucviz2
/
ChimeraResidue.java
diff --git
a/src/ext/edu/ucsf/rbvi/strucviz2/ChimeraResidue.java
b/src/ext/edu/ucsf/rbvi/strucviz2/ChimeraResidue.java
index
0045e97
..
3abbe75
100644
(file)
--- a/
src/ext/edu/ucsf/rbvi/strucviz2/ChimeraResidue.java
+++ b/
src/ext/edu/ucsf/rbvi/strucviz2/ChimeraResidue.java
@@
-383,6
+383,8
@@
public class ChimeraResidue implements ChimeraStructuralObject,
public void splitInsertionCode(String residue)
{
// OK, split the index into number and insertion code
public void splitInsertionCode(String residue)
{
// OK, split the index into number and insertion code
+ // JBPNote - m.matches() can be true even if there is no resnum - this can
+ // cause NumberFormatExceptions below
Pattern p = Pattern.compile("(\\d*)([A-Z]?)");
Matcher m = p.matcher(residue);
if (m.matches())
Pattern p = Pattern.compile("(\\d*)([A-Z]?)");
Matcher m = p.matcher(residue);
if (m.matches())