[richfaces-svn-commits] JBoss Rich Faces SVN: r12011 - trunk/ui/calendar/src/main/java/org/richfaces/component.
Author: alevkovsky
Date: 2008-12-24 11:33:36 -0500 (Wed, 24 Dec 2008)
New Revision: 12011
Modified:
trunk/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java
Log:
https://jira.jboss.org/jira/browse/RF-4005
Modified: trunk/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java
===================================================================
--- trunk/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java 2008-12-24
16:03:34 UTC (rev 12010)
+++ trunk/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java 2008-12-24
16:33:36 UTC (rev 12011)
@@ -54,6 +54,7 @@
import org.ajax4jsf.event.AjaxEvent;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.richfaces.component.util.MessageUtil;
import org.richfaces.event.CurrentDateChangeEvent;
import org.richfaces.event.CurrentDateChangeListener;
import org.richfaces.model.CalendarDataModel;
@@ -787,20 +788,27 @@
* @return firstWeekDay value from local variable or value bindings
*/
public int getFirstWeekDay( ){
- if(this._firstWeekDaySet){
- return this._firstWeekDay;
- }
- ValueExpression ve = getValueExpression("firstWeekDay");
- if (ve != null) {
-
- Integer value = (Integer) ve.getValue(getFacesContext().getELContext());
- if (null == value) {
- return getDefaultFirstWeekDay();
+ int result;
+ if (this._firstWeekDaySet) {
+ result = this._firstWeekDay;
+ }else{
+ ValueExpression ve = getValueExpression("firstWeekDay");
+ if (ve != null) {
+
+ Integer value = (Integer) ve.getValue(getFacesContext().getELContext());
+ result = (value.intValue());
+ } else {
+ result = getDefaultFirstWeekDay();
}
- return (value.intValue());
- } else {
- return getDefaultFirstWeekDay();
}
+ if (result < 0 || result > 6) {
+ getFacesContext().getExternalContext()
+ .log(result + " value of firstWeekDay attribute is not a legal one for
component: "
+ + MessageUtil.getLabel(getFacesContext(), this)
+ + ". Default value was applied.");
+ result = getDefaultFirstWeekDay();
+ }
+ return result;
}
public Object saveState(FacesContext context) {