Changeset 33632 in osm for applications/editors/josm

Timestamp:

2017-09-19T18:33:50+02:00 (7 years ago)

Author:

bastik

Message:

[indoorhelper] avoid usage of data.preferences.Setting class in anticipation of JOSM-core rework

File:

• applications/editors/josm/plugins/indoorhelper/src/controller/IndoorHelperController.java (modified) (3 diffs)

applications/editors/josm/plugins/indoorhelper/src/controller/IndoorHelperController.java

@@ -24 +24 @@
 import java.awt.event.ItemListener;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
@@ -34 +35 @@
 import org.openstreetmap.josm.actions.ValidateAction;
 import org.openstreetmap.josm.data.osm.Tag;
-import org.openstreetmap.josm.data.preferences.MapListSetting;
-import org.openstreetmap.josm.data.preferences.Setting;
 import org.openstreetmap.josm.data.validation.OsmValidator;
 import org.openstreetmap.josm.data.validation.tests.MapCSSTagChecker;
@@ -395 +394 @@
      */
     private void setPluginPreferences(boolean enabled) {
-        Map<String, Setting<?>> settings = Main.pref.getAllSettings();
-
-        MapListSetting validatorMapListSetting = (MapListSetting) settings.
-                get("validator.org.openstreetmap.josm.data.validation.tests.MapCSSTagChecker.entries");
-        List<Map<String, String>> validatorMaps = new ArrayList<>();
-        if (validatorMapListSetting != null) {
-            validatorMaps = validatorMapListSetting.getValue();
-        }
-
-        MapListSetting styleMapListSetting = (MapListSetting) settings.
-                get("mappaint.style.entries");
-        List<Map<String, String>> styleMaps = new ArrayList<>();
-        if (styleMapListSetting != null) {
-            styleMaps = styleMapListSetting.getValue();
-        }
+        Collection<Map<String, String>> validatorMaps = 
+                Main.pref.getListOfStructs("validator.org.openstreetmap.josm.data.validation.tests.MapCSSTagChecker.entries",
+                new ArrayList<>());
+        Collection<Map<String, String>> styleMaps = 
+                Main.pref.getListOfStructs("mappaint.style.entries", new ArrayList<>());
 
         if (enabled) {