Changeset 12600 in josm for trunk/src/org/openstreetmap/josm/io

Timestamp:

2017-08-14T13:32:37+02:00 (7 years ago)

Author:

bastiK

Message:

see #14524 - use inteface SessionAwareReadApply

Location:

trunk/src/org/openstreetmap/josm/io/session

Files:

• ImagerySessionExporter.java (modified) (1 diff)
• ImagerySessionImporter.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/io/session/ImagerySessionExporter.java

@@ -86 +86 @@
         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);

trunk/src/org/openstreetmap/josm/io/session/ImagerySessionImporter.java

@@ -46 +46 @@
         if (layer instanceof AbstractTileSourceLayer) {
             AbstractTileSourceLayer<?> tsLayer = (AbstractTileSourceLayer<?>) layer;
-            tsLayer.getDisplaySettings().loadFrom(attributes);
+            tsLayer.getDisplaySettings().applyFromPropertiesMap(attributes);
             Element offsetEl = getFirstElementByTagName(elem, "offset");
             if (offsetEl != null) {