X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FJalviewFileChooser.java;h=0a6dc339f9420dbc1018d34a226e1d4a7c6a7797;hb=ad15cff29620f960119f80176f1fd443da9f6763;hp=f70432ff8548ea050c6979a530f01e70507a2b25;hpb=d423f22792e47dbc800ae220a58677f988971d06;p=jalview.git
diff --git a/src/jalview/io/JalviewFileChooser.java b/src/jalview/io/JalviewFileChooser.java
index f70432f..0a6dc33 100755
--- a/src/jalview/io/JalviewFileChooser.java
+++ b/src/jalview/io/JalviewFileChooser.java
@@ -1,38 +1,55 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.5)
- * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
- *
+ * 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.
- *
- * 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 .
+ *
+ * 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.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
+import jalview.util.MessageManager;
+import jalview.util.Platform;
+
+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;
+import javax.swing.SpringLayout;
/**
* 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
{
@@ -85,7 +102,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;
@@ -100,6 +116,7 @@ public class JalviewFileChooser extends JFileChooser
setAccessory(new RecentlyOpened());
}
+ @Override
public void setFileFilter(javax.swing.filechooser.FileFilter filter)
{
super.setFileFilter(filter);
@@ -118,6 +135,7 @@ public class JalviewFileChooser extends JFileChooser
EventQueue.invokeLater(new Thread()
{
+ @Override
public void run()
{
String currentName = ui.getFileName();
@@ -172,17 +190,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)
{
@@ -201,7 +224,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)
@@ -213,22 +236,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
@@ -237,6 +262,7 @@ public class JalviewFileChooser extends JFileChooser
public RecentlyOpened()
{
+
String historyItems = jalview.bin.Cache.getProperty("RECENT_FILE");
StringTokenizer st;
Vector recent = new Vector();
@@ -259,22 +285,37 @@ 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));
+
+ SpringLayout layout = new SpringLayout();
+ layout.putConstraint(SpringLayout.WEST, scroller, 5,
+ SpringLayout.WEST, this);
+ layout.putConstraint(SpringLayout.NORTH, scroller, 5,
+ SpringLayout.NORTH, this);
+
+ if (new Platform().isAMac())
+ {
+ scroller.setPreferredSize(new Dimension(500, 100));
+ }
+ else
+ {
+ scroller.setPreferredSize(new Dimension(130, 200));
+ }
+
this.add(scroller);
javax.swing.SwingUtilities.invokeLater(new Runnable()
{
+ @Override
public void run()
{
scroller.getHorizontalScrollBar().setValue(