Changeset 6410 in josm

Timestamp:

2013-11-25T01:23:30+01:00 (11 years ago)

Author:

Don-vip

Message:

• tagchecker: ignore keys starting with source:
• utils: handle unicode character '\uFEFF' (ZERO WIDTH NO-BREAK SPACE)

Location:

trunk

Files:

• data/ignoretags.cfg (modified) (1 diff)
• src/org/openstreetmap/josm/tools/Utils.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/tools/UtilsTest.java (modified) (1 diff)

trunk/data/ignoretags.cfg

@@ -20 +20 @@
 S:is_in
 S:wikipedia
+S:source:
 S:source_ref:
 ;

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

@@ -701 +701 @@
             char c = str.charAt(start);
             // '\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');
+            // same for '\uFEFF' (ZERO WIDTH NO-BREAK SPACE)
+            leadingWhite = (Character.isWhitespace(c) || Character.isSpaceChar(c) || c == '\u200B' || c == '\uFEFF');
             if (leadingWhite) {
                 start++;
@@ -709 +710 @@
         while (trailingWhite && end > start+1) {
             char c = str.charAt(end-1);
-            trailingWhite = (Character.isWhitespace(c) || Character.isSpaceChar(c) || c == '\u200B');
+            trailingWhite = (Character.isWhitespace(c) || Character.isSpaceChar(c) || c == '\u200B' || c == '\uFEFF');
             if (trailingWhite) {
                 end--;

trunk/test/unit/org/openstreetmap/josm/tools/UtilsTest.java

@@ -31 +31 @@
             "\u2007"+ // FIGURE SPACE
             "\u200B"+ // ZERO WIDTH SPACE
+            "\uFEFF"+ // ZERO WIDTH NO-BREAK SPACE
             "\u3000"; // IDEOGRAPHIC SPACE
         Assert.assertNull(Utils.strip(null));