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 23:19:18 UTC
svn commit: r682950 - in
/myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib:
extension/ extension12/
Author: bommel
Date: Tue Aug 5 14:19:14 2008
New Revision: 682950
URL: http://svn.apache.org/viewvc?rev=682950&view=rev
Log:
(TOBAGO-690) Markup attribute for Label Extension Tags doesn't work
Modified:
myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/DateExtensionTag.java
myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/InExtensionTag.java
myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/LabelExtensionTag.java
myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectBooleanCheckboxExtensionTag.java
myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectManyCheckboxExtensionTag.java
myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectManyListboxExtensionTag.java
myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectOneChoiceExtensionTag.java
myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectOneListboxExtensionTag.java
myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectOneRadioExtensionTag.java
myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/TextAreaExtensionTag.java
myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/DateExtensionTag.java
myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/InExtensionTag.java
myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/LabelExtensionTag.java
myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/SelectBooleanCheckboxExtensionTag.java
myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/SelectManyCheckboxExtensionTag.java
myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/SelectManyListboxExtensionTag.java
myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/SelectOneChoiceExtensionTag.java
myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/SelectOneListboxExtensionTag.java
myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/SelectOneRadioExtensionTag.java
myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/TextAreaExtensionTag.java
Modified: myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/DateExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/DateExtensionTag.java?rev=682950&r1=682949&r2=682950&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/DateExtensionTag.java (original)
+++ myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/DateExtensionTag.java Tue Aug 5 14:19:14 2008
@@ -119,6 +119,9 @@
if (rendered != null) {
labelTag.setRendered(rendered);
}
+ if (markup != null) {
+ labelTag.setMarkup(markup);
+ }
labelTag.setParent(getParent());
labelTag.doStartTag();
Modified: myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/InExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/InExtensionTag.java?rev=682950&r1=682949&r2=682950&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/InExtensionTag.java (original)
+++ myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/InExtensionTag.java Tue Aug 5 14:19:14 2008
@@ -112,7 +112,9 @@
if (labelWidth != null) {
labelTag.setColumns(labelWidth + ";*");
}
-
+ if (markup != null) {
+ labelTag.setMarkup(markup);
+ }
labelTag.setParent(getParent());
labelTag.doStartTag();
Modified: myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/LabelExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/LabelExtensionTag.java?rev=682950&r1=682949&r2=682950&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/LabelExtensionTag.java (original)
+++ myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/LabelExtensionTag.java Tue Aug 5 14:19:14 2008
@@ -50,6 +50,7 @@
private String columns = DEFAULT_COLUMNS;
private String rows = "fixed";
private String labelWidth;
+ private String markup;
private PanelTag panelTag;
@@ -92,6 +93,9 @@
if (tip != null) {
labelTag.setTip(tip);
}
+ if (markup != null) {
+ labelTag.setMarkup(markup);
+ }
labelTag.setFor("@auto");
labelTag.setParent(panelTag);
labelTag.doStartTag();
@@ -116,6 +120,7 @@
rows = "fixed";
panelTag = null;
labelWidth = null;
+ markup = null;
}
public void setValue(String value) {
@@ -146,4 +151,8 @@
public void setLabelWidth(String labelWidth) {
this.labelWidth = labelWidth;
}
+
+ public void setMarkup(String markup) {
+ this.markup = markup;
+ }
}
Modified: myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectBooleanCheckboxExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectBooleanCheckboxExtensionTag.java?rev=682950&r1=682949&r2=682950&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectBooleanCheckboxExtensionTag.java (original)
+++ myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectBooleanCheckboxExtensionTag.java Tue Aug 5 14:19:14 2008
@@ -96,13 +96,9 @@
if (labelWidth != null) {
labelTag.setColumns(labelWidth + ";*");
}
- /* TODO accessKey
- if (labelWithAccessKey != null) {
- label.setLabelWithAccessKey(labelWithAccessKey);
- }
- if (accessKey !=null) {
- label.setAccessKey(accessKey);
- } */
+ if (markup != null) {
+ labelTag.setMarkup(markup);
+ }
labelTag.setParent(getParent());
labelTag.doStartTag();
Modified: myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectManyCheckboxExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectManyCheckboxExtensionTag.java?rev=682950&r1=682949&r2=682950&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectManyCheckboxExtensionTag.java (original)
+++ myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectManyCheckboxExtensionTag.java Tue Aug 5 14:19:14 2008
@@ -101,13 +101,9 @@
if (labelWidth != null) {
labelTag.setColumns(labelWidth + ";*");
}
- /* TODO accessKey
- if (labelWithAccessKey != null) {
- label.setLabelWithAccessKey(labelWithAccessKey);
- }
- if (accessKey !=null) {
- label.setAccessKey(accessKey);
- } */
+ if (markup != null) {
+ labelTag.setMarkup(markup);
+ }
labelTag.setParent(getParent());
labelTag.doStartTag();
Modified: myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectManyListboxExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectManyListboxExtensionTag.java?rev=682950&r1=682949&r2=682950&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectManyListboxExtensionTag.java (original)
+++ myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectManyListboxExtensionTag.java Tue Aug 5 14:19:14 2008
@@ -106,13 +106,9 @@
if (labelWidth != null) {
labelTag.setColumns(labelWidth + ";*");
}
- /* TODO accessKey
- if (labelWithAccessKey != null) {
- label.setLabelWithAccessKey(labelWithAccessKey);
- }
- if (accessKey !=null) {
- label.setAccessKey(accessKey);
- } */
+ if (markup != null) {
+ labelTag.setMarkup(markup);
+ }
labelTag.setParent(getParent());
labelTag.doStartTag();
Modified: myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectOneChoiceExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectOneChoiceExtensionTag.java?rev=682950&r1=682949&r2=682950&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectOneChoiceExtensionTag.java (original)
+++ myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectOneChoiceExtensionTag.java Tue Aug 5 14:19:14 2008
@@ -99,6 +99,9 @@
if (labelWidth != null) {
labelTag.setColumns(labelWidth + ";*");
}
+ if (markup != null) {
+ labelTag.setMarkup(markup);
+ }
labelTag.setParent(getParent());
labelTag.doStartTag();
Modified: myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectOneListboxExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectOneListboxExtensionTag.java?rev=682950&r1=682949&r2=682950&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectOneListboxExtensionTag.java (original)
+++ myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectOneListboxExtensionTag.java Tue Aug 5 14:19:14 2008
@@ -40,6 +40,7 @@
import org.apache.myfaces.tobago.taglib.decl.HasValidatorMessage;
import org.apache.myfaces.tobago.taglib.decl.HasRequiredMessage;
import org.apache.myfaces.tobago.taglib.decl.HasConverterMessage;
+import org.apache.myfaces.tobago.taglib.decl.HasMarkup;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.tagext.BodyTagSupport;
@@ -52,7 +53,7 @@
public class SelectOneListboxExtensionTag
extends BodyTagSupport implements HasId, HasValue, HasValueChangeListener, IsDisabled,
HasLabel, HasLabelWidth, IsReadonly, HasOnchange, IsRendered,
- HasValidatorMessage, HasRequiredMessage, HasConverterMessage,
+ HasValidatorMessage, HasRequiredMessage, HasConverterMessage, HasMarkup,
HasBinding, HasDeprecatedHeight, IsFocus, HasTip, IsRequired, HasConverter, HasValidator, HasTabIndex {
private String required;
private String value;
@@ -74,6 +75,7 @@
private String validatorMessage;
private String converterMessage;
private String requiredMessage;
+ private String markup;
private LabelExtensionTag labelTag;
private SelectOneListboxTag selectOneListboxTag;
@@ -96,6 +98,9 @@
if (labelWidth != null) {
labelTag.setColumns(labelWidth + ";*");
}
+ if (markup != null) {
+ labelTag.setMarkup(markup);
+ }
labelTag.setParent(getParent());
labelTag.doStartTag();
@@ -152,6 +157,9 @@
if (requiredMessage != null) {
selectOneListboxTag.setRequiredMessage(requiredMessage);
}
+ if (markup != null) {
+ selectOneListboxTag.setMarkup(markup);
+ }
selectOneListboxTag.setParent(labelTag);
selectOneListboxTag.doStartTag();
@@ -191,6 +199,7 @@
validatorMessage = null;
converterMessage = null;
requiredMessage = null;
+ markup = null;
}
public void setRequired(String required) {
@@ -272,4 +281,8 @@
public void setRequiredMessage(String requiredMessage) {
this.requiredMessage = requiredMessage;
}
+
+ public void setMarkup(String markup) {
+ this.markup = markup;
+ }
}
Modified: myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectOneRadioExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectOneRadioExtensionTag.java?rev=682950&r1=682949&r2=682950&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectOneRadioExtensionTag.java (original)
+++ myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectOneRadioExtensionTag.java Tue Aug 5 14:19:14 2008
@@ -40,6 +40,7 @@
import org.apache.myfaces.tobago.taglib.decl.HasValidatorMessage;
import org.apache.myfaces.tobago.taglib.decl.HasRequiredMessage;
import org.apache.myfaces.tobago.taglib.decl.HasConverterMessage;
+import org.apache.myfaces.tobago.taglib.decl.HasMarkup;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.tagext.BodyTagSupport;
@@ -55,7 +56,7 @@
public class SelectOneRadioExtensionTag extends BodyTagSupport
implements HasId, HasValue, HasValueChangeListener, IsDisabled,
IsReadonly, HasOnchange, IsInline, HasLabel, HasLabelWidth, IsRequired,
- HasValidatorMessage, HasRequiredMessage, HasConverterMessage,
+ HasValidatorMessage, HasRequiredMessage, HasConverterMessage, HasMarkup,
IsRendered, HasBinding, HasTip, HasValidator, HasConverter, HasRenderRange, HasTabIndex {
private String required;
@@ -78,6 +79,7 @@
private String validatorMessage;
private String converterMessage;
private String requiredMessage;
+ private String markup;
private LabelExtensionTag labelTag;
private SelectOneRadioTag selectOneRadioTag;
@@ -99,6 +101,9 @@
if (labelWidth != null) {
labelTag.setColumns(labelWidth + ";*");
}
+ if (markup != null) {
+ labelTag.setMarkup(markup);
+ }
labelTag.setParent(getParent());
labelTag.doStartTag();
@@ -155,6 +160,9 @@
if (requiredMessage != null) {
selectOneRadioTag.setRequiredMessage(requiredMessage);
}
+ if (markup != null) {
+ selectOneRadioTag.setMarkup(markup);
+ }
selectOneRadioTag.setParent(labelTag);
selectOneRadioTag.doStartTag();
@@ -194,6 +202,7 @@
validatorMessage = null;
converterMessage = null;
requiredMessage = null;
+ markup = null;
}
public void setRequired(String required) {
@@ -275,4 +284,8 @@
public void setRequiredMessage(String requiredMessage) {
this.requiredMessage = requiredMessage;
}
+
+ public void setMarkup(String markup) {
+ this.markup = markup;
+ }
}
Modified: myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/TextAreaExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/TextAreaExtensionTag.java?rev=682950&r1=682949&r2=682950&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/TextAreaExtensionTag.java (original)
+++ myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/TextAreaExtensionTag.java Tue Aug 5 14:19:14 2008
@@ -109,6 +109,9 @@
if (labelWidth != null) {
labelTag.setColumns(labelWidth + ";*");
}
+ if (markup != null) {
+ labelTag.setMarkup(markup);
+ }
labelTag.setParent(getParent());
labelTag.doStartTag();
Modified: myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/DateExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/DateExtensionTag.java?rev=682950&r1=682949&r2=682950&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/DateExtensionTag.java (original)
+++ myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/DateExtensionTag.java Tue Aug 5 14:19:14 2008
@@ -99,6 +99,9 @@
if (rendered != null) {
labelTag.setRendered(rendered);
}
+ if (markup != null) {
+ labelTag.setMarkup(markup);
+ }
labelTag.setParent(getParent());
labelTag.doStartTag();
Modified: myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/InExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/InExtensionTag.java?rev=682950&r1=682949&r2=682950&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/InExtensionTag.java (original)
+++ myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/InExtensionTag.java Tue Aug 5 14:19:14 2008
@@ -90,7 +90,9 @@
if (labelWidth != null) {
labelTag.setColumns(createStringValueExpression(labelWidth.getExpressionString() + ";*"));
}
-
+ if (markup != null) {
+ labelTag.setMarkup(markup);
+ }
labelTag.setParent(getParent());
labelTag.doStartTag();
Modified: myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/LabelExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/LabelExtensionTag.java?rev=682950&r1=682949&r2=682950&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/LabelExtensionTag.java (original)
+++ myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/LabelExtensionTag.java Tue Aug 5 14:19:14 2008
@@ -47,6 +47,7 @@
private javax.el.ValueExpression columns;
private String rows = "fixed";
private javax.el.ValueExpression labelWidth;
+ private javax.el.ValueExpression markup;
private PanelTag panelTag;
@@ -93,6 +94,9 @@
if (tip != null) {
labelTag.setTip(tip);
}
+ if (markup != null) {
+ labelTag.setMarkup(markup);
+ }
labelTag.setFor("@auto");
labelTag.setParent(panelTag);
labelTag.doStartTag();
@@ -117,6 +121,7 @@
rows = "fixed";
panelTag = null;
labelWidth = null;
+ markup = null;
}
/**
@@ -171,4 +176,14 @@
public void setLabelWidth(ValueExpression labelWidth) {
this.labelWidth = labelWidth;
}
+
+ /**
+ * Indicate markup of this component.
+ * Possible value is 'none'. But this can be overridden in the theme.
+ */
+ @TagAttribute
+ @UIComponentTagAttribute(defaultValue = "none", type = "java.lang.String[]")
+ public void setMarkup(javax.el.ValueExpression markup) {
+ this.markup = markup;
+ }
}
Modified: myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/SelectBooleanCheckboxExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/SelectBooleanCheckboxExtensionTag.java?rev=682950&r1=682949&r2=682950&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/SelectBooleanCheckboxExtensionTag.java (original)
+++ myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/SelectBooleanCheckboxExtensionTag.java Tue Aug 5 14:19:14 2008
@@ -77,13 +77,9 @@
if (labelWidth != null) {
labelTag.setColumns(createStringValueExpression(labelWidth.getExpressionString() + ";*"));
}
- /* TODO accessKey
- if (labelWithAccessKey != null) {
- label.setLabelWithAccessKey(labelWithAccessKey);
- }
- if (accessKey !=null) {
- label.setAccessKey(accessKey);
- } */
+ if (markup != null) {
+ labelTag.setMarkup(markup);
+ }
labelTag.setParent(getParent());
labelTag.doStartTag();
Modified: myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/SelectManyCheckboxExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/SelectManyCheckboxExtensionTag.java?rev=682950&r1=682949&r2=682950&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/SelectManyCheckboxExtensionTag.java (original)
+++ myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/SelectManyCheckboxExtensionTag.java Tue Aug 5 14:19:14 2008
@@ -76,13 +76,9 @@
if (labelWidth != null) {
labelTag.setColumns(createStringValueExpression(labelWidth.getExpressionString() + ";*"));
}
- /* TODO accessKey
- if (labelWithAccessKey != null) {
- label.setLabelWithAccessKey(labelWithAccessKey);
- }
- if (accessKey !=null) {
- label.setAccessKey(accessKey);
- } */
+ if (markup != null) {
+ labelTag.setMarkup(markup);
+ }
labelTag.setParent(getParent());
labelTag.doStartTag();
Modified: myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/SelectManyListboxExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/SelectManyListboxExtensionTag.java?rev=682950&r1=682949&r2=682950&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/SelectManyListboxExtensionTag.java (original)
+++ myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/SelectManyListboxExtensionTag.java Tue Aug 5 14:19:14 2008
@@ -82,13 +82,9 @@
if (labelWidth != null) {
labelTag.setColumns(createStringValueExpression(labelWidth.getExpressionString() + ";*"));
}
- /* TODO accessKey
- if (labelWithAccessKey != null) {
- label.setLabelWithAccessKey(labelWithAccessKey);
- }
- if (accessKey !=null) {
- label.setAccessKey(accessKey);
- } */
+ if (markup != null) {
+ labelTag.setMarkup(markup);
+ }
labelTag.setParent(getParent());
labelTag.doStartTag();
Modified: myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/SelectOneChoiceExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/SelectOneChoiceExtensionTag.java?rev=682950&r1=682949&r2=682950&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/SelectOneChoiceExtensionTag.java (original)
+++ myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/SelectOneChoiceExtensionTag.java Tue Aug 5 14:19:14 2008
@@ -75,6 +75,9 @@
if (labelWidth != null) {
labelTag.setColumns(createStringValueExpression(labelWidth.getExpressionString() + ";*"));
}
+ if (markup != null) {
+ labelTag.setMarkup(markup);
+ }
labelTag.setParent(getParent());
labelTag.doStartTag();
Modified: myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/SelectOneListboxExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/SelectOneListboxExtensionTag.java?rev=682950&r1=682949&r2=682950&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/SelectOneListboxExtensionTag.java (original)
+++ myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/SelectOneListboxExtensionTag.java Tue Aug 5 14:19:14 2008
@@ -52,6 +52,7 @@
private javax.el.ValueExpression validatorMessage;
private javax.el.ValueExpression converterMessage;
private javax.el.ValueExpression requiredMessage;
+ private javax.el.ValueExpression markup;
private LabelExtensionTag labelTag;
private SelectOneListboxTag selectOneListboxTag;
@@ -74,6 +75,9 @@
if (labelWidth != null) {
labelTag.setColumns(createStringValueExpression(labelWidth.getExpressionString() + ";*"));
}
+ if (markup != null) {
+ labelTag.setMarkup(markup);
+ }
labelTag.setParent(getParent());
labelTag.doStartTag();
@@ -130,6 +134,9 @@
if (requiredMessage != null) {
selectOneListboxTag.setRequiredMessage(requiredMessage);
}
+ if (markup != null) {
+ selectOneListboxTag.setMarkup(markup);
+ }
selectOneListboxTag.setParent(labelTag);
selectOneListboxTag.doStartTag();
@@ -168,6 +175,7 @@
validatorMessage = null;
converterMessage = null;
requiredMessage = null;
+ markup = null;
}
/**
* Flag indicating that a value is required.
@@ -363,4 +371,14 @@
this.requiredMessage = requiredMessage;
}
+ /**
+ * Indicate markup of this component.
+ * Possible value is 'none'. But this can be overridden in the theme.
+ */
+ @TagAttribute
+ @UIComponentTagAttribute(defaultValue = "none", type = "java.lang.String[]")
+ public void setMarkup(javax.el.ValueExpression markup) {
+ this.markup = markup;
+ }
+
}
Modified: myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/SelectOneRadioExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/SelectOneRadioExtensionTag.java?rev=682950&r1=682949&r2=682950&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/SelectOneRadioExtensionTag.java (original)
+++ myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/SelectOneRadioExtensionTag.java Tue Aug 5 14:19:14 2008
@@ -56,6 +56,7 @@
private javax.el.ValueExpression validatorMessage;
private javax.el.ValueExpression converterMessage;
private javax.el.ValueExpression requiredMessage;
+ private javax.el.ValueExpression markup;
private LabelExtensionTag labelTag;
private SelectOneRadioTag selectOneRadioTag;
@@ -77,6 +78,9 @@
if (labelWidth != null) {
labelTag.setColumns(createStringValueExpression(labelWidth.getExpressionString() + ";*"));
}
+ if (markup != null) {
+ labelTag.setMarkup(markup);
+ }
labelTag.setParent(getParent());
labelTag.doStartTag();
@@ -133,6 +137,9 @@
if (requiredMessage != null) {
selectOneRadioTag.setRequiredMessage(requiredMessage);
}
+ if (markup != null) {
+ selectOneRadioTag.setMarkup(markup);
+ }
selectOneRadioTag.setParent(labelTag);
selectOneRadioTag.doStartTag();
@@ -172,6 +179,7 @@
validatorMessage = null;
converterMessage = null;
requiredMessage = null;
+ markup = null;
}
/**
@@ -377,4 +385,14 @@
this.requiredMessage = requiredMessage;
}
+ /**
+ * Indicate markup of this component.
+ * Possible value is 'none'. But this can be overridden in the theme.
+ */
+ @TagAttribute
+ @UIComponentTagAttribute(defaultValue = "none", type = "java.lang.String[]")
+ public void setMarkup(javax.el.ValueExpression markup) {
+ this.markup = markup;
+ }
+
}
Modified: myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/TextAreaExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/TextAreaExtensionTag.java?rev=682950&r1=682949&r2=682950&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/TextAreaExtensionTag.java (original)
+++ myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/TextAreaExtensionTag.java Tue Aug 5 14:19:14 2008
@@ -89,6 +89,9 @@
if (labelWidth != null) {
labelTag.setColumns(createStringValueExpression(labelWidth.getExpressionString() + ";*"));
}
+ if (markup != null) {
+ labelTag.setMarkup(markup);
+ }
labelTag.setParent(getParent());
labelTag.doStartTag();