Changeset 5460 in josm for trunk/src/org/openstreetmap/josm/actions/mapmode

Timestamp:

2012-08-20T01:26:42+02:00 (13 years ago)

Author:

Don-vip

Message:

global use of Main.isDisplayingMapView()

Location:

trunk/src/org/openstreetmap/josm/actions/mapmode

Files:

• DeleteAction.java (modified) (1 diff)
• MapMode.java (modified) (1 diff)

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

@@ -326 +326 @@
     @Override
     protected void updateEnabledState() {
-        setEnabled(Main.map != null && Main.map.mapView != null && Main.map.mapView.isActiveLayerDrawable());
+        setEnabled(Main.isDisplayingMapView() && Main.map.mapView.isActiveLayerDrawable());
     }
 

trunk/src/org/openstreetmap/josm/actions/mapmode/MapMode.java

@@ -71 +71 @@
      */
     public void actionPerformed(ActionEvent e) {
-        if (Main.map != null)
+        if (Main.isDisplayingMapView()) {
             Main.map.selectMapMode(this);
+        }
     }