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:
b97119f
)
allow debug messages to be output before jscallback execution
author
jprocter
<Jim Procter>
Mon, 17 Jan 2011 14:27:06 +0000
(14:27 +0000)
committer
jprocter
<Jim Procter>
Mon, 17 Jan 2011 14:27:06 +0000
(14:27 +0000)
src/jalview/javascript/JSFunctionExec.java
patch
|
blob
|
history
diff --git
a/src/jalview/javascript/JSFunctionExec.java
b/src/jalview/javascript/JSFunctionExec.java
index
9674926
..
64e8a0e
100644
(file)
--- a/
src/jalview/javascript/JSFunctionExec.java
+++ b/
src/jalview/javascript/JSFunctionExec.java
@@
-96,6
+96,15
@@
public class JSFunctionExec implements Runnable
public void executeJavascriptFunction(final boolean async,
final String _listener, Object[] arguments) throws Exception
{
public void executeJavascriptFunction(final boolean async,
final String _listener, Object[] arguments) throws Exception
{
+
+ executeJavascriptFunction(async, _listener, arguments, null);
+
+ }
+
+ public void executeJavascriptFunction(final boolean async,
+ final String _listener, Object[] arguments, final String dbgMsg)
+ throws Exception
+ {
final Object[] objects = new Object[arguments != null ? arguments.length
: 0];
if (arguments != null)
final Object[] objects = new Object[arguments != null ? arguments.length
: 0];
if (arguments != null)
@@
-112,13
+121,17
@@
public class JSFunctionExec implements Runnable
JSObject scriptObject = null;
try
{
JSObject scriptObject = null;
try
{
- scriptObject = JSObject.getWindow(jvlite.applet);
+ scriptObject = JSObject.getWindow(jvlite);
} catch (Exception ex)
{
}
;
if (scriptObject != null)
{
} catch (Exception ex)
{
}
;
if (scriptObject != null)
{
+ if (jvlite.debug && dbgMsg != null)
+ {
+ System.err.println(dbgMsg);
+ }
scriptObject.call(_listener, objects);
}
} catch (Exception jex)
scriptObject.call(_listener, objects);
}
} catch (Exception jex)