Changeset 7185 in josm for trunk

Timestamp:

2014-05-29T00:58:29+02:00 (10 years ago)

Author:

Don-vip

Message:

see #9518 - Automatically reload local styles using new Java 7 WatchService API

Location:

trunk/src/org/openstreetmap/josm

Files:

• Main.java (modified) (2 diffs)
• gui/dialogs/MapPaintDialog.java (modified) (6 diffs)
• gui/mappaint/MapPaintStyles.java (modified) (4 diffs)
• gui/mappaint/StyleSource.java (modified) (3 diffs)
• io/FileWatcher.java (added)

trunk/src/org/openstreetmap/josm/Main.java

@@ -88 +88 @@
 import org.openstreetmap.josm.gui.util.RedirectInputMap;
 import org.openstreetmap.josm.gui.widgets.JMultilineLabel;
+import org.openstreetmap.josm.io.FileWatcher;
 import org.openstreetmap.josm.io.OsmApi;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
@@ -198 +199 @@
      */
     public OsmValidator validator;
+
+    /**
+     * The file watcher service.
+     */
+    public static final FileWatcher fileWatcher = new FileWatcher();
 
     /**

trunk/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java

@@ -3 +3 @@
 
 import static org.openstreetmap.josm.tools.I18n.tr;
-import static org.openstreetmap.josm.tools.I18n.trn;
 
 import java.awt.Component;
@@ -66 +65 @@
 import org.openstreetmap.josm.gui.SideButton;
 import org.openstreetmap.josm.gui.mappaint.MapPaintStyles;
-import org.openstreetmap.josm.gui.mappaint.MapPaintStyles.MapPaintStyleLoader;
 import org.openstreetmap.josm.gui.mappaint.MapPaintStyles.MapPaintSylesUpdateListener;
 import org.openstreetmap.josm.gui.mappaint.StyleSource;
@@ -83 +81 @@
 import org.openstreetmap.josm.tools.Utils;
 
-public class MapPaintDialog extends ToggleDialog implements Main.WindowSwitchListener {
+public class MapPaintDialog extends ToggleDialog {
 
     protected StylesTable tblStyles;
@@ -191 +189 @@
 
     @Override
-    public void toOtherApplication() {
-        // nothing
-    }
-
-    @Override
-    public void fromOtherApplication() {
-        // Reload local styles when they have been changed in an external editor.
-        // Checks file modification time.
-        List<StyleSource> toReload = new ArrayList<>();
-        for (StyleSource s : MapPaintStyles.getStyles().getStyleSources()) {
-            if (s.isLocal()) {
-                File f = new File(s.url);
-                long mtime = f.lastModified();
-                if (mtime > s.getLastMTime()) {
-                    toReload.add(s);
-                    s.setLastMTime(mtime);
-                }
-            }
-        }
-        if (!toReload.isEmpty()) {
-            Main.info(trn("Reloading {0} map style.", "Reloading {0} map styles.", toReload.size(), toReload.size()));
-            Main.worker.submit(new MapPaintStyleLoader(toReload));
-        }
-    }
-
-    @Override
     public void showNotify() {
         MapPaintStyles.addMapPaintSylesUpdateListener(model);
         Main.main.menu.wireFrameToggleAction.addButtonModel(cbWireframe.getModel());
-        if (Main.pref.getBoolean("mappaint.auto_reload_local_styles", true)) {
-            Main.addWindowSwitchListener(this);
-        }
     }
 
@@ -229 +198 @@
         Main.main.menu.wireFrameToggleAction.removeButtonModel(cbWireframe.getModel());
         MapPaintStyles.removeMapPaintSylesUpdateListener(model);
-        if (Main.pref.getBoolean("mappaint.auto_reload_local_styles", true)) {
-            Main.removeWindowSwitchListener(this);
-        }
     }
 
@@ -296 +262 @@
             tblStyles.repaint();
         }
-
-        /**
-         * MapPaintSylesUpdateListener interface
-         */
 
         @Override

trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.io.File;
 import java.io.IOException;
 import java.io.InputStreamReader;
@@ -206 +205 @@
         }
         for (StyleSource source : styles.getStyleSources()) {
-            final long startTime = System.currentTimeMillis();
-            source.loadStyleSource();
-            if (Main.pref.getBoolean("mappaint.auto_reload_local_styles", true) && source.isLocal()) {
-                File f = new File(source.url);
-                source.setLastMTime(f.lastModified());
-            }
-            if (Main.isDebugEnabled()) {
-                final long elapsedTime = System.currentTimeMillis() - startTime;
-                Main.debug("Initializing map style " + source.url + " completed in " + Utils.getDurationString(elapsedTime));
-            }
+            loadStyleForFirstTime(source);
         }
         fireMapPaintSylesUpdated();
+    }
+
+    private static void loadStyleForFirstTime(StyleSource source) {
+        final long startTime = System.currentTimeMillis();
+        source.loadStyleSource();
+        if (Main.pref.getBoolean("mappaint.auto_reload_local_styles", true) && source.isLocal()) {
+            try {
+                Main.fileWatcher.registerStyleSource(source);
+            } catch (IOException e) {
+                Main.error(e);
+            }
+        }
+        if (Main.isDebugEnabled()) {
+            final long elapsedTime = System.currentTimeMillis() - startTime;
+            Main.debug("Initializing map style " + source.url + " completed in " + Utils.getDurationString(elapsedTime));
+        }
     }
 
@@ -287 +293 @@
     public static class MapPaintStyleLoader extends PleaseWaitRunnable {
         private boolean canceled;
-        private List<StyleSource> sources;
-
-        public MapPaintStyleLoader(List<StyleSource> sources) {
+        private Collection<StyleSource> sources;
+
+        public MapPaintStyleLoader(Collection<StyleSource> sources) {
             super(tr("Reloading style sources"));
             this.sources = sources;
@@ -385 +391 @@
         if (source != null) {
             styles.add(source);
-            source.loadStyleSource();
+            loadStyleForFirstTime(source);
             MapPaintPrefHelper.INSTANCE.put(styles.getStyleSources());
             fireMapPaintSylesUpdated();

trunk/src/org/openstreetmap/josm/gui/mappaint/StyleSource.java

@@ -34 +34 @@
 
     private ImageIcon imageIcon;
-    private long lastMTime = 0L;
 
     /******
@@ -81 +80 @@
      */
     public abstract InputStream getSourceInputStream() throws IOException;
-    
+
     /**
      * Returns a new {@code MirroredInputStream} to the local file containing style source (can be a text file or an archive).
@@ -156 +155 @@
         return null;
     }
-
-    public long getLastMTime() {
-        return lastMTime;
-    }
-
-    public void setLastMTime(long lastMTime) {
-        this.lastMTime = lastMTime;
-    }
 }