Author: ehillenius
Date: Wed Aug 1 21:46:36 2007
New Revision: 562014
URL: http://svn.apache.org/viewvc?view=rev&rev=562014
Log:
use factory method newDateTextField to give users the opportunity to construct/
return their own instance with e.g. their preferred date pattern.
Modified:
wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateField.java
wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateTimeField.java
Modified:
wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateField.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateField.java?view=diff&rev=562014&r1=562013&r2=562014
==============================================================================
---
wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateField.java
(original)
+++
wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateField.java
Wed Aug 1 21:46:36 2007
@@ -62,28 +62,6 @@
}
/**
- * Sets the converted input. In this case, we're really just interested
in
- * the nested date field, as that is the element that receives the real
user
- * input. So we're just passing that on.
- * <p>
- * Note that overriding this method is a better option than overriding
- * [EMAIL PROTECTED] #updateModel()} like the first versions of this
class did. The
- * reason for that is that this method can be used by form validators
- * without having to depend on the actual model being updated, and this
- * method is called by the default implementation of [EMAIL PROTECTED]
#updateModel()}
- * anyway (so we don't have to override that anymore).
- * </p>
- *
- * @return instance of [EMAIL PROTECTED] Date}, possibly null
- *
- * @see org.apache.wicket.markup.html.form.FormComponent#convertInput()
- */
- protected void convertInput()
- {
- setConvertedInput(dateField.getConvertedInput());
- }
-
- /**
* Gets date.
*
* @return date
@@ -111,8 +89,43 @@
private void init()
{
setType(Date.class);
- add(dateField = DateTextField.forShortStyle("date", new
PropertyModel(this, "date")));
+ PropertyModel dateFieldModel = new PropertyModel(this, "date");
+ add(dateField = newDateTextField(dateFieldModel));
dateField.add(new DatePicker());
+ }
+
+ /**
+ * Sets the converted input. In this case, we're really just interested
in
+ * the nested date field, as that is the element that receives the real
user
+ * input. So we're just passing that on.
+ * <p>
+ * Note that overriding this method is a better option than overriding
+ * [EMAIL PROTECTED] #updateModel()} like the first versions of this
class did. The
+ * reason for that is that this method can be used by form validators
+ * without having to depend on the actual model being updated, and this
+ * method is called by the default implementation of [EMAIL PROTECTED]
#updateModel()}
+ * anyway (so we don't have to override that anymore).
+ * </p>
+ *
+ * @return instance of [EMAIL PROTECTED] Date}, possibly null
+ *
+ * @see org.apache.wicket.markup.html.form.FormComponent#convertInput()
+ */
+ protected void convertInput()
+ {
+ setConvertedInput(dateField.getConvertedInput());
+ }
+
+ /**
+ * create a new [EMAIL PROTECTED] DateTextField} instance to be added
to this panel.
+ *
+ * @param dateFieldModel
+ * model that should be used by the [EMAIL PROTECTED]
DateTextField}
+ * @return a new date text field instance
+ */
+ protected DateTextField newDateTextField(PropertyModel dateFieldModel)
+ {
+ return DateTextField.forShortStyle("date", dateFieldModel);
}
/**
Modified:
wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateTimeField.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateTimeField.java?view=diff&rev=562014&r1=562013&r2=562014
==============================================================================
---
wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateTimeField.java
(original)
+++
wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateTimeField.java
Wed Aug 1 21:46:36 2007
@@ -216,7 +216,8 @@
private void init()
{
setType(Date.class);
- add(dateField = DateTextField.forShortStyle("date", new
PropertyModel(this, "date")));
+ PropertyModel dateFieldModel = new PropertyModel(this, "date");
+ add(dateField = newDateTextField(dateFieldModel));
dateField.add(new DatePicker());
add(hoursField = new TextField("hours", new PropertyModel(this,
"hours"), Integer.class));
hoursField.add(NumberValidator.range(0, 12));
@@ -288,6 +289,18 @@
}
setConvertedInput(convertedInput);
+ }
+
+ /**
+ * create a new [EMAIL PROTECTED] DateTextField} instance to be added
to this panel.
+ *
+ * @param dateFieldModel
+ * model that should be used by the [EMAIL PROTECTED]
DateTextField}
+ * @return a new date text field instance
+ */
+ protected DateTextField newDateTextField(PropertyModel dateFieldModel)
+ {
+ return DateTextField.forShortStyle("date", dateFieldModel);
}
/**
