X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FJalviewFileChooser.java;h=079cc09e367688f4850b13099be4a9a591dc52bd;hb=7d67fb613ec026dc9a265e351e7fab542e3f1d61;hp=951b998fd596f30c2ddc83a5e2e1bade5eaa1575;hpb=17e77c3f2949a0729322b4a8d907f3f34b6a9914;p=jalview.git diff --git a/src/jalview/io/JalviewFileChooser.java b/src/jalview/io/JalviewFileChooser.java index 951b998..079cc09 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.9) - * Copyright (C) 2015 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. * @@ -31,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; @@ -41,6 +44,8 @@ import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.JScrollPane; import javax.swing.SpringLayout; +import javax.swing.filechooser.FileView; +import javax.swing.plaf.basic.BasicFileChooserUI; /** * Enhanced file chooser dialog box. @@ -53,12 +58,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) @@ -74,35 +164,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; } @@ -123,10 +204,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)) { @@ -138,10 +219,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); } } }); @@ -153,49 +234,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 @@ -328,4 +399,10 @@ public class JalviewFileChooser extends JFileChooser } } + + @Override + public void setFileView(FileView fileView) + { + // do nothing - does it matter? + } }