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:
5e6ed74
)
increment if strings *dont* match
author
jprocter
<Jim Procter>
Thu, 2 Sep 2010 12:31:38 +0000
(12:31 +0000)
committer
jprocter
<Jim Procter>
Thu, 2 Sep 2010 12:31:38 +0000
(12:31 +0000)
src/jalview/ext/jmol/JalviewJmolBinding.java
patch
|
blob
|
history
diff --git
a/src/jalview/ext/jmol/JalviewJmolBinding.java
b/src/jalview/ext/jmol/JalviewJmolBinding.java
index
5a36b7c
..
f27b533
100644
(file)
--- a/
src/jalview/ext/jmol/JalviewJmolBinding.java
+++ b/
src/jalview/ext/jmol/JalviewJmolBinding.java
@@
-694,8
+694,8
@@
public abstract class JalviewJmolBinding implements StructureListener,
mset[j] = viewer.getModelFileName(i);
_modelFileNameMap[j] = i; // record the model index for the filename
// skip any additional models in the same file (NMR structures)
- if ((mset[j] == null ? mset[j] != mset[j - 1] : mset[j - 1] == null
- || mset[j].equals(mset[j - 1])))
+ if ((mset[j] == null ? mset[j] != mset[j - 1] : (mset[j - 1] == null
+ || !mset[j].equals(mset[j - 1]))))
{
j++;
}