Changeset 27977 in osm for applications/editors/josm/plugins/editgpx/src/org/openstreetmap

Timestamp:

2012-03-03T12:38:28+01:00 (13 years ago)

Author:

jttt

Message:

Select zoom tool in case select tool is not available (ie activate layer is not osm data layer)

File:

• applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java (modified) (2 diffs)

applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java

@@ -145 +145 @@
             super(tr("Convert to GPX layer"), ImageProvider.get("converttogpx"));
         }
+        @Override
         public void actionPerformed(ActionEvent e) {
+            if (Main.map.mapMode instanceof EditGpxMode) {
+                if (!Main.map.selectSelectTool(false)) {
+                    Main.map.selectZoomTool(false); // Select tool might not be support of active layer, zoom is always supported
+                }
+            }
             Main.main.addLayer(new GpxLayer(toGpxData(false), tr("Converted from: {0}", getName())));
             Main.main.removeLayer(EditGpxLayer.this);
-            if(Main.map.mapMode instanceof EditGpxMode)
-                Main.map.selectSelectTool(false);
         }
     }
@@ -158 +162 @@
             super(tr("Convert to GPX layer with anonymised time"), ImageProvider.get("converttogpx"));
         }
+        @Override
         public void actionPerformed(ActionEvent e) {
+            if (Main.map.mapMode instanceof EditGpxMode) {
+                if (!Main.map.selectSelectTool(false)) {
+                    Main.map.selectZoomTool(false); // Select tool might not be support of active layer, zoom is always supported
+                }
+            }
             Main.main.addLayer(new GpxLayer(toGpxData(true), tr("Converted from: {0}", getName())));
             Main.main.removeLayer(EditGpxLayer.this);
-            if(Main.map.mapMode instanceof EditGpxMode)
-                Main.map.selectSelectTool(false);
         }
     }