Changeset 8405 in josm for trunk

Timestamp:

2015-05-21T01:27:02+02:00 (10 years ago)

Author:

Don-vip

Message:

remove duplicated class JpegFileFilter

Location:

trunk/src/org/openstreetmap/josm/gui/layer/geoimage

Files:

• CorrelateGpxWithImages.java (modified) (2 diffs)
• GeoImageLayer.java (modified) (2 diffs)
• JpegFileFilter.java (deleted)

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java

@@ -76 +76 @@
 import org.openstreetmap.josm.gui.widgets.JosmTextField;
 import org.openstreetmap.josm.io.GpxReader;
+import org.openstreetmap.josm.io.JpgImporter;
 import org.openstreetmap.josm.tools.ExifReader;
 import org.openstreetmap.josm.tools.GBC;
@@ -383 +384 @@
                 @Override
                 public void actionPerformed(ActionEvent ae) {
-                    AbstractFileChooser fc = DiskAccessAction.createAndOpenFileChooser(true, false, null, JpegFileFilter.getInstance(),
-                            JFileChooser.FILES_ONLY, "geoimage.lastdirectory");
+                    AbstractFileChooser fc = DiskAccessAction.createAndOpenFileChooser(true, false, null,
+                            JpgImporter.FILE_FILTER_WITH_FOLDERS, JFileChooser.FILES_ONLY, "geoimage.lastdirectory");
                     if (fc == null)
                         return;

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java

@@ -68 +68 @@
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.util.GuiHelper;
+import org.openstreetmap.josm.io.JpgImporter;
 import org.openstreetmap.josm.tools.ExifReader;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -209 +210 @@
                     }
 
-                    File[] children = f.listFiles(JpegFileFilter.getInstance());
+                    File[] children = f.listFiles(JpgImporter.FILE_FILTER_WITH_FOLDERS);
                     if (children != null) {
                         progressMonitor.subTask(tr("Scanning directory {0}", f.getPath()));