Author: thomas.heute(a)jboss.com Date: 2010-10-25 07:12:16 -0400 (Mon, 25 Oct 2010) New Revision: 4816 Modified: epp/portal/branches/EPP_5_1_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageNodeForm.java Log: JBEPP-572: It is possible to change page of "NotFound" node and NPE exception occurs after it Modified: epp/portal/branches/EPP_5_1_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageNodeForm.java =================================================================== --- epp/portal/branches/EPP_5_1_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageNodeForm.java 2010-10-25 08:06:56 UTC (rev 4815) +++ epp/portal/branches/EPP_5_1_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageNodeForm.java 2010-10-25 11:12:16 UTC (rev 4816) @@ -186,13 +186,16 @@ public void invokeSetBindingBean(Object bean) throws Exception { super.invokeSetBindingBean(bean); - PageNode node = (PageNode)bean; - Calendar cal = getUIFormDateTimeInput(START_PUBLICATION_DATE).getCalendar(); - Date date = (cal != null) ? cal.getTime() : null; - node.setStartPublicationDate(date); - cal = getUIFormDateTimeInput(END_PUBLICATION_DATE).getCalendar(); - date = (cal != null) ? cal.getTime() : null; - node.setEndPublicationDate(date); + PageNode node = (PageNode) bean; + if (node.getVisibility() != Visibility.SYSTEM) + { + Calendar cal = getUIFormDateTimeInput(START_PUBLICATION_DATE).getCalendar(); + Date date = (cal != null) ? cal.getTime() : null; + node.setStartPublicationDate(date); + cal = getUIFormDateTimeInput(END_PUBLICATION_DATE).getCalendar(); + date = (cal != null) ? cal.getTime() : null; + node.setEndPublicationDate(date); + } } public void setShowCheckPublicationDate(boolean show) @@ -269,7 +272,11 @@ WebuiRequestContext ctx = event.getRequestContext(); UIPageNodeForm uiPageNodeForm = event.getSource(); UIApplication uiPortalApp = ctx.getUIApplication(); - if (uiPageNodeForm.getUIFormCheckBoxInput(SHOW_PUBLICATION_DATE).isChecked()) + PageNode pageNode = uiPageNodeForm.getPageNode(); + if (pageNode == null) + pageNode = new PageNode(); + + if (pageNode.getVisibility() != Visibility.SYSTEM && uiPageNodeForm.getUIFormCheckBoxInput(SHOW_PUBLICATION_DATE).isChecked()) { Calendar currentCalendar = Calendar.getInstance(); currentCalendar.set(currentCalendar.get(Calendar.YEAR), currentCalendar.get(Calendar.MONTH), currentCalendar.get(Calendar.DAY_OF_MONTH), 0, 0, 0); @@ -305,10 +312,7 @@ } } - - PageNode pageNode = uiPageNodeForm.getPageNode(); - if (pageNode == null) - pageNode = new PageNode(); + uiPageNodeForm.invokeSetBindingBean(pageNode); UIPageSelector2 pageSelector = uiPageNodeForm.getChild(UIPageSelector2.class); if (pageSelector.getPage() == null)