Changeset 5430 in josm for trunk/src/org/openstreetmap/josm/gui/layer

Timestamp:

2012-08-11T23:37:27+02:00 (12 years ago)

Author:

Don-vip

Message:

fix #7873 - select geotagged image should not be allowed in add node mode

File:

• trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java

@@ -42 +42 @@
 import org.openstreetmap.josm.actions.RenameLayerAction;
 import org.openstreetmap.josm.actions.mapmode.MapMode;
+import org.openstreetmap.josm.actions.mapmode.SelectAction;
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.coor.LatLon;
@@ -724 +725 @@
     private void hook_up_mouse_events() {
         mouseAdapter = new MouseAdapter() {
+            private final boolean isMapModeOk() {
+                return Main.map.mapMode == null || Main.map.mapMode instanceof SelectAction;
+            }
             @Override public void mousePressed(MouseEvent e) {
 
                 if (e.getButton() != MouseEvent.BUTTON1)
                     return;
-                if (isVisible()) {
+                if (isVisible() && isMapModeOk()) {
                     Main.map.mapView.repaint();
                 }
@@ -736 +740 @@
                 if (ev.getButton() != MouseEvent.BUTTON1)
                     return;
-                if (data == null || !isVisible())
+                if (data == null || !isVisible() || !isMapModeOk())
                     return;