X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fio%2FJalviewFileChooser.java;h=2bac0deade798553b8007af8d9915b1032070a0f;hb=9480f18113c0d16dfb157eb3fff60a1e29c33d39;hp=8050e975319130098fd525733bf6dbd2c7a0a4b2;hpb=be915dc80b72e8130c43d6f0e1f59a7c09938b65;p=jalview.git

diff --git a/src/jalview/io/JalviewFileChooser.java b/src/jalview/io/JalviewFileChooser.java
index 8050e97..2bac0de 100755
--- a/src/jalview/io/JalviewFileChooser.java
+++ b/src/jalview/io/JalviewFileChooser.java
@@ -62,27 +62,29 @@ public class JalviewFileChooser
     super.setFileFilter(filter);
 
     try{
-      final javax.swing.plaf.basic.BasicFileChooserUI ui = (javax.swing.plaf.basic.
-          BasicFileChooserUI) getUI();
-      final String name = ui.getFileName().trim();
-
-      if ( (name == null) || (name.length() == 0))
+      if(getUI() instanceof javax.swing.plaf.basic.BasicFileChooserUI)
       {
-        return;
-      }
+        final javax.swing.plaf.basic.BasicFileChooserUI ui = (javax.swing.plaf.
+            basic.BasicFileChooserUI) getUI();
+        final String name = ui.getFileName().trim();
 
-      EventQueue.invokeLater(new Thread()
-      {
-        public void run()
+        if ( (name == null) || (name.length() == 0))
         {
-          String currentName = ui.getFileName();
-          if ( (currentName == null) || (currentName.length() == 0))
-          {
-            ui.setFileName(name);
-          }
+          return;
         }
-      });
 
+        EventQueue.invokeLater(new Thread()
+        {
+          public void run()
+          {
+            String currentName = ui.getFileName();
+            if ( (currentName == null) || (currentName.length() == 0))
+            {
+              ui.setFileName(name);
+            }
+          }
+        });
+      }
     }catch(Exception ex)
     {
       // Some platforms do not have BasicFileChooserUI
@@ -92,6 +94,11 @@ public class JalviewFileChooser
 
   public String getSelectedFormat()
   {
+    if(getFileFilter()==null)
+    {
+      return null;
+    }
+
     String format = getFileFilter().getDescription();
 
     if (format.toUpperCase().startsWith("JALVIEW"))
@@ -155,7 +162,7 @@ public class JalviewFileChooser
 
       if (confirm != JOptionPane.YES_OPTION)
       {
-        ret = this.CANCEL_OPTION;
+        ret = JalviewFileChooser.CANCEL_OPTION;
       }
     }