Changeset 4140 in josm for trunk/src/org

Timestamp:

2011-06-18T16:10:06+02:00 (13 years ago)

Author:

stoecker

Message:

fix #6464 - add security check in case tag editing leads to overwrite of existing key

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java

@@ -310 +310 @@
             Main.main.undoRedo.add(new ChangePropertyCommand(sel, newkey, value));
         } else {
+            for (OsmPrimitive osm: sel) {
+                if(osm.get(newkey) != null) {
+                    ExtendedDialog ed = new ExtendedDialog(
+                            Main.parent,
+                            tr("Overwrite key"),
+                            new String[]{tr("Replace"), tr("Cancel")});
+                    ed.setButtonIcons(new String[]{"purge", "cancel"});
+                    ed.setContent(tr("You changed the key from ''{0}'' to ''{1}''.\n"
+                    + "The new key is already used, overwrite values?", key, newkey));
+                    ed.setCancelButton(2);
+                    ed.toggleEnable("overwriteEditKey");
+                    ed.showDialog();
+
+                    if (ed.getValue() != 1) {
+                        return;
+                    }
+                    break;
+                }
+            }
             Collection<Command> commands=new Vector<Command>();
             commands.add(new ChangePropertyCommand(sel, key, null));
@@ -1258 +1277 @@
         }
     }
-
-
 }