Changeset 2020 in josm for trunk

Timestamp:

2009-08-31T09:40:29+02:00 (15 years ago)

Author:

Gubaer

Message:

new method signature for preparing file chooser

File:

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

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

@@ -24 +24 @@
 
     public static JFileChooser createAndOpenFileChooser(boolean open, boolean multiple, String title) {
+        return createAndOpenFileChooser(open, multiple, title, null);
+    }
+
+    public static JFileChooser createAndOpenFileChooser(boolean open, boolean multiple, String title, String extension) {
         String curDir = Main.pref.get("lastDirectory");
         if (curDir.equals("")) {
@@ -38 +42 @@
         for (FileImporter imExporter: ExtensionFileFilter.importers) {
             fc.addChoosableFileFilter(imExporter.filter);
-            if (imExporter instanceof ExtensionFileFilter.AllFormatsImporter) {
+            if (extension != null && extension.endsWith(imExporter.filter.defaultExtension)) {
                 defaultFilter = imExporter.filter;
             }
-
         }
 
-        if (defaultFilter != null) {
-            fc.setFileFilter(defaultFilter);
+        if (defaultFilter == null) {
+            defaultFilter = new ExtensionFileFilter.AllFormatsImporter().filter;
         }
-
+        fc.setFileFilter(defaultFilter);
 
         int answer = open ? fc.showOpenDialog(Main.parent) : fc.showSaveDialog(Main.parent);