X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FMain.java;h=b9967e852339f83ca97bd82f82d880b7dad36660;hb=7e9239a7088d4cd772a31a76e1a53e1c681638bc;hp=f10293946dd5c2771a713bfb6a7b9724ed966587;hpb=81bb6c152f30f56b093cf0670cca3640a5c47ae2;p=org.ibex.core.git

diff --git a/src/org/xwt/Main.java b/src/org/xwt/Main.java
index f102939..b9967e8 100644
--- a/src/org/xwt/Main.java
+++ b/src/org/xwt/Main.java
@@ -1,4 +1,4 @@
-// Copyright 2003 Adam Megacz, see the COPYING file for licensing [GPL]
+// Copyright 2004 Adam Megacz, see the COPYING file for licensing [GPL]
 package org.xwt;
 
 import java.net.*;
@@ -25,18 +25,14 @@ public class Main {
     public static String originHost = null;
     public static String origin = null;
     
-    public static final Res builtin = new Res.Builtin();
+    public static final Stream builtin = new Stream.Zip(new Stream.Builtin());
     public static Picture scarImage = null;
 
     public static void printUsage() {
         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");
@@ -47,25 +43,23 @@ public class Main {
         Runtime.getRuntime().exit(-1);
     }
 
-    /** common entry point */
     public static void main(String[] args) throws Exception {
         int startargs = 0;
         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++;
         }
 
         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('/', '.');
+        initialTemplateName = initialTemplateName.replace('.', '/');
         origin = args[startargs];
 
-        Res rr;
+        Stream rr;
         final String initialTemplate;
 
         if (origin.startsWith("http://") || origin.startsWith("https://")) {
@@ -76,32 +70,21 @@ 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);
+            rr = new Stream.File(origin);
+            if (!new File(origin).isDirectory()) rr = new Stream.Zip(rr);
             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;
+        final Stream 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();
-        
-        Platform.running();
-    }
+        scarImage =
+            Picture.load((Stream)Main.builtin.get("org/xwt/builtin/scar.png"),
+                         new Scheduler.Task() { public void perform() throws JSExn {
+                             Template.getTemplate(((Stream)final_rr.get(initialTemplate))).apply(new Box(), xwt);
+                         } });
 
+        Scheduler.init();
+    }
 }