Changeset 16562 in josm for trunk

Timestamp:

2020-06-07T18:40:25+02:00 (4 years ago)

Author:

simon04

Message:

fix #19196 - Don't require a restart when a MapPaint color is changed (patch by taylor.smock)

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• mappaint/MapPaintStyles.java (modified) (3 diffs)
• preferences/display/ColorPreference.java (modified) (1 diff)

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

@@ -24 +24 @@
 import org.openstreetmap.josm.io.FileWatcher;
 import org.openstreetmap.josm.spi.preferences.Config;
+import org.openstreetmap.josm.spi.preferences.IPreferences;
+import org.openstreetmap.josm.spi.preferences.PreferenceChangeEvent;
+import org.openstreetmap.josm.spi.preferences.PreferenceChangedListener;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.ListenerList;
@@ -45 +48 @@
     private static final ListenerList<MapPaintSylesUpdateListener> listeners = ListenerList.createUnchecked();
 
+    private static final class MapPaintStylesPreferenceListener implements PreferenceChangedListener {
+        private final IPreferences pref;
+
+        MapPaintStylesPreferenceListener(IPreferences pref) {
+            this.pref = pref;
+        }
+
+        @Override
+        public void preferenceChanged(PreferenceChangeEvent e) {
+            if (e.getKey().contains("mappaint")) {
+                // We need to remove this from the listeners, so that we don't recursively call ourselves.
+                pref.removePreferenceChangeListener(this);
+                MapPaintStyles.readFromPreferences();
+                pref.addPreferenceChangeListener(this);
+            }
+        }
+    }
+
     static {
         listeners.addListener(new MapPaintSylesUpdateListener() {
@@ -57 +78 @@
             }
         });
+        Config.getPref().addPreferenceChangeListener(new MapPaintStylesPreferenceListener(Config.getPref()));
     }
 

trunk/src/org/openstreetmap/josm/gui/preferences/display/ColorPreference.java

@@ -391 +391 @@
     @Override
     public boolean ok() {
-        boolean ret = false;
         for (ColorEntry d : tableModel.getDeleted()) {
             d.toProperty().remove();
         }
         for (ColorEntry e : tableModel.getData()) {
-            if (e.info.getValue() != null && e.toProperty().put(e.info.getValue())
-                    && NamedColorProperty.COLOR_CATEGORY_MAPPAINT.equals(e.info.getCategory())) {
-                ret = true;
+            if (e.info.getValue() != null) {
+                e.toProperty().put(e.info.getValue());
             }
         }
         OsmDataLayer.createHatchTexture();
-        return ret;
+        return false;
     }