Changeset 17643 in josm for trunk/src/org

Timestamp:

2021-03-23T00:47:37+01:00 (4 years ago)

Author:

simon04

Message:

see #19078 - Presets: validate user input (using MapCSSTagChecker, OpeningHourTest)

This feature is disabled by default and can be activated by setting the advanced preference taggingpreset.validator to true.

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/validation/tests/OpeningHourTest.java (modified) (1 diff)
• gui/tagging/presets/TaggingPreset.java (modified) (2 diffs)
• gui/tagging/presets/TaggingPresetValidation.java (added)

trunk/src/org/openstreetmap/josm/data/validation/tests/OpeningHourTest.java

@@ -125 +125 @@
     @Override
     public void check(final OsmPrimitive p) {
+        addErrorsForPrimitive(p, this.errors);
+    }
+
+    /**
+     * Checks the tags of the given primitive and adds validation errors to the given list.
+     * @param p The primitive to test
+     * @param errors The list to add validation errors to
+     * @since 17643
+     */
+    public void addErrorsForPrimitive(OsmPrimitive p, Collection<TestError> errors) {
         if (p.isTagged()) {
             for (String key : KEYS_TO_CHECK) {

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

@@ -317 +317 @@
             pp.add(label);
         }
+        JLabel validationLabel = new JLabel(ImageProvider.get("warning-small", ImageProvider.ImageSizes.LARGEICON));
+        validationLabel.setVisible(false);
+        pp.add(validationLabel);
+
         final int count = pp.getComponentCount();
         if (preset_name_label) {
@@ -353 +357 @@
         if (selected.isEmpty() && !supportsRelation()) {
             GuiHelper.setEnabledRec(items, false);
+        }
+
+        if (selected.size() == 1 && Config.getPref().getBoolean("taggingpreset.validator", false)) {
+            itemGuiSupport.addListener((source, key, newValue) ->
+                    TaggingPresetValidation.validateAsync(selected.iterator().next(), validationLabel, getChangedTags()));
         }