2002/06/05 19:53:10

darcs-hash:20040130064756-2ba56-c96db96c06155dcd8b695e6895a27aa7a414bd6a.gz

diff --git a/CHANGES b/CHANGES
index e92a105..5b83e2b 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -184,3 +184,5 @@
 
 05-Jun megacz Box.java: bugfix to ensure that negative regions are never filled
 
+05-Jun megacz Main.java: now require filename to end with .xwar
+

diff --git a/src/org/xwt/Main.java b/src/org/xwt/Main.java
index d488256..3faf54f 100644 (file)
--- a/src/org/xwt/Main.java
+++ b/src/org/xwt/Main.java
@@ -94,6 +94,8 @@ public class Main extends Applet {
                     if (Log.on) Log.log(Main.class, "downloading xwar");
                     origin = args[startargs];
                     URL u = new URL(args[startargs]);
+                    if (!u.getFile().endsWith(".xwar"))
+                        Platform.criticalAbort("archive filenames must end with \".xwar\"");
                     try {
                         originAddr = InetAddress.getByName(u.getHost());
                         // FIXME: use XMLRPC resolver?
@@ -111,7 +113,11 @@ public class Main extends Applet {
                     File f = new File(args[startargs]);
                     origin = "file://" + f.getAbsolutePath();
                     if (f.isDirectory()) Resources.loadDirectory(f);
-                    else Resources.loadArchive(new FileInputStream(f));
+                    else {
+                        if (!args[startargs].endsWith(".xwar"))
+                            Platform.criticalAbort("archive filenames must end with \".xwar\"");
+                        Resources.loadArchive(new FileInputStream(f));
+                    }
                 }
             }