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/02/02 21:03:27 UTC
svn commit: r617877 - in /myfaces/tobago/branches/tobago-1.0.x: ./
core/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectOneChoiceExtensionTag.java
Author: bommel
Date: Sat Feb 2 12:03:25 2008
New Revision: 617877
URL: http://svn.apache.org/viewvc?rev=617877&view=rev
Log:
Merged revisions 617876 via svnmerge from
https://svn.apache.org/repos/asf/myfaces/tobago/trunk
........
r617876 | bommel | 2008-02-02 20:59:56 +0100 (Sa, 02 Feb 2008) | 1 line
(TOBAGO-524) Markup-attribute on tx:selectOneChoice is missing
........
Modified:
myfaces/tobago/branches/tobago-1.0.x/ (props changed)
myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectOneChoiceExtensionTag.java
Propchange: myfaces/tobago/branches/tobago-1.0.x/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sat Feb 2 12:03:25 2008
@@ -1 +1 @@
-/myfaces/tobago/trunk:1-603371,609568-609629,612250-612251,612282,612518,613455,613939,614278,614291,614642,615257,616717
+/myfaces/tobago/trunk:1-603371,609568-609629,612250-612251,612282,612518,613455,613939,614278,614291,614642,615257,616717,617876
Modified: myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectOneChoiceExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectOneChoiceExtensionTag.java?rev=617877&r1=617876&r2=617877&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectOneChoiceExtensionTag.java (original)
+++ myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectOneChoiceExtensionTag.java Sat Feb 2 12:03:25 2008
@@ -37,6 +37,7 @@
import org.apache.myfaces.tobago.taglib.decl.IsReadonly;
import org.apache.myfaces.tobago.taglib.decl.IsRendered;
import org.apache.myfaces.tobago.taglib.decl.IsRequired;
+import org.apache.myfaces.tobago.taglib.decl.HasMarkup;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.tagext.BodyTagSupport;
@@ -51,7 +52,7 @@
extends BodyTagSupport
implements HasId, HasValue, HasValueChangeListener, IsDisabled,
IsReadonly, HasOnchange, IsInline, HasLabel, HasLabelWidth, IsRequired,
- IsRendered, IsFocus, HasBinding, HasTip, HasValidator, HasConverter, HasTabIndex {
+ IsRendered, IsFocus, HasBinding, HasTip, HasValidator, HasConverter, HasMarkup, HasTabIndex {
private String required;
private String value;
@@ -69,6 +70,7 @@
private String labelWidth;
private String tabIndex;
private String focus;
+ private String markup;
private LabelExtensionTag labelTag;
private SelectOneChoiceTag selectOneChoiceTag;
@@ -116,7 +118,9 @@
if (disabled != null) {
selectOneChoiceTag.setDisabled(disabled);
}
-
+ if (markup != null) {
+ selectOneChoiceTag.setMarkup(markup);
+ }
if (inline != null) {
selectOneChoiceTag.setInline(inline);
}
@@ -169,6 +173,7 @@
selectOneChoiceTag = null;
labelTag = null;
focus = null;
+ markup = null;
}
public void setRequired(String required) {
@@ -233,5 +238,9 @@
public void setFocus(String focus) {
this.focus = focus;
+ }
+
+ public void setMarkup(String markup) {
+ this.markup = markup;
}
}