Make DateLabel implement IGenericComponent<Date>, since it only allows IModel<Date>
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/ad11f127 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/ad11f127 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/ad11f127 Branch: refs/heads/pr-86-media_tags Commit: ad11f1277684165e64759b10d3c14c40cbe2e79d Parents: a781d33 Author: Thibault Kruse <[email protected]> Authored: Wed Feb 25 13:30:39 2015 +0100 Committer: Sven Meier <[email protected]> Committed: Wed Feb 25 15:30:31 2015 +0100 ---------------------------------------------------------------------- .../datetime/markup/html/basic/DateLabel.java | 24 +++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/ad11f127/wicket-datetime/src/main/java/org/apache/wicket/datetime/markup/html/basic/DateLabel.java ---------------------------------------------------------------------- diff --git a/wicket-datetime/src/main/java/org/apache/wicket/datetime/markup/html/basic/DateLabel.java b/wicket-datetime/src/main/java/org/apache/wicket/datetime/markup/html/basic/DateLabel.java index 550bfed..1b3111a 100644 --- a/wicket-datetime/src/main/java/org/apache/wicket/datetime/markup/html/basic/DateLabel.java +++ b/wicket-datetime/src/main/java/org/apache/wicket/datetime/markup/html/basic/DateLabel.java @@ -19,6 +19,7 @@ package org.apache.wicket.datetime.markup.html.basic; import java.text.SimpleDateFormat; import java.util.Date; +import org.apache.wicket.IGenericComponent import org.apache.wicket.datetime.DateConverter; import org.apache.wicket.datetime.PatternDateConverter; import org.apache.wicket.datetime.StyleDateConverter; @@ -50,7 +51,7 @@ import org.joda.time.format.DateTimeFormat; * * @author eelcohillenius */ -public class DateLabel extends Label +public class DateLabel extends Label implements IGenericComponent<Date> { private static final long serialVersionUID = 1L; @@ -305,4 +306,25 @@ public class DateLabel extends Label } replaceComponentTagBody(markupStream, openTag, s); } + + @Override + public IModel<Date> getModel() { + return (IModel<Date>) super.getDefaultModel(); + } + + @Override + public void setModel(IModel<Date> model) { + super.setDefaultModel(model); + } + + @Override + public void setModelObject(Date object) { + super.setDefaultModelObject(object); + } + + @Override + public Date getModelObject() { + return (Date) super.getDefaultModelObject(); + } + }
