svn commit: r551035 - /roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Entries.java

[ag...@apache.org]

Author: agilliland
Date: Tue Jun 26 21:30:51 2007
New Revision: 551035

URL: http://svn.apache.org/viewvc?view=rev&rev=551035
Log:
category list should include all categories, not just children of root cat.


Modified:
    roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Entries.java

Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Entries.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Entries.java?view=diff&rev=551035&r1=551034&r2=551035
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Entries.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/Entries.java Tue Jun 26 21:30:51 2007
@@ -19,6 +19,7 @@
 package org.apache.roller.weblogger.ui.struts2.editor;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -158,6 +159,9 @@
     }
     
     
+    /**
+     * Get the list of all categories for the action weblog, not including root.
+     */
     public List<WeblogCategory> getCategories() {
         // make list of categories with first option being being a transient
         // category just meant to represent the default option of any category
@@ -168,7 +172,15 @@
         tmpCat.setPath("");
         cats.add(tmpCat);
         
-        cats.addAll(getActionWeblog().getWeblogCategories());
+        List<WeblogCategory> weblogCats = Collections.EMPTY_LIST;
+        try {
+            WeblogManager wmgr = RollerFactory.getRoller().getWeblogManager();
+            weblogCats = wmgr.getWeblogCategories(getActionWeblog(), false);
+        } catch (WebloggerException ex) {
+            log.error("Error getting category list for weblog - "+getWeblog(), ex);
+        }
+        
+        cats.addAll(weblogCats);
         
         return cats;
     }