Changeset 9732 in josm for trunk/src/org

Timestamp:

2016-02-04T00:48:38+01:00 (9 years ago)

Author:

Don-vip

Message:

remote control: add more unit tests, robustness

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/downloadtasks/DownloadOsmTask.java (modified) (1 diff)
• io/OsmServerReader.java (modified) (2 diffs)
• io/remotecontrol/handler/AddNodeHandler.java (modified) (1 diff)
• io/remotecontrol/handler/ImportHandler.java (modified) (1 diff)
• io/remotecontrol/handler/RequestHandler.java (modified) (1 diff)
• tools/Utils.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java

@@ -273 +273 @@
                 //
                 final OsmDataLayer layer = createNewLayer(newLayerName);
-                Main.main.addLayer(layer, computeBbox(bounds));
+                if (Main.main != null)
+                    Main.main.addLayer(layer, computeBbox(bounds));
                 return layer;
             }

trunk/src/org/openstreetmap/josm/io/OsmServerReader.java

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import java.io.IOException;
 import java.io.InputStream;
 import java.net.HttpURLConnection;
@@ -122 +123 @@
             }
 
+            if ("file".equals(url.getProtocol())) {
+                try {
+                    return url.openStream();
+                } catch (IOException e) {
+                    throw new OsmTransferException(e);
+                }
+            }
+
             final HttpClient client = HttpClient.create(url);
             activeConnection = client;

trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/AddNodeHandler.java

@@ -115 +115 @@
     protected void validateRequest() throws RequestHandlerBadRequestException {
         try {
-            lat = Double.parseDouble(args.get("lat"));
-            lon = Double.parseDouble(args.get("lon"));
+            lat = Double.parseDouble(args != null ? args.get("lat") : "");
+            lon = Double.parseDouble(args != null ? args.get("lon") : "");
         } catch (NumberFormatException e) {
             throw new RequestHandlerBadRequestException("NumberFormatException ("+e.getMessage()+')', e);

trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/ImportHandler.java

@@ -98 +98 @@
     @Override
     protected void validateRequest() throws RequestHandlerBadRequestException {
-        String urlString = args.get("url");
+        String urlString = args != null ? args.get("url") : null;
         if (Main.pref.getBoolean("remotecontrol.importhandler.fix_url_query", true)) {
             urlString = Utils.fixURLQuery(urlString);

trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandler.java

@@ -223 +223 @@
         List<String> missingKeys = new LinkedList<>();
         boolean error = false;
-        if (mandatory != null) for (String key : mandatory) {
-            String value = args.get(key);
-            if (value == null || value.isEmpty()) {
-                error = true;
-                Main.warn('\'' + myCommand + "' remote control request must have '" + key + "' parameter");
-                missingKeys.add(key);
+        if (mandatory != null && args != null) {
+            for (String key : mandatory) {
+                String value = args.get(key);
+                if (value == null || value.isEmpty()) {
+                    error = true;
+                    Main.warn('\'' + myCommand + "' remote control request must have '" + key + "' parameter");
+                    missingKeys.add(key);
+                }
             }
         }
         Set<String> knownParams = new HashSet<>();
-        if (mandatory != null) Collections.addAll(knownParams, mandatory);
-        if (optional != null) Collections.addAll(knownParams, optional);
-        for (String par: args.keySet()) {
-            if (!knownParams.contains(par)) {
-                Main.warn("Unknown remote control parameter {0}, skipping it", par);
+        if (mandatory != null)
+            Collections.addAll(knownParams, mandatory);
+        if (optional != null)
+            Collections.addAll(knownParams, optional);
+        if (args != null) {
+            for (String par: args.keySet()) {
+                if (!knownParams.contains(par)) {
+                    Main.warn("Unknown remote control parameter {0}, skipping it", par);
+                }
             }
         }

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

@@ -1221 +1221 @@
      */
     public static String fixURLQuery(String url) {
-        if (url.indexOf('?') == -1)
+        if (url == null || url.indexOf('?') == -1)
             return url;