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

Timestamp:

2010-09-23T09:41:18+02:00 (14 years ago)

Author:

bastiK

Message:

cleanup search - use unicode normalization (java 6 required)

File:

• trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java (modified) (7 diffs)

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

@@ -7 +7 @@
 import java.io.PushbackReader;
 import java.io.StringReader;
+import java.text.Normalizer;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -235 +236 @@
                 String v2 = caseSensitive ? value : value.toLowerCase();
 
-                // is not Java 1.5
-                //v1 = java.text.Normalizer.normalize(v1, java.text.Normalizer.Form.NFC);
-                //v2 = java.text.Normalizer.normalize(v2, java.text.Normalizer.Form.NFC);
+                v1 = Normalizer.normalize(v1, Normalizer.Form.NFC);
+                v2 = Normalizer.normalize(v2, Normalizer.Form.NFC);
                 return v1.indexOf(v2) != -1;
             }
@@ -260 +260 @@
 
         public ExactKeyValue(boolean regexp, String key, String value) throws ParseError {
-            if (key == "")
+            if ("".equals(key))
                 throw new ParseError(tr("Key cannot be empty when tag operator is used. Sample use: key=value"));
             this.key = key;
@@ -380 +380 @@
 
         public Any(String s, boolean regexSearch, boolean caseSensitive) throws ParseError {
+            s = Normalizer.normalize(s, Normalizer.Form.NFC);
             this.caseSensitive = caseSensitive;
             if (regexSearch) {
@@ -400 +401 @@
 
         @Override public boolean match(OsmPrimitive osm) {
-            if (!osm.hasKeys())
+            if (!osm.hasKeys() && osm.getUser() == null)
                 return search.equals("");
 
-            // is not Java 1.5
-            //search = java.text.Normalizer.normalize(search, java.text.Normalizer.Form.NFC);
             for (String key: osm.keySet()) {
                 String value = osm.get(key);
                 if (searchRegex != null) {
 
-                    // is not Java 1.5
-                    //value = java.text.Normalizer.normalize(value, java.text.Normalizer.Form.NFC);
+                    value = Normalizer.normalize(value, Normalizer.Form.NFC);
 
                     Matcher keyMatcher = searchRegex.matcher(key);
@@ -426 +424 @@
                     }
 
-                    // is not Java 1.5
-                    //value = java.text.Normalizer.normalize(value, java.text.Normalizer.Form.NFC);
+                    value = Normalizer.normalize(value, Normalizer.Form.NFC);
 
                     if (key.indexOf(search) != -1 || value.indexOf(search) != -1)
@@ -434 +431 @@
             }
             if (osm.getUser() != null) {
-                String name = osm.getUser().getName();
-                // is not Java 1.5
-                //String name = java.text.Normalizer.normalize(name, java.text.Normalizer.Form.NFC);
-                if (!caseSensitive) {
-                    name = name.toLowerCase();
-                }
-                if (name.indexOf(search) != -1)
-                    return true;
+                for (String name : osm.getUser().getNames()) {
+                    name = Normalizer.normalize(name, Normalizer.Form.NFC);
+                    if (!caseSensitive) {
+                        name = name.toLowerCase();
+                    }
+                    if (name.indexOf(search) != -1)
+                        return true;
+                }
             }
             return false;