2003/09/21 10:26:54

[org.ibex.core.git] / src / org / xwt / MessageQueue.java

diff --git a/src/org/xwt/MessageQueue.java b/src/org/xwt/MessageQueue.java
index fbebad4..2f444c8 100644 (file)
--- a/src/org/xwt/MessageQueue.java
+++ b/src/org/xwt/MessageQueue.java
@@ -1,4 +1,4 @@
-// Copyright 2002 Adam Megacz, see the COPYING file for licensing [GPL]
+// Copyright 2003 Adam Megacz, see the COPYING file for licensing [GPL]
 package org.xwt;
 
 import java.util.*;
@@ -87,7 +87,8 @@ public class MessageQueue extends Thread {
                 if (Log.on) Log.log(this, "caught throwable in MessageQueue.run(); this should never happen");
                 if (Log.on) Log.log(this, "    currentlyPerforming == " + currentlyPerforming);
                 if (Log.on) Log.log(this, "    working             == " + working);
-                if (Log.on) Log.log(this, "    lastfunc            == " + lastfunc);
+                // FIXME - this currently calls compiledfunction.toString which gives more info than we need
+                // if (Log.on) Log.log(this, "    lastfunc            == " + lastfunc.getDescription());
                 if (Log.on) Log.log(this, "    lastmessage         == " + lastmessage);
                 if (Log.on) Log.log(this, t);
                 if (Log.on) Log.log(this, "resuming MessageQueue loop");
@@ -117,13 +118,13 @@ public class MessageQueue extends Thread {
                 if ((m != null && m == MessageQueue.currentlyPerforming) || MessageQueue.working) {
                     String what, where;
                     if (m != null && m instanceof ThreadMessage) {
-                        where = org.xwt.js.Context.getSourceNameAndLineForThread((ThreadMessage)m);
+                        where = org.xwt.js.JS.Thread.fromJavaThread((ThreadMessage)m).getSourceName();
                         what = "background thread";
                     } else if (m != null) {
-                        where = org.xwt.js.Context.getSourceNameAndLineForThread(MessageQueue.singleton);
+                        where = org.xwt.js.JS.Thread.fromJavaThread(MessageQueue.singleton).getSourceName();
                         what = "event trap";
                     } else {
-                        where = org.xwt.js.Context.getSourceNameAndLineForThread(MessageQueue.singleton);
+                        where = org.xwt.js.JS.Thread.fromJavaThread(MessageQueue.singleton).getSourceName();
                         what = "script";
                     }
                     long howlong = (System.currentTimeMillis() - t) / 1000;