From ad7d057ea80d61610f4b8729919384a979f389a2 Mon Sep 17 00:00:00 2001 From: megacz Date: Fri, 30 Jan 2004 06:50:06 +0000 Subject: [PATCH] 2002/08/16 23:37:51 darcs-hash:20040130065006-2ba56-ae74a3d33c882f75a4b6403863b1bbfb3f048a69.gz --- src/org/xwt/Resources.java | 5 +++-- src/org/xwt/Static.java | 3 +-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/org/xwt/Resources.java b/src/org/xwt/Resources.java index f193477..d525ad0 100644 --- a/src/org/xwt/Resources.java +++ b/src/org/xwt/Resources.java @@ -59,8 +59,9 @@ public class Resources { loadDirectory(file, name + File.separatorChar); } else { if (name.endsWith(".xwt")) { - Static.createStatic(name.replace(File.separatorChar, '.'), false); - usedPackages.put(JSObject.nodeNameToPackageName(name.replace('/', '.')), new Object()); + String name2 = name.substring(0, name.length() - 4); + Static.createStatic(name2.replace(File.separatorChar, '.'), false); + usedPackages.put(JSObject.nodeNameToPackageName(name2.replace('/', '.')), new Object()); } bytes.put(name.replace(File.separatorChar, '.'), file); } diff --git a/src/org/xwt/Static.java b/src/org/xwt/Static.java index da2f6a6..3376d02 100644 --- a/src/org/xwt/Static.java +++ b/src/org/xwt/Static.java @@ -18,8 +18,7 @@ public class Static extends JSObject { if (ret != null) return ret; if (resourcename.indexOf('.') != -1) createStatic(resourcename.substring(0, resourcename.lastIndexOf('.')), true); - ret = new Static(resourcename, false); - cache.put(resourcename, ret); + ret = new Static(resourcename, isPackage); return ret; } -- 1.7.10.4