ViewVC Help

View File | Revision Log | View Changeset | Root Listing

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

Comparing java/installer2/src/net/oni2/aeinstaller/gui/MainWin.java (file contents):
Revision 722 by alloc, Thu Mar 21 11:41:22 2013 UTC vs.
Revision 749 by alloc, Tue Mar 26 17:26:41 2013 UTC

#	Line 44 | Line 44 | import net.oni2.aeinstaller.AEInstaller2
44		import net.oni2.aeinstaller.backend.ImageResizer;
45		import net.oni2.aeinstaller.backend.Paths;
46		import net.oni2.aeinstaller.backend.SizeFormatter;
47	–	import net.oni2.aeinstaller.backend.depot.DepotManager;
48	–	import net.oni2.aeinstaller.backend.oni.InstallProgressListener;
49	–	import net.oni2.aeinstaller.backend.oni.Installer;
47		import net.oni2.aeinstaller.backend.oni.OniLauncher;
48		import net.oni2.aeinstaller.backend.oni.OniSplit;
49	+	import net.oni2.aeinstaller.backend.oni.management.Initializer;
50	+	import net.oni2.aeinstaller.backend.oni.management.InstallProgressListener;
51	+	import net.oni2.aeinstaller.backend.oni.management.Installer;
52	+	import net.oni2.aeinstaller.backend.oni.management.ToolsManager;
53		import net.oni2.aeinstaller.backend.packages.Package;
54		import net.oni2.aeinstaller.backend.packages.PackageManager;
55		import net.oni2.aeinstaller.backend.packages.Type;
#	Line 66 | Line 67 | import net.oni2.aeinstaller.gui.modtable
67		import net.oni2.aeinstaller.gui.packageinfobox.PackageInfoBox;
68		import net.oni2.aeinstaller.gui.settings.SettingsDialog;
69		import net.oni2.aeinstaller.gui.toolmanager.ToolManager;
70	+	import net.oni2.moddepot.DepotManager;
71		import net.oni2.platformtools.PlatformInformation;
72		import net.oni2.platformtools.PlatformInformation.Platform;
73		import net.oni2.platformtools.applicationinvoker.ApplicationInvoker;
#	Line 204 | Line 206 | public class MainWin extends JFrame impl
206
207		@DoInBackground(progressMessage = "updateDepot.title", cancelable = false, indeterminateProgress = false)
208		private void execDepotUpdate(final BackgroundEvent evt) {
209	+	DepotManager.loadFromCacheFile(Paths.getDepotCacheFilename());
210	+
211		if (!SettingsManager.getInstance().isOfflineMode()
212		&& !SettingsManager.getInstance().isNoCacheUpdateMode()) {
213		long start = new Date().getTime();
214
215	<	try {
216	<	DepotManager.getInstance().updateInformation();
217	<	} catch (Exception e) {
214	<	e.printStackTrace();
215	<	}
215	>	if (DepotManager.getInstance().updateInformation())
216	>	DepotManager.getInstance().saveToCacheFile(
217	>	Paths.getDepotCacheFilename());
218
219		System.out.println("Took: " + (new Date().getTime() - start)
220		+ " msec");
#	Line 359 | Line 361 | public class MainWin extends JFrame impl
361		try {
362		dl.setVisible(true);
363		if (dl.isFinished()) {
364	<	TreeSet<Integer> installed = Installer.getInstalledTools();
364	>	TreeSet<Integer> installed = ToolsManager
365	>	.getInstalledTools();
366		TreeSet<Package> tools = new TreeSet<Package>();
367		for (Package m : execUpdates)
368		if (m.isTool()
369		&& installed.contains(m.getPackageNumber()))
370		tools.add(m);
371		if (tools.size() > 0) {
372	<	Installer.installTools(tools, false);
372	>	ToolsManager.installTools(tools, false);
373		}
374		}
375		} finally {
#	Line 460 | Line 463 | public class MainWin extends JFrame impl
463
464		@DoInBackground(progressMessage = "initializingEdition.title", cancelable = false, indeterminateProgress = false)
465		private void reglobalize(final BackgroundEvent evt) {
466	<	Installer.initializeEdition(new InstallProgressListener() {
466	>	Initializer.initializeEdition(new InstallProgressListener() {
467		@Override
468		public void installProgressUpdate(int done, int total, String step) {
469		evt.setProgressEnd(total);
#	Line 579 | Line 582 | public class MainWin extends JFrame impl
582		}
583		}
584		evt.setProgressMessage(bundle.getString("coreToolsInstall.title"));
585	<	Installer.installTools(PackageManager.getInstance().getCoreTools(),
586	<	false);
585	>	ToolsManager.installTools(PackageManager.getInstance()
586	>	.getCoreTools(), false);
587		}
588		}
589
#	Line 730 | Line 733 | public class MainWin extends JFrame impl
733		}
734
735		if (actuallyTools.size() > 0) {
736	<	Installer.installTools(actuallyTools, false);
736	>	ToolsManager.installTools(actuallyTools, false);
737		}
738		}
739		}
#	Line 846 | Line 849 | public class MainWin extends JFrame impl
849		@DoInBackground(progressMessage = "initializingEdition.title", cancelable = false, indeterminateProgress = false)
850		private void initialize(final BackgroundEvent evt) {
851		if (!Installer.isEditionInitialized()) {
852	<	Installer.initializeEdition(new InstallProgressListener() {
852	>	Initializer.initializeEdition(new InstallProgressListener() {
853		@Override
854		public void installProgressUpdate(int done, int total,
855		String step) {

Diff Legend

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