Stream->Fountain, move Scheduler to Platform, HashMap->Hash

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

diff --git a/src/org/ibex/core/Main.java b/src/org/ibex/core/Main.java
index d925bc0..a9c35df 100644 (file)
--- a/src/org/ibex/core/Main.java
+++ b/src/org/ibex/core/Main.java
@@ -29,7 +29,7 @@ public class Main {
     public static String origin = null;
     public static String initialTemplate = null;
     
-    public static final Stream builtin = new Stream.Zip(new Stream.Builtin());
+    public static final Fountain builtin = new Fountain.Zip(new Fountain.FromInputStream(Platform.getBuiltinInputStream()));
 
     public static void printUsage() {
         System.err.println("Usage: ibex [-lawp] [ url | file | directory ]");
@@ -79,7 +79,7 @@ public class Main {
         initialTemplate = args.length > startargs + 1 ? args[startargs + 1] : "main";
         origin = args[startargs];
 
-        Stream rr;
+        Fountain rr;
         final String startupTemplate;
         if (origin.startsWith("http://") || origin.startsWith("https://")) {
             originHost = origin.substring(origin.indexOf('/') + 2);
@@ -88,11 +88,11 @@ public class Main {
             originAddr = InetAddress.getByName(originHost);
             //rr = builtin;
             //startupTemplate = "org.ibex.builtin.splash";
-            rr = new Stream.HTTP(origin);
+            rr = new Fountain.HTTP(origin);
             startupTemplate = initialTemplate;
         } else {
-            rr = new Stream.File(origin);
-            if (!new File(origin).isDirectory()) rr = new Stream.Zip(rr);
+            rr = new Fountain.File(origin);
+            if (!new File(origin).isDirectory()) rr = new Fountain.Zip(rr);
             startupTemplate = initialTemplate;
         }
 
@@ -100,12 +100,18 @@ public class Main {
         final Ibex ibex = new Ibex(rr);
 
         org.ibex.graphics.Surface.scarImage =
-            Picture.load(new Stream.FromInputStream(Encode.JavaSourceCode.decode(Scar.data)),
-                         new Task() { public void perform() throws JSExn, UnknownHostException {
-                             if (Log.on) Log.info(Main.class, "invoking initial template");
-                             ibex.resolveString(startupTemplate, false).call(new Box(), null, null, null, 1);
+            Picture.load(new Fountain.FromInputStream(Encode.JavaSourceCode.decode(Scar.data)),
+                         new Callable() {
+                             private final JS[] callargs = new JS[1];
+                             public Object run(Object o) throws JSExn,UnknownHostException {
+                                 if (Log.on) Log.info(Main.class, "invoking initial template");
+                                 try {
+                                     callargs[0] = new Box(); 
+                                     ibex.resolveString(startupTemplate, false).call(null, callargs);
+                                 } finally { callargs[0] = null; }
+                                 return null;
                          } });
 
-        Scheduler.init();
+        Platform.Scheduler.init();
     }
 }