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

Timestamp:

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

Author:

bastiK

Message:

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

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• conflict/tags/TagConflictResolutionUtil.java (modified) (8 diffs)
• io/importexport/WMSLayerExporter.java (modified) (2 diffs)
• io/importexport/WMSLayerImporter.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolutionUtil.java

@@ -15 +15 @@
 import java.util.stream.Collectors;
 
-import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.Preferences.pref;
+import org.openstreetmap.josm.data.StructUtils;
+import org.openstreetmap.josm.data.StructUtils.StructEntry;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Tag;
 import org.openstreetmap.josm.data.osm.TagCollection;
+import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.Pair;
@@ -158 +159 @@
     public static Collection<AutomaticTagConflictResolver> getAutomaticTagConflictResolvers() {
         if (automaticTagConflictResolvers == null) {
-            Collection<AutomaticCombine> automaticTagConflictCombines =
-                    Main.pref.getListOfStructs(
+            Collection<AutomaticCombine> automaticTagConflictCombines = StructUtils.getListOfStructs(
+                            Config.getPref(),
                             "automatic-tag-conflict-resolution.combine",
                             defaultAutomaticTagConflictCombines, AutomaticCombine.class);
             Collection<AutomaticChoiceGroup> automaticTagConflictChoiceGroups =
-                    AutomaticChoiceGroup.groupChoices(Main.pref.getListOfStructs(
+                    AutomaticChoiceGroup.groupChoices(StructUtils.getListOfStructs(
+                            Config.getPref(),
                             "automatic-tag-conflict-resolution.choice",
                             defaultAutomaticTagConflictChoices, AutomaticChoice.class));
@@ -230 +232 @@
 
         /** The Tag key to match */
-        @pref public String key;
+        @StructEntry public String key;
 
         /** A free description */
-        @pref public String description = "";
+        @StructEntry public String description = "";
 
         /** If regular expression must be used to match the Tag key or the value. */
-        @pref public boolean isRegex;
+        @StructEntry public boolean isRegex;
 
         /** The separator to use to combine the values. */
-        @pref public String separator = ";";
+        @StructEntry public String separator = ";";
 
         /** If the combined values must be sorted.
@@ -249 +251 @@
          * </ul>
          */
-        @pref public String sort;
+        @StructEntry public String sort;
 
         /** Default constructor. */
@@ -317 +319 @@
 
         /** The Tag key to match. */
-        @pref public String key;
+        @StructEntry public String key;
 
         /** The name of the {link AutomaticChoice group} this choice belongs to. */
-        @pref public String group;
+        @StructEntry public String group;
 
         /** A free description. */
-        @pref public String description = "";
+        @StructEntry public String description = "";
 
         /** If regular expression must be used to match the Tag key or the value. */
-        @pref public boolean isRegex;
+        @StructEntry public boolean isRegex;
 
         /** The Tag value to match. */
-        @pref public String value;
+        @StructEntry public String value;
 
         /**
@@ -335 +337 @@
          * Natural String ordering is used to identify the best score.
          */
-        @pref public String score;
+        @StructEntry public String score;
 
         /** Default constructor. */
@@ -404 +406 @@
 
         /** The Tag key to match. */
-        @pref public String key;
+        @StructEntry public String key;
 
         /** The name of the group. */
@@ -410 +412 @@
 
         /** If regular expression must be used to match the Tag key. */
-        @pref public boolean isRegex;
+        @StructEntry public boolean isRegex;
 
         /** The list of choice to choose from. */

trunk/src/org/openstreetmap/josm/gui/io/importexport/WMSLayerExporter.java

@@ -7 +7 @@
 import java.io.ObjectOutputStream;
 
-import org.openstreetmap.josm.data.Preferences;
+import org.openstreetmap.josm.data.StructUtils;
 import org.openstreetmap.josm.data.imagery.ImageryInfo.ImageryPreferenceEntry;
 import org.openstreetmap.josm.gui.MainApplication;
@@ -42 +42 @@
                 oos.writeObject(MainApplication.getMap().mapView.getCenter());
                 ImageryPreferenceEntry entry = new ImageryPreferenceEntry(((AbstractTileSourceLayer) layer).getInfo());
-                oos.writeObject(Preferences.serializeStruct(entry, ImageryPreferenceEntry.class));
+                oos.writeObject(StructUtils.serializeStruct(entry, ImageryPreferenceEntry.class));
             }
         }

trunk/src/org/openstreetmap/josm/gui/io/importexport/WMSLayerImporter.java

@@ -12 +12 @@
 
 import org.openstreetmap.josm.actions.ExtensionFileFilter;
-import org.openstreetmap.josm.data.Preferences;
+import org.openstreetmap.josm.data.StructUtils;
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.imagery.ImageryInfo;
@@ -72 +72 @@
 
                 @SuppressWarnings("unchecked")
-                ImageryPreferenceEntry entry = Preferences.deserializeStruct(
+                ImageryPreferenceEntry entry = StructUtils.deserializeStruct(
                         (Map<String, String>) ois.readObject(),
                         ImageryPreferenceEntry.class);