[gatein-commits] gatein SVN: r2031 - portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal.

[do-not-reply at jboss.org]

Author: trong.tran
Date: 2010-03-08 04:05:11 -0500 (Mon, 08 Mar 2010)
New Revision: 2031

Modified:
   portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortal.java
   portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java
Log:
GTNPORTAL-809 Fix a minor cache issue at UI level

Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortal.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortal.java	2010-03-08 04:43:50 UTC (rev 2030)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortal.java	2010-03-08 09:05:11 UTC (rev 2031)
@@ -257,7 +257,7 @@
       
       //Refresh locale
       Locale locale = Util.getUIPortalApplication().getLocale();
-      refreshNavigation(locale);
+      localizePageNavigation(navigation, locale);
    }
    
    public synchronized void setSelectedNode(PageNode node)
@@ -422,39 +422,7 @@
    {
       setProperty(PortalProperties.SESSION_ALIVE, type);
    }
-
-   /*
-   @Deprecated
-   public void refreshNavigation()
-   {
-      ResourceBundleManager mgr = getApplicationComponent(ResourceBundleManager.class);
-      for (PageNavigation nav : navigations)
-      {
-         if (nav.getOwnerType().equals(PortalConfig.USER_TYPE))
-            continue;
-         ResourceBundle res = mgr.getNavigationResourceBundle(locale, nav.getOwnerType(), nav.getOwnerId());
-         for (PageNode node : nav.getNodes())
-         {
-            resolveLabel(res, node);
-         }
-      }
-   }
-   */
    
-   /*
-   public void refreshNavigation(Locale locale)
-   {
-      for (PageNavigation nav : navigations)
-      {
-         localizePageNavigation(nav,locale);
-      }
-   }
-   */
-   public void refreshNavigation(Locale locale)
-   {
-      localizePageNavigation(navigation, locale);
-   }
-
    private void localizePageNavigation(PageNavigation nav,Locale locale)
    {
       ResourceBundleManager mgr = getApplicationComponent(ResourceBundleManager.class);

Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java	2010-03-08 04:43:50 UTC (rev 2030)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java	2010-03-08 09:05:11 UTC (rev 2031)
@@ -466,6 +466,7 @@
 
             //Update the cache of UIPortal from UIPortalApplication
             uiPortalApp.updateCachedUIPortal(uiPortal);
+            uiPortalApp.setShowedUIPortal(uiPortal);
             
             //To init the UIPage, that fixed a bug on AdminToolbarPortlet when edit the layout. Here is only a
             //temporal solution. Complete solution is to avoid mapping UIPortal -- model, that requires