Merge commit '42b2e5ca519766e37ce6941ba4faecc9691cc403' into upstream

[debian/openrocket] / core / src / net / sf / openrocket / gui / util / SimpleFileFilter.java

diff --git a/core/src/net/sf/openrocket/gui/util/SimpleFileFilter.java b/core/src/net/sf/openrocket/gui/util/SimpleFileFilter.java
index 39ded917956f48ffca6e2c54935d56918a0a0ce6..e895b9299d490c46d9b33aca661ab460e60314d9 100644 (file)
--- a/core/src/net/sf/openrocket/gui/util/SimpleFileFilter.java
+++ b/core/src/net/sf/openrocket/gui/util/SimpleFileFilter.java
@@ -1,6 +1,7 @@
 package net.sf.openrocket.gui.util;
 
 import java.io.File;
+import java.util.Locale;
 
 import javax.swing.filechooser.FileFilter;
 
@@ -12,7 +13,7 @@ import javax.swing.filechooser.FileFilter;
  * @author Sampo Niskanen <sampo.niskanen@iki.fi>
  */
 public class SimpleFileFilter extends FileFilter implements java.io.FileFilter {
-
+       
        private final String description;
        private final boolean acceptDir;
        private final String[] extensions;
@@ -25,11 +26,11 @@ public class SimpleFileFilter extends FileFilter implements java.io.FileFilter {
         * @param description   the description of this file filter.
         * @param extensions    an array of extensions that match this filter.
         */
-       public SimpleFileFilter(String description, String ... extensions) {
+       public SimpleFileFilter(String description, String... extensions) {
                this(description, true, extensions);
        }
        
-
+       
        /**
         * Create filter that accepts files with the provided extensions.
         * 
@@ -37,12 +38,12 @@ public class SimpleFileFilter extends FileFilter implements java.io.FileFilter {
         * @param acceptDir             whether to accept directories
         * @param extensions    an array of extensions that match this filter.
         */
-       public SimpleFileFilter(String description, boolean acceptDir, String ... extensions) {
+       public SimpleFileFilter(String description, boolean acceptDir, String... extensions) {
                this.description = description;
                this.acceptDir = acceptDir;
                this.extensions = new String[extensions.length];
-               for (int i=0; i<extensions.length; i++) {
-                       String ext = extensions[i].toLowerCase();
+               for (int i = 0; i < extensions.length; i++) {
+                       String ext = extensions[i].toLowerCase(Locale.ENGLISH);
                        if (ext.charAt(0) == '.') {
                                this.extensions[i] = ext;
                        } else {
@@ -60,18 +61,18 @@ public class SimpleFileFilter extends FileFilter implements java.io.FileFilter {
                        return acceptDir;
                
                String filename = file.getName();
-               filename = filename.toLowerCase();
-               for (String ext: extensions) {
+               filename = filename.toLowerCase(Locale.ENGLISH);
+               for (String ext : extensions) {
                        if (filename.endsWith(ext))
                                return true;
                }
                
                return false;
        }
-
+       
        @Override
        public String getDescription() {
                return description;
        }
-
+       
 }