Changeset 22963 in osm for applications/editors/josm

Timestamp:

2010-09-03T02:29:56+02:00 (14 years ago)

Author:

yellowbkpk

Message:

Keeping track of the original URL the user entered instead of the one that we manufacture for GetCapabilities.

File:

• applications/editors/josm/plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java (modified) (4 diffs)

applications/editors/josm/plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java

@@ -184 +184 @@
         a.append(serviceUrl.getPath());
         a.append("?");
+        if(serviceUrl.getQuery() != null) {
+            a.append(serviceUrl.getQuery());
+            if (!serviceUrl.getQuery().endsWith("&")) {
+                a.append("&");
+            }
+        }
         return a.toString();
     }
@@ -213 +219 @@
 
     private void attemptGetCapabilities(String serviceUrlStr) {
-        serviceUrl = null;
+        URL getCapabilitiesUrl = null;
         try {
             if (!serviceUrlStr.trim().contains("capabilities")) {
                 // If the url doesn't already have GetCapabilities, add it in
-                serviceUrl = new URL(serviceUrlStr + "VERSION=1.1.1&SERVICE=WMS&REQUEST=GetCapabilities");
+                getCapabilitiesUrl = new URL(serviceUrlStr + "VERSION=1.1.1&SERVICE=WMS&REQUEST=GetCapabilities");
             } else {
                 // Otherwise assume it's a good URL and let the subsequent error
                 // handling systems deal with problems
-                serviceUrl = new URL(serviceUrlStr);
-            }
+                getCapabilitiesUrl = new URL(serviceUrlStr);
+            }
+            serviceUrl = new URL(serviceUrlStr);
         } catch (HeadlessException e) {
             return;
@@ -231 +238 @@
         }
 
-        System.out.println("Connecting to: " + serviceUrl);
+        System.out.println("Connecting to: " + getCapabilitiesUrl);
 
         String incomingData;
         try {
-            URLConnection openConnection = serviceUrl.openConnection();
+            URLConnection openConnection = getCapabilitiesUrl.openConnection();
             InputStream inputStream = openConnection.getInputStream();
             BufferedReader br = new BufferedReader(new InputStreamReader(inputStream));
@@ -281 +288 @@
 
         try {
-            treeRootNode.setUserObject(serviceUrl.getHost());
+            treeRootNode.setUserObject(getCapabilitiesUrl.getHost());
             Element capabilityElem = getChild(document.getDocumentElement(), "Capability");
             List<Element> children = getChildren(capabilityElem, "Layer");