Author: hoang_to Date: 2010-12-17 04:24:12 -0500 (Fri, 17 Dec 2010) New Revision: 5601 Modified: exo/portal/branches/webos-gatein-branch/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageForm.java Log: Remove DesktopPage-related check from UIPageForm Modified: exo/portal/branches/webos-gatein-branch/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageForm.java =================================================================== --- exo/portal/branches/webos-gatein-branch/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageForm.java 2010-12-17 04:17:04 UTC (rev 5600) +++ exo/portal/branches/webos-gatein-branch/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageForm.java 2010-12-17 09:24:12 UTC (rev 5601) @@ -292,49 +292,6 @@ applications.add(PortalDataMapper.buildModelObject(uiPortlet)); } - if (Page.DESKTOP_PAGE.equals(uiPage.getFactoryId()) && !Page.DESKTOP_PAGE.equals(page.getFactoryId())) - { - page.setShowMaxWindow(false); - uiPage.getChildren().clear(); - page.setChildren(applications); - - PortalDataMapper.toUIPage(uiPage, page); - // if(page.getTemplate() == null) page.setTemplate(uiPage.getTemplate()) ; - if (page.getChildren() == null) - page.setChildren(new ArrayList<ModelObject>()); - - // uiEditBar.setUIPage(uiPage); - // Class<?> [] childrenToRender = {UIPageEditBar.class, - // UIPageNodeSelector.class, UIPageNavigationControlBar.class}; - // uiManagement.setRenderedChildrenOfTypes(childrenToRender); - - pcontext.setFullRender(true); - UIWorkingWorkspace uiWorkingWS = uiPortalApp.getChildById(UIPortalApplication.UI_WORKING_WS_ID); - pcontext.addUIComponentToUpdateByAjax(uiWorkingWS); - - return; - } - - if (Page.DESKTOP_PAGE.equals(page.getFactoryId())) - { - uiPage.getChildren().clear(); - page.setChildren(applications); - - PortalDataMapper.toUIPage(uiPage, page); - // if(page.getTemplate() == null) page.setTemplate(uiPage.getTemplate()) ; - if (page.getChildren() == null) - page.setChildren(new ArrayList<ModelObject>()); - - UIPortalToolPanel toolPanel = Util.getUIPortalToolPanel(); - toolPanel.setShowMaskLayer(true); - pcontext.setFullRender(true); - UIWorkingWorkspace uiWorkingWS = uiPortalApp.getChildById(UIPortalApplication.UI_WORKING_WS_ID); - pcontext.addUIComponentToUpdateByAjax(uiWorkingWS); - DataStorage dataService = uiPageForm.getApplicationComponent(DataStorage.class); - dataService.save(page); - return; - } - List<UIComponent> uiChildren = uiPage.getChildren(); if (uiChildren == null) {