You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by bo...@apache.org on 2008/08/05 21:12:51 UTC
svn commit: r682878 -
/myfaces/tobago/branches/tobago-1.0.x/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/TobagoLabelExtensionHandler.java
Author: bommel
Date: Tue Aug 5 12:12:51 2008
New Revision: 682878
URL: http://svn.apache.org/viewvc?rev=682878&view=rev
Log:
(TOBAGO-690) Markup attribute for Facelet Label Extension Tags doesn't work
Modified:
myfaces/tobago/branches/tobago-1.0.x/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/TobagoLabelExtensionHandler.java
Modified: myfaces/tobago/branches/tobago-1.0.x/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/TobagoLabelExtensionHandler.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/TobagoLabelExtensionHandler.java?rev=682878&r1=682877&r2=682878&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/TobagoLabelExtensionHandler.java (original)
+++ myfaces/tobago/branches/tobago-1.0.x/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/TobagoLabelExtensionHandler.java Tue Aug 5 12:12:51 2008
@@ -32,6 +32,7 @@
import org.apache.myfaces.tobago.component.UIInput;
import org.apache.myfaces.tobago.component.UILabel;
import org.apache.myfaces.tobago.component.UIPanel;
+import org.apache.myfaces.tobago.component.ComponentUtil;
import org.apache.myfaces.tobago.facelets.SuggestMethodRule;
import org.apache.myfaces.tobago.facelets.SupportsMarkupRule;
import org.apache.myfaces.tobago.util.LayoutUtil;
@@ -55,12 +56,14 @@
private TagAttribute labelWidthAttribute;
private TagAttribute tipAttribute;
private TagAttribute labelAttribute;
+ private TagAttribute markupAttribute;
public TobagoLabelExtensionHandler(ComponentConfig config) {
super(config);
labelWidthAttribute = getAttribute("labelWidth");
tipAttribute = getAttribute(TobagoConstants.ATTR_TIP);
labelAttribute = getAttribute(TobagoConstants.ATTR_LABEL);
+ markupAttribute = getAttribute(TobagoConstants.ATTR_MARKUP);
}
protected abstract String getSubComponentType();
@@ -144,6 +147,14 @@
ELAdaptor.setExpression(label, TobagoConstants.ATTR_VALUE, expression);
}
}
+ if (markupAttribute != null) {
+ if (markupAttribute.isLiteral()) {
+ ComponentUtil.setMarkup(label, markupAttribute.getValue());
+ } else {
+ ValueExpression expression = markupAttribute.getValueExpression(faceletContext, Object.class);
+ ELAdaptor.setExpression(label, TobagoConstants.ATTR_MARKUP, expression);
+ }
+ }
panel.getChildren().add(label);
}