2002/05/28 17:50:57

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

diff --git a/src/org/xwt/Main.java b/src/org/xwt/Main.java
index 0bcf0f4..2ac6754 100644 (file)
--- a/src/org/xwt/Main.java
+++ b/src/org/xwt/Main.java
@@ -90,8 +90,13 @@ public class Main extends Applet {
                 if (args[startargs].startsWith("http://")) {
                     if (Log.on) Log.log(Main.class, "downloading xwar");
                     URL u = new URL(args[startargs]);
-                    originAddr = InetAddress.getByName(u.getHost());
-                    Resources.loadArchive(Platform.urlToInputStream(u));
+                    try {
+                        originAddr = InetAddress.getByName(u.getHost());
+                        // FIXME: use XMLRPC resolver?
+                    } catch (UnknownHostException e) {
+                        if (Log.on) Log.log(Main.class, "couldn't resolve " + u.getHost() + " -- hopefully there is a proxy that can");
+                    }
+                    Resources.loadArchive(new HTTP(args[startargs]).getInputStream());
                     
                 } else {
 
@@ -194,7 +199,7 @@ public class Main extends Applet {
                 String bytes = Resources.bytesDownloaded < 1024 ?
                     (Resources.bytesDownloaded + " bytes ") :
                     (Resources.bytesDownloaded / 1024) + "kb ";
-                surf.backbuffer.drawString(Platform.getDefaultFont(), "downloading user interface: " + bytes + "recieved",
+                surf.backbuffer.drawString(Platform.getDefaultFont(), "downloading user interface: " + bytes + "received",
                                            barX, barY - 5, 0xffffffff);
             } else {
                 barPos = barW / 2 + (instantiatedUnits * barW) / (initialTemplate.numUnits() * 2);