Changeset 14532 in josm

Timestamp:

2018-12-09T15:46:38+01:00 (5 years ago)

Author:

Don-vip

Message:

see #16073 - avoid spurious warnings

File:

• trunk/src/org/openstreetmap/josm/gui/layer/imagery/TileSourceDisplaySettings.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/imagery/TileSourceDisplaySettings.java

@@ -39 +39 @@
 
     /**
-     * A string returned by {@link DisplaySettingsChangeEvent#getChangedSetting()} if the sow errors property was changed.
+     * A string returned by {@link DisplaySettingsChangeEvent#getChangedSetting()} if the show errors property was changed.
      * @see TileSourceDisplaySettings#isShowErrors()
      */
@@ -91 +91 @@
 
     private TileSourceDisplaySettings(String... prefixes) {
-        autoZoom = getProperty(prefixes, "default_autozoom");
-        autoLoad = getProperty(prefixes, "default_autoload");
-        showErrors = getProperty(prefixes, "default_showerrors");
-    }
-
-    private static boolean getProperty(String[] prefixes, String name) {
+        autoZoom = getProperty(prefixes, "default_autozoom", PROP_AUTO_ZOOM.getDefaultValue());
+        autoLoad = getProperty(prefixes, "default_autoload", PROP_AUTO_LOAD.getDefaultValue());
+        showErrors = getProperty(prefixes, "default_showerrors", Boolean.TRUE);
+    }
+
+    private static boolean getProperty(String[] prefixes, String name, Boolean def) {
         // iterate through all values to force the preferences to receive the default value.
         // we only support a default value of true.
@@ -103 +103 @@
             String key = p + "." + name;
             boolean currentValue = Config.getPref().getBoolean(key, true);
-            if (!Config.getPref().get(key).isEmpty()) {
+            if (!Config.getPref().get(key, def.toString()).isEmpty()) {
                 value = currentValue;
             }