Changeset 11996 in josm

Timestamp:

2017-04-24T21:35:09+02:00 (7 years ago)

Author:

Don-vip

Message:

fix #13809 - run GUI operations of NotificationManager.processQueue in EDT

File:

• trunk/src/org/openstreetmap/josm/gui/NotificationManager.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/NotificationManager.java

@@ -40 +40 @@
 import org.openstreetmap.josm.gui.help.HelpBrowser;
 import org.openstreetmap.josm.gui.help.HelpUtil;
+import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.tools.ImageProvider;
 
@@ -103 +104 @@
         if (currentNotification == null) return;
 
-        currentNotificationPanel = new NotificationPanel(currentNotification, new FreezeMouseListener(), e -> this.stopHideTimer());
-        currentNotificationPanel.validate();
-
-        int margin = 5;
-        JFrame parentWindow = (JFrame) Main.parent;
-        Dimension size = currentNotificationPanel.getPreferredSize();
-        if (parentWindow != null) {
-            int x;
-            int y;
-            if (Main.isDisplayingMapView() && Main.map.mapView.getHeight() > 0) {
-                MapView mv = Main.map.mapView;
-                Point mapViewPos = SwingUtilities.convertPoint(mv.getParent(), mv.getX(), mv.getY(), Main.parent);
-                x = mapViewPos.x + margin;
-                y = mapViewPos.y + mv.getHeight() - Main.map.statusLine.getHeight() - size.height - margin;
-            } else {
-                x = margin;
-                y = parentWindow.getHeight() - Main.toolbar.control.getSize().height - size.height - margin;
-            }
-            parentWindow.getLayeredPane().add(currentNotificationPanel, JLayeredPane.POPUP_LAYER, 0);
-
-            currentNotificationPanel.setLocation(x, y);
-        }
-        currentNotificationPanel.setSize(size);
-
-        currentNotificationPanel.setVisible(true);
+        GuiHelper.runInEDTAndWait(() -> {
+            currentNotificationPanel = new NotificationPanel(currentNotification, new FreezeMouseListener(), e -> this.stopHideTimer());
+            currentNotificationPanel.validate();
+
+            int margin = 5;
+            JFrame parentWindow = (JFrame) Main.parent;
+            Dimension size = currentNotificationPanel.getPreferredSize();
+            if (parentWindow != null) {
+                int x;
+                int y;
+                if (Main.isDisplayingMapView() && Main.map.mapView.getHeight() > 0) {
+                    MapView mv = Main.map.mapView;
+                    Point mapViewPos = SwingUtilities.convertPoint(mv.getParent(), mv.getX(), mv.getY(), Main.parent);
+                    x = mapViewPos.x + margin;
+                    y = mapViewPos.y + mv.getHeight() - Main.map.statusLine.getHeight() - size.height - margin;
+                } else {
+                    x = margin;
+                    y = parentWindow.getHeight() - Main.toolbar.control.getSize().height - size.height - margin;
+                }
+                parentWindow.getLayeredPane().add(currentNotificationPanel, JLayeredPane.POPUP_LAYER, 0);
+
+                currentNotificationPanel.setLocation(x, y);
+            }
+            currentNotificationPanel.setSize(size);
+            currentNotificationPanel.setVisible(true);
+        });
 
         running = true;