2003/10/20 03:37:11

darcs-hash:20040130073952-2ba56-6fcca635420d85d4f7b3d7d14c5ac022d1095df0.gz

diff --git a/Makefile b/Makefile
index 61588b4..27286c9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -317,6 +317,6 @@ dist-private:
 
 
 # this is for Adam; don't mess with it
-test: JVM; /System/Library/Frameworks/JavaVM.framework/Versions/1.3.1/Commands/java -jar build/JVM/xwt.jar http://www.xwt.org/demo.xwar
+test: JVM; /System/Library/Frameworks/JavaVM.framework/Versions/1.3.1/Commands/java -jar build/JVM/xwt.jar .
 
 

diff --git a/src/org/xwt/Main.java b/src/org/xwt/Main.java
index 8967902..4f1c6ac 100644 (file)
--- a/src/org/xwt/Main.java
+++ b/src/org/xwt/Main.java
@@ -67,7 +67,7 @@ public class Main {
         initialTemplateName = initialTemplateName.replace('/', '.');
         origin = args[startargs];
 
-        final Res rr;
+        Res rr;
         final String initialTemplate;
 
         if (origin.startsWith("http://") || origin.startsWith("https://")) {
@@ -80,21 +80,22 @@ 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);
+                            Template.getTemplate(((Res)final_rr.get(initialTemplate))).apply(new Box(), null, xwt);
                             return null;
                         }
                     });