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 603 by alloc, Thu Jan 10 16:25:51 2013 UTC vs.
Revision 612 by alloc, Mon Jan 14 18:55:16 2013 UTC

#	Line 23 | Line 23 | import net.oni2.aeinstaller.backend.Size
23		import net.oni2.aeinstaller.backend.depot.DepotManager;
24		import net.oni2.aeinstaller.backend.oni.Installer;
25		import net.oni2.aeinstaller.backend.oni.OniSplit;
26	+	import net.oni2.aeinstaller.gui.HTMLLinkLabel;
27		import net.oni2.aeinstaller.gui.MainWin;
28
29		import org.javabuilders.swing.SwingJavaBuilder;
#	Line 125 | Line 126 | public class AEInstaller2 {
126		System.out.println("DataPath:  " + Paths.getModsPath());
127		System.out.println("DownPath:  " + Paths.getDownloadPath());
128		System.out.println("TempPath:  " + Paths.getTempPath());
129	<	System.out.println("ValidPath: "
129	<	+ Installer.verifyRunningDirectory());
129	>	System.out.println("ValidPath: " + Installer.verifyRunningDirectory());
130		System.out.println("Platform:  " + Settings.getPlatform());
131		System.out.println("Architect: " + Settings.getArchitecture());
132		System.out.println(".NET:      " + OniSplit.isDotNETInstalled());
#	Line 141 | Line 141 | public class AEInstaller2 {
141		+ SizeFormatter.format(Paths.getInstallerPath()
142		.getUsableSpace(), 3));
143
144	+	if (!OniSplit.isDotNETInstalled()) {
145	+	HTMLLinkLabel hll = new HTMLLinkLabel();
146	+	String dlUrl = "";
147	+	switch (Settings.getPlatform()) {
148	+	case WIN:
149	+	switch (Settings.getArchitecture()) {
150	+	case X86:
151	+	dlUrl = "http://download.microsoft.com/download/c/6/e/c6e88215-0178-4c6c-b5f3-158ff77b1f38/NetFx20SP2_x86.exe";
152	+	break;
153	+	case AMD64:
154	+	dlUrl = "http://download.microsoft.com/download/c/6/e/c6e88215-0178-4c6c-b5f3-158ff77b1f38/NetFx20SP2_x64.exe";
155	+	break;
156	+	}
157	+	break;
158	+	default:
159	+	dlUrl = "http://www.go-mono.com/mono-downloads/download.html";
160	+	}
161	+	hll.setText(basicBundle.getString("dotNetMissing.text").replaceAll(
162	+	"%1", String.format("<a href=\"%s\">%s</a>", dlUrl, dlUrl)));
163	+	JOptionPane.showMessageDialog(null, hll,
164	+	basicBundle.getString("dotNetMissing.title"),
165	+	JOptionPane.ERROR_MESSAGE);
166	+	return;
167	+	}
168	+
169		if (!Installer.verifyRunningDirectory()) {
170		JOptionPane.showMessageDialog(null,
171		basicBundle.getString("invalidPath.text"),

Diff Legend

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