Changeset 5438 in josm for trunk/src/org/openstreetmap/josm/io/JpgImporter.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/io/JpgImporter.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/io/JpgImporter.java

@@ -17 +17 @@
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 
+/**
+ * File importer allowing to import geottaged images (*.jpg files).
+ *
+ */
 public class JpgImporter extends FileImporter {
     private GpxLayer gpx;
     
+    /**
+     * The default file filter (only *.jpg files).
+     */
     public static final ExtensionFileFilter FILE_FILTER = new ExtensionFileFilter(
+            "jpg", "jpg", tr("Image Files") + " (*.jpg)");
+    
+    /**
+     * An alternate file filter that also includes folders.
+     * @since 5438
+     */
+    public static final ExtensionFileFilter FILE_FILTER_WITH_FOLDERS = new ExtensionFileFilter(
             "jpg", "jpg", tr("Image Files") + " (*.jpg, "+ tr("folder")+")");
 
+    /**
+     * Constructs a new {@code JpgImporter}.
+     */
     public JpgImporter() {
-        super(FILE_FILTER);
+        this(false);
     }
 
+    /**
+     * Constructs a new {@code JpgImporter} with folders selection, if wanted.
+     * @param includeFolders If true, includes folders in the file filter
+     * @since 5438
+     */
+    public JpgImporter(boolean includeFolders) {
+        super(includeFolders ? FILE_FILTER_WITH_FOLDERS : FILE_FILTER);
+    }
+
+    /**
+     * Constructs a new {@code JpgImporter} for the given GPX layer. Folders selection is allowed.
+     * @param gpx The GPX layer
+     */
     public JpgImporter(GpxLayer gpx) {
-        this();
+        this(true);
         this.gpx = gpx;
     }