Changeset 12851 in josm for trunk/src/org/openstreetmap/josm/io/session

Timestamp:

2017-09-14T01:59:34+02:00 (7 years ago)

Author:

bastiK

Message:

see #15229 - extract "struct" handling from Preference to StructUtils

Location:

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

Files:

• ImagerySessionExporter.java (modified) (2 diffs)
• ImagerySessionImporter.java (modified) (2 diffs)

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

@@ -13 +13 @@
 import javax.swing.SwingConstants;
 
-import org.openstreetmap.josm.data.Preferences;
+import org.openstreetmap.josm.data.StructUtils;
 import org.openstreetmap.josm.data.imagery.ImageryInfo.ImageryPreferenceEntry;
 import org.openstreetmap.josm.data.imagery.OffsetBookmark;
@@ -84 +84 @@
         layerElem.setAttribute("version", "0.1");
         ImageryPreferenceEntry e = new ImageryPreferenceEntry(layer.getInfo());
-        Map<String, String> data = new LinkedHashMap<>(Preferences.serializeStruct(e, ImageryPreferenceEntry.class));
+        Map<String, String> data = new LinkedHashMap<>(StructUtils.serializeStruct(e, ImageryPreferenceEntry.class));
         Utils.instanceOfThen(layer, AbstractTileSourceLayer.class, tsLayer -> {
             data.putAll(tsLayer.getDisplaySettings().toPropertiesMap());

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

@@ -8 +8 @@
 import java.util.Map;
 
-import org.openstreetmap.josm.data.Preferences;
+import org.openstreetmap.josm.data.StructUtils;
 import org.openstreetmap.josm.data.imagery.ImageryInfo;
 import org.openstreetmap.josm.data.imagery.ImageryInfo.ImageryPreferenceEntry;
@@ -42 +42 @@
         Map<String, String> attributes = readProperties(elem);
 
-        ImageryPreferenceEntry prefEntry = Preferences.deserializeStruct(attributes, ImageryPreferenceEntry.class);
+        ImageryPreferenceEntry prefEntry = StructUtils.deserializeStruct(attributes, ImageryPreferenceEntry.class);
         ImageryInfo info = new ImageryInfo(prefEntry);
         ImageryLayer layer = ImageryLayer.create(info);