X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FJalviewFileChooser.java;h=d14fa50ece1475ba2c2d83b5fd310fbf806f12b3;hb=ab43013b7e357b84b4abade0dba949668dfb2a0e;hp=1e767829c2163ee1de65eaf7e4261d90f5abf96c;hpb=b57a02c25e335d033c97f8a6bacd6b54f62bd2b6;p=jalview.git

diff --git a/src/jalview/io/JalviewFileChooser.java b/src/jalview/io/JalviewFileChooser.java
index 1e76782..d14fa50 100755
--- a/src/jalview/io/JalviewFileChooser.java
+++ b/src/jalview/io/JalviewFileChooser.java
@@ -1,38 +1,53 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
- * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle
- * 
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2b1)
+ * Copyright (C) 2014 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.
- * 
- * 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 
+ * 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.
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
  */
 //////////////////////////////////////////////////////////////////
 package jalview.io;
 
-import java.io.*;
-import java.util.*;
-
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
+import jalview.util.MessageManager;
+
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.EventQueue;
+import java.awt.HeadlessException;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.io.File;
+import java.util.StringTokenizer;
+import java.util.Vector;
+
+import javax.swing.DefaultListCellRenderer;
+import javax.swing.JFileChooser;
+import javax.swing.JList;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
 
 /**
  * Enhanced file chooser dialog box.
- * 
+ *
  * NOTE: bug on Windows systems when filechooser opened on directory to view
  * files with colons in title.
- * 
+ *
  * @author AMW
- * 
+ *
  */
 public class JalviewFileChooser extends JFileChooser
 {
@@ -99,6 +114,7 @@ public class JalviewFileChooser extends JFileChooser
     setAccessory(new RecentlyOpened());
   }
 
+  @Override
   public void setFileFilter(javax.swing.filechooser.FileFilter filter)
   {
     super.setFileFilter(filter);
@@ -117,6 +133,7 @@ public class JalviewFileChooser extends JFileChooser
 
         EventQueue.invokeLater(new Thread()
         {
+          @Override
           public void run()
           {
             String currentName = ui.getFileName();
@@ -171,17 +188,22 @@ public class JalviewFileChooser extends JFileChooser
     {
       format = "PFAM";
     }
+    else if (format.toUpperCase().startsWith(PhylipFile.FILE_DESC))
+    {
+      format = PhylipFile.FILE_DESC;
+    }
 
     return format;
   }
 
+  @Override
   public int showSaveDialog(Component parent) throws HeadlessException
   {
     this.setAccessory(null);
 
     setDialogType(SAVE_DIALOG);
 
-    int ret = showDialog(parent, "Save");
+    int ret = showDialog(parent, MessageManager.getString("action.save"));
 
     if (getFileFilter() instanceof JalviewFileFilter)
     {
@@ -200,7 +222,7 @@ public class JalviewFileChooser extends JFileChooser
             && getSelectedFile().exists())
     {
       int confirm = JOptionPane.showConfirmDialog(parent,
-              "Overwrite existing file?", "File exists",
+              MessageManager.getString("label.overwrite_existing_file"), MessageManager.getString("label.file_already_exists"),
               JOptionPane.YES_NO_OPTION);
 
       if (confirm != JOptionPane.YES_OPTION)
@@ -212,22 +234,24 @@ public class JalviewFileChooser extends JFileChooser
     return ret;
   }
 
-  void recentListSelectionChanged(String selection)
+  void recentListSelectionChanged(Object selection)
   {
     setSelectedFile(null);
-
-    File file = new File(selection);
-    if (getFileFilter() instanceof JalviewFileFilter)
+    if (selection != null)
     {
-      JalviewFileFilter jvf = (JalviewFileFilter) this.getFileFilter();
-
-      if (!jvf.accept(file))
+      File file = new File((String) selection);
+      if (getFileFilter() instanceof JalviewFileFilter)
       {
-        setFileFilter(getChoosableFileFilters()[0]);
+        JalviewFileFilter jvf = (JalviewFileFilter) this.getFileFilter();
+
+        if (!jvf.accept(file))
+        {
+          setFileFilter(getChoosableFileFilters()[0]);
+        }
       }
-    }
 
-    setSelectedFile(file);
+      setSelectedFile(file);
+    }
   }
 
   class RecentlyOpened extends JPanel
@@ -258,13 +282,14 @@ public class JalviewFileChooser extends JFileChooser
 
       list.addMouseListener(new MouseAdapter()
       {
+        @Override
         public void mousePressed(MouseEvent evt)
         {
-          recentListSelectionChanged(list.getSelectedValue().toString());
+          recentListSelectionChanged(list.getSelectedValue());
         }
       });
 
-      this.setBorder(new javax.swing.border.TitledBorder("Recently Opened"));
+      this.setBorder(new javax.swing.border.TitledBorder(MessageManager.getString("label.recently_opened")));
 
       final JScrollPane scroller = new JScrollPane(list);
       scroller.setPreferredSize(new Dimension(130, 200));
@@ -272,6 +297,7 @@ public class JalviewFileChooser extends JFileChooser
 
       javax.swing.SwingUtilities.invokeLater(new Runnable()
       {
+        @Override
         public void run()
         {
           scroller.getHorizontalScrollBar().setValue(