Ticket #19196: 19196.2.patch

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

@@ -23 +23 @@
 import org.openstreetmap.josm.io.CachedFile;
 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;
 import org.openstreetmap.josm.tools.Logging;
@@ -44 +47 @@
 
     private static final ListenerList<MapPaintSylesUpdateListener> listeners = ListenerList.createUnchecked();
 
+    private static final class MapPaintStylesPreferenceListener implements PreferenceChangedListener {
+        private IPreferences pref;
+        public 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() {
             @Override
@@ -56 +76 @@
                 mapPaintStylesUpdated();
             }
         });
+        Config.getPref().addPreferenceChangeListener(new MapPaintStylesPreferenceListener(Config.getPref()));
     }
 
     private static ElemStyles styles = new ElemStyles();

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

@@ -390 +390 @@
 
     @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;
     }
 
     @Override