You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by jc...@apache.org on 2007/03/06 17:45:18 UTC
svn commit: r515203 -
/incubator/wicket/branches/wicket-1.x/wicket-datetime/src/main/java/wicket/extensions/yui/calendar/DatePicker.java
Author: jcompagner
Date: Tue Mar 6 08:45:17 2007
New Revision: 515203
URL: http://svn.apache.org/viewvc?view=rev&rev=515203
Log:
converter backport
Modified:
incubator/wicket/branches/wicket-1.x/wicket-datetime/src/main/java/wicket/extensions/yui/calendar/DatePicker.java
Modified: incubator/wicket/branches/wicket-1.x/wicket-datetime/src/main/java/wicket/extensions/yui/calendar/DatePicker.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket-datetime/src/main/java/wicket/extensions/yui/calendar/DatePicker.java?view=diff&rev=515203&r1=515202&r2=515203
==============================================================================
--- incubator/wicket/branches/wicket-1.x/wicket-datetime/src/main/java/wicket/extensions/yui/calendar/DatePicker.java (original)
+++ incubator/wicket/branches/wicket-1.x/wicket-datetime/src/main/java/wicket/extensions/yui/calendar/DatePicker.java Tue Mar 6 08:45:17 2007
@@ -16,7 +16,6 @@
*/
package wicket.extensions.yui.calendar;
-import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Iterator;
@@ -24,6 +23,8 @@
import java.util.Properties;
import java.util.Map.Entry;
+import org.joda.time.DateTime;
+
import wicket.Component;
import wicket.RequestCycle;
import wicket.ResourceReference;
@@ -37,9 +38,7 @@
import wicket.markup.html.form.AbstractTextComponent.ITextFormatProvider;
import wicket.markup.html.resources.CompressedResourceReference;
import wicket.markup.html.resources.JavascriptResourceReference;
-import wicket.util.convert.Converter;
import wicket.util.convert.IConverter;
-import wicket.util.convert.ITypeConverter;
import wicket.util.convert.converters.DateConverter;
import wicket.util.string.JavascriptUtils;
import wicket.util.string.Strings;
@@ -259,19 +258,13 @@
return;
}
- IConverter converter = component.getConverter();
- if (converter instanceof Converter) {
- ITypeConverter typeConverter = ((Converter) converter)
- .get(Date.class);
- if (typeConverter instanceof DateConverter) {
- DateConverter dateConverter = (DateConverter) typeConverter;
- DateFormat df = dateConverter.getDateFormat(component
- .getLocale());
- if (df instanceof SimpleDateFormat) {
- // not as nice as IDatePatternProvider, but it'll do
- return;
- }
- }
+ IConverter converter = component.getConverter(DateTime.class);
+ if (converter == null) {
+ converter = component.getConverter(Date.class);
+ }
+ if (converter instanceof DateConverter) {
+
+ return; // This is ok
}
throw new WicketRuntimeException(
"this behavior can only be added to components that either implement "
@@ -344,10 +337,12 @@
return ((ITextFormatProvider) component).getTextFormat();
} else {
// cast from hell, but we checked before whether we could
- DateConverter dateConverter = (DateConverter) ((Converter) component
- .getConverter()).get(Date.class);
- return ((SimpleDateFormat) dateConverter.getDateFormat(component
- .getLocale())).toPattern();
+ IConverter converter = component.getConverter(DateTime.class);
+ if (converter == null) {
+ converter = component.getConverter(Date.class);
+ }
+ return ((SimpleDateFormat) ((DateConverter) converter)
+ .getDateFormat(component.getLocale())).toPattern();
}
}