You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by jd...@apache.org on 2009/11/29 00:22:35 UTC
svn commit: r885165 -
/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/ExternalLink.java
Author: jdonnerstag
Date: Sat Nov 28 23:22:34 2009
New Revision: 885165
URL: http://svn.apache.org/viewvc?rev=885165&view=rev
Log:
fixed ExternalLink to take IModel<?> instead of IModel<String> for label
Issue: WICKET-2588
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/ExternalLink.java
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/ExternalLink.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/ExternalLink.java?rev=885165&r1=885164&r2=885165&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/ExternalLink.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/ExternalLink.java Sat Nov 28 23:22:34 2009
@@ -34,7 +34,7 @@
private static final long serialVersionUID = 1L;
/** this links' label. */
- private final IModel<String> label;
+ private final IModel<?> label;
private boolean contextRelative = false;
@@ -85,7 +85,7 @@
* @param label
* the label (body)
*/
- public ExternalLink(final String id, final IModel<String> href, final IModel<String> label)
+ public ExternalLink(final String id, final IModel<String> href, final IModel<?> label)
{
super(id);
@@ -139,7 +139,7 @@
* @see org.apache.wicket.Component#onComponentTag(org.apache.wicket.markup.ComponentTag)
*/
@Override
- protected void onComponentTag(ComponentTag tag)
+ protected void onComponentTag(final ComponentTag tag)
{
super.onComponentTag(tag);
@@ -211,7 +211,7 @@
* org.apache.wicket.markup.ComponentTag)
*/
@Override
- protected void onComponentTagBody(MarkupStream markupStream, ComponentTag openTag)
+ protected void onComponentTagBody(final MarkupStream markupStream, final ComponentTag openTag)
{
// Draw anything before the body?
if (!isLinkEnabled() && getBeforeDisabledLink() != null)
@@ -252,20 +252,17 @@
* @param contextRelative
* @return This for chaining
*/
- public ExternalLink setContextRelative(boolean contextRelative)
+ public ExternalLink setContextRelative(final boolean contextRelative)
{
this.contextRelative = contextRelative;
return this;
}
-
/**
* @return label attribute
*/
- public IModel<String> getLabel()
+ public IModel<?> getLabel()
{
return label;
}
-
-
}
\ No newline at end of file