Changeset 626 for AE/installer2/src/net/oni2/aeinstaller/backend

Timestamp:

Jan 17, 2013, 8:52:55 PM (12 years ago)

Author:

alloc

Message:

AEI2 0.86:

• Added patch-type to tools

Location:

AE/installer2/src/net/oni2/aeinstaller/backend

Files:

• depot/DepotConfig.java (modified) (2 diffs)
• depot/model/NodeMod.java (modified) (1 diff)
• mods/ModManager.java (modified) (2 diffs)

AE/installer2/src/net/oni2/aeinstaller/backend/depot/DepotConfig.java

@@ -1 +1 @@
 package net.oni2.aeinstaller.backend.depot;
+
+import java.util.TreeSet;
 
 import net.oni2.aeinstaller.backend.Settings;
@@ -65 +67 @@
 
         /**
-         * @return Taxonomy term name for modtype Tool
+         * @return Taxonomy term names for mods of type Tool
          */
-        public static String getTaxonomyName_ModType_Tool() {
-                return "Tool";
+        public static TreeSet<String> getTaxonomyName_ModType_Tool() {
+                TreeSet<String> res = new TreeSet<String>();
+                res.add("Tool");
+                res.add("Patch");
+                return res;
         }
 

AE/installer2/src/net/oni2/aeinstaller/backend/depot/model/NodeMod.java

@@ -153 +153 @@
          */
         public boolean isTool() {
-                TaxonomyTerm tt = DepotManager.getInstance().getTaxonomyTerm(
-                                DepotConfig.getTaxonomyName_ModType_Tool());
-                return getTypes().contains(tt);
+                HashSet<TaxonomyTerm> types = getTypes();
+                for (String s : DepotConfig.getTaxonomyName_ModType_Tool()) {
+                        TaxonomyTerm tt = DepotManager.getInstance().getTaxonomyTerm(s);
+                        if (types.contains(tt))
+                                return true;
+                }
+                return false;
         }
 }

AE/installer2/src/net/oni2/aeinstaller/backend/mods/ModManager.java

@@ -10 +10 @@
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.TreeMap;
 import java.util.TreeSet;
 import java.util.Vector;
@@ -208 +209 @@
          * @return Collection of tools valid on this platform and not mandatory
          */
-        public Collection<Mod> getTools() {
-                Vector<Mod> res = new Vector<Mod>();
+        public TreeMap<String, Mod> getTools() {
+                TreeMap<String, Mod> res = new TreeMap<String, Mod>();
                 for (Mod m : tools.values())
                         if (m.isValidOnPlatform() && !m.isMandatoryMod())
-                                res.add(m);
+                                res.put(m.getName(), m);
                 return res;
         }