Changeset 1653 in josm for trunk/src/org/openstreetmap/josm/io/OsmImporter.java

Timestamp:

2009-06-07T16:18:31+02:00 (15 years ago)

Author:

stoecker

Message:

add support for compressed OSM files (bzip2, gzip)

File:

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

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

@@ -9 +9 @@
 import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.io.InputStream;
 
 import javax.swing.JOptionPane;
@@ -24 +25 @@
     }
 
+    public OsmImporter(ExtensionFileFilter filter) {
+        super(filter);
+    }
+
     @Override public void importData(File file) throws IOException {
         try {
-            OsmReader osm = OsmReader.parseDataSetOsm(new FileInputStream(file), null, Main.pleaseWaitDlg);
-            DataSet dataSet = osm.getDs();
-            OsmDataLayer layer = new OsmDataLayer(dataSet, file.getName(), file);
-            Main.main.addLayer(layer);
-            layer.fireDataChange();
-            if (osm.getParseNotes().length() != 0) {
-                /* display at most five lines */
-                String notes = osm.getParseNotes();
-                int j = 0;
-                for (int i = 0; i < 5; i++)
-                    j = notes.indexOf('\n', j + 1);
-                j = j >= 0 ? j : notes.length();
-                JOptionPane.showMessageDialog(Main.parent, notes.substring(0, j));
-            }
+            FileInputStream in = new FileInputStream(file);
+            importData(in, file);
         } catch (HeadlessException e) {
             e.printStackTrace();
@@ -51 +44 @@
         }
     }
+
+    protected void importData(InputStream in, File associatedFile) throws SAXException, IOException {
+        OsmReader osm = OsmReader.parseDataSetOsm(in, null, Main.pleaseWaitDlg);
+        DataSet dataSet = osm.getDs();
+        OsmDataLayer layer = new OsmDataLayer(dataSet, associatedFile.getName(), associatedFile);
+        Main.main.addLayer(layer);
+        layer.fireDataChange();
+        if (osm.getParseNotes().length() != 0) {
+            /* display at most five lines */
+            String notes = osm.getParseNotes();
+            int j = 0;
+            for (int i = 0; i < 5; i++)
+                j = notes.indexOf('\n', j + 1);
+            j = j >= 0 ? j : notes.length();
+            JOptionPane.showMessageDialog(Main.parent, notes.substring(0, j));
+        }
+    }
 }