X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FJalviewFileChooser.java;h=90e32291b0da334622099591c6cfd229e7e7b249;hb=47168f025aefdaa044802bd5f8f510ffe43a4808;hp=6e15b90bd0529a4cd5d916d59d6ce111cd0f5a66;hpb=f2e4454160c7b5e36f2a29d3dea6d4a1450bc938;p=jalview.git
diff --git a/src/jalview/io/JalviewFileChooser.java b/src/jalview/io/JalviewFileChooser.java
index 6e15b90..90e3229 100755
--- a/src/jalview/io/JalviewFileChooser.java
+++ b/src/jalview/io/JalviewFileChooser.java
@@ -1,23 +1,28 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.6)
- * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
+ * 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.
- *
+ * 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 jalview.util.MessageManager;
+
import java.io.*;
import java.util.*;
@@ -80,7 +85,7 @@ public class JalviewFileChooser extends JFileChooser
// SelectAllFilter needs to be set first before adding further
// file filters to fix bug on Mac OSX
setAcceptAllFileFilterUsed(selectAll);
-
+
for (int i = 0; i < suffix.length; i++)
{
JalviewFileFilter jvf = new JalviewFileFilter(suffix[i], desc[i]);
@@ -181,7 +186,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)
{
@@ -212,22 +217,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
@@ -260,7 +267,7 @@ public class JalviewFileChooser extends JFileChooser
{
public void mousePressed(MouseEvent evt)
{
- recentListSelectionChanged(list.getSelectedValue().toString());
+ recentListSelectionChanged(list.getSelectedValue());
}
});