Changeset 6716 in josm for trunk/src/org
- Timestamp:
- 2014-01-17T21:23:07+01:00 (11 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/io
- Files:
-
- 1 added
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/io/GpxExporter.java
r6643 r6716 10 10 import java.awt.event.KeyEvent; 11 11 import java.io.File; 12 import java.io.FileOutputStream;13 12 import java.io.IOException; 13 import java.io.OutputStream; 14 14 import java.text.MessageFormat; 15 15 import java.util.Calendar; … … 173 173 } 174 174 175 FileOutputStream fo = null;175 OutputStream fo = null; 176 176 try { 177 fo = newFileOutputStream(file);177 fo = Compression.getCompressedFileOutputStream(file); 178 178 new GpxWriter(fo).write(gpxData); 179 179 fo.flush(); -
trunk/src/org/openstreetmap/josm/io/GpxImporter.java
r6643 r6716 5 5 6 6 import java.io.File; 7 import java.io.FileInputStream;8 7 import java.io.IOException; 9 8 import java.io.InputStream; 10 import java.util.zip.GZIPInputStream;11 9 12 10 import javax.swing.JOptionPane; … … 31 29 */ 32 30 public static final ExtensionFileFilter FILE_FILTER = new ExtensionFileFilter( 33 "gpx,gpx.gz ", "gpx", tr("GPX Files") + " (*.gpx *.gpx.gz)");31 "gpx,gpx.gz,gpx.bz2", "gpx", tr("GPX Files") + " (*.gpx *.gpx.gz, *.gpx.bz2)"); 34 32 35 33 /** … … 78 76 @Override 79 77 public void importData(File file, ProgressMonitor progressMonitor) throws IOException { 80 InputStream is; 81 if (file.getName().endsWith(".gpx.gz")) { 82 is = new GZIPInputStream(new FileInputStream(file)); 83 } else { 84 is = new FileInputStream(file); 85 } 86 String fileName = file.getName(); 78 final InputStream is = Compression.getUncompressedFileInputStream(file); 79 final String fileName = file.getName(); 87 80 88 81 try { -
trunk/src/org/openstreetmap/josm/io/OsmBzip2Exporter.java
r6289 r6716 1 1 // License: GPL. For details, see LICENSE file. 2 2 package org.openstreetmap.josm.io; 3 4 import java.io.File;5 import java.io.FileNotFoundException;6 import java.io.FileOutputStream;7 import java.io.IOException;8 import java.io.OutputStream;9 10 import org.apache.tools.bzip2.CBZip2OutputStream;11 import org.openstreetmap.josm.tools.Utils;12 3 13 4 public class OsmBzip2Exporter extends OsmExporter { … … 20 11 } 21 12 22 @Override 23 protected OutputStream getOutputStream(File file) throws FileNotFoundException, IOException { 24 OutputStream out = new FileOutputStream(file); 25 try { 26 out.write('B'); 27 out.write('Z'); 28 return new CBZip2OutputStream(out); 29 } catch (IOException e) { 30 Utils.close(out); 31 throw e; 32 } 33 } 13 // compression handling is preformed in super-class 14 34 15 } -
trunk/src/org/openstreetmap/josm/io/OsmBzip2Importer.java
r6070 r6716 4 4 import static org.openstreetmap.josm.tools.I18n.tr; 5 5 6 import java.io.File;7 import java.io.FileInputStream;8 import java.io.IOException;9 10 6 import org.openstreetmap.josm.actions.ExtensionFileFilter; 11 import org.openstreetmap.josm.gui.progress.ProgressMonitor;12 7 13 8 public class OsmBzip2Importer extends OsmImporter { … … 20 15 } 21 16 22 @Override 23 public void importData(File file, ProgressMonitor progressMonitor) throws IOException, IllegalDataException { 24 importData(getBZip2InputStream(new FileInputStream(file)), file, progressMonitor); 25 } 17 // compression handling is preformed in super-class 18 26 19 } -
trunk/src/org/openstreetmap/josm/io/OsmChangeImporter.java
r6643 r6716 5 5 6 6 import java.io.File; 7 import java.io.FileInputStream;8 7 import java.io.FileNotFoundException; 9 8 import java.io.IOException; … … 38 37 @Override public void importData(File file, ProgressMonitor progressMonitor) throws IOException, IllegalDataException { 39 38 try { 40 FileInputStream in = new FileInputStream(file); 41 42 if (file.getName().endsWith(".osc")) { 43 importData(in, file, progressMonitor); 44 } else if (file.getName().endsWith(".gz")) { 45 importData(getGZipInputStream(in), file, progressMonitor); 46 } else { 47 importData(getBZip2InputStream(in), file, progressMonitor); 48 } 49 39 importData(Compression.getUncompressedFileInputStream(file), file, progressMonitor); 50 40 } catch (FileNotFoundException e) { 51 41 Main.error(e); -
trunk/src/org/openstreetmap/josm/io/OsmExporter.java
r6643 r6716 53 53 54 54 protected OutputStream getOutputStream(File file) throws FileNotFoundException, IOException { 55 return newFileOutputStream(file);55 return Compression.getCompressedFileOutputStream(file); 56 56 } 57 57 -
trunk/src/org/openstreetmap/josm/io/OsmGzipExporter.java
r5361 r6716 2 2 package org.openstreetmap.josm.io; 3 3 4 import java.io.File;5 import java.io.FileNotFoundException;6 import java.io.FileOutputStream;7 import java.io.IOException;8 import java.io.OutputStream;9 import java.util.zip.GZIPOutputStream;10 4 public class OsmGzipExporter extends OsmExporter { 11 5 … … 14 8 } 15 9 16 @Override 17 protected OutputStream getOutputStream(File file) throws FileNotFoundException, IOException { 18 OutputStream out = new FileOutputStream(file); 19 return new GZIPOutputStream(out); 20 } 10 // compression handling is preformed in super-class 11 21 12 } -
trunk/src/org/openstreetmap/josm/io/OsmGzipImporter.java
r6070 r6716 4 4 import static org.openstreetmap.josm.tools.I18n.tr; 5 5 6 import java.io.File;7 import java.io.FileInputStream;8 import java.io.IOException;9 10 6 import org.openstreetmap.josm.actions.ExtensionFileFilter; 11 import org.openstreetmap.josm.gui.progress.ProgressMonitor;12 7 13 8 public class OsmGzipImporter extends OsmImporter { … … 20 15 } 21 16 22 @Override 23 public void importData(File file, ProgressMonitor progressMonitor) throws IOException, IllegalDataException { 24 importData(getGZipInputStream(new FileInputStream(file)), file, progressMonitor); 25 } 17 // compression handling is preformed in super-class 18 26 19 } -
trunk/src/org/openstreetmap/josm/io/OsmImporter.java
r6643 r6716 5 5 6 6 import java.io.File; 7 import java.io.FileInputStream;8 7 import java.io.FileNotFoundException; 9 8 import java.io.IOException; … … 60 59 @Override 61 60 public void importData(File file, ProgressMonitor progressMonitor) throws IOException, IllegalDataException { 62 FileInputStream in = null;61 InputStream in = null; 63 62 try { 64 in = newFileInputStream(file);63 in = Compression.getUncompressedFileInputStream(file); 65 64 importData(in, file, progressMonitor); 66 65 } catch (FileNotFoundException e) { -
trunk/src/org/openstreetmap/josm/io/OsmServerLocationReader.java
r6244 r6716 38 38 this.progressMonitor = progressMonitor; 39 39 this.compression = compression; 40 }41 42 protected final InputStream getUncompressedInputStream() throws IOException {43 switch (compression) {44 case BZIP2: return FileImporter.getBZip2InputStream(in);45 case GZIP: return FileImporter.getGZipInputStream(in);46 case NONE:47 default: return in;48 }49 40 } 50 41 … … 121 112 return null; 122 113 progressMonitor.subTask(tr("Downloading OSM data...")); 123 return OsmReader.parseDataSet( getUncompressedInputStream(), progressMonitor.createSubTaskMonitor(1, false));114 return OsmReader.parseDataSet(compression.getUncompressedInputStream(in), progressMonitor.createSubTaskMonitor(1, false)); 124 115 } 125 116 } … … 136 127 return null; 137 128 progressMonitor.subTask(tr("Downloading OSM data...")); 138 return OsmChangeReader.parseDataSet( getUncompressedInputStream(), progressMonitor.createSubTaskMonitor(1, false));129 return OsmChangeReader.parseDataSet(compression.getUncompressedInputStream(in), progressMonitor.createSubTaskMonitor(1, false)); 139 130 } 140 131 } … … 151 142 return null; 152 143 progressMonitor.subTask(tr("Downloading OSM data...")); 153 GpxReader reader = new GpxReader( getUncompressedInputStream());144 GpxReader reader = new GpxReader(compression.getUncompressedInputStream(in)); 154 145 gpxParsedProperly = reader.parse(false); 155 146 GpxData result = reader.getGpxData(); -
trunk/src/org/openstreetmap/josm/io/OsmServerReader.java
r6695 r6716 34 34 private boolean doAuthenticate = false; 35 35 protected boolean gpxParsedProperly; 36 37 protected enum Compression {38 NONE,39 BZIP2,40 GZIP41 }42 36 43 37 /**
Note:
See TracChangeset
for help on using the changeset viewer.