Changeset 12825 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2017-09-11T20:43:41+02:00 (7 years ago)

Author:

Don-vip

Message:

see #15229 - see #15182 - make FileWatcher generic so it has no more dependence on MapCSS

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• MainApplication.java (modified) (5 diffs)
• mappaint/MapPaintStyles.java (modified) (1 diff)
• mappaint/StyleSource.java (modified) (2 diffs)
• mappaint/loader/MapPaintStyleLoader.java (modified) (2 diffs)
• preferences/SourceEditor.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/MainApplication.java

@@ -88 +88 @@
 import org.openstreetmap.josm.data.osm.UserInfo;
 import org.openstreetmap.josm.data.osm.search.SearchMode;
+import org.openstreetmap.josm.data.preferences.sources.SourceType;
 import org.openstreetmap.josm.data.projection.ProjectionCLI;
 import org.openstreetmap.josm.data.projection.datum.NTV2GridShiftFileSource;
@@ -93 +94 @@
 import org.openstreetmap.josm.data.projection.datum.NTV2Proj4DirGridShiftFileSource;
 import org.openstreetmap.josm.data.validation.OsmValidator;
+import org.openstreetmap.josm.data.validation.tests.MapCSSTagChecker;
 import org.openstreetmap.josm.gui.ProgramArguments.Option;
 import org.openstreetmap.josm.gui.SplashScreen.SplashProgressMonitor;
@@ -110 +112 @@
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.layer.TMSLayer;
+import org.openstreetmap.josm.gui.mappaint.loader.MapPaintStyleLoader;
 import org.openstreetmap.josm.gui.oauth.OAuthAuthorizationWizard;
 import org.openstreetmap.josm.gui.preferences.ToolbarPreferences;
@@ -126 +129 @@
 import org.openstreetmap.josm.io.CertificateAmendment;
 import org.openstreetmap.josm.io.DefaultProxySelector;
+import org.openstreetmap.josm.io.FileWatcher;
 import org.openstreetmap.josm.io.MessageNotifier;
 import org.openstreetmap.josm.io.OnlineResource;
@@ -1094 +1098 @@
         MessageNotifier.setNotifierCallback(MainApplication::notifyNewMessages);
         DeleteCommand.setDeletionCallback(DeleteAction.defaultDeletionCallback);
+        FileWatcher.registerLoader(SourceType.MAP_PAINT_STYLE, MapPaintStyleLoader::reloadStyle);
+        FileWatcher.registerLoader(SourceType.TAGCHECKER_RULE, MapCSSTagChecker::reloadRule);
         OsmUrlToBounds.setMapSizeSupplier(() -> {
             if (isDisplayingMapView()) {

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

@@ -301 +301 @@
         if (Main.pref.getBoolean("mappaint.auto_reload_local_styles", true) && source.isLocal()) {
             try {
-                Main.fileWatcher.registerStyleSource(source);
+                Main.fileWatcher.registerSource(source);
             } catch (IOException | IllegalStateException | IllegalArgumentException e) {
                 Logging.error(e);

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

@@ -22 +22 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.preferences.sources.SourceEntry;
+import org.openstreetmap.josm.data.preferences.sources.SourceType;
 import org.openstreetmap.josm.gui.mappaint.MapPaintStyles.IconReference;
 import org.openstreetmap.josm.io.CachedFile;
@@ -70 +71 @@
      */
     public StyleSource(String url, String name, String title) {
-        super(url, name, title, true);
+        super(SourceType.MAP_PAINT_STYLE, url, name, title, true);
     }
 

trunk/src/org/openstreetmap/josm/gui/mappaint/loader/MapPaintStyleLoader.java

@@ -6 +6 @@
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 
+import org.openstreetmap.josm.data.preferences.sources.SourceEntry;
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
@@ -67 +69 @@
         MainApplication.worker.submit(new MapPaintStyleLoader(toReload));
     }
+
+    /**
+     * Reload style.
+     * @param style {@link StyleSource} to reload
+     * @throws IllegalArgumentException if {@code style} is not a {@code StyleSource} instance
+     * @since 12825
+     */
+    public static void reloadStyle(SourceEntry style) {
+        if (style instanceof StyleSource) {
+            MainApplication.worker.submit(new MapPaintStyleLoader(Collections.singleton((StyleSource) style)));
+        } else {
+            throw new IllegalArgumentException(style + " is not a StyleSource");
+        }
+    }
 }

trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java

@@ -741 +741 @@
             if (sources == null) return;
             for (ExtendedSourceEntry info: sources) {
-                data.add(new SourceEntry(info.url, info.name, info.getDisplayName(), true));
+                data.add(new SourceEntry(info.type, info.url, info.name, info.getDisplayName(), true));
             }
             fireTableDataChanged();
@@ -969 +969 @@
                     active = editEntryDialog.active();
                 }
-                final SourceEntry entry = new SourceEntry(
+                final SourceEntry entry = new SourceEntry(sourceType,
                         editEntryDialog.getURL(),
                         null, editEntryDialog.getTitle(), active);
@@ -1509 +1509 @@
                         Matcher m = Pattern.compile("^(.+);(.+)$").matcher(line);
                         if (m.matches()) {
-                            last = new ExtendedSourceEntry(m.group(1), m.group(2));
+                            last = new ExtendedSourceEntry(sourceType, m.group(1), m.group(2));
                             sources.add(last);
                         } else {