Changeset 12846 in josm for trunk/src/org/openstreetmap/josm/io/DefaultProxySelector.java

Timestamp:

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

Author:

bastiK

Message:

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

File:

• trunk/src/org/openstreetmap/josm/io/DefaultProxySelector.java (modified) (5 diffs)

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

@@ -18 +18 @@
 import java.util.TreeSet;
 
-import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.Logging;
 
@@ -126 +126 @@
      */
     public final void initFromPreferences() {
-        String value = Main.pref.get(PROXY_POLICY);
+        String value = Config.getPref().get(PROXY_POLICY);
         if (value.isEmpty()) {
             proxyPolicy = ProxyPolicy.NO_PROXY;
@@ -137 +137 @@
             }
         }
-        String host = Main.pref.get(PROXY_HTTP_HOST, null);
-        int port = parseProxyPortValue(PROXY_HTTP_PORT, Main.pref.get(PROXY_HTTP_PORT, null));
+        String host = Config.getPref().get(PROXY_HTTP_HOST, null);
+        int port = parseProxyPortValue(PROXY_HTTP_PORT, Config.getPref().get(PROXY_HTTP_PORT, null));
         httpProxySocketAddress = null;
         if (proxyPolicy.equals(ProxyPolicy.USE_HTTP_PROXY)) {
@@ -149 +149 @@
         }
 
-        host = Main.pref.get(PROXY_SOCKS_HOST, null);
-        port = parseProxyPortValue(PROXY_SOCKS_PORT, Main.pref.get(PROXY_SOCKS_PORT, null));
+        host = Config.getPref().get(PROXY_SOCKS_HOST, null);
+        port = parseProxyPortValue(PROXY_SOCKS_PORT, Config.getPref().get(PROXY_SOCKS_PORT, null));
         socksProxySocketAddress = null;
         if (proxyPolicy.equals(ProxyPolicy.USE_SOCKS_PROXY)) {
@@ -161 +161 @@
         }
         proxyExceptions = new HashSet<>(
-            Main.pref.getList(PROXY_EXCEPTIONS,
+            Config.getPref().getList(PROXY_EXCEPTIONS,
                     Arrays.asList("localhost", IPV4_LOOPBACK, IPV6_LOOPBACK))
         );