Changeset 18908 in josm for trunk/src/org

Timestamp:

2023-12-13T16:54:29+01:00 (10 months ago)

Author:

taylor.smock

Message:

Fix #23341: Don't set paintstyles to nothing when paintstyles haven't been modified by the user

The original fix (r18907) was a short-term fix that reset paintstyles to the
default if the list was empty. This is not ideal, since people who have
deliberately made their paintstyle list empty now have to clear it every time
JOSM starts.

This patch fixes that by only attempting to remove potlatch2 if the user has
previously modified the painstyle list. The previous patch was necessary to get
most users back to a "known good" state, especially those that have never used
the style settings.

File:

• trunk/src/org/openstreetmap/josm/data/Preferences.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/Preferences.java

@@ -918 +918 @@
      */
     private void updateMapPaintKnownDefaults() {
+        final String mapPaintStyleEntriesPrefEntry = "mappaint.style.entries";
         final String url = "url";
         final String active = "active";
@@ -933 +934 @@
         putList("mappaint.style.known-defaults", knownDefaults);
 
+        // If the user hasn't set the entries, don't go through the removal process for potlatch 2. There is an issue
+        // where it may clear all paintstyles (done when the user has never touched the style settings).
+        if (!this.settingsMap.containsKey(mapPaintStyleEntriesPrefEntry)) {
+            return;
+        }
         // Replace potlatch2 in the current style entries, but only if it is enabled. Otherwise, remove it.
-        final List<Map<String, String>> styleEntries = new ArrayList<>(getListOfMaps("mappaint.style.entries"));
+        final List<Map<String, String>> styleEntries = new ArrayList<>(getListOfMaps(mapPaintStyleEntriesPrefEntry));
         final boolean potlatchEnabled = styleEntries.stream().filter(map -> potlatch2.equals(map.get(url)))
                 .anyMatch(map -> Boolean.parseBoolean(map.get(active)));
@@ -946 +952 @@
             }
         }
-        putListOfMaps("mappaint.style.entries", styleEntries.isEmpty() ? null : styleEntries);
+        putListOfMaps(mapPaintStyleEntriesPrefEntry, styleEntries);
     }