X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FJalviewFileChooser.java;h=2bac0deade798553b8007af8d9915b1032070a0f;hb=78005cb0c9ddd81e515a0e7dbeef7647698337f2;hp=d5ac106b7e169ccdf9ad56b381de40ac814b1346;hpb=a3601f26e2c2be8af72dcfb23d8f2d9bebd89d0a;p=jalview.git

diff --git a/src/jalview/io/JalviewFileChooser.java b/src/jalview/io/JalviewFileChooser.java
index d5ac106..2bac0de 100755
--- a/src/jalview/io/JalviewFileChooser.java
+++ b/src/jalview/io/JalviewFileChooser.java
@@ -22,25 +22,7 @@ package jalview.io;
 
 import java.io.*;
 import java.awt.*;
-import java.awt.event.*;
-import java.util.*;
-import java.util.List;
-
 import javax.swing.*;
-import javax.swing.event.TableModelEvent;
-import javax.swing.event.TableModelListener;
-import javax.swing.table.*;
-import java.util.*;
-
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import javax.swing.plaf.*;
-import javax.swing.plaf.basic.*;
-import javax.swing.plaf.metal.*;
-import javax.swing.table.*;
-import javax.swing.event.*;
-import java.text.*;
 
 public class JalviewFileChooser
     extends JFileChooser
@@ -79,35 +61,44 @@ public class JalviewFileChooser
   {
     super.setFileFilter(filter);
 
-    if (! (getUI() instanceof BasicFileChooserUI))
-    {
-      return;
-    }
-
-    final BasicFileChooserUI ui = (BasicFileChooserUI) getUI();
-    final String name = ui.getFileName().trim();
-
-    if ( (name == null) || (name.length() == 0))
-    {
-      return;
-    }
-
-    EventQueue.invokeLater(new Thread()
-    {
-      public void run()
+    try{
+      if(getUI() instanceof javax.swing.plaf.basic.BasicFileChooserUI)
       {
-        String currentName = ui.getFileName();
-        if ( (currentName == null) || (currentName.length() == 0))
+        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))
         {
-          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
+    }
   }
 
 
   public String getSelectedFormat()
   {
+    if(getFileFilter()==null)
+    {
+      return null;
+    }
+
     String format = getFileFilter().getDescription();
 
     if (format.toUpperCase().startsWith("JALVIEW"))
@@ -171,7 +162,7 @@ public class JalviewFileChooser
 
       if (confirm != JOptionPane.YES_OPTION)
       {
-        ret = this.CANCEL_OPTION;
+        ret = JalviewFileChooser.CANCEL_OPTION;
       }
     }