Changeset 600 for AE/installer2/src/net/oni2/aeinstaller/backend/depot

Timestamp:

Jan 10, 2013, 12:12:01 AM (12 years ago)

Author:

alloc

Message:

 

Location:

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

Files:

• DepotManager.java (modified) (4 diffs)
• model/NodeMod.java (modified) (2 diffs)

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

@@ -18 +18 @@
 import net.oni2.aeinstaller.backend.depot.model.TaxonomyTerm;
 import net.oni2.aeinstaller.backend.depot.model.TaxonomyVocabulary;
+import net.oni2.aeinstaller.backend.mods.ECompatiblePlatform;
 import net.oni2.aeinstaller.backend.network.DrupalJSONQuery;
 
@@ -287 +288 @@
 
         /**
-         * @return Mod-Nodes
-         */
-        public Vector<NodeMod> getModPackageNodes() {
-                Vector<NodeMod> result = new Vector<NodeMod>();
-                TaxonomyTerm tt = getTaxonomyTerm(DepotConfig.getTaxonomyName_InstallType_Package());
-                if (tt == null)
-                        return result;
-
-                int packageterm_id = tt.getTid();
-
+         * Get a node by node id
+         * 
+         * @param id
+         *            Node id
+         * @return Node
+         */
+        public Node getNodeById(int id) {
+                return nodes.get(id);
+        }
+
+        /**
+         * Get a Mod-Node by a given package number
+         * 
+         * @param packageNumber
+         *            Package number to find
+         * @return The Mod-Node or null
+         */
+        public NodeMod getNodeByPackageNumber(int packageNumber) {
                 Vector<Node> files = getNodesByType(DepotConfig.getNodeType_Mod());
                 for (Node n : files) {
                         if (n instanceof NodeMod) {
                                 NodeMod nm = (NodeMod) n;
-                                if (nm.getTaxonomyTerms().get(vocabId_instmethod)
-                                                .contains(packageterm_id))
+                                if (nm.getPackageNumber() == packageNumber)
+                                        return nm;
+                        }
+                }
+                return null;
+        }
+
+        /**
+         * @return Mod-Nodes
+         */
+        public Vector<NodeMod> getModPackageNodes() {
+                Vector<NodeMod> result = new Vector<NodeMod>();
+                String instMethName = DepotConfig.getTaxonomyName_InstallType_Package();
+
+                Vector<Node> files = getNodesByType(DepotConfig.getNodeType_Mod());
+                for (Node n : files) {
+                        if (n instanceof NodeMod) {
+                                NodeMod nm = (NodeMod) n;
+                                if (nm.getInstallMethod().getName()
+                                                .equalsIgnoreCase(instMethName))
                                         result.add(nm);
                         }
@@ -317 +344 @@
          */
         public boolean isModValidOnPlatform(NodeMod node, Settings.Platform platform) {
-                int termId = node.getTaxonomyTerms().get(vocabId_platform).iterator()
-                                .next();
-                String validPlatform = getTaxonomyTerm(termId).getName();
-                if (validPlatform.equalsIgnoreCase(DepotConfig.getTaxonomyName_Platform_Both()))
-                        return true;
-
-                if ((platform == Platform.WIN) || (platform == Platform.LINUX))
-                        return validPlatform.equalsIgnoreCase(DepotConfig.getTaxonomyName_Platform_Win());
-                else if (platform == Platform.MACOS)
-                        return validPlatform.equalsIgnoreCase(DepotConfig.getTaxonomyName_Platform_Mac());
-                else
-                        return false;
+                ECompatiblePlatform plat = node.getPlatform();
+                switch (plat) {
+                        case BOTH:
+                                return true;
+                        case WIN:
+                                return (platform == Platform.WIN)
+                                                || (platform == Platform.LINUX);
+                        case MACOS:
+                                return (platform == Platform.MACOS);
+                }
+                return false;
         }
 
@@ -344 +370 @@
          */
         public boolean isModOfType(NodeMod node, HashSet<Integer> type, boolean or) {
-                boolean matching = true;
-                if (or)
-                        matching = false;
+                boolean matching = !or;
+                HashSet<TaxonomyTerm> terms = node.getTypes();
 
                 for (int t : type) {
                         if (or)
-                                matching |= node.getTaxonomyTerms().get(vocabId_type)
-                                                .contains(t);
+                                matching |= terms.contains(t);
                         else
-                                matching &= node.getTaxonomyTerms().get(vocabId_type)
-                                                .contains(t);
+                                matching &= terms.contains(t);
                 }
                 return matching;
+        }
+
+        /**
+         * @return VocabId of Platform vocabulary
+         */
+        public int getVocabIdPlatform() {
+                return vocabId_platform;
+        }
+
+        /**
+         * @return VocabId of Install method vocabulary
+         */
+        public int getVocabIdInstMethod() {
+                return vocabId_instmethod;
+        }
+
+        /**
+         * @return VocabId of Type vocabulary
+         */
+        public int getVocabIdType() {
+                return vocabId_type;
+        }
+
+        /**
+         * @param id
+         *            ID of file to get
+         * @return the file
+         */
+        public File getFile(int id) {
+                return files.get(id);
         }
 

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

@@ -4 +4 @@
 import java.util.HashSet;
 import java.util.Vector;
+
+import net.oni2.aeinstaller.backend.depot.DepotConfig;
+import net.oni2.aeinstaller.backend.depot.DepotManager;
+import net.oni2.aeinstaller.backend.mods.ECompatiblePlatform;
 
 import org.json.JSONArray;
@@ -74 +78 @@
 
         /**
-         * @return the taxonomyTerms
+         * @return Types
          */
-        public HashMap<Integer, HashSet<Integer>> getTaxonomyTerms() {
-                return taxonomyTerms;
+        public HashSet<TaxonomyTerm> getTypes() {
+                HashSet<TaxonomyTerm> tt = new HashSet<TaxonomyTerm>();
+                for (int t : taxonomyTerms.get(DepotManager.getInstance()
+                                .getVocabIdType())) {
+                        tt.add(DepotManager.getInstance().getTaxonomyTerm(t));
+                }
+                return tt;
         }
 
         /**
-         * @return the fields
+         * @return Install method
          */
-        public HashMap<String, String> getFields() {
-                return fields;
+        public TaxonomyTerm getInstallMethod() {
+                return DepotManager.getInstance().getTaxonomyTerm(
+                                taxonomyTerms
+                                                .get(DepotManager.getInstance().getVocabIdInstMethod())
+                                                .iterator().next());
+        }
+
+        /**
+         * @return Compatible platform
+         */
+        public ECompatiblePlatform getPlatform() {
+                TaxonomyTerm term = DepotManager.getInstance().getTaxonomyTerm(
+                                taxonomyTerms
+                                                .get(DepotManager.getInstance().getVocabIdPlatform())
+                                                .iterator().next());
+
+                String validPlatform = term.getName();
+                if (validPlatform.equalsIgnoreCase(DepotConfig
+                                .getTaxonomyName_Platform_Both()))
+                        return ECompatiblePlatform.BOTH;
+                if (validPlatform.equalsIgnoreCase(DepotConfig
+                                .getTaxonomyName_Platform_Win()))
+                        return ECompatiblePlatform.WIN;
+                if (validPlatform.equalsIgnoreCase(DepotConfig
+                                .getTaxonomyName_Platform_Mac()))
+                        return ECompatiblePlatform.MACOS;
+
+                return null;
+        }
+
+        /**
+         * @return Creator of mod
+         */
+        public String getCreator() {
+                if (fields.get("creator") != null)
+                        return fields.get("creator");
+                else
+                        return "";
+        }
+
+        /**
+         * @return Version of mod
+         */
+        public String getVersion() {
+                if (fields.get("version") != null)
+                        return fields.get("version");
+                else
+                        return "";
+        }
+
+        /**
+         * @return Package number
+         */
+        public int getPackageNumber() {
+                return Integer.parseInt(fields.get("package_number"));
         }
 }