Changeset 18634 in josm

Timestamp:

2023-01-16T16:52:10+01:00 (18 months ago)

Author:

taylor.smock

Message:

Fix #22638: NoSuchFileException can occur when a gpx track points at non-existent images

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/layer/markerlayer/ImageMarker.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/gui/layer/markerlayer/ImageMarkerTest.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/ImageMarker.java

@@ -5 +5 @@
 
 import java.awt.event.ActionEvent;
+import java.io.UncheckedIOException;
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -67 +68 @@
         } catch (URISyntaxException e) {
             Logging.trace(e);
-            new Notification(tr("Malformed URI: ", this.imageUrl.toExternalForm())).setIcon(JOptionPane.WARNING_MESSAGE).show();
+            new Notification(tr("Malformed URI: {0}", this.imageUrl.toExternalForm())).setIcon(JOptionPane.WARNING_MESSAGE).show();
+        } catch (UncheckedIOException e) {
+            Logging.trace(e);
+            new Notification(tr("IO Exception: {0}\n{1}", this.imageUrl.toExternalForm(), e.getCause().getMessage()))
+                    .setIcon(JOptionPane.WARNING_MESSAGE).show();
         }
         return null;

trunk/test/unit/org/openstreetmap/josm/gui/layer/markerlayer/ImageMarkerTest.java

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.layer.markerlayer;
 
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
@@ -40 +41 @@
         assertEquals(LatLon.ZERO, wpt.getCoor());
     }
+
+    /**
+     * Non-regression test for #22638: NoSuchFileException causes a crash
+     */
+    @Test
+    void testTicket22638() throws MalformedURLException {
+        ImageMarker marker = new ImageMarker(
+                LatLon.ZERO,
+                new File(TestUtils.getRegressionDataFile(12255, "no_such.jpg")).toURI().toURL(),
+                new MarkerLayer(new GpxData(), null, null, null),
+                1d, 2d);
+        assertDoesNotThrow(() -> marker.actionPerformed(null));
+    }
 }