Changeset 4461 in josm for trunk/src/org/openstreetmap/josm/command

Timestamp:

2011-09-24T22:09:19+02:00 (13 years ago)

Author:

simon04

Message:

fix #5407 - simplify way: dialog asking to delete nodes outside boundary is missing "never ask again" checkbox

File:

• trunk/src/org/openstreetmap/josm/command/Command.java (modified) (3 diffs)

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

@@ -183 +183 @@
      * Request confirmation if he is.
      *
-     * @param layer the layer in whose context data is deleted
+     * @param operation the operation name which is used for setting some preferences
+     * @param dialogTitle the title of the dialog being displayed
+     * @param outsideDialogMessage the message text to be displayed when data is outside of the download area
+     * @param incompleteDialogMessage the message text to be displayed when data is incomplete
+     * @param area the area used to determine whether data is outlying
      * @param primitives the primitives to operate on
-     * @return true, if deleting outlying primitives is OK; false, otherwise
+     * @param ignore {@code null} or a primitive to be ignored
+     * @return true, if operating on outlying primitives is OK; false, otherwise
      */
     public static boolean checkAndConfirmOutlyingOperation(String operation,
@@ -196 +201 @@
                 if (osm.isIncomplete()) {
                     incomplete = true;
-                } else if (osm instanceof Node && !osm.isNewOrUndeleted()
-                        && !area.contains(((Node) osm).getCoor())
+                } else if (isOutlying(osm, area)
                         && (ignore == null || !ignore.equals(osm))) {
                     outside = true;
@@ -240 +244 @@
     }
 
+    private static boolean isOutlying(OsmPrimitive osm, Area area) {
+        if (osm instanceof Node) {
+            return !osm.isNewOrUndeleted() && !area.contains(((Node) osm).getCoor());
+        } else if (osm instanceof Way) {
+            for (Node n : ((Way) osm).getNodes()) {
+                if (isOutlying(n, area)) {
+                    return true;
+                }
+            }
+            return false;
+        }
+        return false;
+    }
 }