Changeset 5361 in josm for trunk/src/org/openstreetmap/josm/io/OsmBzip2Importer.java

Timestamp:

2012-07-25T02:31:52+02:00 (12 years ago)

Author:

Don-vip

Message:

fix #7879 - Allow to open local and remote gzipped/bzipped osmChange files + remote osm.gz files + make some public constants of File filters to share between same importers/exporters

File:

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

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

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.io.BufferedInputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
-import java.io.InputStream;
 
-import org.apache.tools.bzip2.CBZip2InputStream;
 import org.openstreetmap.josm.actions.ExtensionFileFilter;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
@@ -16 +13 @@
 public class OsmBzip2Importer extends OsmImporter {
 
+    public static final ExtensionFileFilter FILE_FILTER = new ExtensionFileFilter(
+            "osm.bz2,osm.bz", "osm.bz2", tr("OSM Server Files bzip2 compressed") + " (*.osm.bz2 *.osm.bz)");
+    
     public OsmBzip2Importer() {
-        super(new ExtensionFileFilter("osm.bz2,osm.bz", "osm.bz2", tr("OSM Server Files bzip2 compressed")
-                + " (*.osm.bz2 *.osm.bz)"));
+        super(FILE_FILTER);
     }
 
@@ -25 +24 @@
         importData(getBZip2InputStream(new FileInputStream(file)), file);
     }
-    
-    public static CBZip2InputStream getBZip2InputStream(InputStream in) throws IOException {
-        if (in == null) {
-            return null;
-        }
-        BufferedInputStream bis = new BufferedInputStream(in);
-        int b = bis.read();
-        if (b != 'B')
-            throw new IOException(tr("Invalid bz2 file."));
-        b = bis.read();
-        if (b != 'Z')
-            throw new IOException(tr("Invalid bz2 file."));
-        return new CBZip2InputStream(bis);
-    }
 }