Changeset 9537 in josm for trunk/src/org/openstreetmap/josm/io

Timestamp:

2016-01-19T11:20:23+01:00 (10 years ago)

Author:

bastiK

Message:

applied #12370 - adapted osm file filter to other file types (patch by kolesar)

Location:

trunk/src/org/openstreetmap/josm/io

Files:

• OsmBzip2Exporter.java (modified) (2 diffs)
• OsmBzip2Importer.java (deleted)
• OsmExporter.java (modified) (1 diff)
• OsmGzipExporter.java (modified) (2 diffs)
• OsmGzipImporter.java (deleted)
• OsmImporter.java (modified) (2 diffs)
• OsmZipImporter.java (deleted)

trunk/src/org/openstreetmap/josm/io/OsmBzip2Exporter.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.io;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import org.openstreetmap.josm.actions.ExtensionFileFilter;
 
 /**
@@ -11 +15 @@
      */
     public OsmBzip2Exporter() {
-        super(OsmBzip2Importer.FILE_FILTER);
+        super(new ExtensionFileFilter(
+            "osm.bz2,osm.bz", "osm.bz2", tr("OSM Server Files bzip2 compressed") + " (*.osm.bz2, *.osm.bz)"));
     }
 

trunk/src/org/openstreetmap/josm/io/OsmExporter.java

@@ -32 +32 @@
      */
     public OsmExporter() {
-        super(OsmImporter.FILE_FILTER);
+        super(new ExtensionFileFilter(
+            "osm,xml", "osm", tr("OSM Server Files") + " (*.osm)"));
     }
 

trunk/src/org/openstreetmap/josm/io/OsmGzipExporter.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.io;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import org.openstreetmap.josm.actions.ExtensionFileFilter;
 
 /**
@@ -11 +15 @@
      */
     public OsmGzipExporter() {
-        super(OsmGzipImporter.FILE_FILTER);
+        super(new ExtensionFileFilter(
+            "osm.gz", "osm.gz", tr("OSM Server Files gzip compressed") + " (*.osm.gz)"));
     }
 

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

@@ -8 +8 @@
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.Arrays;
 
 import javax.swing.JOptionPane;
@@ -24 +25 @@
      * The OSM file filter (*.osm and *.xml files).
      */
-    public static final ExtensionFileFilter FILE_FILTER = new ExtensionFileFilter(
-            "osm,xml", "osm", tr("OSM Server Files") + " (*.osm *.xml)");
+    public static final ExtensionFileFilter FILE_FILTER = ExtensionFileFilter.newFilterWithArchiveExtensions(
+            "osm,xml", "osm", tr("OSM Server Files") + " (*.osm, *.osm.gz, *.osm.bz2, *.osm.zip, *.xml)", ExtensionFileFilter.AddArchiveExtension.NONE, Arrays.asList("gz", "bz", "bz2", "zip"));
 
     /**