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

Timestamp:

2009-09-29T18:13:18+02:00 (15 years ago)

Author:

Gubaer

Message:

applied #3583: patch by vsandre: Unable to download data with "Open location..."

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/OpenLocationAction.java (modified) (1 diff)
• actions/downloadtasks/DownloadGpsTask.java (modified) (1 diff)
• actions/downloadtasks/DownloadOsmTask.java (modified) (1 diff)
• gui/download/DownloadDialog.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/OpenLocationAction.java

@@ -58 +58 @@
      */
     public void openUrl(boolean new_layer, String url) {
-        new DownloadOsmTask().loadUrl(new_layer, url);
+        new DownloadOsmTask().loadUrl(new_layer, url, null);
     }
 

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

@@ -104 +104 @@
     }
 
-    public void loadUrl(boolean a,java.lang.String b) {
+    public void loadUrl(boolean a,java.lang.String b,  ProgressMonitor progressMonitor) {
         // FIXME this is not currently used
     }

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

@@ -201 +201 @@
      * @param The URL as String
      */
-    public void loadUrl(boolean new_layer, String url) {
+    public void loadUrl(boolean new_layer, String url, ProgressMonitor progressMonitor) {
         Task t = new Task(new_layer,
                 new OsmServerLocationReader(url),
-                NullProgressMonitor.INSTANCE);
+                progressMonitor);
+        currentBounds = new Bounds(new LatLon(0,0), new LatLon(0,0));
         task = Main.worker.submit(t, t);
     }

trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java

@@ -59 +59 @@
          * @param url
          */
-        void loadUrl(boolean newLayer, String url);
+        void loadUrl(boolean newLayer, String url, ProgressMonitor progressMonitor);
 
         /**