Changeset 12851 in josm for trunk/src/org/openstreetmap/josm/data/imagery/OffsetBookmark.java

Timestamp:

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

Author:

bastiK

Message:

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

File:

• trunk/src/org/openstreetmap/josm/data/imagery/OffsetBookmark.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/data/imagery/OffsetBookmark.java

@@ -12 +12 @@
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.Preferences;
-import org.openstreetmap.josm.data.Preferences.pref;
-import org.openstreetmap.josm.data.Preferences.writeExplicitly;
+import org.openstreetmap.josm.data.StructUtils;
+import org.openstreetmap.josm.data.StructUtils.StructEntry;
+import org.openstreetmap.josm.data.StructUtils.WriteExplicitly;
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.coor.LatLon;
@@ -34 +34 @@
     private static final List<OffsetBookmark> allBookmarks = new ArrayList<>();
 
-    @pref private String projection_code;
-    @pref private String imagery_name;
-    @pref private String name;
-    @pref @writeExplicitly private double dx, dy;
-    @pref private double center_lon, center_lat;
+    @StructEntry private String projection_code;
+    @StructEntry private String imagery_name;
+    @StructEntry private String name;
+    @StructEntry @WriteExplicitly private double dx, dy;
+    @StructEntry private double center_lon, center_lat;
 
     public boolean isUsable(ImageryLayer layer) {
@@ -167 +167 @@
 
     public static void loadBookmarks() {
-        List<OffsetBookmark> bookmarks = Main.pref.getListOfStructs("imagery.offsetbookmarks", null, OffsetBookmark.class);
+        List<OffsetBookmark> bookmarks = StructUtils.getListOfStructs(
+                Config.getPref(), "imagery.offsetbookmarks", null, OffsetBookmark.class);
         if (bookmarks == null) {
             loadBookmarksOld();
@@ -184 +185 @@
 
     public static void saveBookmarks() {
-        Main.pref.putListOfStructs("imagery.offsetbookmarks", allBookmarks, OffsetBookmark.class);
+        StructUtils.putListOfStructs(Config.getPref(), "imagery.offsetbookmarks", allBookmarks, OffsetBookmark.class);
     }
 
@@ -276 +277 @@
      */
     public Map<String, String> toPropertiesMap() {
-        return Preferences.serializeStruct(this, OffsetBookmark.class);
+        return StructUtils.serializeStruct(this, OffsetBookmark.class);
     }
 
@@ -287 +288 @@
      */
     public static OffsetBookmark fromPropertiesMap(Map<String, String> properties) {
-        return Preferences.deserializeStruct(properties, OffsetBookmark.class);
+        return StructUtils.deserializeStruct(properties, OffsetBookmark.class);
     }
 }