[gatein-commits] gatein SVN: r5622 - in portal/branches/branch-GTNPORTAL-1731: portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component and 8 other directories.

Author: hoang_to Date: 2010-12-22 01:46:03 -0500 (Wed, 22 Dec 2010) New Revision: 5622 Modified: portal/branches/branch-GTNPORTAL-1731/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java portal/branches/branch-GTNPORTAL-1731/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIUserInfo.java portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIAddNewApplication.java portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletActionListener.java portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletForm.java portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/container/UIColumnContainer.java portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/container/UIContainerForm.java portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationManagement.java portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationNodeSelector.java portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIPageNodeSelector.java portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageActionListener.java portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBrowser.java portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageForm.java portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageWizard.java portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UILanguageSelector.java portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalActionListener.java portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComponentActionListener.java portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UISkinSelector.java portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/util/ToolbarUtils.java portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/util/Util.java portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMainActionListener.java portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIPortalApplicationLifecycle.java Log: GTNPORTAL-1720: Rename the confusing methods setFullRender/getFullRender in PortalRequestContext Modified: portal/branches/branch-GTNPORTAL-1731/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java =================================================================== --- portal/branches/branch-GTNPORTAL-1731/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java 2010-12-21 19:29:13 UTC (rev 5621) +++ portal/branches/branch-GTNPORTAL-1731/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java 2010-12-22 06:46:03 UTC (rev 5622) @@ -324,7 +324,7 @@ uiWorkingWS.setRenderedChild(UIPortalApplication.UI_EDITTING_WS_ID); prContext.addUIComponentToUpdateByAjax(uiWorkingWS); - prContext.setFullRender(true); + prContext.ignoreAJAXUpdateOnPortlets(true); } } Modified: portal/branches/branch-GTNPORTAL-1731/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIUserInfo.java =================================================================== --- portal/branches/branch-GTNPORTAL-1731/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIUserInfo.java 2010-12-21 19:29:13 UTC (rev 5621) +++ portal/branches/branch-GTNPORTAL-1731/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIUserInfo.java 2010-12-22 06:46:03 UTC (rev 5622) @@ -140,7 +140,7 @@ Util.getPortalRequestContext().addUIComponentToUpdateByAjax( uiApp.findFirstComponentOfType(UIWorkingWorkspace.class)); - Util.getPortalRequestContext().setFullRender(true); + Util.getPortalRequestContext().ignoreAJAXUpdateOnPortlets(true); } UIAccountEditInputSet accountInput = uiUserInfo.getChild(UIAccountEditInputSet.class); Modified: portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java =================================================================== --- portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java 2010-12-21 19:29:13 UTC (rev 5621) +++ portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java 2010-12-22 06:46:03 UTC (rev 5622) @@ -403,11 +403,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: portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIAddNewApplication.java =================================================================== --- portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIAddNewApplication.java 2010-12-21 19:29:13 UTC (rev 5621) +++ portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIAddNewApplication.java 2010-12-22 06:46:03 UTC (rev 5622) @@ -262,7 +262,7 @@ PortalRequestContext pcontext = Util.getPortalRequestContext(); UIWorkingWorkspace uiWorkingWS = uiPortalApp.getChildById(UIPortalApplication.UI_WORKING_WS_ID); pcontext.addUIComponentToUpdateByAjax(uiWorkingWS); - pcontext.setFullRender(true); + pcontext.ignoreAJAXUpdateOnPortlets(true); } static public class AddApplicationActionListener extends EventListener<UIAddNewApplication> Modified: portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletActionListener.java =================================================================== --- portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletActionListener.java 2010-12-21 19:29:13 UTC (rev 5621) +++ portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletActionListener.java 2010-12-22 06:46:03 UTC (rev 5622) @@ -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: portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletForm.java =================================================================== --- portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletForm.java 2010-12-21 19:29:13 UTC (rev 5621) +++ portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletForm.java 2010-12-22 06:46:03 UTC (rev 5622) @@ -170,7 +170,7 @@ try { PortalRequestContext prcontext = (PortalRequestContext)WebuiRequestContext.getCurrentInstance(); - prcontext.setFullRender(true); + prcontext.ignoreAJAXUpdateOnPortlets(true); StatefulPortletContext portletContext = uiPortlet_.getPortletContext(); ExoPortletInvocationContext portletInvocationContext = new ExoPortletInvocationContext(prcontext, uiPortlet_); @@ -407,7 +407,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); } } @@ -429,7 +429,7 @@ uiMaskWorkspace.setUIComponent(null); uiMaskWorkspace.setWindowSize(-1, -1); pcontext.addUIComponentToUpdateByAjax(uiMaskWorkspace); - pcontext.setFullRender(true); + pcontext.ignoreAJAXUpdateOnPortlets(true); Util.showComponentLayoutMode(UIPortlet.class); } } Modified: portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/container/UIColumnContainer.java =================================================================== --- portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/container/UIColumnContainer.java 2010-12-21 19:29:13 UTC (rev 5621) +++ portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/container/UIColumnContainer.java 2010-12-22 06:46:03 UTC (rev 5622) @@ -82,7 +82,7 @@ UIPortalApplication uiPortalApp = uiParent.getAncestorOfType(UIPortalApplication.class); UIWorkingWorkspace uiWorkingWS = uiPortalApp.getChildById(UIPortalApplication.UI_WORKING_WS_ID); pcontext.addUIComponentToUpdateByAjax(uiWorkingWS); - pcontext.setFullRender(true); + pcontext.ignoreAJAXUpdateOnPortlets(true); } } Modified: portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/container/UIContainerForm.java =================================================================== --- portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/container/UIContainerForm.java 2010-12-21 19:29:13 UTC (rev 5621) +++ portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/container/UIContainerForm.java 2010-12-22 06:46:03 UTC (rev 5622) @@ -145,7 +145,7 @@ UIWorkingWorkspace uiWorkingWS = uiPortalApp.getChildById(UIPortalApplication.UI_WORKING_WS_ID); pcontext.getJavascriptManager().addJavascript("eXo.portal.UIPortal.changeComposerSaveButton();"); pcontext.addUIComponentToUpdateByAjax(uiWorkingWS); - pcontext.setFullRender(true); + pcontext.ignoreAJAXUpdateOnPortlets(true); Util.showComponentLayoutMode(UIContainer.class); } } Modified: portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationManagement.java =================================================================== --- portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationManagement.java 2010-12-21 19:29:13 UTC (rev 5621) +++ portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationManagement.java 2010-12-22 06:46:03 UTC (rev 5622) @@ -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: portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationNodeSelector.java =================================================================== --- portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationNodeSelector.java 2010-12-21 19:29:13 UTC (rev 5621) +++ portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationNodeSelector.java 2010-12-22 06:46:03 UTC (rev 5622) @@ -452,7 +452,7 @@ // convert Page to UIPage PortalDataMapper.toUIPage(uiPage, selectPage); Util.getPortalRequestContext().addUIComponentToUpdateByAjax(uiWorkingWS); - Util.getPortalRequestContext().setFullRender(true); + Util.getPortalRequestContext().ignoreAJAXUpdateOnPortlets(true); } else { Modified: portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIPageNodeSelector.java =================================================================== --- portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIPageNodeSelector.java 2010-12-21 19:29:13 UTC (rev 5621) +++ portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIPageNodeSelector.java 2010-12-22 06:46:03 UTC (rev 5622) @@ -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: portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageActionListener.java =================================================================== --- portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageActionListener.java 2010-12-21 19:29:13 UTC (rev 5621) +++ portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageActionListener.java 2010-12-22 06:46:03 UTC (rev 5622) @@ -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: portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBrowser.java =================================================================== --- portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBrowser.java 2010-12-21 19:29:13 UTC (rev 5621) +++ portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBrowser.java 2010-12-22 06:46:03 UTC (rev 5622) @@ -454,7 +454,7 @@ //uiWorkingWS.addChild(UIPortalComposer.class, "UIPageEditor", null); uiWorkingWS.setRenderedChild(UIPortalApplication.UI_EDITTING_WS_ID); pcontext.addUIComponentToUpdateByAjax(uiWorkingWS); - pcontext.setFullRender(true); + pcontext.ignoreAJAXUpdateOnPortlets(true); } } Modified: portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageForm.java =================================================================== --- portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageForm.java 2010-12-21 19:29:13 UTC (rev 5621) +++ portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageForm.java 2010-12-22 06:46:03 UTC (rev 5622) @@ -321,7 +321,7 @@ if (page.getChildren() == null) page.setChildren(new ArrayList<ModelObject>()); - pcontext.setFullRender(true); + pcontext.ignoreAJAXUpdateOnPortlets(true); UIWorkingWorkspace uiWorkingWS = uiPortalApp.getChildById(UIPortalApplication.UI_WORKING_WS_ID); pcontext.addUIComponentToUpdateByAjax(uiWorkingWS); pcontext.getJavascriptManager().addJavascript("eXo.portal.UIPortal.changeComposerSaveButton();"); @@ -339,7 +339,7 @@ UIPortalToolPanel toolPanel = Util.getUIPortalToolPanel(); toolPanel.setShowMaskLayer(true); - pcontext.setFullRender(true); + pcontext.ignoreAJAXUpdateOnPortlets(true); UIWorkingWorkspace uiWorkingWS = uiPortalApp.getChildById(UIPortalApplication.UI_WORKING_WS_ID); pcontext.addUIComponentToUpdateByAjax(uiWorkingWS); pcontext.getJavascriptManager().addJavascript("eXo.portal.UIPortal.changeComposerSaveButton();"); Modified: portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageWizard.java =================================================================== --- portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageWizard.java 2010-12-21 19:29:13 UTC (rev 5621) +++ portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageWizard.java 2010-12-22 06:46:03 UTC (rev 5622) @@ -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: portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UILanguageSelector.java =================================================================== --- portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UILanguageSelector.java 2010-12-21 19:29:13 UTC (rev 5621) +++ portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UILanguageSelector.java 2010-12-22 06:46:03 UTC (rev 5622) @@ -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: portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalActionListener.java =================================================================== --- portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalActionListener.java 2010-12-21 19:29:13 UTC (rev 5621) +++ portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalActionListener.java 2010-12-22 06:46:03 UTC (rev 5622) @@ -72,7 +72,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: portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComponentActionListener.java =================================================================== --- portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComponentActionListener.java 2010-12-21 19:29:13 UTC (rev 5621) +++ portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComponentActionListener.java 2010-12-22 06:46:03 UTC (rev 5622) @@ -231,7 +231,7 @@ if (newComponent) { portalComposer.updateWorkspaceComponent(); - pcontext.setFullRender(true); + pcontext.ignoreAJAXUpdateOnPortlets(true); } UIWorkingWorkspace uiWorkingWS = uiApp.getChild(UIWorkingWorkspace.class); Modified: portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java =================================================================== --- portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java 2010-12-21 19:29:13 UTC (rev 5621) +++ portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java 2010-12-22 06:46:03 UTC (rev 5622) @@ -408,7 +408,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(); @@ -459,7 +459,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; @@ -582,7 +582,7 @@ } event.getSource().updateWorkspaceComponent(); - Util.getPortalRequestContext().setFullRender(true); + Util.getPortalRequestContext().ignoreAJAXUpdateOnPortlets(true); } } @@ -655,7 +655,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); @@ -704,7 +704,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)); @@ -761,7 +761,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: portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UISkinSelector.java =================================================================== --- portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UISkinSelector.java 2010-12-21 19:29:13 UTC (rev 5621) +++ portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UISkinSelector.java 2010-12-22 06:46:03 UTC (rev 5622) @@ -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: portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/util/ToolbarUtils.java =================================================================== --- portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/util/ToolbarUtils.java 2010-12-21 19:29:13 UTC (rev 5621) +++ portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/util/ToolbarUtils.java 2010-12-22 06:46:03 UTC (rev 5622) @@ -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: portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/util/Util.java =================================================================== --- portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/util/Util.java 2010-12-21 19:29:13 UTC (rev 5621) +++ portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/util/Util.java 2010-12-22 06:46:03 UTC (rev 5622) @@ -315,7 +315,7 @@ UIWorkingWorkspace uiWorkingWS = uiPortalApp.getChildById(UIPortalApplication.UI_WORKING_WS_ID); pcontext.addUIComponentToUpdateByAjax(uiWorkingWS); - pcontext.setFullRender(true); + pcontext.ignoreAJAXUpdateOnPortlets(true); return uiWorkingWS; } Modified: portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMainActionListener.java =================================================================== --- portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMainActionListener.java 2010-12-21 19:29:13 UTC (rev 5621) +++ portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMainActionListener.java 2010-12-22 06:46:03 UTC (rev 5622) @@ -97,7 +97,7 @@ pageBody.setUIComponent(null); event.getRequestContext().addUIComponentToUpdateByAjax(uiWorkingWS); - Util.getPortalRequestContext().setFullRender(true); + Util.getPortalRequestContext().ignoreAJAXUpdateOnPortlets(true); } } @@ -202,7 +202,7 @@ uiWorkingWS.setRenderedChild(UIEditInlineWorkspace.class); pcontext.addUIComponentToUpdateByAjax(uiWorkingWS); - pcontext.setFullRender(true); + pcontext.ignoreAJAXUpdateOnPortlets(true); } } Modified: portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIPortalApplicationLifecycle.java =================================================================== --- portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIPortalApplicationLifecycle.java 2010-12-21 19:29:13 UTC (rev 5621) +++ portal/branches/branch-GTNPORTAL-1731/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIPortalApplicationLifecycle.java 2010-12-22 06:46:03 UTC (rev 5622) @@ -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)