2003/11/05 10:25:00

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

diff --git a/src/org/xwt/Scheduler.java b/src/org/xwt/Scheduler.java
index 95fd6bf..a46c75c 100644 (file)
--- a/src/org/xwt/Scheduler.java
+++ b/src/org/xwt/Scheduler.java
@@ -5,26 +5,40 @@ import java.util.*;
 import org.xwt.js.*;
 import org.xwt.util.*;
 
-// FEATURE: reimplement Watcher
 /** Implements cooperative multitasking */
 public class Scheduler {
 
-    private static Scheduler singleton = new Scheduler();
-    public static void run() { singleton.do_run(); }
+    // Public API Exposed to org.xwt /////////////////////////////////////////////////
+
+    public static abstract class Task { public abstract void perform(); }
+    public static void add(Task t) { singleton.runnable.append(t); }
+    public static void init() { singleton.run(); }
+
+
+    // API which must be supported by subclasses /////////////////////////////////////
+
     protected Scheduler() { }
 
-    public static abstract class Task implements Callback { public abstract Object call(Object o); }
+    /**
+     *  INVARIANT: all scheduler implementations MUST invoke
+     *  Surface.renderAll() after performing a Task if no tasks remain
+     *  in the queue.  A scheduler may choose to invoke
+     *  Surface.renderAll() more often than that if it so chooses.
+     */
+    public void run() { defaultRun(); }
 
-    private static Queue runnable = new Queue(50);
 
-    public static void add(Task t) { singleton.runnable.append(t); }
-    public void do_run() {
+    // Default Implementation /////////////////////////////////////
+
+    protected static Queue runnable = new Queue(50);
+    private static final Scheduler singleton = Platform.getScheduler();
+    public void defaultRun() {
         while(true) {
             Task t = (Task)runnable.remove(true);
             try {
-                t.call(null);
-                for(int i=0; i<Surface.allSurfaces.size(); i++)
-                    ((Surface)Surface.allSurfaces.elementAt(i)).render();
+                t.perform();
+                // FIXME: be smarter about this
+                Surface.renderAll();
             } catch (Exception e) {
                 Log.log(Scheduler.class, "Task threw an exception: " + e);
                 Log.log(Scheduler.class, e);