Changeset 6436 in josm for trunk/src

Timestamp:

2013-12-04T21:40:03+01:00 (10 years ago)

Author:

Don-vip

Message:

fix #9362 - Validator dialog not filled with warning messages after cancelling the upload popup window

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/upload/ValidateUploadHook.java (modified) (2 diffs)
• gui/dialogs/ValidatorDialog.java (modified) (1 diff)
• gui/layer/OsmDataLayer.java (modified) (1 diff)

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

@@ -23 +23 @@
 import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.gui.dialogs.validator.ValidatorTreePanel;
+import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.preferences.ValidatorPreference;
 import org.openstreetmap.josm.gui.widgets.HtmlPanel;
@@ -71 +72 @@
         }
         tests = null;
+        OsmDataLayer editLayer = Main.main.getEditLayer();
+        editLayer.validationErrors.clear();
+        editLayer.validationErrors.addAll(errors);
         Main.map.validatorDialog.tree.setErrors(errors);
         if (errors == null || errors.isEmpty())

trunk/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java

@@ -374 +374 @@
                 hasFixes = hasFixes || error.isFixable();
                 if (addSelected) {
-                    //                    sel.addAll(error.getPrimitives()); // was selecting already deleted primitives! see #6640
                     sel.addAll(error.getSelectablePrimitives());
                 }

trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

@@ -99 +99 @@
     private int highlightUpdateCount;
 
-    public List<TestError> validationErrors = new ArrayList<TestError>();
+    /**
+     * List of validation errors in this layer.
+     * @since 3669
+     */
+    public final List<TestError> validationErrors = new ArrayList<TestError>();
 
     protected void setRequiresSaveToFile(boolean newValue) {