Changeset 14977 in josm for trunk/src/org/openstreetmap/josm/data/Preferences.java

Timestamp:

2019-04-09T01:32:56+02:00 (5 years ago)

Author:

Don-vip

Message:

ensures consistency of upload comment:

• fix #11168 - ctrl-z/undo could reset unwanted old changeset comment
• fix #13474 - selecting "new changeset" after having entered a changeset comment did reset it to the previous value
• fix #17452 - ctrl-enter while typing a changeset comment did upload with the previous value
• fix behaviour of upload.comment.max-age: values were reset after 5 months instead of intended 4 hours because seconds were compared to milliseconds
• avoid creation of unneeded undo/redo internal classes for non-editable text fields
• ensures consistency of upload dialog if upload.comment properties are modified manually from advanced preferences
• add a source attribute to preference events to know which class modified the preference entry
• refactor reflection utils

File:

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

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

@@ -16 +16 @@
 import java.nio.file.InvalidPathException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
@@ -44 +45 @@
 import org.openstreetmap.josm.spi.preferences.AbstractPreferences;
 import org.openstreetmap.josm.spi.preferences.Config;
+import org.openstreetmap.josm.spi.preferences.DefaultPreferenceChangeEvent;
 import org.openstreetmap.josm.spi.preferences.IBaseDirectories;
 import org.openstreetmap.josm.spi.preferences.ListSetting;
+import org.openstreetmap.josm.spi.preferences.PreferenceChangeEvent;
 import org.openstreetmap.josm.spi.preferences.Setting;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
@@ -51 +54 @@
 import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.PlatformManager;
+import org.openstreetmap.josm.tools.ReflectionUtils;
 import org.openstreetmap.josm.tools.Utils;
 import org.xml.sax.SAXException;
@@ -120 +124 @@
 
     /**
+     * Preferences classes calling directly the method {@link #putSetting(String, Setting)}.
+     * This collection allows us to exclude them when searching the business class who set a preference.
+     * The found class is used as event source when notifying event listeners.
+     */
+    private static final Collection<Class<?>> preferencesClasses = Arrays.asList(
+            Preferences.class, PreferencesUtils.class, AbstractPreferences.class);
+
+    /**
      * Constructs a new {@code Preferences}.
      */
@@ -216 +228 @@
 
     protected void firePreferenceChanged(String key, Setting<?> oldValue, Setting<?> newValue) {
-        final org.openstreetmap.josm.spi.preferences.PreferenceChangeEvent evt =
-                new org.openstreetmap.josm.spi.preferences.DefaultPreferenceChangeEvent(key, oldValue, newValue);
+        final PreferenceChangeEvent evt =
+                new DefaultPreferenceChangeEvent(ReflectionUtils.findCallerClass(preferencesClasses), key, oldValue, newValue);
         listeners.fireEvent(listener -> listener.preferenceChanged(evt));