Changeset 18427 in josm for trunk

Timestamp:

2022-04-04T22:26:00+02:00 (2 years ago)

Author:

taylor.smock

Message:

Fix an NPE that occurred when attempting to copy an image URL

This occurred when the user
1) Downloaded images from Wikimedia Commons
2) Attempted to open the image in an external program

This patch also fixes an issue where image paths, when copied with the
Copy image path action and were to remote resources, could have a /
removed from the protocol (https://example.org -> https:/example.org).

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/imagery/street_level/IImageEntry.java (modified) (2 diffs)
• gui/layer/geoimage/ImageViewerDialog.java (modified) (2 diffs)
• gui/layer/geoimage/WikimediaCommonsEntry.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/imagery/street_level/IImageEntry.java

@@ -6 +6 @@
 import java.io.File;
 import java.io.IOException;
+import java.net.URI;
 import java.time.Instant;
 import java.util.List;
@@ -158 +159 @@
 
     /**
+     * Get the URI for the image
+     * @return The image URI
+     * @since 18427
+     */
+    default URI getImageURI() {
+        return this.getFile().toURI();
+    }
+
+    /**
      * Returns the position value. The position value from the temporary copy
      * is returned if that copy exists.

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

@@ -484 +484 @@
         public void actionPerformed(ActionEvent e) {
             if (currentEntry != null) {
-                ClipboardUtils.copyString(String.valueOf(currentEntry.getFile()));
+                ClipboardUtils.copyString(String.valueOf(currentEntry.getImageURI()));
             }
         }
@@ -511 +511 @@
             if (currentEntry != null) {
                 try {
-                    PlatformManager.getPlatform().openUrl(currentEntry.getFile().toURI().toURL().toExternalForm());
+                    PlatformManager.getPlatform().openUrl(currentEntry.getImageURI().toURL().toExternalForm());
                 } catch (IOException ex) {
                     Logging.error(ex);

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

@@ -3 +3 @@
 
 import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.Objects;
 
 import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.tools.JosmRuntimeException;
 import org.openstreetmap.josm.tools.Mediawiki;
 
@@ -23 +26 @@
     protected URL getImageUrl() throws MalformedURLException {
         return new URL(Mediawiki.getImageUrl("https://upload.wikimedia.org/wikipedia/commons", title));
+    }
+
+    @Override
+    public URI getImageURI() {
+        try {
+            return new URI(Mediawiki.getImageUrl("https://upload.wikimedia.org/wikipedia/commons", this.title));
+        } catch (URISyntaxException e) {
+            // This should never happen.
+            throw new JosmRuntimeException(this.toString(), e);
+        }
     }