X-Git-Url: http://git.megacz.com/?p=org.ibex.core.git;a=blobdiff_plain;f=src%2Forg%2Fibex%2FMain.java;fp=src%2Forg%2Fxwt%2FMain.java;h=2c6a7d30644f9ac38adda4386a4b7e751ff79980;hp=49eb2b2aef89468cd2156f5b0cf074a673869729;hb=3591b88b94a6bb378af3d4abe6eb5233ce583104;hpb=de378041d5ca2aca1a2b5a31ef15ae90a86c977f

diff --git a/src/org/xwt/Main.java b/src/org/ibex/Main.java
similarity index 80%
rename from src/org/xwt/Main.java
rename to src/org/ibex/Main.java
index 49eb2b2..2c6a7d3 100644
--- a/src/org/xwt/Main.java
+++ b/src/org/ibex/Main.java
@@ -1,17 +1,12 @@
 // Copyright 2004 Adam Megacz, see the COPYING file for licensing [GPL]
-package org.xwt;
+package org.ibex;
 
 import java.net.*;
-import java.util.*;
 import java.io.*;
-import java.awt.*;
-import org.xwt.js.*;
-import org.xwt.util.*;
-import org.xwt.translators.*;
-import org.xwt.plat.*;
-import org.bouncycastle.util.encoders.Base64;
+import org.ibex.js.*;
+import org.ibex.util.*;
 
-/** Entry point for the XWT Engine; handles splash screen, initial xwar loading, and argument processing */
+/** Entry point for the Ibex Engine; handles splash screen, initial xwar loading, and argument processing */
 public class Main {
 
     /**
@@ -31,7 +26,7 @@ public class Main {
     public static Picture scarImage = null;
 
     public static void printUsage() {
-        System.err.println("Usage: xwt [-s] [-v] [-l <port>/<url>] source-location [initial-template]");
+        System.err.println("Usage: ibex [-s] [-v] [-l <port>/<url>] source-location [initial-template]");
         System.err.println("");
         System.err.println("Options:");
         System.err.println("    -v verbose logging (required for logging on Win32)");
@@ -70,7 +65,7 @@ public class Main {
             if (originHost.indexOf('@') != -1) originHost = originHost.substring(originHost.indexOf('@') + 1);
             originAddr = InetAddress.getByName(originHost);
             rr = builtin;
-            startupTemplate = "org.xwt.builtin.splash";
+            startupTemplate = "org.ibex.builtin.splash";
         } else {
             rr = new Stream.File(origin);
             if (!new File(origin).isDirectory()) rr = new Stream.Zip(rr);
@@ -78,13 +73,13 @@ public class Main {
         }
 
         if (Log.on) Log.info(Main.class, "loading xwar");
-        final XWT xwt = new XWT(rr);
-        final JS final_rr = (JS)xwt.get("");
+        final Ibex ibex = new Ibex(rr);
+        final JS final_rr = (JS)ibex.get("");
 
         scarImage =
-            Picture.load((Stream)Main.builtin.get("org/xwt/builtin/scar.png"),
+            Picture.load((Stream)Main.builtin.get("org/ibex/builtin/scar.png"),
                          new Scheduler.Task() { public void perform() throws Exception {
-                             xwt.resolveString(startupTemplate, false).call(new Box(), null, null, null, 1);
+                             ibex.resolveString(startupTemplate, false).call(new Box(), null, null, null, 1);
                          } });
 
         Scheduler.init();