X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FScheduler.java;h=4dc85bfb49221737c8c73b4edb6fcbf416a94086;hb=7e9239a7088d4cd772a31a76e1a53e1c681638bc;hp=6867376de9e4abd8d311f9c323aaab452718cf15;hpb=094ee9684222ee0b257d2ce3822fa2563e5787ce;p=org.ibex.core.git

diff --git a/src/org/xwt/Scheduler.java b/src/org/xwt/Scheduler.java
index 6867376..4dc85bf 100644
--- a/src/org/xwt/Scheduler.java
+++ b/src/org/xwt/Scheduler.java
@@ -1,4 +1,4 @@
-// Copyright 2003 Adam Megacz, see the COPYING file for licensing [GPL]
+// Copyright 2004 Adam Megacz, see the COPYING file for licensing [GPL]
 package org.xwt;
 
 import java.util.*;
@@ -23,8 +23,8 @@ public class Scheduler {
 
     public static void init() { if (singleton == null) (singleton = Platform.getScheduler()).run(); }
 
-    private static Task current = null;
-    public static Task current() { return current; }
+    private static Task currentTask = null;
+    public static Task current() { return currentTask; }
 
     /** synchronizd so that we can safely call it from an event-delivery thread, in-context */
     private static volatile boolean rendering = false;
@@ -66,12 +66,12 @@ public class Scheduler {
     protected static Queue runnable = new Queue(50);
     public void defaultRun() {
         while(true) {
-            current = (Task)runnable.remove(true);
+            currentTask = (Task)runnable.remove(true);
             try {
                 synchronized(this) {
                     for(int i=0; i<Surface.allSurfaces.size(); i++) {
                         Surface s = (Surface)Surface.allSurfaces.elementAt(i);
-                        if (current instanceof JSFunction) {
+                        if (currentTask instanceof JSFunction) {
                             s._mousex = Integer.MAX_VALUE;
                             s._mousey = Integer.MAX_VALUE;
                         } else {
@@ -79,12 +79,13 @@ public class Scheduler {
                             s._mousey = s.mousey;
                         }
                     }
-                    current.perform();
+                    currentTask.perform();
                 }
                 renderAll();
             } catch (JSExn e) {
                 Log.info(Scheduler.class, "a JavaScript thread spawned with xwt.thread() threw an exception:");
-                Log.info(Scheduler.class, e);
+                Log.info(Scheduler.class, "JS Exception: " + e.getObject() + "\n" + e.backtrace());
+                Log.info(Scheduler.class,e);
             } catch (Exception e) {
                 Log.info(Scheduler.class, "a Task threw an exception which was caught by the scheduler:");
                 Log.info(Scheduler.class, e);