Changeset 12851 in josm for trunk/src/org/openstreetmap/josm/tools

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/tools/PlatformHookWindows.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/tools/PlatformHookWindows.java

@@ -67 +67 @@
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.Preferences;
+import org.openstreetmap.josm.data.StructUtils;
+import org.openstreetmap.josm.data.StructUtils.StructEntry;
+import org.openstreetmap.josm.data.StructUtils.WriteExplicitly;
 import org.openstreetmap.josm.io.CertificateAmendment.CertAmend;
 import org.openstreetmap.josm.spi.preferences.Config;
@@ -86 +88 @@
          * The character subset. Basically a free identifier, but should be unique.
          */
-        @Preferences.pref
+        @StructEntry
         public String charset;
 
@@ -92 +94 @@
          * Platform font name.
          */
-        @Preferences.pref
-        @Preferences.writeExplicitly
+        @StructEntry
+        @WriteExplicitly
         public String name = "";
 
@@ -99 +101 @@
          * File name.
          */
-        @Preferences.pref
-        @Preferences.writeExplicitly
+        @StructEntry
+        @WriteExplicitly
         public String file = "";
 
@@ -525 +527 @@
             os.write(content);
             try (Writer w = new BufferedWriter(new OutputStreamWriter(os, StandardCharsets.UTF_8))) {
-                Collection<FontEntry> extrasPref = Main.pref.getListOfStructs(
+                Collection<FontEntry> extrasPref = StructUtils.getListOfStructs(Config.getPref(),
                         "font.extended-unicode.extra-items", getAdditionalFonts(), FontEntry.class);
                 Collection<FontEntry> extras = new ArrayList<>();