Author: akushunin
Date: 2007-11-27 10:52:55 -0500 (Tue, 27 Nov 2007)
New Revision: 4287
Modified:
trunk/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java
Log:
RF-997
Modified:
trunk/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java
===================================================================
---
trunk/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java 2007-11-27
15:01:50 UTC (rev 4286)
+++
trunk/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java 2007-11-27
15:52:55 UTC (rev 4287)
@@ -21,7 +21,8 @@
package org.richfaces.renderkit;
-import java.awt.Component;
+
+
import java.io.IOException;
import java.text.DateFormatSymbols;
import java.util.Calendar;
@@ -30,29 +31,26 @@
import java.util.Iterator;
import java.util.Locale;
import java.util.Map;
-import java.util.TimeZone;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
-import javax.faces.convert.Converter;
import javax.faces.convert.ConverterException;
import javax.faces.convert.DateTimeConverter;
import javax.faces.event.PhaseId;
import org.ajax4jsf.context.AjaxContext;
import org.ajax4jsf.event.AjaxEvent;
-import org.ajax4jsf.event.AjaxSingleEvent;
import org.ajax4jsf.javascript.JSFunction;
import org.ajax4jsf.javascript.JSFunctionDefinition;
import org.ajax4jsf.javascript.JSReference;
import org.ajax4jsf.javascript.ScriptUtils;
import org.ajax4jsf.renderkit.AjaxRendererUtils;
-import org.ajax4jsf.util.SelectUtils;
-import org.richfaces.event.CurrentDateChangeEvent;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.richfaces.component.UICalendar;
import org.richfaces.component.util.ComponentUtil;
-import org.ajax4jsf.event.AjaxSingleEvent;
+import org.richfaces.event.CurrentDateChangeEvent;
/**
* @author Nick Belaevski - mailto:nbelaevski@exadel.com created 08.06.2007
@@ -71,6 +69,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)
@@ -329,8 +329,17 @@
public String getInputValue(FacesContext context, UIComponent component) {
UICalendar input = (UICalendar) component;
// XXX nick - nick - can contain either Date or String instance
-
- Date value = input.getAsDate(input.getSubmittedValue());
+ //Fix for myFaces 1.1.x RF-997
+ Date value = null;
+ 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();
@@ -444,14 +453,20 @@
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(formatSelectedDate(date));
Show replies by date