Changeset 13597 in josm for trunk

Timestamp:

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

Author:

Don-vip

Message:

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

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/upload/FixDataHook.java (modified) (2 diffs)
• data/osm/Tag.java (modified) (1 diff)
• data/validation/tests/MapCSSTagChecker.java (modified) (1 diff)
• data/validation/tests/TagChecker.java (modified) (1 diff)
• gui/conflict/tags/RelationMemberConflictResolver.java (modified) (3 diffs)
• gui/dialogs/properties/TagEditHelper.java (modified) (2 diffs)
• gui/tagging/presets/items/ComboMultiSelect.java (modified) (1 diff)
• gui/tagging/presets/items/Text.java (modified) (2 diffs)
• tools/TextTagParser.java (modified) (1 diff)
• tools/Utils.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/upload/FixDataHook.java

@@ -18 +18 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Relation;
-import org.openstreetmap.josm.data.osm.Tag;
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.spi.preferences.Config;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -82 +82 @@
             Map<String, String> newKeys = new HashMap<>(keys);
             for (Entry<String, String> e : keys.entrySet()) {
-                String v = Tag.removeWhiteSpaces(e.getValue());
-                String k = Tag.removeWhiteSpaces(e.getKey());
+                String v = Utils.removeWhiteSpaces(e.getValue());
+                String k = Utils.removeWhiteSpaces(e.getKey());
                 boolean drop = k.isEmpty() || v.isEmpty();
                 if (!e.getKey().equals(k)) {

trunk/src/org/openstreetmap/josm/data/osm/Tag.java

@@ -145 +145 @@
      * @return The string without leading, trailing or multiple inner whitespaces
      * @since 6699
-     */
+     * @deprecated since 13597. Use {@link Utils#removeWhiteSpaces(String)} instead
+     */
+    @Deprecated
     public static String removeWhiteSpaces(String s) {
-        if (s == null || s.isEmpty()) {
-            return s;
-        }
-        return Utils.strip(s).replaceAll("\\s+", " ");
+        return Utils.removeWhiteSpaces(s);
     }
 

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);

trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java

@@ -31 +31 @@
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.data.osm.Tag;
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
@@ -39 +38 @@
 import org.openstreetmap.josm.gui.widgets.JMultilineLabel;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -197 +197 @@
         if (primitives == null || primitives.isEmpty())
             return null;
-        return new ChangePropertyCommand(primitives, Tag.removeWhiteSpaces(tfKey.getText()), Tag.removeWhiteSpaces(tfValue.getText()));
+        return new ChangePropertyCommand(primitives, Utils.removeWhiteSpaces(tfKey.getText()), Utils.removeWhiteSpaces(tfValue.getText()));
     }
 

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

@@ -494 +494 @@
         @Override
         public void performTagEdit() {
-            String value = Tag.removeWhiteSpaces(values.getEditor().getItem().toString());
+            String value = Utils.removeWhiteSpaces(values.getEditor().getItem().toString());
             value = Normalizer.normalize(value, Normalizer.Form.NFC);
             if (value.isEmpty()) {
                 value = null; // delete the key
             }
-            String newkey = Tag.removeWhiteSpaces(keys.getEditor().getItem().toString());
+            String newkey = Utils.removeWhiteSpaces(keys.getEditor().getItem().toString());
             newkey = Normalizer.normalize(newkey, Normalizer.Form.NFC);
             if (newkey.isEmpty()) {
@@ -1060 +1060 @@
          */
         public final void performTagAdding() {
-            String key = Tag.removeWhiteSpaces(keys.getEditor().getItem().toString());
-            String value = Tag.removeWhiteSpaces(values.getEditor().getItem().toString());
+            String key = Utils.removeWhiteSpaces(keys.getEditor().getItem().toString());
+            String value = Utils.removeWhiteSpaces(values.getEditor().getItem().toString());
             if (key.isEmpty() || value.isEmpty())
                 return;

trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/ComboMultiSelect.java

@@ -530 +530 @@
             value = "";
         }
-        value = Tag.removeWhiteSpaces(value);
+        value = Utils.removeWhiteSpaces(value);
 
         // no change if same as before

trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/Text.java

@@ -31 +31 @@
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.Logging;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -207 +208 @@
         }
 
-        v = Tag.removeWhiteSpaces(v);
+        v = Utils.removeWhiteSpaces(v);
 
         if (!"false".equals(use_last_as_default) || auto_increment != null) {

trunk/src/org/openstreetmap/josm/tools/TextTagParser.java

@@ -59 +59 @@
             Matcher m = p.matcher(line);
             if (m.matches()) {
-                 k = m.group(1).trim();
-                 v = m.group(2).trim();
+                 k = Utils.removeWhiteSpaces(m.group(1));
+                 v = Utils.removeWhiteSpaces(m.group(2));
                  if (unescapeTextInQuotes) {
                      k = unescape(k);

trunk/src/org/openstreetmap/josm/tools/Utils.java

@@ -823 +823 @@
 
     /**
+     * Removes leading, trailing, and multiple inner whitespaces from the given string, to be used as a key or value.
+     * @param s The string
+     * @return The string without leading, trailing or multiple inner whitespaces
+     * @since 13597
+     */
+    public static String removeWhiteSpaces(String s) {
+        if (s == null || s.isEmpty()) {
+            return s;
+        }
+        return strip(s).replaceAll("\\s+", " ");
+    }
+
+    /**
      * Runs an external command and returns the standard output.
      *