Changeset 6699 in josm for trunk/src/org/openstreetmap/josm/data/osm

Timestamp:

2014-01-16T02:42:49+01:00 (10 years ago)

Author:

Don-vip

Message:

fix #9547 - Remove multiple whitespaces inside values

File:

• trunk/src/org/openstreetmap/josm/data/osm/Tag.java (modified) (3 diffs)

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

@@ -3 +3 @@
 
 import org.openstreetmap.josm.tools.CheckParameterUtil;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -17 +18 @@
      * Create an empty tag whose key and value are empty.
      */
-    public Tag(){
+    public Tag() {
         this("", "");
     }
@@ -119 +120 @@
         return key + "=" + value;
     }
+
+    /**
+     * 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 6699
+     */
+    public static String removeWhiteSpaces(String s) {
+        if (s == null || s.isEmpty()) {
+            return s;
+        }
+        return Utils.strip(s).replaceAll("\\s+", " ");
+    }
 }