Index: src/main/java/common/javax/swing/JFileChooser.java =================================================================== --- src/main/java/common/javax/swing/JFileChooser.java (revision 490626) +++ src/main/java/common/javax/swing/JFileChooser.java (working copy) @@ -164,11 +164,11 @@ } public JFileChooser(final String currentDirectoryPath) { - this(currentDirectoryPath, FileSystemView.getFileSystemView()); + this(currentDirectoryPath, null); } public JFileChooser(final File currentDirectory) { - this(currentDirectory, FileSystemView.getFileSystemView()); + this(currentDirectory, null); } public JFileChooser(final FileSystemView fsv) { @@ -596,7 +596,7 @@ } protected void setup(final FileSystemView view) { - setFileSystemView(view); + setFileSystemView(view != null ? view : FileSystemView.getFileSystemView()); updateUI(); if (isAcceptAllFileFilterUsed()) { addChoosableFileFilter(getAcceptAllFileFilter());