Changeset 12630 in josm for trunk/src/org/openstreetmap/josm/gui/NotificationManager.java

Timestamp:

2017-08-24T00:15:51+02:00 (9 years ago)

Author:

Don-vip

Message:

see #15182 - deprecate Main.map and Main.isDisplayingMapView(). Replacements: gui.MainApplication.getMap() / gui.MainApplication.isDisplayingMapView()

File:

• trunk/src/org/openstreetmap/josm/gui/NotificationManager.java (modified) (1 diff)

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

@@ -114 +114 @@
                 int x;
                 int y;
-                if (Main.isDisplayingMapView() && Main.map.mapView.getHeight() > 0) {
-                    MapView mv = Main.map.mapView;
+                MapFrame map = MainApplication.getMap();
+                if (MainApplication.isDisplayingMapView() && map.mapView.getHeight() > 0) {
+                    MapView mv = 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;
+                    y = mapViewPos.y + mv.getHeight() - map.statusLine.getHeight() - size.height - margin;
                 } else {
                     x = margin;