|
18 | 18 |
|
19 | 19 | import java.io.File; |
20 | 20 | import java.io.FileFilter; |
21 | | -import java.io.IOException; |
22 | 21 | import java.io.Serializable; |
23 | 22 | import java.util.ArrayList; |
24 | 23 | import java.util.Arrays; |
|
30 | 29 |
|
31 | 30 | import org.apache.commons.io.FileUtils; |
32 | 31 | import org.apache.commons.io.IOCase; |
33 | | -import org.apache.commons.io.build.AbstractSupplier; |
34 | | -import org.apache.commons.io.comparator.DefaultFileComparator; |
35 | 32 | import org.apache.commons.io.comparator.NameFileComparator; |
36 | 33 | import org.apache.commons.io.filefilter.TrueFileFilter; |
37 | 34 |
|
@@ -317,7 +314,7 @@ private void checkAndNotify(final FileEntry parent, final FileEntry[] previous, |
317 | 314 | private FileEntry createFileEntry(final FileEntry parent, final File file) { |
318 | 315 | final FileEntry entry = parent.newChildInstance(file); |
319 | 316 | entry.refresh(file); |
320 | | - entry.setChildren(doListFiles(file, entry)); |
| 317 | + entry.setChildren(listFileEntries(file, entry)); |
321 | 318 | return entry; |
322 | 319 | } |
323 | 320 |
|
@@ -362,20 +359,6 @@ private void doDelete(final FileEntry entry) { |
362 | 359 | }); |
363 | 360 | } |
364 | 361 |
|
365 | | - /** |
366 | | - * Lists the files in {@code file}. |
367 | | - * |
368 | | - * @param file The file to list files for |
369 | | - * @param entry the parent entry |
370 | | - * @return The child files |
371 | | - */ |
372 | | - private FileEntry[] doListFiles(final File file, final FileEntry entry) { |
373 | | - final File[] files = listFiles(file); |
374 | | - final FileEntry[] children = files.length > 0 ? new FileEntry[files.length] : FileEntry.EMPTY_FILE_ENTRY_ARRAY; |
375 | | - Arrays.setAll(children, i -> createFileEntry(entry, files[i])); |
376 | | - return children; |
377 | | - } |
378 | | - |
379 | 362 | /** |
380 | 363 | * Fires directory/file change events to the registered listeners. |
381 | 364 | * |
@@ -430,7 +413,21 @@ public Iterable<FileAlterationListener> getListeners() { |
430 | 413 | @SuppressWarnings("unused") // Possibly thrown from subclasses. |
431 | 414 | public void initialize() throws Exception { |
432 | 415 | rootEntry.refresh(rootEntry.getFile()); |
433 | | - rootEntry.setChildren(doListFiles(rootEntry.getFile(), rootEntry)); |
| 416 | + rootEntry.setChildren(listFileEntries(rootEntry.getFile(), rootEntry)); |
| 417 | + } |
| 418 | + |
| 419 | + /** |
| 420 | + * Lists the file entries in {@code file}. |
| 421 | + * |
| 422 | + * @param file The file to list files for |
| 423 | + * @param entry the parent entry |
| 424 | + * @return The child files |
| 425 | + */ |
| 426 | + private FileEntry[] listFileEntries(final File file, final FileEntry entry) { |
| 427 | + final File[] files = listFiles(file); |
| 428 | + final FileEntry[] children = files.length > 0 ? new FileEntry[files.length] : FileEntry.EMPTY_FILE_ENTRY_ARRAY; |
| 429 | + Arrays.setAll(children, i -> createFileEntry(entry, files[i])); |
| 430 | + return children; |
434 | 431 | } |
435 | 432 |
|
436 | 433 | /** |
|
0 commit comments