Author: jrthomerson Date: Tue Sep 21 21:35:13 2010 New Revision: 999655 URL: http://svn.apache.org/viewvc?rev=999655&view=rev Log: force open-close tag on MultiLineLabel just like Label
Modified: wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/markup/html/basic/MultiLineLabel.java Modified: wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/markup/html/basic/MultiLineLabel.java URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/markup/html/basic/MultiLineLabel.java?rev=999655&r1=999654&r2=999655&view=diff ============================================================================== --- wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/markup/html/basic/MultiLineLabel.java (original) +++ wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/markup/html/basic/MultiLineLabel.java Tue Sep 21 21:35:13 2010 @@ -19,6 +19,7 @@ package org.apache.wicket.markup.html.ba import org.apache.wicket.markup.ComponentTag; import org.apache.wicket.markup.MarkupStream; import org.apache.wicket.markup.html.WebComponent; +import org.apache.wicket.markup.parser.XmlTag; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; import org.apache.wicket.util.string.Strings; @@ -80,4 +81,15 @@ public class MultiLineLabel extends WebC final CharSequence body = Strings.toMultilineMarkup(getDefaultModelObjectAsString()); replaceComponentTagBody(markupStream, openTag, body); } + + /** + * @see org.apache.wicket.Component#onComponentTag(org.apache.wicket.markup.ComponentTag) + */ + @Override + protected void onComponentTag(ComponentTag tag) + { + super.onComponentTag(tag); + // always transform the tag to <span></span> so even labels defined as <span/> render + tag.setType(XmlTag.OPEN); + } }