Changeset 2215 in josm for trunk/src/org


Ignore:
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:
4 edited

Legend:

Unmodified
Added
Removed

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

    r2080 r2215  
    5858     */
    5959    public void openUrl(boolean new_layer, String url) {
    60         new DownloadOsmTask().loadUrl(new_layer, url);
     60        new DownloadOsmTask().loadUrl(new_layer, url, null);
    6161    }
    6262

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

    r2201 r2215  
    104104    }
    105105
    106     public void loadUrl(boolean a,java.lang.String b) {
     106    public void loadUrl(boolean a,java.lang.String b,  ProgressMonitor progressMonitor) {
    107107        // FIXME this is not currently used
    108108    }

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

    r2195 r2215  
    201201     * @param The URL as String
    202202     */
    203     public void loadUrl(boolean new_layer, String url) {
     203    public void loadUrl(boolean new_layer, String url, ProgressMonitor progressMonitor) {
    204204        Task t = new Task(new_layer,
    205205                new OsmServerLocationReader(url),
    206                 NullProgressMonitor.INSTANCE);
     206                progressMonitor);
     207        currentBounds = new Bounds(new LatLon(0,0), new LatLon(0,0));
    207208        task = Main.worker.submit(t, t);
    208209    }

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

    r2142 r2215  
    5959         * @param url
    6060         */
    61         void loadUrl(boolean newLayer, String url);
     61        void loadUrl(boolean newLayer, String url, ProgressMonitor progressMonitor);
    6262
    6363        /**
Note: See TracChangeset for help on using the changeset viewer.