preliminary core conversion

[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 8003ada..7d1f62a 100644 (file)
--- a/src/org/ibex/core/Main.java
+++ b/src/org/ibex/core/Main.java
@@ -1,11 +1,13 @@
 // Copyright 2004 Adam Megacz, see the COPYING file for licensing [GPL]
-package org.ibex;
+package org.ibex.core;
 
 import java.net.*;
 import java.io.*;
 import java.util.*;
 import org.ibex.js.*;
 import org.ibex.util.*;
+import org.ibex.plat.*;
+import org.ibex.graphics.*;
 
 /** Entry point for the Ibex Engine; handles splash screen, initial xwar loading, and argument processing */
 public class Main {
@@ -24,7 +26,6 @@ public class Main {
     public static String initialTemplate = null;
     
     public static final Stream builtin = new Stream.Zip(new Stream.Builtin());
-    public static Picture scarImage = null;
 
     public static void printUsage() {
         System.err.println("Usage: ibex [-lawp] [ url | file | directory ]");
@@ -67,7 +68,7 @@ public class Main {
             startargs++;
         }
 
-        Platform.forceLoad();
+        org.ibex.plat.Platform.forceLoad();
         if (Log.on) for(int i=0; i<args.length; i++) Log.info(Main.class, "argument " + i + ": " + args[i]);
 
         initialTemplate = args.length > startargs + 1 ? args[startargs + 1] : "main";
@@ -91,9 +92,9 @@ public class Main {
         if (Log.on) Log.info(Main.class, "loading xwar");
         final Ibex ibex = new Ibex(rr);
 
-        scarImage =
-            Picture.load((Stream)Main.builtin.get("org/ibex/builtin/scar.png"),
-                         new Scheduler.Task() { public void perform() throws JSExn, UnknownHostException {
+        org.ibex.graphics.Surface.scarImage =
+            Picture.load((Stream)Main.builtin.get(JS.S("org/ibex/core/builtin/scar.png")),
+                         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);
                          } });