X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FMain.java;fp=src%2Forg%2Fxwt%2FMain.java;h=6bae13c133fa875b5be84eca2d445b26b8c0e4dd;hb=75b9e1e72f6067e59a1e5312c91d20d05ec8a927;hp=b9967e852339f83ca97bd82f82d880b7dad36660;hpb=02e33b14dc483c8890fa1a6084c684473d94644b;p=org.ibex.core.git

diff --git a/src/org/xwt/Main.java b/src/org/xwt/Main.java
index b9967e8..6bae13c 100644
--- 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();