Changeset 15377 in josm for trunk/src/org/openstreetmap/josm/io/session/OsmDataSessionExporter.java
- Timestamp:
- 2019-09-26T20:05:02+02:00 (7 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/io/session/OsmDataSessionExporter.java
r12800 r15377 8 8 import java.nio.charset.StandardCharsets; 9 9 10 import org.openstreetmap.josm.data.osm.DataSet; 10 11 import org.openstreetmap.josm.gui.layer.OsmDataLayer; 11 12 import org.openstreetmap.josm.io.OsmWriter; … … 28 29 @Override 29 30 protected void addDataFile(OutputStream out) { 31 export(layer.data, out); 32 } 33 34 /** 35 * Exports OSM data to the given output stream. 36 * @param data data set 37 * @param out output stream 38 * @since 15377 39 */ 40 public static void export(DataSet data, OutputStream out) { 30 41 Writer writer = new OutputStreamWriter(out, StandardCharsets.UTF_8); 31 OsmWriter w = OsmWriterFactory.createOsmWriter(new PrintWriter(writer), false, layer.data.getVersion());32 layer.data.getReadLock().lock();42 OsmWriter w = OsmWriterFactory.createOsmWriter(new PrintWriter(writer), false, data.getVersion()); 43 data.getReadLock().lock(); 33 44 try { 34 w.write( layer.data);45 w.write(data); 35 46 w.flush(); 36 47 } finally { 37 layer.data.getReadLock().unlock();48 data.getReadLock().unlock(); 38 49 } 39 50 }
Note:
See TracChangeset
for help on using the changeset viewer.
