Changeset 33514 in osm for applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.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/CadastreInterface.java (modified) (6 diffs)

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

@@ -7 +7 @@
 import java.io.BufferedReader;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.OutputStream;
@@ -29 +30 @@
 import org.openstreetmap.josm.data.validation.util.Entities;
 import org.openstreetmap.josm.gui.layer.Layer;
+import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
+import org.openstreetmap.josm.gui.util.GuiHelper;
+import org.openstreetmap.josm.io.OsmTransferException;
+import org.openstreetmap.josm.io.ProgressInputStream;
 import org.openstreetmap.josm.tools.GBC;
 
 public class CadastreInterface {
     public boolean downloadCanceled;
-    public HttpURLConnection urlConn;
+    private HttpURLConnection urlConn;
 
     private String cookie;
@@ -53 +58 @@
     private long cookieTimestamp;
 
-    static final String BASE_URL = "http://www.cadastre.gouv.fr";
+    static final String BASE_URL = "https://www.cadastre.gouv.fr";
     static final String C_IMAGE_FORMAT = "Cette commune est au format ";
     static final String C_COMMUNE_LIST_START = "<select name=\"codeCommune\"";
@@ -98 +103 @@
         } catch (IOException e) {
             Main.error(e);
-            JOptionPane.showMessageDialog(Main.parent,
+            GuiHelper.runInEDT(() ->
+                JOptionPane.showMessageDialog(Main.parent,
                     tr("Town/city {0} not found or not available\n" +
-                            "or action canceled", wmsLayer.getLocation()));
+                            "or action canceled", wmsLayer.getLocation())));
             return false;
         }
@@ -191 +197 @@
     }
 
-    public void setCookie() {
+    private void setCookie() {
         this.urlConn.setRequestProperty("Cookie", this.cookie);
     }
@@ -591 +597 @@
         lastWMSLayerName = null;
     }
+
+    public InputStream getContent(URL url) throws IOException, OsmTransferException {
+        urlConn = (HttpURLConnection) url.openConnection();
+        urlConn.setRequestProperty("Connection", "close");
+        urlConn.setRequestMethod("GET");
+        setCookie();
+        return new ProgressInputStream(urlConn, NullProgressMonitor.INSTANCE);
+    }
 }