Changeset 14122 in josm

Timestamp:

2018-08-11T18:18:58+02:00 (6 years ago)

Author:

Don-vip

Message:

see #15229 - minor preferences refactoring

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/Preferences.java (modified) (1 diff)
• src/org/openstreetmap/josm/spi/preferences/AbstractPreferences.java (modified) (1 diff)
• src/org/openstreetmap/josm/spi/preferences/MemoryPreferences.java (modified) (5 diffs)
• test/unit/org/openstreetmap/josm/gui/dialogs/MinimapDialogTest.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/data/Preferences.java

@@ -693 +693 @@
     }
 
-    /**
-     * Gets a map of all settings that are currently stored
-     * @return The settings
-     */
+    @Override
     public Map<String, Setting<?>> getAllSettings() {
         return new TreeMap<>(settingsMap);

trunk/src/org/openstreetmap/josm/spi/preferences/AbstractPreferences.java

@@ -124 +124 @@
 
     /**
+     * Gets a map of all settings that are currently stored
+     * @return The settings
+     */
+    public abstract Map<String, Setting<?>> getAllSettings();
+
+    /**
      * Set a value for a certain setting. The changed setting is saved to the preference file immediately.
      * Due to caching mechanisms on modern operating systems and hardware, this shouldn't be a performance problem.

trunk/src/org/openstreetmap/josm/spi/preferences/MemoryPreferences.java

@@ -7 +7 @@
 import java.util.Objects;
 import java.util.Set;
+import java.util.TreeMap;
 
 /**
@@ -22 +23 @@
     @Override
     public boolean putSetting(String key, Setting<?> setting) {
-        Setting current = settings.get(key);
+        Setting<?> current = settings.get(key);
         if (setting == null) {
             settings.remove(key);
@@ -33 +34 @@
     @Override
     public <T extends Setting<?>> T getSetting(String key, T def, Class<T> klass) {
-        Setting current = settings.get(key);
+        Setting<?> current = settings.get(key);
         if (current != null && klass.isInstance(current)) {
             @SuppressWarnings("unchecked")
@@ -45 +46 @@
     public Set<String> getKeySet() {
         return Collections.unmodifiableSet(settings.keySet());
+    }
+
+    @Override
+    public Map<String, Setting<?>> getAllSettings() {
+        return new TreeMap<>(settings);
     }
 
@@ -66 +72 @@
         // do nothing
     }
-
 }

trunk/test/unit/org/openstreetmap/josm/gui/dialogs/MinimapDialogTest.java

@@ -40 +40 @@
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.util.GuiHelper;
+import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.testutils.ImagePatternMatching;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
@@ -225 +226 @@
     @Test
     public void testSourcePrefObeyed() throws Exception {
-        Main.pref.put("slippy_map_chooser.mapstyle", "Green Tiles");
+        Config.getPref().put("slippy_map_chooser.mapstyle", "Green Tiles");
 
         this.setUpMiniMap();
@@ -252 +253 @@
     @Test
     public void testSourcePrefInvalid() throws Exception {
-        Main.pref.put("slippy_map_chooser.mapstyle", "Hooloovoo Tiles");
+        Config.getPref().put("slippy_map_chooser.mapstyle", "Hooloovoo Tiles");
 
         this.setUpMiniMap();
@@ -277 +278 @@
         MainApplication.getLayerManager().addLayer(new TestLayer());
 
-        Main.pref.put("slippy_map_chooser.mapstyle", "White Tiles");
+        Config.getPref().put("slippy_map_chooser.mapstyle", "White Tiles");
         // ensure projection matches JMapViewer's
         ProjectionRegistry.setProjection(Projections.getProjectionByCode("EPSG:3857"));
@@ -415 +416 @@
     @Test
     public void testShowDownloadedArea() throws Exception {
-        Main.pref.put("slippy_map_chooser.mapstyle", "Green Tiles");
-        Main.pref.putBoolean("slippy_map_chooser.show_downloaded_area", false);
+        Config.getPref().put("slippy_map_chooser.mapstyle", "Green Tiles");
+        Config.getPref().putBoolean("slippy_map_chooser.show_downloaded_area", false);
 
         DataSet dataSet = new DataSet();
@@ -574 +575 @@
     @Test
     public void testShowDownloadedAreaLayerSwitching() throws Exception {
-        Main.pref.put("slippy_map_chooser.mapstyle", "Green Tiles");
-        Main.pref.putBoolean("slippy_map_chooser.show_downloaded_area", true);
+        Config.getPref().put("slippy_map_chooser.mapstyle", "Green Tiles");
+        Config.getPref().putBoolean("slippy_map_chooser.show_downloaded_area", true);
 
         DataSet dataSetA = new DataSet();