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:
a5be53d
)
JAL-2044 increase Jmol file load timeout from 5 to 20 seconds
author
gmungoc
<g.m.carstairs@dundee.ac.uk>
Thu, 13 Oct 2016 09:56:37 +0000
(10:56 +0100)
committer
gmungoc
<g.m.carstairs@dundee.ac.uk>
Thu, 13 Oct 2016 09:56:37 +0000
(10:56 +0100)
src/jalview/gui/AppJmol.java
patch
|
blob
|
history
diff --git
a/src/jalview/gui/AppJmol.java
b/src/jalview/gui/AppJmol.java
index
021a004
..
1c0dfe6
100644
(file)
--- a/
src/jalview/gui/AppJmol.java
+++ b/
src/jalview/gui/AppJmol.java
@@
-79,6
+79,9
@@
import javax.swing.event.MenuListener;
public class AppJmol extends StructureViewerBase
{
public class AppJmol extends StructureViewerBase
{
+ // ms to wait for Jmol to load files
+ private static final int JMOL_LOAD_TIMEOUT = 20000;
+
private static final String SPACE = " ";
private static final String BACKSLASH = "\"";
private static final String SPACE = " ";
private static final String BACKSLASH = "\"";
@@
-309,12
+312,10
@@
public class AppJmol extends StructureViewerBase
jmb.setColourBySequence(true);
setSize(400, 400); // probably should be a configurable/dynamic default here
initMenus();
jmb.setColourBySequence(true);
setSize(400, 400); // probably should be a configurable/dynamic default here
initMenus();
- worker = null;
- {
- addingStructures = false;
- worker = new Thread(this);
- worker.start();
- }
+ addingStructures = false;
+ worker = new Thread(this);
+ worker.start();
+
this.addInternalFrameListener(new InternalFrameAdapter()
{
@Override
this.addInternalFrameListener(new InternalFrameAdapter()
{
@Override
@@
-551,7
+552,7
@@
public class AppJmol extends StructureViewerBase
}
// need to wait around until script has finished
}
// need to wait around until script has finished
- int waitMax = 5000; // give up after 5 seconds
+ int waitMax = JMOL_LOAD_TIMEOUT;
int waitFor = 35;
int waitTotal = 0;
while (addingStructures ? lastnotify >= jmb.getLoadNotifiesHandled()
int waitFor = 35;
int waitTotal = 0;
while (addingStructures ? lastnotify >= jmb.getLoadNotifiesHandled()
@@
-568,7
+569,13
@@
public class AppJmol extends StructureViewerBase
}
if (waitTotal > waitMax)
{
}
if (waitTotal > waitMax)
{
- System.err.println("Timed out waiting for Jmol to load files");
+ System.err
+ .println("Timed out waiting for Jmol to load files after "
+ + waitTotal + "ms");
+// System.err.println("finished: " + jmb.isFinishedInit()
+// + "; loaded: " + Arrays.toString(jmb.getPdbFile())
+// + "; files: " + files.toString());
+ jmb.getPdbFile();
break;
}
}
break;
}
}