Changeset 13063 in josm for trunk/src/org/openstreetmap

Timestamp:

2017-10-30T23:39:03+01:00 (6 years ago)

Author:

Don-vip

Message:

remove legacy proxy support (proxy.host and proxy.port) kind-of-deprecated 8 years ago in r2641

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java

@@ -267 +267 @@
                 .orElse(ProxyPolicy.NO_PROXY);
         rbProxyPolicy.get(pp).setSelected(true);
-        String value = Config.getPref().get("proxy.host", null);
-        if (value != null) {
-            // legacy support
-            tfProxyHttpHost.setText(value);
-            Config.getPref().put("proxy.host", null);
-        } else {
-            tfProxyHttpHost.setText(Config.getPref().get(DefaultProxySelector.PROXY_HTTP_HOST, ""));
-        }
-        value = Config.getPref().get("proxy.port", null);
-        if (value != null) {
-            // legacy support
-            tfProxyHttpPort.setText(value);
-            Config.getPref().put("proxy.port", null);
-        } else {
-            tfProxyHttpPort.setText(Config.getPref().get(DefaultProxySelector.PROXY_HTTP_PORT, ""));
-        }
+        tfProxyHttpHost.setText(Config.getPref().get(DefaultProxySelector.PROXY_HTTP_HOST, ""));
+        tfProxyHttpPort.setText(Config.getPref().get(DefaultProxySelector.PROXY_HTTP_PORT, ""));
         tfProxySocksHost.setText(Config.getPref().get(DefaultProxySelector.PROXY_SOCKS_HOST, ""));
         tfProxySocksPort.setText(Config.getPref().get(DefaultProxySelector.PROXY_SOCKS_PORT, ""));