Ticket #12370: OsmFileFilter.patch

File OsmFileFilter.patch, 7.2 KB (added by kolesar, 10 years ago)

  • src/org/openstreetmap/josm/actions/ExtensionFileFilter.java 

    diff --git a/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java b/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java
index 0f52313..de44d7b 100644
    a b public class ExtensionFileFilter extends FileFilter implements java.io.FileFilte  
    5252
    5353        final List<Class<? extends FileImporter>> importerNames = Arrays.asList(
    5454                org.openstreetmap.josm.io.OsmImporter.class,
    55                 org.openstreetmap.josm.io.OsmGzipImporter.class,
    56                 org.openstreetmap.josm.io.OsmZipImporter.class,
    5755                org.openstreetmap.josm.io.OsmChangeImporter.class,
    5856                org.openstreetmap.josm.io.GpxImporter.class,
    5957                org.openstreetmap.josm.io.NMEAImporter.class,
    6058                org.openstreetmap.josm.io.NoteImporter.class,
    61                 org.openstreetmap.josm.io.OsmBzip2Importer.class,
    6259                org.openstreetmap.josm.io.JpgImporter.class,
    6360                org.openstreetmap.josm.io.WMSLayerImporter.class,
    6461                org.openstreetmap.josm.io.AllFormatsImporter.class,
    … … public class ExtensionFileFilter extends FileFilter implements java.io.FileFilte  
    9895        final List<Class<? extends FileExporter>> exporterClasses = Arrays.asList(
    9996                org.openstreetmap.josm.io.GpxExporter.class,
    10097                org.openstreetmap.josm.io.OsmExporter.class,
    101                 org.openstreetmap.josm.io.OsmGzipExporter.class,
    102                 org.openstreetmap.josm.io.OsmBzip2Exporter.class,
    10398                org.openstreetmap.josm.io.GeoJSONExporter.CurrentProjection.class, // needs to be considered earlier than GeoJSONExporter
    10499                org.openstreetmap.josm.io.GeoJSONExporter.class,
    105100                org.openstreetmap.josm.io.WMSLayerExporter.class,

  • deleted file src/org/openstreetmap/josm/io/OsmBzip2Exporter.java 

    diff --git a/src/org/openstreetmap/josm/io/OsmBzip2Exporter.java b/src/org/openstreetmap/josm/io/OsmBzip2Exporter.java
deleted file mode 100644
index a3dd2f6..0000000
    + -  
    1 // License: GPL. For details, see LICENSE file.
    2 package org.openstreetmap.josm.io;
    3 
    4 /**
    5  * OSM data exporter that compresses it in Bzip2 format.
    6  */
    7 public class OsmBzip2Exporter extends OsmExporter {
    8 
    9     /**
    10      * Constructs a new {@code OsmBzip2Exporter}.
    11      */
    12     public OsmBzip2Exporter() {
    13         super(OsmBzip2Importer.FILE_FILTER);
    14     }
    15 
    16     // compression handling is performed in super-class
    17 
    18 }

  • deleted file src/org/openstreetmap/josm/io/OsmBzip2Importer.java 

    diff --git a/src/org/openstreetmap/josm/io/OsmBzip2Importer.java b/src/org/openstreetmap/josm/io/OsmBzip2Importer.java
deleted file mode 100644
index de84539..0000000
    + -  
    1 // License: GPL. For details, see LICENSE file.
    2 package org.openstreetmap.josm.io;
    3 
    4 import static org.openstreetmap.josm.tools.I18n.tr;
    5 
    6 import org.openstreetmap.josm.actions.ExtensionFileFilter;
    7 
    8 /**
    9  * OSM data importer that uncompresses it from Bzip2 format.
    10  */
    11 public class OsmBzip2Importer extends OsmImporter {
    12 
    13     /**
    14      * File filter used to load/save Bzip2 compressed OSM files.
    15      */
    16     public static final ExtensionFileFilter FILE_FILTER = new ExtensionFileFilter(
    17             "osm.bz2,osm.bz", "osm.bz2", tr("OSM Server Files bzip2 compressed") + " (*.osm.bz2 *.osm.bz)");
    18 
    19     /**
    20      * Constructs a new {@code OsmBzip2Importer}.
    21      */
    22     public OsmBzip2Importer() {
    23         super(FILE_FILTER);
    24     }
    25 
    26     // compression handling is performed in super-class
    27 
    28 }

  • deleted file src/org/openstreetmap/josm/io/OsmGzipExporter.java 

    diff --git a/src/org/openstreetmap/josm/io/OsmGzipExporter.java b/src/org/openstreetmap/josm/io/OsmGzipExporter.java
deleted file mode 100644
index 77ca4e1..0000000
    + -  
    1 // License: GPL. For details, see LICENSE file.
    2 package org.openstreetmap.josm.io;
    3 
    4 /**
    5  * OSM data exporter that compresses it in GZip format.
    6  */
    7 public class OsmGzipExporter extends OsmExporter {
    8 
    9     /**
    10      * Constructs a new {@code OsmGzipExporter}.
    11      */
    12     public OsmGzipExporter() {
    13         super(OsmGzipImporter.FILE_FILTER);
    14     }
    15 
    16     // compression handling is performed in super-class
    17 
    18 }

  • deleted file src/org/openstreetmap/josm/io/OsmGzipImporter.java 

    diff --git a/src/org/openstreetmap/josm/io/OsmGzipImporter.java b/src/org/openstreetmap/josm/io/OsmGzipImporter.java
deleted file mode 100644
index 9ab1df7..0000000
    + -  
    1 // License: GPL. For details, see LICENSE file.
    2 package org.openstreetmap.josm.io;
    3 
    4 import static org.openstreetmap.josm.tools.I18n.tr;
    5 
    6 import org.openstreetmap.josm.actions.ExtensionFileFilter;
    7 
    8 /**
    9  * OSM data importer that uncompresses it from Gzip format.
    10  */
    11 public class OsmGzipImporter extends OsmImporter {
    12 
    13     /**
    14      * File filter used to load/save Gzip compressed OSM files.
    15      */
    16     public static final ExtensionFileFilter FILE_FILTER = new ExtensionFileFilter(
    17             "osm.gz", "osm.gz", tr("OSM Server Files gzip compressed") + " (*.osm.gz)");
    18 
    19     /**
    20      * Constructs a new {@code OsmGzipImporter}.
    21      */
    22     public OsmGzipImporter() {
    23         super(FILE_FILTER);
    24     }
    25 
    26     // compression handling is performed in super-class
    27 
    28 }

  • src/org/openstreetmap/josm/io/OsmImporter.java 

    diff --git a/src/org/openstreetmap/josm/io/OsmImporter.java b/src/org/openstreetmap/josm/io/OsmImporter.java
index fa54c0b..dd7cdf1 100644
    a b import org.openstreetmap.josm.gui.util.GuiHelper;  
    2121public class OsmImporter extends FileImporter {
    2222
    2323    /**
    24      * The OSM file filter (*.osm and *.xml files).
     24     * The OSM file filter (*.osm files).
    2525     */
    2626    public static final ExtensionFileFilter FILE_FILTER = new ExtensionFileFilter(
    27             "osm,xml", "osm", tr("OSM Server Files") + " (*.osm *.xml)");
     27            "osm,xml,osm.gz,osm.bz2,osm.bz,osm.zip", "osm", tr("OSM Server Files") + " (*.osm, *.xml, *.osm.gz, *.osm.bz2, *.osm.bz, *.osm.zip)");
    2828
    2929    /**
    3030     * Utility class containing imported OSM layer, and a task to run after it is added to MapView.

  • deleted file src/org/openstreetmap/josm/io/OsmZipImporter.java 

    diff --git a/src/org/openstreetmap/josm/io/OsmZipImporter.java b/src/org/openstreetmap/josm/io/OsmZipImporter.java
deleted file mode 100644
index d9b4e6d..0000000
    + -  
    1 // License: GPL. For details, see LICENSE file.
    2 package org.openstreetmap.josm.io;
    3 
    4 import static org.openstreetmap.josm.tools.I18n.tr;
    5 
    6 import org.openstreetmap.josm.actions.ExtensionFileFilter;
    7 
    8 /**
    9  * OSM data importer that uncompresses it from Zip format.
    10  * @since 6882
    11  */
    12 public class OsmZipImporter extends OsmImporter {
    13 
    14     /**
    15      * File filter used to load/save Zip compressed OSM files.
    16      */
    17     public static final ExtensionFileFilter FILE_FILTER = new ExtensionFileFilter(
    18             "osm.zip", "osm.zip", tr("OSM Server Files zip compressed") + " (*.osm.zip)");
    19 
    20     /**
    21      * Constructs a new {@code OsmZipImporter}.
    22      */
    23     public OsmZipImporter() {
    24         super(FILE_FILTER);
    25     }
    26 
    27     // compression handling is performed in super-class
    28 }