2003/12/29 18:05:53

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

diff --git a/src/org/xwt/Main.java b/src/org/xwt/Main.java
index b725805..179ffab 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) {
@@ -54,7 +53,7 @@ public class Main {
         }
 
         Platform.forceLoad();
-        if (Log.on) for(int i=0; i<args.length; i++) Log.log(Main.class, "argument " + i + ": " + args[i]);
+        if (Log.on) for(int i=0; i<args.length; i++) Log.info(Main.class, "argument " + i + ": " + args[i]);
 
         String initialTemplateName = args.length > startargs + 1 ? args[startargs + 1] : "main";
         initialTemplateName = initialTemplateName.replace('.', '/');
@@ -76,19 +75,16 @@ public class Main {
             initialTemplate = initialTemplateName;
         }
 
-        if (Log.on) Log.log(Main.class, "loading xwar");
+        if (Log.on) Log.info(Main.class, "loading xwar");
         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() {
-                            scarImage = scarHolder.picture;
-                            Template.getTemplate(((Res)final_rr.get(initialTemplate))).apply(new BoxTree(), 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;
 }