X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FJalviewFileChooser.java;h=588a2b8a03e8a27f8bc6ad67b638534ef46d1326;hb=3fdc889794e3566af57628f0b6a308eb23886f96;hp=fe01a6999a39dd44af000a847539389de0d254d7;hpb=78daabcc6b478d861b3982754b8412e651cc8dc4;p=jalview.git diff --git a/src/jalview/io/JalviewFileChooser.java b/src/jalview/io/JalviewFileChooser.java index fe01a69..588a2b8 100755 --- a/src/jalview/io/JalviewFileChooser.java +++ b/src/jalview/io/JalviewFileChooser.java @@ -197,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); } } @@ -286,6 +287,11 @@ public class JalviewFileChooser extends JFileChooser alljvf.setExtensionListInDescription(false); addChoosableFileFilter(alljvf); + if (selected == null) + { + chosen = alljvf; + } + for (String[] format : formats) { JalviewFileFilter jvf = new JalviewFileFilter(format[0], format[1]); @@ -432,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; @@ -486,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(); } @@ -548,6 +554,11 @@ public class JalviewFileChooser extends JFileChooser } } + if (!file.isAbsolute() && file.exists()) + { + file = file.getAbsoluteFile(); + } + setSelectedFile(file); } }