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
Allows Jmol to share cached files
[jalview.git]
/
src
/
jalview
/
io
/
JalviewFileView.java
diff --git
a/src/jalview/io/JalviewFileView.java
b/src/jalview/io/JalviewFileView.java
index
3461110
..
18114f3
100755
(executable)
--- a/
src/jalview/io/JalviewFileView.java
+++ b/
src/jalview/io/JalviewFileView.java
@@
-37,15
+37,16
@@
public class JalviewFileView extends FileView
private void loadExtensions()
{
private void loadExtensions()
{
- extensions = new HashMap<String, String>();
- for (FileFormatI ff : FileFormat.values())
+ extensions = new HashMap<>();
+ for (FileFormatI ff : FileFormats.getInstance().getFormats())
{
{
- String desc = ff.toString() + " file";
+ String desc = ff.getName() + " file";
String exts = ff.getExtensions();
for (String ext : exts.split(","))
{
String exts = ff.getExtensions();
for (String ext : exts.split(","))
{
- extensions.put(ext.trim().toLowerCase(), desc
- + ("jar".equals(ext) ? " (old)" : ""));
+ ext = ext.trim().toLowerCase();
+ extensions.put(ext,
+ desc + ("jar".equals(ext) ? " (old)" : ""));
}
}
}
}
}
}
@@
-124,7
+125,7
@@
public class JalviewFileView extends FileView
{
if (icons == null)
{
{
if (icons == null)
{
- icons = new HashMap<String, ImageIcon>();
+ icons = new HashMap<>();
}
if (!icons.containsKey(filePath))
{
}
if (!icons.containsKey(filePath))
{
@@
-136,8
+137,8
@@
public class JalviewFileView extends FileView
}
else
{
}
else
{
- System.err
- .println("JalviewFileView.createImageIcon: Couldn't find file: "
+ System.err.println(
+ "JalviewFileView.createImageIcon: Couldn't find file: "
+ filePath);
}
icons.put(filePath, icon);
+ filePath);
}
icons.put(filePath, icon);