Changeset 5519 in josm for trunk/src/org/openstreetmap/josm/Main.java

Timestamp:

2012-09-30T17:36:39+02:00 (12 years ago)

Author:

Don-vip

Message:

fix #8090 - Removing saved non-uploadable layer asks for confirmation

File:

• trunk/src/org/openstreetmap/josm/Main.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/Main.java

@@ -628 +628 @@
     }
 
+    /**
+     * Asks user to perform "save layer" operations (save .osm on disk and/or upload osm data to server) for all {@link OsmDataLayer} before JOSM exits.
+     * @return {@code true} if there was nothing to save, or if the user wants to proceed to save operations. {@code false} if the user cancels.
+     * @since 2025
+     */
     public static boolean saveUnsavedModifications() {
-        if (map == null) return true;
-        SaveLayersDialog dialog = new SaveLayersDialog(Main.parent);
+        if (map == null || map.mapView == null) return true;
+        return saveUnsavedModifications(map.mapView.getLayersOfType(OsmDataLayer.class), true);
+    }
+
+    /**
+     * Asks user to perform "save layer" operations (save .osm on disk and/or upload osm data to server) before osm layers deletion.
+     * 
+     * @param selectedLayers The layers to check. Only instances of {@link OsmDataLayer} are considered.
+     * @param exit {@code true} if JOSM is exiting, {@code false} otherwise.
+     * @return {@code true} if there was nothing to save, or if the user wants to proceed to save operations. {@code false} if the user cancels.
+     * @since 5519
+     */
+    public static boolean saveUnsavedModifications(List<? extends Layer> selectedLayers, boolean exit) {
+        SaveLayersDialog dialog = new SaveLayersDialog(parent);
         List<OsmDataLayer> layersWithUnmodifiedChanges = new ArrayList<OsmDataLayer>();
-        for (OsmDataLayer l: Main.map.mapView.getLayersOfType(OsmDataLayer.class)) {
-            if ((l.requiresSaveToFile() || l.requiresUploadToServer()) && l.data.isModified()) {
-                layersWithUnmodifiedChanges.add(l);
-            }
-        }
-        dialog.prepareForSavingAndUpdatingLayersBeforeExit();
+        for (Layer l: selectedLayers) {
+            if (!(l instanceof OsmDataLayer)) {
+                continue;
+            }
+            OsmDataLayer odl = (OsmDataLayer)l;
+            if ((odl.requiresSaveToFile() || (odl.requiresUploadToServer() && !odl.isUploadDiscouraged())) && odl.data.isModified()) {
+                layersWithUnmodifiedChanges.add(odl);
+            }
+        }
+        if (exit) {
+            dialog.prepareForSavingAndUpdatingLayersBeforeExit();
+        } else {
+            dialog.prepareForSavingAndUpdatingLayersBeforeDelete();
+        }
         if (!layersWithUnmodifiedChanges.isEmpty()) {
             dialog.getModel().populate(layersWithUnmodifiedChanges);