Changeset 16839

Show
Ignore:
Timestamp:
15.08.2008 18:58:19 (11 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

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • gli/trunk/src/org/greenstone/gatherer/file/FileNode.java

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