X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FJalviewFileChooser.java;h=e4317bd0532d3bfa2d7ecabcc708495f4582a7c9;hb=4815037f13748676b04b91dc761b73cf6f2d6ecd;hp=f0e0cb1bb9d833045bac8e750a02c0aee65a793c;hpb=d4a690ec5b8ed7480d830e7a81cef9935c9b3a91;p=jalview.git diff --git a/src/jalview/io/JalviewFileChooser.java b/src/jalview/io/JalviewFileChooser.java index f0e0cb1..e4317bd 100755 --- a/src/jalview/io/JalviewFileChooser.java +++ b/src/jalview/io/JalviewFileChooser.java @@ -1,6 +1,6 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2) - * Copyright (C) 2014 The Jalview Authors + * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$) + * Copyright (C) $$Year-Rel$$ The Jalview Authors * * This file is part of Jalview. * @@ -22,6 +22,7 @@ package jalview.io; import jalview.util.MessageManager; +import jalview.util.Platform; import java.awt.Component; import java.awt.Dimension; @@ -30,6 +31,9 @@ import java.awt.HeadlessException; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.io.File; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; import java.util.StringTokenizer; import java.util.Vector; @@ -40,6 +44,7 @@ import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.JScrollPane; import javax.swing.SpringLayout; +import javax.swing.plaf.basic.BasicFileChooserUI; /** * Enhanced file chooser dialog box. @@ -52,12 +57,97 @@ import javax.swing.SpringLayout; */ public class JalviewFileChooser extends JFileChooser { + /** + * Factory method to return a file chooser that offers readable alignment file + * formats + * + * @param directory + * @param selected + * @param selectAll + * @return + */ + public static JalviewFileChooser forRead(String directory, + String selected, boolean selectAll) + { + List extensions = new ArrayList(); + List descs = new ArrayList(); + for (FileFormatI format : FileFormat.values()) + { + if (format.isReadable()) + { + extensions.add(format.getExtensions()); + descs.add(format.toString()); + } + } + return new JalviewFileChooser(directory, + extensions.toArray(new String[extensions.size()]), + descs.toArray(new String[descs.size()]), + selected); + } + + /** + * Factory method to return a file chooser that offers writable alignment file + * formats + * + * @param directory + * @param selected + * @param selectAll + * @return + */ + public static JalviewFileChooser forWrite(String directory, + String selected, boolean selectAll) + { + // TODO in Java 8, forRead and forWrite can be a single method + // with a lambda expression parameter for isReadable/isWritable + List extensions = new ArrayList(); + List descs = new ArrayList(); + for (FileFormatI format : FileFormat.values()) + { + if (format.isWritable()) + { + extensions.add(format.getExtensions()); + descs.add(format.toString()); + } + } + return new JalviewFileChooser(directory, + extensions.toArray(new String[extensions.size()]), + descs.toArray(new String[descs.size()]), selected); + } + public JalviewFileChooser(String dir) { super(safePath(dir)); setAccessory(new RecentlyOpened()); } + public JalviewFileChooser(String dir, String extension, String desc, + String selected) + { + super(safePath(dir)); + init(Collections.singletonList(new String[] { extension, desc }), + selected); + } + + public JalviewFileChooser(String dir, String[] extensions, String[] descs, + String selected) + { + super(safePath(dir)); + if (extensions.length == descs.length) + { + List formats = new ArrayList(); + for (int i = 0; i < extensions.length; i++) + { + formats.add(new String[] { extensions[i], descs[i] }); + } + init(formats, selected); + } + else + { + System.err.println("JalviewFileChooser arguments mismatch: " + + extensions + ", " + descs); + } + } + private static File safePath(String dir) { if (dir == null) @@ -73,35 +163,26 @@ public class JalviewFileChooser extends JFileChooser return f; } - public JalviewFileChooser(String dir, String[] suffix, String[] desc, - String selected, boolean selectAll) - { - super(safePath(dir)); - init(suffix, desc, selected, selectAll); - } - - public JalviewFileChooser(String dir, String[] suffix, String[] desc, - String selected) - { - super(safePath(dir)); - init(suffix, desc, selected, true); - } - - void init(String[] suffix, String[] desc, String selected, - boolean selectAll) + /** + * + * @param formats + * a list of {extensions, description} for each file format + * @param selected + */ + void init(List formats, String selected) { JalviewFileFilter chosen = null; // SelectAllFilter needs to be set first before adding further // file filters to fix bug on Mac OSX - setAcceptAllFileFilterUsed(selectAll); + setAcceptAllFileFilterUsed(true); - for (int i = 0; i < suffix.length; i++) + for (String[] format : formats) { - JalviewFileFilter jvf = new JalviewFileFilter(suffix[i], desc[i]); + JalviewFileFilter jvf = new JalviewFileFilter(format[0], format[1]); addChoosableFileFilter(jvf); - if ((selected != null) && selected.equalsIgnoreCase(desc[i])) + if ((selected != null) && selected.equalsIgnoreCase(format[1])) { chosen = jvf; } @@ -122,10 +203,10 @@ public class JalviewFileChooser extends JFileChooser try { - if (getUI() instanceof javax.swing.plaf.basic.BasicFileChooserUI) + if (getUI() instanceof BasicFileChooserUI) { - final javax.swing.plaf.basic.BasicFileChooserUI ui = (javax.swing.plaf.basic.BasicFileChooserUI) getUI(); - final String name = ui.getFileName().trim(); + final BasicFileChooserUI fcui = (BasicFileChooserUI) getUI(); + final String name = fcui.getFileName().trim(); if ((name == null) || (name.length() == 0)) { @@ -137,10 +218,10 @@ public class JalviewFileChooser extends JFileChooser @Override public void run() { - String currentName = ui.getFileName(); + String currentName = fcui.getFileName(); if ((currentName == null) || (currentName.length() == 0)) { - ui.setFileName(name); + fcui.setFileName(name); } } }); @@ -152,49 +233,39 @@ public class JalviewFileChooser extends JFileChooser } } - public String getSelectedFormat() + /** + * Returns the selected file format, or null if none selected + * + * @return + */ + public FileFormatI getSelectedFormat() { if (getFileFilter() == null) { return null; } + /* + * logic here depends on option description being formatted as + * formatName (extension, extension...) + * or the 'no option selected' value + * All Files + * @see JalviewFileFilter.getDescription + */ String format = getFileFilter().getDescription(); - - if (format.toUpperCase().startsWith("JALVIEW")) - { - format = "Jalview"; - } - else if (format.toUpperCase().startsWith("FASTA")) - { - format = "FASTA"; - } - else if (format.toUpperCase().startsWith("MSF")) - { - format = "MSF"; - } - else if (format.toUpperCase().startsWith("CLUSTAL")) + int parenPos = format.indexOf("("); + if (parenPos > 0) { - format = "CLUSTAL"; - } - else if (format.toUpperCase().startsWith("BLC")) - { - format = "BLC"; - } - else if (format.toUpperCase().startsWith("PIR")) - { - format = "PIR"; - } - else if (format.toUpperCase().startsWith("PFAM")) - { - format = "PFAM"; - } - else if (format.toUpperCase().startsWith(PhylipFile.FILE_DESC)) - { - format = PhylipFile.FILE_DESC; + format = format.substring(0, parenPos).trim(); + try + { + return FileFormat.valueOf(format); + } catch (IllegalArgumentException e) + { + System.err.println("Unexpected format: " + format); + } } - - return format; + return null; } @Override @@ -223,7 +294,8 @@ public class JalviewFileChooser extends JFileChooser && getSelectedFile().exists()) { int confirm = JOptionPane.showConfirmDialog(parent, - MessageManager.getString("label.overwrite_existing_file"), MessageManager.getString("label.file_already_exists"), + MessageManager.getString("label.overwrite_existing_file"), + MessageManager.getString("label.file_already_exists"), JOptionPane.YES_NO_OPTION); if (confirm != JOptionPane.YES_OPTION) @@ -291,7 +363,8 @@ public class JalviewFileChooser extends JFileChooser } }); - this.setBorder(new javax.swing.border.TitledBorder(MessageManager.getString("label.recently_opened"))); + this.setBorder(new javax.swing.border.TitledBorder(MessageManager + .getString("label.recently_opened"))); final JScrollPane scroller = new JScrollPane(list); @@ -301,10 +374,15 @@ public class JalviewFileChooser extends JFileChooser layout.putConstraint(SpringLayout.NORTH, scroller, 5, SpringLayout.NORTH, this); - // scroller.setPreferredSize(new Dimension(130, 200)); - + if (new Platform().isAMac()) + { + scroller.setPreferredSize(new Dimension(500, 100)); + } + else + { + scroller.setPreferredSize(new Dimension(130, 200)); + } - scroller.setPreferredSize(new Dimension(500, 100)); this.add(scroller); javax.swing.SwingUtilities.invokeLater(new Runnable()