Changeset 804 for java/installer2/src/net/oni2/aeinstaller/gui/MainWin.java

Timestamp:

Apr 12, 2013, 5:57:57 PM (12 years ago)

Author:

alloc

Message:

AEI2.02:

• Fixes #5 and #14

File:

• java/installer2/src/net/oni2/aeinstaller/gui/MainWin.java (modified) (4 diffs)

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

@@ -50 +50 @@
 import net.oni2.aeinstaller.backend.oni.management.InstallProgressListener;
 import net.oni2.aeinstaller.backend.oni.management.Installer;
-import net.oni2.aeinstaller.backend.oni.management.ToolsManager;
+import net.oni2.aeinstaller.backend.oni.management.tools.ToolInstallationList;
+import net.oni2.aeinstaller.backend.oni.management.tools.ToolsManager;
 import net.oni2.aeinstaller.backend.packages.Package;
 import net.oni2.aeinstaller.backend.packages.PackageManager;
@@ -358 +359 @@
                                 dl.setVisible(true);
                                 if (dl.isFinished()) {
-                                        TreeSet<Integer> installed = ToolsManager
-                                                        .getInstalledTools();
+                                        ToolInstallationList til = ToolInstallationList
+                                                        .getInstance();
                                         TreeSet<Package> tools = new TreeSet<Package>();
                                         for (Package m : execUpdates)
-                                                if (m.isTool()
-                                                                && installed.contains(m.getPackageNumber()))
+                                                if (m.isTool() && til.isInstalled(m.getPackageNumber()))
                                                         tools.add(m);
                                         if (tools.size() > 0) {
+                                                ToolsManager.installTools(tools, true);
                                                 ToolsManager.installTools(tools, false);
                                         }
@@ -548 +549 @@
         private void checkCorePackages() {
                 if (!SettingsManager.getInstance().isOfflineMode()) {
+                        TreeSet<Package> tools = new TreeSet<Package>();
                         for (Package m : PackageManager.getInstance().getCoreTools()) {
                                 if (m.isNewerAvailable()) {
                                         execCoreUpdates.add(m);
+                                        tools.add(m);
                                 }
                         }
@@ -566 +569 @@
                                 }
                         }
-                        ToolsManager.installTools(PackageManager.getInstance()
-                                        .getCoreTools(), false);
-                }
+
+                        ToolsManager.installTools(tools, true);
+                        ToolsManager.installTools(tools, false);
+                }
+                ToolsManager.verifyToolsIntegrity();
+                if (ToolInstallationList.getInstance().getModifiedTools().size() > 0)
+                        System.out.println("Locally modified tools: "
+                                        + ToolInstallationList.getInstance().getModifiedTools()
+                                                        .toString());
         }