Changeset 16834 for gli/trunk

Timestamp:

2008-08-15T16:07:28+12:00 (16 years ago)

Author:

ak19

Message:

Removed the longer calcDisplayString() and now the call to this methodname only refers to the shorter version, since the longer version which would try to convert the filename into several encodings produced strange results on Linux

File:

• gli/trunk/src/org/greenstone/gatherer/collection/CollectionTreeNode.java (modified) (2 diffs)

gli/trunk/src/org/greenstone/gatherer/collection/CollectionTreeNode.java

@@ -64 +64 @@
     }
 
-    /** Similar to calcDisplayString, but this version only checks whether the filename
-     * String is UTF8. If so, it converts it into UTF8 and returns it. If the filename
-     * is not UTF8, it is returned unchanged.
-     */ 
-    protected String quickCalcDisplayString() {
-    String filename = super.toString();
-    try{
-        String utf8filename = new String(filename.getBytes(), "UTF8");
-        if(utf8filename.indexOf('\ufffd') == -1) {
-        return utf8filename;
-        } else { // contains the character indicating that it's invalid utf8
-        // return the original string
-        return filename;
-        }
-    } catch(java.io.UnsupportedEncodingException e) {
-        return filename;
-    }
-    }
 
     /** This method returns a string representation of the filenodes in the Collection
@@ -107 +89 @@
     protected String calcDisplayString() {
     String filename = super.toString();
-
     try{
-        String[] charsets = {"UTF-8", "ISO-8859-1", "US-ASCII", "UTF-16BE", "UTF-16LE", "UTF-16"};
-        for(int i = 0; i < charsets.length; i++) {
-        String charset = charsets[i];
-        String convertedfilename = new String(filename.getBytes(), charset);
-        if(convertedfilename.indexOf('\ufffd') != -1) {
-            // encountered the character that indicates when the conversion is invalid
-            convertedfilename = null;
-            continue; // try to use the next charset to encode the filename as
-        } 
-        else { // valid conversion
-            return convertedfilename;
-        }
+        String utf8filename = new String(filename.getBytes(), "UTF8");
+        if(utf8filename.indexOf('\ufffd') == -1) {
+        return utf8filename;
+        } else { // contains the character indicating that it's invalid utf8
+        // return the original string
+        return filename;
         }
     } catch(java.io.UnsupportedEncodingException e) {
         return filename;
     }
-
-    return filename; // attempted conversions all failed
     }