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

Timestamp:

05.02.2012 20:51:01 (4 months ago)

Author:

Don-vip

Message:

fix #7361 - image filename with 3 commas causes exception

File:

• trunk/src/org/openstreetmap/josm/Main.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/Main.java

@@ -639 +639 @@
         if(s.startsWith("http:")) return DownloadParamType.httpUrl;
         if(s.startsWith("file:")) return DownloadParamType.fileUrl;
-        final StringTokenizer st = new StringTokenizer(s, ",");
-        // we assume a string with exactly 3 commas is a bounds parameter
-        if (st.countTokens() == 4) return DownloadParamType.bounds;
+        String coorPattern = "\\s*[0-9]+(\\.[0-9]+)?\\s*";
+        if(s.matches(coorPattern+"(,"+coorPattern+"){3}")) return DownloadParamType.bounds;
         // everything else must be a file name
         return DownloadParamType.fileName;