Changeset 2029 in josm for trunk/src/org/openstreetmap/josm/actions/DiskAccessAction.java

Timestamp:

2009-09-02T23:37:57+02:00 (17 years ago)

Author:

Gubaer

Message:

fixed #3362: "All formats" is added twice to format selections in open dialog

File:

• trunk/src/org/openstreetmap/josm/actions/DiskAccessAction.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/DiskAccessAction.java

@@ -7 +7 @@
 
 import javax.swing.JFileChooser;
-import javax.swing.filechooser.FileFilter;
 
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.gui.ExtendedDialog;
-import org.openstreetmap.josm.io.FileImporter;
 import org.openstreetmap.josm.tools.Shortcut;
 
@@ -39 +37 @@
         fc.setMultiSelectionEnabled(multiple);
         fc.setAcceptAllFileFilterUsed(false);
-        FileFilter defaultFilter = null;
-        for (FileImporter imExporter: ExtensionFileFilter.importers) {
-            fc.addChoosableFileFilter(imExporter.filter);
-            if (extension != null && extension.endsWith(imExporter.filter.defaultExtension)) {
-                defaultFilter = imExporter.filter;
-            }
-        }
-
-        if (defaultFilter == null) {
-            defaultFilter = new ExtensionFileFilter.AllFormatsImporter().filter;
-        }
-        fc.setFileFilter(defaultFilter);
+        System.out.println("opening fc for extension " + extension);
+        ExtensionFileFilter.applyChoosableImportFileFilters(fc, extension);
 
         int answer = open ? fc.showOpenDialog(Main.parent) : fc.showSaveDialog(Main.parent);