Changeset 12630 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint

Timestamp:

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

Author:

Don-vip

Message:

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

Location:

trunk/src/org/openstreetmap/josm/gui/mappaint

Files:

• MapPaintMenu.java (modified) (2 diffs)
• styleelement/MapImage.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintMenu.java

@@ -14 +14 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.dialogs.MapPaintDialog;
 import org.openstreetmap.josm.gui.layer.GpxLayer;
@@ -66 +67 @@
         @Override
         public void updateEnabledState() {
-            setEnabled(Main.isDisplayingMapView() && (Main.getLayerManager().getEditLayer() != null || mapHasGpxorMarkerLayer()));
+            setEnabled(MainApplication.isDisplayingMapView() && (Main.getLayerManager().getEditLayer() != null || mapHasGpxorMarkerLayer()));
         }
 

trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/MapImage.java

@@ -12 +12 @@
 import javax.swing.ImageIcon;
 
-import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.mappaint.MapPaintStyles;
 import org.openstreetmap.josm.gui.mappaint.StyleSource;
@@ -149 +150 @@
                         if (temporary) {
                             disabledImgCache = null;
-                            Main.map.mapView.preferenceChanged(null); // otherwise repaint is ignored, because layer hasn't changed
-                            Main.map.mapView.repaint();
+                            MapView mapView = MainApplication.getMap().mapView;
+                            mapView.preferenceChanged(null); // otherwise repaint is ignored, because layer hasn't changed
+                            mapView.repaint();
                         }
                         temporary = false;