You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2012/09/03 12:01:36 UTC
git commit: WICKET-4731 TimeField not able to work with a
java.sql.Time
Updated Branches:
refs/heads/master cdd66a79f -> 995559ef0
WICKET-4731 TimeField not able to work with a java.sql.Time
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/995559ef
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/995559ef
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/995559ef
Branch: refs/heads/master
Commit: 995559ef03314bc102e009b42f3b6afa05192507
Parents: cdd66a7
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Mon Sep 3 12:01:07 2012 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Mon Sep 3 12:01:07 2012 +0200
----------------------------------------------------------------------
.../extensions/yui/calendar/DateTimeField.java | 24 ++++++++++++++-
.../wicket/extensions/yui/calendar/TimeField.java | 5 ++-
2 files changed, 27 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/995559ef/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateTimeField.java
----------------------------------------------------------------------
diff --git a/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateTimeField.java b/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateTimeField.java
index 0e9cb46..148c1a3 100644
--- a/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateTimeField.java
+++ b/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateTimeField.java
@@ -368,7 +368,7 @@ public class DateTimeField extends FormComponentPanel<Date>
}
// The date will be in the server's timezone
- setConvertedInput(new Date(date.getMillis()));
+ setConvertedInput(newDateInstance(date.getMillis()));
}
catch (RuntimeException e)
{
@@ -378,6 +378,28 @@ public class DateTimeField extends FormComponentPanel<Date>
}
/**
+ * A factory method for the DateTextField's model object.
+ *
+ * @return any specialization of java.util.Date
+ */
+ protected Date newDateInstance()
+ {
+ return new Date();
+ }
+
+ /**
+ * A factory method for the DateTextField's model object.
+ *
+ * @param time
+ * the time in milliseconds
+ * @return any specialization of java.util.Date
+ */
+ protected Date newDateInstance(long time)
+ {
+ return new Date(time);
+ }
+
+ /**
* create a new {@link DateTextField} instance to be added to this panel.
*
* @param id
http://git-wip-us.apache.org/repos/asf/wicket/blob/995559ef/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/TimeField.java
----------------------------------------------------------------------
diff --git a/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/TimeField.java b/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/TimeField.java
index 68b5e6c..170cf84 100644
--- a/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/TimeField.java
+++ b/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/TimeField.java
@@ -38,6 +38,7 @@ public class TimeField extends DateTimeField
* Construct.
*
* @param id
+ * the component id
*/
public TimeField(String id)
{
@@ -48,7 +49,9 @@ public class TimeField extends DateTimeField
* Construct.
*
* @param id
+ * the component id
* @param model
+ * the component's model
*/
public TimeField(String id, IModel<Date> model)
{
@@ -61,7 +64,7 @@ public class TimeField extends DateTimeField
protected void convertInput()
{
Date modelObject = (Date)getDefaultModelObject();
- getDateTextField().setConvertedInput(modelObject != null ? modelObject : new Date());
+ getDateTextField().setConvertedInput(modelObject != null ? modelObject : newDateInstance());
super.convertInput();
}