ViewVC Help

View File | Revision Log | View Changeset | Root Listing

root/Oni2/java/installer2/src/net/oni2/aeinstaller/AEInstaller2.java

Comparing AE/installer2/src/net/oni2/aeinstaller/AEInstaller2.java (file contents):
Revision 699 by alloc, Sun Mar 17 17:52:08 2013 UTC vs.
Revision 709 by alloc, Thu Mar 21 09:40:09 2013 UTC

#	Line 23 | Line 23 | import javax.swing.UIManager.LookAndFeel
23		import net.oni2.aeinstaller.backend.CaseInsensitiveFile;
24		import net.oni2.aeinstaller.backend.DotNet;
25		import net.oni2.aeinstaller.backend.Paths;
26	–	import net.oni2.aeinstaller.backend.Settings;
27	–	import net.oni2.aeinstaller.backend.Settings.Platform;
26		import net.oni2.aeinstaller.backend.SizeFormatter;
27		import net.oni2.aeinstaller.backend.depot.DepotManager;
28		import net.oni2.aeinstaller.backend.oni.Installer;
29		import net.oni2.aeinstaller.backend.oni.OniSplit;
30		import net.oni2.aeinstaller.gui.HTMLLinkLabel;
31		import net.oni2.aeinstaller.gui.MainWin;
32	+	import net.oni2.settingsmanager.Settings;
33	+	import net.oni2.settingsmanager.Settings.Platform;
34
35		import org.javabuilders.swing.SwingJavaBuilder;
36		import org.simplericity.macify.eawt.Application;
#	Line 126 | Line 126 | public class AEInstaller2 {
126		initMacOS();
127
128		Settings.setDebug(debug);
129	<	Settings.deserializeFromFile();
129	>	Settings.deserializeFromFile(Paths.getSettingsFilename());
130		Settings.setDebug(debug);
131		Settings.getInstance().setNoCacheUpdateMode(noCacheUpdate);
132

Diff Legend

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