[richfaces-svn-commits] JBoss Rich Faces SVN: r3015 - trunk/ui/calendar/src/main/java/org/richfaces/component.

[richfaces-svn-commits at lists.jboss.org]

Author: akushunin
Date: 2007-09-20 09:45:05 -0400 (Thu, 20 Sep 2007)
New Revision: 3015

Modified:
   trunk/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java
Log:
RF-946
processing preloadDateRangeBegin/End=null

Modified: trunk/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java
===================================================================
--- trunk/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java	2007-09-20 13:26:44 UTC (rev 3014)
+++ trunk/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java	2007-09-20 13:45:05 UTC (rev 3015)
@@ -296,7 +296,7 @@
 			AjaxContext ajaxContext = AjaxContext
 					.getCurrentInstance(facesContext);
 			ajaxContext.addRegionsFromComponent(this);
-			ajaxContext.setResponseData(getPreload());
+			if(getPreload()!=null){ajaxContext.setResponseData(getPreload());}			
 		} else {
 			if (event instanceof CurrentDateChangeEvent) {
 				FacesContext facesContext = FacesContext.getCurrentInstance();
@@ -392,9 +392,17 @@
 	public Date[] getPreloadDateRange() {
 		Date dateRangeBegin = this.getPreloadDateRangeBegin();
 		Date dateRangeEnd = this.getPreloadDateRangeEnd();
-
+		
+		if(dateRangeBegin==null&&dateRangeEnd==null){
+			return null;
+		}
+		else{
 		if (dateRangeBegin.after(dateRangeEnd)) {
-			// TODO add message
+			// XXX add message
+			FacesMessage message = new FacesMessage("preloadDateRangeBegin is greater than preloadDateRangeEnd");
+			message.setSeverity(FacesMessage.SEVERITY_ERROR);
+			FacesContext context = FacesContext.getCurrentInstance();
+			context.addMessage(getClientId(context), message);
 			throw new IllegalArgumentException();
 		}
 
@@ -413,6 +421,7 @@
 
 		return (Date[]) dates.toArray(new Date[dates.size()]);
 	}
+	}
 	
 	public void addCurrentDateChangeListener(CurrentDateChangeListener listener) {
 		addFacesListener(listener);