From 793a015abbdf77e20052362db626d9aea855c16b Mon Sep 17 00:00:00 2001 From: Andrey Turbanov Date: Sat, 20 Nov 2021 16:53:30 +0300 Subject: According to javadoc File.isDirectory 'true' if and only if the file denoted by this abstract pathname exists and is a directory. It means that separate File.exists() check before File.isDirectory() check is redundant. --- testing/src/test/java/org/aspectj/testing/util/FileUtil.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'testing/src') diff --git a/testing/src/test/java/org/aspectj/testing/util/FileUtil.java b/testing/src/test/java/org/aspectj/testing/util/FileUtil.java index 6aea81dfa..03b29a85a 100644 --- a/testing/src/test/java/org/aspectj/testing/util/FileUtil.java +++ b/testing/src/test/java/org/aspectj/testing/util/FileUtil.java @@ -267,7 +267,7 @@ public class FileUtil { * return true; * }}, true); * @param file root/starting point. If a file, the only one visited. - * @param filter supplies boolean accept(File) method + * @param fileFilter supplies boolean accept(File) method * @param userRecursion - if true, do accept() on dirs; else, recurse * @return false if any fileFilter.accept(File) did. * @throws IllegalArgumentException if file or fileFilter is null @@ -655,7 +655,6 @@ public class FileUtil { */ protected static boolean deleteDirectory(File dir) { return ((null != dir) - && dir.exists() && dir.isDirectory() && FileUtil.descendFileTree(dir, DELETE_FILES, false) && FileUtil.descendFileTree(dir, DELETE_DIRS, true) @@ -675,7 +674,7 @@ public class FileUtil { protected static final FileFilter DELETE_DIRS = new FileFilter() { public boolean accept(File file) { return ((null != file) && file.isDirectory() - && file.exists() && file.delete()); + && file.delete()); } }; protected static final FileFilter DELETE_FILES = new FileFilter() { -- cgit v1.2.3