Ignore:
Timestamp:
2019-09-26T20:05:02+02:00 (7 years ago)
Author:
Don-vip
Message:

see #13679 - refactor session import/export classes for easier plugin extensions

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/io/session/OsmDataSessionExporter.java

    r12800 r15377  
    88import java.nio.charset.StandardCharsets;
    99
     10import org.openstreetmap.josm.data.osm.DataSet;
    1011import org.openstreetmap.josm.gui.layer.OsmDataLayer;
    1112import org.openstreetmap.josm.io.OsmWriter;
     
    2829    @Override
    2930    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) {
    3041        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();
    3344        try {
    34             w.write(layer.data);
     45            w.write(data);
    3546            w.flush();
    3647        } finally {
    37             layer.data.getReadLock().unlock();
     48            data.getReadLock().unlock();
    3849        }
    3950    }
Note: See TracChangeset for help on using the changeset viewer.