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 2011/12/08 16:09:02 UTC
svn commit: r1211927 -
/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/GridLayoutConstraintTag.java
Author: bommel
Date: Thu Dec 8 15:09:02 2011
New Revision: 1211927
URL: http://svn.apache.org/viewvc?rev=1211927&view=rev
Log:
(TOBAGO-1055) tc:gridLayoutConstraint doesn't work inside of tx:in or any other tx: tag
Modified:
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/GridLayoutConstraintTag.java
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/GridLayoutConstraintTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/GridLayoutConstraintTag.java?rev=1211927&r1=1211926&r2=1211927&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/GridLayoutConstraintTag.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/GridLayoutConstraintTag.java Thu Dec 8 15:09:02 2011
@@ -47,6 +47,7 @@ public abstract class GridLayoutConstrai
private static final Logger LOG = LoggerFactory.getLogger(GridLayoutConstraintTag.class);
+
@Override
public int doStartTag() throws JspException {
@@ -68,14 +69,16 @@ public abstract class GridLayoutConstrai
throw new JspException("Component Instance is null");
}
+ // XXX need a better solution
+ if (component.getParent() != null && component.getParent().getClass().getName().endsWith("UIExtensionPanel")) {
+ component = component.getParent();
+ }
+
if (!(component instanceof LayoutBase)) {
// TODO Message resource i18n
throw new JspException("Component Instance is not a LayoutBase");
}
- // XXX need a better solution
- if (component.getParent() != null && component.getClass().getName().endsWith("UIExtensionPanel")) {
- component = component.getParent();
- }
+
if (component instanceof LayoutComponent && isColumnSpanSet()) {
if (isColumnSpanLiteral()) {