You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2011/07/04 09:12:36 UTC
svn commit: r1142572 -
/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheetLayout.java
Author: lofwyr
Date: Mon Jul 4 07:12:36 2011
New Revision: 1142572
URL: http://svn.apache.org/viewvc?rev=1142572&view=rev
Log:
TOBAGO-828: Make Sheet work with new LayoutManager
- if there is no column attribute and now width attribute in the columns, the space should be partitioned to all columns (relative layout like e. g. "*;*;*;*")
Modified:
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheetLayout.java
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheetLayout.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheetLayout.java?rev=1142572&r1=1142571&r2=1142572&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheetLayout.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheetLayout.java Mon Jul 4 07:12:36 2011
@@ -216,7 +216,7 @@ public abstract class AbstractUISheetLay
UIColumn column = allColumns.get(i);
if (column.isRendered()) {
if (tokens == null) {
- if (column instanceof AbstractUIColumn) {
+ if (column instanceof AbstractUIColumn && ((AbstractUIColumn) column).getWidth() != null) {
newTokens.addToken(LayoutTokens.parseToken(((AbstractUIColumn) column).getWidth()));
} else {
newTokens.addToken(RelativeLayoutToken.DEFAULT_INSTANCE);