Changeset 6130 in josm for trunk/src/org/openstreetmap/josm/actions/SplitWayAction.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/SplitWayAction.java (modified) (6 diffs)

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

@@ -32 +32 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.gui.DefaultNameFormatter;
+import org.openstreetmap.josm.gui.Notification;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
@@ -128 +129 @@
 
         if (applicableWays == null) {
-            JOptionPane.showMessageDialog(
-                    Main.parent,
-                    tr("The current selection cannot be used for splitting - no node is selected."),
-                    tr("Warning"),
-                    JOptionPane.WARNING_MESSAGE);
+            new Notification(
+                    tr("The current selection cannot be used for splitting - no node is selected."))
+                    .setIcon(JOptionPane.WARNING_MESSAGE)
+                    .show();
             return;
         } else if (applicableWays.isEmpty()) {
-            JOptionPane.showMessageDialog(Main.parent,
-                    tr("The selected nodes do not share the same way."),
-                    tr("Warning"),
-                    JOptionPane.WARNING_MESSAGE);
+            new Notification(
+                    tr("The selected nodes do not share the same way."))
+                    .setIcon(JOptionPane.WARNING_MESSAGE)
+                    .show();
             return;
         }
@@ -157 +157 @@
 
         if (applicableWays.isEmpty()) {
-            JOptionPane.showMessageDialog(Main.parent,
+            new Notification(
                     trn("The selected node is not in the middle of any way.",
-                            "The selected nodes are not in the middle of any way.",
-                            selectedNodes.size()),
-                            tr("Warning"),
-                            JOptionPane.WARNING_MESSAGE);
+                        "The selected nodes are not in the middle of any way.",
+                        selectedNodes.size()))
+                    .setIcon(JOptionPane.WARNING_MESSAGE)
+                    .show();
             return;
         } else if (applicableWays.size() > 1) {
-            JOptionPane.showMessageDialog(Main.parent,
+            new Notification(
                     trn("There is more than one way using the node you selected. Please select the way also.",
-                            "There is more than one way using the nodes you selected. Please select the way also.",
-                            selectedNodes.size()),
-                            tr("Warning"),
-                            JOptionPane.WARNING_MESSAGE);
+                        "There is more than one way using the nodes you selected. Please select the way also.",
+                        selectedNodes.size()))
+                    .setIcon(JOptionPane.WARNING_MESSAGE)
+                    .show();
             return;
         }
@@ -290 +290 @@
                 && !nodeSet.contains(wayChunks.get(0).get(0))) {
             if (wayChunks.size() == 2) {
-                JOptionPane.showMessageDialog(
-                        Main.parent,
-                        tr("You must select two or more nodes to split a circular way."),
-                        tr("Warning"),
-                        JOptionPane.WARNING_MESSAGE);
+                new Notification(
+                        tr("You must select two or more nodes to split a circular way."))
+                        .setIcon(JOptionPane.WARNING_MESSAGE)
+                        .show();
                 return null;
             }
@@ -305 +304 @@
         if (wayChunks.size() < 2) {
             if (wayChunks.get(0).get(0) == wayChunks.get(0).get(wayChunks.get(0).size() - 1)) {
-                JOptionPane.showMessageDialog(
-                        Main.parent,
-                        tr("You must select two or more nodes to split a circular way."),
-                        tr("Warning"),
-                        JOptionPane.WARNING_MESSAGE);
+                new Notification(
+                        tr("You must select two or more nodes to split a circular way."))
+                        .setIcon(JOptionPane.WARNING_MESSAGE)
+                        .show();
             } else {
-                JOptionPane.showMessageDialog(
-                        Main.parent,
-                        tr("The way cannot be split at the selected nodes. (Hint: Select nodes in the middle of the way.)"),
-                        tr("Warning"),
-                        JOptionPane.WARNING_MESSAGE);
+                new Notification(
+                        tr("The way cannot be split at the selected nodes. (Hint: Select nodes in the middle of the way.)"))
+                        .setIcon(JOptionPane.WARNING_MESSAGE)
+                        .show();
             }
             return null;
@@ -495 +492 @@
         }
         if (warnmerole) {
-            JOptionPane.showMessageDialog(
-                    Main.parent,
-                    tr("<html>A role based relation membership was copied to all new ways.<br>You should verify this and correct it when necessary.</html>"),
-                    tr("Warning"),
-                    JOptionPane.WARNING_MESSAGE);
+            new Notification(
+                    tr("A role based relation membership was copied to all new ways.<br>You should verify this and correct it when necessary."))
+                    .setIcon(JOptionPane.WARNING_MESSAGE)
+                    .show();
         } else if (warnme) {
-            JOptionPane.showMessageDialog(
-                    Main.parent,
-                    tr("<html>A relation membership was copied to all new ways.<br>You should verify this and correct it when necessary.</html>"),
-                    tr("Warning"),
-                    JOptionPane.WARNING_MESSAGE);
+            new Notification(
+                    tr("A relation membership was copied to all new ways.<br>You should verify this and correct it when necessary."))
+                    .setIcon(JOptionPane.WARNING_MESSAGE)
+                    .show();
         }