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

Timestamp:

Jan 10, 2013, 5:25:51 PM (12 years ago)

Author:

alloc

Message:

AEI2

Location:

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

Files:

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

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

@@ -87 +87 @@
 
                         // Get taxonomy vocabulary
-                        listener.cacheUpdateProgress("Updating taxonomy vocabulary", 0, 100);
+                        if (listener != null)
+                                listener.cacheUpdateProgress("Updating taxonomy vocabulary", 0,
+                                                100);
                         page = 0;
                         do {
@@ -100 +102 @@
 
                         // Get taxonomy terms
-                        listener.cacheUpdateProgress("Updating taxonomy terms", 0, 100);
+                        if (listener != null)
+                                listener.cacheUpdateProgress("Updating taxonomy terms", 0, 100);
                         page = 0;
                         do {
@@ -113 +116 @@
 
                         // Check nodes for new information
-                        listener.cacheUpdateProgress("Checking for new/updated nodes", 1,
-                                        100);
+                        if (listener != null)
+                                listener.cacheUpdateProgress("Checking for new/updated nodes",
+                                                1, 100);
                         HashSet<Integer> nodesToUpdate = new HashSet<Integer>();
                         page = 0;
@@ -142 +146 @@
 
                         // Check files for new stuff
-                        listener.cacheUpdateProgress("Checking for new/updated files", 2,
-                                        100);
+                        if (listener != null)
+                                listener.cacheUpdateProgress("Checking for new/updated files",
+                                                2, 100);
                         HashSet<Integer> filesToUpdate = new HashSet<Integer>();
                         page = 0;
@@ -168 +173 @@
                         // Update nodes with new information
                         for (int nid : nodesToUpdate) {
-                                listener.cacheUpdateProgress("Updating nodes", step++, total);
+                                if (listener != null)
+                                        listener.cacheUpdateProgress("Updating nodes", step++,
+                                                        total);
 
                                 ja = DrupalJSONQuery.getItem("node", nid, "");
@@ -188 +195 @@
                         // Update new files
                         for (int fid : filesToUpdate) {
-                                listener.cacheUpdateProgress("Updating files", step++, total);
+                                if (listener != null)
+                                        listener.cacheUpdateProgress("Updating files", step++,
+                                                        total);
 
                                 ja = DrupalJSONQuery.getItem("file", fid, "&file_contents=0");

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

@@ -148 +148 @@
                 return Integer.parseInt(fields.get("package_number"));
         }
+
+        /**
+         * @return Is this mod a tool?
+         */
+        public boolean isTool() {
+                TaxonomyTerm tt = DepotManager.getInstance().getTaxonomyTerm(
+                                DepotConfig.getTaxonomyName_ModType_Tool());
+                return getTypes().contains(tt);
+        }
 }