Changeset 8405 in josm


Ignore:
Timestamp:
2015-05-21T01:27:02+02:00 (6 years ago)
Author:
Don-vip
Message:

remove duplicated class JpegFileFilter

Location:
trunk/src/org/openstreetmap/josm/gui/layer/geoimage
Files:
1 deleted
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java

    r8404 r8405  
    7676import org.openstreetmap.josm.gui.widgets.JosmTextField;
    7777import org.openstreetmap.josm.io.GpxReader;
     78import org.openstreetmap.josm.io.JpgImporter;
    7879import org.openstreetmap.josm.tools.ExifReader;
    7980import org.openstreetmap.josm.tools.GBC;
     
    383384                @Override
    384385                public void actionPerformed(ActionEvent ae) {
    385                     AbstractFileChooser fc = DiskAccessAction.createAndOpenFileChooser(true, false, null, JpegFileFilter.getInstance(),
    386                             JFileChooser.FILES_ONLY, "geoimage.lastdirectory");
     386                    AbstractFileChooser fc = DiskAccessAction.createAndOpenFileChooser(true, false, null,
     387                            JpgImporter.FILE_FILTER_WITH_FOLDERS, JFileChooser.FILES_ONLY, "geoimage.lastdirectory");
    387388                    if (fc == null)
    388389                        return;
  • trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java

    r8395 r8405  
    6868import org.openstreetmap.josm.gui.layer.Layer;
    6969import org.openstreetmap.josm.gui.util.GuiHelper;
     70import org.openstreetmap.josm.io.JpgImporter;
    7071import org.openstreetmap.josm.tools.ExifReader;
    7172import org.openstreetmap.josm.tools.ImageProvider;
     
    209210                    }
    210211
    211                     File[] children = f.listFiles(JpegFileFilter.getInstance());
     212                    File[] children = f.listFiles(JpgImporter.FILE_FILTER_WITH_FOLDERS);
    212213                    if (children != null) {
    213214                        progressMonitor.subTask(tr("Scanning directory {0}", f.getPath()));
Note: See TracChangeset for help on using the changeset viewer.