Changeset 16581 in osm for applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java

Timestamp:

2009-07-19T18:01:42+02:00 (17 years ago)

Author:

jttt

Message:

Made work with JOSM new ProgressMonitor

File:

• applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java (modified) (4 diffs)

applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java

@@ -29 +29 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
+import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
 import org.openstreetmap.josm.io.OsmTransferException;
 import org.openstreetmap.josm.io.ProgressInputStream;
@@ -54 +55 @@
     @Override
     public void realRun() throws IOException, OsmTransferException {
-        Main.pleaseWaitDlg.currentAction.setText(tr("Contacting WMS Server..."));
+        progressMonitor.indeterminateSubTask(tr("Contacting WMS Server..."));
         try {
             if (wmsInterface.retrieveInterface(wmsLayer)) {
@@ -60 +61 @@
                 if (svg == null)
                     return;
-                Main.pleaseWaitDlg.currentAction.setText(tr("Extract SVG ViewBox..."));
+                progressMonitor.indeterminateSubTask(tr("Extract SVG ViewBox..."));
                 getViewBox(svg);
                 if (viewBox == null)
                     return;
-                Main.pleaseWaitDlg.currentAction.setText(tr("Extract best fitting boundary..."));
+                progressMonitor.indeterminateSubTask(tr("Extract best fitting boundary..."));
                 createWay(svg);
             }
@@ -187 +188 @@
         wmsInterface.urlConn.setRequestMethod("GET");
         wmsInterface.setCookie();
-        InputStream is = new ProgressInputStream(wmsInterface.urlConn, Main.pleaseWaitDlg);
+        InputStream is = new ProgressInputStream(wmsInterface.urlConn, NullProgressMonitor.INSTANCE);
         File file = new File(CadastrePlugin.cacheDir + "boundary.svg");
         String svg = new String();