Changeset 5438 in josm for trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.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/preferences/SourceEditor.java (modified) (4 diffs)

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

@@ -75 +75 @@
 import org.openstreetmap.josm.gui.HelpAwareOptionPane;
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
+import org.openstreetmap.josm.gui.widgets.JFileChooserManager;
 import org.openstreetmap.josm.io.MirroredInputStream;
 import org.openstreetmap.josm.io.OsmTransferException;
@@ -751 +752 @@
 
             public void actionPerformed(ActionEvent e) {
-                JFileChooser fc= new JFileChooser();
-                prepareFileChooser(tfURL.getText(), fc);
-                int ret = fc.showOpenDialog(JOptionPane.getFrameForComponent(SourceEditor.this));
-                if (ret != JFileChooser.APPROVE_OPTION)
-                    return;
-                tfURL.setText(fc.getSelectedFile().toString());
+                JFileChooserManager fcm = new JFileChooserManager(true);
+                prepareFileChooser(tfURL.getText(), fcm.getFileChooser());
+                JFileChooser fc = fcm.openFileChooser(JOptionPane.getFrameForComponent(SourceEditor.this));
+                if (fc != null) {
+                    tfURL.setText(fc.getSelectedFile().toString());
+                }
             }
         }
@@ -1285 +1286 @@
         private CopyOnWriteArrayList<CellEditorListener> listeners;
         private String value;
-        private JFileChooser fileChooser;
         private boolean isFile;
-
-        protected JFileChooser getFileChooser() {
-            if (fileChooser == null) {
-                this.fileChooser = new JFileChooser();
-                if(!isFile) {
-                    fileChooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
-                }
-            }
-            return fileChooser;
-        }
 
         /**
@@ -1428 +1418 @@
 
             public void actionPerformed(ActionEvent e) {
-                JFileChooser fc = getFileChooser();
-                prepareFileChooser(tfFileName.getText(), fc);
-                int ret = fc.showOpenDialog(JOptionPane.getFrameForComponent(SourceEditor.this));
-                if (ret != JFileChooser.APPROVE_OPTION)
-                    return;
-                tfFileName.setText(fc.getSelectedFile().toString());
+                JFileChooserManager fcm = new JFileChooserManager(true).createFileChooser();
+                if (!isFile) {
+                    fcm.getFileChooser().setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
+                }
+                prepareFileChooser(tfFileName.getText(), fcm.getFileChooser());
+                JFileChooser fc = fcm.openFileChooser(JOptionPane.getFrameForComponent(SourceEditor.this));
+                if (fc != null) {
+                    tfFileName.setText(fc.getSelectedFile().toString());
+                }
             }
         }