Changeset 16839 for gli/trunk/src/org/greenstone/gatherer/file/FileNode.java

Timestamp:

2008-08-15T18:58:19+12:00 (16 years ago)

Author:

ak19

Message:

1. Fix of bug introduced in changes made in previous commit; 2. Constructor does not check for isFile but isDir instead. The meaning is subtly different, see Java API docs

File:

• gli/trunk/src/org/greenstone/gatherer/file/FileNode.java (modified) (2 diffs)

gli/trunk/src/org/greenstone/gatherer/file/FileNode.java

@@ -29 +29 @@
 
     // Files cannot have children
-    if (file != null && file.isFile()) {
+    if (file != null && !file.isDirectory()) { //file.isFile()) {
         // Cache this result to prevent unceasing missing disk messages being thrown if the
         // removable media was, um, removed after directory mapped
         this.allows_children = false;
-    }
-    displayFileName = calcDisplayString();
+        displayFileName = calcDisplayString();
+    }   
     }
 
@@ -45 +45 @@
      * characters. Therefore, when converting to utf8, if the converted filename 
      * contains the special character '\ufffd', then we know the conversion did not work
-     * and we return the original string which may or may not be properly presented by
+     * and we return the original string which may or may not be properly presented byBibliothèques face aux pressions2.html
      * default.
      * See http://java.sun.com/j2se/1.4.2/docs/api/java/nio/charset/CharsetDecoder.html