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

Timestamp:

2015-05-21T01:18:35+02:00 (11 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/tools

Files:

• ColorHelper.java (modified) (2 diffs)
• ImageProvider.java (modified) (1 diff)
• LanguageInfo.java (modified) (4 diffs)
• PlatformHookUnixoid.java (modified) (2 diffs)
• PlatformHookWindows.java (modified) (2 diffs)
• Utils.java (modified) (3 diffs)
• template_engine/Variable.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/tools/ColorHelper.java

@@ -3 +3 @@
 
 import java.awt.Color;
+import java.util.Locale;
 
 /**
@@ -40 +41 @@
     private static String int2hex(int i) {
         String s = Integer.toHexString(i / 16) + Integer.toHexString(i % 16);
-        return s.toUpperCase();
+        return s.toUpperCase(Locale.ENGLISH);
     }
 

trunk/src/org/openstreetmap/josm/tools/ImageProvider.java

@@ -693 +693 @@
             }
 
-            ImageType type = name.toLowerCase().endsWith(".svg") ? ImageType.SVG : ImageType.OTHER;
+            ImageType type = Utils.hasExtension(name, "svg") ? ImageType.SVG : ImageType.OTHER;
 
             if (name.startsWith(HTTP_PROTOCOL) || name.startsWith(HTTPS_PROTOCOL)) {

trunk/src/org/openstreetmap/josm/tools/LanguageInfo.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.tools;
-
-import static org.openstreetmap.josm.tools.I18n.trc;
 
 import java.util.Collection;
@@ -55 +53 @@
             return null;
         } else if(code.matches(".+@.+")) {
-          return code.substring(0,1).toUpperCase() + code.substring(1,2)
-          + "-" + code.substring(3,4).toUpperCase() + code.substring(4) + ":";
-        }
-        return code.substring(0,1).toUpperCase() + code.substring(1) + ":";
+          return code.substring(0,1).toUpperCase(Locale.ENGLISH) + code.substring(1,2)
+          + "-" + code.substring(3,4).toUpperCase(Locale.ENGLISH) + code.substring(4) + ":";
+        }
+        return code.substring(0,1).toUpperCase(Locale.ENGLISH) + code.substring(1) + ":";
     }
 
@@ -88 +86 @@
      * to identify the locale of a localized resource, but in some cases it may use the
      * programmatic name for locales, as replied by {@link Locale#toString()}.
-     * 
+     *
      * For unknown country codes and variants this function already does fallback to
      * internally known translations.
@@ -191 +189 @@
         return want.equals(newLanguage) || (!want.equals(oldLanguage) && newLanguage.startsWith("en"));
     }
-    
+
     /**
      * Replies the language prefix for use in XML elements (with a dot appended).

trunk/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java

@@ -32 +32 @@
 import java.util.Collection;
 import java.util.List;
+import java.util.Locale;
 import java.util.Properties;
 
@@ -501 +502 @@
                 for (FontEntry entry: extrasPref) {
                     Collection<String> fontsAvail = getInstalledFonts();
-                    if (fontsAvail != null && fontsAvail.contains(entry.file.toUpperCase())) {
+                    if (fontsAvail != null && fontsAvail.contains(entry.file.toUpperCase(Locale.ENGLISH))) {
                         if (!allCharSubsets.contains(entry.charset)) {
                             allCharSubsets.add(entry.charset);

trunk/src/org/openstreetmap/josm/tools/PlatformHookWindows.java

@@ -50 +50 @@
 import java.util.Enumeration;
 import java.util.List;
+import java.util.Locale;
 
 import javax.swing.JOptionPane;
@@ -320 +321 @@
                 Path filename = p.getFileName();
                 if (filename != null) {
-                    fontsAvail.add(filename.toString().toUpperCase());
+                    fontsAvail.add(filename.toString().toUpperCase(Locale.ENGLISH));
                 }
             }

trunk/src/org/openstreetmap/josm/tools/Utils.java

@@ -42 +42 @@
 import java.util.Iterator;
 import java.util.List;
+import java.util.Locale;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -1206 +1207 @@
         if (value != null) {
             String old = System.setProperty(key, value);
-            if (!key.toLowerCase().contains("password")) {
+            if (!key.toLowerCase(Locale.ENGLISH).contains("password")) {
                 Main.debug("System property '"+key+"' set to '"+value+"'. Old value was '"+old+"'");
             } else {
@@ -1251 +1252 @@
         }
     }
+
+    /**
+     * Determines if the filename has one of the given extensions, in a robust manner.
+     * The comparison is case and locale insensitive.
+     * @param filename The file name
+     * @param extensions The list of extensions to look for (without dot)
+     * @return {@code true} if the filename has one of the given extensions
+     * @since 8404
+     */
+    public static boolean hasExtension(String filename, String ... extensions) {
+        String name = filename.toLowerCase(Locale.ENGLISH);
+        for (String ext : extensions)
+            if (name.endsWith("."+ext.toLowerCase(Locale.ENGLISH)))
+                return true;
+        return false;
+    }
+
+    /**
+     * Determines if the file's name has one of the given extensions, in a robust manner.
+     * The comparison is case and locale insensitive.
+     * @param file The file
+     * @param extensions The list of extensions to look for (without dot)
+     * @return {@code true} if the file's name has one of the given extensions
+     * @since 8404
+     */
+    public static boolean hasExtension(File file, String ... extensions) {
+        return hasExtension(file.getName(), extensions);
+    }
 }

trunk/src/org/openstreetmap/josm/tools/template_engine/Variable.java

@@ -3 +3 @@
 
 import java.util.Collection;
+import java.util.Locale;
 
 public class Variable implements TemplateEntry {
@@ -14 +15 @@
 
     public Variable(String variableName) {
-        if (variableName.toLowerCase().startsWith(SPECIAL_VARIABLE_PREFIX)) {
+        if (variableName.toLowerCase(Locale.ENGLISH).startsWith(SPECIAL_VARIABLE_PREFIX)) {
             this.variableName = variableName.substring(SPECIAL_VARIABLE_PREFIX.length());
             // special:special:key means that real key named special:key is needed, not special variable
-            this.special = !this.variableName.toLowerCase().startsWith(SPECIAL_VARIABLE_PREFIX);
+            this.special = !this.variableName.toLowerCase(Locale.ENGLISH).startsWith(SPECIAL_VARIABLE_PREFIX);
         } else {
             this.variableName = variableName;