Changeset 8404 in josm for trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java

Timestamp:

2015-05-21T01:18:35+02:00 (9 years ago)

Author:

Don-vip

Message:

When doing a String.toLowerCase()/toUpperCase() call, use a Locale. This avoids problems with certain locales, i.e. Lithuanian or Turkish. See PMD UseLocaleWithCaseConversions rule and String.toLowerCase() javadoc.

File:

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

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

@@ -11 +11 @@
 import java.util.Collection;
 import java.util.HashMap;
+import java.util.Locale;
 import java.util.Map;
 import java.util.regex.Matcher;
@@ -477 +478 @@
                 this.valuePattern = null;
             } else {
-                this.key = key.toLowerCase();
+                this.key = key.toLowerCase(Locale.ENGLISH);
                 this.value = value;
                 this.keyPattern = null;
@@ -523 +524 @@
                     return false;
 
-                String v1 = caseSensitive ? mv : mv.toLowerCase();
-                String v2 = caseSensitive ? value : value.toLowerCase();
+                String v1 = caseSensitive ? mv : mv.toLowerCase(Locale.ENGLISH);
+                String v2 = caseSensitive ? value : value.toLowerCase(Locale.ENGLISH);
 
                 v1 = Normalizer.normalize(v1, Normalizer.Form.NFC);
@@ -533 +534 @@
             return false;
         }
-        @Override public String toString() {return key+"="+value;}
+        @Override
+        public String toString() {
+            return key + "=" + value;
+        }
     }
 
@@ -719 +723 @@
                 this.searchRegex = null;
             } else {
-                this.search = s.toLowerCase();
+                this.search = s.toLowerCase(Locale.ENGLISH);
                 this.searchRegex = null;
             }
@@ -744 +748 @@
                 } else {
                     if (!caseSensitive) {
-                        key = key.toLowerCase();
-                        value = value.toLowerCase();
+                        key = key.toLowerCase(Locale.ENGLISH);
+                        value = value.toLowerCase(Locale.ENGLISH);
                     }