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

Timestamp:

2017-08-23T00:34:13+02:00 (7 years ago)

Author:

donvip

Message:

fix #josm15178 - use new HTTPS links from French cadastre - requires JOSM 12623+ to load Certigna certificate from platform keystore (not included in JRE keystore)

File:

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

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

@@ -11 +11 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -31 +30 @@
 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;
+
 /**
  * Grab the SVG administrative boundaries of the active commune layer (cadastre),
@@ -193 +191 @@
 
     private String grabSVG(URL url) throws IOException, OsmTransferException {
-        wmsInterface.urlConn = (HttpURLConnection) url.openConnection();
-        wmsInterface.urlConn.setRequestProperty("Connection", "close");
-        wmsInterface.urlConn.setRequestMethod("GET");
-        wmsInterface.setCookie();
         File file = new File(CadastrePlugin.cacheDir + "boundary.svg");
         String svg = "";
-        try (InputStream is = new ProgressInputStream(wmsInterface.urlConn, NullProgressMonitor.INSTANCE)) {
+        try (InputStream is = wmsInterface.getContent(url)) {
             if (file.exists())
                 file.delete();