Changeset 12630 in josm for trunk/src/org/openstreetmap/josm/actions/DeleteAction.java

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()

File:

• trunk/src/org/openstreetmap/josm/actions/DeleteAction.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/DeleteAction.java

@@ -9 +9 @@
 import java.util.Collection;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.tools.Shortcut;
 
@@ -30 +31 @@
     @Override
     public void actionPerformed(ActionEvent e) {
-        if (!isEnabled() || !Main.map.mapView.isActiveLayerVisible())
+        MapFrame map = MainApplication.getMap();
+        if (!isEnabled() || !map.mapView.isActiveLayerVisible())
             return;
-        Main.map.mapModeDelete.doActionPerformed(e);
+        map.mapModeDelete.doActionPerformed(e);
     }