From: jprocter <Jim Procter>
Date: Mon, 17 Jan 2011 14:27:06 +0000 (+0000)
Subject: allow debug messages to be output before jscallback execution
X-Git-Tag: Release_2_7~298
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=00f975038d7e80958e6c8e085c24987a5c48f9c9;p=jalview.git

allow debug messages to be output before jscallback execution
---

diff --git a/src/jalview/javascript/JSFunctionExec.java b/src/jalview/javascript/JSFunctionExec.java
index 9674926..64e8a0e 100644
--- 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
   {
+
+    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)
@@ -112,13 +121,17 @@ public class JSFunctionExec implements Runnable
           JSObject scriptObject = null;
           try
           {
-            scriptObject = JSObject.getWindow(jvlite.applet);
+            scriptObject = JSObject.getWindow(jvlite);
           } catch (Exception ex)
           {
           }
           ;
           if (scriptObject != null)
           {
+            if (jvlite.debug && dbgMsg != null)
+            {
+              System.err.println(dbgMsg);
+            }
             scriptObject.call(_listener, objects);
           }
         } catch (Exception jex)