Changeset 16365 in josm for trunk/src/org

Timestamp:

2020-04-20T14:58:12+02:00 (4 years ago)

Author:

GerdP

Message:

fix #19121: JosmAction.checkAndConfirmOutlyingOperation() should also handle dataset without download area

• adjust message texts
• also check if object is old and no download area exists

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/DeleteAction.java (modified) (1 diff)
• actions/JoinAreasAction.java (modified) (1 diff)
• actions/JosmAction.java (modified) (1 diff)
• actions/UnGlueAction.java (modified) (1 diff)
• command/Command.java (modified) (1 diff)

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

@@ -96 +96 @@
         return checkAndConfirmOutlyingOperation("delete",
                 tr("Delete confirmation"),
-                tr("You are about to delete nodes outside of the area you have downloaded."
+                tr("You are about to delete nodes which can have other referrers not yet downloaded."
                         + "<br>"
                         + "This can cause problems because other objects (that you do not see) might use them."

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

@@ -520 +520 @@
         // TODO: Only display this warning when nodes outside dataSourceArea are deleted
         boolean ok = checkAndConfirmOutlyingOperation("joinarea", tr("Join area confirmation"),
-                trn("The selected way has nodes outside of the downloaded data region.",
-                    "The selected ways have nodes outside of the downloaded data region.",
+                trn("The selected way has nodes which can have other referrers not yet downloaded.",
+                    "The selected ways have nodes which can have other referrers not yet downloaded.",
                     ways.size()) + "<br/>"
                     + tr("This can lead to nodes being deleted accidentally.") + "<br/>"

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

@@ -496 +496 @@
      * Check whether user is about to operate on data outside of the download area.
      * Request confirmation if he is.
+     * Also handles the case that there is no download area.
      *
      * @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 outsideDialogMessage the message text to be displayed when data is outside of the download area or no download area exists
      * @param incompleteDialogMessage the message text to be displayed when data is incomplete
      * @param primitives the primitives to operate on

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

@@ -504 +504 @@
         final boolean ok = checkAndConfirmOutlyingOperation("unglue",
                 tr("Unglue confirmation"),
-                tr("You are about to unglue nodes outside of the area you have downloaded."
+                tr("You are about to unglue nodes which can have other referrers not yet downloaded."
                         + "<br>"
                         + "This can cause problems because other objects (that you do not see) might use them."

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

@@ -229 +229 @@
                 res |= IS_INCOMPLETE;
             } else if (osm.isOutsideDownloadArea()
-                    && (ignore == null || !ignore.contains(osm))) {
+                    || (!osm.isNew() && osm.getDataSet() != null && osm.getDataSet().getDataSourceBounds().isEmpty())
+                            && (ignore == null || !ignore.contains(osm))) {
                 res |= IS_OUTSIDE;
             }