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

Timestamp:

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

Author:

Don-vip

Message:

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

Location:

trunk/src/org/openstreetmap/josm/io

Files:

• DefaultProxySelector.java (modified) (5 diffs)
• OsmApi.java (modified) (1 diff)
• ProxyPolicy.java (added)
• auth/JosmPreferencesCredentialAgent.java (modified) (4 diffs)

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

@@ -19 +19 @@
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.gui.preferences.server.ProxyPreferencesPanel;
-import org.openstreetmap.josm.gui.preferences.server.ProxyPreferencesPanel.ProxyPolicy;
 import org.openstreetmap.josm.tools.Logging;
 
 /**
  * This is the default proxy selector used in JOSM.
- *
+ * @since 2641
  */
 public class DefaultProxySelector extends ProxySelector {
+
+    /** 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 static final List<Proxy> NO_PROXY_LIST = Collections.singletonList(Proxy.NO_PROXY);
@@ -111 +126 @@
      */
     public final void initFromPreferences() {
-        String value = Main.pref.get(ProxyPreferencesPanel.PROXY_POLICY);
+        String value = Main.pref.get(PROXY_POLICY);
         if (value.isEmpty()) {
             proxyPolicy = ProxyPolicy.NO_PROXY;
@@ -118 +133 @@
             if (proxyPolicy == null) {
                 Logging.warn(tr("Unexpected value for preference ''{0}'' found. Got ''{1}''. Will use no proxy.",
-                        ProxyPreferencesPanel.PROXY_POLICY, value));
+                        PROXY_POLICY, value));
                 proxyPolicy = ProxyPolicy.NO_PROXY;
             }
         }
-        String host = Main.pref.get(ProxyPreferencesPanel.PROXY_HTTP_HOST, null);
-        int port = parseProxyPortValue(ProxyPreferencesPanel.PROXY_HTTP_PORT, Main.pref.get(ProxyPreferencesPanel.PROXY_HTTP_PORT, null));
+        String host = Main.pref.get(PROXY_HTTP_HOST, null);
+        int port = parseProxyPortValue(PROXY_HTTP_PORT, Main.pref.get(PROXY_HTTP_PORT, null));
         httpProxySocketAddress = null;
         if (proxyPolicy.equals(ProxyPolicy.USE_HTTP_PROXY)) {
@@ -134 +149 @@
         }
 
-        host = Main.pref.get(ProxyPreferencesPanel.PROXY_SOCKS_HOST, null);
-        port = parseProxyPortValue(ProxyPreferencesPanel.PROXY_SOCKS_PORT, Main.pref.get(ProxyPreferencesPanel.PROXY_SOCKS_PORT, null));
+        host = Main.pref.get(PROXY_SOCKS_HOST, null);
+        port = parseProxyPortValue(PROXY_SOCKS_PORT, Main.pref.get(PROXY_SOCKS_PORT, null));
         socksProxySocketAddress = null;
         if (proxyPolicy.equals(ProxyPolicy.USE_SOCKS_PROXY)) {
@@ -146 +161 @@
         }
         proxyExceptions = new HashSet<>(
-            Main.pref.getCollection(ProxyPreferencesPanel.PROXY_EXCEPTIONS,
+            Main.pref.getCollection(PROXY_EXCEPTIONS,
                     Arrays.asList("localhost", IPV4_LOOPBACK, IPV6_LOOPBACK))
         );

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

@@ -50 +50 @@
  * It is conceivable to extract this into an interface later and create various
  * classes implementing the interface, to be able to talk to various kinds of servers.
- * @ince 1523
+ * @since 1523
  */
 public class OsmApi extends OsmConnection {

trunk/src/org/openstreetmap/josm/io/auth/JosmPreferencesCredentialAgent.java

@@ -13 +13 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.oauth.OAuthToken;
-import org.openstreetmap.josm.gui.preferences.server.ProxyPreferencesPanel;
 import org.openstreetmap.josm.gui.widgets.HtmlPanel;
+import org.openstreetmap.josm.io.DefaultProxySelector;
 import org.openstreetmap.josm.io.OsmApi;
 
@@ -20 +20 @@
  * This is the default credentials agent in JOSM. It keeps username and password for both
  * the OSM API and an optional HTTP proxy in the JOSM preferences file.
- *
+ * @since 2641
  */
 public class JosmPreferencesCredentialAgent extends AbstractCredentialsAgent {
@@ -49 +49 @@
             return new PasswordAuthentication(user, password == null ? new char[0] : password.toCharArray());
         case PROXY:
-            user = Main.pref.get(ProxyPreferencesPanel.PROXY_USER, null);
-            password = Main.pref.get(ProxyPreferencesPanel.PROXY_PASS, null);
+            user = Main.pref.get(DefaultProxySelector.PROXY_USER, null);
+            password = Main.pref.get(DefaultProxySelector.PROXY_PASS, null);
             if (user == null)
                 return null;
@@ -84 +84 @@
             break;
         case PROXY:
-            Main.pref.put(ProxyPreferencesPanel.PROXY_USER, credentials.getUserName());
+            Main.pref.put(DefaultProxySelector.PROXY_USER, credentials.getUserName());
             if (credentials.getPassword() == null) {
-                Main.pref.put(ProxyPreferencesPanel.PROXY_PASS, null);
+                Main.pref.put(DefaultProxySelector.PROXY_PASS, null);
             } else {
-                Main.pref.put(ProxyPreferencesPanel.PROXY_PASS, String.valueOf(credentials.getPassword()));
+                Main.pref.put(DefaultProxySelector.PROXY_PASS, String.valueOf(credentials.getPassword()));
             }
             break;