Changeset 29679 in osm for applications/editors/josm


Ignore:
Timestamp:
2013-06-21T00:57:18+02:00 (11 years ago)
Author:
donvip
Message:

[josm_opendata] Add .7z archive read support

Location:
applications/editors/josm/plugins/opendata
Files:
85 added
4 edited

Legend:

Unmodified
Added
Removed

  • applications/editors/josm/plugins/opendata/README

    r29014 r29679  
    2222        - commons/lang3: Apache Commons Lang 3.1 (stuff related to WordUtils, used by the plugin itself)
    2323        - poi: Apache POI 3.7 (Excel format support without styles, formulas and writing capabilities, used by the plugin itself)
     24    - org/j7zip: J7zip 4.43alpha2 (7z archive read support, LGPL v2.1, see LGPL-2.1.txt)
    2425    - org/jopendocument: jOpenDocument 1.2 (ODS support without styles and writing capabilities, used by the plugin itself) (GPL v3, see GPL-3.0.txt)
    2526   

  • applications/editors/josm/plugins/opendata/build.xml

    r29505 r29679  
    5858    <!--
    5959    **********************************************************
     60    ** compile_j7zip - compiles J7zip classes
     61    **********************************************************
     62    -->
     63    <target name="compile_j7zip" depends="init">
     64        <echo message="compiling J7Zip ... "/>
     65        <javac srcdir="includes/org/j7zip" debug="true" destdir="${plugin.build.dir}" includeAntRuntime="false" encoding="UTF-8" />
     66    </target>
     67    <!--
     68    **********************************************************
    6069    ** compile_neptune - compiles Neptune classes
    6170    **********************************************************
    … …  
    7079    **********************************************************
    7180    -->
    72     <target name="compile" depends="init, compile_lang3, compile_poi, compile_jopendoc, compile_neptune">
     81    <target name="compile" depends="init, compile_lang3, compile_poi, compile_jopendoc, compile_neptune, compile_j7zip">
    7382        <echo message="compiling sources for  ${plugin.jar} ... "/>
    7483        <javac srcdir="src" debug="true" destdir="${plugin.build.dir}" includeAntRuntime="false">

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

    r28113 r29679  
    2929
    3030import org.openstreetmap.josm.data.osm.DataSet;
    31 import org.openstreetmap.josm.plugins.opendata.core.io.archive.DefaultZipHandler;
     31import org.openstreetmap.josm.plugins.opendata.core.io.archive.DefaultArchiveHandler;
    3232import org.openstreetmap.josm.plugins.opendata.modules.fr.datagouvfr.datasets.DataGouvDataSetHandler;
    3333import org.openstreetmap.josm.tools.Pair;
    … …  
    6666        public EauxDeSurfaceHandler() {
    6767                setName("Eaux de surface");
    68                 setZipHandler(new InternalZipHandler());
     68                setArchiveHandler(new InternalZipHandler());
    6969        }
    7070       
    … …  
    126126        }
    127127       
    128         private class InternalZipHandler extends DefaultZipHandler {
     128        private class InternalZipHandler extends DefaultArchiveHandler {
    129129                @Override
    130130                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

    r28554 r29679  
    3434        setName("Réseau Tisséo (Métro, Bus, Tram)");
    3535        setCategory(CAT_TRANSPORT);
    36         getZipHandler().setSkipXsdValidation(true);
     36        getArchiveHandler().setSkipXsdValidation(true);
    3737    }
    3838
Note: See TracChangeset for help on using the changeset viewer.