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

trunk/src/org/openstreetmap/josm/gui/MainApplication.java

@@ -34 +34 @@
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
@@ -206 +207 @@
 
         private Option(boolean requiresArgument) {
-            this.name = name().toLowerCase().replace("_", "-");
+            this.name = name().toLowerCase(Locale.ENGLISH).replace("_", "-");
             this.requiresArg = requiresArgument;
         }
@@ -229 +230 @@
             Map<Option, Collection<String>> res = new EnumMap<>(Option.class);
             for (Map.Entry<String, Collection<String>> e : opts.entrySet()) {
-                Option o = Option.valueOf(e.getKey().toUpperCase().replace("-", "_"));
+                Option o = Option.valueOf(e.getKey().toUpperCase(Locale.ENGLISH).replace("-", "_"));
                 if (o != null) {
                     res.put(o, e.getValue());
@@ -509 +510 @@
             for (String s : args.get(Option.OFFLINE).iterator().next().split(",")) {
                 try {
-                    Main.setOffline(OnlineResource.valueOf(s.toUpperCase()));
+                    Main.setOffline(OnlineResource.valueOf(s.toUpperCase(Locale.ENGLISH)));
                 } catch (IllegalArgumentException e) {
                     Main.error(tr("''{0}'' is not a valid value for argument ''{1}''. Possible values are {2}, possibly delimited by commas.",
-                            s.toUpperCase(), Option.OFFLINE.getName(), Arrays.toString(OnlineResource.values())));
+                            s.toUpperCase(Locale.ENGLISH), Option.OFFLINE.getName(), Arrays.toString(OnlineResource.values())));
                     System.exit(1);
                     return;