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 615 by alloc, Tue Jan 15 00:49:04 2013 UTC vs.
Revision 616 by alloc, Tue Jan 15 00:57:48 2013 UTC

#	Line 487 | Line 487 | public class MainWin extends JFrame impl
487		lblDownloadSizeVal.setText(SizeFormatter.format(newSize, 2));
488		}
489
490	<	@DoInBackground(progressMessage = "initializingEdition.title", cancelable = false, indeterminateProgress = false)
491	<	private void initialize(final BackgroundEvent evt) {
490	>	@SuppressWarnings("unused")
491	>	private void checkInitialize() {
492		if (!Installer.isEditionInitialized()) {
493		int res = JOptionPane.showConfirmDialog(this,
494		bundle.getString("askInitialize.text"),
#	Line 497 | Line 497 | public class MainWin extends JFrame impl
497		if (res == JOptionPane.NO_OPTION) {
498		saveLocalData();
499		exit();
500	–	} else {
501	–	Installer.initializeEdition(new InstallProgressListener() {
502	–	@Override
503	–	public void installProgressUpdate(int done, int total,
504	–	String step) {
505	–	evt.setProgressEnd(total);
506	–	evt.setProgressValue(done);
507	–	evt.setProgressMessage(step);
508	–	}
509	–	});
500		}
501		}
502		}
503
504	+	@DoInBackground(progressMessage = "initializingEdition.title", cancelable = false, indeterminateProgress = false)
505	+	private void initialize(final BackgroundEvent evt) {
506	+	if (!Installer.isEditionInitialized()) {
507	+	Installer.initializeEdition(new InstallProgressListener() {
508	+	@Override
509	+	public void installProgressUpdate(int done, int total,
510	+	String step) {
511	+	evt.setProgressEnd(total);
512	+	evt.setProgressValue(done);
513	+	evt.setProgressMessage(step);
514	+	}
515	+	});
516	+	}
517	+	}
518	+
519		private Vector<String> getBasicOniLaunchParams() {
520		Vector<String> params = new Vector<String>();
521		switch (Settings.getPlatform()) {

Diff Legend

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