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 2007/08/07 22:33:35 UTC
svn commit: r563646 - in
/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component:
LabelTag.java LabelTagDeclaration.java
Author: bommel
Date: Tue Aug 7 13:33:35 2007
New Revision: 563646
URL: http://svn.apache.org/viewvc?view=rev&rev=563646
Log:
(TOBAGO-460) Markup attribute for label
Modified:
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/LabelTag.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/LabelTagDeclaration.java
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/LabelTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/LabelTag.java?view=diff&rev=563646&r1=563645&r2=563646
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/LabelTag.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/LabelTag.java Tue Aug 7 13:33:35 2007
@@ -31,6 +31,8 @@
private String forComponent;
private String tip;
+ private String markup;
+
@Override
public String getComponentType() {
@@ -46,6 +48,7 @@
super.release();
tip = null;
forComponent = null;
+ markup = null;
}
public void setFor(String forComponent) {
@@ -57,6 +60,7 @@
super.setProperties(component);
ComponentUtil.setStringProperty(component, ATTR_FOR, forComponent);
ComponentUtil.setStringProperty(component, ATTR_TIP, tip);
+ ComponentUtil.setMarkup(component, markup);
}
public String getAccessKey() {
@@ -84,6 +88,14 @@
public void setTip(String tip) {
this.tip = tip;
+ }
+
+ public String getMarkup() {
+ return markup;
+ }
+
+ public void setMarkup(String markup) {
+ this.markup = markup;
}
}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/LabelTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/LabelTagDeclaration.java?view=diff&rev=563646&r1=563645&r2=563646
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/LabelTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/LabelTagDeclaration.java Tue Aug 7 13:33:35 2007
@@ -28,6 +28,7 @@
import org.apache.myfaces.tobago.taglib.decl.HasLabelWithAccessKey;
import org.apache.myfaces.tobago.taglib.decl.HasTip;
import org.apache.myfaces.tobago.taglib.decl.IsInline;
+import org.apache.myfaces.tobago.taglib.decl.HasMarkup;
/*
* Created: Aug 5, 2005 3:48:09 PM
@@ -43,7 +44,7 @@
uiComponent = "org.apache.myfaces.tobago.component.UILabel",
rendererType = "Label")
public interface LabelTagDeclaration extends BeanTagDeclaration, HasIdBindingAndRendered,
- HasLabelWithAccessKey, HasFor, IsInline, HasDeprecatedWidth, HasTip {
+ HasLabelWithAccessKey, HasFor, IsInline, HasDeprecatedWidth, HasTip, HasMarkup {
/**
* Text value to display as label. Overwritten by 'labelWithAccessKey'