Changeset 19000 in josm for trunk

Timestamp:

2024-02-29T07:48:30+01:00 (10 months ago)

Author:

GerdP

Message:

fix #23519: Don't automatically enlarge "Validation Results" panel

• implement new preference validator.force.unfurl.window with default value true, if set to false the window is not unfurled
• code cleanup to remove duplicate or obsolete code

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/upload/ValidateUploadHook.java (modified) (2 diffs)
• data/preferences/sources/ValidatorPrefHelper.java (modified) (1 diff)
• data/validation/ValidationTask.java (modified) (2 diffs)
• gui/dialogs/ValidatorDialog.java (modified) (1 diff)

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

@@ -22 +22 @@
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.dialogs.validator.ValidatorTreePanel;
-import org.openstreetmap.josm.gui.layer.ValidatorLayer;
 import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.gui.widgets.HtmlPanel;
@@ -106 +105 @@
         GuiHelper.destroyComponents(ed, false);
         ed.dispose();
-        if (rc != 1) {
-            OsmValidator.initializeTests();
-            OsmValidator.initializeErrorLayer();
-            MainApplication.getMap().validatorDialog.unfurlDialog();
-            MainApplication.getLayerManager().getLayersOfType(ValidatorLayer.class).forEach(ValidatorLayer::invalidate);
-            return false;
-        }
-        return true;
+        return rc == 1;
     }
 }

trunk/src/org/openstreetmap/josm/data/preferences/sources/ValidatorPrefHelper.java

@@ -72 +72 @@
 
     /**
+     * See #23519
+     * The preferences key for the automatic unfurl of the validation result window
+     *
+     */
+    public static final BooleanProperty PREF_UNFURL = new BooleanProperty(PREFIX + ".force.unfurl.window", true);
+
+    /**
      * Constructs a new {@code PresetPrefHelper}.
      */

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

@@ -24 +24 @@
 import org.openstreetmap.josm.gui.Notification;
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
-import org.openstreetmap.josm.gui.layer.ValidatorLayer;
+import org.openstreetmap.josm.gui.dialogs.ValidatorDialog;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 import org.openstreetmap.josm.gui.progress.swing.PleaseWaitProgressMonitor;
@@ -143 +143 @@
                 if (!map.validatorDialog.isShowing() && errors.isEmpty() && beforeUpload)
                     return;
-                map.validatorDialog.unfurlDialog();
+                if (Boolean.TRUE.equals(ValidatorPrefHelper.PREF_UNFURL.get()))
+                    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);
+                ValidatorDialog.invalidateValidatorLayers();
                 if (!errors.isEmpty()) {
                     OsmValidator.initializeErrorLayer();

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

@@ -702 +702 @@
     }
 
-    private static void invalidateValidatorLayers() {
+    /**
+     * Invalidate the error layer
+     */
+    public static void invalidateValidatorLayers() {
         MainApplication.getLayerManager().getLayersOfType(ValidatorLayer.class).forEach(ValidatorLayer::invalidate);
     }