Changeset 12846 in josm for trunk/src/org/openstreetmap/josm/data/imagery

Timestamp:

2017-09-13T23:24:50+02:00 (7 years ago)

Author:

bastiK

Message:

see #15229 - use Config.getPref() wherever possible

Location:

trunk/src/org/openstreetmap/josm/data/imagery

Files:

• CachedTileLoaderFactory.java (modified) (2 diffs)
• ImageryInfo.java (modified) (2 diffs)
• ImageryLayerInfo.java (modified) (4 diffs)
• OffsetBookmark.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/imagery/CachedTileLoaderFactory.java

@@ -15 +15 @@
 import org.openstreetmap.josm.data.cache.BufferedImageCacheEntry;
 import org.openstreetmap.josm.data.preferences.StringProperty;
+import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.Logging;
@@ -72 +73 @@
 
         return getLoader(listener, cache,
-                (int) TimeUnit.SECONDS.toMillis(Main.pref.getInt("socket.timeout.connect", 15)),
-                (int) TimeUnit.SECONDS.toMillis(Main.pref.getInt("socket.timeout.read", 30)),
+                (int) TimeUnit.SECONDS.toMillis(Config.getPref().getInt("socket.timeout.connect", 15)),
+                (int) TimeUnit.SECONDS.toMillis(Config.getPref().getInt("socket.timeout.read", 30)),
                 headers);
     }

trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java

@@ -26 +26 @@
 import org.openstreetmap.gui.jmapviewer.tilesources.OsmTileSource.Mapnik;
 import org.openstreetmap.gui.jmapviewer.tilesources.TileSourceInfo;
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.Preferences.pref;
 import org.openstreetmap.josm.io.Capabilities;
 import org.openstreetmap.josm.io.OsmApi;
+import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -817 +817 @@
     public void clearId() {
         if (this.id != null) {
-            Collection<String> newAddedIds = new TreeSet<>(Main.pref.getList("imagery.layers.addedIds"));
+            Collection<String> newAddedIds = new TreeSet<>(Config.getPref().getList("imagery.layers.addedIds"));
             newAddedIds.add(this.id);
-            Main.pref.putList("imagery.layers.addedIds", new ArrayList<>(newAddedIds));
+            Config.getPref().putList("imagery.layers.addedIds", new ArrayList<>(newAddedIds));
         }
         setId(null);

trunk/src/org/openstreetmap/josm/data/imagery/ImageryLayerInfo.java

@@ -25 +25 @@
 import org.openstreetmap.josm.io.OnlineResource;
 import org.openstreetmap.josm.io.imagery.ImageryReader;
+import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.Utils;
@@ -57 +58 @@
      */
     public static Collection<String> getImageryLayersSites() {
-        return Main.pref.getList("imagery.layers.sites", Arrays.asList(DEFAULT_LAYER_SITES));
+        return Config.getPref().getList("imagery.layers.sites", Arrays.asList(DEFAULT_LAYER_SITES));
     }
 
@@ -236 +237 @@
         // add new default entries to the user selection
         boolean changed = false;
-        Collection<String> knownDefaults = new TreeSet<>(Main.pref.getList("imagery.layers.default"));
+        Collection<String> knownDefaults = new TreeSet<>(Config.getPref().getList("imagery.layers.default"));
         Collection<String> newKnownDefaults = new TreeSet<>();
         for (ImageryInfo def : defaultLayers) {
@@ -279 +280 @@
             newKnownDefaults.addAll(knownDefaults);
         }
-        Main.pref.putList("imagery.layers.default", new ArrayList<>(newKnownDefaults));
+        Config.getPref().putList("imagery.layers.default", new ArrayList<>(newKnownDefaults));
 
         // automatically update user entries with same id as a default entry

trunk/src/org/openstreetmap/josm/data/imagery/OffsetBookmark.java

@@ -22 +22 @@
 import org.openstreetmap.josm.gui.layer.AbstractTileSourceLayer;
 import org.openstreetmap.josm.gui.layer.ImageryLayer;
+import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.Logging;
 
@@ -177 +178 @@
     // migration code - remove Nov. 2017
     private static void loadBookmarksOld() {
-        for (Collection<String> c : Main.pref.getArray("imagery.offsets",
-                Collections.<Collection<String>>emptySet())) {
+        for (Collection<String> c : Config.getPref().getListOfLists("imagery.offsets")) {
             allBookmarks.add(new OffsetBookmark(c));
         }