Changeset 18135 in josm for trunk/src/org

Timestamp:

2021-08-20T14:18:17+02:00 (3 years ago)

Author:

Don-vip

Message:

see #16709 - fix #20755 - Display a notification while/after saving session files

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• DiskAccessAction.java (modified) (3 diffs)
• SaveActionBase.java (modified) (4 diffs)
• SessionSaveAsAction.java (modified) (2 diffs)

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

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.actions;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.util.Collection;
@@ -7 +9 @@
 import javax.swing.filechooser.FileFilter;
 
+import org.openstreetmap.josm.gui.Notification;
+import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.gui.widgets.AbstractFileChooser;
 import org.openstreetmap.josm.gui.widgets.FileChooserManager;
+import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Shortcut;
 
@@ -137 +142 @@
                 .openFileChooser();
     }
+
+    /**
+     * Show "saving file ..." notification and returns it, for future replacement.
+     * @param filename filename of file to save
+     * @return {@link Notification} to provide to {@link #showSavedNotification} once saving is successful
+     * @since 18135
+     */
+    protected static Notification showSavingNotification(String filename) {
+        Notification savingNotification = new Notification(tr("Saving file {0}...", filename)).setIcon(ImageProvider.get("save"));
+        GuiHelper.runInEDT(savingNotification::show);
+        return savingNotification;
+    }
+
+    /**
+     * Show "Successfully saved file" notification and returns it.
+     * @param savingNotification {@link Notification} returned by {@link #showSavingNotification}
+     * @param filename filename of file saved
+     * @return {@code Notification} displayed
+     * @since 18135
+     */
+    protected static Notification showSavedNotification(Notification savingNotification, String filename) {
+        Notification doneNotification = new Notification(tr("Successfully saved file {0}", filename)).setIcon(ImageProvider.get("save"));
+        GuiHelper.runInEDT(() -> doneNotification.replaceExisting(savingNotification));
+        return doneNotification;
+    }
 }

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

@@ -12 +12 @@
 import java.util.List;
 
-import javax.swing.ImageIcon;
 import javax.swing.JFileChooser;
 import javax.swing.JOptionPane;
@@ -27 +26 @@
 import org.openstreetmap.josm.gui.widgets.AbstractFileChooser;
 import org.openstreetmap.josm.spi.preferences.Config;
-import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.Shortcut;
@@ -137 +135 @@
             return false;
 
-        ImageIcon icon = ImageProvider.get("save");
-        Notification savingNotification = new Notification(tr("Saving file {0}...", file.getName())).setIcon(icon);
-        GuiHelper.runInEDT(savingNotification::show);
+        Notification savingNotification = showSavingNotification(file.getName());
         try {
             boolean exported = false;
@@ -175 +171 @@
         }
         addToFileOpenHistory(file);
-        Notification doneNotification = new Notification(tr("Successfully saved file {0}", file.getName())).setIcon(icon);
-        GuiHelper.runInEDT(() -> doneNotification.replaceExisting(savingNotification));
+        showSavedNotification(savingNotification, file.getName());
         return true;
     }

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

@@ -38 +38 @@
 import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.gui.MapFrameListener;
+import org.openstreetmap.josm.gui.Notification;
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.util.WindowGeometry;
@@ -166 +167 @@
         SessionWriter sw = new SessionWriter(layersOut, active, exporters, dependencies, zip);
         try {
+            Notification savingNotification = showSavingNotification(file.getName());
             sw.write(file);
             SaveActionBase.addToFileOpenHistory(file);
+            showSavedNotification(savingNotification, file.getName());
         } catch (IOException ex) {
             Logging.error(ex);