Changeset 1155 in josm for trunk/src/org/openstreetmap

Timestamp:

2008-12-22T15:14:51+01:00 (16 years ago)

Author:

stoecker

Message:

close bug #518 (normalize UTF strings)

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/search/SearchCompiler.java (modified) (2 diffs)
• gui/dialogs/PropertiesDialog.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java

@@ -90 +90 @@
                         String v1 = caseSensitive ? value : value.toLowerCase();
                         String v2 = caseSensitive ? this.value : this.value.toLowerCase();
+                        v1 = java.text.Normalizer.normalize(v1, java.text.Normalizer.Form.NFC);
+                        v2 = java.text.Normalizer.normalize(v2, java.text.Normalizer.Form.NFC);
                         return v1.indexOf(v2) != -1;
                 }
@@ -102 +104 @@
                                 return s.equals("");
                         String search = caseSensitive ? s : s.toLowerCase();
+                        search = java.text.Normalizer.normalize(search, java.text.Normalizer.Form.NFC);
                         for (Entry<String, String> e : osm.keys.entrySet()) {
                                 String key = caseSensitive ? e.getKey() : e.getKey().toLowerCase();
                                 String value = caseSensitive ? e.getValue() : e.getValue().toLowerCase();
+                                value = java.text.Normalizer.normalize(value, java.text.Normalizer.Form.NFC);
                                 if (key.indexOf(search) != -1 || value.indexOf(search) != -1)
                                         return true;
                         }
                         if (osm.user != null) {
-                                String name = osm.user.name;
+                                String name = java.text.Normalizer.normalize(osm.user.name, java.text.Normalizer.Form.NFC);
                                 if (!caseSensitive)
                                         name = name.toLowerCase();

trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java

@@ -209 +209 @@
 
                 String value = values.getEditor().getItem().toString();
+                value = java.text.Normalizer.normalize(value, java.text.Normalizer.Form.NFC);
                 if (value.equals(""))
                         value = null; // delete the key
                 String newkey = keys.getEditor().getItem().toString();
+                newkey = java.text.Normalizer.normalize(value, java.text.Normalizer.Form.NFC);
                 if (newkey.equals("")) {
                         newkey = key;