2003/10/28 10:10:17

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

diff --git a/src/org/xwt/Main.java b/src/org/xwt/Main.java
index 8967902..e771585 100644 (file)
--- a/src/org/xwt/Main.java
+++ b/src/org/xwt/Main.java
@@ -24,8 +24,10 @@ public class Main {
     public static java.net.InetAddress originAddr = null;
     public static String originHost = null;
     public static String origin = null;
-
-    public static Res builtin = null;
+    
+    public static final Res builtin = new Res.Zip(new Res() {
+            public InputStream getInputStream(String path) { return Platform.getBuiltinInputStream(); } });
+    public static Picture scarImage = null;
 
     public static void printUsage() {
         System.err.println("Usage: xwt [-s] [-v] [-l <port>/<url>] source-location [initial-template]");
@@ -60,14 +62,11 @@ public class Main {
         Platform.forceLoad();
         if (Log.on) for(int i=0; i<args.length; i++) Log.log(Main.class, "argument " + i + ": " + args[i]);
 
-        Res zip = new Res() { public InputStream getInputStream(String path) { return Platform.getBuiltinInputStream(); } };
-        builtin = new Res.Zip(zip);
-
         String initialTemplateName = args.length > startargs + 1 ? args[startargs + 1] : "main";
         initialTemplateName = initialTemplateName.replace('/', '.');
         origin = args[startargs];
 
-        final Res rr;
+        Res rr;
         final String initialTemplate;
 
         if (origin.startsWith("http://") || origin.startsWith("https://")) {
@@ -80,21 +79,23 @@ public class Main {
         } else {
             // HACK because MSIE turns \'s into /'s in file URLs... argh!!
             if (Platform.platform.getClass().getName().endsWith("Win32")) origin = origin.replace('/', '\\');
-            if (!new File(origin).isDirectory()) origin += "!";
-            origin = "file:" + origin;
-            rr = Res.stringToRes(origin, true);
+            final String final_origin = origin;
+            rr = new Res.File(origin);
+            if (!new File(origin).isDirectory()) rr = new Res.Zip(rr);
             initialTemplate = initialTemplateName;
         }
 
         if (Log.on) Log.log(Main.class, "loading xwar");
         final XWT xwt = new XWT(rr);
+        final Res final_rr = rr;
 
         new Thread(new Runnable() { 
             public void run() {
                 Message.Q.startQ();
                 ThreadMessage.newthread(new JS.Callable() {
                         public Object call(JS.Array args) {
-                            Template.getTemplate(((Res)rr.get(initialTemplate))).apply(new Box(), null, xwt);
+                            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;
                         }
                     });