Changeset 18866 in josm for trunk/src/org/openstreetmap

Timestamp:

2023-10-12T17:42:13+02:00 (9 months ago)

Author:

taylor.smock

Message:

Fix #23196: DataIntegrityProblemException: Primitive must be part of the dataset

It turns out that FilterModel doesn't care whether a primitive's referrers are
in the dataset or not.

This additionally adds a non-regression test and modifies WindowMocker to cover
some more headless exceptions. This additionally lets us stop mocking
ExtendedDialog#setupDialog.

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/FilterModel.java (modified) (1 diff)
• gui/tagging/presets/TaggingPreset.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/osm/FilterModel.java

@@ -440 +440 @@
             }
 
-            for (OsmPrimitive ref: p.getReferrers()) {
+            for (OsmPrimitive ref: p.getReferrers(true)) {
                 stack.push(ref);
             }

trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPreset.java

@@ -85 +85 @@
  * read in all predefined presets, either shipped with JOSM or that are
  * in the config directory.
- *
+ * <p>
  * It is also able to construct dialogs out of preset definitions.
  * @since 294
@@ -405 +405 @@
             /**
              * This hack allows the items to have their own orientation.
-             *
+             * <p>
              * The problem is that
              * {@link org.openstreetmap.josm.gui.ExtendedDialog#showDialog ExtendedDialog} calls
              * {@code applyComponentOrientation} very late in the dialog construction process thus
              * overwriting the orientation the components have chosen for themselves.
-             *
+             * <p>
              * This stops the propagation of {@code applyComponentOrientation}, thus all
              * {@code TaggingPresetItem}s may (and have to) set their own orientation.
@@ -446 +446 @@
 
         if (selected.size() == 1 && Boolean.TRUE.equals(USE_VALIDATOR.get())) {
-            // Fail early -- validateAsync requires the primitive(s) to be part of a dataset. Failing later in validateAsync ''does not'' give us
-            // a usable stack trace. See #21829 for details.
-            selected.forEach(OsmPrimitive::checkDataset);
             itemGuiSupport.addListener((source, key, newValue) ->
                     TaggingPresetValidation.validateAsync(selected.iterator().next(), validationLabel, getChangedTags()));