X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FJalviewFileChooser.java;h=34c1fdd5d2e0a7e74d50fe3384a2352f50a2d5be;hb=a8f483d04205bb8273ee311c12968b7e86d205fa;hp=b381d62462f2dbdf8e9a6358c709455f9d796ca6;hpb=506d60f0e188723ddc91c26824b41ac7034df3fe;p=jalview.git

diff --git a/src/jalview/io/JalviewFileChooser.java b/src/jalview/io/JalviewFileChooser.java
index b381d62..34c1fdd 100755
--- a/src/jalview/io/JalviewFileChooser.java
+++ b/src/jalview/io/JalviewFileChooser.java
@@ -1,24 +1,26 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.4)
- * Copyright (C) 2008 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
+ * Copyright (C) 2014 The Jalview Authors
  * 
- * This program 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 2
- * of the License, or (at your option) any later version.
+ * This file is part of Jalview.
  * 
- * This program 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.
+ * 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 
+ * PURPOSE.  See the GNU General Public License for more details.
  * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ * 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 jalview.util.MessageManager;
+
 import java.io.*;
 import java.util.*;
 
@@ -86,7 +88,6 @@ public class JalviewFileChooser extends JFileChooser
     {
       JalviewFileFilter jvf = new JalviewFileFilter(suffix[i], desc[i]);
       addChoosableFileFilter(jvf);
-
       if ((selected != null) && selected.equalsIgnoreCase(desc[i]))
       {
         chosen = jvf;
@@ -183,7 +184,7 @@ public class JalviewFileChooser extends JFileChooser
 
     setDialogType(SAVE_DIALOG);
 
-    int ret = showDialog(parent, "Save");
+    int ret = showDialog(parent, MessageManager.getString("action.save"));
 
     if (getFileFilter() instanceof JalviewFileFilter)
     {
@@ -214,22 +215,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
@@ -262,13 +265,11 @@ public class JalviewFileChooser extends JFileChooser
       {
         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("Recently Opened"));
 
       final JScrollPane scroller = new JScrollPane(list);
       scroller.setPreferredSize(new Dimension(130, 200));