Changeset 6331 in josm for trunk/src/org/openstreetmap/josm/actions/upload

Timestamp:

2013-10-27T02:38:21+01:00 (10 years ago)

Author:

Don-vip

Message:

fix #9205 - validation run on upload is not updating validation window when there is no error

File:

• trunk/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java (modified) (4 diffs)

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

@@ -34 +34 @@
  *
  * @author frsantos
+ * @since 3669
  */
-public class ValidateUploadHook implements UploadHook
-{
-    /** Serializable ID */
-    private static final long serialVersionUID = -2304521273582574603L;
-
+public class ValidateUploadHook implements UploadHook {
+    
     /**
      * Validate the modified data before uploading
@@ -62 +60 @@
             test.endTest();
             if (Main.pref.getBoolean(ValidatorPreference.PREF_OTHER, false) &&
-                Main.pref.getBoolean(ValidatorPreference.PREF_OTHER_UPLOAD, false))
-            {
-                errors.addAll( test.getErrors() );
-            }
-            else {
+                Main.pref.getBoolean(ValidatorPreference.PREF_OTHER_UPLOAD, false)) {
+                errors.addAll(test.getErrors());
+            } else {
                 for (TestError e : test.getErrors()) {
                     if (e.getSeverity() != Severity.OTHER) {
@@ -75 +71 @@
         }
         tests = null;
+        Main.map.validatorDialog.tree.setErrors(errors);
         if (errors == null || errors.isEmpty())
             return true;
@@ -141 +138 @@
         ed.showDialog();
 
-        if(ed.getValue() != 1) {
+        if (ed.getValue() != 1) {
             OsmValidator.initializeErrorLayer();
             Main.map.validatorDialog.unfurlDialog();
-            Main.map.validatorDialog.tree.setErrors(errors);
             Main.main.getCurrentDataSet().fireSelectionChanged();
             return false;