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/01/18 21:17:55 UTC
svn commit: r613255 - in /myfaces/tobago/branches/tobago-1.0.x: ./
core/src/main/java/org/apache/myfaces/tobago/taglib/extension/LabelExtensionTag.java
Author: bommel
Date: Fri Jan 18 12:17:53 2008
New Revision: 613255
URL: http://svn.apache.org/viewvc?rev=613255&view=rev
Log:
Merged revisions 612518 via svnmerge from
https://svn.apache.org/repos/asf/myfaces/tobago/trunk
........
r612518 | weber | 2008-01-16 18:08:49 +0100 (Mi, 16 Jan 2008) | 2 lines
(TOBAGO-598) el in labelWidth did not work in tx:* tags
<http://issues.apache.org/jira/browse/TOBAGO-598>
........
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/LabelExtensionTag.java
Propchange: myfaces/tobago/branches/tobago-1.0.x/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Jan 18 12:17:53 2008
@@ -1 +1 @@
-/myfaces/tobago/trunk:1-603371,609568-609629,612250-612251,612282
+/myfaces/tobago/trunk:1-603371,609568-609629,612250-612251,612282,612518
Modified: myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/LabelExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/LabelExtensionTag.java?rev=613255&r1=613254&r2=613255&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/LabelExtensionTag.java (original)
+++ myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/LabelExtensionTag.java Fri Jan 18 12:17:53 2008
@@ -31,6 +31,7 @@
import org.apache.myfaces.tobago.util.LayoutUtil;
import javax.faces.webapp.FacetTag;
+import javax.faces.webapp.UIComponentTag;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.tagext.BodyTagSupport;
@@ -124,7 +125,7 @@
}
void setColumns(String columns) {
- if (!LayoutUtil.checkTokens(columns)) {
+ if (!(UIComponentTag.isValueReference(columns) || LayoutUtil.checkTokens(columns))) {
LOG.warn("Illegal value for columns = \"" + columns + "\" replacing with default: \"" + DEFAULT_COLUMNS + "\"");
this.columns = DEFAULT_COLUMNS;
} else {