2003/12/13 08:13:32

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

diff --git a/src/org/xwt/Main.java b/src/org/xwt/Main.java
index 939922c..50bb76d 100644 (file)
--- a/src/org/xwt/Main.java
+++ b/src/org/xwt/Main.java
@@ -43,7 +43,6 @@ public class Main {
         Runtime.getRuntime().exit(-1);
     }
 
-    /** common entry point */
     public static void main(String[] args) throws Exception {
         int startargs = 0;
         while (true) {
@@ -80,15 +79,12 @@ public class Main {
         final XWT xwt = new XWT(rr);
         final Res final_rr = rr;
 
-        scarHolder =
-            Picture.fromRes((Res)Main.builtin.get("org/xwt/builtin/scar.png"),
-                        new Scheduler.Task() { public void perform() throws JSExn {
-                            scarImage = scarHolder.picture;
-                            Template.getTemplate(((Res)final_rr.get(initialTemplate))).apply(new Box(), xwt);
-                        } });
+        scarImage =
+            Picture.load((Res)Main.builtin.get("org/xwt/builtin/scar.png"),
+                         new Scheduler.Task() { public void perform() throws JSExn {
+                             Template.getTemplate(((Res)final_rr.get(initialTemplate))).apply(new Box(), xwt);
+                         } });
 
-        new Thread() { public void run() { Scheduler.init(); } }.start();
-        Platform.running();
+        Scheduler.init();
     }
-    static Picture.Holder scarHolder = null;
 }