From 4b21d2c59473c8ed6ced24b76b03463fc8796717 Mon Sep 17 00:00:00 2001 From: Per Abich Date: Tue, 16 Oct 2018 09:48:39 +0200 Subject: [PATCH] - Fixing html in pac_files_docu.html - Fixing Javadoc in IEProxySearchStrategy.java, GnomeDConfProxySearchStrategy.java and WinProxySearchStrategy.java - Improving performance by using arraycopy instead of manual code in DHCPOptions.java and WpadProxySearchStrategy.java - Removed unnecessary "final" in TestUtil.java --- src/doc/pac_files_docu.html | 15 ++++++++++++++- .../search/browser/ie/IEProxySearchStrategy.java | 4 ++-- .../gnome/GnomeDConfProxySearchStrategy.java | 2 -- .../desktop/win/WinProxySearchStrategy.java | 2 +- .../search/wpad/WpadProxySearchStrategy.java | 3 +-- .../proxy/search/wpad/dhcp/DHCPOptions.java | 4 +--- .../proxy/search/wpad/dhcp/DHCPSocket.java | 8 +------- .../github/markusbernhardt/proxy/TestUtil.java | 2 +- 8 files changed, 21 insertions(+), 19 deletions(-) diff --git a/src/doc/pac_files_docu.html b/src/doc/pac_files_docu.html index 9e08bf87..e64bd618 100644 --- a/src/doc/pac_files_docu.html +++ b/src/doc/pac_files_docu.html @@ -9,7 +9,20 @@ Proxy Client Autoconfig File Format -
Documentation
+
+ + Documentation + + + + + + +

diff --git a/src/main/java/com/github/markusbernhardt/proxy/search/browser/ie/IEProxySearchStrategy.java b/src/main/java/com/github/markusbernhardt/proxy/search/browser/ie/IEProxySearchStrategy.java index 64fa07f1..5da84b07 100644 --- a/src/main/java/com/github/markusbernhardt/proxy/search/browser/ie/IEProxySearchStrategy.java +++ b/src/main/java/com/github/markusbernhardt/proxy/search/browser/ie/IEProxySearchStrategy.java @@ -84,7 +84,7 @@ public IEProxyConfig readIEProxyConfig() { /************************************************************************* * Parses the settings and creates an PAC ProxySelector for it. * - * @param ieSettings + * @param ieProxyConfig * the IE settings to use. * @return a PacProxySelector the selector or null. ************************************************************************/ @@ -120,7 +120,7 @@ private PacProxySelector createPacSelector(IEProxyConfig ieProxyConfig) { /************************************************************************* * Parses the proxy settings into an ProxySelector. * - * @param ieSettings + * @param ieProxyConfig * the settings to use. * @return a ProxySelector, null if no settings are set. * @throws ProxyException diff --git a/src/main/java/com/github/markusbernhardt/proxy/search/desktop/gnome/GnomeDConfProxySearchStrategy.java b/src/main/java/com/github/markusbernhardt/proxy/search/desktop/gnome/GnomeDConfProxySearchStrategy.java index 109f65fd..d781fa1d 100644 --- a/src/main/java/com/github/markusbernhardt/proxy/search/desktop/gnome/GnomeDConfProxySearchStrategy.java +++ b/src/main/java/com/github/markusbernhardt/proxy/search/desktop/gnome/GnomeDConfProxySearchStrategy.java @@ -280,8 +280,6 @@ private void installSecureSelector(Properties settings, ProtocolDispatchSelector /************************************************************************* * Parse the settings file and extract all network.proxy.* settings from it. * - * @param context - * the gconf context to parse. * @param settings * the settings object to fill. * @return the parsed properties. diff --git a/src/main/java/com/github/markusbernhardt/proxy/search/desktop/win/WinProxySearchStrategy.java b/src/main/java/com/github/markusbernhardt/proxy/search/desktop/win/WinProxySearchStrategy.java index 621cc1d6..b7cc499e 100644 --- a/src/main/java/com/github/markusbernhardt/proxy/search/desktop/win/WinProxySearchStrategy.java +++ b/src/main/java/com/github/markusbernhardt/proxy/search/desktop/win/WinProxySearchStrategy.java @@ -79,7 +79,7 @@ public WinProxyConfig readWindowsProxyConfig() { /************************************************************************* * Parses the proxy settings into an ProxySelector. * - * @param winProxySettings + * @param winProxyConfig * the settings to use. * @return a ProxySelector, null if no settings are set. * @throws ProxyException diff --git a/src/main/java/com/github/markusbernhardt/proxy/search/wpad/WpadProxySearchStrategy.java b/src/main/java/com/github/markusbernhardt/proxy/search/wpad/WpadProxySearchStrategy.java index 964eff2e..09680383 100644 --- a/src/main/java/com/github/markusbernhardt/proxy/search/wpad/WpadProxySearchStrategy.java +++ b/src/main/java/com/github/markusbernhardt/proxy/search/wpad/WpadProxySearchStrategy.java @@ -235,8 +235,7 @@ private String checkDhcpAckForPAC(InetAddress ip, byte[] mac) throws IOException // fields MUST be set all-zero. byte[] addr = new byte[16]; if (mac != null) - for (int i = 0; i < 6; i++) - addr[i] = mac[i]; + System.arraycopy(mac, 0, addr, 0, 6); // Despite what the spec says above if these are set to 0 you may // not get a response from some dhcp servers messageOut.setHtype((byte) 1); // 1 for Ethernet diff --git a/src/main/java/com/github/markusbernhardt/proxy/search/wpad/dhcp/DHCPOptions.java b/src/main/java/com/github/markusbernhardt/proxy/search/wpad/dhcp/DHCPOptions.java index c5025f14..6be7b002 100644 --- a/src/main/java/com/github/markusbernhardt/proxy/search/wpad/dhcp/DHCPOptions.java +++ b/src/main/java/com/github/markusbernhardt/proxy/search/wpad/dhcp/DHCPOptions.java @@ -186,9 +186,7 @@ public void setOption(byte entryCode, byte value[]) { */ private byte[] getArrayOption(int length, int position, byte options[]) { byte value[] = new byte[length]; - for (int i = 0; i < length; i++) { - value[i] = options[position + i]; - } + System.arraycopy(options, position, value, 0, length); return value; } diff --git a/src/main/java/com/github/markusbernhardt/proxy/search/wpad/dhcp/DHCPSocket.java b/src/main/java/com/github/markusbernhardt/proxy/search/wpad/dhcp/DHCPSocket.java index c52468c0..360c58ed 100644 --- a/src/main/java/com/github/markusbernhardt/proxy/search/wpad/dhcp/DHCPSocket.java +++ b/src/main/java/com/github/markusbernhardt/proxy/search/wpad/dhcp/DHCPSocket.java @@ -1,13 +1,7 @@ package com.github.markusbernhardt.proxy.search.wpad.dhcp; import java.io.IOException; -import java.net.DatagramPacket; -import java.net.DatagramSocket; -import java.net.InetAddress; -import java.net.InetSocketAddress; -import java.net.Socket; -import java.net.SocketException; -import java.net.UnknownHostException; +import java.net.*; /** * This class represents a Socket for sending DHCP Messages diff --git a/src/test/java/com/github/markusbernhardt/proxy/TestUtil.java b/src/test/java/com/github/markusbernhardt/proxy/TestUtil.java index 1b132ef4..2cb0b96a 100644 --- a/src/test/java/com/github/markusbernhardt/proxy/TestUtil.java +++ b/src/test/java/com/github/markusbernhardt/proxy/TestUtil.java @@ -61,7 +61,7 @@ public class TestUtil { * the name of the test folder. ************************************************************************/ - public static final void setTestDataFolder(String folder) { + public static void setTestDataFolder(String folder) { System.setProperty(PlatformUtil.OVERRIDE_HOME_DIR, System.getProperty("user.dir") + File.separator + TestUtil.TEST_DATA_FOLDER + folder); }