Changeset 5438 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java

Timestamp:

2012-08-13T00:12:48+02:00 (14 years ago)

Author:

Don-vip

Message:

fix #6733 - File Open dialog incorrectly accepts folder selection

Major rework of how the JFileChooser are created in JOSM

• Simple need: use DiskAccessAction.createAndOpenFileChooser methods
• Complex need: use directly the new class JFileChooserManager

Concerning the directory selection for geottaged images, this is still possible via:

• right-click on GPX layer -> Import Photos

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java

@@ -71 +71 @@
 import org.openstreetmap.josm.gui.preferences.SourceEntry;
 import org.openstreetmap.josm.gui.widgets.HtmlPanel;
+import org.openstreetmap.josm.gui.widgets.JFileChooserManager;
 import org.openstreetmap.josm.gui.widgets.PopupMenuLauncher;
 import org.openstreetmap.josm.tools.GBC;
@@ -522 +523 @@
             final StyleSource s = model.getRow(sel);
 
-            String curDir = Main.pref.get("mappaint.clone-style.lastDirectory", System.getProperty("user.home"));
-
-            String suggestion = curDir + File.separator + s.getFileNamePart();
-            JFileChooser fc = new JFileChooser();
-            fc.setSelectedFile(new File(suggestion));
-
-            int answer = fc.showSaveDialog(Main.parent);
-            if (answer != JFileChooser.APPROVE_OPTION)
+            JFileChooserManager fcm = new JFileChooserManager(false, "mappaint.clone-style.lastDirectory", System.getProperty("user.home"));
+            String suggestion = fcm.getInitialDirectory() + File.separator + s.getFileNamePart();
+            fcm.createFileChooser().getFileChooser().setSelectedFile(new File(suggestion));
+            JFileChooser fc = fcm.openFileChooser();
+            if (fc == null)
                 return;
 
-            if (!fc.getCurrentDirectory().getAbsolutePath().equals(curDir)) {
-                Main.pref.put("mappaint.clone-style.lastDirectory", fc.getCurrentDirectory().getAbsolutePath());
-            }
             File file = fc.getSelectedFile();