Changeset 13597 in josm for trunk/src/org/openstreetmap/josm/data/validation/tests

Timestamp:

2018-04-04T19:47:35+02:00 (6 years ago)

Author:

Don-vip

Message:

fix #16145 - remove white spaces from key/values when pasting tags

Location:

trunk/src/org/openstreetmap/josm/data/validation/tests

Files:

• MapCSSTagChecker.java (modified) (1 diff)
• TagChecker.java (modified) (1 diff)

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

@@ -336 +336 @@
                             CheckParameterUtil.ensureThat(val.contains("=>"), "Separate old from new key by '=>'!");
                             final String[] x = val.split("=>", 2);
-                            check.fixCommands.add(FixCommand.fixChangeKey(Tag.removeWhiteSpaces(x[0]), Tag.removeWhiteSpaces(x[1])));
+                            check.fixCommands.add(FixCommand.fixChangeKey(Utils.removeWhiteSpaces(x[0]), Utils.removeWhiteSpaces(x[1])));
                         } else if (val != null && "fixDeleteObject".equals(ai.key)) {
                             CheckParameterUtil.ensureThat("this".equals(val), "fixDeleteObject must be followed by 'this'");

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

@@ -710 +710 @@
                     commands.add(new ChangePropertyCommand(p, key, null));
                 } else if (value.startsWith(" ") || value.endsWith(" ") || value.contains("  ")) {
-                    commands.add(new ChangePropertyCommand(p, key, Tag.removeWhiteSpaces(value)));
+                    commands.add(new ChangePropertyCommand(p, key, Utils.removeWhiteSpaces(value)));
                 } else if (key.startsWith(" ") || key.endsWith(" ") || key.contains("  ")) {
-                    commands.add(new ChangePropertyKeyCommand(p, key, Tag.removeWhiteSpaces(key)));
+                    commands.add(new ChangePropertyKeyCommand(p, key, Utils.removeWhiteSpaces(key)));
                 } else {
                     String evalue = Entities.unescape(value);