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/10/06 10:40:14 UTC
svn commit: r582469 -
/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/LabelExtensionTag.java
Author: bommel
Date: Sat Oct 6 01:40:13 2007
New Revision: 582469
URL: http://svn.apache.org/viewvc?rev=582469&view=rev
Log:
(TOBAGO-505) <tx:selectBooleanCheckbox> with attribute "labelWidth" doesn't work
Modified:
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/LabelExtensionTag.java
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/LabelExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/LabelExtensionTag.java?rev=582469&r1=582468&r2=582469&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/LabelExtensionTag.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/LabelExtensionTag.java Sat Oct 6 01:40:13 2007
@@ -54,8 +54,6 @@
@Override
public int doStartTag() throws JspException {
- checkValidColums();
-
panelTag = new PanelTag();
panelTag.setPageContext(pageContext);
panelTag.setParent(getParent());
@@ -96,13 +94,6 @@
return super.doStartTag();
}
- private void checkValidColums() {
- if (!LayoutUtil.checkTokens(columns)) {
- LOG.warn("Illegal value for columns = \"" + columns + "\" replacing with default: \"" + DEFAULT_COLUMNS + "\"");
- columns = DEFAULT_COLUMNS;
- }
- }
-
@Override
public int doEndTag() throws JspException {
panelTag.doEndTag();
@@ -115,7 +106,7 @@
value = null;
tip = null;
rendered = null;
- columns = "fixed;*";
+ columns = DEFAULT_COLUMNS;
rows = "fixed";
panelTag = null;
}
@@ -133,7 +124,12 @@
}
void setColumns(String columns) {
- this.columns = columns;
+ if (!LayoutUtil.checkTokens(columns)) {
+ LOG.warn("Illegal value for columns = \"" + columns + "\" replacing with default: \"" + DEFAULT_COLUMNS + "\"");
+ this.columns = DEFAULT_COLUMNS;
+ } else {
+ this.columns = columns;
+ }
}
public void setRows(String rows) {