X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FJalviewFileView.java;h=b90bd7aca13d8626fa6a685d1413d6bd330f86ff;hb=41b0e9331ac71787c1280aa1d809f54c575fbf97;hp=6e045615a85cca707c3f588914833503f63b72db;hpb=c98ec7d017c2f11909f8344fe5d44d97c7c6fc24;p=jalview.git

diff --git a/src/jalview/io/JalviewFileView.java b/src/jalview/io/JalviewFileView.java
index 6e04561..b90bd7a 100755
--- a/src/jalview/io/JalviewFileView.java
+++ b/src/jalview/io/JalviewFileView.java
@@ -20,8 +20,15 @@
  */
 package jalview.io;
 
+import java.util.Locale;
+
+import jalview.util.MessageManager;
+
 import java.io.File;
-import java.util.Hashtable;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
 
 import javax.swing.Icon;
 import javax.swing.ImageIcon;
@@ -29,19 +36,22 @@ import javax.swing.filechooser.FileView;
 
 public class JalviewFileView extends FileView
 {
-  static Hashtable<String, String> extensions;
+  private static Map<String, String> extensions;
+
+  private static Map<String, ImageIcon> icons;
 
-  static void loadExtensions()
+  private void loadExtensions()
   {
-    extensions = new Hashtable<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(","))
       {
-        extensions.put(ext.trim(), desc
-                + ("jar".equals(ext) ? " (old)" : ""));
+        ext = ext.trim().toLowerCase(Locale.ROOT);
+        extensions.put(ext,
+                desc + ("jar".equals(ext) ? " (old)" : ""));
       }
     }
   }
@@ -50,7 +60,9 @@ public class JalviewFileView extends FileView
   public String getTypeDescription(File f)
   {
     String extension = getExtension(f);
+    
     String type = getDescriptionForExtension(extension);
+    
     if (extension != null)
     {
       if (extensions.containsKey(extension))
@@ -79,17 +91,44 @@ public class JalviewFileView extends FileView
   {
     String extension = getExtension(f);
     Icon icon = null;
+    String type = getDescriptionForExtension(extension);
+
+    if (type == null)
+    {
+      Iterator<String> it = extensions.keySet().iterator();
+      EXTENSION: while (it.hasNext())
+      {
+        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())
+        {
+          extension = ext;
+          type = getDescriptionForExtension(extension)
+                  + MessageManager.getString("label.backup");
+          break;
+        }
+      }
+    }
 
-    if (getDescriptionForExtension(extension) != null)
+    if (type != null)
     {
-      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)
   {
@@ -99,7 +138,7 @@ public class JalviewFileView extends FileView
 
     if ((i > 0) && (i < (s.length() - 1)))
     {
-      ext = s.substring(i + 1).toLowerCase();
+      ext = s.substring(i + 1).toLowerCase(Locale.ROOT);
     }
 
     return ext;
@@ -110,21 +149,39 @@ public class JalviewFileView extends FileView
    * 
    * @param filePath
    */
-  protected static ImageIcon createImageIcon(String filePath)
+  protected ImageIcon getImageIcon(String filePath)
   {
-    java.net.URL imgURL = JalviewFileView.class.getResource(filePath);
-
-    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: "
-                      + filePath);
 
-      return null;
-    }
+    /*
+     * return the image from the table (which may be null if
+     * icon creation failed)
+     */
+    return icons.get(filePath);
   }
 }