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

Timestamp:

2016-10-07T21:55:54+02:00 (8 years ago)

Author:

simon04

Message:

fix #13320 - Use restart text and icon in unsaved changes dialog

File:

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

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

@@ -77 +77 @@
 import org.openstreetmap.josm.gui.ProgramArguments.Option;
 import org.openstreetmap.josm.gui.io.SaveLayersDialog;
-import org.openstreetmap.josm.gui.layer.AbstractModifiableLayer;
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.MainLayerManager;
@@ -795 +794 @@
 
     /**
-     * Asks user to perform "save layer" operations (save on disk and/or upload data to server) for all
-     * {@link AbstractModifiableLayer} 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 (!isDisplayingMapView()) return true;
-        return saveUnsavedModifications(getLayerManager().getLayersOfType(AbstractModifiableLayer.class), true);
-    }
-
-    /**
-     * Asks user to perform "save layer" operations (save on disk and/or upload data to server) before data layers deletion.
-     *
-     * @param selectedLayers The layers to check. Only instances of {@link AbstractModifiableLayer} 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(Iterable<? extends Layer> selectedLayers, boolean exit) {
-        SaveLayersDialog dialog = new SaveLayersDialog(parent);
-        List<AbstractModifiableLayer> layersWithUnmodifiedChanges = new ArrayList<>();
-        for (Layer l: selectedLayers) {
-            if (!(l instanceof AbstractModifiableLayer)) {
-                continue;
-            }
-            AbstractModifiableLayer odl = (AbstractModifiableLayer) l;
-            if (odl.isModified() &&
-                    ((!odl.isSavable() && !odl.isUploadable()) ||
-                     odl.requiresSaveToFile() ||
-                     (odl.requiresUploadToServer() && !odl.isUploadDiscouraged()))) {
-                layersWithUnmodifiedChanges.add(odl);
-            }
-        }
-        if (exit) {
-            dialog.prepareForSavingAndUpdatingLayersBeforeExit();
-        } else {
-            dialog.prepareForSavingAndUpdatingLayersBeforeDelete();
-        }
-        if (!layersWithUnmodifiedChanges.isEmpty()) {
-            dialog.getModel().populate(layersWithUnmodifiedChanges);
-            dialog.setVisible(true);
-            switch(dialog.getUserAction()) {
-            case PROCEED: return true;
-            case CANCEL:
-            default: return false;
-            }
-        }
-
-        return true;
-    }
-
-    /**
      * Closes JOSM and optionally terminates the Java Virtual Machine (JVM).
      * If there are some unsaved data layers, asks first for user confirmation.
      * @param exit If {@code true}, the JVM is terminated by running {@link System#exit} with a given return code.
      * @param exitCode The return code
+     * @param reason the reason for exiting
      * @return {@code true} if JOSM has been closed, {@code false} if the user has cancelled the operation.
-     * @since 3378
-     */
-    public static boolean exitJosm(boolean exit, int exitCode) {
-        if (Main.saveUnsavedModifications()) {
+     * @since 11093 (3378 with a different function signature)
+     */
+    public static boolean exitJosm(boolean exit, int exitCode, SaveLayersDialog.Reason reason) {
+        if (SaveLayersDialog.saveUnsavedModifications(getLayerManager().getLayers(), reason != null ? reason : SaveLayersDialog.Reason.EXIT)) {
             if (Main.main != null) {
                 Main.main.shutdown();