git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
044474c
)
JAL-674 check for null vector before ...
author
Jim Procter
<j.procter@dundee.ac.uk>
Tue, 21 Oct 2014 16:36:13 +0000
(17:36 +0100)
committer
Jim Procter
<j.procter@dundee.ac.uk>
Tue, 21 Oct 2014 16:36:13 +0000
(17:36 +0100)
src/MCview/PDBfile.java
patch
|
blob
|
history
diff --git
a/src/MCview/PDBfile.java
b/src/MCview/PDBfile.java
index
a99f172
..
132aea8
100755
(executable)
--- a/
src/MCview/PDBfile.java
+++ b/
src/MCview/PDBfile.java
@@
-331,11
+331,17
@@
public class PDBfile extends jalview.io.AlignFile
{
if (sq.getDatasetSequence() != null)
{
{
if (sq.getDatasetSequence() != null)
{
- sq.getDatasetSequence().getPDBId().clear();
+ if (sq.getDatasetSequence().getPDBId() != null)
+ {
+ sq.getDatasetSequence().getPDBId().clear();
+ }
}
else
{
}
else
{
- sq.getPDBId().clear();
+ if (sq.getPDBId() != null)
+ {
+ sq.getPDBId().clear();
+ }
}
}
AlignSeq.replaceMatchingSeqsWith(seqs, annotations, prot, al, AlignSeq.PEP, false);
}
}
AlignSeq.replaceMatchingSeqsWith(seqs, annotations, prot, al, AlignSeq.PEP, false);
@@
-370,11
+376,17
@@
public class PDBfile extends jalview.io.AlignFile
{
if (sq.getDatasetSequence() != null)
{
{
if (sq.getDatasetSequence() != null)
{
- sq.getDatasetSequence().getPDBId().clear();
+ if (sq.getDatasetSequence().getPDBId() != null)
+ {
+ sq.getDatasetSequence().getPDBId().clear();
+ }
}
else
{
}
else
{
- sq.getPDBId().clear();
+ if (sq.getPDBId() != null)
+ {
+ sq.getDatasetSequence().getPDBId().clear();
+ }
}
}
AlignSeq.replaceMatchingSeqsWith(seqs, annotations, rna, al, AlignSeq.DNA, false);
}
}
AlignSeq.replaceMatchingSeqsWith(seqs, annotations, rna, al, AlignSeq.DNA, false);