mobeigi
/
filebot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* try to make sure Java 7 features won't crash Java 6 users

This commit is contained in:
Reinhard Pointner 2011-12-01 18:52:44 +00:00
parent fae09a653a
commit 8bccdd1523
1 changed files with 21 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
source/net/sourceforge/filebot/cli/FolderWatchService.java
View File

@ -28,7 +28,7 @@ import net.sourceforge.tuned.Timer;
public abstract class FolderWatchService implements Closeable { public abstract class FolderWatchService implements Closeable {
private final Collection<Path> commitSet = new HashSet<Path>(); private final Collection<File> commitSet = new HashSet<File>();
private final ExecutorService processor = Executors.newSingleThreadExecutor(); private final ExecutorService processor = Executors.newSingleThreadExecutor();
private final ExecutorService watchers = Executors.newCachedThreadPool(new DefaultThreadFactory("FolderWatchService", Thread.MIN_PRIORITY, true)); private final ExecutorService watchers = Executors.newCachedThreadPool(new DefaultThreadFactory("FolderWatchService", Thread.MIN_PRIORITY, true));
@ -63,9 +63,7 @@ public abstract class FolderWatchService implements Closeable {
final SortedSet<File> files = new TreeSet<File>(); final SortedSet<File> files = new TreeSet<File>();
synchronized (commitSet) { synchronized (commitSet) {
for (Path path : commitSet) { files.addAll(commitSet);
files.add(path.toFile());
}
commitSet.clear(); commitSet.clear();
} }
@ -93,7 +91,7 @@ public abstract class FolderWatchService implements Closeable {
throw new IllegalArgumentException("Must be a folder: " + node); throw new IllegalArgumentException("Must be a folder: " + node);
} }
watchers.submit(new FolderWatcher(node.toPath()) { watchers.submit(new FolderWatcher(node) {
@Override @Override
protected void processEvents(List<WatchEvent<?>> events) { protected void processEvents(List<WatchEvent<?>> events) {
@ -105,20 +103,20 @@ public abstract class FolderWatchService implements Closeable {
@Override @Override
protected void created(Path path) { protected void created(File file) {
commitSet.add(path); commitSet.add(file);
} }
@Override @Override
protected void modified(Path path) { protected void modified(File file) {
commitSet.add(path); commitSet.add(file);
} }
@Override @Override
protected void deleted(Path path) { protected void deleted(File file) {
commitSet.remove(path); commitSet.remove(file);
} }
}); });
} }
@ -138,10 +136,10 @@ public abstract class FolderWatchService implements Closeable {
private final WatchService watchService; private final WatchService watchService;
public FolderWatcher(Path node) throws IOException { public FolderWatcher(File node) throws IOException {
this.node = node; this.node = node.toPath();
this.watchService = node.getFileSystem().newWatchService(); this.watchService = this.node.getFileSystem().newWatchService();
node.register(watchService, ENTRY_CREATE, ENTRY_MODIFY, ENTRY_DELETE); this.node.register(watchService, ENTRY_CREATE, ENTRY_MODIFY, ENTRY_DELETE);
} }
@ -170,31 +168,31 @@ public abstract class FolderWatchService implements Closeable {
} }
public Path getPath(WatchEvent event) { public File getAbsoluteFile(WatchEvent event) {
return node.resolve(event.context().toString()); return node.resolve(event.context().toString()).toFile();
} }
protected void processEvents(List<WatchEvent<?>> list) { protected void processEvents(List<WatchEvent<?>> list) {
for (WatchEvent event : list) { for (WatchEvent event : list) {
if (event.kind() == ENTRY_CREATE) { if (event.kind() == ENTRY_CREATE) {
created(getPath(event)); created(getAbsoluteFile(event));
} else if (event.kind() == ENTRY_MODIFY) { } else if (event.kind() == ENTRY_MODIFY) {
modified(getPath(event)); modified(getAbsoluteFile(event));
} else if (event.kind() == ENTRY_DELETE) { } else if (event.kind() == ENTRY_DELETE) {
deleted(getPath(event)); deleted(getAbsoluteFile(event));
} }
} }
} }
protected abstract void created(Path path); protected abstract void created(File file);
protected abstract void modified(Path path); protected abstract void modified(File file);
protected abstract void deleted(Path path); protected abstract void deleted(File file);
@Override @Override