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

Timestamp:

2009-09-03T15:13:20+02:00 (17 years ago)

Author:

Gubaer

Message:

applied #3377: patch by xeen: Less warnings for JOSM

File:

• trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java (modified) (1 diff)

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

@@ -155 +155 @@
         for (HashSet<Node> nodelinks : backlinks.values()) {
             if (!nodelinks.containsAll(allNodes)) {
-                int option = new ExtendedDialog(Main.parent,
+                ExtendedDialog ed = new ExtendedDialog(Main.parent,
                         tr("Merge nodes with different memberships?"),
-                        tr("The selected nodes have differing relation memberships.  "
-                                + "Do you still want to merge them?"),
-                                new String[] {tr("Merge Anyway"), tr("Cancel")},
-                                new String[] {"mergenodes.png", "cancel.png"}).getValue();
-                if (option == 1) {
+                        new String[] {tr("Merge Anyway"), tr("Cancel")});
+                ed.setButtonIcons(new String[] {"mergenodes.png", "cancel.png"});
+                ed.setContent(tr("The selected nodes have differing relation memberships.  "
+                        + "Do you still want to merge them?"));
+                ed.showDialog();
+
+                if (ed.getValue() == 1) {
                     break;
                 }