Changeset 12841 in josm for trunk/src/org/openstreetmap/josm/io

Timestamp:

2017-09-13T16:30:27+02:00 (7 years ago)

Author:

bastiK

Message:

see #15229 - fix deprecations caused by [12840]

Location:

trunk/src/org/openstreetmap/josm/io

Files:

• CacheCustomContent.java (modified) (2 diffs)
• CachedFile.java (modified) (5 diffs)
• DefaultProxySelector.java (modified) (1 diff)
• MultiFetchServerObjectReader.java (modified) (1 diff)
• OsmApi.java (modified) (1 diff)
• OverpassDownloadReader.java (modified) (2 diffs)
• remotecontrol/RemoteControlHttpServer.java (modified) (1 diff)
• remotecontrol/RemoteControlHttpsServer.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/io/CacheCustomContent.java

@@ -91 +91 @@
             return false;
         }
-        return Main.pref.getInteger("cache." + ident, 0) + updateInterval < TimeUnit.MILLISECONDS.toSeconds(System.currentTimeMillis())
+        return Main.pref.getInt("cache." + ident, 0) + updateInterval < TimeUnit.MILLISECONDS.toSeconds(System.currentTimeMillis())
                 || !isCacheValid();
     }
@@ -141 +141 @@
         this.data = updateData();
         saveToDisk();
-        Main.pref.putInteger("cache." + ident, (int) (TimeUnit.MILLISECONDS.toSeconds(System.currentTimeMillis())));
+        Main.pref.putInt("cache." + ident, (int) (TimeUnit.MILLISECONDS.toSeconds(System.currentTimeMillis())));
         return data;
     }

trunk/src/org/openstreetmap/josm/io/CachedFile.java

@@ -381 +381 @@
             if (!"file".equals(url.getProtocol())) {
                 String prefKey = getPrefKey(url, destDir);
-                List<String> localPath = new ArrayList<>(Main.pref.getCollection(prefKey));
+                List<String> localPath = new ArrayList<>(Main.pref.getList(prefKey));
                 if (localPath.size() == 2) {
                     File lfile = new File(localPath.get(1));
@@ -388 +388 @@
                     }
                 }
-                Main.pref.putCollection(prefKey, null);
+                Main.pref.putList(prefKey, null);
             }
         } catch (MalformedURLException e) {
@@ -419 +419 @@
         Long ifModifiedSince = null;
         File localFile = null;
-        List<String> localPathEntry = new ArrayList<>(Main.pref.getCollection(prefKey));
+        List<String> localPathEntry = new ArrayList<>(Main.pref.getList(prefKey));
         boolean offline = false;
         try {
@@ -476 +476 @@
                 if (localFile == null)
                     throw new AssertionError();
-                Main.pref.putCollection(prefKey,
+                Main.pref.putList(prefKey,
                         Arrays.asList(Long.toString(System.currentTimeMillis()), localPathEntry.get(1)));
                 return localFile;
@@ -488 +488 @@
             localFile = new File(destDir, localPath);
             if (Main.platform.rename(destDirFile, localFile)) {
-                Main.pref.putCollection(prefKey,
+                Main.pref.putList(prefKey,
                         Arrays.asList(Long.toString(System.currentTimeMillis()), localFile.toString()));
             } else {

trunk/src/org/openstreetmap/josm/io/DefaultProxySelector.java

@@ -161 +161 @@
         }
         proxyExceptions = new HashSet<>(
-            Main.pref.getCollection(PROXY_EXCEPTIONS,
+            Main.pref.getList(PROXY_EXCEPTIONS,
                     Arrays.asList("localhost", IPV4_LOOPBACK, IPV6_LOOPBACK))
         );

trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java

@@ -321 +321 @@
         // Build a list of fetchers that will  download smaller sets containing only MAX_IDS_PER_REQUEST (200) primitives each.
         // we will run up to MAX_DOWNLOAD_THREADS concurrent fetchers.
-        int threadsNumber = Main.pref.getInteger("osm.download.threads", OsmApi.MAX_DOWNLOAD_THREADS);
+        int threadsNumber = Main.pref.getInt("osm.download.threads", OsmApi.MAX_DOWNLOAD_THREADS);
         threadsNumber = Utils.clamp(threadsNumber, 1, OsmApi.MAX_DOWNLOAD_THREADS);
         final ExecutorService exec = Executors.newFixedThreadPool(

trunk/src/org/openstreetmap/josm/io/OsmApi.java

@@ -593 +593 @@
      */
     protected int getMaxRetries() {
-        int ret = Main.pref.getInteger("osm-server.max-num-retries", DEFAULT_MAX_NUM_RETRIES);
+        int ret = Main.pref.getInt("osm-server.max-num-retries", DEFAULT_MAX_NUM_RETRIES);
         return Math.max(ret, 0);
     }

trunk/src/org/openstreetmap/josm/io/OverpassDownloadReader.java

@@ -33 +33 @@
 import org.openstreetmap.josm.data.osm.PrimitiveId;
 import org.openstreetmap.josm.data.preferences.BooleanProperty;
-import org.openstreetmap.josm.data.preferences.CollectionProperty;
+import org.openstreetmap.josm.data.preferences.ListProperty;
 import org.openstreetmap.josm.data.preferences.StringProperty;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
@@ -59 +59 @@
      * @since 12816
      */
-    public static final CollectionProperty OVERPASS_SERVER_HISTORY = new CollectionProperty("download.overpass.servers",
+    public static final ListProperty OVERPASS_SERVER_HISTORY = new ListProperty("download.overpass.servers",
             Arrays.asList("https://overpass-api.de/api/", "http://overpass.osm.rambler.ru/cgi/"));
     /**

trunk/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpServer.java

@@ -33 +33 @@
     public static void restartRemoteControlHttpServer() {
         stopRemoteControlHttpServer();
-        int port = Main.pref.getInteger("remote.control.port", 8111);
+        int port = Main.pref.getInt("remote.control.port", 8111);
         try {
             instance4 = new RemoteControlHttpServer(port, false);

trunk/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpsServer.java

@@ -312 +312 @@
         stopRemoteControlHttpsServer();
         if (RemoteControl.PROP_REMOTECONTROL_HTTPS_ENABLED.get()) {
-            int port = Main.pref.getInteger("remote.control.https.port", HTTPS_PORT);
+            int port = Main.pref.getInt("remote.control.https.port", HTTPS_PORT);
             try {
                 instance4 = new RemoteControlHttpsServer(port, false);