2003/10/16 09:08:27

darcs-hash:20040130073925-2ba56-8322f9cdd861f57a3aa9f29b318ccb483e3efd9a.gz

diff --git a/src/org/xwt/Template.java b/src/org/xwt/Template.java
index 207f859..a180bf9 100644 (file)
--- a/src/org/xwt/Template.java
+++ b/src/org/xwt/Template.java
@@ -355,8 +355,6 @@ public class Template {
             if (key.equals("static")) return myStatic;
             if (Box.SpecialBoxProperty.specialBoxProperties.get(key.toString()) != null) return getParentScope().get(key);
             if (super.has(key)) return super.get(key);
-            Object ret = xwt.rr.get(key);
-            if (ret != null) return ret;
             throw new JS.Exn("must declare " + key + " before using it!");
         }
         public void put(Object key, Object val) {

diff --git a/src/org/xwt/XWT.java b/src/org/xwt/XWT.java
index 9fa97b8..278532a 100644 (file)
--- a/src/org/xwt/XWT.java
+++ b/src/org/xwt/XWT.java
@@ -47,7 +47,7 @@ public final class XWT extends JS.Obj {
             else if (!Surface.button1 && !Surface.button2 && Surface.button3) return new Integer(1);
             else return new Integer(0);
         }
-        else return super.get(name);
+        else return rr.get(name);
     }
 
     public void put(Object name, Object value) {