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

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

Location:

trunk/src/org/openstreetmap/josm/io

Files:

• FileImporter.java (modified) (2 diffs)
• GeoJSONExporter.java (modified) (1 diff)
• GpxExporter.java (modified) (2 diffs)
• GpxImporter.java (modified) (2 diffs)
• JpgImporter.java (modified) (1 diff)
• NMEAImporter.java (modified) (1 diff)
• OsmBzip2Exporter.java (modified) (2 diffs)
• OsmBzip2Importer.java (modified) (3 diffs)
• OsmChangeImporter.java (modified) (2 diffs)
• OsmExporter.java (modified) (1 diff)
• OsmGzipExporter.java (modified) (2 diffs)
• OsmGzipImporter.java (modified) (2 diffs)
• OsmImporter.java (modified) (2 diffs)
• OsmServerLocationReader.java (modified) (3 diffs)
• OsmServerReader.java (modified) (2 diffs)
• WMSLayerExporter.java (modified) (1 diff)
• WMSLayerImporter.java (modified) (1 diff)

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

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import java.io.BufferedInputStream;
 import java.io.File;
 import java.io.IOException;
+import java.io.InputStream;
 import java.util.List;
+import java.util.zip.GZIPInputStream;
 
 import javax.swing.JOptionPane;
 
+import org.apache.tools.bzip2.CBZip2InputStream;
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.ExtensionFileFilter;
@@ -97 +101 @@
         return (new Double(this.getPriority())).compareTo(other.getPriority());
     }
+    
+    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);
+    }
 
+    public static GZIPInputStream getGZipInputStream(InputStream in) throws IOException {
+        if (in == null) {
+            return null;
+        }
+        return new GZIPInputStream(in);
+    }
 }

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

@@ -12 +12 @@
 public class GeoJSONExporter extends FileExporter {
 
+    public static final ExtensionFileFilter FILE_FILTER = new ExtensionFileFilter(
+            "json,geojson", "json", tr("GeoJSON Files") + " (*.json *.geojson)");
+    
     public GeoJSONExporter() {
-        super(new ExtensionFileFilter("json,geojson", "json", tr("GeoJSON Files") + " (*.json *.geojson)"));
+        super(FILE_FILTER);
     }
 

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

@@ -27 +27 @@
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.actions.ExtensionFileFilter;
 import org.openstreetmap.josm.data.gpx.GpxData;
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -43 +42 @@
 
     public GpxExporter() {
-        super(new ExtensionFileFilter("gpx,gpx.gz", "gpx", tr("GPX Files") + " (*.gpx *.gpx.gz)"));
+        super(GpxImporter.FILE_FILTER);
     }
 

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

@@ -22 +22 @@
 public class GpxImporter extends FileImporter {
 
+    public static final ExtensionFileFilter FILE_FILTER = new ExtensionFileFilter(
+            "gpx,gpx.gz", "gpx", tr("GPX Files") + " (*.gpx *.gpx.gz)");
+    
     protected static class GpxImporterData {
         public GpxLayer gpxLayer;
@@ -29 +32 @@
 
     public GpxImporter() {
-        super(new ExtensionFileFilter("gpx,gpx.gz", "gpx", tr("GPX Files") + " (*.gpx *.gpx.gz)"));
+        super(FILE_FILTER);
     }
 

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

@@ -19 +19 @@
 public class JpgImporter extends FileImporter {
     private GpxLayer gpx;
+    
+    public static final ExtensionFileFilter FILE_FILTER = new ExtensionFileFilter(
+            "jpg", "jpg", tr("Image Files") + " (*.jpg, "+ tr("folder")+")");
 
     public JpgImporter() {
-        super(new ExtensionFileFilter("jpg", "jpg", tr("Image Files") + " (*.jpg, "+ tr("folder")+")"));
+        super(FILE_FILTER);
     }
 

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

@@ -20 +20 @@
 public class NMEAImporter extends FileImporter {
 
+    public static final ExtensionFileFilter FILE_FILTER = new ExtensionFileFilter(
+            "nmea,nme,nma,log,txt", "nmea", tr("NMEA-0183 Files") + " (*.nmea *.nme *.nma *.log *.txt)");
+    
     public NMEAImporter() {
-        super(
-                new ExtensionFileFilter("nmea,nme,nma,log,txt", "nmea", tr("NMEA-0183 Files")
-                        + " (*.nmea *.nme *.nma *.log *.txt)"));
+        super(FILE_FILTER);
     }
 

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 java.io.File;
@@ -11 +9 @@
 
 import org.apache.tools.bzip2.CBZip2OutputStream;
-import org.openstreetmap.josm.actions.ExtensionFileFilter;
 public class OsmBzip2Exporter extends OsmExporter {
 
     public OsmBzip2Exporter() {
-        super(new ExtensionFileFilter("osm.bz2, osm.bz", "osm.bz2", tr("OSM Server Files bzip2 compressed")
-                + " (*.osm.bz2 *.osm.bz)"));
+        super(OsmBzip2Importer.FILE_FILTER);
     }
 

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);
-    }
 }

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

@@ -22 +22 @@
 public class OsmChangeImporter extends FileImporter {
 
+    public static final ExtensionFileFilter FILE_FILTER = new ExtensionFileFilter(
+            "osc,osc.bz2,osc.bz,osc.gz", "osc", tr("OsmChange File") + " (*.osc *.osc.bz2 *.osc.bz *.osc.gz)");
+    
     public OsmChangeImporter() {
-        super(new ExtensionFileFilter("osc", "osc", tr("OsmChange File") + " (*.osc)"));
+        super(FILE_FILTER);
     }
 
@@ -33 +36 @@
         try {
             FileInputStream in = new FileInputStream(file);
-            importData(in, file);
+            
+            if (file.getName().endsWith(".osc")) {
+                importData(in, file);
+            } else if (file.getName().endsWith(".gz")) {
+                importData(getGZipInputStream(in), file);
+            } else {
+                importData(getBZip2InputStream(in), file);
+            }
+            
         } catch (FileNotFoundException e) {
             e.printStackTrace();

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

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

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 java.io.File;
@@ -10 +8 @@
 import java.io.OutputStream;
 import java.util.zip.GZIPOutputStream;
-
-import org.openstreetmap.josm.actions.ExtensionFileFilter;
 public class OsmGzipExporter extends OsmExporter {
 
     public OsmGzipExporter() {
-        super(new ExtensionFileFilter("osm.gz", "osm.gz", tr("OSM Server Files gzip compressed") + " (*.osm.gz)"));
+        super(OsmGzipImporter.FILE_FILTER);
     }
 

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

@@ -7 +7 @@
 import java.io.FileInputStream;
 import java.io.IOException;
-import java.util.zip.GZIPInputStream;
 
 import org.openstreetmap.josm.actions.ExtensionFileFilter;
@@ -14 +13 @@
 public class OsmGzipImporter extends OsmImporter {
 
+    public static final ExtensionFileFilter FILE_FILTER = new ExtensionFileFilter(
+            "osm.gz", "osm.gz", tr("OSM Server Files gzip compressed") + " (*.osm.gz)");
+    
     public OsmGzipImporter() {
-        super(new ExtensionFileFilter("osm.gz", "osm.gz", tr("OSM Server Files gzip compressed") + " (*.osm.gz)"));
+        super(FILE_FILTER);
     }
 
     @Override
     public void importData(File file, ProgressMonitor progressMonitor) throws IOException, IllegalDataException {
-        GZIPInputStream in = new GZIPInputStream(new FileInputStream(file));
-        importData(in, file);
+        importData(getGZipInputStream(new FileInputStream(file)), file);
     }
 }

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

@@ -22 +22 @@
 public class OsmImporter extends FileImporter {
 
+    public static final ExtensionFileFilter FILE_FILTER = new ExtensionFileFilter(
+            "osm,xml", "osm", tr("OSM Server Files") + " (*.osm *.xml)");
+    
     public static class OsmImporterData {
 
@@ -42 +45 @@
 
     public OsmImporter() {
-        super(new ExtensionFileFilter("osm,xml", "osm", tr("OSM Server Files") + " (*.osm *.xml)"));
+        super(FILE_FILTER);
     }
 

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

@@ -6 +6 @@
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.zip.GZIPInputStream;
 
 import org.apache.tools.bzip2.CBZip2InputStream;
@@ -76 +77 @@
                 if (in == null)
                     return null;
-                CBZip2InputStream bzin = OsmBzip2Importer.getBZip2InputStream(in);
+                CBZip2InputStream bzin = FileImporter.getBZip2InputStream(in);
                 progressMonitor.subTask(tr("Downloading OSM data..."));
                 return OsmReader.parseDataSet(bzin, progressMonitor.createSubTaskMonitor(1, false));
+            }
+        }, progressMonitor);
+    }
+    
+    /**
+     * Method to download GZip-compressed OSM files from somewhere
+     */
+    @Override
+    public DataSet parseOsmGzip(final ProgressMonitor progressMonitor) throws OsmTransferException {
+        return doParse(new Parser<DataSet>() {
+            @Override
+            public DataSet parse() throws OsmTransferException, IllegalDataException, IOException {
+                in = getInputStreamRaw(url, progressMonitor.createSubTaskMonitor(9, false));
+                if (in == null)
+                    return null;
+                GZIPInputStream gzin = FileImporter.getGZipInputStream(in);
+                progressMonitor.subTask(tr("Downloading OSM data..."));
+                return OsmReader.parseDataSet(gzin, progressMonitor.createSubTaskMonitor(1, false));
             }
         }, progressMonitor);
@@ -97 +116 @@
                 progressMonitor.subTask(tr("Downloading OSM data..."));
                 return OsmChangeReader.parseDataSet(in, progressMonitor.createSubTaskMonitor(1, false));
+            }
+        }, progressMonitor);
+    }
+    
+    /**
+     * Method to download BZip2-compressed OSM Change files from somewhere
+     */
+    @Override
+    public DataSet parseOsmChangeBzip2(final ProgressMonitor progressMonitor) throws OsmTransferException {
+        return doParse(new Parser<DataSet>() {
+            @Override
+            public DataSet parse() throws OsmTransferException, IllegalDataException, IOException {
+                in = getInputStreamRaw(url, progressMonitor.createSubTaskMonitor(9, false));
+                if (in == null)
+                    return null;
+                CBZip2InputStream bzin = FileImporter.getBZip2InputStream(in);
+                progressMonitor.subTask(tr("Downloading OSM data..."));
+                return OsmChangeReader.parseDataSet(bzin, progressMonitor.createSubTaskMonitor(1, false));
+            }
+        }, progressMonitor);
+    }
+    
+    /**
+     * Method to download GZip-compressed OSM Change files from somewhere
+     */
+    @Override
+    public DataSet parseOsmChangeGzip(final ProgressMonitor progressMonitor) throws OsmTransferException {
+        return doParse(new Parser<DataSet>() {
+            @Override
+            public DataSet parse() throws OsmTransferException, IllegalDataException, IOException {
+                in = getInputStreamRaw(url, progressMonitor.createSubTaskMonitor(9, false));
+                if (in == null)
+                    return null;
+                GZIPInputStream gzin = FileImporter.getGZipInputStream(in);
+                progressMonitor.subTask(tr("Downloading OSM data..."));
+                return OsmChangeReader.parseDataSet(gzin, progressMonitor.createSubTaskMonitor(1, false));
             }
         }, progressMonitor);

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

@@ -151 +151 @@
         return null;
     }
-    
+
+    public DataSet parseOsmChangeBzip2(final ProgressMonitor progressMonitor) throws OsmTransferException {
+        return null;
+    }
+
+    public DataSet parseOsmChangeGzip(final ProgressMonitor progressMonitor) throws OsmTransferException {
+        return null;
+    }
+
     public GpxData parseRawGps(final ProgressMonitor progressMonitor) throws OsmTransferException {
         return null;
@@ -159 +167 @@
         return null;
     }
-    
+
+    public DataSet parseOsmGzip(final ProgressMonitor progressMonitor) throws OsmTransferException {
+        return null;
+    }
+
     /**
      * Returns true if this reader is adding authentication credentials to the read

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

@@ -2 +2 @@
 package org.openstreetmap.josm.io;
 
-import static org.openstreetmap.josm.tools.I18n.tr;
-
-import org.openstreetmap.josm.actions.ExtensionFileFilter;
-
-public class WMSLayerExporter extends FileExporter{
+public class WMSLayerExporter extends FileExporter {
 
     public WMSLayerExporter() {
-        super(new ExtensionFileFilter("wms", "wms", tr("WMS Files (*.wms)")));
+        super(WMSLayerImporter.FILE_FILTER);
     }
 }

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

@@ -6 +6 @@
 import org.openstreetmap.josm.actions.ExtensionFileFilter;
 
-public class WMSLayerImporter extends FileImporter{
+public class WMSLayerImporter extends FileImporter {
 
+    public static final ExtensionFileFilter FILE_FILTER = new ExtensionFileFilter(
+            "wms", "wms", tr("WMS Files (*.wms)"));
+    
     public WMSLayerImporter() {
-        super(new ExtensionFileFilter("wms", "wms", tr("WMS Files (*.wms)")));
+        super(FILE_FILTER);
     }
-
 }