[gatein-commits] gatein SVN: r583 - in portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui: portal and 1 other directory.

[do-not-reply at jboss.org]

Author: tan_pham_dinh
Date: 2009-11-12 23:04:11 -0500 (Thu, 12 Nov 2009)
New Revision: 583

Modified:
   portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBody.java
   portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComponentActionListener.java
Log:
GTNPORTAL-195: When change node, UIPortal still keeping obsolete page which has 'Show max window' attribute

Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBody.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBody.java	2009-11-13 03:40:52 UTC (rev 582)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBody.java	2009-11-13 04:04:11 UTC (rev 583)
@@ -96,6 +96,7 @@
          }
       }
 
+      uiPortal.setMaximizedUIComponent(null);
       if (page != null)
       {
          if (Page.DESKTOP_PAGE.equals(page.getFactoryId()))
@@ -109,8 +110,6 @@
          PortalDataMapper.toUIPage(uiPage, page);
          if (uiPage.isShowMaxWindow())
             uiPortal.setMaximizedUIComponent(uiPage);
-         else
-            uiPortal.setMaximizedUIComponent(null);
       }
       setUIComponent(uiPage);
    }

Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComponentActionListener.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComponentActionListener.java	2009-11-13 03:40:52 UTC (rev 582)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComponentActionListener.java	2009-11-13 04:04:11 UTC (rev 583)
@@ -243,6 +243,8 @@
                UIApplicationList appList = uiApp.findFirstComponentOfType(UIApplicationList.class);
                app = appList.getApplication(sourceId);
                ApplicationType applicationType = app.getType();
+               
+               //TanPD: Hardcoded to fix bug GTNPORTAL-91
                Application temp = null;
                if (applicationType.equals(ApplicationType.GADGET))
                {
@@ -279,6 +281,8 @@
 
                //
                uiPortlet.setState(new PortletState(state, applicationType));
+               
+               //TanPD: Fix bug GTNPORTAL-91
                if (temp != null && applicationType.equals(ApplicationType.PORTLET))
                {
                   UIGadget uiGadget = uiPortlet.createUIComponent(UIGadget.class, null, null);