Author: abelevich Date: 2007-09-21 10:44:05 -0400 (Fri, 21 Sep 2007) New Revision: 3052 Modified: branches/3.1.x/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java Log: RF-946 Modified: branches/3.1.x/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java =================================================================== --- branches/3.1.x/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java 2007-09-21 14:24:04 UTC (rev 3051) +++ branches/3.1.x/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java 2007-09-21 14:44:05 UTC (rev 3052) @@ -64,6 +64,10 @@ private static final String COMPONENT_FAMILY = "org.richfaces.Calendar"; + public static final String AJAX_MODE = "ajax"; + + public static final String CLIENT_MODE = "client"; + private final static Log log = LogFactory.getLog(UICalendar.class); public abstract Locale getLocale(); @@ -142,6 +146,10 @@ public abstract void setCurrentDateChangeListener(MethodBinding scrollerListener); + public abstract String getMode(); + + public abstract void setMode(String mode); + //TODO onclick add users onclick @@ -288,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(); @@ -384,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(); } @@ -405,6 +421,7 @@ return (Date[]) dates.toArray(new Date[dates.size()]); } + } public void addCurrentDateChangeListener(CurrentDateChangeListener listener) { addFacesListener(listener);