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
JSON refactoring
[jalview.git]
/
src
/
jalview
/
analysis
/
AlignmentUtils.java
diff --git
a/src/jalview/analysis/AlignmentUtils.java
b/src/jalview/analysis/AlignmentUtils.java
index
14096cf
..
4f8897a
100644
(file)
--- a/
src/jalview/analysis/AlignmentUtils.java
+++ b/
src/jalview/analysis/AlignmentUtils.java
@@
-2320,10
+2320,14
@@
public class AlignmentUtils
int phase = 0;
try
{
int phase = 0;
try
{
- phase = Integer.parseInt(sf.getPhase());
+ String s = sf.getPhase();
+ if (s != null)
+ {
+ phase = Integer.parseInt(s);
+ }
} catch (NumberFormatException e)
{
} catch (NumberFormatException e)
{
- // ignore
+ // SwingJS -- need to avoid these.
}
/*
* phase > 0 on first codon means 5' incomplete - skip to the start
}
/*
* phase > 0 on first codon means 5' incomplete - skip to the start