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 2024/01/30 15:20:46 UTC
(commons-io) 01/03: Internal renaming
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-io.git
commit 57ab49f51f16dadf6ad246dbbcaad18fa3dd7a0e
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Tue Jan 30 09:48:57 2024 -0500
Internal renaming
---
.../commons/io/monitor/FileAlterationObserver.java | 50 +++++++++++-----------
1 file changed, 25 insertions(+), 25 deletions(-)
diff --git a/src/main/java/org/apache/commons/io/monitor/FileAlterationObserver.java b/src/main/java/org/apache/commons/io/monitor/FileAlterationObserver.java
index fa1b267bc..611ddb4fd 100644
--- a/src/main/java/org/apache/commons/io/monitor/FileAlterationObserver.java
+++ b/src/main/java/org/apache/commons/io/monitor/FileAlterationObserver.java
@@ -254,32 +254,32 @@ public class FileAlterationObserver implements Serializable {
*
* @param parent The parent entry.
* @param previous The original list of files.
- * @param files The current list of files.
+ * @param current The current list of files.
*/
- private void checkAndFire(final FileEntry parent, final FileEntry[] previous, final File[] files) {
+ private void checkAndFire(final FileEntry parent, final FileEntry[] previous, final File[] current) {
int c = 0;
- final FileEntry[] current = files.length > 0 ? new FileEntry[files.length] : FileEntry.EMPTY_FILE_ENTRY_ARRAY;
+ final FileEntry[] actual = current.length > 0 ? new FileEntry[current.length] : FileEntry.EMPTY_FILE_ENTRY_ARRAY;
for (final FileEntry entry : previous) {
- while (c < files.length && comparator.compare(entry.getFile(), files[c]) > 0) {
- current[c] = createFileEntry(parent, files[c]);
- fireOnCreate(current[c]);
+ while (c < current.length && comparator.compare(entry.getFile(), current[c]) > 0) {
+ actual[c] = createFileEntry(parent, current[c]);
+ fireOnCreate(actual[c]);
c++;
}
- if (c < files.length && comparator.compare(entry.getFile(), files[c]) == 0) {
- fireOnChange(entry, files[c]);
- checkAndFire(entry, entry.getChildren(), listFiles(files[c]));
- current[c] = entry;
+ if (c < current.length && comparator.compare(entry.getFile(), current[c]) == 0) {
+ fireOnChange(entry, current[c]);
+ checkAndFire(entry, entry.getChildren(), listFiles(current[c]));
+ actual[c] = entry;
c++;
} else {
checkAndFire(entry, entry.getChildren(), FileUtils.EMPTY_FILE_ARRAY);
fireOnDelete(entry);
}
}
- for (; c < files.length; c++) {
- current[c] = createFileEntry(parent, files[c]);
- fireOnCreate(current[c]);
+ for (; c < current.length; c++) {
+ actual[c] = createFileEntry(parent, current[c]);
+ fireOnCreate(actual[c]);
}
- parent.setChildren(current);
+ parent.setChildren(actual);
}
/**
@@ -436,17 +436,7 @@ public class FileAlterationObserver implements Serializable {
* @return the directory contents or a zero length array if the empty or the file is not a directory
*/
private File[] listFiles(final File directory) {
- File[] children = null;
- if (directory.isDirectory()) {
- children = directory.listFiles(fileFilter);
- }
- if (children == null) {
- children = FileUtils.EMPTY_FILE_ARRAY;
- }
- if (children.length > 1) {
- Arrays.sort(children, comparator);
- }
- return children;
+ return directory.isDirectory() ? sort(directory.listFiles(fileFilter)) : FileUtils.EMPTY_FILE_ARRAY;
}
/**
@@ -460,6 +450,16 @@ public class FileAlterationObserver implements Serializable {
}
}
+ private File[] sort(final File[] files) {
+ if (files == null) {
+ return FileUtils.EMPTY_FILE_ARRAY;
+ }
+ if (files.length > 1) {
+ Arrays.sort(files, comparator);
+ }
+ return files;
+ }
+
/**
* Returns a String representation of this observer.
*