X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fio%2FJalviewFileChooser.java;h=588a2b8a03e8a27f8bc6ad67b638534ef46d1326;hb=3fdc889794e3566af57628f0b6a308eb23886f96;hp=b046d36d951302c23d8dcf88b82fd097ba143f1b;hpb=737dc271c809d911ea69c423f1525c3c41c68ded;p=jalview.git diff --git a/src/jalview/io/JalviewFileChooser.java b/src/jalview/io/JalviewFileChooser.java index b046d36..588a2b8 100755 --- a/src/jalview/io/JalviewFileChooser.java +++ b/src/jalview/io/JalviewFileChooser.java @@ -21,12 +21,6 @@ ////////////////////////////////////////////////////////////////// package jalview.io; -import jalview.bin.Cache; -import jalview.gui.JvOptionPane; -import jalview.util.MessageManager; -import jalview.util.Platform; -import jalview.util.dialogrunner.DialogRunnerI; - import java.awt.Component; import java.awt.Dimension; import java.awt.EventQueue; @@ -44,23 +38,27 @@ import java.util.List; import java.util.Map; import java.util.StringTokenizer; import java.util.Vector; -import java.util.concurrent.Callable; import javax.swing.BoxLayout; -import javax.swing.DefaultListCellRenderer; import javax.swing.JCheckBox; import javax.swing.JDialog; import javax.swing.JFileChooser; +import javax.swing.JLabel; import javax.swing.JList; import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.JScrollPane; +import javax.swing.ListCellRenderer; import javax.swing.SpringLayout; +import javax.swing.SwingConstants; +import javax.swing.SwingUtilities; +import javax.swing.border.TitledBorder; import javax.swing.filechooser.FileFilter; import javax.swing.plaf.basic.BasicFileChooserUI; import jalview.bin.Cache; import jalview.gui.JvOptionPane; +import jalview.util.ChannelProperties; import jalview.util.MessageManager; import jalview.util.Platform; import jalview.util.dialogrunner.DialogRunnerI; @@ -79,7 +77,7 @@ public class JalviewFileChooser extends JFileChooser { private static final long serialVersionUID = 1L; - private Map callbacks = new HashMap<>(); + private Map callbacks = new HashMap<>(); File selectedFile = null; @@ -199,8 +197,9 @@ public class JalviewFileChooser extends JFileChooser } else { - System.err.println("JalviewFileChooser arguments mismatch: " - + extensions + ", " + descs); + jalview.bin.Console + .errPrintln("JalviewFileChooser arguments mismatch: " + + extensions + ", " + descs); } } @@ -268,6 +267,31 @@ public class JalviewFileChooser extends JFileChooser // file filters to fix bug on Mac OSX setAcceptAllFileFilterUsed(acceptAny); + // add a "All known alignment files" option + List allExtensions = new ArrayList<>(); + for (String[] format : formats) + { + String[] extensions = format[0].split(","); + for (String ext : extensions) + { + if (!allExtensions.contains(ext)) + { + allExtensions.add(ext); + } + } + } + allExtensions.sort(null); + JalviewFileFilter alljvf = new JalviewFileFilter( + allExtensions.toArray(new String[] {}), + MessageManager.getString("label.all_known_alignment_files")); + alljvf.setExtensionListInDescription(false); + addChoosableFileFilter(alljvf); + + if (selected == null) + { + chosen = alljvf; + } + for (String[] format : formats) { JalviewFileFilter jvf = new JalviewFileFilter(format[0], format[1]); @@ -414,7 +438,7 @@ public class JalviewFileChooser extends JFileChooser return FileFormats.getInstance().forName(format); } catch (IllegalArgumentException e) { - System.err.println("Unexpected format: " + format); + jalview.bin.Console.errPrintln("Unexpected format: " + format); } } return null; @@ -468,7 +492,7 @@ public class JalviewFileChooser extends JFileChooser } } catch (Throwable x) { - System.err.println( + jalview.bin.Console.errPrintln( "Unexpected exception when trying to get filename."); x.printStackTrace(); } @@ -530,6 +554,11 @@ public class JalviewFileChooser extends JFileChooser } } + if (!file.isAbsolute() && file.exists()) + { + file = file.getAbsoluteFile(); + } + setSelectedFile(file); } } @@ -558,10 +587,7 @@ public class JalviewFileChooser extends JFileChooser } list = new JList<>(recent); - - DefaultListCellRenderer dlcr = new DefaultListCellRenderer(); - dlcr.setHorizontalAlignment(DefaultListCellRenderer.RIGHT); - list.setCellRenderer(dlcr); + list.setCellRenderer(new recentlyOpenedCellRenderer()); list.addMouseListener(new MouseAdapter() { @@ -572,8 +598,11 @@ public class JalviewFileChooser extends JFileChooser } }); - this.setBorder(new javax.swing.border.TitledBorder( - MessageManager.getString("label.recently_opened"))); + TitledBorder recentlyOpenedBorder = new TitledBorder( + MessageManager.getString("label.recently_opened")); + recentlyOpenedBorder.setTitleFont( + recentlyOpenedBorder.getTitleFont().deriveFont(10f)); + this.setBorder(recentlyOpenedBorder); final JScrollPane scroller = new JScrollPane(list); @@ -583,18 +612,11 @@ public class JalviewFileChooser extends JFileChooser layout.putConstraint(SpringLayout.NORTH, scroller, 5, SpringLayout.NORTH, this); - if (Platform.isAMacAndNotJS()) - { - scroller.setPreferredSize(new Dimension(500, 100)); - } - else - { - scroller.setPreferredSize(new Dimension(530, 200)); - } - + // one size okay for all + scroller.setPreferredSize(new Dimension(280, 105)); this.add(scroller); - javax.swing.SwingUtilities.invokeLater(new Runnable() + SwingUtilities.invokeLater(new Runnable() { @Override public void run() @@ -608,6 +630,77 @@ public class JalviewFileChooser extends JFileChooser } + class recentlyOpenedCellRenderer extends JLabel + implements ListCellRenderer + { + private final static int maxChars = 46; + + private final static String ellipsis = "..."; + + @Override + public Component getListCellRendererComponent( + JList list, String value, int index, + boolean isSelected, boolean cellHasFocus) + { + String filename = value.toString(); + String displayFilename; + if (filename.length() > maxChars) + { + StringBuilder displayFileSB = new StringBuilder(); + File file = new File(filename); + displayFileSB.append(file.getName()); + if (file.getParent() != null) + { + File parent = file; + boolean spaceleft = true; + while (spaceleft && parent.getParent() != null) + { + parent = parent.getParentFile(); + String name = parent.getName(); + displayFileSB.insert(0, File.separator); + if (displayFileSB.length() + name.length() < maxChars - 1) + { + displayFileSB.insert(0, name); + } + else + { + displayFileSB.insert(0, ellipsis); + spaceleft = false; + } + } + if (spaceleft && filename.startsWith(File.separator) + && !(displayFileSB.charAt(0) == File.separatorChar)) + { + displayFileSB.insert(0, File.separator); + } + } + displayFilename = displayFileSB.toString(); + } + else + { + displayFilename = filename; + } + this.setText(displayFilename.toString()); + this.setToolTipText(filename); + if (isSelected) + { + setBackground(list.getSelectionBackground()); + setForeground(list.getSelectionForeground()); + } + else + { + setBackground(list.getBackground()); + setForeground(list.getForeground()); + } + this.setHorizontalAlignment(SwingConstants.TRAILING); + this.setEnabled(list.isEnabled()); + this.setFont(list.getFont().deriveFont(12f)); + this.setOpaque(true); + return this; + } + + } + /* @Override public JalviewFileChooser setResponseHandler(Object response, @@ -627,7 +720,7 @@ public class JalviewFileChooser extends JFileChooser */ @Override - public DialogRunnerI setResponseHandler(Object response, Callable action) + public DialogRunnerI setResponseHandler(Object response, Runnable action) { callbacks.put(response, action); return this; @@ -643,12 +736,12 @@ public class JalviewFileChooser extends JFileChooser { return; } - Callable action = callbacks.get(response); + Runnable action = callbacks.get(response); if (action != null) { try { - action.call(); + action.run(); } catch (Exception e) { e.printStackTrace(); @@ -682,7 +775,7 @@ public class JalviewFileChooser extends JFileChooser protected JDialog createDialog(Component parent) throws HeadlessException { JDialog dialog = super.createDialog(parent); - dialog.setIconImage(null); + dialog.setIconImages(ChannelProperties.getIconList()); return dialog; }