Changeset 5680 in josm for trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/ImportHandler.java

Timestamp:

2013-01-27T19:11:23+01:00 (11 years ago)

Author:

Don-vip

Message:

fix #8148 - Improve remote control handlers (requests validation, display of confirmation messages, robustness, javadoc)

File:

• trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/ImportHandler.java (modified) (5 diffs)

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

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
 import java.util.HashMap;
 
@@ -17 +15 @@
 public class ImportHandler extends RequestHandler {
 
+    /**
+     * The remote control command name used to import data.
+     */
     public static final String command = "import";
 
@@ -39 +40 @@
     public String getPermissionMessage() {
         return tr("Remote Control has been asked to import data from the following URL:")
-                + "<br>" + request;
+                + "<br>" + args.get("url");
     }
 
@@ -53 +54 @@
             String query = request.substring(request.indexOf('?') + 1);
             if (query.indexOf("url=") == 0) {
-                args.put("url", decodeURL(query.substring(4)));
+                args.put("url", decodeParam(query.substring(4)));
             } else {
                 int urlIdx = query.indexOf("&url=");
                 if (urlIdx != -1) {
-                    String url = query.substring(urlIdx + 1);
-                    args.put("url", decodeURL(query.substring(urlIdx + 5)));
+                    /*String url =*/ query.substring(urlIdx + 1);
+                    args.put("url", decodeParam(query.substring(urlIdx + 5)));
                     query = query.substring(0, urlIdx);
                 } else {
@@ -77 +78 @@
     }
 
-    private String decodeURL(String url) {
-        try {
-            return URLDecoder.decode(url, "UTF-8");
-        } catch (UnsupportedEncodingException e) {
-            throw new RuntimeException();
-        }
+    @Override
+    protected void validateRequest() throws RequestHandlerBadRequestException {
+        // Nothing to do
     }
 }