2003/11/16 08:28:09

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

diff --git a/src/org/xwt/Main.java b/src/org/xwt/Main.java
index 1552c00..b725805 100644 (file)
--- a/src/org/xwt/Main.java
+++ b/src/org/xwt/Main.java
@@ -32,11 +32,7 @@ public class Main {
         System.err.println("Usage: xwt [-s] [-v] [-l <port>/<url>] source-location [initial-template]");
         System.err.println("");
         System.err.println("Options:");
-        // FEATURE: reintroduce
-        //System.err.println("    -s show rendering activity with red rectangles");
         System.err.println("    -v verbose logging");
-        // FEATURE: reintroduce
-        //System.err.println("    -l serve logs via HTTP on 127.0.0.1:<port>/<url>");
         System.err.println("");
         System.err.println("Source-location is one of the following:");
         System.err.println("    - the path to an xwar file");
@@ -53,7 +49,6 @@ public class Main {
         while (true) {
             if (startargs > args.length - 1) printUsage();
             else if (args[startargs].equals("-v")) Log.verbose = true;
-            else if (args[startargs].equals("-l")) startargs++;
             else break;
             startargs++;
         }
@@ -62,7 +57,7 @@ public class Main {
         if (Log.on) for(int i=0; i<args.length; i++) Log.log(Main.class, "argument " + i + ": " + args[i]);
 
         String initialTemplateName = args.length > startargs + 1 ? args[startargs + 1] : "main";
-        initialTemplateName = initialTemplateName.replace('/', '.');
+        initialTemplateName = initialTemplateName.replace('.', '/');
         origin = args[startargs];
 
         Res rr;
@@ -76,9 +71,6 @@ public class Main {
             rr = builtin;
             initialTemplate = "org/xwt/builtin/splash.xwt";
         } else {
-            // HACK because MSIE turns \'s into /'s in file URLs... argh!!
-            if (Platform.platform.getClass().getName().endsWith("Win32")) origin = origin.replace('/', '\\');
-            final String final_origin = origin;
             rr = new Res.File(origin);
             if (!new File(origin).isDirectory()) rr = new Res.Zip(rr);
             initialTemplate = initialTemplateName;
@@ -88,17 +80,15 @@ public class Main {
         final XWT xwt = new XWT(rr);
         final Res final_rr = rr;
 
-        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;
-                } });
+        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);
+                        } });
 
         new Thread() { public void run() { Scheduler.init(); } }.start();
         Platform.running();
     }
-
+    static Picture.Holder scarHolder = null;
 }