From 74955a37f7709770c2b3b3a05f0fc1dc051864f7 Mon Sep 17 00:00:00 2001 From: tupshin Date: Tue, 3 Feb 2004 11:22:08 +0000 Subject: [PATCH] UNDO: converted engine to use .ibex instead of .xwar darcs-hash:20040203112208-a9258-7c876dc20d87b55ac76c2b143627b9b73d573e44.gz --- src/org/ibex/Ibex.java | 2 +- src/org/ibex/Main.java | 10 +++++----- src/org/ibex/Platform.java | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/org/ibex/Ibex.java b/src/org/ibex/Ibex.java index 5110127..9431f1f 100644 --- a/src/org/ibex/Ibex.java +++ b/src/org/ibex/Ibex.java @@ -301,7 +301,7 @@ public final class Ibex extends JS.Cloneable { } } - // FEATURE: move this into builtin.ibex + // FEATURE: move this into builtin.xwar public Blessing bless(JS b) { return new Ibex.Blessing((JS.Cloneable)b, this, null, null); } public static class Blessing extends JS.Clone { private Ibex ibex; diff --git a/src/org/ibex/Main.java b/src/org/ibex/Main.java index ed700da..2c6a7d3 100644 --- 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,9 +34,9 @@ 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); @@ -72,7 +72,7 @@ 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(""); diff --git a/src/org/ibex/Platform.java b/src/org/ibex/Platform.java index 70d368b..15f87a6 100644 --- a/src/org/ibex/Platform.java +++ b/src/org/ibex/Platform.java @@ -166,7 +166,7 @@ public abstract class Platform { public static boolean isCaseSensitive() { return platform._isCaseSensitive(); } protected boolean _isCaseSensitive() { return true; } - /** returns an InputStream to the builtin ibex archive */ + /** returns an InputStream to the builtin xwar */ public static InputStream getBuiltinInputStream() { return platform._getBuiltinInputStream(); } protected InputStream _getBuiltinInputStream() {return getClass().getClassLoader().getResourceAsStream("org/ibex/builtin.jar");} -- 1.7.10.4