Changeset 4298 in josm for trunk/src

Timestamp:

2011-08-08T00:22:04+02:00 (13 years ago)

Author:

stoecker

Message:

fix #6643 - patch mainly by simon04 - Exception when pasting URL into download bounding box window

File:

• trunk/src/org/openstreetmap/josm/tools/OsmUrlToBounds.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/tools/OsmUrlToBounds.java

@@ -2 +2 @@
 package org.openstreetmap.josm.tools;
 
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
 import java.util.HashMap;
 import java.util.Map;
@@ -12 +14 @@
 
     public static Bounds parse(String url) {
+        try {
+            // a percent sign indicates an encoded URL (RFC 1738).
+            if (url.contains("%")) {
+                url = URLDecoder.decode(url, "UTF-8");
+            }
+        } catch (UnsupportedEncodingException x) {
+        } catch (IllegalArgumentException x) {
+        }
         Bounds b = parseShortLink(url);
         if (b != null)
@@ -50 +60 @@
         } catch (NumberFormatException x) {
         } catch (NullPointerException x) {
+        } catch (ArrayIndexOutOfBoundsException x) {
         }
         return b;