X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FMain.java;h=1552c009d78356fbb8a33448ea7d39dbf2c07f82;hb=67eeff476179a91ae930ea89cbecde22132ca532;hp=e77158546cedf8e0df51b2593ac10c2cc02094fa;hpb=d8a2348c7712a69ac368335417a8f6616e535b1b;p=org.ibex.core.git

diff --git a/src/org/xwt/Main.java b/src/org/xwt/Main.java
index e771585..1552c00 100644
--- a/src/org/xwt/Main.java
+++ b/src/org/xwt/Main.java
@@ -25,8 +25,7 @@ public class Main {
     public static String originHost = null;
     public static String origin = null;
     
-    public static final Res builtin = new Res.Zip(new Res() {
-            public InputStream getInputStream(String path) { return Platform.getBuiltinInputStream(); } });
+    public static final Res builtin = new Res.Zip(new Res.Builtin());
     public static Picture scarImage = null;
 
     public static void printUsage() {
@@ -89,19 +88,16 @@ public class Main {
         final XWT xwt = new XWT(rr);
         final Res final_rr = rr;
 
-        new Thread(new Runnable() { 
-            public void run() {
-                Message.Q.startQ();
-                ThreadMessage.newthread(new JS.Callable() {
-                        public Object call(JS.Array args) {
-                            scarImage = Picture.fromRes((Res)Main.builtin.get("org/xwt/builtin/scar.png"));
-                            Template.getTemplate(((Res)final_rr.get(initialTemplate))).apply(new Box(), null, xwt);
-                            return null;
-                        }
-                    });
-            }
-        }).start();
-        
+        Picture.fromRes((Res)Main.builtin.get("org/xwt/builtin/scar.png"), new Callback() {
+                public Object call(Object arg) {
+                    scarImage = (Picture)arg;
+                    Scheduler.add(new Scheduler.Task() { public void perform() {
+                        Template.getTemplate(((Res)final_rr.get(initialTemplate))).apply(new BoxTree(), xwt);
+                    } });
+                    return null;
+                } });
+
+        new Thread() { public void run() { Scheduler.init(); } }.start();
         Platform.running();
     }