You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2012/02/14 17:23:53 UTC
svn commit: r1244110 -
/commons/proper/io/trunk/src/main/java/org/apache/commons/io/FilenameUtils.java
Author: ggregory
Date: Tue Feb 14 16:23:52 2012
New Revision: 1244110
URL: http://svn.apache.org/viewvc?rev=1244110&view=rev
Log:
Checkstyle: Line length <= 120.
Modified:
commons/proper/io/trunk/src/main/java/org/apache/commons/io/FilenameUtils.java
Modified: commons/proper/io/trunk/src/main/java/org/apache/commons/io/FilenameUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/main/java/org/apache/commons/io/FilenameUtils.java?rev=1244110&r1=1244109&r2=1244110&view=diff
==============================================================================
--- commons/proper/io/trunk/src/main/java/org/apache/commons/io/FilenameUtils.java (original)
+++ commons/proper/io/trunk/src/main/java/org/apache/commons/io/FilenameUtils.java Tue Feb 14 16:23:52 2012
@@ -534,21 +534,22 @@ public class FilenameUtils {
* @since 2.2
* @see FileUtils#directoryContains(File, File)
*/
- public static boolean directoryContains(final String canonicalParent, final String canonicalChild) throws IOException {
-
+ public static boolean directoryContains(final String canonicalParent, final String canonicalChild)
+ throws IOException {
+
// Fail fast against NullPointerException
if (canonicalParent == null) {
throw new IllegalArgumentException("Directory must not be null");
}
-
+
if (canonicalChild == null) {
return false;
}
-
+
if (IOCase.SYSTEM.checkEquals(canonicalParent, canonicalChild)) {
return false;
}
-
+
return IOCase.SYSTEM.checkStartsWith(canonicalChild, canonicalParent);
}