Updated Branches: refs/heads/master 535b2eec8 -> bfae6c64d
move constant to top of file + comment Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/bfae6c64 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/bfae6c64 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/bfae6c64 Branch: refs/heads/master Commit: bfae6c64d6141a2ee602b0885c3a1be7b3116320 Parents: 45f676a Author: Peter Ertl <p...@apache.org> Authored: Tue May 8 00:56:48 2012 +0200 Committer: Peter Ertl <p...@apache.org> Committed: Tue May 8 00:56:48 2012 +0200 ---------------------------------------------------------------------- .../java/org/apache/wicket/util/file/Files.java | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/bfae6c64/wicket-util/src/main/java/org/apache/wicket/util/file/Files.java ---------------------------------------------------------------------- diff --git a/wicket-util/src/main/java/org/apache/wicket/util/file/Files.java b/wicket-util/src/main/java/org/apache/wicket/util/file/Files.java index 8abfa76..dc4647f 100644 --- a/wicket-util/src/main/java/org/apache/wicket/util/file/Files.java +++ b/wicket-util/src/main/java/org/apache/wicket/util/file/Files.java @@ -23,7 +23,6 @@ import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; -import java.io.UnsupportedEncodingException; import java.net.URL; import org.apache.wicket.util.encoding.UrlDecoder; @@ -47,7 +46,9 @@ public class Files // protocols for urls private static final String URL_FILE_PREFIX = "file:"; private static final String URL_LOCAL_JAR_FILE_PREFIX = "jar:file:"; - + + // characters not allowed in filenames + private static final String FILENAME_FORBIDDEN_CHARACTERS = "\"*/:<>?\\|,"; /** * Private constructor to prevent instantiation. @@ -295,8 +296,6 @@ public class Files } } - private static final String FORBIDDEN_IN_NAME = "\"*/:<>?\\|,"; - /** * <p> * Replaces commonly unsupported characters with '_' @@ -309,9 +308,9 @@ public class Files public static final String cleanupFilename(final String filename) { String name = filename; - for (int i = 0; i < FORBIDDEN_IN_NAME.length(); i++) + for (int i = 0; i < FILENAME_FORBIDDEN_CHARACTERS.length(); i++) { - name = name.replace(FORBIDDEN_IN_NAME.charAt(i), '_'); + name = name.replace(FILENAME_FORBIDDEN_CHARACTERS.charAt(i), '_'); } return name; }
