Changeset 8894 in josm for trunk/src/org/openstreetmap/josm/io/NMEAImporter.java

Timestamp:

2015-10-18T12:48:44+02:00 (9 years ago)

Author:

simon04

Message:

fix #7058 - Ability to load gz and bz2 zipped NMEA files

File:

• trunk/src/org/openstreetmap/josm/io/NMEAImporter.java (modified) (3 diffs)

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

@@ -5 +5 @@
 
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -31 +30 @@
      * The NMEA file filter (*.nmea *.nme *.nma *.log *.txt files).
      */
-    public static final ExtensionFileFilter FILE_FILTER = new ExtensionFileFilter(
-            "nmea,nme,nma,log,txt", "nmea", tr("NMEA-0183 Files") + " (*.nmea *.nme *.nma *.log *.txt)");
+    public static final ExtensionFileFilter FILE_FILTER = ExtensionFileFilter.newFilterWithArchiveExtensions(
+            "nmea,nme,nma,log,txt", "nmea", tr("NMEA-0183 Files"));
 
     /**
@@ -44 +43 @@
     public void importData(File file, ProgressMonitor progressMonitor) throws IOException {
         final String fn = file.getName();
-        try (InputStream fis = new FileInputStream(file)) {
+        try (InputStream fis = Compression.getUncompressedFileInputStream(file)) {
             final NmeaReader r = new NmeaReader(fis);
             if (r.getNumberOfCoordinates() > 0) {