2002/08/07 04:29:28

[org.ibex.core.git] / src / org / xwt / Resources.java

diff --git a/src/org/xwt/Resources.java b/src/org/xwt/Resources.java
index c11562c..f193477 100644 (file)
--- a/src/org/xwt/Resources.java
+++ b/src/org/xwt/Resources.java
@@ -55,8 +55,15 @@ public class Resources {
             if (subfiles[i].equals("CVS") || !validResourceName(subfiles[i])) continue;
             String name = prefix + subfiles[i];
             File file = new File(dir.getPath() + File.separatorChar + subfiles[i]);
-            if (file.isDirectory()) loadDirectory(file, name + File.separatorChar);
-            else bytes.put(name.replace(File.separatorChar, '.'), file);
+            if (file.isDirectory()) {
+                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());
+                }
+                bytes.put(name.replace(File.separatorChar, '.'), file);
+            }
         }
     }
 
@@ -112,8 +119,7 @@ public class Resources {
                     if (Log.on) Log.log(Resources.class, "templates have already been loaded into " + packageName + "; refusing to load " + name);
                 } else {
                     usedPackages.put(packageName, thisArchive);
-                    for(int i=0; i<name.length() && i != -1; i = name.indexOf('/', i + 1))
-                        Static.createStatic(name.substring(0, i).replace('/', '.'));
+                    Static.createStatic(name.replace('/', '.'), false);
                     Template.buildTemplate(zis, name.replace('/', '.'));
                 }