Rename private methods

Author: garydgregory

src/main/java/org/apache/commons/io/monitor/FileAlterationObserver.java

@@ -249,60 +249,60 @@ public void addListener(final FileAlterationListener listener) {
         }
     }
 
-    /**
-     * Checks whether the file and its children have been created, modified or deleted.
-     */
-    public void checkAndNotify() {
-
-        // fire onStart()
-        listeners.forEach(listener -> listener.onStart(this));
-
-        // fire directory/file events
-        final File rootFile = rootEntry.getFile();
-        if (rootFile.exists()) {
-            checkAndNotify(rootEntry, rootEntry.getChildren(), listFiles(rootFile));
-        } else if (rootEntry.isExists()) {
-            checkAndNotify(rootEntry, rootEntry.getChildren(), FileUtils.EMPTY_FILE_ARRAY);
-        }
-        // Else: Didn't exist and still doesn't
-
-        // fire onStop()
-        listeners.forEach(listener -> listener.onStop(this));
-    }
-
     /**
      * Compares two file lists for files which have been created, modified or deleted.
      *
      * @param parent   The parent entry.
      * @param previous The original list of files.
      * @param files    The current list of files.
      */
-    private void checkAndNotify(final FileEntry parent, final FileEntry[] previous, final File[] files) {
+    private void checkAndFire(final FileEntry parent, final FileEntry[] previous, final File[] files) {
         int c = 0;
         final FileEntry[] current = files.length > 0 ? new FileEntry[files.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]);
-                doCreate(current[c]);
+                fireOnCreate(current[c]);
                 c++;
             }
             if (c < files.length && comparator.compare(entry.getFile(), files[c]) == 0) {
-                doMatch(entry, files[c]);
-                checkAndNotify(entry, entry.getChildren(), listFiles(files[c]));
+                fireOnChange(entry, files[c]);
+                checkAndFire(entry, entry.getChildren(), listFiles(files[c]));
                 current[c] = entry;
                 c++;
             } else {
-                checkAndNotify(entry, entry.getChildren(), FileUtils.EMPTY_FILE_ARRAY);
-                doDelete(entry);
+                checkAndFire(entry, entry.getChildren(), FileUtils.EMPTY_FILE_ARRAY);
+                fireOnDelete(entry);
             }
         }
         for (; c < files.length; c++) {
             current[c] = createFileEntry(parent, files[c]);
-            doCreate(current[c]);
+            fireOnCreate(current[c]);
         }
         parent.setChildren(current);
     }
 
+    /**
+     * Checks whether the file and its children have been created, modified or deleted.
+     */
+    public void checkAndNotify() {
+
+        // fire onStart()
+        listeners.forEach(listener -> listener.onStart(this));
+
+        // fire directory/file events
+        final File rootFile = rootEntry.getFile();
+        if (rootFile.exists()) {
+            checkAndFire(rootEntry, rootEntry.getChildren(), listFiles(rootFile));
+        } else if (rootEntry.isExists()) {
+            checkAndFire(rootEntry, rootEntry.getChildren(), FileUtils.EMPTY_FILE_ARRAY);
+        }
+        // Else: Didn't exist and still doesn't
+
+        // fire onStop()
+        listeners.forEach(listener -> listener.onStop(this));
+    }
+
     /**
      * Creates a new file entry for the specified file.
      *
@@ -327,28 +327,46 @@ public void destroy() throws Exception {
         // noop
     }
 
+    /**
+     * Fires directory/file change events to the registered listeners.
+     *
+     * @param entry The previous file system entry.
+     * @param file  The current file.
+     */
+    private void fireOnChange(final FileEntry entry, final File file) {
+        if (entry.refresh(file)) {
+            listeners.forEach(listener -> {
+                if (entry.isDirectory()) {
+                    listener.onDirectoryChange(file);
+                } else {
+                    listener.onFileChange(file);
+                }
+            });
+        }
+    }
+
     /**
      * Fires directory/file created events to the registered listeners.
      *
      * @param entry The file entry.
      */
-    private void doCreate(final FileEntry entry) {
+    private void fireOnCreate(final FileEntry entry) {
         listeners.forEach(listener -> {
             if (entry.isDirectory()) {
                 listener.onDirectoryCreate(entry.getFile());
             } else {
                 listener.onFileCreate(entry.getFile());
             }
         });
-        Stream.of(entry.getChildren()).forEach(this::doCreate);
+        Stream.of(entry.getChildren()).forEach(this::fireOnCreate);
     }
 
     /**
      * Fires directory/file delete events to the registered listeners.
      *
      * @param entry The file entry.
      */
-    private void doDelete(final FileEntry entry) {
+    private void fireOnDelete(final FileEntry entry) {
         listeners.forEach(listener -> {
             if (entry.isDirectory()) {
                 listener.onDirectoryDelete(entry.getFile());
@@ -358,24 +376,6 @@ private void doDelete(final FileEntry entry) {
         });
     }
 
-    /**
-     * Fires directory/file change events to the registered listeners.
-     *
-     * @param entry The previous file system entry.
-     * @param file  The current file.
-     */
-    private void doMatch(final FileEntry entry, final File file) {
-        if (entry.refresh(file)) {
-            listeners.forEach(listener -> {
-                if (entry.isDirectory()) {
-                    listener.onDirectoryChange(file);
-                } else {
-                    listener.onFileChange(file);
-                }
-            });
-        }
-    }
-
     /**
      * Returns the directory being observed.
      *