Changeset 16952 in josm for trunk

Timestamp:

2020-08-28T22:38:26+02:00 (4 years ago)

Author:

simon04

Message:

see #19717 - Extract DefaultNameFormatter.removeBiDiCharacters

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/osm/DefaultNameFormatter.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/datatransfer/PrimitiveTransferable.java (modified) (2 diffs)
• src/org/openstreetmap/josm/gui/datatransfer/RelationMemberTransferable.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/data/osm/DefaultNameFormatterTest.java (modified) (1 diff)

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

@@ -672 +672 @@
         return formatAsHtmlUnorderedList(Collections.singletonList(primitive), 1);
     }
+
+    /**
+     * Removes the bidirectional text characters U+200C, U+200E, U+200F from the string
+     * @param string the string
+     * @return the string with the bidirectional text characters removed
+     */
+    public static String removeBiDiCharacters(String string) {
+        return string.replaceAll("[\\u200C\\u200E\\u200F]", "");
+    }
 }

trunk/src/org/openstreetmap/josm/gui/datatransfer/PrimitiveTransferable.java

@@ -9 +9 @@
 import java.util.List;
 
+import org.openstreetmap.josm.data.osm.DefaultNameFormatter;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 import org.openstreetmap.josm.data.osm.PrimitiveData;
@@ -91 +92 @@
             sb.append(OsmPrimitiveType.from(primitive).getAPIName()).append(' ').append(primitive.getId());
         }
-        return sb.toString().replace("\u200C", "").replace("\u200E", "").replace("\u200F", "");
+        return DefaultNameFormatter.removeBiDiCharacters(sb.toString());
     }
 }

trunk/src/org/openstreetmap/josm/gui/datatransfer/RelationMemberTransferable.java

@@ -107 +107 @@
               .append('\n');
         }
-        return sb.toString().replace("\u200C", "").replace("\u200E", "").replace("\u200F", "");
+        return DefaultNameFormatter.removeBiDiCharacters(sb.toString());
     }
 

trunk/test/unit/org/openstreetmap/josm/data/osm/DefaultNameFormatterTest.java

@@ -168 +168 @@
                         TestUtils.newNode("tourism=hotel name:en=foo url=http://foo.bar xml=<tag/>")));
     }
+
+    /**
+     * Test of {@link DefaultNameFormatter#removeBiDiCharacters(String)}.
+     */
+    @Test
+    public void testRemoveBiDiCharacters() {
+        assertEquals("building (0 nodes)", DefaultNameFormatter.removeBiDiCharacters("\u200Ebuilding\u200E (0 nodes)\u200C"));
+    }
 }