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 633 by alloc, Fri Jan 18 18:18:45 2013 UTC vs.
Revision 634 by alloc, Sat Jan 19 11:58:17 2013 UTC

#	Line 73 | Line 73 | public class AEInstaller2 {
73		debug = true;
74		if (!debug) {
75		try {
76	<	System.setOut(new PrintStream(new File(Paths.getPrefsPath(),
77	<	"aei_output.log")));
78	<	System.setErr(new PrintStream(new File(Paths.getPrefsPath(),
79	<	"aei_error.log")));
76	>	PrintStream ps = new PrintStream(new File(Paths.getPrefsPath(),
77	>	"aei_output.log"));
78	>	System.setOut(ps);
79	>	System.setErr(ps);
80		} catch (FileNotFoundException e1) {
81		e1.printStackTrace();
82		}
#	Line 122 | Line 122 | public class AEInstaller2 {
122		}
123		JFrame.setDefaultLookAndFeelDecorated(true);
124
125	+	System.out.println(basicBundle.getString("appname") + " " + basicBundle.getString("appversion"));
126		System.out.println("JarPath:   " + Paths.getInstallerPath());
127		System.out.println("PrefsPath: " + Paths.getPrefsPath());
128		System.out.println("DataPath:  " + Paths.getModsPath());
#	Line 142 | Line 143 | public class AEInstaller2 {
143		System.out.println("Free space on Jar:  "
144		+ SizeFormatter.format(Paths.getInstallerPath()
145		.getUsableSpace(), 3));
146	+	System.out.println();
147
148		if (!OniSplit.isDotNETInstalled()) {
149		HTMLLinkLabel hll = new HTMLLinkLabel();
#	Line 160 | Line 162 | public class AEInstaller2 {
162		default:
163		dlUrl = "http://www.go-mono.com/mono-downloads/download.html";
164		}
165	<	hll.setText(startupBundle.getString("dotNetMissing.text").replaceAll(
166	<	"%1", String.format("<a href=\"%s\">%s</a>", dlUrl, dlUrl)));
165	>	hll.setText(startupBundle
166	>	.getString("dotNetMissing.text")
167	>	.replaceAll(
168	>	"%1",
169	>	String.format("<a href=\"%s\">%s</a>", dlUrl, dlUrl)));
170		JOptionPane.showMessageDialog(null, hll,
171		startupBundle.getString("dotNetMissing.title"),
172		JOptionPane.ERROR_MESSAGE);

Diff Legend

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