Changeset 635 for AE/installer2/src/net/oni2/aeinstaller/backend/depot/model

Timestamp:

Jan 19, 2013, 4:04:27 PM (12 years ago)

Author:

alloc

Message:

AEI2:

• Refactorings

File:

• AE/installer2/src/net/oni2/aeinstaller/backend/depot/model/NodeMod.java (modified) (6 diffs)

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

@@ -18 +18 @@
 public class NodeMod extends Node {
         private Vector<NodeField_Upload> uploads = new Vector<NodeField_Upload>();
-        private HashMap<Integer, HashSet<Integer>> taxonomyTerms = new HashMap<Integer, HashSet<Integer>>();
+        private HashMap<Integer, HashSet<TaxonomyTerm>> taxonomyTerms = new HashMap<Integer, HashSet<TaxonomyTerm>>();
         private HashMap<String, String> fields = new HashMap<String, String>();
 
@@ -58 +58 @@
                                 int vid = Integer
                                                 .parseInt(keyS.substring(keyS.lastIndexOf("_") + 1));
-                                HashSet<Integer> values = new HashSet<Integer>();
+                                HashSet<TaxonomyTerm> values = new HashSet<TaxonomyTerm>();
                                 if (val instanceof JSONObject) {
                                         JSONArray ja = ((JSONObject) val).getJSONArray("und");
                                         for (int i = 0; i < ja.length(); i++) {
-                                                values.add(ja.getJSONObject(i).getInt("tid"));
+                                                values.add(DepotManager.getInstance().getTaxonomyTerm(
+                                                                ja.getJSONObject(i).getInt("tid")));
                                         }
                                 }
@@ -81 +82 @@
          */
         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 taxonomyTerms.get(DepotManager.getInstance().getVocabIdType());
         }
 
@@ -93 +89 @@
          */
         public TaxonomyTerm getInstallMethod() {
-                return DepotManager.getInstance().getTaxonomyTerm(
-                                taxonomyTerms
-                                                .get(DepotManager.getInstance().getVocabIdInstMethod())
-                                                .iterator().next());
+                return taxonomyTerms
+                                .get(DepotManager.getInstance().getVocabIdInstMethod())
+                                .iterator().next();
         }
 
@@ -103 +98 @@
          */
         public ECompatiblePlatform getPlatform() {
-                TaxonomyTerm term = DepotManager.getInstance().getTaxonomyTerm(
-                                taxonomyTerms
-                                                .get(DepotManager.getInstance().getVocabIdPlatform())
-                                                .iterator().next());
+                TaxonomyTerm term = taxonomyTerms
+                                .get(DepotManager.getInstance().getVocabIdPlatform())
+                                .iterator().next();
 
                 String validPlatform = term.getName();
@@ -155 +149 @@
                 HashSet<TaxonomyTerm> types = getTypes();
                 for (String s : DepotConfig.getTaxonomyName_ModType_Tool()) {
-                        TaxonomyTerm tt = DepotManager.getInstance().getTaxonomyTerm(s);
-                        if (types.contains(tt))
-                                return true;
+                        for (TaxonomyTerm tt : types)
+                                if (tt.getName().equalsIgnoreCase(s))
+                                        return true;
                 }
                 return false;