Changeset 17651 in josm for trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPreset.java

Timestamp:

2021-03-23T23:31:56+01:00 (3 years ago)

Author:

simon04

Message:

see #19078 - Preset preference: extract property constants

File:

• trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPreset.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPreset.java

@@ -52 +52 @@
 import org.openstreetmap.josm.data.osm.search.SearchCompiler.Match;
 import org.openstreetmap.josm.data.osm.search.SearchParseError;
+import org.openstreetmap.josm.data.preferences.BooleanProperty;
 import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.gui.MainApplication;
@@ -67 +68 @@
 import org.openstreetmap.josm.gui.tagging.presets.items.Space;
 import org.openstreetmap.josm.gui.util.GuiHelper;
-import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -100 +100 @@
 
     /**
+     * Defines whether the validator should be active in the preset dialog
+     * @see TaggingPresetValidation
+     */
+    public static final BooleanProperty USE_VALIDATOR = new BooleanProperty("taggingpreset.validator", false);
+
+    /**
      * The preset group this preset belongs to.
      */
@@ -228 +234 @@
         }
         File arch = TaggingPresetReader.getZipIcons();
-        final Collection<String> s = Config.getPref().getList("taggingpreset.icon.sources", null);
+        final Collection<String> s = TaggingPresets.ICON_SOURCES.get();
         this.iconFuture = new CompletableFuture<>();
         new ImageProvider(iconName)
@@ -359 +365 @@
         }
 
-        if (selected.size() == 1 && Config.getPref().getBoolean("taggingpreset.validator", false)) {
+        if (selected.size() == 1 && USE_VALIDATOR.get()) {
             itemGuiSupport.addListener((source, key, newValue) ->
                     TaggingPresetValidation.validateAsync(selected.iterator().next(), validationLabel, getChangedTags()));