Changeset 6094 in josm for trunk/src/org/openstreetmap/josm/tools/Utils.java

Timestamp:

2013-07-31T01:12:19+02:00 (11 years ago)

Author:

Don-vip

Message:

fix #8918 - Handle Zero width space char since Java 7 changes related to Unicode 6.0

File:

• trunk/src/org/openstreetmap/josm/tools/Utils.java (modified) (2 diffs)

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

@@ -648 +648 @@
         while (leadingWhite && start < end) {
             char c = str.charAt(start);
-            leadingWhite = (Character.isWhitespace(c) || Character.isSpaceChar(c));
+            // '\u200B' (ZERO WIDTH SPACE character) needs to be handled manually because of change in Unicode 6.0 (Java 7, see #8918)
+            leadingWhite = (Character.isWhitespace(c) || Character.isSpaceChar(c) || c == '\u200B');
             if (leadingWhite) {
                 start++;
@@ -656 +657 @@
         while (trailingWhite && end > start+1) {
             char c = str.charAt(end-1);
-            trailingWhite = (Character.isWhitespace(c) || Character.isSpaceChar(c));
+            trailingWhite = (Character.isWhitespace(c) || Character.isSpaceChar(c) || c == '\u200B');
             if (trailingWhite) {
                 end--;