git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-3997 check for tooltip being null before checking equivalence to last tooltip...
[jalview.git]
/
src
/
jalview
/
io
/
JalviewFileFilter.java
diff --git
a/src/jalview/io/JalviewFileFilter.java
b/src/jalview/io/JalviewFileFilter.java
index
8c6b802
..
10dc9ea
100755
(executable)
--- a/
src/jalview/io/JalviewFileFilter.java
+++ b/
src/jalview/io/JalviewFileFilter.java
@@
-20,6
+20,8
@@
*/
package jalview.io;
*/
package jalview.io;
+import java.util.Locale;
+
import java.io.File;
import java.util.Hashtable;
import java.util.Iterator;
import java.io.File;
import java.util.Hashtable;
import java.util.Iterator;
@@
-103,10
+105,16
@@
public class JalviewFileFilter extends FileFilter
if (parentJFC != null && parentJFC.includeBackupFiles)
{
Iterator<String> it = filters.keySet().iterator();
if (parentJFC != null && parentJFC.includeBackupFiles)
{
Iterator<String> it = filters.keySet().iterator();
- while (it.hasNext())
+ EXTENSION: while (it.hasNext())
{
String ext = it.next();
{
String ext = it.next();
+ // quick negative test
+ if (!f.getName().contains(ext))
+ {
+ continue EXTENSION;
+ }
+
BackupFilenameParts bfp = BackupFilenameParts
.currentBackupFilenameParts(f.getName(), ext, true);
if (bfp.isBackupFile())
BackupFilenameParts bfp = BackupFilenameParts
.currentBackupFilenameParts(f.getName(), ext, true);
if (bfp.isBackupFile())
@@
-115,7
+123,7
@@
public class JalviewFileFilter extends FileFilter
}
}
}
}
}
}
-
+
return false;
}
return false;
}
@@
-128,7
+136,7
@@
public class JalviewFileFilter extends FileFilter
if ((i > 0) && (i < (filename.length() - 1)))
{
if ((i > 0) && (i < (filename.length() - 1)))
{
- return filename.substring(i + 1).toLowerCase();
+ return filename.substring(i + 1).toLowerCase(Locale.ROOT);
}
;
}
;
@@
-144,7
+152,7
@@
public class JalviewFileFilter extends FileFilter
filters = new LinkedHashMap<>(5);
}
filters = new LinkedHashMap<>(5);
}
- filters.put(extension.toLowerCase(), this);
+ filters.put(extension.toLowerCase(Locale.ROOT), this);
fullDescription = null;
}
fullDescription = null;
}