Changeset 7578 in josm for trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java

Timestamp:

2014-09-22T22:00:21+02:00 (10 years ago)

Author:

Don-vip

Message:

fix #10024 - Add an option in Preferences/Look-and-Feel to use native file-choosing dialogs.
They look nicer but they do not support file filters, so we cannot use them (yet) as default.
Based on patch by Lesath and code review by simon04.
The native dialogs are not used if selection mode is not supported ("files and directories" on all platforms, "directories" on systems other than OS X)

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java

@@ -89 +89 @@
 import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.gui.util.TableHelper;
-import org.openstreetmap.josm.gui.widgets.JFileChooserManager;
+import org.openstreetmap.josm.gui.widgets.AbstractFileChooser;
+import org.openstreetmap.josm.gui.widgets.FileChooserManager;
 import org.openstreetmap.josm.gui.widgets.JosmTextField;
 import org.openstreetmap.josm.io.CachedFile;
@@ -701 +702 @@
     }
 
-    private static void prepareFileChooser(String url, JFileChooser fc) {
+    private static void prepareFileChooser(String url, AbstractFileChooser fc) {
         if (url == null || url.trim().length() == 0) return;
         URL sourceUrl = null;
@@ -813 +814 @@
                     return;
                 }
-                JFileChooserManager fcm = new JFileChooserManager(true)
+                FileChooserManager fcm = new FileChooserManager(true)
                         .createFileChooser(true, null, Arrays.asList(ff, FileFilterAllFiles.getInstance()), ff, JFileChooser.FILES_ONLY);
                 prepareFileChooser(tfURL.getText(), fcm.getFileChooser());
-                JFileChooser fc = fcm.openFileChooser(JOptionPane.getFrameForComponent(SourceEditor.this));
+                AbstractFileChooser fc = fcm.openFileChooser(JOptionPane.getFrameForComponent(SourceEditor.this));
                 if (fc != null) {
                     tfURL.setText(fc.getSelectedFile().toString());
@@ -1512 +1513 @@
             @Override
             public void actionPerformed(ActionEvent e) {
-                JFileChooserManager fcm = new JFileChooserManager(true).createFileChooser();
+                FileChooserManager fcm = new FileChooserManager(true).createFileChooser();
                 if (!isFile) {
                     fcm.getFileChooser().setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
                 }
                 prepareFileChooser(tfFileName.getText(), fcm.getFileChooser());
-                JFileChooser fc = fcm.openFileChooser(JOptionPane.getFrameForComponent(SourceEditor.this));
+                AbstractFileChooser fc = fcm.openFileChooser(JOptionPane.getFrameForComponent(SourceEditor.this));
                 if (fc != null) {
                     tfFileName.setText(fc.getSelectedFile().toString());