2002/06/17 06:45:32

darcs-hash:20040130064812-2ba56-c33c711b0feffdef30f0286ee33bc5a6ee019d6c.gz

diff --git a/CHANGES b/CHANGES
index bcee019..c4100c4 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -193,3 +193,5 @@
 
 14-Jun megacz HTML.java, XWT.java: introduced xwt.parseHTML()
 
+16-Jun megacz Resources.java: eliminated some annoying warning messages
+

diff --git a/src/org/xwt/Resources.java b/src/org/xwt/Resources.java
index ae2a1f4..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);