2004/01/13 10:27:46

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

diff --git a/src/org/xwt/Main.java b/src/org/xwt/Main.java
index b9967e8..6bae13c 100644 (file)
--- a/src/org/xwt/Main.java
+++ b/src/org/xwt/Main.java
@@ -57,6 +57,7 @@ public class Main {
 
         String initialTemplateName = args.length > startargs + 1 ? args[startargs + 1] : "main";
         initialTemplateName = initialTemplateName.replace('.', '/');
+        initialTemplateName += ".xwt";
         origin = args[startargs];
 
         Stream rr;
@@ -77,12 +78,12 @@ public class Main {
 
         if (Log.on) Log.info(Main.class, "loading xwar");
         final XWT xwt = new XWT(rr);
-        final Stream final_rr = rr;
+        final JS final_rr = (JS)xwt.get("");
 
         scarImage =
             Picture.load((Stream)Main.builtin.get("org/xwt/builtin/scar.png"),
-                         new Scheduler.Task() { public void perform() throws JSExn {
-                             Template.getTemplate(((Stream)final_rr.get(initialTemplate))).apply(new Box(), xwt);
+                         new Scheduler.Task() { public void perform() throws Exception {
+                             new Template(Stream.getInputStream(final_rr.get(initialTemplate)), xwt).apply(new Box());
                          } });
 
         Scheduler.init();