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

Timestamp:

Dec 29, 2012, 5:01:15 PM (12 years ago)

Author:

alloc

Message:

AEI - Current state

Location:

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

Files:

• DepotConfig.java (modified) (1 diff)
• DepotManager.java (modified) (4 diffs)
• model/NodeMod.java (modified) (1 diff)

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

@@ -5 +5 @@
  */
 public class DepotConfig {
-        /**
-         * Type-value of nodes which contain Mods
-         */
-        public static final String NODETYPE_MOD = "mod";
 
         /**
-         * Vocabulary name for platform field
+         * @return Type-value of nodes which contain Mods
          */
-        public static final String PLATFORM_VOCAB = "Platform";
-        /**
-         * Vocabulary name for installtype field
-         */
-        public static final String INSTALLTYPE_VOCAB = "Install method";
-        /**
-         * Vocabulary name for modtype field
-         */
-        public static final String MODTYPE_VOCAB = "Mod type";
-        
-        /**
-         * Taxonomy term name for platform value Win
-         */
-        public static final String PLATFORM_WIN = "Windows";
-        /**
-         * Taxonomy term name for platform value Mac
-         */
-        public static final String PLATFORM_MAC = "Mac OS";
-        /**
-         * Taxonomy term name for platform value Both
-         */
-        public static final String PLATFORM_BOTH = "Both";
+        public static String getNodeType_Mod() {
+                return "mod";
+        }
 
         /**
-         * Taxonomy term name for installtype Package
+         * @return Vocabulary name for platform field
          */
-        public static final String INSTALLTYPE_PACKAGE = "Package";
+        public static String getVocabularyName_Platform() {
+                return "Platform";
+        }
+
+        /**
+         * @return Vocabulary name for installtype field
+         */
+        public static String getVocabularyName_InstallType() {
+                return "Install method";
+        }
+
+        /**
+         * @return Vocabulary name for modtype field
+         */
+        public static String getVocabularyName_ModType() {
+                return "Mod type";
+        }
+
+        /**
+         * @return Taxonomy term name for platform value Win
+         */
+        public static String getTaxonomyName_Platform_Win() {
+                return "Windows";
+        }
+
+        /**
+         * @return Taxonomy term name for platform value Mac
+         */
+        public static String getTaxonomyName_Platform_Mac() {
+                return "Mac OS";
+        }
+
+        /**
+         * @return Taxonomy term name for platform value Both
+         */
+        public static String getTaxonomyName_Platform_Both() {
+                return "Both";
+        }
+
+        /**
+         * @return Taxonomy term name for installtype Package
+         */
+        public static String getTaxonomyName_InstallType_Package() {
+                return "Package";
+        }
 }

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

@@ -174 +174 @@
 
                                 Node n = null;
-                                if (type.equalsIgnoreCase(DepotConfig.NODETYPE_MOD))
+                                if (type.equalsIgnoreCase(DepotConfig.getNodeType_Mod()))
                                         n = new NodeMod(jo);
                                 else
@@ -196 +196 @@
                         }
 
-                        vocabId_type = getVocabulary(DepotConfig.MODTYPE_VOCAB).getVid();
-                        vocabId_platform = getVocabulary(DepotConfig.PLATFORM_VOCAB)
-                                        .getVid();
-                        vocabId_instmethod = getVocabulary(DepotConfig.INSTALLTYPE_VOCAB)
-                                        .getVid();
+                        vocabId_type = getVocabulary(
+                                        DepotConfig.getVocabularyName_ModType()).getVid();
+                        vocabId_platform = getVocabulary(
+                                        DepotConfig.getVocabularyName_Platform()).getVid();
+                        vocabId_instmethod = getVocabulary(
+                                        DepotConfig.getVocabularyName_InstallType()).getVid();
                 } catch (JSONException e) {
                         e.printStackTrace();
@@ -289 +290 @@
          */
         public Vector<NodeMod> getModPackageNodes() {
-                int packageterm_id = getTaxonomyTerm(DepotConfig.INSTALLTYPE_PACKAGE)
-                                .getTid();
-
-                Vector<Node> files = getNodesByType(DepotConfig.NODETYPE_MOD);
                 Vector<NodeMod> result = new Vector<NodeMod>();
+                TaxonomyTerm tt = getTaxonomyTerm(DepotConfig.getTaxonomyName_InstallType_Package());
+                if (tt == null)
+                        return result;
+
+                int packageterm_id = tt.getTid();
+
+                Vector<Node> files = getNodesByType(DepotConfig.getNodeType_Mod());
                 for (Node n : files) {
                         if (n instanceof NodeMod) {
@@ -316 +320 @@
                                 .next();
                 String validPlatform = getTaxonomyTerm(termId).getName();
-                if (validPlatform.equalsIgnoreCase(DepotConfig.PLATFORM_BOTH))
+                if (validPlatform.equalsIgnoreCase(DepotConfig.getTaxonomyName_Platform_Both()))
                         return true;
 
                 if ((platform == Platform.WIN) || (platform == Platform.LINUX))
-                        return validPlatform.equalsIgnoreCase(DepotConfig.PLATFORM_WIN);
+                        return validPlatform.equalsIgnoreCase(DepotConfig.getTaxonomyName_Platform_Win());
                 else if (platform == Platform.MACOS)
-                        return validPlatform.equalsIgnoreCase(DepotConfig.PLATFORM_MAC);
+                        return validPlatform.equalsIgnoreCase(DepotConfig.getTaxonomyName_Platform_Mac());
                 else
                         return false;

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

@@ -32 +32 @@
                                 NodeField_Upload up = new NodeField_Upload(
                                                 jUploads.getJSONObject(i));
-                                uploads.add(up);
+                                if (up.getDisplay() != 0) {
+                                        uploads.add(up);
+                                }
                         }
                 }