Changeset 8404 in josm for trunk/src/org/openstreetmap/josm/gui/preferences/advanced/AdvancedPreference.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/gui/preferences/advanced/AdvancedPreference.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/advanced/AdvancedPreference.java

@@ -15 +15 @@
 import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -49 +50 @@
 import org.openstreetmap.josm.gui.widgets.JosmTextField;
 import org.openstreetmap.josm.tools.GBC;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -191 +193 @@
             @Override
             public boolean accept(File f) {
-                return f.isDirectory() || f.getName().toLowerCase().endsWith(".xml");
+                return f.isDirectory() || Utils.hasExtension(f, "xml");
             }
             @Override
@@ -435 +437 @@
 
             // Make 'wmsplugin cache' search for e.g. 'cache.wmsplugin'
-            final String prefKeyLower = prefKey.toLowerCase();
-            final String prefValueLower = prefValue.toLowerCase();
+            final String prefKeyLower = prefKey.toLowerCase(Locale.ENGLISH);
+            final String prefValueLower = prefValue.toLowerCase(Locale.ENGLISH);
             for (String bit : input) {
-                bit = bit.toLowerCase();
+                bit = bit.toLowerCase(Locale.ENGLISH);
                 if (!prefKeyLower.contains(bit) && !prefValueLower.contains(bit)) {
                     canHas = false;