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 efficiency/JAL-2034_JAL-1421
[jalview.git]
/
src
/
jalview
/
structures
/
models
/
AAStructureBindingModel.java
diff --git
a/src/jalview/structures/models/AAStructureBindingModel.java
b/src/jalview/structures/models/AAStructureBindingModel.java
index
2ed59ae
..
dc42315
100644
(file)
--- a/
src/jalview/structures/models/AAStructureBindingModel.java
+++ b/
src/jalview/structures/models/AAStructureBindingModel.java
@@
-598,6
+598,10
@@
public abstract class AAStructureBindingModel extends
for (String file : files)
{
notLoaded = file;
for (String file : files)
{
notLoaded = file;
+ if (file == null)
+ {
+ continue;
+ }
try
{
StructureMapping[] sm = getSsm().getMapping(file);
try
{
StructureMapping[] sm = getSsm().getMapping(file);
@@
-633,7
+637,10
@@
public abstract class AAStructureBindingModel extends
{
for (SequenceI s : seqs)
{
{
for (SequenceI s : seqs)
{
- if (s == seq)
+ if (s == seq
+ || (s.getDatasetSequence() != null && s
+ .getDatasetSequence() == seq
+ .getDatasetSequence()))
{
return true;
}
{
return true;
}