Changeset 19160 in josm

Timestamp:

2024-07-30T15:13:18+02:00 (4 months ago)

Author:

taylor.smock

Message:

Fix #23825: UI appears to freeze when a multi-select option is used

There are two problems fixed here:

1. The ListSelectionListener gets called twice; this is fixed by waiting for the list value to stop changing.
2. The act of applyChangeTags clones any primitive that might be affected by the tag change of the primitive. This can get pretty expensive if relations are involved. This is fixed by cloning the primitive in a different thread.

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/tagging/presets/TaggingPresetValidation.java (modified) (1 diff)
• gui/tagging/presets/items/MultiSelect.java (modified) (1 diff)
• io/CertificateAmendment.java (modified) (1 diff)

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

@@ -45 +45 @@
      */
     static void validateAsync(OsmPrimitive original, JLabel validationLabel, List<Tag> changedTags) {
-        OsmPrimitive primitive = applyChangedTags(original, changedTags);
-        MainApplication.worker.execute(() -> validate(primitive, validationLabel));
+        MainApplication.worker.execute(() -> {
+            // applyChangedTags can be very expensive if a relation gets involved, so it must be done in
+            // a separate thread. This is becuase it clones all potentially affected objects.
+            OsmPrimitive primitive = applyChangedTags(original, changedTags);
+            validate(primitive, validationLabel);
+        });
     }
 

trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/MultiSelect.java

@@ -95 +95 @@
         p.add(sp, GBC.eol().fill(GBC.HORIZONTAL)); // NOSONAR
 
-        list.addListSelectionListener(l -> support.fireItemValueModified(this, key, getSelectedItem().value));
+        list.addListSelectionListener(l -> {
+            if (!l.getValueIsAdjusting()) {
+                support.fireItemValueModified(this, key, getSelectedItem().value);
+            }
+        });
         list.setToolTipText(getKeyTooltipText());
         list.applyComponentOrientation(OrientationAction.getValueOrientation(key));

trunk/src/org/openstreetmap/josm/io/CertificateAmendment.java

@@ -22 +22 @@
 import java.security.cert.TrustAnchor;
 import java.security.cert.X509Certificate;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;