[Minor] Code cleanup in FileHelper.deleteFiles()
This commit is contained in:
parent
db8e552ebe
commit
320fc01624
|
@ -190,25 +190,27 @@ public class FileHelper {
|
||||||
*
|
*
|
||||||
* @return true if all went well, and false if it did not work. The log will contain the problems encountered
|
* @return true if all went well, and false if it did not work. The log will contain the problems encountered
|
||||||
*/
|
*/
|
||||||
public final static boolean deleteFiles(File[] files, boolean log) {
|
public static boolean deleteFiles(File[] files, boolean log) {
|
||||||
|
|
||||||
boolean worked = true;
|
boolean worked = true;
|
||||||
for (int i = 0; i < files.length; i++) {
|
for (File file : files) {
|
||||||
File file = files[i];
|
|
||||||
if (file.isDirectory()) {
|
if (file.isDirectory()) {
|
||||||
boolean done = FileHelper.deleteFiles(file.listFiles(), log);
|
File[] children = file.listFiles();
|
||||||
|
if (children == null)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
boolean done = FileHelper.deleteFiles(children, log);
|
||||||
if (!done) {
|
if (!done) {
|
||||||
worked = false;
|
worked = false;
|
||||||
FileHelper.logger.warn("Could not empty the directory: " + file.getAbsolutePath()); //$NON-NLS-1$
|
logger.warn("Could not empty the directory: " + file.getAbsolutePath()); //$NON-NLS-1$
|
||||||
} else {
|
} else {
|
||||||
done = file.delete();
|
done = file.delete();
|
||||||
if (done) {
|
if (done) {
|
||||||
if (log)
|
if (log)
|
||||||
FileHelper.logger.info("Deleted DIR " + file.getAbsolutePath()); //$NON-NLS-1$
|
logger.info("Deleted DIR " + file.getAbsolutePath()); //$NON-NLS-1$
|
||||||
} else {
|
} else {
|
||||||
worked = false;
|
worked = false;
|
||||||
FileHelper.logger
|
logger.warn("Could not delete the directory: " + file.getAbsolutePath()); //$NON-NLS-1$
|
||||||
.warn("Could not delete the directory: " + file.getAbsolutePath()); //$NON-NLS-1$
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
|
Loading…
Reference in New Issue