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 773 by alloc, Mon Apr 1 12:13:33 2013 UTC vs.
Revision 804 by alloc, Fri Apr 12 15:57:57 2013 UTC

#	Line 49 | Line 49 | import net.oni2.aeinstaller.backend.oni.
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;
52	>	import net.oni2.aeinstaller.backend.oni.management.tools.ToolInstallationList;
53	>	import net.oni2.aeinstaller.backend.oni.management.tools.ToolsManager;
54		import net.oni2.aeinstaller.backend.packages.Package;
55		import net.oni2.aeinstaller.backend.packages.PackageManager;
56		import net.oni2.aeinstaller.backend.packages.Type;
#	Line 357 | Line 358 | public class MainWin extends JFrame impl
358		try {
359		dl.setVisible(true);
360		if (dl.isFinished()) {
361	<	TreeSet<Integer> installed = ToolsManager
362	<	.getInstalledTools();
361	>	ToolInstallationList til = ToolInstallationList
362	>	.getInstance();
363		TreeSet<Package> tools = new TreeSet<Package>();
364		for (Package m : execUpdates)
365	<	if (m.isTool()
365	<	&& installed.contains(m.getPackageNumber()))
365	>	if (m.isTool() && til.isInstalled(m.getPackageNumber()))
366		tools.add(m);
367		if (tools.size() > 0) {
368	+	ToolsManager.installTools(tools, true);
369		ToolsManager.installTools(tools, false);
370		}
371		}
#	Line 547 | Line 548 | public class MainWin extends JFrame impl
548		@SuppressWarnings("unused")
549		private void checkCorePackages() {
550		if (!SettingsManager.getInstance().isOfflineMode()) {
551	+	TreeSet<Package> tools = new TreeSet<Package>();
552		for (Package m : PackageManager.getInstance().getCoreTools()) {
553		if (m.isNewerAvailable()) {
554		execCoreUpdates.add(m);
555	+	tools.add(m);
556		}
557		}
558		for (Package m : PackageManager.getInstance().getCoreMods()) {
#	Line 565 | Line 568 | public class MainWin extends JFrame impl
568		dl.dispose();
569		}
570		}
571	<	ToolsManager.installTools(PackageManager.getInstance()
572	<	.getCoreTools(), false);
571	>
572	>	ToolsManager.installTools(tools, true);
573	>	ToolsManager.installTools(tools, false);
574		}
575	+	ToolsManager.verifyToolsIntegrity();
576	+	if (ToolInstallationList.getInstance().getModifiedTools().size() > 0)
577	+	System.out.println("Locally modified tools: "
578	+	+ ToolInstallationList.getInstance().getModifiedTools()
579	+	.toString());
580		}
581
582		@SuppressWarnings("unused")

Diff Legend

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