Changeset 8799 in josm

Timestamp:

2015-09-27T19:45:21+02:00 (9 years ago)

Author:

simon04

Message:

fix #11898 - Command line --download option broken for bounds

Location:

trunk

Files:

• src/org/openstreetmap/josm/Main.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/MainTest.java (added)

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

@@ -1136 +1136 @@
      * @see #paramType
      */
-    private enum DownloadParamType { httpUrl, fileUrl, bounds, fileName }
+    enum DownloadParamType { httpUrl, fileUrl, bounds, fileName }
 
     /**
@@ -1143 +1143 @@
      * @return The guessed parameter type
      */
-    private static DownloadParamType paramType(String s) {
+    static DownloadParamType paramType(String s) {
         if (s.startsWith("http:") || s.startsWith("https:")) return DownloadParamType.httpUrl;
         if (s.startsWith("file:")) return DownloadParamType.fileUrl;
         String coorPattern = "\\s*[+-]?[0-9]+(\\.[0-9]+)?\\s*";
-        if (s.matches(coorPattern+"(,"+coorPattern+") {3}")) return DownloadParamType.bounds;
+        if (s.matches(coorPattern+"(,"+coorPattern+"){3}")) return DownloadParamType.bounds;
         // everything else must be a file name
         return DownloadParamType.fileName;