Changeset 1857 in josm for trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java

Timestamp:

2009-07-26T22:52:23+02:00 (15 years ago)

Author:

Gubaer

Message:

replaced JOptionDialog.show... by OptionPaneUtil.show....
improved relation editor

File:

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

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

@@ -37 +37 @@
 import org.openstreetmap.josm.data.osm.visitor.CollectBackReferencesVisitor;
 import org.openstreetmap.josm.gui.ExtendedDialog;
+import org.openstreetmap.josm.gui.OptionPaneUtil;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.Pair;
@@ -72 +73 @@
 
         if (selectedNodes.size() < 2) {
-            JOptionPane.showMessageDialog(
+            OptionPaneUtil.showMessageDialog(
                     Main.parent,
                     tr("Please select at least two nodes to merge."),
@@ -249 +250 @@
                 w.visit(backRefs);
                 if (!backRefs.data.isEmpty()) {
-                    JOptionPane.showMessageDialog(Main.parent,
+                    OptionPaneUtil.showMessageDialog(
+                            Main.parent,
                             tr("Cannot merge nodes: " +
-                            "Would have to delete a way that is still used."));
+                            "Would have to delete a way that is still used."),
+                            tr("Warning"),
+                            JOptionPane.WARNING_MESSAGE
+                    );
                     return null;
                 }