AutomationWatchService uses relative path.

Adapting the code of AutomationWatchService to use relative path. This change was necessary after #2342 was merged. Signed-off-by: Svilen Valkanov <svilen.valkanov@musala.com>
eclipse-archived · Nov 29, 2016 · 55c5606 · 55c5606
1 parent 4a489f8
commit 55c5606
Showing 1 changed file with 14 additions and 8 deletions.
diff --git a/.../java/org/eclipse/smarthome/automation/internal/provider/file/AutomationWatchService.java b/.../java/org/eclipse/smarthome/automation/internal/provider/file/AutomationWatchService.java
@@ -14,7 +14,9 @@
 import java.nio.file.Path;
 import java.nio.file.WatchEvent;
 import java.nio.file.WatchEvent.Kind;
+import java.nio.file.WatchKey;
 import java.nio.file.WatchService;
+import java.util.Map;
 
 import org.eclipse.smarthome.core.service.AbstractWatchQueueReader;
 import org.eclipse.smarthome.core.service.AbstractWatchService;
@@ -49,8 +51,9 @@ protected String getSourcePath() {
     }
 
     @Override
-    protected AbstractWatchQueueReader buildWatchQueueReader(WatchService watchService, Path toWatch) {
-        return new WatchQueueReader(watchService, toWatch, provider);
+    protected AbstractWatchQueueReader buildWatchQueueReader(WatchService watchService, Path toWatch,
+            Map<WatchKey, Path> registredWatchKeys) {
+        return new WatchQueueReader(watchService, toWatch, provider, registredWatchKeys);
     }
 
     @Override
@@ -59,26 +62,29 @@ protected boolean watchSubDirectories() {
     }
 
     @Override
-    protected void registerDirectory(Path subDir) throws IOException {
-        subDir.register(watchService, ENTRY_CREATE, ENTRY_DELETE, ENTRY_MODIFY);
+    protected WatchKey registerDirectory(Path subDir) throws IOException {
+        return subDir.register(watchService, ENTRY_CREATE, ENTRY_DELETE, ENTRY_MODIFY);
     }
 
     private static class WatchQueueReader extends AbstractWatchQueueReader {
 
         private AbstractFileProvider provider;
 
-        WatchQueueReader(WatchService watchService, Path dirToWatch, AbstractFileProvider provider) {
-            super(watchService, dirToWatch);
+        WatchQueueReader(WatchService watchService, Path dirToWatch, AbstractFileProvider provider,
+                Map<WatchKey, Path> registredWatchKeys) {
+            super(watchService, dirToWatch, registredWatchKeys);
             this.provider = provider;
         }
 
         @Override
         protected void processWatchEvent(WatchEvent<?> event, Kind<?> kind, Path path) {
             if (!path.getFileName().startsWith(".")) {
                 if (kind.equals(ENTRY_DELETE)) {
-                    provider.removeResources(new File(this.dir + File.separator + path.toString()));
+                    provider.removeResources(
+                            new File(baseWatchedDir.toAbsolutePath() + File.separator + path.toString()));
                 } else {
-                    provider.importResources(new File(this.dir + File.separator + path.toString()));
+                    provider.importResources(
+                            new File(baseWatchedDir.toAbsolutePath() + File.separator + path.toString()));
                 }
             }
         }