ViewVC Help

View File | Revision Log | View Changeset | Root Listing

root/Oni2/java/installer2/src/net/oni2/aeinstaller/gui/MainWin.java

Comparing AE/installer2/src/net/oni2/aeinstaller/gui/MainWin.java (file contents):
Revision 617 by alloc, Tue Jan 15 01:20:48 2013 UTC vs.
Revision 618 by alloc, Tue Jan 15 01:50:36 2013 UTC

#	Line 433 | Line 433 | public class MainWin extends JFrame impl
433		}
434		}
435		}
436	<
436	>
437		if (instReady) {
438		System.out.println("Install mods: " + mods.toString());
439
#	Line 450 | Line 450 | public class MainWin extends JFrame impl
450		}
451		return false;
452		}
453	<
453	>
454		@SuppressWarnings("unused")
455		private void installDone() {
456		JOptionPane.showMessageDialog(this,
#	Line 527 | Line 527 | public class MainWin extends JFrame impl
527
528		private Vector<String> getBasicOniLaunchParams() {
529		Vector<String> params = new Vector<String>();
530	+	File exe = null;
531		switch (Settings.getPlatform()) {
532		case WIN:
533	<	params.add(new File(Paths.getEditionBasePath(), "Oni.exe")
534	<	.getPath());
533	>	exe = new File(Paths.getEditionBasePath(), "Oni.exe");
534	>	if (exe.exists())
535	>	params.add(exe.getPath());
536		break;
537		case MACOS:
538	<	params.add(new File(Paths.getEditionBasePath(),
539	<	"Oni.app/Contents/MacOS/Oni").getPath());
538	>	exe = new File(Paths.getEditionBasePath(),
539	>	"Oni.app/Contents/MacOS/Oni");
540	>	if (exe.exists())
541	>	params.add(exe.getPath());
542		break;
543		case LINUX:
544		String wine = Settings.getWinePath();
545	<	if (wine != null) {
546	<	params.add(wine);
547	<	params.add(new File(Paths.getEditionBasePath(), "Oni.exe")
548	<	.getPath());
545	>	exe = new File(Paths.getEditionBasePath(), "Oni.exe");
546	>	if (exe.exists()) {
547	>	if (wine != null) {
548	>	params.add(wine);
549	>	params.add(exe.getPath());
550	>	}
551		}
552		break;
553		default:

Diff Legend

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