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/08/13 16:55:33 UTC
svn commit: r565367 - in /myfaces/tobago/trunk:
core/src/main/java/org/apache/myfaces/tobago/component/
theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/
Author: bommel
Date: Mon Aug 13 07:55:28 2007
New Revision: 565367
URL: http://svn.apache.org/viewvc?view=rev&rev=565367
Log:
(TOBAGO-98) More log information on layout problems
Modified:
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/LayoutTokens.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIGridLayout.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/GridLayoutRenderer.java
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/LayoutTokens.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/LayoutTokens.java?view=diff&rev=565367&r1=565366&r2=565367
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/LayoutTokens.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/LayoutTokens.java Mon Aug 13 07:55:28 2007
@@ -75,8 +75,15 @@
}
public static LayoutTokens parse(String tokens) {
+ return parse(tokens, null);
+ }
+
+
+
+ public static LayoutTokens parse(String tokens, LayoutToken defaultToken) {
LayoutTokens layoutTokens = new LayoutTokens();
if (tokens == null) {
+ layoutTokens.addToken(defaultToken);
return layoutTokens;
}
StringTokenizer tokenizer = new StringTokenizer(tokens, ";");
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIGridLayout.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIGridLayout.java?view=diff&rev=565367&r1=565366&r2=565367
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIGridLayout.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIGridLayout.java Mon Aug 13 07:55:28 2007
@@ -17,7 +17,6 @@
* limitations under the License.
*/
-import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_COLUMNS;
@@ -149,7 +148,7 @@
if (vb != null) {
return (String) vb.getValue(getFacesContext());
} else {
- return rows;
+ return "1*";
}
}
@@ -161,7 +160,7 @@
if (vb != null) {
return (String) vb.getValue(getFacesContext());
} else {
- return columns;
+ return "1*";
}
}
@@ -283,15 +282,7 @@
}
public int getColumnCount() {
- String columns =
- ComponentUtil.getStringAttribute(this, ATTR_COLUMNS);
- int columnCount;
- if (columns != null) {
- columnCount = 1 + StringUtils.countMatches(columns, ";");
- } else {
- columnCount = 1;
- }
- return columnCount;
+ return getColumnLayout().getSize();
}
public List<Row> ensureRows() {
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/GridLayoutRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/GridLayoutRenderer.java?view=diff&rev=565367&r1=565366&r2=565367
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/GridLayoutRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/GridLayoutRenderer.java Mon Aug 13 07:55:28 2007
@@ -100,19 +100,20 @@
+ " for all " + rows.size() + " rows."
+ " (clientId='" + layout.getClientId(facesContext) + "')");
}
- layoutTokens.ensureSize(rows.size(), new RelativeLayoutToken(1));
- // TODO alternative? rows.size() == 1 ? new RelativeLayoutToken(1) : new FixedLayoutToken()
- //new FixedLayoutToken() );
- //String[] layoutTokens
- // = LayoutInfo.createLayoutTokens(rowLayout, rows.size(),
- // minimum ? "minimum" : "fixed");
-
if (rows.size() != layoutTokens.getSize()) {
LOG.warn("Unbalanced layout: rows.size()=" + rows.size()
+ " != layoutTokens.length=" + layoutTokens.getSize()
+ " rowLayout='" + layoutTokens + "'"
+ " (clientId='" + layout.getClientId(facesContext) + "')");
+ layoutTokens.ensureSize(rows.size(), new RelativeLayoutToken(1));
}
+ // TODO alternative? rows.size() == 1 ? new RelativeLayoutToken(1) : new FixedLayoutToken()
+ //new FixedLayoutToken() );
+ //String[] layoutTokens
+ // = LayoutInfo.createLayoutTokens(rowLayout, rows.size(),
+ // minimum ? "minimum" : "fixed");
+
+
int size = Math.min(rows.size(), layoutTokens.getSize());
int height = 0;
@@ -162,16 +163,15 @@
+ " for all " + rows.size() + " rows of "
+ layout.getClientId(facesContext) + " !");
}
- //String[] layoutTokens
- // = LayoutInfo.createLayoutTokens(columnLayout, row.getColumns(),
- layoutTokens.ensureSize(row.getColumns(), new FixedLayoutToken());
if (row.getColumns() != layoutTokens.getSize()) {
LOG.warn("Unbalanced layout: rows.size()=" + rows.size()
+ " != layoutTokens.length=" + layoutTokens.getSize()
+ " columnLayout='" + layoutTokens + "'"
+ " (clientId='" + layout.getClientId(facesContext) + "')");
+ layoutTokens.ensureSize(row.getColumns(), new FixedLayoutToken());
}
+
int size = Math.min(rows.size(), layoutTokens.getSize());
int width = 0;
@@ -512,10 +512,11 @@
FacesContext facesContext) {
final List<UIGridLayout.Row> rows = layout.ensureRows();
- final int columnCount = layout.getColumnCount();
+ //final int columnCount = layout.getColumnCount();
final LayoutTokens layoutTokens = layout.getColumnLayout();
- layoutTokens.ensureSize(columnCount, new RelativeLayoutToken(1));
+ //layoutTokens.ensureSize(columnCount, new RelativeLayoutToken(1));
+
//LayoutInfo.createLayoutTokens((String)
//layout.getAttributes().get(ATTR_COLUMNS), columnCount);
@@ -542,7 +543,7 @@
innerWidth -= getWidthSpacingSum(layout, facesContext, renderedColumnCount);
LayoutInfo layoutInfo =
- new LayoutInfo(columnCount, innerWidth.intValue(), layoutTokens, layout.getClientId(facesContext),
+ new LayoutInfo(layoutTokens.getSize(), innerWidth.intValue(), layoutTokens, layout.getClientId(facesContext),
layout.isIgnoreFree());
parseFixedWidth(layoutInfo, layout, facesContext);