Changeset 5060 in josm for trunk/src/org/openstreetmap/josm/command/DeleteCommand.java

Timestamp:

2012-03-08T22:02:30+01:00 (12 years ago)

Author:

simon04

Message:

fix #7470 - tune warning of nodes out of downloaded bbox

File:

• trunk/src/org/openstreetmap/josm/command/DeleteCommand.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/command/DeleteCommand.java

@@ -358 +358 @@
         }
 
-        if (!silent && !checkAndConfirmOutlyingDelete(layer, primitivesToDelete, null))
+        if (!silent && !checkAndConfirmOutlyingDelete(layer,
+                primitivesToDelete, Utils.filteredCollection(primitivesToDelete, Way.class)))
             return null;
 
@@ -454 +455 @@
     }
 
-    public static boolean checkAndConfirmOutlyingDelete(OsmDataLayer layer, Collection<? extends OsmPrimitive> primitives, OsmPrimitive ignore) {
+    public static boolean checkAndConfirmOutlyingDelete(OsmDataLayer layer, Collection<? extends OsmPrimitive> primitives, Collection<? extends OsmPrimitive> ignore) {
         return checkAndConfirmOutlyingDelete(layer.data.getDataSourceArea(), primitives, ignore);
     }
 
-    public static boolean checkAndConfirmOutlyingDelete(Area area, Collection<? extends OsmPrimitive> primitives, OsmPrimitive ignore) {
+    public static boolean checkAndConfirmOutlyingDelete(Area area, Collection<? extends OsmPrimitive> primitives, Collection<? extends OsmPrimitive> ignore) {
         return Command.checkAndConfirmOutlyingOperation("delete",
                 tr("Delete confirmation"),