Ticket #3583: open_location.patch

File open_location.patch, 2.6 KB (added by vsandre, 17 years ago)
  • src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java

     
    103103        return "gps";
    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    }
    109109
  • src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java

     
    200200     * @param True if the data should be saved to a new layer
    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    }
    209210
  • src/org/openstreetmap/josm/actions/OpenLocationAction.java

     
    5757     * Open the given file.
    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
    6363}
  • src/org/openstreetmap/josm/gui/download/DownloadDialog.java

     
    5858         * @param newLayer
    5959         * @param url
    6060         */
    61         void loadUrl(boolean newLayer, String url);
     61        void loadUrl(boolean newLayer, String url, ProgressMonitor progressMonitor);
    6262
    6363        /**
    6464         * @return The checkbox presented to the user