Index: /trunk/src/org/openstreetmap/josm/gui/layer/imagery/TileSourceDisplaySettings.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/layer/imagery/TileSourceDisplaySettings.java	(revision 12599)
+++ /trunk/src/org/openstreetmap/josm/gui/layer/imagery/TileSourceDisplaySettings.java	(revision 12600)
@@ -2,4 +2,5 @@
 package org.openstreetmap.josm.gui.layer.imagery;
 
+import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.CopyOnWriteArrayList;
@@ -11,4 +12,5 @@
 import org.openstreetmap.josm.data.preferences.BooleanProperty;
 import org.openstreetmap.josm.gui.layer.AbstractTileSourceLayer;
+import org.openstreetmap.josm.io.session.SessionAwareReadApply;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.JosmRuntimeException;
@@ -22,5 +24,5 @@
  * @since 10568
  */
-public class TileSourceDisplaySettings {
+public class TileSourceDisplaySettings implements SessionAwareReadApply {
     /**
      * A string returned by {@link DisplaySettingsChangeEvent#getChangedSetting()} if auto load was changed.
@@ -249,12 +251,14 @@
      * Stores the current settings object to the given hashmap.
      * The offset data is not stored and needs to be handled separately.
-     * @param data The map to store the settings to.
-     * @see #loadFrom(Map)
+     * @see #applyFromPropertiesMap(Map)
      * @see OffsetBookmark#toPropertiesMap()
      */
-    public void storeTo(Map<String, String> data) {
+    @Override
+    public Map<String, String> toPropertiesMap() {
+        Map<String, String> data = new HashMap<>();
         data.put(AUTO_LOAD, Boolean.toString(autoLoad));
         data.put(AUTO_ZOOM, Boolean.toString(autoZoom));
         data.put(SHOW_ERRORS, Boolean.toString(showErrors));
+        return data;
     }
 
@@ -263,8 +267,9 @@
      * The offset data is not loaded and needs to be handled separately.
      * @param data The data
-     * @see #storeTo(Map)
+     * @see #toPropertiesMap()
      * @see OffsetBookmark#fromPropertiesMap(java.util.Map)
      */
-    public void loadFrom(Map<String, String> data) {
+    @Override
+    public void applyFromPropertiesMap(Map<String, String> data) {
         try {
             String doAutoLoad = data.get(AUTO_LOAD);
Index: /trunk/src/org/openstreetmap/josm/io/session/ImagerySessionExporter.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/io/session/ImagerySessionExporter.java	(revision 12599)
+++ /trunk/src/org/openstreetmap/josm/io/session/ImagerySessionExporter.java	(revision 12600)
@@ -86,5 +86,5 @@
         Map<String, String> data = new LinkedHashMap<>(Preferences.serializeStruct(e, ImageryPreferenceEntry.class));
         if (layer instanceof AbstractTileSourceLayer) {
-            ((AbstractTileSourceLayer<?>) layer).getDisplaySettings().storeTo(data);
+            data.putAll(((AbstractTileSourceLayer<?>) layer).getDisplaySettings().toPropertiesMap());
         }
         addAttributes(layerElem, data, support);
Index: /trunk/src/org/openstreetmap/josm/io/session/ImagerySessionImporter.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/io/session/ImagerySessionImporter.java	(revision 12599)
+++ /trunk/src/org/openstreetmap/josm/io/session/ImagerySessionImporter.java	(revision 12600)
@@ -46,5 +46,5 @@
         if (layer instanceof AbstractTileSourceLayer) {
             AbstractTileSourceLayer<?> tsLayer = (AbstractTileSourceLayer<?>) layer;
-            tsLayer.getDisplaySettings().loadFrom(attributes);
+            tsLayer.getDisplaySettings().applyFromPropertiesMap(attributes);
             Element offsetEl = getFirstElementByTagName(elem, "offset");
             if (offsetEl != null) {