Changeset 6130 in josm for trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java

Timestamp:

2013-08-10T12:06:25+02:00 (11 years ago)

Author:

bastiK

Message:

see #6963 - converted popups to notifications for all actions in the Tools menu (TODO: Simplify Way)

File:

• trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java (modified) (3 diffs)

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

@@ -34 +34 @@
 import org.openstreetmap.josm.data.preferences.BooleanProperty;
 import org.openstreetmap.josm.gui.ExtendedDialog;
+import org.openstreetmap.josm.gui.Notification;
 import org.openstreetmap.josm.gui.conflict.tags.CombinePrimitiveResolverDialog;
 import org.openstreetmap.josm.gui.util.GuiHelper;
@@ -65 +66 @@
 
     protected static void warnCombiningImpossible() {
-        String msg = tr("Could not combine ways "
+        String msg = tr("Could not combine ways<br>"
                 + "(They could not be merged into a single string of nodes)");
-        JOptionPane.showMessageDialog(
-                Main.parent,
-                msg,
-                tr("Information"),
-                JOptionPane.INFORMATION_MESSAGE
-        );
+        new Notification(msg)
+                .setIcon(JOptionPane.INFORMATION_MESSAGE)
+                .show();
         return;
     }
@@ -198 +196 @@
         Set<Way> selectedWays = OsmPrimitive.getFilteredSet(selection, Way.class);
         if (selectedWays.size() < 2) {
-            JOptionPane.showMessageDialog(
-                    Main.parent,
-                    tr("Please select at least two ways to combine."),
-                    tr("Information"),
-                    JOptionPane.INFORMATION_MESSAGE
-            );
+            new Notification(
+                    tr("Please select at least two ways to combine."))
+                    .setIcon(JOptionPane.INFORMATION_MESSAGE)
+                    .setDuration(Notification.TIME_SHORT)
+                    .show();
             return;
         }