2004/01/19 00:16:54

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

diff --git a/src/org/xwt/Scheduler.java b/src/org/xwt/Scheduler.java
index 8cbbb35..9e939a3 100644 (file)
--- a/src/org/xwt/Scheduler.java
+++ b/src/org/xwt/Scheduler.java
@@ -12,24 +12,22 @@ public class Scheduler {
 
     private static Scheduler singleton;
     public static interface Task { public abstract void perform() throws Exception; }
-
-    /** adds a task to the back of the queue */
     public static void add(Task t) { singleton.runnable.append(t); }
-
     public static void init() { if (singleton == null) (singleton = Platform.getScheduler()).run(); }
 
-    private static Task currentTask = null;
-    public static Task current() { return currentTask; }
+    private static Task current = null;
 
-    /** synchronizd so that we can safely call it from an event-delivery thread, in-context */
     private static volatile boolean rendering = false;
     private static volatile boolean again = false;
+
+    /** synchronizd so that we can safely call it from an event-delivery thread, in-context */
     public static void renderAll() {
         if (rendering) { again = true; return; }
         synchronized(Scheduler.class) {
             try {
                 rendering = true;
                 do {
+                    // FEATURE: this could be cleaner
                     again = false;
                     for(int i=0; i<Surface.allSurfaces.size(); i++) {
                         Surface s = ((Surface)Surface.allSurfaces.elementAt(i));
@@ -60,13 +58,14 @@ public class Scheduler {
 
     protected static Queue runnable = new Queue(50);
     public void defaultRun() {
-        try {while(true) {
-            currentTask = (Task)runnable.remove(true);
+        while(true) {
+            current = (Task)runnable.remove(true);
             try {
+                // FIXME hideous
                 synchronized(this) {
                     for(int i=0; i<Surface.allSurfaces.size(); i++) {
                         Surface s = (Surface)Surface.allSurfaces.elementAt(i);
-                        if (currentTask instanceof JS) {
+                        if (current instanceof JS) {
                             s._mousex = Integer.MAX_VALUE;
                             s._mousey = Integer.MAX_VALUE;
                         } else {
@@ -74,7 +73,7 @@ public class Scheduler {
                             s._mousey = s.mousey;
                         }
                     }
-                    currentTask.perform();
+                    current.perform();
                 }
                 renderAll();
             } catch (JSExn e) {
@@ -86,8 +85,6 @@ public class Scheduler {
                 Log.info(Scheduler.class, e);
             }
             // if an Error is thrown it will cause the engine to quit
-}        } catch (Throwable t) {
-            t.printStackTrace();
         }
     }
 }