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

diff --git a/src/org/xwt/Main.java b/src/org/xwt/Main.java
index 09f1b31..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,7 +25,7 @@ public class Main {
     public static String originHost = null;
     public static String origin = null;
     
-    public static final Res builtin = new Res.Zip(new Res.Builtin());
+    public static final Stream builtin = new Stream.Zip(new Stream.Builtin());
     public static Picture scarImage = null;
 
     public static void printUsage() {
@@ -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,13 +53,13 @@ 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('.', '/');
         origin = args[startargs];
 
-        Res rr;
+        Stream rr;
         final String initialTemplate;
 
         if (origin.startsWith("http://") || origin.startsWith("https://")) {
@@ -71,24 +70,21 @@ public class Main {
             rr = builtin;
             initialTemplate = "org/xwt/builtin/splash.xwt";
         } else {
-            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;
 
-        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 Box(), xwt);
-                        } });
+        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);
+                         } });
 
-        new Thread() { public void run() { Scheduler.init(); } }.start();
-        Platform.running();
+        Scheduler.init();
     }
-    static Picture.Holder scarHolder = null;
 }