Changeset 6132 in josm

Timestamp:

2013-08-10T17:12:42+02:00 (11 years ago)

Author:

bastiK

Message:

see #6963 - new message after successful upload; use notification for NMEA import

Location:

trunk

Files:

• images/misc/check_large.png (added)
• src/org/openstreetmap/josm/gui/NotificationManager.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java (modified) (2 diffs)
• src/org/openstreetmap/josm/io/NMEAImporter.java (modified) (2 diffs)

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

@@ -25 +25 @@
 
 import javax.swing.AbstractAction;
-import javax.swing.Action;
 import javax.swing.BorderFactory;
 import javax.swing.GroupLayout;

trunk/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java

@@ -37 +37 @@
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.xml.sax.SAXException;
+
+import org.openstreetmap.josm.gui.Notification;
 
 /**
@@ -328 +330 @@
                     UploadDialog.getUploadDialog().setSelectedChangesetForNextUpload(changeset);
                 }
-                if (lastException == null)
+                if (lastException == null) {
+                    new Notification(
+                            "<h3>" + tr("Upload successful!") + "</h3>")
+                            .setIcon(ImageProvider.get("misc", "check_large"))
+                            .show();
                     return;
+                }
                 if (lastException instanceof ChangesetClosedException) {
                     ChangesetClosedException e = (ChangesetClosedException)lastException;

trunk/src/org/openstreetmap/josm/io/NMEAImporter.java

@@ -9 +9 @@
 
 import javax.swing.JOptionPane;
+import javax.swing.SwingUtilities;
 
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.ExtensionFileFilter;
 import org.openstreetmap.josm.gui.HelpAwareOptionPane;
+import org.openstreetmap.josm.gui.Notification;
 import org.openstreetmap.josm.gui.layer.GpxLayer;
 import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer;
@@ -62 +64 @@
         msg.append("</html>");
         if (success) {
-            HelpAwareOptionPane.showMessageDialogInEDT(
-                    Main.parent,
-                    msg.toString(),
-                    tr("NMEA import success"),
-                    JOptionPane.INFORMATION_MESSAGE, null);
+            SwingUtilities.invokeLater(new Runnable() {
+                @Override
+                public void run() {
+                    new Notification(
+                            "<h3>" + tr("NMEA import success:") + "</h3>" + msg.toString())
+                            .setIcon(JOptionPane.INFORMATION_MESSAGE)
+                            .show();
+                }
+            });
         } else {
             HelpAwareOptionPane.showMessageDialogInEDT(