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
JAL-1001 - hack to extract the global URL for a service from the 'MORE INFORMATION...
[jalview.git]
/
src
/
jalview
/
ext
/
jmol
/
JalviewJmolBinding.java
diff --git
a/src/jalview/ext/jmol/JalviewJmolBinding.java
b/src/jalview/ext/jmol/JalviewJmolBinding.java
index
4a1efe6
..
7f949c7
100644
(file)
--- a/
src/jalview/ext/jmol/JalviewJmolBinding.java
+++ b/
src/jalview/ext/jmol/JalviewJmolBinding.java
@@
-1,6
+1,6
@@
/*
\r
* Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
\r
/*
\r
* Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
\r
- * Copyright (C) 2011 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
\r
+ * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle
\r
*
\r
* This file is part of Jalview.
\r
*
\r
*
\r
* This file is part of Jalview.
\r
*
\r
@@
-357,7
+357,7
@@
public abstract class JalviewJmolBinding implements StructureListener,
for (int pdbfnum = 0; pdbfnum < files.length; pdbfnum++)
\r
{
\r
StructureMapping[] mapping = ssm.getMapping(files[pdbfnum]);
\r
for (int pdbfnum = 0; pdbfnum < files.length; pdbfnum++)
\r
{
\r
StructureMapping[] mapping = ssm.getMapping(files[pdbfnum]);
\r
-
\r
+ // RACE CONDITION - getMapping only returns Jmol loaded filenames once Jmol callback has completed.
\r
if (mapping == null || mapping.length < 1)
\r
continue;
\r
\r
if (mapping == null || mapping.length < 1)
\r
continue;
\r
\r