Changeset 35191 in osm for applications/editors/josm/plugins

Timestamp:

2019-10-15T00:10:00+02:00 (5 years ago)

Author:

donvip

Message:

fix #josm18225 - NPE

Location:

applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre

Files:

• download/CadastreDownloadData.java (modified) (1 diff)
• edigeo/pci/EdigeoPciImporter.java (modified) (1 diff)

applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/download/CadastreDownloadData.java

@@ -28 +28 @@
      * @param downloadCommune whether to download communal layer
      */
-    CadastreDownloadData(boolean downloadWater, boolean downloadBuilding, boolean downloadSymbol,
+    public CadastreDownloadData(boolean downloadWater, boolean downloadBuilding, boolean downloadSymbol,
             boolean downloadParcel, boolean downloadParcelNumber, boolean downloadAddress, boolean downloadLocality,
             boolean downloadSection, boolean downloadCommune) {

applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/edigeo/pci/EdigeoPciImporter.java

@@ -55 +55 @@
     protected DataSet parseDataSet(InputStream in, ProgressMonitor instance) throws IllegalDataException {
         try {
+            if (data == null) {
+                data = new CadastreDownloadData(true, true, true, true, true, true, true, true, true);
+            }
             return EdigeoPciReader.parseDataSet(in, file, data, instance);
         } catch (IOException e) {