2004/01/19 05:24:56

darcs-hash:20040130080412-2ba56-a63c4b7612af21fa2a6a4c8dc67e66a14a85e3e8.gz

diff --git a/src/org/xwt/Main.java b/src/org/xwt/Main.java
index 5c25df5..2bfb7d8 100644 (file)
--- a/src/org/xwt/Main.java
+++ b/src/org/xwt/Main.java
@@ -83,7 +83,7 @@ public class Main {
         scarImage =
             Picture.load((Stream)Main.builtin.get("org/xwt/builtin/scar.png"),
                          new Scheduler.Task() { public void perform() throws Exception {
-                             new Template(Stream.getInputStream(xwt.resolveStringToResource(startupTemplate, false)), xwt).apply(new Box());
+                             xwt.resolveString(startupTemplate, false).call(new Box(), null, null, null, 1);
                          } });
 
         Scheduler.init();

diff --git a/src/org/xwt/Template.java b/src/org/xwt/Template.java
index 03dd337..40648f6 100644 (file)
--- a/src/org/xwt/Template.java
+++ b/src/org/xwt/Template.java
@@ -95,7 +95,7 @@ public class Template {
 
         // FIXME this dollar stuff is all wrong
         if (id != null) parentPis.putDollar(id, b);
-        if (tagname != null) xwt.resolveStringToResource(tagname, false).call(b, null, null, null, 1);
+        if (tagname != null) xwt.resolveString(tagname, false).call(b, null, null, null, 1);
 
         PerInstantiationScope pis = new PerInstantiationScope(b, xwt, parentPis, staticScope);
 
@@ -123,7 +123,7 @@ public class Template {
                         if (val == null) throw new JSExn("unknown box id '"+vals[i]+"' referenced in XML attribute");
                         break;
                     case '.':
-                        val = xwt.resolveStringToResource(((String)val).substring(1), false);
+                        val = xwt.resolveString(((String)val).substring(1), false);
                     // FIXME: url case
                     // FIXME: should we be resolving all of these in the XML-parsing code?
                 }

diff --git a/src/org/xwt/XWT.java b/src/org/xwt/XWT.java
index 1076de0..d792776 100644 (file)
--- a/src/org/xwt/XWT.java
+++ b/src/org/xwt/XWT.java
@@ -17,7 +17,7 @@ public final class XWT extends JS.Cloneable {
     private final JS rr;
     public XWT(Stream rr) { this.rr = bless(rr); }
 
-    public JS resolveStringToResource(String str, boolean permitAbsolute) throws JSExn {
+    public JS resolveString(String str, boolean permitAbsolute) throws JSExn {
         if (str.indexOf("://") != -1) {
             if (permitAbsolute) return (Stream)url2res(str);
             throw new JSExn("absolute URL " + str + " not permitted here");