X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FJalviewFileView.java;h=18114f34b747c6fc44b02fa42b4fc49ab5b020fa;hb=7047b076a62df177047ceb16c3611efe020bdd76;hp=27c6a073b0af267ae26103e888ffcd067e1db192;hpb=865a855a4ca87eadb3e5ff284ed32ed307d9c34b;p=jalview.git
diff --git a/src/jalview/io/JalviewFileView.java b/src/jalview/io/JalviewFileView.java
index 27c6a07..18114f3 100755
--- a/src/jalview/io/JalviewFileView.java
+++ b/src/jalview/io/JalviewFileView.java
@@ -1,80 +1,101 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.0b1)
- * Copyright (C) 2014 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
*
* This file is part of Jalview.
*
* Jalview is free software: you can redistribute it and/or
* modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
*
* Jalview is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR
* PURPOSE. See the GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License along with Jalview. If not, see .
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview. If not, see .
* The Jalview Authors are detailed in the 'AUTHORS' file.
*/
package jalview.io;
-import java.io.*;
-import java.util.*;
+import java.io.File;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
-import javax.swing.*;
-import javax.swing.filechooser.*;
+import javax.swing.Icon;
+import javax.swing.ImageIcon;
+import javax.swing.filechooser.FileView;
public class JalviewFileView extends FileView
{
- static Hashtable alignSuffix = new Hashtable();
+ private static Map extensions;
- static
+ private static Map icons;
+
+ private void loadExtensions()
{
- alignSuffix.put("fasta", "Fasta file");
- alignSuffix.put("fa", "Fasta file");
- alignSuffix.put("fastq", "Fasta file");
- alignSuffix.put("blc", "BLC file");
- alignSuffix.put("msf", "MSF file");
- alignSuffix.put("pfam", "PFAM file");
- alignSuffix.put("aln", "Clustal file");
- alignSuffix.put("pir", "PIR file");
- alignSuffix.put("jar", "Jalview file");
+ extensions = new HashMap<>();
+ for (FileFormatI ff : FileFormats.getInstance().getFormats())
+ {
+ String desc = ff.getName() + " file";
+ String exts = ff.getExtensions();
+ for (String ext : exts.split(","))
+ {
+ ext = ext.trim().toLowerCase();
+ extensions.put(ext,
+ desc + ("jar".equals(ext) ? " (old)" : ""));
+ }
+ }
}
+ @Override
public String getTypeDescription(File f)
{
String extension = getExtension(f);
- String type = null;
-
+ String type = getDescriptionForExtension(extension);
if (extension != null)
{
- if (alignSuffix.containsKey(extension))
+ if (extensions.containsKey(extension))
{
- type = alignSuffix.get(extension).toString();
+ type = extensions.get(extension).toString();
}
}
return type;
}
+ private String getDescriptionForExtension(String extension)
+ {
+ synchronized (this)
+ {
+ if (extensions == null)
+ {
+ loadExtensions();
+ }
+ }
+ return extensions.get(extension);
+ }
+
+ @Override
public Icon getIcon(File f)
{
String extension = getExtension(f);
Icon icon = null;
- if (extension != null)
+ if (getDescriptionForExtension(extension) != null)
{
- if (alignSuffix.containsKey(extension))
- {
- icon = createImageIcon("/images/file.png");
- }
+ icon = getImageIcon("/images/file.png");
}
return icon;
}
- /*
- * Get the extension of a file.
+ /**
+ * Returns the extension of a file (part of the name after the last period),
+ * in lower case, or null if the name ends in or does not include a period.
*/
public static String getExtension(File f)
{
@@ -90,22 +111,44 @@ public class JalviewFileView extends FileView
return ext;
}
- /** Returns an ImageIcon, or null if the path was invalid. */
- protected static ImageIcon createImageIcon(String path)
+ /**
+ * Returns an ImageIcon, or null if the file was not found
+ *
+ * @param filePath
+ */
+ protected ImageIcon getImageIcon(String filePath)
{
- java.net.URL imgURL = JalviewFileView.class.getResource(path);
-
- if (imgURL != null)
+ /*
+ * we reuse a single icon object per path here
+ */
+ synchronized (this)
{
- return new ImageIcon(imgURL);
+ if (icons == null)
+ {
+ icons = new HashMap<>();
+ }
+ if (!icons.containsKey(filePath))
+ {
+ ImageIcon icon = null;
+ URL imgURL = JalviewFileView.class.getResource(filePath);
+ if (imgURL != null)
+ {
+ icon = new ImageIcon(imgURL);
+ }
+ else
+ {
+ System.err.println(
+ "JalviewFileView.createImageIcon: Couldn't find file: "
+ + filePath);
+ }
+ icons.put(filePath, icon);
+ }
}
- else
- {
- System.err
- .println("JalviewFileView.createImageIcon: Couldn't find file: "
- + path);
- return null;
- }
+ /*
+ * return the image from the table (which may be null if
+ * icon creation failed)
+ */
+ return icons.get(filePath);
}
}