Changeset 9382 in josm for trunk/src/org

Timestamp:

2016-01-10T10:49:51+01:00 (9 years ago)

Author:

simon04

Message:

fix #12329 - Tag checker: Losing valid values when auto-fixing in some tests

File:

• trunk/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java

@@ -444 +444 @@
                             // misspelled preset key
                             String i = marktr("Key ''{0}'' looks like ''{1}''.");
-                            errors.add(new FixableTestError(this, Severity.WARNING, tr("Misspelled property key"),
-                                    tr(i, key, fixedKey),
-                                    MessageFormat.format(i, key, fixedKey), MISSPELLED_KEY, p,
-                                    new ChangePropertyKeyCommand(p, key, fixedKey)));
+                            final TestError error;
+                            if (p.hasKey(fixedKey)) {
+                                error = new TestError(this, Severity.WARNING, tr("Misspelled property key"),
+                                        tr(i, key, fixedKey),
+                                        MessageFormat.format(i, key, fixedKey), MISSPELLED_KEY, p);
+                            } else {
+                                error = new FixableTestError(this, Severity.WARNING, tr("Misspelled property key"),
+                                        tr(i, key, fixedKey),
+                                        MessageFormat.format(i, key, fixedKey), MISSPELLED_KEY, p,
+                                        new ChangePropertyKeyCommand(p, key, fixedKey));
+                            }
+                            errors.add(error);
                             withErrors.put(p, "WPK");
                         } else {