Changeset 7248 in josm for trunk/src/org/openstreetmap/josm/io/FileWatcher.java

Timestamp:

2014-06-14T12:40:50+02:00 (10 years ago)

Author:

bastiK

Message:

reworked MirroredInputStream (renamed to CachedFile):

• no more awkwardly open and close InputStream if you just want the underlying file (e.g. to get file inside zip file)
• make it easier to add configuration parameters, without having endless list of parameters for the constructor (Factory style, similar to ImageProvider)

breaks plugins; see #10139

File:

• trunk/src/org/openstreetmap/josm/io/FileWatcher.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/io/FileWatcher.java

@@ -59 +59 @@
             throw new IllegalStateException("File watcher is not available");
         }
-        try (MirroredInputStream mis = style.getMirroredInputStream()) {
-            // Get underlying file
-            File file = mis.getFile();
-            if (file == null) {
-                throw new IllegalArgumentException("Style "+style+" does not have a local file");
-            }
-            // Get parent directory as WatchService allows only to monitor directories, not single files
-            File dir = file.getParentFile();
-            if (dir == null) {
-                throw new IllegalArgumentException("Style "+style+" does not have a parent directory");
-            }
-            synchronized(this) {
-                // Register directory. Can be called several times for a same directory without problem
-                // (it returns the same key so it should not send events several times)
-                dir.toPath().register(watcher, StandardWatchEventKinds.ENTRY_MODIFY, StandardWatchEventKinds.ENTRY_CREATE);
-                styleMap.put(file.toPath(), style);
-            }
+        CachedFile cf = style.getCachedFile();
+        // Get underlying file
+        File file = cf.getFile();
+        if (file == null) {
+            throw new IllegalArgumentException("Style "+style+" does not have a local file");
+        }
+        // Get parent directory as WatchService allows only to monitor directories, not single files
+        File dir = file.getParentFile();
+        if (dir == null) {
+            throw new IllegalArgumentException("Style "+style+" does not have a parent directory");
+        }
+        synchronized(this) {
+            // Register directory. Can be called several times for a same directory without problem
+            // (it returns the same key so it should not send events several times)
+            dir.toPath().register(watcher, StandardWatchEventKinds.ENTRY_MODIFY, StandardWatchEventKinds.ENTRY_CREATE);
+            styleMap.put(file.toPath(), style);
         }
     }