Changeset 8404 in josm for trunk/src/org/openstreetmap/josm/plugins

Timestamp:

2015-05-21T01:18:35+02:00 (10 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.

Location:

trunk/src/org/openstreetmap/josm/plugins

Files:

• PluginHandler.java (modified) (3 diffs)
• PluginInformation.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java

@@ -28 +28 @@
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -380 +381 @@
         // check whether automatic update at startup was disabled
         //
-        String policy = Main.pref.get(togglePreferenceKey, "ask").trim().toLowerCase();
+        String policy = Main.pref.get(togglePreferenceKey, "ask").trim().toLowerCase(Locale.ENGLISH);
         switch(policy) {
         case "never":
@@ -1408 +1409 @@
         public void initDontShowAgain(String preferencesKey) {
             String policy = Main.pref.get(preferencesKey, "ask");
-            policy = policy.trim().toLowerCase();
+            policy = policy.trim().toLowerCase(Locale.ENGLISH);
             cbDontShowAgain.setSelected(!"ask".equals(policy));
         }

trunk/src/org/openstreetmap/josm/plugins/PluginInformation.java

@@ -19 +19 @@
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.TreeMap;
@@ -458 +459 @@
         if (filter == null) return true;
         if (value == null) return false;
-        return value.toLowerCase().contains(filter.toLowerCase());
+        return value.toLowerCase(Locale.ENGLISH).contains(filter.toLowerCase(Locale.ENGLISH));
     }