Changeset 1087 in josm

Timestamp:

2008-11-19T03:18:28+01:00 (15 years ago)

Author:

framm

Message:

• fixed some NPEs when users go crazy ointhe keyboard with no data loaded

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• DeleteAction.java (modified) (3 diffs)
• ZoomInAction.java (modified) (1 diff)
• ZoomOutAction.java (modified) (1 diff)

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

@@ -3 +3 @@
 
 import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.util.Collection;
 
 import java.awt.event.ActionEvent;
@@ -9 +11 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.tools.Shortcut;
+import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.SelectionChangedListener;
 
-public final class DeleteAction extends JosmAction {
+public final class DeleteAction extends JosmAction implements SelectionChangedListener {
 
         public DeleteAction() {
                 super(tr("Delete"), "dialogs/delete", tr("Delete selected objects."),
                 Shortcut.registerShortcut("system:delete", tr("Edit: {0}", tr("Delete")), KeyEvent.VK_DELETE, Shortcut.GROUP_DIRECT), true);
-                setEnabled(true);
+        DataSet.selListeners.add(this);
+                setEnabled(false);
         }
 
@@ -22 +28 @@
                         .doActionPerformed(e);
         }
+    public void selectionChanged(Collection<? extends OsmPrimitive> newSelection) {
+        setEnabled(! newSelection.isEmpty());
+    }
 }

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

@@ -19 +19 @@
 
         public void actionPerformed(ActionEvent e) {
+        if (Main.map == null) return;
                 double zoom = Main.map.mapView.getScale();
                 Main.map.mapView.zoomTo(Main.map.mapView.getCenter(), zoom * .9);

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

@@ -19 +19 @@
 
         public void actionPerformed(ActionEvent e) {
+        if (Main.map == null) return;
                 double zoom = Main.map.mapView.getScale();
                 Main.map.mapView.zoomTo(Main.map.mapView.getCenter(), zoom /.9);