Changeset 12805 in josm for trunk/src/org/openstreetmap/josm/gui/preferences

Timestamp:

2017-09-09T17:12:43+02:00 (7 years ago)

Author:

Don-vip

Message:

see #15229 - see #15182 - remove GUI references from DefaultProxySelector

File:

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

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

@@ -16 +16 @@
 import java.net.ProxySelector;
 import java.util.EnumMap;
-import java.util.Locale;
 import java.util.Map;
 import java.util.Optional;
@@ -33 +32 @@
 import org.openstreetmap.josm.gui.widgets.VerticallyScrollablePanel;
 import org.openstreetmap.josm.io.DefaultProxySelector;
+import org.openstreetmap.josm.io.ProxyPolicy;
 import org.openstreetmap.josm.io.auth.CredentialsAgent;
 import org.openstreetmap.josm.io.auth.CredentialsAgentException;
@@ -54 +54 @@
         }
     }
-
-    /**
-     * The proxy policy is how JOSM will use proxy information.
-     */
-    public enum ProxyPolicy {
-        /** No proxy: JOSM will access Internet resources directly */
-        NO_PROXY("no-proxy"),
-        /** Use system settings: JOSM will use system proxy settings */
-        USE_SYSTEM_SETTINGS("use-system-settings"),
-        /** Use HTTP proxy: JOSM will use the given HTTP proxy, configured manually */
-        USE_HTTP_PROXY("use-http-proxy"),
-        /** Use HTTP proxy: JOSM will use the given SOCKS proxy */
-        USE_SOCKS_PROXY("use-socks-proxy");
-
-        private final String policyName;
-
-        ProxyPolicy(String policyName) {
-            this.policyName = policyName;
-        }
-
-        /**
-         * Replies the policy name, to be stored in proxy preferences.
-         * @return the policy unique name
-         */
-        public String getName() {
-            return policyName;
-        }
-
-        /**
-         * Retrieves a proxy policy from its name found in preferences.
-         * @param policyName The policy name
-         * @return The proxy policy matching the given name, or {@code null}
-         */
-        public static ProxyPolicy fromName(String policyName) {
-            if (policyName == null) return null;
-            policyName = policyName.trim().toLowerCase(Locale.ENGLISH);
-            for (ProxyPolicy pp: values()) {
-                if (pp.getName().equals(policyName))
-                    return pp;
-            }
-            return null;
-        }
-    }
-
-    /** Property key for proxy policy */
-    public static final String PROXY_POLICY = "proxy.policy";
-    /** Property key for HTTP proxy host */
-    public static final String PROXY_HTTP_HOST = "proxy.http.host";
-    /** Property key for HTTP proxy port */
-    public static final String PROXY_HTTP_PORT = "proxy.http.port";
-    /** Property key for SOCKS proxy host */
-    public static final String PROXY_SOCKS_HOST = "proxy.socks.host";
-    /** Property key for SOCKS proxy port */
-    public static final String PROXY_SOCKS_PORT = "proxy.socks.port";
-    /** Property key for proxy username */
-    public static final String PROXY_USER = "proxy.user";
-    /** Property key for proxy password */
-    public static final String PROXY_PASS = "proxy.pass";
-    /** Property key for proxy exceptions list */
-    public static final String PROXY_EXCEPTIONS = "proxy.exceptions";
 
     private transient Map<ProxyPolicy, JRadioButton> rbProxyPolicy;
@@ -324 +264 @@
      */
     public final void initFromPreferences() {
-        ProxyPolicy pp = Optional.ofNullable(ProxyPolicy.fromName(Main.pref.get(PROXY_POLICY, null))).orElse(ProxyPolicy.NO_PROXY);
+        ProxyPolicy pp = Optional.ofNullable(ProxyPolicy.fromName(Main.pref.get(DefaultProxySelector.PROXY_POLICY, null)))
+                .orElse(ProxyPolicy.NO_PROXY);
         rbProxyPolicy.get(pp).setSelected(true);
         String value = Main.pref.get("proxy.host", null);
@@ -332 +273 @@
             Main.pref.put("proxy.host", null);
         } else {
-            tfProxyHttpHost.setText(Main.pref.get(PROXY_HTTP_HOST, ""));
+            tfProxyHttpHost.setText(Main.pref.get(DefaultProxySelector.PROXY_HTTP_HOST, ""));
         }
         value = Main.pref.get("proxy.port", null);
@@ -340 +281 @@
             Main.pref.put("proxy.port", null);
         } else {
-            tfProxyHttpPort.setText(Main.pref.get(PROXY_HTTP_PORT, ""));
-        }
-        tfProxySocksHost.setText(Main.pref.get(PROXY_SOCKS_HOST, ""));
-        tfProxySocksPort.setText(Main.pref.get(PROXY_SOCKS_PORT, ""));
+            tfProxyHttpPort.setText(Main.pref.get(DefaultProxySelector.PROXY_HTTP_PORT, ""));
+        }
+        tfProxySocksHost.setText(Main.pref.get(DefaultProxySelector.PROXY_SOCKS_HOST, ""));
+        tfProxySocksPort.setText(Main.pref.get(DefaultProxySelector.PROXY_SOCKS_PORT, ""));
 
         if (pp.equals(ProxyPolicy.USE_SYSTEM_SETTINGS) && !DefaultProxySelector.willJvmRetrieveSystemProxies()) {
@@ -417 +358 @@
             }
         }
-        Main.pref.put(PROXY_POLICY, Optional.ofNullable(policy).orElse(ProxyPolicy.NO_PROXY).getName());
-        Main.pref.put(PROXY_HTTP_HOST, tfProxyHttpHost.getText());
-        Main.pref.put(PROXY_HTTP_PORT, tfProxyHttpPort.getText());
-        Main.pref.put(PROXY_SOCKS_HOST, tfProxySocksHost.getText());
-        Main.pref.put(PROXY_SOCKS_PORT, tfProxySocksPort.getText());
+        Main.pref.put(DefaultProxySelector.PROXY_POLICY, Optional.ofNullable(policy).orElse(ProxyPolicy.NO_PROXY).getName());
+        Main.pref.put(DefaultProxySelector.PROXY_HTTP_HOST, tfProxyHttpHost.getText());
+        Main.pref.put(DefaultProxySelector.PROXY_HTTP_PORT, tfProxyHttpPort.getText());
+        Main.pref.put(DefaultProxySelector.PROXY_SOCKS_HOST, tfProxySocksHost.getText());
+        Main.pref.put(DefaultProxySelector.PROXY_SOCKS_PORT, tfProxySocksPort.getText());
 
         // update the proxy selector