Changeset 2315 in josm for trunk/src/org/openstreetmap/josm/actions

Timestamp:

2009-10-25T13:58:47+01:00 (17 years ago)

Author:

Gubaer

Message:

fixed #3753: Merging the ends of two node ways produces corrupt way
Also extended help information. See help

File:

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

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

@@ -5 +5 @@
 import static org.openstreetmap.josm.gui.conflict.tags.TagConflictResolutionUtil.completeTagCollectionForEditing;
 import static org.openstreetmap.josm.gui.conflict.tags.TagConflictResolutionUtil.normalizeTagCollectionBeforeEditing;
+import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
 import static org.openstreetmap.josm.tools.I18n.tr;
 
@@ -29 +30 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.osm.BackreferencedDataSet.RelationToChildReference;
+import org.openstreetmap.josm.gui.DefaultNameFormatter;
+import org.openstreetmap.josm.gui.HelpAwareOptionPane;
+import org.openstreetmap.josm.gui.HelpAwareOptionPane.ButtonSpec;
 import org.openstreetmap.josm.gui.conflict.tags.CombinePrimitiveResolverDialog;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Shortcut;
-
-
 /**
  * Merges a collection of nodes into one node.
@@ -161 +164 @@
                     waysToDelete.add(w);
                 } else {
-                    JOptionPane.showMessageDialog(
+                    ButtonSpec[] options = new ButtonSpec[] {
+                            new ButtonSpec(
+                                    tr("Abort Merging"),
+                                    ImageProvider.get("cancel"),
+                                    tr("Click to abort merging nodes"),
+                                    null /* no special help topic */
+                            )
+                    };
+                    HelpAwareOptionPane.showOptionDialog(
                             Main.parent,
-                            tr("Cannot merge nodes: " +
-                            "Would have to delete a way that is still used."),
+                            tr(
+                                    "Cannot merge nodes: Would have to delete way ''{0}'' which is still used.",
+                                    w.getDisplayName(DefaultNameFormatter.getInstance())
+                            ),
                             tr("Warning"),
-                            JOptionPane.WARNING_MESSAGE
+                            JOptionPane.WARNING_MESSAGE,
+                            null, /* no icon */
+                            options,
+                            options[0],
+                            ht("/Action/MergeNodes#WaysToDeleteStillInUse")
                     );
                     return null;
@@ -178 +195 @@
             }
         }
+        cmds.add(new DeleteCommand(waysToDelete));
         return cmds;
     }