[richfaces-svn-commits] JBoss Rich Faces SVN: r4288 - branches/3.1.x/ui/calendar/src/main/java/org/richfaces/renderkit.

Author: akushunin Date: 2007-11-27 10:57:04 -0500 (Tue, 27 Nov 2007) New Revision: 4288 Modified: branches/3.1.x/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java Log: RF-997 Modified: branches/3.1.x/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java =================================================================== --- branches/3.1.x/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java 2007-11-27 15:52:55 UTC (rev 4287) +++ branches/3.1.x/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java 2007-11-27 15:57:04 UTC (rev 4288) @@ -52,6 +52,8 @@ import org.richfaces.component.UICalendar; import org.richfaces.component.util.ComponentUtil; import org.ajax4jsf.event.AjaxSingleEvent; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; /** * @author Nick Belaevski - mailto:nbelaevski@exadel.com created 08.06.2007 @@ -70,6 +72,8 @@ public static final String DATE_SCROLL = "DateScroll"; protected static final String MARKUP_SUFFIX = "Markup"; + + private final static Log log = LogFactory.getLog(CalendarRendererBase.class); /* * (non-Javadoc) @@ -233,7 +237,17 @@ UICalendar input = (UICalendar) component; // XXX nick - nick - can contain either Date or String instance - Date value = input.getAsDate(input.getSubmittedValue()); + Date value = null; + //Fix for myfaces-1.1.x (RF-997.) + try { + value = input.getAsDate(input.getSubmittedValue()); + } catch (Exception e) { + if (log.isDebugEnabled()) { + log.debug(" InputValue: " + + e.toString(), e); + } + value = null; + } Date curVal = input.getAsDate(input.getValue()); DateTimeConverter converter = new DateTimeConverter(); @@ -346,15 +360,21 @@ public String getSelectedDate(FacesContext context, UICalendar calendar) throws IOException { - Date submittedValue = calendar.getAsDate(calendar.getSubmittedValue()); - Date date; - - if (submittedValue != null) { - date = submittedValue; - } else { + + //Fix for myFaces 1.1.x RF-997 + Date date; + if(calendar.isValid()){ + Date submittedValue = calendar.getAsDate(calendar.getSubmittedValue()); + if (submittedValue != null) { + date = submittedValue; + } else { + date = calendar.getAsDate(calendar.getValue()); + } + }else{ date = calendar.getAsDate(calendar.getValue()); - } - + //Date submittedValue = null; + } + if (date != null) { return ScriptUtils.toScript(formatDate(date)); }