Ignore:
Timestamp:
2014-05-07T02:04:32+02:00 (6 years ago)
Author:
Don-vip
Message:

see #9990 - show problem with unit tests

Location:
trunk/src/org/openstreetmap/josm/io/session
Files:
2 edited

Legend:

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

    r7033 r7070  
    5656    }
    5757
    58     public OsmDataSessionExporter() {
    59     }
    60 
    6158    @Override
    6259    public Collection<Layer> getDependencies() {
  • trunk/src/org/openstreetmap/josm/io/session/SessionWriter.java

    r7033 r7070  
    2828import javax.xml.transform.stream.StreamResult;
    2929
    30 import org.w3c.dom.Document;
    31 import org.w3c.dom.Element;
    32 import org.w3c.dom.Text;
    33 
    3430import org.openstreetmap.josm.Main;
    3531import org.openstreetmap.josm.data.coor.EastNorth;
     
    4541import org.openstreetmap.josm.tools.MultiMap;
    4642import org.openstreetmap.josm.tools.Utils;
     43import org.w3c.dom.Document;
     44import org.w3c.dom.Element;
     45import org.w3c.dom.Text;
    4746
    4847public class SessionWriter {
     
    8079
    8180    private final List<Layer> layers;
    82     private final int active; 
     81    private final int active;
    8382    private final Map<Layer, SessionLayerExporter> exporters;
    8483    private final MultiMap<Layer, Layer> dependencies;
     
    9190     * @param layers The ordered list of layers to save
    9291     * @param active The index of active layer in {@code layers} (starts to 0). Ignored if set to -1
    93      * @param exporters The exprters to use to save layers
     92     * @param exporters The exporters to use to save layers
    9493     * @param zip {@code true} if a joz archive has to be created, {@code false otherwise}
    9594     * @since 6271
     
    208207            }
    209208            Set<Layer> deps = dependencies.get(layer);
    210             if (!deps.isEmpty()) {
     209            if (deps != null && !deps.isEmpty()) {
    211210                List<Integer> depsInt = new ArrayList<>();
    212211                for (Layer depLayer : deps) {
     
    247246    }
    248247
    249     public void write (OutputStream out) throws IOException {
     248    public void write(OutputStream out) throws IOException {
    250249        if (zip) {
    251250            zipOut = new ZipOutputStream(new BufferedOutputStream(out));
Note: See TracChangeset for help on using the changeset viewer.