fixed bug 372

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

diff --git a/src/org/ibex/Main.java b/src/org/ibex/Main.java
index ed700da..4a53a44 100644 (file)
--- a/src/org/ibex/Main.java
+++ b/src/org/ibex/Main.java
@@ -6,7 +6,7 @@ import java.io.*;
 import org.ibex.js.*;
 import org.ibex.util.*;
 
-/** Entry point for the Ibex Engine; handles splash screen, initial ibex archive loading, and argument processing */
+/** Entry point for the Ibex Engine; handles splash screen, initial xwar loading, and argument processing */
 public class Main {
 
     /**
@@ -34,15 +34,15 @@ public class Main {
         System.err.println("    -l [not yet supported]");
         System.err.println("");
         System.err.println("Source-location is one of the following:");
-        System.err.println("    - the path to an ibex file");
-        System.err.println("    - the path to a directory to be used as an ibex archive");
-        System.err.println("    - the http url of an ibext archive");
+        System.err.println("    - the path to an xwar file");
+        System.err.println("    - the path to a directory to be used as an xwar");
+        System.err.println("    - the http url of an xwar");
         System.err.println("");
         System.err.println("Initial-template is the path of the template to load; defaults to 'main'");
         Runtime.getRuntime().exit(-1);
     }
 
-    public static void main(String[] args) throws Exception {
+    public static void main(String[] args) throws UnknownHostException, JSExn {
         int startargs = 0;
         while (true) {
             if (startargs > args.length - 1) printUsage();
@@ -72,13 +72,12 @@ public class Main {
             startupTemplate = initialTemplate;
         }
 
-        if (Log.on) Log.info(Main.class, "loading ibex file");
+        if (Log.on) Log.info(Main.class, "loading xwar");
         final Ibex ibex = new Ibex(rr);
-        final JS final_rr = (JS)ibex.get("");
 
         scarImage =
             Picture.load((Stream)Main.builtin.get("org/ibex/builtin/scar.png"),
-                         new Scheduler.Task() { public void perform() throws Exception {
+                         new Scheduler.Task() { public void perform() throws JSExn, UnknownHostException {
                              ibex.resolveString(startupTemplate, false).call(new Box(), null, null, null, 1);
                          } });