2002/07/15 23:14:55

[org.ibex.core.git] / src / org / xwt / plat / POSIX.java

diff --git a/src/org/xwt/plat/POSIX.java b/src/org/xwt/plat/POSIX.java
index f8766ba..d522834 100644 (file)
--- a/src/org/xwt/plat/POSIX.java
+++ b/src/org/xwt/plat/POSIX.java
@@ -52,63 +52,12 @@ public class POSIX extends GCJ {
     protected native void eventThread();
     private native void natInit();
 
-    /** returns the $BROWSER environment variable, since System.getEnv() is useless */
-    private static native String getEnv(String key);
-
+    /** returns the value of the environment variable key, or null if no such key exists */
+    protected native String _getEnv(String key);
+    
     /** spawns a process which is immune to SIGHUP */
     private static native void spawnChildProcess(String[] command);
 
-    protected synchronized HTTP.ProxyInfo _detectProxy() {
-
-        HTTP.ProxyInfo ret = new HTTP.ProxyInfo();
-
-        ret.httpProxyHost = getEnv("http_proxy");
-        if (ret.httpProxyHost != null) {
-            if (ret.httpProxyHost.startsWith("http://")) ret.httpProxyHost = ret.httpProxyHost.substring(7);
-            if (ret.httpProxyHost.endsWith("/")) ret.httpProxyHost = ret.httpProxyHost.substring(0, ret.httpProxyHost.length() - 1);
-            if (ret.httpProxyHost.indexOf(':') != -1) {
-                ret.httpProxyPort = Integer.parseInt(ret.httpProxyHost.substring(ret.httpProxyHost.indexOf(':') + 1));
-                ret.httpProxyHost = ret.httpProxyHost.substring(0, ret.httpProxyHost.indexOf(':'));
-            } else {
-                ret.httpProxyPort = 80;
-            }
-        }
-
-        ret.httpsProxyHost = getEnv("https_proxy");
-        if (ret.httpsProxyHost != null) {
-            if (ret.httpsProxyHost.startsWith("https://")) ret.httpsProxyHost = ret.httpsProxyHost.substring(7);
-            if (ret.httpsProxyHost.endsWith("/")) ret.httpsProxyHost = ret.httpsProxyHost.substring(0, ret.httpsProxyHost.length() - 1);
-            if (ret.httpsProxyHost.indexOf(':') != -1) {
-                ret.httpsProxyPort = Integer.parseInt(ret.httpsProxyHost.substring(ret.httpsProxyHost.indexOf(':') + 1));
-                ret.httpsProxyHost = ret.httpsProxyHost.substring(0, ret.httpsProxyHost.indexOf(':'));
-            } else {
-                ret.httpsProxyPort = 80;
-            }
-        }
-
-        ret.socksProxyHost = getEnv("socks_proxy");
-        if (ret.socksProxyHost != null) {
-            if (ret.socksProxyHost.startsWith("socks://")) ret.socksProxyHost = ret.socksProxyHost.substring(7);
-            if (ret.socksProxyHost.endsWith("/")) ret.socksProxyHost = ret.socksProxyHost.substring(0, ret.socksProxyHost.length() - 1);
-            if (ret.socksProxyHost.indexOf(':') != -1) {
-                ret.socksProxyPort = Integer.parseInt(ret.socksProxyHost.substring(ret.socksProxyHost.indexOf(':') + 1));
-                ret.socksProxyHost = ret.socksProxyHost.substring(0, ret.socksProxyHost.indexOf(':'));
-            } else {
-                ret.socksProxyPort = 80;
-            }
-        }
-
-        String noproxy = getEnv("no_proxy");
-        if (noproxy != null) {
-            StringTokenizer st = new StringTokenizer(noproxy, ",");
-            ret.excluded = new String[st.countTokens()];
-            for(int i=0; st.hasMoreTokens(); i++) ret.excluded[i] = st.nextToken();
-        }
-
-        if (ret.httpProxyHost == null && ret.socksProxyHost == null) return null;
-        return ret;
-    }
-
     protected void _newBrowserWindow(String url) {
         String browserString = getEnv("BROWSER");
         if (browserString == null) {