You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by kn...@apache.org on 2007/03/30 20:59:08 UTC
svn commit: r524232 -
/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/markup/html/form/FormComponent.java
Author: knopp
Date: Fri Mar 30 11:59:08 2007
New Revision: 524232
URL: http://svn.apache.org/viewvc?view=rev&rev=524232
Log:
check for IAssignmentAwareModel
Modified:
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/markup/html/form/FormComponent.java
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/markup/html/form/FormComponent.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/markup/html/form/FormComponent.java?view=diff&rev=524232&r1=524231&r2=524232
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/markup/html/form/FormComponent.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/markup/html/form/FormComponent.java Fri Mar 30 11:59:08 2007
@@ -31,6 +31,7 @@
import wicket.WicketRuntimeException;
import wicket.markup.ComponentTag;
import wicket.markup.html.WebMarkupContainer;
+import wicket.model.IAssignmentAwareModel;
import wicket.model.IModel;
import wicket.util.convert.ConversionException;
import wicket.util.convert.IConverter;
@@ -610,8 +611,12 @@
* @param labelModel
* @return this for chaining
*/
- public FormComponent setLabel(final IModel labelModel)
+ public FormComponent setLabel(IModel labelModel)
{
+ if (labelModel instanceof IAssignmentAwareModel)
+ {
+ labelModel = ((IAssignmentAwareModel)labelModel).wrapOnAssignment(this);
+ }
this.labelModel = labelModel;
return this;
}