X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FJalviewFileChooser.java;h=eca6e432a12be23605b42a972d45c13250600f80;hb=40c5abaee48533a19613d9566099a92a60e841d4;hp=e731ddc752140a07efcb8bf9034c835b015e33a2;hpb=c72aef50d0ab104b28b24e28ec1ccb48073a09d5;p=jalview.git diff --git a/src/jalview/io/JalviewFileChooser.java b/src/jalview/io/JalviewFileChooser.java index e731ddc..eca6e43 100755 --- a/src/jalview/io/JalviewFileChooser.java +++ b/src/jalview/io/JalviewFileChooser.java @@ -40,7 +40,7 @@ public class JalviewFileChooser extends JFileChooser { JalviewFileFilter jvf = new JalviewFileFilter(suffix[i], desc[i]); addChoosableFileFilter(jvf); - if(selected!=null && selected.equals(desc[i])) + if(selected!=null && selected.equalsIgnoreCase(desc[i])) chosen = jvf; } if(chosen!=null) @@ -80,11 +80,14 @@ public class JalviewFileChooser extends JFileChooser setDialogType(SAVE_DIALOG); int ret = showDialog(parent, null); - JalviewFileFilter jvf = (JalviewFileFilter)getFileFilter(); - if( !jvf.accept( getSelectedFile() ) ) + if(getFileFilter() instanceof JalviewFileFilter) { - String withExtension = getSelectedFile()+"."+jvf.getAcceptableExtension(); - setSelectedFile(new File(withExtension)); + JalviewFileFilter jvf = (JalviewFileFilter) getFileFilter(); + if (!jvf.accept(getSelectedFile())) + { + String withExtension = getSelectedFile() + "." + jvf.getAcceptableExtension(); + setSelectedFile(new File(withExtension)); + } } if(ret == JalviewFileChooser.APPROVE_OPTION && getSelectedFile().exists() ) @@ -240,7 +243,7 @@ public class JalviewFileChooser extends JFileChooser *************************************************************************/ protected final boolean lt(File a, File b) { - System.out.println("LT called?"); + System.out.println("DEBUG:LT called?"); boolean less = false; switch (col) {