Changeset 2702 in josm for trunk/src/org/openstreetmap/josm/gui/layer

Timestamp:

2009-12-29T23:31:57+01:00 (14 years ago)

Author:

bastiK

Message:

fixed #4100 - unable to simply load already referenced images
Added 'jpg' to the list of available formats for 'File' > 'Open...'

Location:

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

Files:

• GpxLayer.java (modified) (2 diffs)
• geoimage/CorrelateGpxWithImages.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java

@@ -64 +64 @@
 import org.openstreetmap.josm.gui.dialogs.LayerListDialog;
 import org.openstreetmap.josm.gui.dialogs.LayerListPopup;
-import org.openstreetmap.josm.gui.layer.geoimage.GeoImageLayer;
 import org.openstreetmap.josm.gui.layer.markerlayer.AudioMarker;
 import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer;
 import org.openstreetmap.josm.gui.progress.PleaseWaitProgressMonitor;
+import org.openstreetmap.josm.io.JpgImporter;
 import org.openstreetmap.josm.tools.AudioUtil;
 import org.openstreetmap.josm.tools.DateUtils;
@@ -326 +326 @@
                 fc.setMultiSelectionEnabled(true);
                 fc.setAcceptAllFileFilterUsed(false);
-                fc.setFileFilter(new FileFilter() {
-                    @Override
-                    public boolean accept(File f) {
-                        return f.isDirectory() || f.getName().toLowerCase().endsWith(".jpg");
-                    }
-
-                    @Override
-                    public String getDescription() {
-                        return tr("JPEG images (*.jpg)");
-                    }
-                });
+                JpgImporter importer = new JpgImporter(GpxLayer.this);
+                fc.setFileFilter(importer.filter);
                 fc.showOpenDialog(Main.parent);
+                LinkedList<File> files = new LinkedList<File>();
                 File[] sel = fc.getSelectedFiles();
                 if (sel == null || sel.length == 0)
                     return;
-                LinkedList<File> files = new LinkedList<File>();
                 addRecursiveFiles(files, sel);
-                Main.pref.put("geoimage.lastdirectory", fc.getCurrentDirectory().getPath());
-                GeoImageLayer.create(files, GpxLayer.this);
+                importer.importDataHandleExceptions(files);
             }
 

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

@@ -1074 +1074 @@
         Object item = cbGpx.getSelectedItem();
 
-        if (item == null || ! (item instanceof GpxDataWrapper)) {
+        if (item == null || ((GpxDataWrapper) item).file == null) {
             if (complain) {
                 JOptionPane.showMessageDialog(Main.parent, tr("You should select a GPX track"),