Repository: commons-io Updated Branches: refs/heads/master e4e03ef4c -> d24dd1a3a
Fix param names '*Filename*' -> '*FileName*' in code and Javadocs. Project: http://git-wip-us.apache.org/repos/asf/commons-io/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-io/commit/d24dd1a3 Tree: http://git-wip-us.apache.org/repos/asf/commons-io/tree/d24dd1a3 Diff: http://git-wip-us.apache.org/repos/asf/commons-io/diff/d24dd1a3 Branch: refs/heads/master Commit: d24dd1a3abc4624be55c0772ae4432686ee18792 Parents: e4e03ef Author: Gary Gregory <[email protected]> Authored: Thu Mar 8 08:51:35 2018 -0700 Committer: Gary Gregory <[email protected]> Committed: Thu Mar 8 08:51:35 2018 -0700 ---------------------------------------------------------------------- .../java/org/apache/commons/io/FilenameUtils.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-io/blob/d24dd1a3/src/main/java/org/apache/commons/io/FilenameUtils.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/io/FilenameUtils.java b/src/main/java/org/apache/commons/io/FilenameUtils.java index 16e5b86..51a128b 100644 --- a/src/main/java/org/apache/commons/io/FilenameUtils.java +++ b/src/main/java/org/apache/commons/io/FilenameUtils.java @@ -481,29 +481,29 @@ public class FilenameUtils { * use {@link #getFullPath(String)} on the base path argument. * * @param basePath the base path to attach to, always treated as a path - * @param fullFilenameToAdd the fileName (or path) to attach to the base + * @param fullFileNameToAdd the fileName (or path) to attach to the base * @return the concatenated path, or null if invalid. Null bytes inside string will be removed */ - public static String concat(final String basePath, final String fullFilenameToAdd) { - final int prefix = getPrefixLength(fullFilenameToAdd); + public static String concat(final String basePath, final String fullFileNameToAdd) { + final int prefix = getPrefixLength(fullFileNameToAdd); if (prefix < 0) { return null; } if (prefix > 0) { - return normalize(fullFilenameToAdd); + return normalize(fullFileNameToAdd); } if (basePath == null) { return null; } final int len = basePath.length(); if (len == 0) { - return normalize(fullFilenameToAdd); + return normalize(fullFileNameToAdd); } final char ch = basePath.charAt(len - 1); if (isSeparator(ch)) { - return normalize(basePath + fullFilenameToAdd); + return normalize(basePath + fullFileNameToAdd); } - return normalize(basePath + '/' + fullFilenameToAdd); + return normalize(basePath + '/' + fullFileNameToAdd); } /**
