Changeset 12296 in josm for trunk/src/org

Timestamp:

2017-06-01T16:58:05+02:00 (7 years ago)

Author:

bastiK

Message:

respect default preferences when writing preset/style/rule entries

This fixes request for restart with fresh preferences despite no changes in the preferences window.

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java (modified) (1 diff)

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

@@ -1824 +1824 @@
          */
         public boolean put(Collection<? extends SourceEntry> entries) {
+            Collection<Map<String, String>> setting = serializeList(entries);
+            boolean unset = Main.pref.getListOfStructs(pref, (Collection<Map<String, String>>) null) == null;
+            if (unset) {
+                Collection<Map<String, String>> def = serializeList(getDefault());
+                if (setting.equals(def))
+                    return false;
+            }
+            return Main.pref.putListOfStructs(pref, setting);
+        }
+
+        private Collection<Map<String, String>> serializeList(Collection<? extends SourceEntry> entries) {
             Collection<Map<String, String>> setting = new ArrayList<>(entries.size());
             for (SourceEntry e : entries) {
                 setting.add(serialize(e));
             }
-            return Main.pref.putListOfStructs(pref, setting);
+            return setting;
         }