2003/10/20 01:41:21

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

diff --git a/src/org/xwt/Main.java b/src/org/xwt/Main.java
index 902cb92..8967902 100644 (file)
--- a/src/org/xwt/Main.java
+++ b/src/org/xwt/Main.java
@@ -60,35 +60,44 @@ public class Main {
         Platform.forceLoad();
         if (Log.on) for(int i=0; i<args.length; i++) Log.log(Main.class, "argument " + i + ": " + args[i]);
 
-        builtin = new Res.Zip(new Res.IS(Platform.getBuiltinInputStream()));
+        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;
+        final String initialTemplate;
+
         if (origin.startsWith("http://") || origin.startsWith("https://")) {
             originHost = origin.substring(origin.indexOf('/') + 2);
             originHost = originHost.substring(0, originHost.indexOf('/') == -1 ? originHost.length() : originHost.indexOf('/'));
             if (originHost.indexOf('@') != -1) originHost = originHost.substring(originHost.indexOf('@') + 1);
             originAddr = InetAddress.getByName(originHost);
+            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('/', '\\');
             if (!new File(origin).isDirectory()) origin += "!";
             origin = "file:" + origin;
+            rr = Res.stringToRes(origin, true);
+            initialTemplate = initialTemplateName;
         }
 
-        // FIXME put the splash screen back in
         if (Log.on) Log.log(Main.class, "loading xwar");
-
-        final Res rr = Res.stringToRes(origin, true);
         final XWT xwt = new XWT(rr);
-        final String initialTemplateName_ = initialTemplateName;
 
         new Thread(new Runnable() { 
             public void run() {
-                Template.getTemplate(((Res)rr.get(initialTemplateName_)).addExtension(".xwt")).apply(new Box(), null, xwt);
                 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);
+                            return null;
+                        }
+                    });
             }
         }).start();