Changeset 1155 in josm for trunk/src/org/openstreetmap/josm/actions/search
- Timestamp:
- 2008-12-22T15:14:51+01:00 (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java
r888 r1155 90 90 String v1 = caseSensitive ? value : value.toLowerCase(); 91 91 String v2 = caseSensitive ? this.value : this.value.toLowerCase(); 92 v1 = java.text.Normalizer.normalize(v1, java.text.Normalizer.Form.NFC); 93 v2 = java.text.Normalizer.normalize(v2, java.text.Normalizer.Form.NFC); 92 94 return v1.indexOf(v2) != -1; 93 95 } … … 102 104 return s.equals(""); 103 105 String search = caseSensitive ? s : s.toLowerCase(); 106 search = java.text.Normalizer.normalize(search, java.text.Normalizer.Form.NFC); 104 107 for (Entry<String, String> e : osm.keys.entrySet()) { 105 108 String key = caseSensitive ? e.getKey() : e.getKey().toLowerCase(); 106 109 String value = caseSensitive ? e.getValue() : e.getValue().toLowerCase(); 110 value = java.text.Normalizer.normalize(value, java.text.Normalizer.Form.NFC); 107 111 if (key.indexOf(search) != -1 || value.indexOf(search) != -1) 108 112 return true; 109 113 } 110 114 if (osm.user != null) { 111 String name = osm.user.name;115 String name = java.text.Normalizer.normalize(osm.user.name, java.text.Normalizer.Form.NFC); 112 116 if (!caseSensitive) 113 117 name = name.toLowerCase();
Note:
See TracChangeset
for help on using the changeset viewer.