Changeset 16091 in josm

Timestamp:

2020-03-08T20:32:18+01:00 (5 years ago)

Author:

Don-vip

Message:

fix #18658 - Don't create empty validator layer

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/ValidateAction.java (modified) (4 diffs)
• data/validation/OsmValidator.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/ValidateAction.java

@@ -68 +68 @@
 
         OsmValidator.initializeTests();
-        OsmValidator.initializeErrorLayer();
 
         Collection<Test> tests = OsmValidator.getEnabledTests(false);
@@ -144 +143 @@
                 map.validatorDialog.unfurlDialog();
                 map.validatorDialog.tree.setErrors(errors);
-                //FIXME: nicer way to find / invalidate the corresponding error layer
-                MainApplication.getLayerManager().getLayersOfType(ValidatorLayer.class).forEach(ValidatorLayer::invalidate);
+                if (!errors.isEmpty()) {
+                    //FIXME: nicer way to find / invalidate the corresponding error layer
+                    OsmValidator.initializeErrorLayer();
+                    MainApplication.getLayerManager().getLayersOfType(ValidatorLayer.class).forEach(ValidatorLayer::invalidate);
+                }
             });
         }
@@ -154 +156 @@
             if (tests == null || tests.isEmpty())
                 return;
-            errors = new ArrayList<>(200);
+            errors = new ArrayList<>();
             getProgressMonitor().setTicksCount(tests.size() * validatedPrimitives.size());
             int testCounter = 0;
@@ -171 +173 @@
             }
             tests = null;
-            if (ValidatorPrefHelper.PREF_USE_IGNORE.get()) {
+            if (Boolean.TRUE.equals(ValidatorPrefHelper.PREF_USE_IGNORE.get())) {
                 getProgressMonitor().setCustomText("");
                 getProgressMonitor().subTask(tr("Updating ignored errors ..."));

trunk/src/org/openstreetmap/josm/data/validation/OsmValidator.java

@@ -486 +486 @@
      */
     public static synchronized void initializeErrorLayer() {
-        if (!ValidatorPrefHelper.PREF_LAYER.get())
-            return;
-        if (errorLayer == null) {
+        if (errorLayer == null && Boolean.TRUE.equals(ValidatorPrefHelper.PREF_LAYER.get())) {
             errorLayer = new ValidatorLayer();
             MainApplication.getLayerManager().addLayer(errorLayer);