Changeset 2636 in josm for trunk

Timestamp:

2009-12-14T17:10:27+01:00 (14 years ago)

Author:

stoecker

Message:

fixed #4163 - patch by avar - fixed searching

File:

• trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java (modified) (1 diff)

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

@@ -159 +159 @@
                 }
             } else {
-                String value = null;
+                String mv = null;
 
                 if (key.equals("timestamp")) {
-                    value = DateUtils.fromDate(osm.getTimestamp());
+                    mv = DateUtils.fromDate(osm.getTimestamp());
                 } else {
-                    value = osm.get(key);
-                }
-
-                if (value == null)
+                    mv = osm.get(key);
+                }
+
+                if (mv == null)
                     return false;
 
-                String v1 = caseSensitive ? value : value.toLowerCase();
+                String v1 = caseSensitive ? mv : mv.toLowerCase();
+                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);
-                return v1.indexOf(value) != -1;
+                return v1.indexOf(v2) != -1;
             }