Author: mgrigorov
Date: Tue May 3 09:44:17 2011
New Revision: 1098988
URL: http://svn.apache.org/viewvc?rev=1098988&view=rev
Log:
WICKET-3658 Add converter for Calendar class
Added:
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/CalendarConverter.java
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ConverterLocator.java
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/util/convert/converters/ConvertersTest.java
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ConverterLocator.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ConverterLocator.java?rev=1098988&r1=1098987&r2=1098988&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ConverterLocator.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ConverterLocator.java
Tue May 3 09:44:17 2011
@@ -18,6 +18,7 @@ package org.apache.wicket;
import java.lang.ref.WeakReference;
import java.math.BigDecimal;
+import java.util.Calendar;
import java.util.Date;
import java.util.HashMap;
import java.util.Locale;
@@ -28,6 +29,7 @@ import org.apache.wicket.util.convert.IC
import org.apache.wicket.util.convert.converter.BigDecimalConverter;
import org.apache.wicket.util.convert.converter.BooleanConverter;
import org.apache.wicket.util.convert.converter.ByteConverter;
+import org.apache.wicket.util.convert.converter.CalendarConverter;
import org.apache.wicket.util.convert.converter.CharacterConverter;
import org.apache.wicket.util.convert.converter.DateConverter;
import org.apache.wicket.util.convert.converter.DoubleConverter;
@@ -167,6 +169,7 @@ public class ConverterLocator implements
set(Short.TYPE, ShortConverter.INSTANCE);
set(Short.class, ShortConverter.INSTANCE);
set(Date.class, new DateConverter());
+ set(Calendar.class, new CalendarConverter());
set(java.sql.Date.class, new SqlDateConverter());
set(java.sql.Time.class, new SqlTimeConverter());
set(java.sql.Timestamp.class, new SqlTimestampConverter());
Modified:
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/util/convert/converters/ConvertersTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/util/convert/converters/ConvertersTest.java?rev=1098988&r1=1098987&r2=1098988&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/util/convert/converters/ConvertersTest.java
(original)
+++
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/util/convert/converters/ConvertersTest.java
Tue May 3 09:44:17 2011
@@ -29,6 +29,7 @@ import org.apache.wicket.util.convert.Co
import org.apache.wicket.util.convert.converter.BigDecimalConverter;
import org.apache.wicket.util.convert.converter.BooleanConverter;
import org.apache.wicket.util.convert.converter.ByteConverter;
+import org.apache.wicket.util.convert.converter.CalendarConverter;
import org.apache.wicket.util.convert.converter.DateConverter;
import org.apache.wicket.util.convert.converter.DoubleConverter;
import org.apache.wicket.util.convert.converter.FloatConverter;
@@ -79,10 +80,10 @@ public final class ConvertersTest extend
cal.set(2002, Calendar.OCTOBER, 24);
Date date = cal.getTime();
- assertEquals(date,
converter.getConverter(Date.class).convertToObject("24-10-02",
- DUTCH_LOCALE));
- assertEquals("24-10-02",
converter.getConverter(Date.class).convertToString(date,
- DUTCH_LOCALE));
+ assertEquals(date,
+
converter.getConverter(Date.class).convertToObject("24-10-02", DUTCH_LOCALE));
+ assertEquals("24-10-02",
+
converter.getConverter(Date.class).convertToString(date, DUTCH_LOCALE));
// empty strings should return null, NOT throw NPEs
assertNull(converter.getConverter(Integer.class).convertToObject("",
Locale.US));
@@ -93,8 +94,8 @@ public final class ConvertersTest extend
assertNull(converter.getConverter(Short.class).convertToObject("", Locale.US));
assertNull(converter.getConverter(Date.class).convertToObject("", Locale.US));
assertNull(converter.getConverter(Double.class).convertToObject("", Locale.US));
- assertEquals(Boolean.FALSE,
converter.getConverter(Boolean.class).convertToObject("",
- Locale.US));
+ assertEquals(Boolean.FALSE,
+
converter.getConverter(Boolean.class).convertToObject("", Locale.US));
assertNotNull(converter.getConverter(String.class).convertToObject("",
Locale.US));
}
@@ -107,7 +108,7 @@ public final class ConvertersTest extend
assertEquals(new BigDecimal(3000), bdc.convertToObject("3 000",
Locale.FRENCH));
DoubleConverter dc = new DoubleConverter();
- assertEquals((double) 3000, dc.convertToObject("3 000",
Locale.FRENCH));
+ assertEquals((double)3000, dc.convertToObject("3 000",
Locale.FRENCH));
}
@@ -146,7 +147,7 @@ public final class ConvertersTest extend
{
ByteConverter converter = new ByteConverter();
assertEquals(new Byte((byte)10),
converter.convertToObject("10", Locale.US));
- assertEquals("10", converter.convertToString((byte) 10,
Locale.US));
+ assertEquals("10", converter.convertToString((byte)10,
Locale.US));
try
{
converter.convertToObject("whatever", Locale.US);
@@ -276,7 +277,7 @@ public final class ConvertersTest extend
{
LongConverter converter = new LongConverter();
assertEquals(new Long(10), converter.convertToObject("10",
Locale.US));
- assertEquals("10", converter.convertToString((long) 10,
Locale.US));
+ assertEquals("10", converter.convertToString((long)10,
Locale.US));
try
{
converter.convertToObject("whatever", Locale.US);
@@ -313,7 +314,7 @@ public final class ConvertersTest extend
{
ShortConverter converter = new ShortConverter();
assertEquals(new Short((short)10),
converter.convertToObject("10", Locale.US));
- assertEquals("10", converter.convertToString((short) 10,
Locale.US));
+ assertEquals("10", converter.convertToString((short)10,
Locale.US));
try
{
converter.convertToObject("whatever", Locale.US);
@@ -382,6 +383,46 @@ public final class ConvertersTest extend
}
/**
+ * Test calendar locale conversions.
+ */
+ public void testCalendarConverter()
+ {
+ CalendarConverter converter = new CalendarConverter();
+
+ Calendar cal = Calendar.getInstance(DUTCH_LOCALE);
+ cal.clear();
+ cal.set(2011, Calendar.MAY, 1);
+
+ assertEquals("1-5-11", converter.convertToString(cal,
DUTCH_LOCALE));
+ assertEquals(cal, converter.convertToObject("1-5-11",
DUTCH_LOCALE));
+
+ cal = Calendar.getInstance(Locale.US);
+ cal.clear();
+ cal.set(2011, Calendar.MAY, 1);
+ assertEquals("5/1/11", converter.convertToString(cal,
Locale.US));
+ assertEquals(cal, converter.convertToObject("5/1/11",
Locale.US));
+
+ try
+ {
+ converter.convertToObject("whatever", Locale.US);
+ fail("Conversion should have thrown an exception");
+ }
+ catch (ConversionException e)
+ {
+ // this is correct
+ }
+ try
+ {
+ converter.convertToObject("5/1/11whatever", Locale.US);
+ fail("Conversion should have thrown an exception");
+ }
+ catch (ConversionException e)
+ {
+ // this is correct
+ }
+ }
+
+ /**
* See WICKET-2878 and
*
http://java.sun.com/j2se/1.4.2/docs/api/java/math/BigDecimal.html#BigDecimal%28double%29
*/
Added:
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/CalendarConverter.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/CalendarConverter.java?rev=1098988&view=auto
==============================================================================
---
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/CalendarConverter.java
(added)
+++
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/CalendarConverter.java
Tue May 3 09:44:17 2011
@@ -0,0 +1,85 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.wicket.util.convert.converter;
+
+import java.util.Calendar;
+import java.util.Date;
+import java.util.Locale;
+
+import org.apache.wicket.util.convert.IConverter;
+import org.apache.wicket.util.lang.Args;
+
+/**
+ * Converts to {@link Calendar}.
+ */
+public class CalendarConverter implements IConverter<Calendar>
+{
+ private static final long serialVersionUID = 1L;
+
+ private final DateConverter dateConverter;
+
+ /**
+ * Construct.
+ */
+ public CalendarConverter()
+ {
+ this(new DateConverter());
+ }
+
+ /**
+ * Construct.
+ *
+ * @param dateConverter
+ * delegated converter, not null
+ */
+ public CalendarConverter(DateConverter dateConverter)
+ {
+ Args.notNull(dateConverter, "dateConverter");
+
+ this.dateConverter = dateConverter;
+ }
+
+ /**
+ * @see
org.apache.wicket.util.convert.IConverter#convertToObject(java.lang.String,
+ * java.util.Locale)
+ */
+ public Calendar convertToObject(final String value, final Locale locale)
+ {
+ Date date = dateConverter.convertToObject(value, locale);
+ if (date == null)
+ {
+ return null;
+ }
+
+ Calendar calendar = locale != null ?
Calendar.getInstance(locale) : Calendar.getInstance();
+ calendar.setTime(date);
+ return calendar;
+ }
+
+ /**
+ * @see
org.apache.wicket.util.convert.IConverter#convertToString(java.lang.Object,
+ * java.util.Locale)
+ */
+ public String convertToString(final Calendar value, final Locale locale)
+ {
+ if (value == null)
+ {
+ return null;
+ }
+ return dateConverter.convertToString(value.getTime(), locale);
+ }
+}
