X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FStatic.java;h=cb7a51055a418aec231318e9b94ecc706f50d6c9;hb=9a33358173f08013fdacd02c11f3823352bdae23;hp=4117892fdb2837edef594e31bc164c1099088299;hpb=fea7f27cc252c8feaafb8a5c0d4b9f391f03975d;p=org.ibex.core.git diff --git a/src/org/xwt/Static.java b/src/org/xwt/Static.java index 4117892..cb7a510 100644 --- a/src/org/xwt/Static.java +++ b/src/org/xwt/Static.java @@ -8,13 +8,14 @@ import org.mozilla.javascript.*; public class Static extends JSObject { public static Static getStatic(String resourcename) { + return (Static)cache.get(resourcename); + } + + public static Static createStatic(String resourcename) { Static ret = (Static)cache.get(resourcename); if (ret == null) { Template t = Template.getTemplate(resourcename, null); - - // FIXME: ugly if (t == null) return new Static(resourcename, true); - ret = new Static(resourcename, false); t.link(); return ret; @@ -54,10 +55,10 @@ public class Static extends JSObject { for(Scriptable cur = Context.enter().currentFunction; cur != null; cur = cur.getParentScope()) if (cur == this) return XWT.singleton; - System.out.println("casc up " + (resourcename + (resourcename.length() == 0 ? "" : ".") + name)); - if (!ispackage) return super.get(name, start); return getStatic(resourcename + (resourcename.length() == 0 ? "" : ".") + name); } + static { createStatic(""); } + }