Changeset 804 for java/installer2/src/net/oni2/aeinstaller/backend/packages

Timestamp:

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

Author:

alloc

Message:

AEI2.02:

• Fixes #5 and #14

Location:

java/installer2/src/net/oni2/aeinstaller/backend/packages

Files:

• Package.java (modified) (2 diffs)
• PackageManager.java (modified) (4 diffs)

java/installer2/src/net/oni2/aeinstaller/backend/packages/Package.java

@@ -14 +14 @@
 import net.oni2.aeinstaller.backend.CaseInsensitiveFile;
 import net.oni2.aeinstaller.backend.Paths;
-import net.oni2.aeinstaller.backend.oni.management.ToolsManager;
+import net.oni2.aeinstaller.backend.oni.management.tools.ToolInstallationList;
 import net.oni2.moddepot.DepotConfig;
 import net.oni2.moddepot.ECompatiblePlatform;
@@ -230 +230 @@
         public boolean isInstalled() {
                 if (tool)
-                        return ToolsManager.getInstalledTools().contains(packageNumber);
+                        return ToolInstallationList.getInstance().isInstalled(packageNumber);
                 else
                         return PackageManager.getInstance().isModInstalled(this);

java/installer2/src/net/oni2/aeinstaller/backend/packages/PackageManager.java

@@ -14 +14 @@
 
 import net.oni2.aeinstaller.backend.Paths;
+import net.oni2.aeinstaller.backend.oni.management.Installer;
+import net.oni2.aeinstaller.backend.oni.management.tools.ToolInstallationList;
 import net.oni2.moddepot.DepotManager;
 import net.oni2.moddepot.model.NodeMod;
 import net.oni2.moddepot.model.TaxonomyTerm;
-import net.oni2.aeinstaller.backend.oni.management.Installer;
-import net.oni2.aeinstaller.backend.oni.management.ToolsManager;
 
 import com.thoughtworks.xstream.XStream;
@@ -266 +266 @@
         public TreeSet<Package> getInstalledTools() {
                 TreeSet<Package> res = new TreeSet<Package>();
-                for (int n : ToolsManager.getInstalledTools()) {
+                for (int n : ToolInstallationList.getInstance().getItems().keySet()) {
                         res.add(getPackageByNumber(n));
                 }
@@ -301 +301 @@
                         for (int depNum : m.getDependencies()) {
                                 Package other = getPackageByNumber(depNum);
-                                if (!mods.contains(other)) {
-                                        if (!res.containsKey(m))
-                                                res.put(m, new HashSet<Package>());
-                                        res.get(m).add(other);
+                                if (other != null) {
+                                        if (!mods.contains(other)) {
+                                                if (!res.containsKey(m))
+                                                        res.put(m, new HashSet<Package>());
+                                                res.get(m).add(other);
+                                        }
                                 }
                         }
@@ -326 +328 @@
                         for (int confNum : m.getIncompabitilities()) {
                                 Package other = getPackageByNumber(confNum);
-                                if (mods.contains(other)) {
-                                        if (!res.containsKey(m))
-                                                res.put(m, new HashSet<Package>());
-                                        res.get(m).add(other);
+                                if (other != null) {
+                                        if (mods.contains(other)) {
+                                                if (!res.containsKey(m))
+                                                        res.put(m, new HashSet<Package>());
+                                                res.get(m).add(other);
+                                        }
                                 }
                         }