2003/10/31 09:50:08

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

diff --git a/src/org/xwt/Main.java b/src/org/xwt/Main.java
index f102939..3c79fd8 100644 (file)
--- a/src/org/xwt/Main.java
+++ b/src/org/xwt/Main.java
@@ -25,7 +25,7 @@ public class Main {
     public static String originHost = null;
     public static String origin = null;
     
-    public static final Res builtin = new Res.Builtin();
+    public static final Res builtin = new Res.Zip(new Res.Builtin());
     public static Picture scarImage = null;
 
     public static void printUsage() {
@@ -88,19 +88,19 @@ 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 Object call(Object args) {
+                                Template.getTemplate(((Res)final_rr.get(initialTemplate))).apply(new Box(), null, xwt);
+                                return null;
+                            }
+                        });
+                    return null;
+                } });
+
+        new Thread() { public void run() { Scheduler.run(); } }.start();
         Platform.running();
     }