[jboss-svn-commits] JBL Code SVN: r32872 - labs/jbosslabs/labs-3.0-build/integration/sbs-projectinfo/trunk/src/main/java/org/jboss/labs/sbs/plugin/projectinfo.

[jboss-svn-commits at lists.jboss.org]

Author: lkrzyzanek
Date: 2010-05-13 10:40:33 -0400 (Thu, 13 May 2010)
New Revision: 32872

Modified:
   labs/jbosslabs/labs-3.0-build/integration/sbs-projectinfo/trunk/src/main/java/org/jboss/labs/sbs/plugin/projectinfo/ProjectInfoManagerImpl.java
Log:
ORG-517: Tuned usage of navigation cache

Modified: labs/jbosslabs/labs-3.0-build/integration/sbs-projectinfo/trunk/src/main/java/org/jboss/labs/sbs/plugin/projectinfo/ProjectInfoManagerImpl.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs-projectinfo/trunk/src/main/java/org/jboss/labs/sbs/plugin/projectinfo/ProjectInfoManagerImpl.java	2010-05-13 14:30:26 UTC (rev 32871)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-projectinfo/trunk/src/main/java/org/jboss/labs/sbs/plugin/projectinfo/ProjectInfoManagerImpl.java	2010-05-13 14:40:33 UTC (rev 32872)
@@ -21,6 +21,9 @@
  */
 package org.jboss.labs.sbs.plugin.projectinfo;
 
+import org.apache.log4j.LogManager;
+import org.apache.log4j.Logger;
+
 import com.jivesoftware.community.JiveContainer;
 import com.jivesoftware.community.cache.Cache;
 
@@ -31,8 +34,7 @@
  */
 public class ProjectInfoManagerImpl implements ProjectInfoManager {
 
-  // private static final Logger log =
-  // LogManager.getLogger(ProjectInfoManagerImpl.class);
+  private static final Logger log = LogManager.getLogger(ProjectInfoManagerImpl.class);
 
   /**
    * A cache for HF URL titles.<br>
@@ -43,16 +45,16 @@
 
   @Override
   public String getSpaceNavigation(JiveContainer container) {
-    if (container.getParentContainer() == null) {
+    JiveContainer projectSpace = getProjectSpace(container);
+    if (projectSpace == null) {
+      // incorrect space (e.g. root)
       return null;
     }
-    String navigation = spaceNavigationCache.get(container.getID());
+    String navigation = spaceNavigationCache.get(projectSpace.getID());
 
     if (navigation == null) {
-      JiveContainer projectSpace = getProjectSpace(container);
-      if (projectSpace == null) {
-        // incorrect space (e.g. root)
-        return null;
+      if (log.isDebugEnabled()) {
+        log.debug("Retrieve project navigation for project: " + projectSpace.getDisplayName());
       }
       // TODO retrieve navigation from WS and put value to cache
       navigation = "TODO: Call Magnolia's WS for project: " + projectSpace.getDisplayName();