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

Timestamp:

2014-01-30T00:33:07+01:00 (10 years ago)

Author:

Don-vip

Message:

fix #9635 - remote control: new referrers argument to load_object handler

Location:

trunk/src/org/openstreetmap/josm/io/remotecontrol/handler

Files:

• LoadObjectHandler.java (modified) (3 diffs)
• RequestHandler.java (modified) (1 diff)

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

@@ -35 +35 @@
     
     @Override
-    public String[] getOptionalParams()
-    {
-        return new String[] {"new_layer", "addtags"};
+    public String[] getOptionalParams() {
+        return new String[] {"new_layer", "addtags", "relation_members", "referrers"};
     }
 
@@ -48 +47 @@
     public String[] getUsageExamples() {
         return new String[] {"/load_object?new_layer=true&objects=w106159509",
-            "/load_object?new_layer=true&objects=r2263653&relation_members=true"
+            "/load_object?new_layer=true&objects=r2263653&relation_members=true",
+            "/load_object?objects=n100000&referrers=false"
         };
     }
@@ -60 +60 @@
             final boolean newLayer = isLoadInNewLayer();
             final boolean relationMembers = Boolean.parseBoolean(args.get("relation_members"));
+            final boolean referrers = args.containsKey("referrers") ? Boolean.parseBoolean(args.get("referrers")) : true;
             GuiHelper.runInEDTAndWait(new Runnable() {
                 @Override public void run() {
-                    DownloadPrimitiveAction.processItems(newLayer, ps, true, relationMembers);
+                    DownloadPrimitiveAction.processItems(newLayer, ps, referrers, relationMembers);
                 }
             });

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

@@ -60 +60 @@
      * @throws RequestHandlerErrorException
      */
-    public final void handle() throws RequestHandlerForbiddenException, RequestHandlerBadRequestException, RequestHandlerErrorException
-    {
+    public final void handle() throws RequestHandlerForbiddenException, RequestHandlerBadRequestException, RequestHandlerErrorException {
         checkMandatoryParams();
         validateRequest();