2002/07/02 00:18:00

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

diff --git a/src/org/xwt/Resources.java b/src/org/xwt/Resources.java
index f2a1cdc..eebef05 100644 (file)
--- a/src/org/xwt/Resources.java
+++ b/src/org/xwt/Resources.java
@@ -52,17 +52,7 @@ public class Resources {
         new Static(prefix.replace(File.separatorChar, '.'));
         String[] subfiles = dir.list();
         for(int i=0; i<subfiles.length; i++) {
-
-            if (subfiles[i].equals("CVS")) {
-                if (Log.on) Log.log(Resources.class, "ignoring CVS/ directory");
-                continue;
-            }
-            if (!validResourceName(subfiles[i])) {
-                if (subfiles[i].charAt(subfiles[i].length() - 1) != '~')
-                    if (Log.on) Log.log(Resources.class, "WARNING: ignoring file entry with invalid name: " + subfiles[i]);
-                continue;
-            }
-
+            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);
@@ -99,9 +89,7 @@ public class Resources {
                 continue;
             }
             if (name.endsWith(".xwt")) {
-                if (Log.verbose) Log.log(Resources.class, "building template " + name);
                 Template.buildTemplate(zis, name.substring(0, name.length() - 4).replace('/', '.'));
-                if (Log.verbose) Log.log(Resources.class, "   done building template " + name);
                 bytes.put(name.replace('/', '.'), new byte[] { });                          // placeholder so resolveResource() works properly
             } else {
                 bytes.put(name.replace('/', '.'), isToByteArray(zis));