Changeset 14367 in josm for trunk/src/org/openstreetmap

Timestamp:

2018-10-26T22:12:10+02:00 (6 years ago)

Author:

Don-vip

Message:

fix #16897 - catch InvalidPathException for invalid WMS GetCapabilities URL

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/AddImageryLayerAction.java (modified) (2 diffs)
• gui/preferences/imagery/AddWMSLayerPanel.java (modified) (2 diffs)
• io/CachedFile.java (modified) (2 diffs)
• io/imagery/WMSImagery.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java

@@ -11 +11 @@
 import java.io.IOException;
 import java.net.MalformedURLException;
+import java.nio.file.InvalidPathException;
 import java.util.Collection;
 import java.util.Collections;
@@ -169 +170 @@
      * @throws IOException if any I/O error occurs while contacting the WMS endpoint
      * @throws WMSGetCapabilitiesException if the WMS getCapabilities request fails
+     * @throws InvalidPathException if a Path object cannot be constructed for the capabilities cached file
      */
     protected static ImageryInfo getWMSLayerInfo(ImageryInfo info) throws IOException, WMSGetCapabilitiesException {

trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddWMSLayerPanel.java

@@ -7 +7 @@
 import java.io.IOException;
 import java.net.MalformedURLException;
+import java.nio.file.InvalidPathException;
 import java.util.Collection;
 import java.util.List;
@@ -88 +89 @@
                 formats.setModel(new DefaultComboBoxModel<>(wmsFormats.toArray(new String[0])));
                 formats.setSelectedItem(wms.getPreferredFormat());
-            } catch (MalformedURLException ex1) {
+            } catch (MalformedURLException | InvalidPathException ex1) {
                 Logging.log(Logging.LEVEL_ERROR, ex1);
                 JOptionPane.showMessageDialog(getParent(), tr("Invalid service URL."),

trunk/src/org/openstreetmap/josm/io/CachedFile.java

@@ -16 +16 @@
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
+import java.nio.file.InvalidPathException;
 import java.nio.file.StandardCopyOption;
 import java.security.MessageDigest;
@@ -219 +220 @@
      * @return the InputStream
      * @throws IOException when the resource with the given name could not be retrieved
+     * @throws InvalidPathException if a Path object cannot be constructed from the inner file path
      */
     public InputStream getInputStream() throws IOException {

trunk/src/org/openstreetmap/josm/io/imagery/WMSImagery.java

@@ -10 +10 @@
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.nio.file.InvalidPathException;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -133 +134 @@
      * @throws IOException when connection error when fetching get capabilities document
      * @throws WMSGetCapabilitiesException when there are errors when parsing get capabilities document
+     * @throws InvalidPathException if a Path object cannot be constructed for the capabilities cached file
      */
     public WMSImagery(String url) throws IOException, WMSGetCapabilitiesException {
@@ -144 +146 @@
      * @throws IOException when connection error when fetching get capabilities document
      * @throws WMSGetCapabilitiesException when there are errors when parsing get capabilities document
+     * @throws InvalidPathException if a Path object cannot be constructed for the capabilities cached file
      */
     public WMSImagery(String url, Map<String, String> headers) throws IOException, WMSGetCapabilitiesException {