Changeset 2641 in josm for trunk/src/org/openstreetmap/josm/data/Preferences.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/data/Preferences.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/data/Preferences.java

@@ -26 +26 @@
 import java.util.Map.Entry;
 import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.logging.Logger;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -32 +33 @@
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.gui.preferences.ProxyPreferences;
 import org.openstreetmap.josm.tools.ColorHelper;
 
@@ -44 +44 @@
  */
 public class Preferences {
+    static private final Logger logger = Logger.getLogger(Preferences.class.getName());
 
     /**
@@ -731 +732 @@
     public void updateSystemProperties() {
         Properties sysProp = System.getProperties();
-        if (getBoolean(ProxyPreferences.PROXY_ENABLE)) {
-            sysProp.put("proxySet", "true");
-            sysProp.put("http.proxyHost", get(ProxyPreferences.PROXY_HOST));
-            sysProp.put("proxyPort", get(ProxyPreferences.PROXY_PORT));
-            if (!getBoolean(ProxyPreferences.PROXY_ANONYMOUS)) {
-                sysProp.put("proxyUser", get(ProxyPreferences.PROXY_USER));
-                sysProp.put("proxyPassword", get(ProxyPreferences.PROXY_PASS));
-            }
-
-        }
         sysProp.put("http.agent", Version.getInstance().getAgentString());
         System.setProperties(sysProp);