2002/08/07 03:27:46

darcs-hash:20040130064932-2ba56-647ad3cbf1ad9a2f3b615cfa041825cf9d5378dc.gz

diff --git a/CHANGES b/CHANGES
index f3deac4..d3b01a5 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -320,3 +320,5 @@
               works even when an infinite loop occurs in a _SizeChange
               or _PosChange trap.
 
+06-Jul megacz Platform.java: removed WPAD detection, HTTP.Proxy => Proxy.
+

diff --git a/src/org/xwt/Platform.java b/src/org/xwt/Platform.java
index 0a32481..5406ea9 100644 (file)
--- a/src/org/xwt/Platform.java
+++ b/src/org/xwt/Platform.java
@@ -34,7 +34,7 @@ public class Platform {
     static boolean alreadyDetectedProxy = false;
 
     /** the result of proxy autodetection */
-    static HTTP.ProxyInfo cachedProxyInfo = null;
+    static Proxy cachedProxyInfo = null;
 
     /** the current build */
     public static String build = "unknown";
@@ -201,7 +201,7 @@ public class Platform {
     }
 
     /** Returns null if XWT should always use direct connection; otherwise returns a ProxyInfo object with proxy settings */
-    protected synchronized HTTP.ProxyInfo _detectProxy() { return null; }
+    protected synchronized Proxy _detectProxy() { return null; }
 
     /** displays a platform-specific "open file" dialog and returns the chosen filename, or null if the user hit cancel */
     protected String _fileDialog(String suggestedFileName, boolean write) { return null; }
@@ -380,24 +380,20 @@ public class Platform {
     }
 
     /** detects proxy settings */
-    public static synchronized HTTP.ProxyInfo detectProxy() {
+    public static synchronized Proxy detectProxy() {
 
         if (cachedProxyInfo != null) return cachedProxyInfo;
         if (alreadyDetectedProxy) return null;
         alreadyDetectedProxy = true;
 
         if (Log.on) Log.log(Platform.class, "attempting environment-variable DNS proxy detection");
-        cachedProxyInfo = HTTP.ProxyInfo.detectProxyViaManual();
+        cachedProxyInfo = Proxy.detectProxyViaManual();
         if (cachedProxyInfo != null) return cachedProxyInfo;
 
         if (Log.on) Log.log(Platform.class, "attempting " + platform.getClass().getName() + " proxy detection");
         cachedProxyInfo = platform._detectProxy();
         if (cachedProxyInfo != null) return cachedProxyInfo;
 
-        if (Log.on) Log.log(Platform.class, "attempting WPAD proxy detection");
-        cachedProxyInfo = HTTP.ProxyInfo.detectProxyViaWPAD();
-        if (cachedProxyInfo != null) return cachedProxyInfo;
-
         return cachedProxyInfo;
     }