Changeset 29679 in osm for applications/editors/josm/plugins/opendata/modules

Timestamp:

2013-06-21T00:57:18+02:00 (12 years ago)

Author:

donvip

Message:

[josm_opendata] Add .7z archive read support

Location:

applications/editors/josm/plugins/opendata/modules

Files:

• fr.datagouvfr/src/org/openstreetmap/josm/plugins/opendata/modules/fr/datagouvfr/datasets/hydrologie/EauxDeSurfaceHandler.java (modified) (3 diffs)
• fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/transport/ReseauTisseoHandler.java (modified) (1 diff)

applications/editors/josm/plugins/opendata/modules/fr.datagouvfr/src/org/openstreetmap/josm/plugins/opendata/modules/fr/datagouvfr/datasets/hydrologie/EauxDeSurfaceHandler.java

@@ -29 +29 @@
 
 import org.openstreetmap.josm.data.osm.DataSet;
-import org.openstreetmap.josm.plugins.opendata.core.io.archive.DefaultZipHandler;
+import org.openstreetmap.josm.plugins.opendata.core.io.archive.DefaultArchiveHandler;
 import org.openstreetmap.josm.plugins.opendata.modules.fr.datagouvfr.datasets.DataGouvDataSetHandler;
 import org.openstreetmap.josm.tools.Pair;
@@ -66 +66 @@
         public EauxDeSurfaceHandler() {
                 setName("Eaux de surface");
-                setZipHandler(new InternalZipHandler());
+                setArchiveHandler(new InternalZipHandler());
         }
         
@@ -126 +126 @@
         }
         
-        private class InternalZipHandler extends DefaultZipHandler {
+        private class InternalZipHandler extends DefaultArchiveHandler {
                 @Override
                 public void notifyTempFileWritten(File file) {

applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/transport/ReseauTisseoHandler.java

@@ -34 +34 @@
         setName("Réseau Tisséo (Métro, Bus, Tram)");
         setCategory(CAT_TRANSPORT);
-        getZipHandler().setSkipXsdValidation(true);
+        getArchiveHandler().setSkipXsdValidation(true);
     }