Changeset 2641 in josm for trunk/src/org/openstreetmap/josm/gui/MainApplication.java

Timestamp:

2009-12-16T18:58:04+01:00 (14 years ago)

Author:

Gubaer

Message:

new: supports system defined proxies if JOSM is started with -Djava.net.useSystemProxies=true
fixed #1641: JOSM doesn't allow for setting HTTP proxy user/password distrinct from OSM server user/password
fixed #2865: SOCKS Proxy Support
fixed #4182: Proxy Authentication

File:

• trunk/src/org/openstreetmap/josm/gui/MainApplication.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/MainApplication.java

@@ -9 +9 @@
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
+import java.net.Authenticator;
+import java.net.ProxySelector;
 import java.util.Arrays;
 import java.util.Collection;
@@ -19 +21 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.io.DefaultProxySelector;
+import org.openstreetmap.josm.io.auth.CredentialsManagerFactory;
+import org.openstreetmap.josm.io.auth.DefaultAuthenticator;
 import org.openstreetmap.josm.plugins.PluginHandler;
 import org.openstreetmap.josm.tools.BugReportExceptionHandler;
@@ -97 +102 @@
         }
         Main.pref.updateSystemProperties();
+
+        Authenticator.setDefault(
+                new DefaultAuthenticator(
+                        CredentialsManagerFactory.getCredentialManager()
+                )
+        );
+        ProxySelector.setDefault(new DefaultProxySelector(ProxySelector.getDefault()));
 
         if (argList.contains("--help") || argList.contains("-?") || argList.contains("-h")) {