Changeset 17628 in josm for trunk/src/org

Timestamp:

2021-03-21T17:05:43+01:00 (3 years ago)

Author:

simon04

Message:

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

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/SaveActionBase.java (modified) (5 diffs)
• gui/Notification.java (modified) (1 diff)
• gui/NotificationManager.java (modified) (2 diffs)

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;
@@ -19 +20 @@
 import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.gui.Notification;
 import org.openstreetmap.josm.gui.io.importexport.FileExporter;
 import org.openstreetmap.josm.gui.layer.AbstractModifiableLayer;
@@ -25 +27 @@
 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;
@@ -134 +137 @@
             return false;
 
+        ImageIcon icon = ImageProvider.get("save");
+        Notification savingNotification = new Notification(tr("Saving file {0}...", file.getName())).setIcon(icon);
+        GuiHelper.runInEDT(savingNotification::show);
         try {
             boolean exported = false;
@@ -169 +175 @@
         }
         addToFileOpenHistory(file);
+        Notification doneNotification = new Notification(tr("Successfully saved file {0}", file.getName())).setIcon(icon);
+        GuiHelper.runInEDT(() -> doneNotification.replaceExisting(savingNotification));
         return true;
     }

trunk/src/org/openstreetmap/josm/gui/Notification.java

@@ -214 +214 @@
     }
 
+    /**
+     * Display the notification by replacing the given queued/displaying notification
+     * @param oldNotification the notification to replace
+     * @since 17628
+     */
+    public void replaceExisting(Notification oldNotification) {
+        NotificationManager.getInstance().replaceExistingNotification(oldNotification, this);
+    }
+
     private Object getContentTextOrComponent() {
         return content instanceof JTextComponent ? ((JTextComponent) content).getText() : content;

trunk/src/org/openstreetmap/josm/gui/NotificationManager.java

@@ -92 +92 @@
      * @see Notification#show()
      */
-    public void showNotification(Notification note) {
+    void showNotification(Notification note) {
         synchronized (queue) {
             if (Objects.equals(note, currentNotification) || Objects.equals(note, queue.peekLast())) {
@@ -99 +99 @@
             }
             queue.add(note);
+            processQueue();
+        }
+    }
+
+    /**
+     * Show the given notification by replacing the given queued/displaying notification
+     * @param oldNotification the notification to replace
+     * @param newNotification the notification to show
+     */
+    void replaceExistingNotification(Notification oldNotification, Notification newNotification) {
+        synchronized (queue) {
+            if (Objects.equals(oldNotification, currentNotification)) {
+                stopHideTimer();
+            } else {
+                queue.remove(oldNotification);
+            }
+            showNotification(newNotification);
             processQueue();
         }