Index: trunk/test/unit/org/openstreetmap/josm/data/imagery/ImageryInfoTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/imagery/ImageryInfoTest.java	(revision 12849)
+++ trunk/test/unit/org/openstreetmap/josm/data/imagery/ImageryInfoTest.java	(revision 12851)
@@ -12,5 +12,5 @@
 import org.junit.Rule;
 import org.junit.Test;
-import org.openstreetmap.josm.data.Preferences;
+import org.openstreetmap.josm.data.StructUtils;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 import org.openstreetmap.josm.tools.MultiMap;
@@ -56,5 +56,5 @@
 
     /**
-     * Tests the {@linkplain Preferences#serializeStruct(Object, Class) serialization} of {@link ImageryInfo.ImageryPreferenceEntry}
+     * Tests the {@linkplain StructUtils#serializeStruct(Object, Class) serialization} of {@link ImageryInfo.ImageryPreferenceEntry}
      */
     @Test
@@ -64,14 +64,14 @@
         info.noTileHeaders.put("ETag", "foo");
         info.noTileHeaders.put("ETag", "bar");
-        final Map<String, String> map = Preferences.serializeStruct(info, ImageryInfo.ImageryPreferenceEntry.class);
+        final Map<String, String> map = StructUtils.serializeStruct(info, ImageryInfo.ImageryPreferenceEntry.class);
         assertEquals("{noTileHeaders={\"ETag\":[\"foo\",\"bar\"]}}", map.toString());
     }
 
     /**
-     * Tests the {@linkplain Preferences#deserializeStruct(Map, Class)} deserialization} of {@link ImageryInfo.ImageryPreferenceEntry}
+     * Tests the {@linkplain StructUtils#deserializeStruct(Map, Class)} deserialization} of {@link ImageryInfo.ImageryPreferenceEntry}
      */
     @Test
     public void testDeserializeStruct() {
-        final ImageryInfo.ImageryPreferenceEntry info = Preferences.deserializeStruct(
+        final ImageryInfo.ImageryPreferenceEntry info = StructUtils.deserializeStruct(
                 Collections.singletonMap("noTileHeaders", "{\"ETag\":[\"foo\",\"bar\"]}"), ImageryInfo.ImageryPreferenceEntry.class);
         MultiMap<String, String> expect = new MultiMap<>();
@@ -84,9 +84,9 @@
 
     /**
-     * Tests the {@linkplain Preferences#deserializeStruct(Map, Class)} deserialization} of legacy {@link ImageryInfo.ImageryPreferenceEntry}
+     * Tests the {@linkplain StructUtils#deserializeStruct(Map, Class)} deserialization} of legacy {@link ImageryInfo.ImageryPreferenceEntry}
      */
     @Test
     public void testDeserializeStructTicket12474() {
-        final ImageryInfo.ImageryPreferenceEntry info = Preferences.deserializeStruct(
+        final ImageryInfo.ImageryPreferenceEntry info = StructUtils.deserializeStruct(
                 Collections.singletonMap("noTileHeaders", "{\"ETag\":\"foo-and-bar\"}"), ImageryInfo.ImageryPreferenceEntry.class);
         final Set<String> eTag = info.noTileHeaders.get("ETag");