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-4290 Set structureSelectionManager settings more generically and when no desktop...
[jalview.git]
/
src
/
jalview
/
io
/
JalviewFileView.java
diff --git
a/src/jalview/io/JalviewFileView.java
b/src/jalview/io/JalviewFileView.java
index
857d043
..
5996781
100755
(executable)
--- a/
src/jalview/io/JalviewFileView.java
+++ b/
src/jalview/io/JalviewFileView.java
@@
-20,6
+20,8
@@
*/
package jalview.io;
*/
package jalview.io;
+import java.util.Locale;
+
import jalview.util.MessageManager;
import java.io.File;
import jalview.util.MessageManager;
import java.io.File;
@@
-47,9
+49,8
@@
public class JalviewFileView extends FileView
String exts = ff.getExtensions();
for (String ext : exts.split(","))
{
String exts = ff.getExtensions();
for (String ext : exts.split(","))
{
- ext = ext.trim().toLowerCase();
- extensions.put(ext,
- desc + ("jar".equals(ext) ? " (old)" : ""));
+ ext = ext.trim().toLowerCase(Locale.ROOT);
+ extensions.put(ext, desc + ("jar".equals(ext) ? " (old)" : ""));
}
}
}
}
}
}
@@
-58,9
+59,9
@@
public class JalviewFileView extends FileView
public String getTypeDescription(File f)
{
String extension = getExtension(f);
public String getTypeDescription(File f)
{
String extension = getExtension(f);
-
+
String type = getDescriptionForExtension(extension);
String type = getDescriptionForExtension(extension);
-
+
if (extension != null)
{
if (extensions.containsKey(extension))
if (extension != null)
{
if (extensions.containsKey(extension))
@@
-94,9
+95,16
@@
public class JalviewFileView extends FileView
if (type == null)
{
Iterator<String> it = extensions.keySet().iterator();
if (type == null)
{
Iterator<String> it = extensions.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())
@@
-129,7
+137,7
@@
public class JalviewFileView extends FileView
if ((i > 0) && (i < (s.length() - 1)))
{
if ((i > 0) && (i < (s.length() - 1)))
{
- ext = s.substring(i + 1).toLowerCase();
+ ext = s.substring(i + 1).toLowerCase(Locale.ROOT);
}
return ext;
}
return ext;
@@
-161,7
+169,7
@@
public class JalviewFileView extends FileView
}
else
{
}
else
{
- System.err.println(
+ jalview.bin.Console.errPrintln(
"JalviewFileView.createImageIcon: Couldn't find file: "
+ filePath);
}
"JalviewFileView.createImageIcon: Couldn't find file: "
+ filePath);
}