Changeset 6973 in josm for trunk/src/org/openstreetmap/josm/io/remotecontrol/handler

Timestamp:

2014-04-12T20:15:09+02:00 (10 years ago)

Author:

bastiK

Message:

applied #9634 - Downloading Referrers Grabs Focus (patch by Balaitous, minor modifications)

File:

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

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

@@ -8 +8 @@
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.actions.DownloadPrimitiveAction;
 import org.openstreetmap.josm.data.osm.PrimitiveId;
 import org.openstreetmap.josm.data.osm.SimplePrimitiveId;
+import org.openstreetmap.josm.gui.io.DownloadPrimitivesWithReferrersTask;
 import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.io.remotecontrol.AddTagsDialog;
@@ -33 +33 @@
         return new String[]{"objects"};
     }
-    
+
     @Override
     public String[] getOptionalParams() {
@@ -61 +61 @@
             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, referrers, relationMembers);
-                }
-            });
-            GuiHelper.executeByMainWorkerInEDT(new Runnable() {
+            final DownloadPrimitivesWithReferrersTask task = new DownloadPrimitivesWithReferrersTask(
+                    newLayer, ps, referrers, relationMembers, null);
+            Main.worker.submit(task);
+            Main.worker.submit(new Runnable() {
                 @Override
                 public void run() {
-                    Main.main.getCurrentDataSet().setSelected(ps);
+                    final List<PrimitiveId> downloaded = task.getDownloadedId();
+                    if(downloaded != null) {
+                        GuiHelper.runInEDT(new Runnable() {
+                            @Override
+                            public void run() {
+                                Main.main.getCurrentDataSet().setSelected(downloaded);
+                            }
+                        });
+                    }
                     AddTagsDialog.addTags(args, sender);
                     ps.clear();