Changeset 17543 in josm for trunk/src/org

Timestamp:

2021-02-26T00:33:30+01:00 (4 years ago)

Author:

Don-vip

Message:

fix #20535 - strip leading/trailing whitespace from URLs entered in "Add WMS/WMTS" dialogs

Location:

trunk/src/org/openstreetmap/josm/gui/preferences/imagery

Files:

• AddWMSLayerPanel.java (modified) (2 diffs)
• AddWMTSLayerPanel.java (modified) (2 diffs)

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

@@ -30 +30 @@
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.Logging;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -83 +84 @@
         getLayers.addActionListener(e -> {
             try {
-                wms = new WMSImagery(rawUrl.getText(), getCommonHeaders());
+                wms = new WMSImagery(Utils.strip(rawUrl.getText()), getCommonHeaders());
                 tree.updateTree(wms);
                 Collection<String> wmsFormats = wms.getFormats();

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

@@ -24 +24 @@
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.Logging;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -61 +62 @@
         getLayers.addActionListener(e -> {
             try {
-                WMTSCapabilities capabilities = WMTSTileSource.getCapabilities(rawUrl.getText(), getCommonHeaders());
+                WMTSCapabilities capabilities = WMTSTileSource.getCapabilities(Utils.strip(rawUrl.getText()), getCommonHeaders());
                 layerTable = new WMTSLayerSelection(WMTSTileSource.groupLayersByNameAndTileMatrixSet(capabilities.getLayers()));
                 layerTable.getTable().getSelectionModel().addListSelectionListener(lsl -> {