[gatein-commits] gatein SVN: r6884 - in epp/portal/branches/EPP_5_2_Branch: component and 10 other directories.

Author: theute Date: 2011-07-18 18:13:58 -0400 (Mon, 18 Jul 2011) New Revision: 6884 Added: epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/container/UIColumnContainer.java Modified: epp/portal/branches/EPP_5_2_Branch/ epp/portal/branches/EPP_5_2_Branch/component/ epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIUserInfo.java epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletActionListener.java epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletForm.java epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/container/UIContainerForm.java epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationManagement.java epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationNodeSelector.java epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIPageNodeSelector.java epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageActionListener.java epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageWizard.java epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UILanguageSelector.java epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalActionListener.java epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComponentActionListener.java epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UISkinSelector.java epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/util/ToolbarUtils.java epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/util/Util.java epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMainActionListener.java epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIPortalApplicationLifecycle.java Log: JBEPP-1014 Rename the confusing methods setFullRender/getFullRender in PortalRequestContext Property changes on: epp/portal/branches/EPP_5_2_Branch ___________________________________________________________________ Modified: svn:mergeinfo - /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795:5868 /portal/branches/branch-GTNPORTAL-1592:4894 /portal/branches/branch-GTNPORTAL-1643:5002,5063,5167 /portal/branches/branch-GTNPORTAL-1700:5348,5363,5402,5445 /portal/branches/branch-GTNPORTAL-1731:5668 /portal/branches/branch-GTNPORTAL-1745:5765 /portal/branches/branch-GTNPORTAL-1822:5943,5952 /portal/branches/branch-GTNPORTAL-1832:6030,6063 /portal/branches/branch-GTNPORTAL-1872:6400 /portal/branches/decoupled-webos:6214-6243 /portal/branches/global-portlet-metadata:6298-6384 /portal/branches/site-describability:6171-6235 /portal/trunk:4891,5744,5822,5943,6168,6196,6201-6203,6205-6206,6437,6440,6449,6452,6573 + /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795:5868 /portal/branches/branch-GTNPORTAL-1592:4894 /portal/branches/branch-GTNPORTAL-1643:5002,5063,5167 /portal/branches/branch-GTNPORTAL-1700:5348,5363,5402,5445 /portal/branches/branch-GTNPORTAL-1731:5622,5668 /portal/branches/branch-GTNPORTAL-1745:5765 /portal/branches/branch-GTNPORTAL-1822:5943,5952 /portal/branches/branch-GTNPORTAL-1832:6030,6063 /portal/branches/branch-GTNPORTAL-1872:6400 /portal/branches/decoupled-webos:6214-6243 /portal/branches/global-portlet-metadata:6298-6384 /portal/branches/site-describability:6171-6235 /portal/trunk:4891,5744,5822,5943,6168,6196,6201-6203,6205-6206,6437,6440,6449,6452,6573 Property changes on: epp/portal/branches/EPP_5_2_Branch/component ___________________________________________________________________ Modified: svn:mergeinfo - /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795/component:5868 /portal/branches/branch-GTNPORTAL-1592/component:4894 /portal/branches/branch-GTNPORTAL-1643/component:5002,5063,5167 /portal/branches/branch-GTNPORTAL-1700/component:5348,5363,5402,5445 /portal/branches/branch-GTNPORTAL-1731/component:5668 /portal/branches/branch-GTNPORTAL-1745/component:5765 /portal/branches/branch-GTNPORTAL-1822/component:5943,5952 /portal/branches/branch-GTNPORTAL-1832/component:6030,6063 /portal/branches/branch-GTNPORTAL-1872/component:6400 /portal/trunk/component:4891,5744,5822,5943,6031,6033,6168,6196,6201-6203,6205-6206,6437,6440,6449,6452,6573 + /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795/component:5868 /portal/branches/branch-GTNPORTAL-1592/component:4894 /portal/branches/branch-GTNPORTAL-1643/component:5002,5063,5167 /portal/branches/branch-GTNPORTAL-1700/component:5348,5363,5402,5445 /portal/branches/branch-GTNPORTAL-1731/component:5622,5668 /portal/branches/branch-GTNPORTAL-1745/component:5765 /portal/branches/branch-GTNPORTAL-1822/component:5943,5952 /portal/branches/branch-GTNPORTAL-1832/component:6030,6063 /portal/branches/branch-GTNPORTAL-1872/component:6400 /portal/trunk/component:4891,5744,5822,5943,6031,6033,6168,6196,6201-6203,6205-6206,6437,6440,6449,6452,6573 Modified: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java 2011-07-18 21:12:51 UTC (rev 6883) +++ epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java 2011-07-18 22:13:58 UTC (rev 6884) @@ -325,7 +325,7 @@ uiWorkingWS.setRenderedChild(UIPortalApplication.UI_EDITTING_WS_ID); prContext.addUIComponentToUpdateByAjax(uiWorkingWS); - prContext.setFullRender(true); + prContext.ignoreAJAXUpdateOnPortlets(true); } } Modified: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIUserInfo.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIUserInfo.java 2011-07-18 21:12:51 UTC (rev 6883) +++ epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIUserInfo.java 2011-07-18 22:13:58 UTC (rev 6884) @@ -140,7 +140,7 @@ Util.getPortalRequestContext().addUIComponentToUpdateByAjax( uiApp.findFirstComponentOfType(UIWorkingWorkspace.class)); - Util.getPortalRequestContext().setFullRender(true); + Util.getPortalRequestContext().ignoreAJAXUpdateOnPortlets(true); } UIUserManagement userManagement = uiUserInfo.getParent(); Modified: epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java 2011-07-18 21:12:51 UTC (rev 6883) +++ epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java 2011-07-18 22:13:58 UTC (rev 6884) @@ -402,11 +402,30 @@ * 2) Portlets will be fully rendered if are inner of the portal ui components being updated * * @param forceFullUpdate + * + * This method is deprecated, ignoreAJAXUpdateOnPortlets should be used instead */ + @Deprecated() final public void setFullRender(boolean forceFullUpdate) { this.forceFullUpdate = forceFullUpdate; } + + /** + * Call to this method makes sense only in the scope of an AJAX request. + * + * Invoking ignoreAJAXUpdateOnPortlets(true) as there is need to update only UI components + * of portal (ie: the components outside portlet windows) are updated by AJAX. In the request + * response, all the blocks <PortletRespond > are empty. The content displayed in portlet + * windows are retrieved by non-AJAX render request to associated portlet object. + * + * + * @param ignoreAJAXUpdateOnPortlets + */ + final public void ignoreAJAXUpdateOnPortlets(boolean ignoreAJAXUpdateOnPortlets) + { + this.forceFullUpdate = ignoreAJAXUpdateOnPortlets; + } final public void sendRedirect(String url) throws IOException { Modified: epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletActionListener.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletActionListener.java 2011-07-18 21:12:51 UTC (rev 6883) +++ epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletActionListener.java 2011-07-18 22:13:58 UTC (rev 6884) @@ -526,7 +526,7 @@ { log .info("Events were generated outside the scope of an AJAX call, hence will make a full render of the page"); - context.setFullRender(true); + context.ignoreAJAXUpdateOnPortlets(true); } if (newEvents != null && !newEvents.isEmpty()) { @@ -751,7 +751,7 @@ UIWorkingWorkspace uiWorkingWS = uiPortalApp.getChildById(UIPortalApplication.UI_WORKING_WS_ID); PortalRequestContext pcontext = (PortalRequestContext)event.getRequestContext(); pcontext.addUIComponentToUpdateByAjax(uiWorkingWS); - pcontext.setFullRender(true); + pcontext.ignoreAJAXUpdateOnPortlets(true); String windowState = event.getRequestContext().getRequestParameter(Constants.PORTAL_WINDOW_STATE); if (windowState == null) Modified: epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletForm.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletForm.java 2011-07-18 21:12:51 UTC (rev 6883) +++ epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletForm.java 2011-07-18 22:13:58 UTC (rev 6884) @@ -152,7 +152,7 @@ try { PortalRequestContext prcontext = (PortalRequestContext)WebuiRequestContext.getCurrentInstance(); - prcontext.setFullRender(true); + prcontext.ignoreAJAXUpdateOnPortlets(true); StatefulPortletContext portletContext = uiPortlet_.getPortletContext(); ExoPortletInvocationContext portletInvocationContext = new ExoPortletInvocationContext(prcontext, uiPortlet_); @@ -401,7 +401,7 @@ UIPortalApplication uiPortalApp = uiPortlet.getAncestorOfType(UIPortalApplication.class); UIWorkingWorkspace uiWorkingWS = uiPortalApp.getChildById(UIPortalApplication.UI_WORKING_WS_ID); pcontext.addUIComponentToUpdateByAjax(uiWorkingWS); - pcontext.setFullRender(true); + pcontext.ignoreAJAXUpdateOnPortlets(true); Util.showComponentLayoutMode(UIPortlet.class); } } @@ -423,7 +423,7 @@ uiMaskWorkspace.setUIComponent(null); uiMaskWorkspace.setWindowSize(-1, -1); pcontext.addUIComponentToUpdateByAjax(uiMaskWorkspace); - pcontext.setFullRender(true); + pcontext.ignoreAJAXUpdateOnPortlets(true); Util.showComponentLayoutMode(UIPortlet.class); } } Added: epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/container/UIColumnContainer.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/container/UIColumnContainer.java (rev 0) +++ epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/container/UIColumnContainer.java 2011-07-18 22:13:58 UTC (rev 6884) @@ -0,0 +1,108 @@ +/** + * Copyright (C) 2009 eXo Platform SAS. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.exoplatform.portal.webui.container; + +import java.util.Collections; +import java.util.List; + +import org.exoplatform.portal.application.PortalRequestContext; +import org.exoplatform.portal.webui.container.UIContainerActionListener.EditContainerActionListener; +import org.exoplatform.portal.webui.portal.UIPortalComponent; +import org.exoplatform.portal.webui.portal.UIPortalComponentActionListener.DeleteComponentActionListener; +import org.exoplatform.portal.webui.util.Util; +import org.exoplatform.portal.webui.workspace.UIPortalApplication; +import org.exoplatform.portal.webui.workspace.UIWorkingWorkspace; +import org.exoplatform.webui.config.annotation.ComponentConfig; +import org.exoplatform.webui.config.annotation.EventConfig; +import org.exoplatform.webui.core.UIComponent; +import org.exoplatform.webui.event.Event; +import org.exoplatform.webui.event.EventListener; + +/** + * Created by The eXo Platform SAS + * Author : Nguyen Duc Khoi + * khoi.nguyen(a)exoplatform.com + * Jul 29, 2010 + */ + +@ComponentConfig(template = "system:/groovy/portal/webui/container/UIColumnContainer.gtmpl", events = +{ + @EventConfig(listeners = UIColumnContainer.InsertColumnActionListener.class), + @EventConfig(listeners = DeleteComponentActionListener.class, confirm = "UIColumnContainer.deleteColumnContainer"), + @EventConfig(listeners = EditContainerActionListener.class)}) +public class UIColumnContainer extends UIContainer +{ + public static final String COLUMN_CONTAINER = "ColumnContainer"; + + public static final String INSERT_AFTER = "insertColumnAfter"; + + public static final String INSERT_BEFORE = "insertColumnBefore"; + + public UIColumnContainer() + { + super(); + } + + public static class InsertColumnActionListener extends EventListener<UIColumnContainer> + { + @Override + public void execute(Event<UIColumnContainer> event) throws Exception + { + String insertPosition = event.getRequestContext().getRequestParameter(UIComponent.OBJECTID); + UIColumnContainer uiSelectedColumn = event.getSource(); + UIPortalComponent uiParent = (UIPortalComponent) uiSelectedColumn.getParent(); + if (insertPosition.equals(INSERT_AFTER)) + { + UIColumnContainer.insertColumn(uiSelectedColumn, true); + } + else if (insertPosition.equals(INSERT_BEFORE)) + { + UIColumnContainer.insertColumn(uiSelectedColumn, false); + } + + Util.showComponentLayoutMode(uiSelectedColumn.getClass()); + + PortalRequestContext pcontext = (PortalRequestContext) event.getRequestContext(); + UIPortalApplication uiPortalApp = uiParent.getAncestorOfType(UIPortalApplication.class); + UIWorkingWorkspace uiWorkingWS = uiPortalApp.getChildById(UIPortalApplication.UI_WORKING_WS_ID); + pcontext.addUIComponentToUpdateByAjax(uiWorkingWS); + pcontext.ignoreAJAXUpdateOnPortlets(true); + } + + } + + private static void insertColumn(UIColumnContainer selectedColumn, boolean isInsertAfter) throws Exception + { + UIContainer uiParent = selectedColumn.getParent(); + UIColumnContainer uiNewColumn = uiParent.addChild(UIColumnContainer.class, null, null); + + uiNewColumn.setTemplate(selectedColumn.getTemplate()); + uiNewColumn.setFactoryId(selectedColumn.getFactoryId()); + uiNewColumn.setId(String.valueOf(uiNewColumn.hashCode())); + + List<UIComponent> listColumn = uiParent.getChildren(); + int position = listColumn.indexOf(selectedColumn); + if (isInsertAfter) + { + position += 1; + } + Collections.rotate(listColumn.subList(position, listColumn.size()), 1); + } + +} \ No newline at end of file Modified: epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/container/UIContainerForm.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/container/UIContainerForm.java 2011-07-18 21:12:51 UTC (rev 6883) +++ epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/container/UIContainerForm.java 2011-07-18 22:13:58 UTC (rev 6884) @@ -144,7 +144,7 @@ UIPortalApplication uiPortalApp = Util.getUIPortalApplication(); UIWorkingWorkspace uiWorkingWS = uiPortalApp.getChildById(UIPortalApplication.UI_WORKING_WS_ID); pcontext.addUIComponentToUpdateByAjax(uiWorkingWS); - pcontext.setFullRender(true); + pcontext.ignoreAJAXUpdateOnPortlets(true); Util.showComponentLayoutMode(UIContainer.class); } } Modified: epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationManagement.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationManagement.java 2011-07-18 21:12:51 UTC (rev 6883) +++ epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationManagement.java 2011-07-18 22:13:58 UTC (rev 6884) @@ -116,7 +116,7 @@ UIPortalApplication uiPortalApp = (UIPortalApplication)prContext.getUIApplication(); UIWorkingWorkspace uiWorkingWS = uiPortalApp.getChildById(UIPortalApplication.UI_WORKING_WS_ID); prContext.addUIComponentToUpdateByAjax(uiWorkingWS); - prContext.setFullRender(true); + prContext.ignoreAJAXUpdateOnPortlets(true); return; } @@ -136,7 +136,7 @@ UIPortalApplication uiPortalApp = (UIPortalApplication)prContext.getUIApplication(); UIWorkingWorkspace uiWorkingWS = uiPortalApp.getChildById(UIPortalApplication.UI_WORKING_WS_ID); prContext.addUIComponentToUpdateByAjax(uiWorkingWS); - prContext.setFullRender(true); + prContext.ignoreAJAXUpdateOnPortlets(true); return; } } @@ -166,7 +166,7 @@ uiPopup.setShow(false); UIWorkingWorkspace uiWorkingWS = uiPortalApp.getChildById(UIPortalApplication.UI_WORKING_WS_ID); prContext.addUIComponentToUpdateByAjax(uiWorkingWS); - prContext.setFullRender(true); + prContext.ignoreAJAXUpdateOnPortlets(true); } private void setNavigation(List<PageNavigation> navs, PageNavigation nav) Modified: epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationNodeSelector.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationNodeSelector.java 2011-07-18 21:12:51 UTC (rev 6883) +++ epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationNodeSelector.java 2011-07-18 22:13:58 UTC (rev 6884) @@ -453,7 +453,7 @@ // convert Page to UIPage PortalDataMapper.toUIPage(uiPage, selectPage); Util.getPortalRequestContext().addUIComponentToUpdateByAjax(uiWorkingWS); - Util.getPortalRequestContext().setFullRender(true); + Util.getPortalRequestContext().ignoreAJAXUpdateOnPortlets(true); } else { Modified: epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIPageNodeSelector.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIPageNodeSelector.java 2011-07-18 21:12:51 UTC (rev 6883) +++ epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIPageNodeSelector.java 2011-07-18 22:13:58 UTC (rev 6884) @@ -254,7 +254,7 @@ uiToolPanel.setShowMaskLayer(true); UIWorkingWorkspace uiWorkingWS = uiPortalApp.getChildById(UIPortalApplication.UI_WORKING_WS_ID); pcontext.addUIComponentToUpdateByAjax(uiWorkingWS); - pcontext.setFullRender(true); + pcontext.ignoreAJAXUpdateOnPortlets(true); UIContainer uiParent = uiPageNodeSelector.getParent(); PageNode node = null; Modified: epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageActionListener.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageActionListener.java 2011-07-18 21:12:51 UTC (rev 6883) +++ epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageActionListener.java 2011-07-18 22:13:58 UTC (rev 6884) @@ -64,7 +64,7 @@ //This code snippet is to make sure that Javascript/Skin is fully loaded at the first request UIWorkingWorkspace uiWorkingWS = uiPortalApp.getChildById(UIPortalApplication.UI_WORKING_WS_ID); PortalRequestContext pcontext = Util.getPortalRequestContext(); - pcontext.setFullRender(true); + pcontext.ignoreAJAXUpdateOnPortlets(true); pcontext.addUIComponentToUpdateByAjax(uiWorkingWS); PageNavigation currentNav = showedUIPortal.getSelectedNavigation(); @@ -422,7 +422,7 @@ } } PortalRequestContext pcontext = (PortalRequestContext)event.getRequestContext(); - pcontext.setFullRender(false); + pcontext.ignoreAJAXUpdateOnPortlets(false); pcontext.setResponseComplete(true); pcontext.getWriter().write(EventListener.RESULT_OK); } @@ -445,7 +445,7 @@ } DataStorage dataService = uiPage.getApplicationComponent(DataStorage.class); dataService.save(page); - pcontext.setFullRender(false); + pcontext.ignoreAJAXUpdateOnPortlets(false); pcontext.setResponseComplete(true); pcontext.getWriter().write(EventListener.RESULT_OK); } Modified: epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageWizard.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageWizard.java 2011-07-18 21:12:51 UTC (rev 6883) +++ epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageWizard.java 2011-07-18 22:13:58 UTC (rev 6884) @@ -100,7 +100,7 @@ UIPortal uiPortal = Util.getUIPortal(); uiPortal.setRenderSibling(UIPortal.class); - pcontext.setFullRender(true); + pcontext.ignoreAJAXUpdateOnPortlets(true); } void updateWizardComponent() @@ -111,7 +111,7 @@ UIWorkingWorkspace uiWorkingWS = uiPortalApp.getChildById(UIPortalApplication.UI_WORKING_WS_ID); pcontext.addUIComponentToUpdateByAjax(uiWorkingWS); - pcontext.setFullRender(true); + pcontext.ignoreAJAXUpdateOnPortlets(true); } static public class AbortActionListener extends EventListener<UIPageWizard> @@ -124,7 +124,7 @@ UIPortal uiPortal = Util.getUIPortal(); uiPortal.setRenderSibling(UIPortal.class); - pcontext.setFullRender(true); + pcontext.ignoreAJAXUpdateOnPortlets(true); UIWorkingWorkspace uiWorkingWS = uiPortalApp.getChildById(UIPortalApplication.UI_WORKING_WS_ID); uiWorkingWS.findFirstComponentOfType(UIPortalComposer.class).setRendered(false); Modified: epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UILanguageSelector.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UILanguageSelector.java 2011-07-18 21:12:51 UTC (rev 6883) +++ epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UILanguageSelector.java 2011-07-18 22:13:58 UTC (rev 6884) @@ -168,7 +168,7 @@ UIMaskWorkspace uiMaskWS = uiApp.getChildById(UIPortalApplication.UI_MASK_WS_ID); uiMaskWS.setUIComponent(null); // event.getRequestContext().addUIComponentToUpdateByAjax(uiMaskWS) ; - Util.getPortalRequestContext().setFullRender(false); + Util.getPortalRequestContext().ignoreAJAXUpdateOnPortlets(false); if (language == null || language.trim().length() < 1) return; // if(!uiPortal.isModifiable()) return; Modified: epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalActionListener.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalActionListener.java 2011-07-18 21:12:51 UTC (rev 6883) +++ epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalActionListener.java 2011-07-18 22:13:58 UTC (rev 6884) @@ -73,7 +73,7 @@ { PortalRequestContext pContext = (PortalRequestContext)event.getRequestContext(); HttpServletRequest request = pContext.getRequest(); - pContext.setFullRender(false); + pContext.ignoreAJAXUpdateOnPortlets(false); pContext.setResponseComplete(true); pContext.getWriter().write("" + request.getSession().getMaxInactiveInterval()); } Modified: epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComponentActionListener.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComponentActionListener.java 2011-07-18 21:12:51 UTC (rev 6883) +++ epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComponentActionListener.java 2011-07-18 22:13:58 UTC (rev 6884) @@ -231,7 +231,7 @@ if (newComponent) { portalComposer.updateWorkspaceComponent(); - pcontext.setFullRender(true); + pcontext.ignoreAJAXUpdateOnPortlets(true); } UIWorkingWorkspace uiWorkingWS = uiApp.getChild(UIWorkingWorkspace.class); Modified: epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java 2011-07-18 21:12:51 UTC (rev 6883) +++ epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java 2011-07-18 22:13:58 UTC (rev 6884) @@ -409,7 +409,7 @@ uiEditWS.getComposer().setEditted(false); uiEditWS.setRendered(false); uiWorkingWS.setRenderedChild(UIPortalApplication.UI_VIEWING_WS_ID); - prContext.setFullRender(true); + prContext.ignoreAJAXUpdateOnPortlets(true); UISiteBody siteBody = uiWorkingWS.findFirstComponentOfType(UISiteBody.class); UIPortal uiPortal = uiWorkingWS.getBackupUIPortal(); @@ -460,7 +460,7 @@ uiPortalApp.setSessionOpen(PortalProperties.SESSION_ALWAYS.equals(uiPortal.getSessionAlive())); uiPortalApp.setModeState(UIPortalApplication.NORMAL_MODE); uiWorkingWS.setRenderedChild(UIPortalApplication.UI_VIEWING_WS_ID); - prContext.setFullRender(true); + prContext.ignoreAJAXUpdateOnPortlets(true); String uri = (uiPortal.getSelectedNode() != null)? (uiPortal.getSelectedNode().getUri()) : null; @@ -583,7 +583,7 @@ } event.getSource().updateWorkspaceComponent(); - Util.getPortalRequestContext().setFullRender(true); + Util.getPortalRequestContext().ignoreAJAXUpdateOnPortlets(true); } } @@ -656,7 +656,7 @@ UIPortalApplication uiPortalApp = Util.getUIPortalApplication(); uiPortalApp.setModeState(UIPortalApplication.NORMAL_MODE); uiWorkingWS.setRenderedChild(UIPortalApplication.UI_VIEWING_WS_ID); - Util.getPortalRequestContext().setFullRender(true); + Util.getPortalRequestContext().ignoreAJAXUpdateOnPortlets(true); UIPortal uiPortal = uiPortalApp.getShowedUIPortal(); uiPortal.setRenderSibling(UIPortal.class); @@ -705,7 +705,7 @@ uiPortalApp.addMessage(new ApplicationMessage("UIPageBrowser.msg.PageNotExist", new String[]{pageId}, 1)); uiPortalApp.setModeState(UIPortalApplication.NORMAL_MODE); uiWorkingWS.setRenderedChild(UIPortalApplication.UI_VIEWING_WS_ID); - Util.getPortalRequestContext().setFullRender(true); + Util.getPortalRequestContext().ignoreAJAXUpdateOnPortlets(true); PageNodeEvent<UIPortal> pnevent = new PageNodeEvent<UIPortal>(uiPortal, PageNodeEvent.CHANGE_PAGE_NODE, (uiPortal.getSelectedNode() != null ? uiPortal.getSelectedNode().getUri() : null)); @@ -762,7 +762,7 @@ } uiPortalApp.setModeState(UIPortalApplication.NORMAL_MODE); uiWorkingWS.setRenderedChild(UIPortalApplication.UI_VIEWING_WS_ID); - Util.getPortalRequestContext().setFullRender(true); + Util.getPortalRequestContext().ignoreAJAXUpdateOnPortlets(true); PageNodeEvent<UIPortal> pnevent = new PageNodeEvent<UIPortal>(uiPortal, PageNodeEvent.CHANGE_PAGE_NODE, (uiPortal.getSelectedNode() != null ? uiPortal.getSelectedNode().getUri() : null)); Modified: epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UISkinSelector.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UISkinSelector.java 2011-07-18 21:12:51 UTC (rev 6883) +++ epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UISkinSelector.java 2011-07-18 22:13:58 UTC (rev 6884) @@ -100,7 +100,7 @@ UIMaskWorkspace uiMaskWS = uiApp.getChildById(UIPortalApplication.UI_MASK_WS_ID); uiMaskWS.setUIComponent(null); //event.getRequestContext().addUIComponentToUpdateByAjax(uiApp) ; - Util.getPortalRequestContext().setFullRender(false); + Util.getPortalRequestContext().ignoreAJAXUpdateOnPortlets(false); if (skin == null || skin.trim().length() < 1) return; uiApp.setSkin(skin); Modified: epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/util/ToolbarUtils.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/util/ToolbarUtils.java 2011-07-18 21:12:51 UTC (rev 6883) +++ epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/util/ToolbarUtils.java 2011-07-18 22:13:58 UTC (rev 6884) @@ -67,7 +67,7 @@ PortalRequestContext portalRequestContext = (PortalRequestContext)context.getParentAppRequestContext(); UIWorkingWorkspace uiWorkingWS = portalApplication.getChildById(UIPortalApplication.UI_WORKING_WS_ID); portalRequestContext.addUIComponentToUpdateByAjax(uiWorkingWS); - portalRequestContext.setFullRender(true); + portalRequestContext.ignoreAJAXUpdateOnPortlets(true); } /** Modified: epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/util/Util.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/util/Util.java 2011-07-18 21:12:51 UTC (rev 6883) +++ epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/util/Util.java 2011-07-18 22:13:58 UTC (rev 6884) @@ -311,7 +311,7 @@ UIWorkingWorkspace uiWorkingWS = uiPortalApp.getChildById(UIPortalApplication.UI_WORKING_WS_ID); pcontext.addUIComponentToUpdateByAjax(uiWorkingWS); - pcontext.setFullRender(true); + pcontext.ignoreAJAXUpdateOnPortlets(true); return uiWorkingWS; } Modified: epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMainActionListener.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMainActionListener.java 2011-07-18 21:12:51 UTC (rev 6883) +++ epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMainActionListener.java 2011-07-18 22:13:58 UTC (rev 6884) @@ -103,7 +103,7 @@ pageBody.setUIComponent(null); event.getRequestContext().addUIComponentToUpdateByAjax(uiWorkingWS); - Util.getPortalRequestContext().setFullRender(true); + Util.getPortalRequestContext().ignoreAJAXUpdateOnPortlets(true); } } @@ -208,7 +208,7 @@ uiWorkingWS.setRenderedChild(UIEditInlineWorkspace.class); pcontext.addUIComponentToUpdateByAjax(uiWorkingWS); - pcontext.setFullRender(true); + pcontext.ignoreAJAXUpdateOnPortlets(true); } } Modified: epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIPortalApplicationLifecycle.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIPortalApplicationLifecycle.java 2011-07-18 21:12:51 UTC (rev 6883) +++ epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIPortalApplicationLifecycle.java 2011-07-18 22:13:58 UTC (rev 6884) @@ -47,7 +47,7 @@ { context.addUIComponentToUpdateByAjax(uicomponent.<UIComponent>getChildById(UIPortalApplication.UI_WORKING_WS_ID)); context.addUIComponentToUpdateByAjax(uicomponent.getChild(UIMaskWorkspace.class)); - ((PortalRequestContext)context).setFullRender(true); + ((PortalRequestContext)context).ignoreAJAXUpdateOnPortlets(true); return; } if (uiTarget == uicomponent)