Changeset 2629 in josm for trunk/src/org/openstreetmap/josm/gui/layer/geoimage

Timestamp:

2009-12-13T19:31:06+01:00 (14 years ago)

Author:

bastiK

Message:

geoimage: usability - allow clicking on the image symbols only when in select mode

• introduces MapModeChangeListener

File:

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

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

@@ -46 +46 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.RenameLayerAction;
+import org.openstreetmap.josm.actions.mapmode.MapMode;
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.coor.CachedLatLon;
@@ -51 +52 @@
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
 import org.openstreetmap.josm.gui.ExtendedDialog;
+import org.openstreetmap.josm.gui.MapFrame;
+import org.openstreetmap.josm.gui.MapFrame.MapModeChangeListener;
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
@@ -646 +649 @@
 
     private MouseAdapter mouseAdapter = null;
+    private MapModeChangeListener mapModeListener = null;
 
     private void hook_up_mouse_events() {
@@ -689 +693 @@
             }
         };
-        Main.map.mapView.addMouseListener(mouseAdapter);
+
+        mapModeListener = new MapModeChangeListener() {
+            public void mapModeChange(MapMode oldMapMode, MapMode newMapMode) {
+                if (newMapMode instanceof org.openstreetmap.josm.actions.mapmode.SelectAction) {
+                    Main.map.mapView.addMouseListener(mouseAdapter);
+                } else {
+                    Main.map.mapView.removeMouseListener(mouseAdapter);
+                }
+            }
+        };
+
+        Main.map.addMapModeChangeListener(mapModeListener);
+        mapModeListener.mapModeChange(null, Main.map.mapMode);
+
         MapView.addLayerChangeListener(new LayerChangeListener() {
             public void activeLayerChange(Layer oldLayer, Layer newLayer) {
-                if (newLayer == GeoImageLayer.this && currentPhoto >= 0) {
-                    Main.main.map.repaint();
-                    ImageViewerDialog.showImage(GeoImageLayer.this, data.get(currentPhoto));
+                if (newLayer == GeoImageLayer.this) {
+                    // only in select mode it is possible to click the images
+                    Main.map.selectSelectTool(false);
                 }
             }
@@ -707 +724 @@
                     }
                     Main.map.mapView.removeMouseListener(mouseAdapter);
+                    Main.map.removeMapModeChangeListener(mapModeListener);
                     currentPhoto = -1;
                     data.clear();