Ticket #3048: chooser.txt

File chooser.txt, 1.5 KB (added by dmuecke, 16 years ago)
Line 
1Index: src/org/openstreetmap/josm/actions/DiskAccessAction.java
2===================================================================
3--- src/org/openstreetmap/josm/actions/DiskAccessAction.java (revision 1975)
4+++ src/org/openstreetmap/josm/actions/DiskAccessAction.java (working copy)
5@@ -4,11 +4,14 @@
6 import static org.openstreetmap.josm.tools.I18n.tr;
7
8 import java.io.File;
9+
10 import javax.swing.JFileChooser;
11+import javax.swing.filechooser.FileFilter;
12+
13 import org.openstreetmap.josm.Main;
14 import org.openstreetmap.josm.gui.ExtendedDialog;
15-import org.openstreetmap.josm.tools.Shortcut;
16 import org.openstreetmap.josm.io.FileImporter;
17+import org.openstreetmap.josm.tools.Shortcut;
18
19 /**
20 * Helper class for all actions that access the disk
21@@ -30,11 +33,20 @@
22 }
23
24 fc.setMultiSelectionEnabled(multiple);
25+ fc.setAcceptAllFileFilterUsed(false);
26+ FileFilter defaultFilter = null;
27 for (FileImporter imExporter: ExtensionFileFilter.importers) {
28 fc.addChoosableFileFilter(imExporter.filter);
29+ if (imExporter.filter.defaultExtension.endsWith("osm")) {
30+ defaultFilter = imExporter.filter;
31+ }
32+
33 }
34
35- fc.setAcceptAllFileFilterUsed(true);
36+ if (defaultFilter != null) {
37+ fc.setFileFilter(defaultFilter);
38+ }
39+
40
41 int answer = open ? fc.showOpenDialog(Main.parent) : fc.showSaveDialog(Main.parent);
42 if (answer != JFileChooser.APPROVE_OPTION)