Author: hoang_to Date: 2010-04-29 14:40:30 -0400 (Thu, 29 Apr 2010) New Revision: 2904 Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UIGroupNavigationManagement.java portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationManagement.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationNodeSelector.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageNodeForm2.java Log: GTNPORTAL-1087: Update java code Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UIGroupNavigationManagement.java =================================================================== --- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UIGroupNavigationManagement.java 2010-04-29 16:52:29 UTC (rev 2903) +++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UIGroupNavigationManagement.java 2010-04-29 18:40:30 UTC (rev 2904) @@ -344,14 +344,19 @@ public void execute(Event<UIPageNodeForm2> event) throws Exception { UIPageNodeForm2 uiPageNodeForm = event.getSource(); + PageNavigation contextNavigation = uiPageNodeForm.getContextPageNavigation(); + UIGroupNavigationManagement uiGroupNavigation = uiPageNodeForm.getAncestorOfType(UIGroupNavigationManagement.class); PageNavigation selectedNavigation = uiGroupNavigation.getSelectedNavigation(); UIPopupWindow uiNavigationPopup = uiGroupNavigation.getChild(UIPopupWindow.class); - UINavigationManagement pageManager = + UINavigationManagement navigationManager = uiPageNodeForm.createUIComponent(UINavigationManagement.class, null, null); - pageManager.setOwner(selectedNavigation.getOwnerId()); - UINavigationNodeSelector selector = pageManager.getChild(UINavigationNodeSelector.class); + navigationManager.setOwner(contextNavigation.getOwnerId()); + navigationManager.setOwnerType(contextNavigation.getOwnerType()); + UINavigationNodeSelector selector = navigationManager.getChild(UINavigationNodeSelector.class); + selector.setEdittedNavigation(contextNavigation); + selector.initTreeData(); if (uiPageNodeForm.getSelectedParent() instanceof PageNode) { @@ -359,7 +364,7 @@ selector.selectPageNodeByUri(selectedParent.getUri()); } - uiNavigationPopup.setUIComponent(pageManager); + uiNavigationPopup.setUIComponent(navigationManager); uiNavigationPopup.setWindowSize(400, 400); uiNavigationPopup.setRendered(true); Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java =================================================================== --- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java 2010-04-29 16:52:29 UTC (rev 2903) +++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java 2010-04-29 18:40:30 UTC (rev 2904) @@ -372,14 +372,18 @@ public void execute(Event<UIPageNodeForm2> event) throws Exception { UIPageNodeForm2 uiPageNodeForm = event.getSource(); + PageNavigation contextNavigation = uiPageNodeForm.getContextPageNavigation(); UISiteManagement uiSiteManagement = uiPageNodeForm.getAncestorOfType(UISiteManagement.class); - PageNavigation selectedNavigation = uiSiteManagement.getOriginalSelectedNavigation(); UIPopupWindow uiNavigationPopup = uiSiteManagement.getChild(UIPopupWindow.class); - UINavigationManagement pageManager = - uiPageNodeForm.createUIComponent(UINavigationManagement.class, null, null); - pageManager.setOwner(selectedNavigation.getOwnerId()); - UINavigationNodeSelector selector = pageManager.getChild(UINavigationNodeSelector.class); - uiNavigationPopup.setUIComponent(pageManager); + UINavigationManagement navigationManager = uiPageNodeForm.createUIComponent(UINavigationManagement.class, null, null); + navigationManager.setOwner(contextNavigation.getOwnerId()); + navigationManager.setOwnerType(contextNavigation.getOwnerType()); + UINavigationNodeSelector selector = navigationManager.getChild(UINavigationNodeSelector.class); + + selector.setEdittedNavigation(uiPageNodeForm.getContextPageNavigation()); + selector.initTreeData(); + + uiNavigationPopup.setUIComponent(navigationManager); uiNavigationPopup.setWindowSize(400, 400); event.getRequestContext().addUIComponentToUpdateByAjax(uiNavigationPopup.getParent()); } Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationManagement.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationManagement.java 2010-04-29 16:52:29 UTC (rev 2903) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationManagement.java 2010-04-29 18:40:30 UTC (rev 2904) @@ -198,9 +198,7 @@ PageNavigation nav = uiNodeSelector.getEdittedNavigation(); uiNodeForm.setSelectedParent(nav); - // set owner type, owner - uiNodeForm.setOwner(nav.getOwnerId()); - uiNodeForm.setOwnerType(nav.getOwnerType()); + uiNodeForm.setContextPageNavigation(nav); uiManagementPopup.setWindowSize(800, 500); event.getRequestContext().addUIComponentToUpdateByAjax(uiManagementPopup.getParent()); Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationNodeSelector.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationNodeSelector.java 2010-04-29 16:52:29 UTC (rev 2903) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationNodeSelector.java 2010-04-29 18:40:30 UTC (rev 2904) @@ -347,8 +347,8 @@ uiManagementPopup.setUIComponent(uiNodeForm); Object parent = null; - PageNavigation filteredEdittedNavigation = uiNodeSelector.getEdittedNavigation(); - List<PageNode> pageNodes = filteredEdittedNavigation.getNodes(); + PageNavigation edittedNavigation = uiNodeSelector.getEdittedNavigation(); + List<PageNode> pageNodes = edittedNavigation.getNodes(); if (uri != null && uri.trim().length() > 0) { for (PageNode pageNode : pageNodes) @@ -362,15 +362,12 @@ } if (parent == null) { - parent = filteredEdittedNavigation; + parent = edittedNavigation; } uiNodeForm.setSelectedParent(parent); - // set navigation owner, navigation type - uiNodeForm.setOwner(uiNodeSelector.getEdittedNavigation().getOwnerId()); - uiNodeForm.setOwnerType(uiNodeSelector.getEdittedNavigation().getOwnerType()); - + uiNodeForm.setContextPageNavigation(edittedNavigation); uiManagementPopup.setWindowSize(800, 500); event.getRequestContext().addUIComponentToUpdateByAjax(uiManagementPopup.getParent()); } @@ -472,9 +469,9 @@ UIApplication uiApp = ctx.getUIApplication(); String uri = event.getRequestContext().getRequestParameter(UIComponent.OBJECTID); UINavigationNodeSelector uiNodeSelector = popupMenu.getAncestorOfType(UINavigationNodeSelector.class); - PageNavigation selectedNav = uiNodeSelector.getEdittedNavigation(); - Object obj = PageNavigationUtils.searchParentNode(selectedNav, uri); - PageNode selectedNode = PageNavigationUtils.searchPageNodeByUri(selectedNav, uri); + PageNavigation edittedNav = uiNodeSelector.getEdittedNavigation(); + Object obj = PageNavigationUtils.searchParentNode(edittedNav, uri); + PageNode selectedNode = PageNavigationUtils.searchPageNodeByUri(edittedNav, uri); String pageId = selectedNode.getPageReference(); UserPortalConfigService service = uiApp.getApplicationComponent(UserPortalConfigService.class); @@ -492,10 +489,7 @@ UIPageNodeForm2 uiNodeForm = uiApp.createUIComponent(UIPageNodeForm2.class, null, null); uiManagementPopup.setUIComponent(uiNodeForm); - // set navigation owner, navigation type - uiNodeForm.setOwner(uiNodeSelector.getEdittedNavigation().getOwnerId()); - uiNodeForm.setOwnerType(uiNodeSelector.getEdittedNavigation().getOwnerType()); - + uiNodeForm.setContextPageNavigation(edittedNav); uiNodeForm.setValues(selectedNode); uiNodeForm.setSelectedParent(obj); uiManagementPopup.setWindowSize(800, 500); Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageNodeForm2.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageNodeForm2.java 2010-04-29 16:52:29 UTC (rev 2903) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageNodeForm2.java 2010-04-29 18:40:30 UTC (rev 2904) @@ -72,6 +72,8 @@ private Object selectedParent; + private PageNavigation contextPageNavigation; + final private static String SHOW_PUBLICATION_DATE = "showPublicationDate"; final private static String START_PUBLICATION_DATE = "startPublicationDate"; @@ -208,24 +210,24 @@ uiPopupWindowPage.processRender(context); } - public void setOwner(String owner_) + public String getOwner() { - this.owner_ = owner_; + return contextPageNavigation.getOwnerId(); } - public String getOwner() + public String getOwnerType() { - return owner_; + return contextPageNavigation.getOwnerType(); } - - public void setOwnerType(String ownerType_) + + public void setContextPageNavigation(PageNavigation _contextPageNav) { - this.ownerType_ = ownerType_; + this.contextPageNavigation = _contextPageNav; } - - public String getOwnerType() + + public PageNavigation getContextPageNavigation() { - return ownerType_; + return this.contextPageNavigation; } static public class SaveActionListener extends EventListener<UIPageNodeForm2>