Changeset 4466 in josm for trunk

Timestamp:

2011-09-26T11:56:15+02:00 (13 years ago)

Author:

simon04

Message:

WMS: case-insensitive testing for existing GetCapabilities

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java (modified) (2 diffs)

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

@@ -28 +28 @@
 import java.util.Set;
 
+import java.util.regex.Pattern;
 import javax.swing.JButton;
 import javax.swing.JFrame;
@@ -304 +305 @@
         URL getCapabilitiesUrl = null;
         try {
-            if (!serviceUrlStr.trim().contains("capabilities")) {
+            if (!Pattern.compile(".*GetCapabilities.*", Pattern.CASE_INSENSITIVE).matcher(serviceUrlStr).matches()) {
                 // If the url doesn't already have GetCapabilities, add it in
                 getCapabilitiesUrl = new URL(serviceUrlStr + "VERSION=1.1.1&SERVICE=WMS&REQUEST=GetCapabilities");