X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=support%2Fgeneral%2Fsrc%2Fmain%2Fjava%2Forg%2Fwamblee%2Fio%2FDirectoryMonitor.java;h=3f5488b020943ec4763ee42295032a49dafe882f;hb=0d8d8f24656e585ee75558cfd6a4c661f8f14985;hp=029f33ef49d775116efea3b74bc3477d77db43cb;hpb=da48a523c81e59fe0eac34e43d12937396161f25;p=utils diff --git a/support/general/src/main/java/org/wamblee/io/DirectoryMonitor.java b/support/general/src/main/java/org/wamblee/io/DirectoryMonitor.java index 029f33ef..3f5488b0 100644 --- a/support/general/src/main/java/org/wamblee/io/DirectoryMonitor.java +++ b/support/general/src/main/java/org/wamblee/io/DirectoryMonitor.java @@ -45,21 +45,21 @@ public class DirectoryMonitor { void fileDeleted(File aFile); }; - private File _directory; - private FileFilter _filter; - private Listener _listener; - private Map _contents; + private File directory; + private FileFilter filter; + private Listener listener; + private Map contents; public DirectoryMonitor(File aDirectory, FileFilter aFilefilter, Listener aListener) { - _directory = aDirectory; - if (!_directory.isDirectory()) { - throw new IllegalArgumentException("Directory '" + _directory + directory = aDirectory; + if (!directory.isDirectory()) { + throw new IllegalArgumentException("Directory '" + directory + "' does not exist"); } - _filter = aFilefilter; - _listener = aListener; - _contents = new HashMap(); + filter = aFilefilter; + listener = aListener; + contents = new HashMap(); } /** @@ -68,41 +68,41 @@ public class DirectoryMonitor { * the next call to this method will invoked the listeners again for the same changes. */ public void poll() { - LOG.debug("Polling " + _directory); + LOG.debug("Polling " + directory); Map newContents = new HashMap(); - File[] files = _directory.listFiles(_filter); + File[] files = directory.listFiles(filter); // Check deleted files. - Set deletedFiles = new HashSet(_contents.keySet()); + Set deletedFiles = new HashSet(contents.keySet()); for (File file : files) { if (file.isFile()) { - if (_contents.containsKey(file)) { + if (contents.containsKey(file)) { deletedFiles.remove(file); } } } for (File file : deletedFiles) { - _listener.fileDeleted(file); + listener.fileDeleted(file); } for (File file : files) { if (file.isFile()) { - if (_contents.containsKey(file)) { - Date oldDate = _contents.get(file); + if (contents.containsKey(file)) { + Date oldDate = contents.get(file); if (file.lastModified() != oldDate.getTime()) { - _listener.fileChanged(file); + listener.fileChanged(file); } else { // No change. } newContents.put(file, new Date(file.lastModified())); } else { - _listener.fileCreated(file); + listener.fileCreated(file); newContents.put(file, new Date(file.lastModified())); } } } - _contents = newContents; + contents = newContents; } }