Changeset 13223 in josm for trunk

Timestamp:

2017-12-18T15:03:48+01:00 (7 years ago)

Author:

Don-vip

Message:

fix #15008 - make sure EDT listeners receive correct selection events

File:

• trunk/src/org/openstreetmap/josm/data/osm/event/SelectionEventManager.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/data/osm/event/SelectionEventManager.java

@@ -8 +8 @@
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.stream.Stream;
-
-import javax.swing.SwingUtilities;
 
 import org.openstreetmap.josm.data.SelectionChangedListener;
@@ -20 +18 @@
 import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeEvent;
 import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeListener;
+import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.tools.bugreport.BugReport;
+import org.openstreetmap.josm.tools.bugreport.ReportedException;
 
 /**
@@ -72 +72 @@
             return Objects.equals(listener, that.listener);
         }
+
+        @Override
+        public String toString() {
+            return "OldListenerInfo [listener=" + listener + ']';
+        }
     }
 
@@ -97 +102 @@
             DataListenerInfo that = (DataListenerInfo) o;
             return Objects.equals(listener, that.listener);
+        }
+
+        @Override
+        public String toString() {
+            return "DataListenerInfo [listener=" + listener + ']';
         }
     }
@@ -196 +206 @@
     public void selectionChanged(SelectionChangeEvent event) {
         fireEvent(immedatelyListeners, event);
-        SwingUtilities.invokeLater(() -> fireEvent(inEDTListeners, event));
+        try {
+            GuiHelper.runInEDTAndWaitWithException(() -> fireEvent(inEDTListeners, event));
+        } catch (ReportedException e) {
+            throw BugReport.intercept(e).put("event", event).put("inEDTListeners", inEDTListeners);
+        }
     }