You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by al...@apache.org on 2007/03/09 19:53:16 UTC
svn commit: r516508 - in
/incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/util/convert:
./ converters/
Author: almaw
Date: Fri Mar 9 10:53:15 2007
New Revision: 516508
URL: http://svn.apache.org/viewvc?view=rev&rev=516508
Log:
Fix the TODO and make SQL formats first class citizens.
Added:
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/util/convert/converters/SqlDateConverter.java (with props)
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/util/convert/converters/SqlTimeConverter.java (with props)
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/util/convert/converters/SqlTimestampConverter.java (with props)
Modified:
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/util/convert/ConverterLocator.java
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/util/convert/converters/DateConverter.java
Modified: incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/util/convert/ConverterLocator.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/util/convert/ConverterLocator.java?view=diff&rev=516508&r1=516507&r2=516508
==============================================================================
--- incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/util/convert/ConverterLocator.java (original)
+++ incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/util/convert/ConverterLocator.java Fri Mar 9 10:53:15 2007
@@ -31,6 +31,9 @@
import wicket.util.convert.converters.IntegerConverter;
import wicket.util.convert.converters.LongConverter;
import wicket.util.convert.converters.ShortConverter;
+import wicket.util.convert.converters.SqlDateConverter;
+import wicket.util.convert.converters.SqlTimeConverter;
+import wicket.util.convert.converters.SqlTimestampConverter;
import wicket.util.lang.Objects;
/**
@@ -157,12 +160,10 @@
set(Long.class, LongConverter.INSTANCE);
set(Short.TYPE, ShortConverter.INSTANCE);
set(Short.class, ShortConverter.INSTANCE);
- set(Date.class, DateConverter.INSTANCE);
- // TODO convert to string will go fine, but what about to object? It
- // will make a java.util.Date
- set(java.sql.Date.class, DateConverter.INSTANCE);
- set(java.sql.Time.class, DateConverter.INSTANCE);
- set(java.sql.Timestamp.class, DateConverter.INSTANCE);
+ set(Date.class, new DateConverter());
+ set(java.sql.Date.class, new SqlDateConverter());
+ set(java.sql.Time.class, new SqlTimeConverter());
+ set(java.sql.Timestamp.class, new SqlTimestampConverter());
}
/**
Modified: incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/util/convert/converters/DateConverter.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/util/convert/converters/DateConverter.java?view=diff&rev=516508&r1=516507&r2=516508
==============================================================================
--- incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/util/convert/converters/DateConverter.java (original)
+++ incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/util/convert/converters/DateConverter.java Fri Mar 9 10:53:15 2007
@@ -20,8 +20,6 @@
import java.util.Date;
import java.util.Locale;
-import wicket.util.convert.IConverter;
-
/**
* Converts from Object to Date.
*
@@ -32,11 +30,6 @@
private static final long serialVersionUID = 1L;
/**
- * The singleton instance for a character converter
- */
- public static final IConverter INSTANCE = new DateConverter();
-
- /**
* @see wicket.util.convert.IConverter#convertToObject(java.lang.String,Locale)
*/
public Object convertToObject(final String value, Locale locale)
@@ -76,7 +69,7 @@
/**
* @see wicket.util.convert.converters.AbstractConverter#getTargetType()
*/
- protected Class/*<Date>*/ getTargetType()
+ protected Class getTargetType()
{
return Date.class;
}
Added: incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/util/convert/converters/SqlDateConverter.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/util/convert/converters/SqlDateConverter.java?view=auto&rev=516508
==============================================================================
--- incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/util/convert/converters/SqlDateConverter.java (added)
+++ incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/util/convert/converters/SqlDateConverter.java Fri Mar 9 10:53:15 2007
@@ -0,0 +1,34 @@
+/*
+ * 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 wicket.util.convert.converters;
+
+import java.util.Date;
+import java.util.Locale;
+
+public class SqlDateConverter extends DateConverter {
+
+ private static final long serialVersionUID = 1L;
+
+ public Object convertToObject(String value, Locale locale) {
+ return new java.sql.Date(((Date)super.convertToObject(value, locale)).getTime());
+ }
+
+ protected Class getTargetType() {
+ return java.sql.Date.class;
+ }
+
+}
Propchange: incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/util/convert/converters/SqlDateConverter.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/util/convert/converters/SqlTimeConverter.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/util/convert/converters/SqlTimeConverter.java?view=auto&rev=516508
==============================================================================
--- incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/util/convert/converters/SqlTimeConverter.java (added)
+++ incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/util/convert/converters/SqlTimeConverter.java Fri Mar 9 10:53:15 2007
@@ -0,0 +1,35 @@
+/*
+ * 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 wicket.util.convert.converters;
+
+import java.sql.Time;
+import java.util.Date;
+import java.util.Locale;
+
+public class SqlTimeConverter extends DateConverter {
+
+ private static final long serialVersionUID = 1L;
+
+ public Object convertToObject(String value, Locale locale) {
+ return new Time(((Date)super.convertToObject(value, locale)).getTime());
+ }
+
+ protected Class getTargetType() {
+ return Time.class;
+ }
+
+}
Propchange: incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/util/convert/converters/SqlTimeConverter.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/util/convert/converters/SqlTimestampConverter.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/util/convert/converters/SqlTimestampConverter.java?view=auto&rev=516508
==============================================================================
--- incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/util/convert/converters/SqlTimestampConverter.java (added)
+++ incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/util/convert/converters/SqlTimestampConverter.java Fri Mar 9 10:53:15 2007
@@ -0,0 +1,35 @@
+/*
+ * 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 wicket.util.convert.converters;
+
+import java.sql.Timestamp;
+import java.util.Date;
+import java.util.Locale;
+
+public class SqlTimestampConverter extends DateConverter {
+
+ private static final long serialVersionUID = 1L;
+
+ public Object convertToObject(String value, Locale locale) {
+ return new Timestamp(((Date)super.convertToObject(value, locale)).getTime());
+ }
+
+ protected Class getTargetType() {
+ return Timestamp.class;
+ }
+
+}
Propchange: incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/util/convert/converters/SqlTimestampConverter.java
------------------------------------------------------------------------------
svn:eol-style = native