super.setFileFilter(filter);\r
\r
try{\r
- final javax.swing.plaf.basic.BasicFileChooserUI ui = (javax.swing.plaf.basic.\r
- BasicFileChooserUI) getUI();\r
- final String name = ui.getFileName().trim();\r
-\r
- if ( (name == null) || (name.length() == 0))\r
+ if(getUI() instanceof javax.swing.plaf.basic.BasicFileChooserUI)\r
{\r
- return;\r
- }\r
+ final javax.swing.plaf.basic.BasicFileChooserUI ui = (javax.swing.plaf.\r
+ basic.BasicFileChooserUI) getUI();\r
+ final String name = ui.getFileName().trim();\r
\r
- EventQueue.invokeLater(new Thread()\r
- {\r
- public void run()\r
+ if ( (name == null) || (name.length() == 0))\r
{\r
- String currentName = ui.getFileName();\r
- if ( (currentName == null) || (currentName.length() == 0))\r
- {\r
- ui.setFileName(name);\r
- }\r
+ return;\r
}\r
- });\r
\r
+ EventQueue.invokeLater(new Thread()\r
+ {\r
+ public void run()\r
+ {\r
+ String currentName = ui.getFileName();\r
+ if ( (currentName == null) || (currentName.length() == 0))\r
+ {\r
+ ui.setFileName(name);\r
+ }\r
+ }\r
+ });\r
+ }\r
}catch(Exception ex)\r
{\r
// Some platforms do not have BasicFileChooserUI\r
\r
public String getSelectedFormat()\r
{\r
+ if(getFileFilter()==null)\r
+ {\r
+ return null;\r
+ }\r
+\r
String format = getFileFilter().getDescription();\r
\r
if (format.toUpperCase().startsWith("JALVIEW"))\r
\r
if (confirm != JOptionPane.YES_OPTION)\r
{\r
- ret = this.CANCEL_OPTION;\r
+ ret = JalviewFileChooser.CANCEL_OPTION;\r
}\r
}\r
\r