Author: niallp
Date: Wed Oct 13 22:08:56 2010
New Revision: 1022311
URL: http://svn.apache.org/viewvc?rev=1022311&view=rev
Log:
Rename to FilerAlteration*
Added:
commons/proper/io/trunk/src/main/java/org/apache/commons/io/monitor/FileAlterationListener.java
- copied, changed from r1022144,
commons/proper/io/trunk/src/main/java/org/apache/commons/io/monitor/FileListener.java
commons/proper/io/trunk/src/main/java/org/apache/commons/io/monitor/FileAlterationListenerAdaptor.java
- copied, changed from r1022144,
commons/proper/io/trunk/src/main/java/org/apache/commons/io/monitor/FileListenerAdaptor.java
commons/proper/io/trunk/src/main/java/org/apache/commons/io/monitor/FileAlterationMonitor.java
- copied, changed from r1022144,
commons/proper/io/trunk/src/main/java/org/apache/commons/io/monitor/FileMonitor.java
commons/proper/io/trunk/src/main/java/org/apache/commons/io/monitor/FileAlterationObserver.java
- copied, changed from r1022144,
commons/proper/io/trunk/src/main/java/org/apache/commons/io/monitor/FileObserver.java
commons/proper/io/trunk/src/test/java/org/apache/commons/io/monitor/FileAlterationMonitorTestCase.java
- copied, changed from r1022144,
commons/proper/io/trunk/src/test/java/org/apache/commons/io/monitor/FileMonitorTestCase.java
commons/proper/io/trunk/src/test/java/org/apache/commons/io/monitor/FileAlterationObserverTestCase.java
- copied, changed from r1022144,
commons/proper/io/trunk/src/test/java/org/apache/commons/io/monitor/FileObserverTestCase.java
Removed:
commons/proper/io/trunk/src/main/java/org/apache/commons/io/monitor/FileListener.java
commons/proper/io/trunk/src/main/java/org/apache/commons/io/monitor/FileListenerAdaptor.java
commons/proper/io/trunk/src/main/java/org/apache/commons/io/monitor/FileMonitor.java
commons/proper/io/trunk/src/main/java/org/apache/commons/io/monitor/FileObserver.java
commons/proper/io/trunk/src/test/java/org/apache/commons/io/monitor/FileMonitorTestCase.java
commons/proper/io/trunk/src/test/java/org/apache/commons/io/monitor/FileObserverTestCase.java
Modified:
commons/proper/io/trunk/src/main/java/org/apache/commons/io/monitor/FileEntry.java
commons/proper/io/trunk/src/test/java/org/apache/commons/io/monitor/AbstractMonitorTestCase.java
commons/proper/io/trunk/src/test/java/org/apache/commons/io/monitor/CollectionFileListener.java
Copied:
commons/proper/io/trunk/src/main/java/org/apache/commons/io/monitor/FileAlterationListener.java
(from r1022144,
commons/proper/io/trunk/src/main/java/org/apache/commons/io/monitor/FileListener.java)
URL:
http://svn.apache.org/viewvc/commons/proper/io/trunk/src/main/java/org/apache/commons/io/monitor/FileAlterationListener.java?p2=commons/proper/io/trunk/src/main/java/org/apache/commons/io/monitor/FileAlterationListener.java&p1=commons/proper/io/trunk/src/main/java/org/apache/commons/io/monitor/FileListener.java&r1=1022144&r2=1022311&rev=1022311&view=diff
==============================================================================
---
commons/proper/io/trunk/src/main/java/org/apache/commons/io/monitor/FileListener.java
(original)
+++
commons/proper/io/trunk/src/main/java/org/apache/commons/io/monitor/FileAlterationListener.java
Wed Oct 13 22:08:56 2010
@@ -20,20 +20,20 @@ import java.io.File;
/**
* A listener that receives events of file system modifications.
* <p>
- * Register {...@link FileListener}s with a {...@link FileObserver}.
+ * Register {...@link FileAlterationListener}s with a {...@link
FileAlterationObserver}.
*
- * @see FileObserver
+ * @see FileAlterationObserver
* @version $Id$
* @since Commons IO 2.0
*/
-public interface FileListener {
+public interface FileAlterationListener {
/**
* File system observer started checking event.
*
* @param observer The file system observer
*/
- void onStart(final FileObserver observer);
+ void onStart(final FileAlterationObserver observer);
/**
* Directory created Event.
@@ -82,5 +82,5 @@ public interface FileListener {
*
* @param observer The file system observer
*/
- void onStop(final FileObserver observer);
+ void onStop(final FileAlterationObserver observer);
}
Copied:
commons/proper/io/trunk/src/main/java/org/apache/commons/io/monitor/FileAlterationListenerAdaptor.java
(from r1022144,
commons/proper/io/trunk/src/main/java/org/apache/commons/io/monitor/FileListenerAdaptor.java)
URL:
http://svn.apache.org/viewvc/commons/proper/io/trunk/src/main/java/org/apache/commons/io/monitor/FileAlterationListenerAdaptor.java?p2=commons/proper/io/trunk/src/main/java/org/apache/commons/io/monitor/FileAlterationListenerAdaptor.java&p1=commons/proper/io/trunk/src/main/java/org/apache/commons/io/monitor/FileListenerAdaptor.java&r1=1022144&r2=1022311&rev=1022311&view=diff
==============================================================================
---
commons/proper/io/trunk/src/main/java/org/apache/commons/io/monitor/FileListenerAdaptor.java
(original)
+++
commons/proper/io/trunk/src/main/java/org/apache/commons/io/monitor/FileAlterationListenerAdaptor.java
Wed Oct 13 22:08:56 2010
@@ -19,20 +19,20 @@ package org.apache.commons.io.monitor;
import java.io.File;
/**
- * Convenience {...@link FileListener} implementation that does nothing.
+ * Convenience {...@link FileAlterationListener} implementation that does
nothing.
*
- * @see FileObserver
+ * @see FileAlterationObserver
* @version $Id$
* @since Commons IO 2.0
*/
-public class FileListenerAdaptor implements FileListener {
+public class FileAlterationListenerAdaptor implements FileAlterationListener {
/**
* File system observer started checking event.
*
* @param observer The file system observer
*/
- public void onStart(final FileObserver observer) {
+ public void onStart(final FileAlterationObserver observer) {
}
/**
@@ -88,7 +88,7 @@ public class FileListenerAdaptor impleme
*
* @param observer The file system observer
*/
- public void onStop(final FileObserver observer) {
+ public void onStop(final FileAlterationObserver observer) {
}
}
Copied:
commons/proper/io/trunk/src/main/java/org/apache/commons/io/monitor/FileAlterationMonitor.java
(from r1022144,
commons/proper/io/trunk/src/main/java/org/apache/commons/io/monitor/FileMonitor.java)
URL:
http://svn.apache.org/viewvc/commons/proper/io/trunk/src/main/java/org/apache/commons/io/monitor/FileAlterationMonitor.java?p2=commons/proper/io/trunk/src/main/java/org/apache/commons/io/monitor/FileAlterationMonitor.java&p1=commons/proper/io/trunk/src/main/java/org/apache/commons/io/monitor/FileMonitor.java&r1=1022144&r2=1022311&rev=1022311&view=diff
==============================================================================
---
commons/proper/io/trunk/src/main/java/org/apache/commons/io/monitor/FileMonitor.java
(original)
+++
commons/proper/io/trunk/src/main/java/org/apache/commons/io/monitor/FileAlterationMonitor.java
Wed Oct 13 22:08:56 2010
@@ -21,23 +21,23 @@ import java.util.concurrent.CopyOnWriteA
/**
* A runnable that spawns a monitoring thread triggering any
- * registered {...@link FileObserver} at a specified interval.
+ * registered {...@link FileAlterationObserver} at a specified interval.
*
- * @see FileObserver
+ * @see FileAlterationObserver
* @version $Id$
* @since Commons IO 2.0
*/
-public final class FileMonitor implements Runnable {
+public final class FileAlterationMonitor implements Runnable {
private final long interval;
- private final List<FileObserver> observers = new
CopyOnWriteArrayList<FileObserver>();
+ private final List<FileAlterationObserver> observers = new
CopyOnWriteArrayList<FileAlterationObserver>();
private Thread thread = null;
private volatile boolean running = false;
/**
* Construct a monitor with a default interval of 10 seconds.
*/
- public FileMonitor() {
+ public FileAlterationMonitor() {
this(10000);
}
@@ -47,7 +47,7 @@ public final class FileMonitor implement
* @param interval The amount of time in miliseconds to wait between
* checks of the file system
*/
- public FileMonitor(long interval) {
+ public FileAlterationMonitor(long interval) {
this.interval = interval;
}
@@ -58,10 +58,10 @@ public final class FileMonitor implement
* checks of the file system
* @param observers The set of observers to add to the monitor.
*/
- public FileMonitor(long interval, FileObserver... observers) {
+ public FileAlterationMonitor(long interval, FileAlterationObserver...
observers) {
this(interval);
if (observers != null) {
- for (FileObserver observer : observers) {
+ for (FileAlterationObserver observer : observers) {
addObserver(observer);
}
}
@@ -72,7 +72,7 @@ public final class FileMonitor implement
*
* @param observer The file system observer to add
*/
- public void addObserver(final FileObserver observer) {
+ public void addObserver(final FileAlterationObserver observer) {
if (observer != null) {
observers.add(observer);
}
@@ -83,7 +83,7 @@ public final class FileMonitor implement
*
* @param observer The file system observer to remove
*/
- public void removeObserver(final FileObserver observer) {
+ public void removeObserver(final FileAlterationObserver observer) {
if (observer != null) {
while (observers.remove(observer)) {
}
@@ -91,12 +91,12 @@ public final class FileMonitor implement
}
/**
- * Returns the set of {...@link FileObserver} registered with
+ * Returns the set of {...@link FileAlterationObserver} registered with
* this monitor.
*
- * @return The set of {...@link FileObserver}
+ * @return The set of {...@link FileAlterationObserver}
*/
- public Iterable<FileObserver> getObservers() {
+ public Iterable<FileAlterationObserver> getObservers() {
return observers;
}
@@ -106,7 +106,7 @@ public final class FileMonitor implement
* @throws Exception if an error occurs initializing the observer
*/
public void start() throws Exception {
- for (FileObserver observer : observers) {
+ for (FileAlterationObserver observer : observers) {
observer.initialize();
}
running = true;
@@ -126,7 +126,7 @@ public final class FileMonitor implement
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
}
- for (FileObserver observer : observers) {
+ for (FileAlterationObserver observer : observers) {
observer.destroy();
}
}
@@ -136,7 +136,7 @@ public final class FileMonitor implement
*/
public void run() {
while (running) {
- for (FileObserver observer : observers) {
+ for (FileAlterationObserver observer : observers) {
observer.checkAndNotify();
}
if (!running) {
Copied:
commons/proper/io/trunk/src/main/java/org/apache/commons/io/monitor/FileAlterationObserver.java
(from r1022144,
commons/proper/io/trunk/src/main/java/org/apache/commons/io/monitor/FileObserver.java)
URL:
http://svn.apache.org/viewvc/commons/proper/io/trunk/src/main/java/org/apache/commons/io/monitor/FileAlterationObserver.java?p2=commons/proper/io/trunk/src/main/java/org/apache/commons/io/monitor/FileAlterationObserver.java&p1=commons/proper/io/trunk/src/main/java/org/apache/commons/io/monitor/FileObserver.java&r1=1022144&r2=1022311&rev=1022311&view=diff
==============================================================================
---
commons/proper/io/trunk/src/main/java/org/apache/commons/io/monitor/FileObserver.java
(original)
+++
commons/proper/io/trunk/src/main/java/org/apache/commons/io/monitor/FileAlterationObserver.java
Wed Oct 13 22:08:56 2010
@@ -28,25 +28,25 @@ import org.apache.commons.io.IOCase;
import org.apache.commons.io.comparator.NameFileComparator;
/**
- * FileObserver represents the state of files below a root directory,
+ * FileAlterationObserver represents the state of files below a root directory,
* checking the filesystem and notifying listeners of create, change or
* delete events.
* <p>
* To use this implementation:
* <ul>
- * <li>Create {...@link FileListener} implementation(s) that process
+ * <li>Create {...@link FileAlterationListener} implementation(s) that
process
* the file/directory create, change and delete events</li>
- * <li>Register the listener(s) with a {...@link FileObserver} for
+ * <li>Register the listener(s) with a {...@link FileAlterationObserver} for
* the appropriate directory.</li>
- * <li>Either register the observer(s) with a {...@link FileMonitor} or
+ * <li>Either register the observer(s) with a {...@link
FileAlterationMonitor} or
* run manually.</li>
* </ul>
*
* <h2>Basic Usage</h2>
- * Create a {...@link FileObserver} for the directory and register the
listeners:
+ * Create a {...@link FileAlterationObserver} for the directory and register
the listeners:
* <pre>
* File directory = new File(new File("."), "src");
- * FileObserver observer = new FileObserver(directory);
+ * FileAlterationObserver observer = new
FileAlterationObserver(directory);
* observer.addListener(...);
* observer.addListener(...);
* </pre>
@@ -64,11 +64,11 @@ import org.apache.commons.io.comparator.
* // finished
* observer.finish();
* </pre>
- * Alternatively, register the oberver(s) with a {...@link FileMonitor},
+ * Alternatively, register the oberver(s) with a {...@link
FileAlterationMonitor},
* which creates a new thread, invoking the observer at the specified interval:
* <pre>
* long interval = ...
- * FileMonitor monitor = new FileMonitor(interval);
+ * FileAlterationMonitor monitor = new FileAlterationMonitor(interval);
* monitor.addObserver(observer);
* monitor.start();
* ...
@@ -87,40 +87,24 @@ import org.apache.commons.io.comparator.
* implementations for this purpose.
* <p>
* For example, to only observe 1) visible directories and 2) files with a
".java" suffix
- * in a root directory called "src" you could set up a {...@link FileObserver}
in the following
+ * in a root directory called "src" you could set up a {...@link
FileAlterationObserver} in the following
* way:
* <pre>
* // Create a FileFilter
- * IOFileFilter directories = FileFilterUtils.directoryFileFilter();
- * IOFileFilter visible = HiddenFileFilter.VISIBLE;
- * IOFileFilter dirFilter = FileFilterUtils.andFileFilter(directories,
visible);
- * IOFileFilter files = FileFilterUtils.fileFileFilter();
- * IOFileFilter javaSuffix = FileFilterUtils.suffixFileFilter(".java");
- * IOFileFilter fileFilter = FileFilterUtils.andFileFilter(files,
javaSuffix);
- * IOFileFilter filter = FileFilterUtils.orFileFilter(dirFilter,
fileFilter);
+ * IOFileFilter directories = FileFilterUtils.and(
+ * FileFilterUtils.directoryFileFilter(),
+ * HiddenFileFilter.VISIBLE);
+ * IOFileFilter files = FileFilterUtils.and(
+ * FileFilterUtils.fileFileFilter(),
+ *
FileFilterUtils.suffixFileFilter(".java"));
+ * IOFileFilter filter = FileFilterUtils.or(directories, files);
*
* // Create the File system observer and register File Listeners
- * FileObserver observer = new FileObserver(new File("src"), filter);
+ * FileAlterationObserver observer = new FileAlterationObserver(new
File("src"), filter);
* observer.addListener(...);
* observer.addListener(...);
- *
- * //
* </pre>
*
- * <h2>File Comparator</h2>
- * <p>
- * <a href="http://commons.apache.org/io/";>Commons IO</a> has a range of
- * useful, ready made <a
href="../comparator/package-summary.html">Comparator</a>
- * implementations for this purpose.
- * <p>
- * This implementation works by comparing the file names of the current
contents of
- * a directory with the previous contents using the <i>case-sensitive</i>
- * {...@link NameFileComparator#NAME_COMPARATOR} to determine which files have
been created,
- * deleted or still exist. However a custom {...@link Comparator} can be
specified and
- * one example usage would be to compare file names in a
<i>case-insensitive</i>
- * manner ({...@link NameFileComparator#NAME_INSENSITIVE_COMPARATOR} could be
used
- * to do that).
- *
* <h2>FileEntry</h2>
* {...@link FileEntry} represents the state of a file or directory, capturing
* {...@link File} attributes at a point in time. Custom implementations of
@@ -129,17 +113,17 @@ import org.apache.commons.io.comparator.
* method is used to determine if a file or directory has changed since the
last
* check and stores the current state of the {...@link File}'s properties.
*
- * @see FileListener
- * @see FileMonitor
+ * @see FileAlterationListener
+ * @see FileAlterationMonitor
* @version $Id$
* @since Commons IO 2.0
*/
-public class FileObserver implements Serializable {
+public class FileAlterationObserver implements Serializable {
private static final File[] EMPTY_FILES = new File[0];
static final FileEntry[] EMPTY_ENTRIES = new FileEntry[0];
- private final List<FileListener> listeners = new
CopyOnWriteArrayList<FileListener>();
+ private final List<FileAlterationListener> listeners = new
CopyOnWriteArrayList<FileAlterationListener>();
private final FileEntry rootEntry;
private final FileFilter fileFilter;
private final Comparator<File> comparator;
@@ -149,7 +133,7 @@ public class FileObserver implements Ser
*
* @param directoryName the name of the directory to observe
*/
- public FileObserver(String directoryName) {
+ public FileAlterationObserver(String directoryName) {
this(new File(directoryName));
}
@@ -159,7 +143,7 @@ public class FileObserver implements Ser
* @param directoryName the name of the directory to observe
* @param fileFilter The file filter or null if none
*/
- public FileObserver(String directoryName, FileFilter fileFilter) {
+ public FileAlterationObserver(String directoryName, FileFilter fileFilter)
{
this(new File(directoryName), fileFilter);
}
@@ -171,7 +155,7 @@ public class FileObserver implements Ser
* @param fileFilter The file filter or null if none
* @param caseSensitivity what case sensitivity to use comparing file
names, null means system sensitive
*/
- public FileObserver(String directoryName, FileFilter fileFilter, IOCase
caseSensitivity) {
+ public FileAlterationObserver(String directoryName, FileFilter fileFilter,
IOCase caseSensitivity) {
this(new File(directoryName), fileFilter, caseSensitivity);
}
@@ -180,7 +164,7 @@ public class FileObserver implements Ser
*
* @param directory the directory to observe
*/
- public FileObserver(File directory) {
+ public FileAlterationObserver(File directory) {
this(directory, (FileFilter)null);
}
@@ -190,7 +174,7 @@ public class FileObserver implements Ser
* @param directory the directory to observe
* @param fileFilter The file filter or null if none
*/
- public FileObserver(File directory, FileFilter fileFilter) {
+ public FileAlterationObserver(File directory, FileFilter fileFilter) {
this(directory, fileFilter, (IOCase)null);
}
@@ -202,7 +186,7 @@ public class FileObserver implements Ser
* @param fileFilter The file filter or null if none
* @param caseSensitivity what case sensitivity to use comparing file
names, null means system sensitive
*/
- public FileObserver(File directory, FileFilter fileFilter, IOCase
caseSensitivity) {
+ public FileAlterationObserver(File directory, FileFilter fileFilter,
IOCase caseSensitivity) {
this(new FileEntry(directory), fileFilter, caseSensitivity);
}
@@ -214,7 +198,7 @@ public class FileObserver implements Ser
* @param fileFilter The file filter or null if none
* @param caseSensitivity what case sensitivity to use comparing file
names, null means system sensitive
*/
- protected FileObserver(FileEntry rootEntry, FileFilter fileFilter, IOCase
caseSensitivity) {
+ protected FileAlterationObserver(FileEntry rootEntry, FileFilter
fileFilter, IOCase caseSensitivity) {
if (rootEntry == null) {
throw new IllegalArgumentException("Root entry is missing");
}
@@ -273,7 +257,7 @@ public class FileObserver implements Ser
*
* @param listener The file system listener
*/
- public void addListener(final FileListener listener) {
+ public void addListener(final FileAlterationListener listener) {
if (listener != null) {
listeners.add(listener);
}
@@ -284,7 +268,7 @@ public class FileObserver implements Ser
*
* @param listener The file system listener
*/
- public void removeListener(final FileListener listener) {
+ public void removeListener(final FileAlterationListener listener) {
if (listener != null) {
while (listeners.remove(listener)) {
}
@@ -296,7 +280,7 @@ public class FileObserver implements Ser
*
* @return The file system listeners
*/
- public Iterable<FileListener> getListeners() {
+ public Iterable<FileAlterationListener> getListeners() {
return listeners;
}
@@ -329,7 +313,7 @@ public class FileObserver implements Ser
public void checkAndNotify() {
/* fire onStart() */
- for (FileListener listener : listeners) {
+ for (FileAlterationListener listener : listeners) {
listener.onStart(this);
}
@@ -344,7 +328,7 @@ public class FileObserver implements Ser
}
/* fire onStop() */
- for (FileListener listener : listeners) {
+ for (FileAlterationListener listener : listeners) {
listener.onStop(this);
}
}
@@ -407,7 +391,7 @@ public class FileObserver implements Ser
* @param entry The file entry
*/
private void doCreate(FileEntry entry) {
- for (FileListener listener : listeners) {
+ for (FileAlterationListener listener : listeners) {
if (entry.isDirectory()) {
listener.onDirectoryCreate(entry.getFile());
} else {
@@ -428,7 +412,7 @@ public class FileObserver implements Ser
*/
private void doMatch(FileEntry entry, File file) {
if (entry.refresh(file)) {
- for (FileListener listener : listeners) {
+ for (FileAlterationListener listener : listeners) {
if (entry.isDirectory()) {
listener.onDirectoryChange(file);
} else {
@@ -444,7 +428,7 @@ public class FileObserver implements Ser
* @param entry The file entry
*/
private void doDelete(FileEntry entry) {
- for (FileListener listener : listeners) {
+ for (FileAlterationListener listener : listeners) {
if (entry.isDirectory()) {
listener.onDirectoryDelete(entry.getFile());
} else {
Modified:
commons/proper/io/trunk/src/main/java/org/apache/commons/io/monitor/FileEntry.java
URL:
http://svn.apache.org/viewvc/commons/proper/io/trunk/src/main/java/org/apache/commons/io/monitor/FileEntry.java?rev=1022311&r1=1022310&r2=1022311&view=diff
==============================================================================
---
commons/proper/io/trunk/src/main/java/org/apache/commons/io/monitor/FileEntry.java
(original)
+++
commons/proper/io/trunk/src/main/java/org/apache/commons/io/monitor/FileEntry.java
Wed Oct 13 22:08:56 2010
@@ -36,7 +36,7 @@ import java.io.Serializable;
* {...@link FileEntry} with properties for those attributes. Override the
* {...@link #newChildInstance(File)} to return a new instance of the
appropriate type.
* You may also want to override the {...@link #refresh(File)} method.
- * @see FileObserver
+ * @see FileAlterationObserver
* @since Commons IO 2.0
*/
public class FileEntry implements Serializable {
@@ -149,7 +149,7 @@ public class FileEntry implements Serial
* directory is empty
*/
public FileEntry[] getChildren() {
- return children != null ? children : FileObserver.EMPTY_ENTRIES;
+ return children != null ? children :
FileAlterationObserver.EMPTY_ENTRIES;
}
/**
Modified:
commons/proper/io/trunk/src/test/java/org/apache/commons/io/monitor/AbstractMonitorTestCase.java
URL:
http://svn.apache.org/viewvc/commons/proper/io/trunk/src/test/java/org/apache/commons/io/monitor/AbstractMonitorTestCase.java?rev=1022311&r1=1022310&r2=1022311&view=diff
==============================================================================
---
commons/proper/io/trunk/src/test/java/org/apache/commons/io/monitor/AbstractMonitorTestCase.java
(original)
+++
commons/proper/io/trunk/src/test/java/org/apache/commons/io/monitor/AbstractMonitorTestCase.java
Wed Oct 13 22:08:56 2010
@@ -27,12 +27,12 @@ import org.apache.commons.io.filefilter.
import org.apache.commons.io.filefilter.IOFileFilter;
/**
- * {...@link FileObserver} Test Case.
+ * {...@link FileAlterationObserver} Test Case.
*/
public abstract class AbstractMonitorTestCase extends TestCase {
/** File observer */
- protected FileObserver observer;
+ protected FileAlterationObserver observer;
/** Listener which collects file changes */
protected CollectionFileListener listener;
@@ -78,13 +78,13 @@ public abstract class AbstractMonitorTes
}
/**
- * Create a {...@link FileObserver}.
+ * Create a {...@link FileAlterationObserver}.
*
* @param file The directory to observe
* @param fileFilter The file filter to apply
*/
protected void createObserver(File file, FileFilter fileFilter) {
- observer = new FileObserver(file, fileFilter);
+ observer = new FileAlterationObserver(file, fileFilter);
observer.addListener(listener);
try {
observer.initialize();
Modified:
commons/proper/io/trunk/src/test/java/org/apache/commons/io/monitor/CollectionFileListener.java
URL:
http://svn.apache.org/viewvc/commons/proper/io/trunk/src/test/java/org/apache/commons/io/monitor/CollectionFileListener.java?rev=1022311&r1=1022310&r2=1022311&view=diff
==============================================================================
---
commons/proper/io/trunk/src/test/java/org/apache/commons/io/monitor/CollectionFileListener.java
(original)
+++
commons/proper/io/trunk/src/test/java/org/apache/commons/io/monitor/CollectionFileListener.java
Wed Oct 13 22:08:56 2010
@@ -22,10 +22,10 @@ import java.util.ArrayList;
import java.util.Collection;
/**
- * {...@link FileListener} implementation that adds created, changed and
deleted
+ * {...@link FileAlterationListener} implementation that adds created, changed
and deleted
* files/directories to a set of {...@link Collection}s.
*/
-public class CollectionFileListener implements FileListener, Serializable {
+public class CollectionFileListener implements FileAlterationListener,
Serializable {
private final boolean clearOnStart;
private final Collection<File> createdFiles = new ArrayList<File>();
@@ -49,7 +49,7 @@ public class CollectionFileListener impl
*
* @param observer The file system observer
*/
- public void onStart(final FileObserver observer) {
+ public void onStart(final FileAlterationObserver observer) {
if (clearOnStart) {
clear();
}
@@ -180,7 +180,7 @@ public class CollectionFileListener impl
*
* @param observer The file system observer
*/
- public void onStop(final FileObserver observer) {
+ public void onStop(final FileAlterationObserver observer) {
}
}
Copied:
commons/proper/io/trunk/src/test/java/org/apache/commons/io/monitor/FileAlterationMonitorTestCase.java
(from r1022144,
commons/proper/io/trunk/src/test/java/org/apache/commons/io/monitor/FileMonitorTestCase.java)
URL:
http://svn.apache.org/viewvc/commons/proper/io/trunk/src/test/java/org/apache/commons/io/monitor/FileAlterationMonitorTestCase.java?p2=commons/proper/io/trunk/src/test/java/org/apache/commons/io/monitor/FileAlterationMonitorTestCase.java&p1=commons/proper/io/trunk/src/test/java/org/apache/commons/io/monitor/FileMonitorTestCase.java&r1=1022144&r2=1022311&rev=1022311&view=diff
==============================================================================
---
commons/proper/io/trunk/src/test/java/org/apache/commons/io/monitor/FileMonitorTestCase.java
(original)
+++
commons/proper/io/trunk/src/test/java/org/apache/commons/io/monitor/FileAlterationMonitorTestCase.java
Wed Oct 13 22:08:56 2010
@@ -20,16 +20,16 @@ import java.io.File;
import java.util.Collection;
/**
- * {...@link FileMonitor} Test Case.
+ * {...@link FileAlterationMonitor} Test Case.
*/
-public class FileMonitorTestCase extends AbstractMonitorTestCase {
+public class FileAlterationMonitorTestCase extends AbstractMonitorTestCase {
/**
* Construct a new test case.
*
* @param name The name of the test
*/
- public FileMonitorTestCase(String name) {
+ public FileAlterationMonitorTestCase(String name) {
super(name);
testDirName = "test-monitor";
}
@@ -46,7 +46,7 @@ public class FileMonitorTestCase extends
public void testMonitor() {
try {
long interval = 100;
- FileMonitor monitor = new FileMonitor(interval, observer);
+ FileAlterationMonitor monitor = new
FileAlterationMonitor(interval, observer);
monitor.start();
// Create a File
Copied:
commons/proper/io/trunk/src/test/java/org/apache/commons/io/monitor/FileAlterationObserverTestCase.java
(from r1022144,
commons/proper/io/trunk/src/test/java/org/apache/commons/io/monitor/FileObserverTestCase.java)
URL:
http://svn.apache.org/viewvc/commons/proper/io/trunk/src/test/java/org/apache/commons/io/monitor/FileAlterationObserverTestCase.java?p2=commons/proper/io/trunk/src/test/java/org/apache/commons/io/monitor/FileAlterationObserverTestCase.java&p1=commons/proper/io/trunk/src/test/java/org/apache/commons/io/monitor/FileObserverTestCase.java&r1=1022144&r2=1022311&rev=1022311&view=diff
==============================================================================
---
commons/proper/io/trunk/src/test/java/org/apache/commons/io/monitor/FileObserverTestCase.java
(original)
+++
commons/proper/io/trunk/src/test/java/org/apache/commons/io/monitor/FileAlterationObserverTestCase.java
Wed Oct 13 22:08:56 2010
@@ -23,16 +23,16 @@ import org.apache.commons.io.FileUtils;
import org.apache.commons.io.filefilter.FileFilterUtils;
/**
- * {...@link FileObserver} Test Case.
+ * {...@link FileAlterationObserver} Test Case.
*/
-public class FileObserverTestCase extends AbstractMonitorTestCase {
+public class FileAlterationObserverTestCase extends AbstractMonitorTestCase {
/**
* Construct a new test case.
*
* @param name The name of the test
*/
- public FileObserverTestCase(String name) {
+ public FileAlterationObserverTestCase(String name) {
super(name);
testDirName = "test-observer";
}
@@ -346,7 +346,7 @@ public class FileObserverTestCase extend
}
/**
- * Call {...@link FileObserver#checkAndNotify()}.
+ * Call {...@link FileAlterationObserver#checkAndNotify()}.
*
* @throws Exception if an error occurs
*/
