Changeset 16581 in osm for applications

Timestamp:

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

Author:

jttt

Message:

Made work with JOSM new ProgressMonitor

Location:

applications/editors/josm/plugins/cadastre-fr

Files:

• build.xml (modified) (1 diff)
• src/cadastre_fr/CadastreGrabber.java (modified) (2 diffs)
• src/cadastre_fr/CadastreInterface.java (modified) (4 diffs)
• src/cadastre_fr/DownloadSVGBuilding.java (modified) (3 diffs)
• src/cadastre_fr/DownloadSVGTask.java (modified) (4 diffs)
• src/cadastre_fr/DownloadWMSTask.java (modified) (2 diffs)

applications/editors/josm/plugins/cadastre-fr/build.xml

@@ -26 +26 @@
                 <attribute name="Plugin-Description" value="A special handler for the French land registry WMS server."/>
                 <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/wiki/FR:JOSM/Fr:Plugin/Cadastre"/>
-                <attribute name="Plugin-Mainversion" value="1646"/>
+                <attribute name="Plugin-Mainversion" value="1811"/>
                 <attribute name="Plugin-Stage" value="60"/>
                 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>

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

@@ -12 +12 @@
 import javax.imageio.ImageIO;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.EastNorth;
+import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
 import org.openstreetmap.josm.io.OsmTransferException;
 import org.openstreetmap.josm.io.ProgressInputStream;
@@ -84 +84 @@
         wmsInterface.urlConn.setRequestMethod("GET");
         wmsInterface.setCookie();
-        InputStream is = new ProgressInputStream(wmsInterface.urlConn, Main.pleaseWaitDlg);
+        InputStream is = new ProgressInputStream(wmsInterface.urlConn, NullProgressMonitor.INSTANCE);
         BufferedImage img = ImageIO.read(is);
         is.close();

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

@@ -78 +78 @@
             urlConn.connect();
             if (urlConn.getResponseCode() != HttpURLConnection.HTTP_OK) {
-                throw (IOException) new IOException("Cannot get Cadastre cookie.");
+                throw new IOException("Cannot get Cadastre cookie.");
             }
             BufferedReader in = new BufferedReader(new InputStreamReader(urlConn.getInputStream()));
@@ -148 +148 @@
             urlConn.connect();
             if (urlConn.getResponseCode() != HttpURLConnection.HTTP_OK) {
-                throw (IOException) new IOException("Cannot open Cadastre interface. GET response:"+urlConn.getResponseCode());
+                throw new IOException("Cannot open Cadastre interface. GET response:"+urlConn.getResponseCode());
             }
             BufferedReader in = new BufferedReader(new InputStreamReader(urlConn.getInputStream()));
@@ -330 +330 @@
         urlConn.connect();
         if (urlConn.getResponseCode() != HttpURLConnection.HTTP_OK) {
-            throw (IOException) new IOException("Cannot get Cadastre response.");
+            throw new IOException("Cannot get Cadastre response.");
         }
         BufferedReader in = new BufferedReader(new InputStreamReader(urlConn.getInputStream()));
@@ -371 +371 @@
 
     public void cancel() {
-        Main.pleaseWaitDlg.currentAction.setText(tr("Aborting..."));
         if (urlConn != null) {
             urlConn.setConnectTimeout(1);

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

@@ -29 +29 @@
 import org.openstreetmap.josm.gui.MapView;
 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;
@@ -50 +51 @@
     @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)) {
@@ -232 +233 @@
         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 + "building.svg");
         String svg = new String();

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();

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

@@ -4 +4 @@
 
 import java.io.IOException;
+
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
-import org.openstreetmap.josm.gui.MapView;
-import org.openstreetmap.josm.data.Bounds;
 
 public class DownloadWMSTask extends PleaseWaitRunnable {
@@ -26 +27 @@
     @Override
     public void realRun() throws IOException {
-        Main.pleaseWaitDlg.currentAction.setText(tr("Contacting WMS Server..."));
+        progressMonitor.indeterminateSubTask(tr("Contacting WMS Server..."));
         try {
             if (grabber.getWmsInterface().retrieveInterface(wmsLayer)) {