Ticket #16355: ignored_validation_reappearing.patch

File ignored_validation_reappearing.patch, 2.0 KB (added by bhatchl, 6 years ago)

patch file fixing ignored validation finding reappearing

  • src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java 

    From 35678ff26151991d6492eea2a3d41f589392f6cc Mon Sep 17 00:00:00 2001
From: Brian Hatchl <brian.hatchl@radiantsolutions.com>
Date: Fri, 1 Jun 2018 16:23:33 -0400
Subject: [PATCH] set ignored errors before updating layer validation errors
 and dialog

---
 .../josm/actions/upload/ValidateUploadHook.java    | 24 ++++++++++++----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java b/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java
index c8d4f65..3948c89 100644
    a b public class ValidateUploadHook implements UploadHook {  
    7373                }
    7474            }
    7575        }
    76         OsmDataLayer editLayer = MainApplication.getLayerManager().getEditLayer();
    77         if (editLayer != null) {
    78             editLayer.validationErrors.clear();
    79             editLayer.validationErrors.addAll(errors);
    80         }
    81         MapFrame map = MainApplication.getMap();
    82         if (map != null) {
    83             map.validatorDialog.tree.setErrors(errors);
    84         }
    85         if (errors.isEmpty())
    86             return true;
    8776
    8877        if (ValidatorPrefHelper.PREF_USE_IGNORE.get()) {
    8978            int nume = 0;
    … … public class ValidateUploadHook implements UploadHook {  
    10493            if (nume == 0)
    10594                return true;
    10695        }
     96
     97        OsmDataLayer editLayer = MainApplication.getLayerManager().getEditLayer();
     98        if (editLayer != null) {
     99            editLayer.validationErrors.clear();
     100            editLayer.validationErrors.addAll(errors);
     101        }
     102        MapFrame map = MainApplication.getMap();
     103        if (map != null) {
     104            map.validatorDialog.tree.setErrors(errors);
     105        }
     106        if (errors.isEmpty())
     107            return true;
     108
    107109        return displayErrorScreen(errors);
    108110    }
    109111