Changeset 5501 in josm for trunk/src/org/openstreetmap/josm/actions

Timestamp:

2012-09-05T22:15:03+02:00 (12 years ago)

Author:

bastiK

Message:

add session support for gpx layers (see #4029)

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• SessionSaveAsAction.java (modified) (2 diffs)
• downloadtasks/DownloadGpsTask.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/SessionSaveAsAction.java

@@ -51 +51 @@
     private boolean zipRequired;
 
-    /**
-     * Construct the action with "Save" as label.
-     */
     public SessionSaveAsAction() {
         super(tr("Save Session As..."), "save_as", tr("Save the current session to a new file."), null, true, "save_as-session", true);
@@ -72 +69 @@
         for (Layer l : layers) {
             SessionLayerExporter ex = exporters.get(l);
-            if (ex.requiresZip()) {
+            if (ex != null && ex.requiresZip()) {
                 zipRequired = true;
                 break;

trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java

@@ -124 +124 @@
             GpxImporterData layers = GpxImporter.loadLayers(rawData, reader.isGpxParsedProperly(), name, tr("Markers from {0}", name));
             
-            GpxLayer gpxLayer = addOrMergeLayer(layers.gpxLayer, findGpxMergeLayer());
-            addOrMergeLayer(layers.markerLayer, findMarkerMergeLayer(gpxLayer));
+            GpxLayer gpxLayer = addOrMergeLayer(layers.getGpxLayer(), findGpxMergeLayer());
+            addOrMergeLayer(layers.getMarkerLayer(), findMarkerMergeLayer(gpxLayer));
             
-            layers.postLayerTask.run();
+            layers.getPostLayerTask().run();
         }