- Timestamp:
- 2024-02-29T07:48:30+01:00 (9 months ago)
- Location:
- trunk/src/org/openstreetmap/josm
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java
r18960 r19000 22 22 import org.openstreetmap.josm.gui.MainApplication; 23 23 import org.openstreetmap.josm.gui.dialogs.validator.ValidatorTreePanel; 24 import org.openstreetmap.josm.gui.layer.ValidatorLayer;25 24 import org.openstreetmap.josm.gui.util.GuiHelper; 26 25 import org.openstreetmap.josm.gui.widgets.HtmlPanel; … … 106 105 GuiHelper.destroyComponents(ed, false); 107 106 ed.dispose(); 108 if (rc != 1) { 109 OsmValidator.initializeTests(); 110 OsmValidator.initializeErrorLayer(); 111 MainApplication.getMap().validatorDialog.unfurlDialog(); 112 MainApplication.getLayerManager().getLayersOfType(ValidatorLayer.class).forEach(ValidatorLayer::invalidate); 113 return false; 114 } 115 return true; 107 return rc == 1; 116 108 } 117 109 } -
trunk/src/org/openstreetmap/josm/data/preferences/sources/ValidatorPrefHelper.java
r18960 r19000 72 72 73 73 /** 74 * See #23519 75 * The preferences key for the automatic unfurl of the validation result window 76 * 77 */ 78 public static final BooleanProperty PREF_UNFURL = new BooleanProperty(PREFIX + ".force.unfurl.window", true); 79 80 /** 74 81 * Constructs a new {@code PresetPrefHelper}. 75 82 */ -
trunk/src/org/openstreetmap/josm/data/validation/ValidationTask.java
r18964 r19000 24 24 import org.openstreetmap.josm.gui.Notification; 25 25 import org.openstreetmap.josm.gui.PleaseWaitRunnable; 26 import org.openstreetmap.josm.gui. layer.ValidatorLayer;26 import org.openstreetmap.josm.gui.dialogs.ValidatorDialog; 27 27 import org.openstreetmap.josm.gui.progress.ProgressMonitor; 28 28 import org.openstreetmap.josm.gui.progress.swing.PleaseWaitProgressMonitor; … … 143 143 if (!map.validatorDialog.isShowing() && errors.isEmpty() && beforeUpload) 144 144 return; 145 map.validatorDialog.unfurlDialog(); 145 if (Boolean.TRUE.equals(ValidatorPrefHelper.PREF_UNFURL.get())) 146 map.validatorDialog.unfurlDialog(); 146 147 map.validatorDialog.tree.setErrors(errors); 147 148 //FIXME: nicer way to find / invalidate the corresponding error layer 148 MainApplication.getLayerManager().getLayersOfType(ValidatorLayer.class).forEach(ValidatorLayer::invalidate);149 ValidatorDialog.invalidateValidatorLayers(); 149 150 if (!errors.isEmpty()) { 150 151 OsmValidator.initializeErrorLayer(); -
trunk/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java
r18952 r19000 702 702 } 703 703 704 private static void invalidateValidatorLayers() { 704 /** 705 * Invalidate the error layer 706 */ 707 public static void invalidateValidatorLayers() { 705 708 MainApplication.getLayerManager().getLayersOfType(ValidatorLayer.class).forEach(ValidatorLayer::invalidate); 706 709 }
Note:
See TracChangeset
for help on using the changeset viewer.