diff options
Diffstat (limited to 'src/main/java/com/btr/proxy/search')
4 files changed, 14 insertions, 13 deletions
diff --git a/src/main/java/com/btr/proxy/search/browser/firefox/FirefoxProxySearchStrategy.java b/src/main/java/com/btr/proxy/search/browser/firefox/FirefoxProxySearchStrategy.java index 228bc8c..77868e2 100644 --- a/src/main/java/com/btr/proxy/search/browser/firefox/FirefoxProxySearchStrategy.java +++ b/src/main/java/com/btr/proxy/search/browser/firefox/FirefoxProxySearchStrategy.java @@ -13,6 +13,7 @@ import com.btr.proxy.selector.misc.ProtocolDispatchSelector; import com.btr.proxy.selector.whitelist.ProxyBypassListSelector; import com.btr.proxy.util.Logger; import com.btr.proxy.util.Logger.LogLevel; +import com.btr.proxy.util.MiscUtil; import com.btr.proxy.util.PlatformUtil; import com.btr.proxy.util.PlatformUtil.Platform; import com.btr.proxy.util.ProxyException; @@ -91,7 +92,7 @@ public class FirefoxProxySearchStrategy implements ProxySearchStrategy { Properties settings = readSettings(); ProxySelector result = null; - int type = Integer.parseInt(settings.getProperty("network.proxy.type", "-1")); + int type = MiscUtil.parseInt(settings.getProperty("network.proxy.type", "-1")); switch (type) { case -1: // Use system settings Logger.log(getClass(), LogLevel.TRACE, "Firefox uses system settings"); @@ -236,7 +237,7 @@ public class FirefoxProxySearchStrategy implements ProxySearchStrategy { private void installSecureProxy(ProtocolDispatchSelector ps, Properties settings) throws NumberFormatException { String proxyHost = settings.getProperty("network.proxy.ssl", null); - int proxyPort = Integer.parseInt(settings.getProperty("network.proxy.ssl_port", "0")); + int proxyPort = MiscUtil.parseInt(settings.getProperty("network.proxy.ssl_port", "0")); if (proxyHost != null) { Logger.log(getClass(), LogLevel.TRACE, "Firefox secure proxy is {0}:{1}", proxyHost, proxyPort); ProxySelector p = ProxyUtil.parseProxySettings(proxyHost, Proxy.Type.HTTP, proxyPort); @@ -258,7 +259,7 @@ public class FirefoxProxySearchStrategy implements ProxySearchStrategy { Properties settings, String protocol) throws NumberFormatException { String proxyHost = settings.getProperty("network.proxy."+protocol, null); - int proxyPort = Integer.parseInt(settings.getProperty("network.proxy."+protocol+"_port", "0")); + int proxyPort = MiscUtil.parseInt(settings.getProperty("network.proxy."+protocol+"_port", "0")); if (proxyHost != null) { Proxy.Type type; if (protocol.startsWith("socks")) { diff --git a/src/main/java/com/btr/proxy/search/desktop/gnome/GnomeProxySearchStrategy.java b/src/main/java/com/btr/proxy/search/desktop/gnome/GnomeProxySearchStrategy.java index 10d237a..00f7fcc 100644 --- a/src/main/java/com/btr/proxy/search/desktop/gnome/GnomeProxySearchStrategy.java +++ b/src/main/java/com/btr/proxy/search/desktop/gnome/GnomeProxySearchStrategy.java @@ -23,6 +23,7 @@ import com.btr.proxy.selector.whitelist.ProxyBypassListSelector; import com.btr.proxy.util.EmptyXMLResolver; import com.btr.proxy.util.Logger; import com.btr.proxy.util.Logger.LogLevel; +import com.btr.proxy.util.MiscUtil; import com.btr.proxy.util.ProxyException; import com.btr.proxy.util.ProxyUtil; @@ -218,7 +219,7 @@ public class GnomeProxySearchStrategy implements ProxySearchStrategy { private void installHttpSelector(Properties settings, ProtocolDispatchSelector ps) throws NumberFormatException { String proxyHost = settings.getProperty("/system/http_proxy/host", null); - int proxyPort = Integer.parseInt(settings.getProperty("/system/http_proxy/port", "0").trim()); + int proxyPort = MiscUtil.parseInt(settings.getProperty("/system/http_proxy/port", "0").trim()); if (proxyHost != null && proxyHost.length() > 0) { Logger.log(getClass(), LogLevel.TRACE, "Gnome http proxy is {0}:{1}", proxyHost, proxyPort); ps.setSelector("http", ProxyUtil.parseProxySettings(proxyHost.trim(), Proxy.Type.HTTP, proxyPort)); @@ -235,7 +236,7 @@ public class GnomeProxySearchStrategy implements ProxySearchStrategy { private void installSocksSelector(Properties settings, ProtocolDispatchSelector ps) throws NumberFormatException { String proxyHost = settings.getProperty("/system/proxy/socks_host", null); - int proxyPort = Integer.parseInt(settings.getProperty("/system/proxy/socks_port", "0").trim()); + int proxyPort = MiscUtil.parseInt(settings.getProperty("/system/proxy/socks_port", "0").trim()); if (proxyHost != null && proxyHost.length() > 0) { Logger.log(getClass(), LogLevel.TRACE, "Gnome socks proxy is {0}:{1}", proxyHost, proxyPort); ps.setSelector("socks", ProxyUtil.parseProxySettings(proxyHost.trim(), Proxy.Type.SOCKS, proxyPort)); @@ -251,7 +252,7 @@ public class GnomeProxySearchStrategy implements ProxySearchStrategy { private void installFtpSelector(Properties settings, ProtocolDispatchSelector ps) throws NumberFormatException { String proxyHost = settings.getProperty("/system/proxy/ftp_host", null); - int proxyPort = Integer.parseInt(settings.getProperty("/system/proxy/ftp_port", "0").trim()); + int proxyPort = MiscUtil.parseInt(settings.getProperty("/system/proxy/ftp_port", "0").trim()); if (proxyHost != null && proxyHost.length() > 0) { Logger.log(getClass(), LogLevel.TRACE, "Gnome ftp proxy is {0}:{1}", proxyHost, proxyPort); ps.setSelector("ftp", ProxyUtil.parseProxySettings(proxyHost.trim(), Proxy.Type.HTTP, proxyPort)); @@ -268,7 +269,7 @@ public class GnomeProxySearchStrategy implements ProxySearchStrategy { private void installSecureSelector(Properties settings, ProtocolDispatchSelector ps) throws NumberFormatException { String proxyHost = settings.getProperty("/system/proxy/secure_host", null); - int proxyPort = Integer.parseInt(settings.getProperty("/system/proxy/secure_port", "0").trim()); + int proxyPort = MiscUtil.parseInt(settings.getProperty("/system/proxy/secure_port", "0").trim()); if (proxyHost != null && proxyHost.length() > 0) { Logger.log(getClass(), LogLevel.TRACE, "Gnome secure proxy is {0}:{1}", proxyHost, proxyPort); ProxySelector ps2 = ProxyUtil.parseProxySettings(proxyHost.trim(), Proxy.Type.HTTP, proxyPort); diff --git a/src/main/java/com/btr/proxy/search/desktop/kde/KdeProxySearchStrategy.java b/src/main/java/com/btr/proxy/search/desktop/kde/KdeProxySearchStrategy.java index de81c4c..ecac104 100644 --- a/src/main/java/com/btr/proxy/search/desktop/kde/KdeProxySearchStrategy.java +++ b/src/main/java/com/btr/proxy/search/desktop/kde/KdeProxySearchStrategy.java @@ -8,14 +8,12 @@ import com.btr.proxy.search.ProxySearchStrategy; import com.btr.proxy.search.env.EnvProxySearchStrategy; import com.btr.proxy.search.wpad.WpadProxySearchStrategy; import com.btr.proxy.selector.direct.NoProxySelector; -import com.btr.proxy.selector.fixed.FixedProxySelector; import com.btr.proxy.selector.misc.ProtocolDispatchSelector; -import com.btr.proxy.selector.pac.PacProxySelector; -import com.btr.proxy.selector.pac.UrlPacScriptSource; import com.btr.proxy.selector.whitelist.ProxyBypassListSelector; import com.btr.proxy.selector.whitelist.UseProxyWhiteListSelector; import com.btr.proxy.util.Logger; import com.btr.proxy.util.Logger.LogLevel; +import com.btr.proxy.util.MiscUtil; import com.btr.proxy.util.ProxyException; import com.btr.proxy.util.ProxyUtil; @@ -84,7 +82,7 @@ public class KdeProxySearchStrategy implements ProxySearchStrategy { } ProxySelector result = null; - int type = Integer.parseInt(settings.getProperty("ProxyType", "-1")); + int type = MiscUtil.parseInt(settings.getProperty("ProxyType", "-1")); switch (type) { case 0: // Use no proxy Logger.log(getClass(), LogLevel.TRACE, "Kde uses no proxy"); diff --git a/src/main/java/com/btr/proxy/search/java/JavaProxySearchStrategy.java b/src/main/java/com/btr/proxy/search/java/JavaProxySearchStrategy.java index f1853b7..83e746e 100644 --- a/src/main/java/com/btr/proxy/search/java/JavaProxySearchStrategy.java +++ b/src/main/java/com/btr/proxy/search/java/JavaProxySearchStrategy.java @@ -9,6 +9,7 @@ import com.btr.proxy.selector.misc.ProtocolDispatchSelector; import com.btr.proxy.selector.whitelist.ProxyBypassListSelector; import com.btr.proxy.util.Logger; import com.btr.proxy.util.Logger.LogLevel; +import com.btr.proxy.util.MiscUtil; /***************************************************************************** * Reads some java system properties and extracts the proxy settings from them. @@ -96,7 +97,7 @@ public class JavaProxySearchStrategy implements ProxySearchStrategy { String port = System.getProperty("socksProxyPort", "1080"); if (host != null && host.trim().length() > 0) { Logger.log(getClass(), LogLevel.TRACE, "Socks proxy {0}:{1} found", host, port); - ps.setSelector("socks", new FixedProxySelector(Proxy.Type.SOCKS, host, Integer.parseInt(port))); + ps.setSelector("socks", new FixedProxySelector(Proxy.Type.SOCKS, host, MiscUtil.parseInt(port))); } } @@ -122,7 +123,7 @@ public class JavaProxySearchStrategy implements ProxySearchStrategy { Logger.log(getClass(), LogLevel.TRACE, protocol.toUpperCase()+" proxy {0}:{1} found using whitelist: {2}", host, port, whiteList); - ProxySelector protocolSelector = new FixedProxySelector(Proxy.Type.HTTP, host, Integer.parseInt(port)); + ProxySelector protocolSelector = new FixedProxySelector(Proxy.Type.HTTP, host, MiscUtil.parseInt(port)); if (whiteList.trim().length() > 0) { protocolSelector = new ProxyBypassListSelector(whiteList, protocolSelector); } |