Changeset 18295 in osm for applications/editors

Timestamp:

2009-10-27T10:57:31+01:00 (15 years ago)

Author:

guggis

Message:

Updated to JOSM r2327

Location:

applications/editors/josm/plugins/remotecontrol

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java (modified) (4 diffs)

applications/editors/josm/plugins/remotecontrol/build.xml

@@ -26 +26 @@
                 <attribute name="Plugin-Description" value="Let other applications send commands to JOSM."/>
                 <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/index.php/JOSM/Plugins/RemoteControl"/>
-                <attribute name="Plugin-Mainversion" value="2263"/>
+                <attribute name="Plugin-Mainversion" value="2327"/>
                 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
             </manifest>

applications/editors/josm/plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java

@@ -19 +19 @@
 import java.util.HashSet;
 import java.util.StringTokenizer;
+import java.util.concurrent.Future;
 
 import javax.swing.JOptionPane;
@@ -25 +26 @@
 import org.openstreetmap.josm.actions.AutoScaleAction;
 import org.openstreetmap.josm.actions.downloadtasks.DownloadOsmTask;
+import org.openstreetmap.josm.actions.downloadtasks.DownloadTask;
+import org.openstreetmap.josm.actions.downloadtasks.PostDownloadHandler;
 import org.openstreetmap.josm.command.AddCommand;
 import org.openstreetmap.josm.data.Bounds;
@@ -34 +37 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
-import org.openstreetmap.josm.gui.download.DownloadDialog.DownloadTask;
 import org.openstreetmap.josm.gui.progress.PleaseWaitProgressMonitor;
 
@@ -165 +167 @@
                         maxlon = downloadBounds.getMaxX();
                     }
-                    osmTask.download(null, minlat,minlon,maxlat,maxlon, new PleaseWaitProgressMonitor());
+                    Future<?> future = osmTask.download(false /*no new layer*/, new Bounds(minlat,minlon,maxlat,maxlon), new PleaseWaitProgressMonitor());                    
+                    Main.worker.submit(new PostDownloadHandler(osmTask, future));                    
                 } catch (AlreadyLoadedException ex) {
                     System.out.println("RemoteControl: no download necessary");