ViewVC Help

View File | Revision Log | View Changeset | Root Listing

root/Oni2/java/AEInstaller2-Updater/src/net/oni2/aeinstaller/updater/AEInstaller2Updater.java

Comparing java/AEInstaller2-Updater/src/net/oni2/aeinstaller/updater/AEInstaller2Updater.java (file contents):
Revision 777 by alloc, Tue Apr 2 00:33:46 2013 UTC vs.
Revision 852 by alloc, Fri May 3 12:25:21 2013 UTC

#	Line 8 | Line 8 | import javax.swing.JFrame;
8		import javax.swing.SwingUtilities;
9		import javax.swing.UIManager;
10
11	+	import net.oni2.ProxySettings;
12		import net.oni2.aeinstaller.updater.backend.Paths;
13		import net.oni2.aeinstaller.updater.gui.MainWin;
14
#	Line 40 | Line 41 | public class AEInstaller2Updater {
41		}
42		}
43
44	+	if (Paths.getProxySettingsFilename().exists()) {
45	+	ProxySettings.deserializeFromFile(Paths.getProxySettingsFilename());
46	+	}
47	+
48		System.setProperty("networkaddress.cache.ttl", "5");
49		System.setProperty("networkaddress.cache.negative.ttl", "1");
50

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)