Changeset 12600 in josm for trunk/src

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

Files:

• gui/layer/imagery/TileSourceDisplaySettings.java (modified) (5 diffs)
• io/session/ImagerySessionExporter.java (modified) (1 diff)
• io/session/ImagerySessionImporter.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/layer/imagery/TileSourceDisplaySettings.java

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.layer.imagery;
 
+import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.CopyOnWriteArrayList;
@@ -11 +12 @@
 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 +24 @@
  * @since 10568
  */
-public class TileSourceDisplaySettings {
+public class TileSourceDisplaySettings implements SessionAwareReadApply {
     /**
      * A string returned by {@link DisplaySettingsChangeEvent#getChangedSetting()} if auto load was changed.
@@ -249 +251 @@
      * 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 +267 @@
      * 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);

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) {